Skip to content

Commit a8b531e

Browse files
renemadsenrenemadsen
committed
Merge branch 'stable'
2 parents 4833f3b + e036462 commit a8b531e

File tree

3 files changed

+66
-146
lines changed

3 files changed

+66
-146
lines changed

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

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[pageOnFront]="false"
77
[rowStriped]="false"
88
[showToolbar]="false"
9+
class="time-dashboard"
910
>
1011
</mtx-grid>
1112

@@ -46,19 +47,20 @@
4647
<div>
4748
<div>
4849
<ng-container *ngIf="row['deviceManufacturer'] === 'iOS' ">
49-
<span [matTooltip]="row['deviceModel']" class="neutral-icon">
50+
<span [matTooltip]="row['deviceModel']" class="device-icon">
5051
<mat-icon>phone_iphone</mat-icon>
5152
</span>
5253
</ng-container>
5354
<ng-container *ngIf="row['deviceManufacturer'] !== 'iOS' ">
54-
<span [matTooltip]="row['deviceModel']" class="neutral-icon">
55+
<span [matTooltip]="row['deviceModel']" class="device-icon">
5556
<mat-icon>android</mat-icon>
5657
</span>
5758
</ng-container>
5859
{{row['softwareVersion']}}
5960
<div *ngIf="row['softwareVersionIsValid'] === false">
60-
<span [matTooltip]="'Needs update!' | translate "><mat-icon
61-
color="accent">warning</mat-icon></span>
61+
<span [matTooltip]="'Needs update!' | translate " class="material-symbols-outlined">
62+
<mat-icon class="neutral-icon red-text">error</mat-icon>
63+
</span>
6264
</div>
6365
</div>
6466
</div>
@@ -101,19 +103,20 @@
101103
<div>
102104
<div>
103105
<ng-container *ngIf="row['deviceManufacturer'] === 'iOS' ">
104-
<span [matTooltip]="row['deviceModel']" class="neutral-icon">
106+
<span [matTooltip]="row['deviceModel']" class="device-icon">
105107
<mat-icon>phone_iphone</mat-icon>
106108
</span>
107109
</ng-container>
108110
<ng-container *ngIf="row['deviceManufacturer'] !== 'iOS' ">
109-
<span [matTooltip]="row['deviceModel']" class="neutral-icon">
111+
<span [matTooltip]="row['deviceModel']" class="device-icon">
110112
<mat-icon>android</mat-icon>
111113
</span>
112114
</ng-container>
113115
{{row['softwareVersion']}}
114116
<div *ngIf="row['softwareVersionIsValid'] === false">
115-
<span [matTooltip]="'Needs update!' | translate "><mat-icon
116-
color="accent">warning</mat-icon></span>
117+
<span [matTooltip]="'Needs update!' | translate " class="material-symbols-outlined" >
118+
<mat-icon class="neutral-icon red-text">error</mat-icon>
119+
</span>
117120
</div>
118121
</div>
119122
</div>
@@ -129,28 +132,28 @@
129132
<div class="plan-content">
130133
<!--<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0"> - </div>-->
131134
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0">
132-
<strong class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
135+
<span class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
133136
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
134137
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift1) }} -
135138
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift1) }} /
136139
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift1) }}
137-
</strong>
140+
</span>
138141
</div>
139142

140143
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.plannedEndOfShift1 !== 0 ">
141-
<strong class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
144+
<span class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
142145
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
143146
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift1) }} -
144147
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift1) }} /
145148
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift1) }}
146-
</strong>
149+
</span>
147150
</div>
148151

149152
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.plannedEndOfShift1 === 0 && row.planningPrDayModels[col.field]?.planHours !== 0">
150-
<strong class="{{ getCellTextColor(row, col.field) }}" id="plannedHours{{index}}_{{col.field}}">
153+
<span class="{{ getCellTextColor(row, col.field) }}" id="plannedHours{{index}}_{{col.field}}">
151154
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
152155
{{ convertHoursToTime(row.planningPrDayModels[col.field]?.planHours) }}
153-
</strong>
156+
</span>
154157
</div>
155158

156159
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
@@ -164,12 +167,12 @@
164167
</span>
165168
</div>
166169
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift2 !== 0">
167-
<strong class="{{ getCellTextColor(row, col.field) }}" id="secondShift{{index}}_{{col.field}}">
170+
<span class="{{ getCellTextColor(row, col.field) }}" id="secondShift{{index}}_{{col.field}}">
168171
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
169172
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift2) }} -
170173
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift2) }} /
171174
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift2) }}
172-
</strong>
175+
</span>
173176
</div>
174177
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
175178
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift" id="secondShiftActual{{index}}_{{col.field}}">
@@ -183,12 +186,12 @@
183186
</div>
184187

185188
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift3 !== 0">
186-
<strong class="{{ getCellTextColor(row, col.field) }}" id="thirdShift{{index}}_{{col.field}}">
189+
<span class="{{ getCellTextColor(row, col.field) }}" id="thirdShift{{index}}_{{col.field}}">
187190
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
188191
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift3) }} -
189192
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift3) }} /
190193
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift3) }}
191-
</strong>
194+
</span>
192195
</div>
193196
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
194197
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift && row.planningPrDayModels[col.field]?.start3StartedAt != null" id="thirdShiftActual{{index}}_{{col.field}}">
@@ -202,12 +205,12 @@
202205
</div>
203206

204207
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift4 !== 0">
205-
<strong class="{{ getCellTextColor(row, col.field) }}" id="fourthShift{{index}}_{{col.field}}">
208+
<span class="{{ getCellTextColor(row, col.field) }}" id="fourthShift{{index}}_{{col.field}}">
206209
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
207210
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift4) }} -
208211
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift4) }} /
209212
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift4) }}
210-
</strong>
213+
</span>
211214
</div>
212215
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
213216
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift && row.planningPrDayModels[col.field]?.start4StartedAt != null" id="fourthShiftActual{{index}}_{{col.field}}">
@@ -221,12 +224,12 @@
221224
</div>
222225

223226
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift5 !== 0">
224-
<strong class="{{ getCellTextColor(row, col.field) }}" id="fifthShift{{index}}_{{col.field}}">
227+
<span class="{{ getCellTextColor(row, col.field) }}" id="fifthShift{{index}}_{{col.field}}">
225228
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
226229
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift5) }} -
227230
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift5) }} /
228231
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift5) }}
229-
</strong>
232+
</span>
230233
</div>
231234
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
232235
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift && row.planningPrDayModels[col.field]?.start5StartedAt != null" id="fifthShiftActual{{index}}_{{col.field}}">
@@ -242,7 +245,7 @@
242245
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
243246
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
244247
<div class="{{ getCellTextColor(row, col.field) }}">
245-
<strong id="totalBreakTime{{index}}_{{col.field}}" [matTooltip]="'Total breaktime' | translate "><mat-icon class="neutral-icon">pause</mat-icon>{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.pauseMinutes) }}</strong>
248+
<span id="totalBreakTime{{index}}_{{col.field}}" [matTooltip]="'Total breaktime' | translate "><mat-icon class="neutral-icon">pause</mat-icon>{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.pauseMinutes) }}</span>
246249
</div>
247250
</div>
248251
</ng-container>
@@ -251,14 +254,14 @@
251254
<ng-container *ngIf="!row.planningPrDayModels[col.field]?.nettoHoursOverrideActive">
252255
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
253256
<div class="{{ getCellTextColor(row, col.field) }}">
254-
<strong id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'Total working hours' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.actualHours.toFixed(2) }}</strong>
257+
<span id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'Total working hours' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.actualHours.toFixed(2) }}</span>
255258
</div>
256259
</div>
257260
</ng-container>
258261
<ng-container *ngIf="row.planningPrDayModels[col.field]?.nettoHoursOverrideActive">
259262
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.nettoHoursOverride !== 0">
260263
<div class="{{ getCellTextColor(row, col.field) }}">
261-
<strong id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'NettoHours override' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.nettoHoursOverride.toFixed(2) }}</strong>
264+
<span id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'NettoHours override' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.nettoHoursOverride.toFixed(2) }}</span>
262265
</div>
263266
</div>
264267
</ng-container>
@@ -267,33 +270,33 @@
267270
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
268271
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.paidOutFlex !== 0">
269272
<div class="{{ getCellTextColor(row, col.field) }}">
270-
<strong id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'PaidOutFlex' | translate "><mat-icon class="neutral-icon">payments</mat-icon>{{ row.planningPrDayModels[col.field]?.paidOutFlex }}</strong>
273+
<span id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'PaidOutFlex' | translate "><mat-icon class="neutral-icon">payments</mat-icon>{{ row.planningPrDayModels[col.field]?.paidOutFlex }}</span>
271274
</div>
272275
</div>
273276
</ng-container>
274277

275278
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
276279
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
277280
<div class="{{ getCellTextColor(row, col.field) }}">
278-
<strong id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'Flex balance to date' | translate "><mat-icon class="neutral-icon">swap_vert</mat-icon>{{ row.planningPrDayModels[col.field]?.sumFlexEnd.toFixed(2) }}</strong>
281+
<span id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'Flex balance to date' | translate "><mat-icon class="neutral-icon">swap_vert</mat-icon>{{ row.planningPrDayModels[col.field]?.sumFlexEnd.toFixed(2) }}</span>
279282
</div>
280283
</div>
281284
</ng-container>
282285
<div class="comment" *ngIf="row.planningPrDayModels[col.field]?.workerComment !== null && row.planningPrDayModels[col.field]?.workerComment !== ''">
283286
<div class="{{ getCellTextColor(row, col.field) }}">
284-
<strong id="commentWorker{{index}}_{{col.field}}" [matTooltip]="'CommentWorker' | translate "><mat-icon class="neutral-icon">face</mat-icon></strong>
287+
<span id="commentWorker{{index}}_{{col.field}}" [matTooltip]="'CommentWorker' | translate "><mat-icon class="neutral-icon">face</mat-icon></span>
285288
{{row.planningPrDayModels[col.field]?.workerComment}}
286289
</div>
287290
</div>
288291
<div class="comment" *ngIf="row.planningPrDayModels[col.field]?.commentOffice !== null && row.planningPrDayModels[col.field]?.commentOffice !== ''">
289292
<div class="{{ getCellTextColor(row, col.field) }}">
290-
<strong id="commentOffice{{index}}_{{col.field}}"><mat-icon class="neutral-icon" [matTooltip]="'CommentOffice' | translate ">gite</mat-icon></strong>
293+
<span id="commentOffice{{index}}_{{col.field}}"><mat-icon class="neutral-icon" [matTooltip]="'CommentOffice' | translate ">gite</mat-icon></span>
291294
{{row.planningPrDayModels[col.field]?.commentOffice}}
292295
</div>
293296
</div>
294297
<div class="plan-text" *ngIf="selectCurrentUserIsFirstUser$ | async">
295298
<div class="{{ getCellTextColor(row, col.field) }}">
296-
<small>
299+
<small class="grey-text">
297300
(id: {{ row.planningPrDayModels[col.field]?.id }})
298301
</small>
299302
</div>
@@ -302,12 +305,12 @@
302305

303306
<!-- Right Icons -->
304307
<div class="plan-icons">
305-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">flight</mat-icon>
306-
<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>
307-
<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>
308-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 4" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">school</mat-icon>
309-
<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>
310-
<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>
308+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">flight</mat-icon>
309+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 3 || row.planningPrDayModels[col.field]?.message === 7 || row.planningPrDayModels[col.field]?.message === 8" class="red-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">sick</mat-icon>
310+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 1" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">event_busy</mat-icon>
311+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 4" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">school</mat-icon>
312+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 5" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">event_busy</mat-icon>
313+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 9" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">outdoor_grill</mat-icon>
311314
</div>
312315
</div>
313316
</ng-template>

0 commit comments

Comments
 (0)