From 2dbcbd1ed8b6902ad1d1ae1bc2c106db2186c07a Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Tue, 8 Apr 2025 07:42:25 +0200 Subject: [PATCH] =?UTF-8?q?Ment=C3=A9s=20f=C3=B6l=C3=A9=20cs=C3=ADk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/CheckListTemplateRowDTO.cs | 12 +++++-- src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs | 17 ++++++++++ .../CheckPoints/CheckPointEditPage.cshtml | 30 +++++++----------- .../CheckPoints/CheckPointsPage.cshtml | 31 +++++++++---------- .../CheckPoints/CheckPointsPage.cshtml.cs | 5 +++ .../Equipments/EquipmentEditPage.cshtml | 1 + .../Locations/LocationEditPage.cshtml | 1 + .../CheckListHeaderEditPage.cshtml | 1 + .../CheckListRow/CheckListRowEditPage.cshtml | 2 +- .../CheckListTemplateHeaderEditPage.cshtml | 1 + .../CheckListTemplateRowEditPage.cshtml | 2 +- ...RoleCheckListTemplateHeaderEditPage.cshtml | 1 + .../UserAndRole/RoleCheckPointEditPage.cshtml | 1 + .../Pages/UserAndRole/RoleEditPage.cshtml | 1 + .../Pages/UserAndRole/UserEditPage.cshtml | 25 ++++++++------- .../Pages/UserAndRole/UserRoleEditPage.cshtml | 1 + 16 files changed, 82 insertions(+), 50 deletions(-) diff --git a/src/WorkFlowCheck.Common/DTO/CheckListTemplateRowDTO.cs b/src/WorkFlowCheck.Common/DTO/CheckListTemplateRowDTO.cs index e1b194d..d867e1b 100644 --- a/src/WorkFlowCheck.Common/DTO/CheckListTemplateRowDTO.cs +++ b/src/WorkFlowCheck.Common/DTO/CheckListTemplateRowDTO.cs @@ -1,25 +1,33 @@ -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations.Schema; namespace WorkFlowCheck.Common.DTO { public class CheckListTemplateRowDTO { public int Id { get; set; } + + [Required(ErrorMessage = "A sorrend megadása kötelező.")] + [DisplayName("Sorrend")] public int RowIndex { get; set; } public int CheckListTemplateHeaderId { get; set; } + [DisplayName("Berendezés")] public int EquipmentId { get; set; } - public EquipmentDTO? EquipmentDTO { get; set; } = null!; + public EquipmentDTO? EquipmentDTO { get; set; } = null!; public int CheckPointId { get; set; } public CheckPointDTO? CheckPointDTO { get; set; } = null!; + [DisplayName("Tevékenység leírása")] public string OperationDescription { get; set; } = null!; /// /// /// I-N (Igen, nem) /// P (Fénykép készítése) + /// PN (Fénykép nem kötelező készítése) /// SI-N (Sárga igen,fehér nem) /// I-SN (Fehér igen, sárga nem) /// PI-N (Piros igen,fehér nem) diff --git a/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs b/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs index a0ec974..371c3db 100644 --- a/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs +++ b/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs @@ -1,13 +1,30 @@  +using System.ComponentModel.DataAnnotations; +using System.ComponentModel; + namespace WorkFlowCheck.Common.DTO { public class CheckPointDTO { public int Id { get; set; } + + [Required(ErrorMessage = "A megnevezés megadása kötelező.")] + [DisplayName("Megnevezés")] public string ShortName { get; set; } + + [Required(ErrorMessage = "A kód megadása kötelező.")] + [DisplayName("Kód")] public string Code { get; set; } + + [DisplayName("Használatban")] public bool IsEnabled { get; set; } + + + [DisplayName("Szabály")] public int? RoleId { get; set; } + + + [DisplayName("Szabály neve")] public string? RoleName { get; set; } public List? CheckListTemplateRowDTO { get; set; } = new List(); } diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointEditPage.cshtml index ef651ca..e3e4f00 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointEditPage.cshtml @@ -1,6 +1,8 @@ @page @model WorkFlowCheck.Web.Pages.BaseStock.CheckPoints.CheckPointEditPageModel @using Microsoft.AspNetCore.Antiforgery +@using WorkFlowCheck.Common.Helper +@using WorkFlowCheck.Common.DTO @inject IAntiforgery Antiforgery @{ ViewData["Title"] = "Ellenőrzési pont"; @@ -37,6 +39,7 @@ +
@@ -54,19 +57,17 @@ ID - RowIndex - OperationDescription - AnswerType - Action + @DisplayNameHelper.GetDisplayName(nameof(CheckListTemplateRowDTO.RowIndex), typeof(CheckListTemplateRowDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckListTemplateRowDTO.OperationDescription), typeof(CheckListTemplateRowDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckListTemplateRowDTO.AnswerType), typeof(CheckListTemplateRowDTO)) ID - RowIndex - OperationDescription - AnswerType - Action + @DisplayNameHelper.GetDisplayName(nameof(CheckListTemplateRowDTO.RowIndex), typeof(CheckListTemplateRowDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckListTemplateRowDTO.OperationDescription), typeof(CheckListTemplateRowDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckListTemplateRowDTO.AnswerType), typeof(CheckListTemplateRowDTO)) @@ -89,23 +90,16 @@ data: "answerType", searchable: false, sortable: false, - render: function ( data, type, row ) { + render: function ( data, type, row ) + { return renderAnswerType(data); } - }, - { data: null, render: function (data, type, row) { - return renderActionButtons(row.id); - }} + } ], columnDefs: [ { "targets": 0, "visible": false - }, - { - "targets": 4, - "className": "text-center", - "width": "10%" } ], diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml index 7e7106b..5b59437 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml @@ -1,6 +1,9 @@ @page @model WorkFlowCheck.Web.Pages.BaseStock.CheckPoints.CheckPointsPageModel @using Microsoft.AspNetCore.Antiforgery +@using WorkFlowCheck.Common.Helper +@using WorkFlowCheck.Common.DTO + @inject IAntiforgery Antiforgery @{ ViewData["Title"] = "Ellenőrzési pontok"; @@ -17,17 +20,20 @@ ID - Enabled - Code + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.IsEnabled), typeof(CheckPointDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.ShortName), typeof(CheckPointDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.Code), typeof(CheckPointDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.RoleName), typeof(CheckPointDTO)) Action ID - Enabled - Short Name - Code + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.IsEnabled), typeof(CheckPointDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.ShortName), typeof(CheckPointDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.Code), typeof(CheckPointDTO)) + @DisplayNameHelper.GetDisplayName(nameof(CheckPointDTO.RoleName), typeof(CheckPointDTO)) Action @@ -56,6 +62,7 @@ }, { data: "shortName" }, { data: "code" }, + { data: "roleName" }, { data: null, render: function (data, type, row) { return renderActionButtons(row.id); }} @@ -66,7 +73,7 @@ "visible": false }, { - "targets": 3, + "targets": 5, "className": "text-center", "width": "10%" } @@ -91,17 +98,7 @@ $('#tbCheckPointsPage').on('click', '.delete-btn', function () { const row = table.row($(this).closest('tr')).data(); - console.log(row); - showConfirmModal({ - title: 'Törlés megerősítése', - message: 'Biztosan törölni szeretnéd ezt az elemet?', - okText: 'Törlés', - cancelText: 'Mégsem' - }).then(function(result) { - if(result === 'ok') { - console.log('Törlés végrehajtva'); - } - }); + deleteEntity(table, './CheckPointPage?handler=DeleteCheckPoint', row.id); }); } \ No newline at end of file diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml.cs b/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml.cs index 9005fa2..41f568e 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml.cs +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml.cs @@ -24,6 +24,11 @@ namespace WorkFlowCheck.Web.Pages.BaseStock.CheckPoints var results = await _baseStockService.GetAllCheckPoints(); return new JsonResult(new { data = results }); } + public async Task OnGetDeleteCheckPoint(int id) + { + var isSuccess = await _baseStockService.DeleteCheckPoint(id); + return new JsonResult(new { result = isSuccess }); + } } } diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentEditPage.cshtml index 0e6fb2b..f1e0a7b 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentEditPage.cshtml @@ -25,6 +25,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationEditPage.cshtml index 0160fa5..37e06b3 100644 --- a/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationEditPage.cshtml @@ -20,6 +20,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml index 037af3d..1b29190 100644 --- a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml @@ -42,6 +42,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListRow/CheckListRowEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListRow/CheckListRowEditPage.cshtml index aa2edd9..1883d20 100644 --- a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListRow/CheckListRowEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListRow/CheckListRowEditPage.cshtml @@ -44,7 +44,7 @@
- +
diff --git a/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateHeader/CheckListTemplateHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateHeader/CheckListTemplateHeaderEditPage.cshtml index 3803705..7b5769a 100644 --- a/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateHeader/CheckListTemplateHeaderEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateHeader/CheckListTemplateHeaderEditPage.cshtml @@ -39,6 +39,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateRows/CheckListTemplateRowEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateRows/CheckListTemplateRowEditPage.cshtml index bab43e4..6d6725d 100644 --- a/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateRows/CheckListTemplateRowEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/CheckListTemplate/CheckListTemplateRows/CheckListTemplateRowEditPage.cshtml @@ -47,7 +47,7 @@
- +
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml index 5a80c08..6f22ace 100644 --- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckListTemplateHeaderEditPage.cshtml @@ -34,6 +34,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml index 4e1fad2..6fd55d7 100644 --- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleCheckPointEditPage.cshtml @@ -34,6 +34,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml index 3e37e44..1522035 100644 --- a/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/RoleEditPage.cshtml @@ -48,6 +48,7 @@
+
diff --git a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml index 7537a2d..6c45c0a 100644 --- a/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml +++ b/src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml @@ -3,7 +3,7 @@ @using Microsoft.AspNetCore.Antiforgery @inject IAntiforgery Antiforgery @{ - ViewData["Title"] = "Ellenőrzési pont"; + ViewData["Title"] = "Felhasználó szerkesztése"; var UserId = Model.UserDTO.Id; var url = Url.Page("./UserEditPage", "LoadRoles", new { id = UserId }); var urlPost = Url.Page("./UserEditPage", "Save"); @@ -48,16 +48,19 @@
-
- - - -
-
- - - +
+
+ + + +
+
+ + + +
+
@@ -83,7 +86,7 @@
@section Scripts {