From ea26b955ace09390ef29f2c5924e838c68af84c6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:48:10 +0000 Subject: [PATCH 1/3] Initial plan From 3921a98a947decba294574fe2c9aeb638dfd7636 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:56:21 +0000 Subject: [PATCH 2/3] Refactor Actions columns to use mat-menu dropdown pattern Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com> --- .../area-rules-table.component.html | 58 +++++++++++++++++++ .../area-rules-table.component.ts | 36 ------------ .../files-table/files-table.component.html | 40 ++++++++++++- .../files-table/files-table.component.ts | 26 --------- .../task-management-table.component.html | 31 +++++++++- .../task-management-table.component.ts | 18 ------ .../task-tracker-table.component.html | 31 +++++++++- .../task-tracker-table.component.ts | 20 ------- 8 files changed, 157 insertions(+), 103 deletions(-) diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html index 57d79e4e9..4f894f457 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html @@ -3,6 +3,7 @@

{{'Halebid' | translate}}

{{'Morning tour' | translate}} {{'Chemicals' | translate}} + + +
+ + + + + + +
+
+ + +
+ + + + + + +
+
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.ts index 70a43c89a..2b882301e 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.ts +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.ts @@ -200,24 +200,6 @@ export class AreaRulesTableComponent implements OnChanges, OnInit { { field: 'actions', header: this.translateService.stream('Actions'), - type: 'button', - buttons: [ - { - type: 'icon', - color: 'accent', - icon: 'assignment', - click: (rowData: AreaRuleSimpleModel) => this.onShowPlanAreaRule(rowData), - tooltip: this.translateService.stream('Plan and assign'), - }, - { - type: 'icon', - color: 'accent', - icon: 'list', - click: () => this.onShowEditEntityListModal(this.selectedArea.groupId), - tooltip: this.translateService.stream('Edit list of stables for tailbites'), - class: 'updateEntityList', - }, - ] }, ]; @@ -416,24 +398,6 @@ export class AreaRulesTableComponent implements OnChanges, OnInit { { field: 'actions', header: this.translateService.stream('Actions'), - type: 'button', - buttons: [ - { - type: 'icon', - color: 'accent', - icon: 'assignment', - click: (rowData: AreaRuleSimpleModel) => this.onShowPlanAreaRule(rowData), - tooltip: this.translateService.stream('Plan and assign'), - }, - { - type: 'icon', - color: 'accent', - icon: 'edit', - iif: (rowData: AreaRuleSimpleModel) => !rowData.isDefault && this.selectedArea.type !== 9 && !rowData.planningStatus, - click: (rowData: AreaRuleSimpleModel) => this.onShowEditRuleModal(rowData), - tooltip: this.translateService.stream('Edit rule'), - }, - ] }, ]; diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.html index 6b876aa10..fac50972c 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.html +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.html @@ -1,7 +1,7 @@ + + +
+ + + + + + + +
+
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.ts index 80536879f..ac120d43f 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.ts +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-table/files-table.component.ts @@ -69,35 +69,9 @@ export class FilesTableComponent implements OnInit { { field: 'actions', header: this.translateService.stream('Actions'), - type: 'button', width: '200px', pinned: 'right', right: '0px', - buttons: [ - { - type: 'icon', - icon: 'visibility', - tooltip: this.translateService.stream('View File'), - click: (filesModel: FilesModel) => this.onOpenView(filesModel), - class: 'viewPdfBtn', - }, - { - color: 'accent', - type: 'icon', - icon: 'edit', - tooltip: this.translateService.stream('Edit file name'), - click: (filesModel: FilesModel) => this.onShowEditDocumentModal(filesModel), - class: 'editFilenameBtn', - }, - { - color: 'warn', - type: 'icon', - icon: 'delete', - tooltip: this.translateService.stream('Delete file'), - click: (filesModel: FilesModel) => this.onOpenDeleteModal(filesModel), - class: 'deleteFileBtn', - }, - ], }, ]; pdfSub$: any; diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.html index a2e275960..e62780a40 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.html +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.html @@ -2,7 +2,7 @@ {{row.status | translate}} + + +
+ + + + + + +
+
diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.ts index b5a0279b2..e74f39df2 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.ts +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.ts @@ -78,27 +78,9 @@ export class TaskManagementTableComponent implements OnInit { { header: this.translateService.stream('Actions'), field: 'actions', - type: 'button', width: '100px', pinned: 'right', right: '0px', - buttons: [ - { - type: 'icon', - icon: 'edit', - click: (rowData: WorkOrderCaseModel) => this.onOpenViewModal(rowData.id), - tooltip: this.translateService.stream('Edit task'), - class: 'taskManagementViewBtn', - }, - { - type: 'icon', - icon: 'delete', - color: 'warn', - click: (rowData: WorkOrderCaseModel) => this.onOpenDeleteModal(rowData), - tooltip: this.translateService.stream('Delete task'), - class: 'taskManagementDeleteTaskBtn', - }, - ] }, ]; diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.html index 4e123f1f7..32ce3322e 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.html +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.html @@ -1,7 +1,7 @@ + +
+ + + + + + +
+
+ diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.ts b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.ts index 4b84e4871..3dd01e98f 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.ts +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.ts @@ -70,26 +70,6 @@ export class TaskTrackerTableComponent implements OnInit, OnChanges { // actions column with custom buttons {header: this.translateService.stream('Actions'), field: 'actions', sortable: false, width: '100px', pinned: 'right', - type: 'button', - buttons: [ // action buttons for each row - { - // eslint-disable-next-line max-len - iif: (record: TaskModel) => (record.createdInWizard && !record.taskIsExpired) || (record.taskIsExpired && record.createdInWizard && !record.movedToExpiredFolder), - type: 'icon', - icon: 'edit', - tooltip: this.translateService.stream('Edit'), - click: (record: TaskModel) => this.redirectToCompliance(record), - }, - { - // eslint-disable-next-line max-len - iif: (record: TaskModel) => record.createdInWizard && !record.movedToExpiredFolder, - type: 'icon', - tooltip: this.translateService.stream('Delete Case'), - icon: 'delete', - //color: (record: TaskModel) => this.deleteIconColor(record), // TODO: Uncomment when the logic is implemented - click: (record: TaskModel) => this.onShowDeleteComplianceModal(record), - } - ], }, ]; complianceDeleteComponentAfterClosedSub$: Subscription; From 22324e90f2ece5735c67b3bb0183b46f32f95ff5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 06:00:22 +0000 Subject: [PATCH 3/3] Remove unnecessary 'this' reference in template Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com> --- .../components/area-rules-table/area-rules-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html index 4f894f457..65a4567f7 100644 --- a/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html +++ b/eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html @@ -162,7 +162,7 @@

{{'Chemicals' | translate}}

mat-menu-item id="updateEntityList-t3-{{i}}" class="updateEntityList" - (click)="onShowEditEntityListModal(this.selectedArea.groupId)" + (click)="onShowEditEntityListModal(selectedArea.groupId)" > list {{ 'Edit list of stables for tailbites' | translate }}