Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/dotnet-core-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ jobs:
run: |
cp -av eform-angular-timeplanning-plugin/eform-client/src/app/plugins/modules/time-planning-pn eform-angular-frontend/eform-client/src/app/plugins/modules/time-planning-pn
cd eform-angular-frontend/eform-client && ../../eform-angular-timeplanning-plugin/testinginstallpn.sh
- name: Button conventions
# The checker lives in the frontend repo (checked out above); these
# templates are ours. A frontend CI run cannot see them because
# src/app/plugins/ is gitignored there, so this plugin has to run it.
run: cd eform-angular-frontend/eform-client && node scripts/check-button-conventions.js src/app/plugins/modules/time-planning-pn
- name: Copy Dockerfile
run: cp eform-angular-timeplanning-plugin/Dockerfile .
- name: Build the tagged Docker image
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/dotnet-core-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
run: |
cp -av eform-angular-timeplanning-plugin/eform-client/src/app/plugins/modules/time-planning-pn eform-angular-frontend/eform-client/src/app/plugins/modules/time-planning-pn
cd eform-angular-frontend/eform-client && ../../eform-angular-timeplanning-plugin/testinginstallpn.sh
- name: Button conventions
# The checker lives in the frontend repo (checked out above); these
# templates are ours. A frontend CI run cannot see them because
# src/app/plugins/ is gitignored there, so this plugin has to run it.
run: cd eform-angular-frontend/eform-client && node scripts/check-button-conventions.js src/app/plugins/modules/time-planning-pn
- name: Copy Dockerfile
run: cp eform-angular-timeplanning-plugin/Dockerfile .
- name: Build the tagged Docker image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@ <h3 mat-dialog-title>{{ 'Approve Absence Request' | translate }}</h3>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="primary"
class="btn-primary"
id="saveApproveBtn"
(click)="approve()"
>
{{ 'Approve' | translate }}
</button>
<button
mat-raised-button
class="btn-cancel"
id="cancelApproveBtn"
(click)="hide()"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@ <h3 mat-dialog-title>{{ 'Reject Absence Request' | translate }}</h3>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="warn"
class="btn-primary"
id="saveRejectBtn"
(click)="reject()"
>
{{ 'Reject' | translate }}
</button>
<button
mat-raised-button
class="btn-cancel"
id="cancelRejectBtn"
(click)="hide()"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@ <h3 mat-dialog-title>{{'Create Break Policy' | translate}}</h3>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="primary"
class="btn-primary"
id="saveCreateBtn"
(click)="createBreakPolicy()"
[disabled]="breakPolicyForm.invalid"
>
{{'Create' | translate}}
</button>
<button
mat-raised-button
class="btn-cancel"
id="cancelCreateBtn"
(click)="hide()"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete' | translate}}?</h3>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="warn"
class="btn-delete"
id="saveDeleteBtn"
(click)="deleteSingle()"
>
{{'Delete' | translate}}
</button>
<button
mat-raised-button
class="btn-cancel"
id="cancelDeleteBtn"
(click)="hide()"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ <h2 mat-dialog-title>{{ dialogTitle | translate }}</h2>
</mat-dialog-content>

<mat-dialog-actions align="end">
<button mat-button
<button class="btn-cancel"
(click)="onCancel()"
id="cancelBtn">
{{ 'Cancel' | translate }}
</button>
<button mat-raised-button
color="primary"
<button class="btn-primary"
(click)="onSave()"
[disabled]="!ruleForm.valid"
id="saveBtn">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ <h3 mat-dialog-title>{{ 'Edit comment office all' | translate }}</h3>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="accent"
class="btn-primary"
(click)="onUpdateFlexPlanning()"
id="flexesCommentOfficeAllEditSaveBtn"
>
{{'Save' | translate}}
</button>
<button
mat-raised-button
class="btn-cancel"
(click)="hide()"
id="flexesCommentOfficeAllEditSaveCancelBtn"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ <h1 class="text-danger">{{'WARNING' | translate}}!</h1>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="warn"
class="btn-primary"
(click)="requestOtp()"
>
{{'OK' | translate}}
</button>
<button
mat-raised-button
class="btn-cancel"
(click)="hide()"
>
{{'Cancel' | translate}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ <h3 mat-dialog-title>{{ 'Edit comment office all' | translate }}</h3>
</div>
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
<button
mat-raised-button
color="accent"
class="btn-primary"
(click)="save()"
id="flexesCommentOfficeAllEditSaveBtn"
>
{{'Save' | translate}}
</button>
<button
mat-raised-button
class="btn-cancel"
(click)="hide()"
id="flexesCommentOfficeAllEditSaveCancelBtn"
>
Expand Down
Loading