From e3cdfa31ebf5cffe653ecb8a7caf2289e35995d0 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 20 Feb 2020 09:47:03 +0300 Subject: [PATCH] finish submit absence request --- .../submit-absence-modal.component.html | 2 +- .../submit-absence.component.html | 33 +++++++++---------- .../submit-absence.component.scss | 16 +++++++++ .../view-attachments.component.html | 2 +- .../view-attachments.component.scss | 3 ++ .../work-list-attach-view.component.html | 2 +- .../work-list-attach-view.component.scss | 3 ++ 7 files changed, 41 insertions(+), 20 deletions(-) diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html index 9eb85a34..917ed98c 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html @@ -22,7 +22,7 @@ - + Are you sure you want to submit {{ts.trPK('general','ok')}} diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index 19fd2200..e1a10ef5 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -1,5 +1,5 @@ - + {{ts.trPK('submitAbsence','submitAbsence')}} @@ -8,37 +8,36 @@ - - {{ts.trPK('submitAbsence','absenceType')}} + + {{ts.trPK('submitAbsence','absenceType')}} {{item.ABSENCE_ATTENDANCE_TYPE_NAME}} - - {{ts.trPK('submitAbsence','startDate')}} + + {{ts.trPK('submitAbsence','startDate')}} - - {{ts.trPK('submitAbsence','startTime')}} + + {{ts.trPK('submitAbsence','startTime')}} - - {{ts.trPK('submitAbsence','endDate')}} + + {{ts.trPK('submitAbsence','endDate')}} - - {{ts.trPK('submitAbsence','endTime')}} + + {{ts.trPK('submitAbsence','endTime')}} - + {{ts.trPK('submitAbsence','totalDays')}} {{totalDays}} - - + - - {{ts.trPK('submitAbsence','comments')}} + + {{ts.trPK('submitAbsence','comments')}}
@@ -55,6 +54,6 @@
- {{ts.trPK('general','next')}} + {{ts.trPK('general','next')}}
diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss index 8783b654..5725eec4 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -3,3 +3,19 @@ font-size: 25px; color: #7F8C8D; } + +.header-toolbar-new{ + --background: #22c6b3; + } + + .confirmEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + --background: #22c6b3; + width: 80% !important; + color: white!important; + border-radius: 16px !important; + } diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.html b/Mohem/src/app/absence/view-attachments/view-attachments.component.html index 921c5ac8..2e17a7bd 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.html +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.html @@ -1,6 +1,6 @@ - + {{ts.trPK('absenceList','attach')}} diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss index e69de29b..d98a85be 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss @@ -0,0 +1,3 @@ +.header-toolbar-new{ + --background: #22c6b3; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.html b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.html index 635bbcb9..f38acc02 100644 --- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.html +++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.html @@ -1,5 +1,5 @@ - + {{'workListMain, suppDoc' | translate}} diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss index e69de29b..d98a85be 100644 --- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss +++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss @@ -0,0 +1,3 @@ +.header-toolbar-new{ + --background: #22c6b3; + } \ No newline at end of file