Skip to content

Commit b5f666d

Browse files
committed
Improved tooltip
1 parent 009cdeb commit b5f666d

29 files changed

Lines changed: 65 additions & 34 deletions

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</strong>
5959
</div>
6060
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.planHours !== 0">
61-
<strong class="{{ getCellTextColor(row, col.field) }}">
61+
<strong class="{{ getCellTextColor(row, col.field) }}" [matTooltip]="'PlannedHours' | translate ">
6262
{{ convertHoursToTime(row.planningPrDayModels[col.field]?.planHours) }}
6363
</strong>
6464
</div>
@@ -100,12 +100,12 @@
100100

101101
<!-- Right Icons -->
102102
<div class="plan-icons">
103-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2" class="blue-text">flight</mat-icon>
104-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 3 || row.planningPrDayModels[col.field]?.message === 7 || row.planningPrDayModels[col.field]?.message === 8" class="red-text">sick</mat-icon>
105-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 1" class="blue-text">event_busy</mat-icon>
106-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 4" class="blue-text">school</mat-icon>
107-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 5" class="blue-text">event_busy</mat-icon>
108-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 9" class="blue-text">outdoor_grill</mat-icon>
103+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">flight</mat-icon>
104+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 3 || row.planningPrDayModels[col.field]?.message === 7 || row.planningPrDayModels[col.field]?.message === 8" class="red-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">sick</mat-icon>
105+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 1" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">event_busy</mat-icon>
106+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 4" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">school</mat-icon>
107+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 5" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">event_busy</mat-icon>
108+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 9" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">outdoor_grill</mat-icon>
109109
</div>
110110
</div>
111111
</ng-template>

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import {
55
import {AssignedSiteModel, TimePlanningModel} from '../../../models';
66
import {MtxGridColumn} from '@ng-matero/extensions/grid';
77
import {TranslateService} from '@ngx-translate/core';
8-
import {TimePlanningPnSettingsService} from 'src/app/plugins/modules/time-planning-pn/services';
8+
import {TimePlanningPnSettingsService} from '../../../services';
99
import {MatDialog} from '@angular/material/dialog';
1010
import {AssignedSiteDialogComponent, WorkdayEntityDialogComponent} from '../';
1111
import {DatePipe} from '@angular/common';
1212
import * as R from 'ramda';
13+
import {TimePlanningMessagesEnum} from '../../../enums';
1314

1415
@Component({
1516
selector: 'app-time-plannings-table',
@@ -27,6 +28,7 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
2728
@Output() assignedSiteChanged: EventEmitter<AssignedSiteModel> = new EventEmitter<AssignedSiteModel>();
2829
@Output() sortChanged: EventEmitter<string> = new EventEmitter<string>();
2930
tableHeaders: MtxGridColumn[] = [];
31+
enumKeys: string[];
3032

3133
@ViewChild('firstColumnTemplate', {static: true}) firstColumnTemplate!: TemplateRef<any>;
3234
@ViewChild('dayColumnTemplate', {static: true}) dayColumnTemplate!: TemplateRef<any>;
@@ -41,6 +43,7 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
4143
}
4244

4345
ngOnInit(): void {
46+
this.enumKeys = Object.keys(TimePlanningMessagesEnum).filter(key => isNaN(Number(key)));
4447
this.updateTableHeaders();
4548
}
4649

eform-client/src/app/plugins/modules/time-planning-pn/i18n/bgBG.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ export const bgBG = {
9595
TimeOff: 'Свободно време',
9696
Shift: 'Shift',
9797
Registered: 'Регистриран',
98+
PlannedHours: 'Планирани часове',
9899
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/csCZ.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ export const csCZ = {
9595
TimeOff: 'Volno',
9696
Shift: 'Posun',
9797
Registered: 'Registrovaný',
98+
PlannedHours: 'Plánované hodiny',
9899
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/da.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@ export const da = {
9393
TimeOff: 'Ferie fridag',
9494
Shift: 'Skift',
9595
Registered: 'Registreret',
96+
PlannedHours: 'Planlagte timer',
9697
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/deDE.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ export const deDE = {
9595
TimeOff: 'Auszeit',
9696
Shift: 'Schicht',
9797
Registered: 'Eingetragen',
98+
PlannedHours: 'Geplante Stunden',
9899
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/elGR.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ export const elGR = {
9595
TimeOff: 'Ρεπό',
9696
Shift: 'Αλλαγή',
9797
Registered: 'Εγγεγραμμένος',
98+
PlannedHours: 'Προγραμματισμένες ώρες',
9899
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/enUS.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,6 @@ export const enUS = {
9292
'Flex balance to date': 'Flex balance to date',
9393
'TimeOff': 'Time off',
9494
'Shift': 'Shift',
95-
'Registered': 'Registered'
95+
'Registered': 'Registered',
96+
'PlannedHours': 'Planned hours',
9697
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/esES.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ export const esES = {
9595
TimeOff: 'Tiempo libre',
9696
Shift: 'Cambio',
9797
Registered: 'Registrado',
98+
PlannedHours: 'Horas planificadas',
9899
};

eform-client/src/app/plugins/modules/time-planning-pn/i18n/etET.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ export const etET = {
9595
TimeOff: 'Vaba aeg',
9696
Shift: 'Shift',
9797
Registered: 'Registreeritud',
98+
PlannedHours: 'Planeeritud tunnid',
9899
};

0 commit comments

Comments
 (0)