Skip to content

Commit 3600484

Browse files
committed
Improving some more styling.
1 parent 91fc95c commit 3600484

File tree

3 files changed

+78
-23
lines changed

3 files changed

+78
-23
lines changed

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.html

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<mtx-grid
33
[data]="workOrderCases"
44
[columns]="tableHeaders"
5+
[cellTemplate]="{propertyName: propertyNameTpl, createdByName: createdByNameTpl, lastAssignedTo: lastAssignedToTpl, lastUpdatedBy: lastUpdatedByTpl, priority: priorityTpl, status: statusTpl}"
56
[showPaginator]="false"
67
[pageOnFront]="false"
78
[rowStriped]="true"
@@ -16,3 +17,41 @@
1617
</mtx-grid>
1718

1819
</div>
20+
21+
22+
23+
<ng-template #propertyNameTpl let-row>
24+
<!-- <mat-chip color="primary">-->
25+
<span>{{row.propertyName}}</span>
26+
<!-- </mat-chip>-->
27+
</ng-template>
28+
29+
<ng-template #createdByNameTpl let-row>
30+
<!-- <mat-chip color="primary">-->
31+
<div>{{row.createdByName}}</div>
32+
<!-- </mat-chip>-->
33+
</ng-template>
34+
35+
<ng-template #lastAssignedToTpl let-row>
36+
<!-- <mat-chip color="primary">-->
37+
<div>{{row.lastAssignedTo}}</div>
38+
<!-- </mat-chip>-->
39+
</ng-template>
40+
41+
<ng-template #lastUpdatedByTpl let-row>
42+
<!-- <mat-chip color="primary">-->
43+
<div>{{row.lastUpdatedBy}}</div>
44+
<!-- </mat-chip>-->
45+
</ng-template>
46+
47+
<ng-template #priorityTpl let-row>
48+
<mat-chip color="primary" [ngClass]="getPriorityClass(row.priority)">
49+
<div>{{TaskManagementPrioritiesEnum[row.priority] | translate}}</div>
50+
</mat-chip>
51+
</ng-template>
52+
53+
<ng-template #statusTpl let-row>
54+
<mat-chip color="primary">
55+
<div>{{row.status | translate}}</div>
56+
</mat-chip>
57+
</ng-template>

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,14 @@ export class TaskManagementTableComponent implements OnInit {
6565
sortProp: {id: 'Priority'},
6666
sortable: true,
6767
class: 'priority',
68-
formatter: (rowData: WorkOrderCaseModel) => this.translateService.instant(TaskManagementPrioritiesEnum[rowData.priority])},
68+
// formatter: (rowData: WorkOrderCaseModel) => this.translateService.instant(TaskManagementPrioritiesEnum[rowData.priority])
69+
},
6970
{
7071
header: this.translateService.stream('Status'),
7172
field: 'status',
7273
sortProp: {id: 'CaseStatusesEnum'},
7374
sortable: true,
74-
formatter: (rowData: WorkOrderCaseModel) => `<span>${this.translateService.instant(rowData.status)}</span>`,
75+
// formatter: (rowData: WorkOrderCaseModel) => `<span>${this.translateService.instant(rowData.status)}</span>`,
7576
class: 'status'
7677
},
7778
{
@@ -130,4 +131,17 @@ export class TaskManagementTableComponent implements OnInit {
130131
onOpenDeleteModal(workOrderCaseModel: WorkOrderCaseModel) {
131132
this.openDeleteModal.emit(workOrderCaseModel);
132133
}
134+
135+
protected readonly TaskManagementPrioritiesEnum = TaskManagementPrioritiesEnum;
136+
137+
priorityClassMap = {
138+
[TaskManagementPrioritiesEnum.Urgent]: 'priority-urgent',
139+
[TaskManagementPrioritiesEnum.High]: 'priority-high',
140+
[TaskManagementPrioritiesEnum.Medium]: 'priority-medium',
141+
[TaskManagementPrioritiesEnum.Low]: 'priority-low',
142+
};
143+
144+
getPriorityClass(priority: number): string {
145+
return this.priorityClassMap[priority] || '';
146+
}
133147
}

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/task-management.module.ts

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {MatDialogModule} from '@angular/material/dialog';
2424
import {MatCardModule} from '@angular/material/card';
2525
import {MatDatepickerModule} from '@angular/material/datepicker';
2626
import {StatisticsModule} from '../statistics/statistics.module';
27+
import {MatChip} from "@angular/material/chips";
2728

2829
@NgModule({
2930
declarations: [
@@ -33,27 +34,28 @@ import {StatisticsModule} from '../statistics/statistics.module';
3334
TaskManagementCreateShowModalComponent,
3435
TaskManagementDeleteModalComponent
3536
],
36-
imports: [
37-
CommonModule,
38-
TranslateModule,
39-
RouterModule,
40-
TaskManagementRouting,
41-
EformSharedModule,
42-
ReactiveFormsModule,
43-
EformImportedModule,
44-
FormsModule,
45-
MatButtonModule,
46-
MatTooltipModule,
47-
MatIconModule,
48-
MatFormFieldModule,
49-
MtxSelectModule,
50-
MatInputModule,
51-
MtxGridModule,
52-
MatDialogModule,
53-
MatCardModule,
54-
MatDatepickerModule,
55-
StatisticsModule,
56-
],
37+
imports: [
38+
CommonModule,
39+
TranslateModule,
40+
RouterModule,
41+
TaskManagementRouting,
42+
EformSharedModule,
43+
ReactiveFormsModule,
44+
EformImportedModule,
45+
FormsModule,
46+
MatButtonModule,
47+
MatTooltipModule,
48+
MatIconModule,
49+
MatFormFieldModule,
50+
MtxSelectModule,
51+
MatInputModule,
52+
MtxGridModule,
53+
MatDialogModule,
54+
MatCardModule,
55+
MatDatepickerModule,
56+
StatisticsModule,
57+
MatChip,
58+
],
5759
providers: [],
5860
})
5961
export class TaskManagementModule {

0 commit comments

Comments
 (0)