Skip to content

Commit 54f09f8

Browse files
renemadsenrenemadsen
committed
Better visual design.
1 parent d1fbecf commit 54f09f8

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,28 +130,28 @@
130130
<div class="plan-content">
131131
<!--<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0"> - </div>-->
132132
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0">
133-
<strong class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
133+
<span class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
134134
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
135135
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift1) }} -
136136
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift1) }} /
137137
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift1) }}
138-
</strong>
138+
</span>
139139
</div>
140140

141141
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.plannedEndOfShift1 !== 0 ">
142-
<strong class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
142+
<span class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
143143
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
144144
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift1) }} -
145145
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift1) }} /
146146
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift1) }}
147-
</strong>
147+
</span>
148148
</div>
149149

150150
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.plannedEndOfShift1 === 0 && row.planningPrDayModels[col.field]?.planHours !== 0">
151-
<strong class="{{ getCellTextColor(row, col.field) }}" id="plannedHours{{index}}_{{col.field}}">
151+
<span class="{{ getCellTextColor(row, col.field) }}" id="plannedHours{{index}}_{{col.field}}">
152152
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
153153
{{ convertHoursToTime(row.planningPrDayModels[col.field]?.planHours) }}
154-
</strong>
154+
</span>
155155
</div>
156156

157157
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
@@ -165,12 +165,12 @@
165165
</span>
166166
</div>
167167
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift2 !== 0">
168-
<strong class="{{ getCellTextColor(row, col.field) }}" id="secondShift{{index}}_{{col.field}}">
168+
<span class="{{ getCellTextColor(row, col.field) }}" id="secondShift{{index}}_{{col.field}}">
169169
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
170170
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift2) }} -
171171
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift2) }} /
172172
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift2) }}
173-
</strong>
173+
</span>
174174
</div>
175175
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
176176
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift" id="secondShiftActual{{index}}_{{col.field}}">
@@ -184,12 +184,12 @@
184184
</div>
185185

186186
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift3 !== 0">
187-
<strong class="{{ getCellTextColor(row, col.field) }}" id="thirdShift{{index}}_{{col.field}}">
187+
<span class="{{ getCellTextColor(row, col.field) }}" id="thirdShift{{index}}_{{col.field}}">
188188
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
189189
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift3) }} -
190190
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift3) }} /
191191
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift3) }}
192-
</strong>
192+
</span>
193193
</div>
194194
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
195195
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift && row.planningPrDayModels[col.field]?.start3StartedAt != null" id="thirdShiftActual{{index}}_{{col.field}}">
@@ -203,12 +203,12 @@
203203
</div>
204204

205205
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift4 !== 0">
206-
<strong class="{{ getCellTextColor(row, col.field) }}" id="fourthShift{{index}}_{{col.field}}">
206+
<span class="{{ getCellTextColor(row, col.field) }}" id="fourthShift{{index}}_{{col.field}}">
207207
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
208208
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift4) }} -
209209
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift4) }} /
210210
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift4) }}
211-
</strong>
211+
</span>
212212
</div>
213213
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
214214
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift && row.planningPrDayModels[col.field]?.start4StartedAt != null" id="fourthShiftActual{{index}}_{{col.field}}">
@@ -222,12 +222,12 @@
222222
</div>
223223

224224
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift5 !== 0">
225-
<strong class="{{ getCellTextColor(row, col.field) }}" id="fifthShift{{index}}_{{col.field}}">
225+
<span class="{{ getCellTextColor(row, col.field) }}" id="fifthShift{{index}}_{{col.field}}">
226226
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
227227
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift5) }} -
228228
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift5) }} /
229229
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift5) }}
230-
</strong>
230+
</span>
231231
</div>
232232
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
233233
*ngIf="row.planningPrDayModels[col.field]?.isDoubleShift && row.planningPrDayModels[col.field]?.start5StartedAt != null" id="fifthShiftActual{{index}}_{{col.field}}">
@@ -282,13 +282,13 @@
282282
</ng-container>
283283
<div class="comment" *ngIf="row.planningPrDayModels[col.field]?.workerComment !== null && row.planningPrDayModels[col.field]?.workerComment !== ''">
284284
<div class="{{ getCellTextColor(row, col.field) }}">
285-
<strong id="commentWorker{{index}}_{{col.field}}" [matTooltip]="'CommentWorker' | translate "><mat-icon class="neutral-icon">face</mat-icon></strong>
285+
<span id="commentWorker{{index}}_{{col.field}}" [matTooltip]="'CommentWorker' | translate "><mat-icon class="neutral-icon">face</mat-icon></span>
286286
{{row.planningPrDayModels[col.field]?.workerComment}}
287287
</div>
288288
</div>
289289
<div class="comment" *ngIf="row.planningPrDayModels[col.field]?.commentOffice !== null && row.planningPrDayModels[col.field]?.commentOffice !== ''">
290290
<div class="{{ getCellTextColor(row, col.field) }}">
291-
<strong id="commentOffice{{index}}_{{col.field}}"><mat-icon class="neutral-icon" [matTooltip]="'CommentOffice' | translate ">gite</mat-icon></strong>
291+
<span id="commentOffice{{index}}_{{col.field}}"><mat-icon class="neutral-icon" [matTooltip]="'CommentOffice' | translate ">gite</mat-icon></span>
292292
{{row.planningPrDayModels[col.field]?.commentOffice}}
293293
</div>
294294
</div>
@@ -303,12 +303,12 @@
303303

304304
<!-- Right Icons -->
305305
<div class="plan-icons">
306-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">flight</mat-icon>
307-
<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>
308-
<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>
309-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 4" class="blue-text" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">school</mat-icon>
310-
<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>
311-
<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>
306+
<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>
307+
<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>
308+
<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>
309+
<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>
310+
<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>
311+
<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>
312312
</div>
313313
</div>
314314
</ng-template>

0 commit comments

Comments
 (0)