diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html index 94fb5ef2..6cabace2 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -11,7 +11,7 @@ -

{{userInfo.name_en}}

+

{{userInfo.name_en}}

diff --git a/Mohem/src/app/authentication/business-card/business-card.component.scss b/Mohem/src/app/authentication/business-card/business-card.component.scss index b70bdcb5..5653a023 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.scss +++ b/Mohem/src/app/authentication/business-card/business-card.component.scss @@ -38,14 +38,15 @@ // CS .card-size{ transform: rotate(90deg) !important; - padding: 10px !important; + padding: 5% !important; padding-right: 0px !important; } .qr-style{ - left: 410px !important; + left: 260% !important; } .name-ar-style{ - left: 320px !important; + left: 175% !important; + padding: 0%; } // HMG .logo-img-hmg-style{ @@ -60,14 +61,15 @@ // CS .card-size{ transform: rotate(90deg) !important; - padding: 10px !important; - padding-right: 0px !important; + padding: 6% !important; + padding-right: 2% !important; } .qr-style{ - left: 324px !important; + width: 80%; + left: 220% !important; } .name-ar-style{ - left: 230px !important; + left: 140% !important; } // HMG @@ -83,14 +85,14 @@ // CS .card-size{ transform: rotate(90deg) !important; - padding: 5px !important; + padding: 3% !important; padding-right: 0px !important; } .qr-style{ - left: 400px !important; + left: 280% !important; } .name-ar-style{ - left: 310px !important; + left: 205%!important; } // HMG .logo-img-hmg-style{ @@ -125,14 +127,14 @@ @media screen and (min-width: 325px) and (max-width:399px) and (max-height: 699px){ .card-size{ transform: rotate(90deg) !important; - padding: 5px !important; - padding-right: 0px !important; + padding: 3% !important; + padding-right: 0% !important; } .qr-style{ - left: 280px !important; + left: 200% !important; } .name-ar-style{ - left: 190px !important; + left: 116% !important; } // HMG .logo-img-hmg-style{ @@ -146,26 +148,26 @@ .card-size{ transform: rotate(90deg) !important; position: relative; - bottom: 30px; - left: 26px; + bottom: 3%; + left: 8%; } .qr-style{ - width: 80px !important; - margin-top: 50px !important; + width: 70% !important; + margin-top: 30% !important; position: relative !important; - left: 265px !important; + left: 200% !important; } .name-ar-style{ font-size: 15px !important; position: relative !important; - left: 130px !important; + left: 115% !important; text-align: end !important; - padding: 10px !important; - width: 225px !important; + padding: 1% !important; + width: 170% !important; } .logo-img-style{ - width: 80px !important; - margin-top: 50px !important; + width: 60% !important; + margin-top: 35% !important; } // HMG @@ -193,23 +195,24 @@ .card-size{ transform: rotate(90deg); + padding: 6%; } .qr-style{ - width: 130px; + width: 70%; margin-top: 0px; position: relative; - left: 410px; + left: 200%; } .name-ar-style{ - font-size: 25px; + font-size: 20px; position: relative; - left: 314px; + left: 120%; text-align: end; - padding: 10px; - width: 225px; + padding: 1%; + width: 145%; } .logo-img-style{ - width: 120px; + width: 70%; } .logo-img-hmg-style{ diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index ee201d5f..4b56790c 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -100,8 +100,14 @@ - + + + + diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts index a54ee2ce..3edd50f3 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts @@ -211,12 +211,13 @@ export class WorkListReplacementItgComponent implements OnInit { } onChangeInput() { this.ReplacementList = []; - clearTimeout(this.typingTimer); - this.typingTimer = setTimeout(() => { - if (this.searchKey.length > 2) { - this.SearchReplacementList(); - } - }, 3000); + this.SearchReplacementList(); + // clearTimeout(this.typingTimer); + // this.typingTimer = setTimeout(() => { + // if (this.searchKey.length > 2) { + // this.SearchReplacementList(); + // } + // }, 3000); } select(selectEmp, index) { this.selEmp = selectEmp diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 5b46275e..a58c5c60 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -60,10 +60,21 @@
- - + + + + + + + + + +

{{"general, search" | translate}}

+
+
+
+
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index 64b9ebd1..7bd616a2 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -209,3 +209,4 @@ ion-radio{ font-size: 12px; } + diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index b64d7209..99ec0032 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -340,17 +340,17 @@ export class WorkListReplacementRollComponent implements OnInit { this.messageSuccess = true; - setTimeout(() => { - this.messageSuccess = false; - //this.modalCtrl.dismiss(succ); - this.modalCtrl.dismiss({ - 'dismissed': true, - data: "Success" - }); - if (this.selEmp && this.isAnswer == false) { - this.setFavorite(this.selEmp); - } - }, 5000); + // setTimeout(() => { + this.messageSuccess = false; + //this.modalCtrl.dismiss(succ); + this.modalCtrl.dismiss({ + 'dismissed': true, + data: "Success" + }); + // if (this.selEmp && this.isAnswer == false) { + // this.setFavorite(this.selEmp); + // } + // }, 5000); this.cs.openNotificationPage(); // this.messageSuccess = true; @@ -441,9 +441,19 @@ export class WorkListReplacementRollComponent implements OnInit { this.isFilter = true; this.selectedType = 1; this.listOfRealted = this.actionHistory; + if(this.favoriteUserList.length > 0){ + this.actionHistory.forEach((obj, i) => { + if(this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) { + this.actionHistory[i].IsFavorite = true; + }else{ + this.actionHistory[i].IsFavorite = false; + } + console.log(this.actionHistory); + }); + } } else if (selectValue === '4') { // if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) { - this.getFavruite(); + this.getFavruite(); // } this.isFilter = true; this.selectedType = 4; @@ -461,11 +471,11 @@ export class WorkListReplacementRollComponent implements OnInit { onChangeInput() { this.ReplacementList = []; clearTimeout(this.typingTimer); - this.typingTimer = setTimeout(() => { - if (this.inputSearch.length > 2) { + // this.typingTimer = setTimeout(() => { + // if (this.inputSearch.length > 2) { this.getreplacmentemployee(); - } - }, 3000); + // } + // }, 3000); // if (this.inputSearch.length > 0) { @@ -509,12 +519,12 @@ export class WorkListReplacementRollComponent implements OnInit { this.worklistService.saveFavoriteList(request, () => { }).subscribe((result) => { if (this.cs.validResponse(result)) { - if(isFav){ - this.cs.toastPK("replacementRoll", "favorite-saved"); - } else{ - this.cs.toastPK("replacementRoll", "favorite-unsaved"); + if (isFav) { + this.cs.greenToastPK("replacementRoll", "favorite-saved"); + } else { + this.cs.redToastPK("replacementRoll", "favorite-unsaved"); } - + this.getFavruite(); } }) } 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 4b5e4f0b..0d6073b6 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -47,9 +47,11 @@ - +
- +
@@ -119,36 +121,33 @@ - +
- +
- + + +

Current

+
+
+ + +

Proposed

+
+
+
+ +
- +
-
-
-
-
-
-
- - - -
- - -
- - +
@@ -346,7 +345,7 @@ - +
@@ -387,7 +386,8 @@
+ {{actionHistory.visible ? 'Show less': 'Show More' + }}