diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.html b/Mohem/src/app/authentication/digital-id/digital-id.component.html index c64a132d..8a998ebd 100644 --- a/Mohem/src/app/authentication/digital-id/digital-id.component.html +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.html @@ -37,12 +37,13 @@ --> - + - - - + + + + @@ -50,5 +51,31 @@

191817

+ + +

Enad Hilal Ahmed

+
+
+ + +

Mobile Developer

+
+
+ + + + + + + + + +
-
\ No newline at end of file +
+ + +
+ +
+
\ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index a174e010..a8c4ab86 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -12,26 +12,26 @@ class="ion-segment-all"> - - {{'worklistMain , itemReq'| translate}} + + {{'worklistMain , info'| translate}} - - {{'worklistMain, action' | translate}} + + {{'worklistMain , itemReq'| translate}} - + - {{'worklistMain, attach-file' | translate}} + {{'worklistMain, action' | translate}} - - {{'worklistMain , info'| translate}} + + {{'worklistMain, attach-file' | translate}} @@ -39,6 +39,163 @@ + + + + + +
{{pInformation}}
+
+
+ + + + + + + + + +
+ + +
+ + + +
+ + + +
+
+ + + + +
+ + + +
+ + + +
+ + + +
+
+ + + + + + +
+ + + +
+ + +
+ + + +
+
+ + + + + +
+ + + +
+
+ + + +
+ + + + + + +
+ + +
+
+ +
+
+ + + + +
+ + +
{{totalH}}
+
{{valueH}}
+ +
+ +
{{taxH}}
+
{{taxvalueH}}
+ +
+
+ +
+
+ + + +
+ + +
+ + + +
+
+
+
+
+
+ - - - - - -
- - -
- - - -
- - - -
-
- - - - -
- - - -
- - - -
- - - -
-
- - - - - - -
- - - -
- - -
- - - -
-
- - - - - -
- - - -
-
- - - -
- - - - - - -
- - -
-
- -
-
- - - - -
- - -
{{totalH}}
-
{{valueH}}
- -
- -
{{taxH}}
-
{{taxvalueH}}
- -
-
- -
-
- - - -
- - -
- - - - - - - -
-
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss index df2dc68f..3a68dd25 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss @@ -111,4 +111,27 @@ .margin-left { margin-left: 30px; -} \ No newline at end of file +} + +.active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } + .active-Segment ion-label{ + font-size: 11px; + color: white !important; + } + .normal-Segment ion-label{ + color: black !important; + font-size: 11px; + } + .normal-Segment { + font-size: 0.3cm !important; + text-transform: none; + --color-checked: none; + border: 0; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index cc535bac..5bc30dac 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -93,7 +93,7 @@ export class WorklistMainMRComponent implements OnInit { confirmMsg: string; delMsg: string; closeMsg: string; - activeSegment: any = 'item-req'; + activeSegment: any = 'info'; lines_note_limit: any = 24; orgNote: string; truncating: boolean; @@ -148,19 +148,19 @@ export class WorklistMainMRComponent implements OnInit { public segmentChanged(event: any) { this.activeSegment = event.detail.value; - if(this.activeSegment === 'item-req') + if(this.activeSegment === 'info') { this.slides.slideTo(0); } - else if(this.activeSegment === 'action-history') + else if(this.activeSegment === 'item-req') { this.slides.slideTo(1); } - else if(this.activeSegment === 'attach') + else if(this.activeSegment === 'action-history') { this.slides.slideTo(2); } - else if(this.activeSegment === 'info') + else if(this.activeSegment === 'attach') { this.slides.slideTo(3); } @@ -173,19 +173,19 @@ export class WorklistMainMRComponent implements OnInit { console.log(event); if(index === 0) { - this.activeSegment = 'item-req'; + this.activeSegment = 'info'; } else if(index === 1) { - this.activeSegment = 'action-history'; + this.activeSegment = 'item-req'; } else if(index === 2) { - this.activeSegment = 'attach'; + this.activeSegment = 'action-history'; } else if(index === 3) { - this.activeSegment = 'info'; + this.activeSegment = 'attach'; } console.log(this.activeSegment); }); diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss index 684ed13a..8b52107b 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss @@ -114,4 +114,27 @@ .margin-left { margin-left: 30px; -} \ No newline at end of file +} + +.active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } + .active-Segment ion-label{ + font-size: 11px; + color: white !important; + } + .normal-Segment ion-label{ + color: black !important; + font-size: 11px; + } + .normal-Segment { + font-size: 0.3cm !important; + text-transform: none; + --color-checked: none; + border: 0; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index bc2100e2..5607e12d 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -10,10 +10,16 @@ - + {{'worklistMain, info'| translate}} + + + - {{'worklistMain, itemReq'| translate}} + {{'worklistMain, itemReq'| translate}} + {{'worklistMain, action' | translate}} @@ -25,24 +31,120 @@ - - - {{'worklistMain, info'| translate}} - + + + + + +
{{pInformation}} +
+
+
+ + + + + + + + +
+ +
+ + +
+ +
+
+ + + +
+ +
+ + +
+ +
+
+ + + +
+ +
+ + +
+ +
+
+
+ + + +
+ +
+
+
+
+ +
+ + +
{{totalH}}
+
{{valueH}}
+
+ +
{{taxH}}
+
{{taxvalueH}}
+
+
+
+
+
+ +
+
+
+
+
+
+
+

{{ 'general, empty' | translate}}

- -
+ +
- +
@@ -55,7 +157,8 @@
- +
{{Lines.UOM}} @@ -68,7 +171,8 @@
- +
@@ -138,8 +242,8 @@ {{actionHistory.ACTION}} - - + + {{actionHistory.NOTIFICATION_DATE| dateString }} @@ -155,123 +259,31 @@ - - - - -
-

{{ 'general, notAttch' | translate}}

-
-
- - - - {{i+1}}. {{attachList.FILE_NAME}} - - - - -
-
-
-
-
- - - - - - -
{{pInformation}}
-
-
- - - - - - - - -
- -
- - -
- -
-
- - - -
- -
- - -
- -
-
- - - -
- -
- - -
- -
-
-
- - - -
- -
-
-
-
- -
- - -
{{totalH}}
-
{{valueH}}
-
- -
{{taxH}}
-
{{taxvalueH}}
-
-
-
-
+ + + +
+

{{ 'general, notAttch' | translate}}

+
+
+ + + + {{i+1}}. {{attachList.FILE_NAME}} + + + - - - - - - - +
+
+
+
+ diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index be89a485..92be66f2 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -111,4 +111,27 @@ .margin-left { margin-left: 30px; -} \ No newline at end of file +} + +.active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } + .active-Segment ion-label{ + font-size: 11px; + color: white !important; + } + .normal-Segment ion-label{ + color: black !important; + font-size: 11px; + } + .normal-Segment { + font-size: 0.3cm !important; + text-transform: none; + --color-checked: none; + border: 0; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index fca6e90b..bc8b2585 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -102,7 +102,7 @@ export class WorklistMainPRComponent implements OnInit { demoeAttach: any = []; notiActionBtnMore: any = []; messageSuccess: boolean = false; - activeSegment: any = 'item-req'; + activeSegment: any = 'info'; approveDis: boolean; rejectDis: boolean; requestDis: boolean; @@ -145,19 +145,19 @@ export class WorklistMainPRComponent implements OnInit { public segmentChanged(event: any) { this.activeSegment = event.detail.value; - if(this.activeSegment === 'item-req') + if(this.activeSegment === 'info') { this.slides.slideTo(0); } - else if(this.activeSegment === 'action-history') + else if(this.activeSegment === 'item-req') { this.slides.slideTo(1); } - else if(this.activeSegment === 'attach') + else if(this.activeSegment === 'action-history') { this.slides.slideTo(2); } - else if(this.activeSegment === 'info') + else if(this.activeSegment === 'attach') { this.slides.slideTo(3); } @@ -170,19 +170,19 @@ export class WorklistMainPRComponent implements OnInit { console.log(event); if(index === 0) { - this.activeSegment = 'item-req'; + this.activeSegment = 'info'; } else if(index === 1) { - this.activeSegment = 'action-history'; + this.activeSegment = 'item-req'; } else if(index === 2) { - this.activeSegment = 'attach'; + this.activeSegment = 'action-history'; } else if(index === 3) { - this.activeSegment = 'info'; + this.activeSegment = 'attach'; } console.log(this.activeSegment); }); diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 9b9eff68..c22ebe93 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -10,24 +10,25 @@ class="ion-segment-all"> + + {{'worklistMain, info'| translate}} + + {{'worklistMain, details-emp'| translate}} - + {{'worklistMain, action' | translate}} - - + + {{'worklistMain, attach-file' | translate}} - - - - {{'worklistMain, info'| translate}} + @@ -35,172 +36,244 @@ - - + + - - -
- - - - -
- -
- - -
- -
-
- - - - -
- -
- - -
- -
-
- - - -
- -
- - -
- -
-
-
- -
-
-
+
{{pInformation}}
+ - - - -
- {{'userProfile, emp-detail' | translate}}
- -
- - - -
- -
-
- - - -
- -
-
- - - -
- -
-
- - - -
- -
-
- - - -
- -
-
- - - -
- -
-
- - - -
- -
-
- - - -
- -
-
- - - - -
- - -
-
- - - -
- - -
-
+
+ + +
+ + + +
+ +
+
+
+
+
+
+
+ {{ts.trPK('worklistMain','employee-on-leave')}} +
+ + +
+ +
- - - + + + +
+
+
+ + + +
+
+ + +
+ +
+ +
+ +
+
+
+
+ - - - - - - - + + + + + + + +
+ + + + +
+ +
+ + +
+ +
+
+ + + + +
+ +
+ + +
+ +
+
+ + + +
+ +
+ + +
+ +
+
+
+ +
+
+
+
+
+ + + + + +
+ {{'userProfile, emp-detail' | translate}}
+ +
+ + + +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ + + +
+ +
+
+ + + + +
+ + +
+
+ + + +
+ + +
+
+
+
+ +
+
+
+
+ + + + + + + +
+
@@ -306,78 +379,6 @@ - - - - - -
{{pInformation}}
-
-
- - - -
- - -
- - - -
- -
-
-
-
-
-
-
- {{ts.trPK('worklistMain','employee-on-leave')}} -
- - -
- - -
- - - -
-
-
- - - -
-
- - -
- -
- -
- -
-
-
-
-
-
- -
-
-
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index ecf60347..5a62c470 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -302,4 +302,27 @@ ion-card{ .padding-zero { padding: 0px !important; +} + +.active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; +} +.active-Segment ion-label{ + font-size: 11px; + color: white !important; +} +.normal-Segment ion-label{ + color: black !important; + font-size: 11px; +} +.normal-Segment { + font-size: 0.3cm !important; + text-transform: none; + --color-checked: none; + border: 0; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 4297bb79..be6520e8 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -76,7 +76,7 @@ export class WorklistMainComponent implements OnInit { P_PAGE_NUM: number = 1; P_PAGE_LIMIT: number = 100; notificationCount: any; - activeSegment: any = 'item-req'; + activeSegment: any = 'info'; lines_note_limit: any = 24; attachmentRes: any = []; private WorkListActionHistoryObj: WorkListActionHistoryRequest; @@ -143,19 +143,19 @@ export class WorklistMainComponent implements OnInit { public segmentChanged(event: any) { this.activeSegment = event.detail.value; - if(this.activeSegment === 'item-req') + if(this.activeSegment === 'info') { this.slides.slideTo(0); } - else if(this.activeSegment === 'action-history') + else if(this.activeSegment === 'item-req' ) { this.slides.slideTo(1); } - else if(this.activeSegment === 'attach') + else if(this.activeSegment === 'action-history') { this.slides.slideTo(2); } - else if(this.activeSegment === 'info') + else if(this.activeSegment === 'attach') { this.slides.slideTo(3); } @@ -168,19 +168,19 @@ export class WorklistMainComponent implements OnInit { console.log(event); if(index === 0) { - this.activeSegment = 'item-req'; + this.activeSegment = 'info'; } else if(index === 1) { - this.activeSegment = 'action-history'; + this.activeSegment = 'item-req'; } else if(index === 2) { - this.activeSegment = 'attach'; + this.activeSegment = 'action-history'; } else if(index === 3) { - this.activeSegment = 'info'; + this.activeSegment = 'attach'; } console.log(this.activeSegment); }); diff --git a/Mohem/src/assets/imgs/DQ_LOO.png b/Mohem/src/assets/imgs/DQ_LOO.png new file mode 100644 index 00000000..7c9c6b4f Binary files /dev/null and b/Mohem/src/assets/imgs/DQ_LOO.png differ diff --git a/Mohem/src/assets/imgs/HMG_LOGO.png b/Mohem/src/assets/imgs/HMG_LOGO.png new file mode 100644 index 00000000..d2dbe038 Binary files /dev/null and b/Mohem/src/assets/imgs/HMG_LOGO.png differ diff --git a/Mohem/src/assets/imgs/PharmacyLOGO.png b/Mohem/src/assets/imgs/PharmacyLOGO.png new file mode 100644 index 00000000..530fe49b Binary files /dev/null and b/Mohem/src/assets/imgs/PharmacyLOGO.png differ diff --git a/Mohem/src/assets/imgs/UserFace.png b/Mohem/src/assets/imgs/UserFace.png new file mode 100644 index 00000000..c69ce06e Binary files /dev/null and b/Mohem/src/assets/imgs/UserFace.png differ diff --git a/Mohem/src/imgs/DQ_LOO.png b/Mohem/src/imgs/DQ_LOO.png new file mode 100644 index 00000000..7c9c6b4f Binary files /dev/null and b/Mohem/src/imgs/DQ_LOO.png differ diff --git a/Mohem/src/imgs/HMG_LOGO.png b/Mohem/src/imgs/HMG_LOGO.png new file mode 100644 index 00000000..d2dbe038 Binary files /dev/null and b/Mohem/src/imgs/HMG_LOGO.png differ diff --git a/Mohem/src/imgs/PharmacyLOGO.png b/Mohem/src/imgs/PharmacyLOGO.png new file mode 100644 index 00000000..530fe49b Binary files /dev/null and b/Mohem/src/imgs/PharmacyLOGO.png differ diff --git a/Mohem/src/imgs/UserFace.png b/Mohem/src/imgs/UserFace.png new file mode 100644 index 00000000..c69ce06e Binary files /dev/null and b/Mohem/src/imgs/UserFace.png differ