Skip to content

Commit 161a714

Browse files
renemadsenrenemadsen
committed
Fixing button styling and location.
1 parent 88902b2 commit 161a714

File tree

4 files changed

+67
-48
lines changed

4 files changed

+67
-48
lines changed

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -587,16 +587,17 @@
587587
</mat-tab-group>
588588
</div>
589589
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
590-
<button mat-raised-button mat-dialog-close
591-
id="cancelButton">
592-
{{ 'Cancel' | translate }}
593-
</button>
594590
<button
595-
mat-raised-button
596-
color="accent"
591+
class="btn-primary btn-primary--icon-left"
597592
id="saveButton"
598593
(click)="updateAssignedSite()"
599594
[mat-dialog-close]="data">
600-
{{ 'Save' | translate }}
595+
<span>{{ 'Save' | translate }}</span>
596+
</button>
597+
<button
598+
class="btn-cancel"
599+
mat-dialog-close
600+
id="cancelButton">
601+
{{ 'Cancel' | translate }}
601602
</button>
602603
</div>

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/download-excel/download-excel-dialog.component.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@
2727
</div>
2828
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
2929

30-
<div class="d-flex align-items-center mr-2 ml-2" *ngIf="siteId && dateFrom && dateTo">
30+
<div class="d-flex align-items-center mr-2 ml-2">
3131
<button
32-
mat-raised-button
33-
id="workingHoursExcel"
34-
(click)="onDownloadExcelReport()"
35-
color="accent"
36-
[matTooltip]="'Download Excel' | translate">
37-
{{ 'Download Excel' | translate }}
32+
class="btn-cancel"
33+
mat-dialog-close
34+
id="cancelButton">
35+
{{ 'Cancel' | translate }}
3836
</button>
3937
</div>
4038

4139
<div class="d-flex align-items-center mr-2 ml-2" *ngIf="!siteId && dateFrom && dateTo">
4240
<button
43-
mat-raised-button
41+
class="btn-primary btn-primary--icon-left"
4442
id="workingHoursExcelAllWorkers"
4543
(click)="onDownloadExcelReportAllWorkers()"
46-
color="accent"
4744
[matTooltip]="'Download Excel (all workers)' | translate">
4845
{{ 'Download Excel (all workers)' | translate }}
4946
</button>
5047
</div>
51-
<div class="d-flex align-items-center mr-2 ml-2">
52-
<button mat-raised-button mat-dialog-close
53-
id="cancelButton">
54-
{{ 'Cancel' | translate }}
48+
<div class="d-flex align-items-center mr-2 ml-2" *ngIf="siteId && dateFrom && dateTo">
49+
<button
50+
class="btn-primary btn-primary--icon-left"
51+
id="workingHoursExcel"
52+
(click)="onDownloadExcelReport()"
53+
[matTooltip]="'Download Excel' | translate">
54+
{{ 'Download Excel' | translate }}
5555
</button>
5656
</div>
5757
</div>

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/workday-entity/workday-entity-dialog.component.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,21 +1024,20 @@
10241024

10251025
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
10261026
<button
1027-
mat-raised-button
1027+
class="btn-cancel"
10281028
mat-dialog-close
10291029
id="cancelButton"
10301030
(click)="onCancel()">
10311031
{{ 'Cancel' | translate }}
10321032
</button>
10331033

10341034
<button
1035+
class="btn-primary btn-primary--icon-left"
10351036
id="saveButton"
1036-
mat-raised-button
1037-
color="accent"
10381037
(click)="onUpdateWorkDayEntity()"
10391038
[disabled]="workdayForm.invalid"
10401039
[mat-dialog-close]="data">
1041-
{{ 'Save' | translate }}
1040+
<span>{{ 'Save' | translate }}</span>
10421041
</button>
10431042
</div>
10441043
</form>

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

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
<eform-new-subheader [title]="'Dashboard'"></eform-new-subheader>
22
<div style="display: flex; align-items: center; justify-content: center; gap: 20px;">
3-
<button id="backwards" mat-raised-button color="primary" (click)="goBackward()">{{ 'Back' | translate }}</button>
43
<!-- <span>{{ formatDateRange() }}</span>-->
5-
<mat-form-field id="workingHoursRange">
6-
<mat-label>{{ 'Date range' | translate }}</mat-label>
7-
<mat-datepicker-toggle matPrefix [for]="picker"></mat-datepicker-toggle>
8-
<mat-date-range-input [rangePicker]="picker" (click)="picker.open()">
9-
<input [value]="dateFrom" (dateChange)="updateDateFrom($event)" matStartDate class="workingHoursRange">
10-
<input [value]="dateTo" (dateChange)="updateDateTo($event)" matEndDate class="workingHoursRange">
11-
</mat-date-range-input>
12-
<mat-date-range-picker #picker></mat-date-range-picker>
13-
</mat-form-field>
144
<!-- <mat-form-field appearance="fill">-->
155
<!-- <input matInput [matDatepicker]="picker" [(ngModel)]="selectedDate" (dateChange)="updateSelectedDate()">-->
166
<!-- <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>-->
177
<!-- <mat-datepicker touchUi #picker></mat-datepicker>-->
188
<!-- </mat-form-field>-->
19-
<button id="forwards" mat-raised-button color="primary" (click)="goForward()">{{ 'Forward' | translate }}</button>
20-
21-
<button id="backwards" mat-raised-button color="primary" (click)="openDownloadExcelDialog()">{{ 'Download Excel' | translate }}</button>
9+
<mat-slide-toggle
10+
color="primary"
11+
class="mb-2"
12+
id="showCalculationsAsNumberToggle"
13+
[checked]="showResignedSites"
14+
[(ngModel)]="showResignedSites"
15+
(change)="onShowResignedSitesChanged($event)"
16+
>
17+
{{ 'Show resigned' | translate }}
18+
</mat-slide-toggle>
2219
<mat-form-field style="flex: 0 0 25%; min-width: 150px;">
2320
<mat-label>{{ 'Worker' | translate }}</mat-label>
2421
<mtx-select
@@ -30,20 +27,42 @@
3027
id="workingHoursSite">
3128
</mtx-select>
3229
</mat-form-field>
33-
<mat-slide-toggle
34-
color="primary"
35-
class="mb-2"
36-
id="showCalculationsAsNumberToggle"
37-
[checked]="showResignedSites"
38-
[(ngModel)]="showResignedSites"
39-
(change)="onShowResignedSitesChanged($event)"
30+
<button
31+
id="backwards"
32+
class="btn-secondary btn-secondary--icon-rounded-border"
33+
(click)="goBackward()"
34+
matTooltip="{{ 'Back' | translate }}"
4035
>
41-
{{ 'Show resigned' | translate }}
42-
</mat-slide-toggle>
36+
<mat-icon>first_page</mat-icon>
37+
</button>
38+
<button
39+
id="forwards"
40+
class="btn-secondary btn-secondary--icon-rounded-border"
41+
(click)="goForward()"
42+
matTooltip="{{ 'Forward' | translate }}"
43+
>
44+
<mat-icon>last_page</mat-icon>
45+
</button>
46+
47+
<mat-form-field id="workingHoursRange">
48+
<mat-label>{{ 'Date range' | translate }}</mat-label>
49+
<mat-datepicker-toggle matPrefix [for]="picker"></mat-datepicker-toggle>
50+
<mat-date-range-input [rangePicker]="picker" (click)="picker.open()">
51+
<input [value]="dateFrom" (dateChange)="updateDateFrom($event)" matStartDate class="workingHoursRange">
52+
<input [value]="dateTo" (dateChange)="updateDateTo($event)" matEndDate class="workingHoursRange">
53+
</mat-date-range-input>
54+
<mat-date-range-picker #picker></mat-date-range-picker>
55+
</mat-form-field>
56+
<button
57+
id="backwards"
58+
class="btn-secondary btn-secondary--icon-rounded-border"
59+
(click)="openDownloadExcelDialog()"
60+
matTooltip="{{ 'Download Excel' | translate }}">
61+
<mat-icon svgIcon="file-excel"></mat-icon>
62+
</button>
4363
<button
44-
mat-icon-button
64+
class="btn-secondary btn-secondary--icon-rounded-border"
4565
id="workingHoursReload"
46-
color="accent"
4766
[matTooltip]="'Reload table' | translate"
4867
(click)="getPlannings()"
4968
>

0 commit comments

Comments
 (0)