From d624f0794c4478a0493680ff646ad8ac062a5d69 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 3 Nov 2021 11:11:27 +0300 Subject: [PATCH 1/4] FIXED MERG ISSUES --- .../submit-absence.component.html | 13 +++++----- .../submit-absence.component.ts | 2 +- .../app/notification/home/home.component.ts | 25 ++++++++++++++++--- .../worklist-main/worklist-main.component.ts | 10 +++++++- Mohem/src/assets/localization/i18n.json | 4 +++ 5 files changed, 43 insertions(+), 11 deletions(-) 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 9a17288e..f3ffe7d4 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -5,19 +5,20 @@ - - + + + let item of AbsenceType; let i=index; {{item.ABSENCE_ATTENDANCE_TYPE_NAME}} - + --> {{ts.trPK('submitAbsence','startDate')}} diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index 360a5175..95d4ae23 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -51,7 +51,7 @@ export class SubmitAbsenceComponent implements OnInit { private modalFlag: any = false; menuType: any; employeeSel: any; - absenceType: any; + absenceType = 'noType'; absenceTypeName: string = null; absenceTypeList: any; startDate: any; diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 89200ab2..13add5f0 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -76,6 +76,7 @@ export class HomeComponent implements OnInit { public totalPR = 0; public totalMR = 0; public totalIC = 0; + public totalStamp = 0; public showChart = false; @@ -88,16 +89,17 @@ export class HomeComponent implements OnInit { public data = { datasets: [ { - data: [0, 0, 0, 0, 0, 0], + data: [0, 0, 0, 0, 0, 0, 0], backgroundColor: [ '#18a169', '#3cb9d5', '#114475', '#38c9b3', '#cc3232', - '#9e7e97' + '#9e7e97', + '#ff9800' ], - borderWidth: 5 + borderWidth: 6 }] }; public filters = [ @@ -156,6 +158,14 @@ export class HomeComponent implements OnInit { color: '#9e7e97', key: 'INVITEM', disable: false + }, + { + value: 0, + name: 'STAMP', + active: false, + color: '#ff9800', + key: 'STAMP', + disable: false } ]; @@ -264,6 +274,10 @@ export class HomeComponent implements OnInit { this.data.datasets[0].data[5] = 0; } + if (this.totalStamp === 0) { + this.data.datasets[0].data[6] = 0; + } + const openNotificationsArray = this.worklistNotifications.GetOpenNotificationsList; for (const notification of openNotificationsArray) { @@ -282,6 +296,9 @@ export class HomeComponent implements OnInit { } else if (notification.ITEM_TYPE === 'INVITEM') { this.filters[6].value = this.totalIC; this.data.datasets[0].data[5] = notification.OPEN_NTF_NUMBER; + } else if (notification.ITEM_TYPE === 'STAMP') { + this.filters[7].value = this.totalStamp; + this.data.datasets[0].data[6] = notification.OPEN_NTF_NUMBER; } } // this.data.datasets[0].data[4] = this.ITGCount; @@ -440,6 +457,8 @@ export class HomeComponent implements OnInit { this.totalMR = this.totalMR + 1; } else if (workList.ITEM_TYPE === 'INVITEM') { this.totalIC = this.totalIC + 1; + } else if (workList.ITEM_TYPE === 'STAMP') { + this.totalStamp = this.totalStamp + 1; } } 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 fcfaf93e..8212c4fe 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -88,6 +88,7 @@ export class WorklistMainComponent implements OnInit { newArr: any = []; selEmp: any; subordinatesleaveList: any = []; + allSubordinatesleaveList: any = []; private WorkListSubmitterInfoObj: WorkListSubmitterInfoRequest; submitterInfoRes: any; approveDis: boolean = false; @@ -986,7 +987,14 @@ export class WorklistMainComponent implements OnInit { public handleSubordinatesLeavesResult(result) { if (this.common.validResponse(result)) { if (this.common.hasData(result.SubordinatesOnLeavesList)) { - this.subordinatesleaveList = result.SubordinatesOnLeavesList; + this.allSubordinatesleaveList = result.SubordinatesOnLeavesList; + // this.subordinatesleaveList.push(this.allSubordinatesleaveList.find( + // el => el.EMPLOYEE_NUMBER !== this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER)); + this.allSubordinatesleaveList.forEach(element => { + if (element.EMPLOYEE_NUMBER !== this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER) { + this.subordinatesleaveList.push(element); + } + }); } } } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 077e6689..393294e7 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1806,6 +1806,10 @@ "tickets-balance": { "en": "Ticket Balance", "ar": "رصيد التذاكر" + }, + "selectType": { + "en": "Select Type", + "ar": "اختر النوع" } }, "accrualBalances": { From 016bd83b81c4c7d2025ac4fc3b78bd90d96e63a8 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 11 Nov 2021 10:40:19 +0300 Subject: [PATCH 2/4] fixed css for business card --- .../business-card.component.html | 8 +-- .../business-card.component.scss | 50 +++++++++++++++---- 2 files changed, 43 insertions(+), 15 deletions(-) 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 6cabace2..e9a093f1 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -9,16 +9,16 @@ - +

{{userInfo.name_en}}

- +
@@ -79,7 +79,7 @@ - +
{{userInfo.job_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 f85bbad2..f2ee7250 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.scss +++ b/Mohem/src/app/authentication/business-card/business-card.component.scss @@ -38,10 +38,9 @@ // CS .card-size{ transform: rotate(90deg) !important; - // padding: 5% !important; - // padding-right: 0px !important; padding-right: 0px !important; padding-left: 15% !important; + padding: 8% !important; } .qr-style{ left: 260% !important; @@ -57,6 +56,9 @@ .qr-img-hmg-style{ left: 580px !important; } + .cs-card-size{ + padding: 15px !important; + } } @media screen and (min-width: 400px) and (min-height:700px) and (max-height: 799px){ @@ -81,6 +83,9 @@ .qr-img-hmg-style{ left: 495px !important; } + .cs-card-size{ + padding: 20px !important; + } } @media screen and (min-width: 325px) and (max-width:399px) and (max-height: 812px){ @@ -103,6 +108,9 @@ .qr-img-hmg-style{ left: 550px !important; } + .cs-card-size{ + padding: 10px !important; + } } @media screen and (min-width: 325px) and (max-width:399px) and (max-height: 700px){ @@ -140,18 +148,25 @@ } // HMG .logo-img-hmg-style{ - left: 245px !important; + left: 225px !important; } .qr-img-hmg-style{ left: 430px !important; } + .cs-card-size{ + padding:5px !important; + } + .name-div{ + padding: 3px !important; + } } @media screen and (min-width: 1px) and (max-width:320px) { .card-size{ transform: rotate(90deg) !important; position: relative; - bottom: 3%; + bottom: 10%; left: 8%; + padding: 10% !important } .qr-style{ width: 70% !important; @@ -176,34 +191,47 @@ .logo-img-hmg-style{ width: 380px !important; position: fixed !important; - left: 200px !important; + left: 240px !important; height: 81px !important; - bottom: 205px !important; + bottom: 175px !important; } .qr-img-hmg-style{ width: 105px !important; margin-top: 0px !important; position: relative !important; left: 390px !important; - top: 160px !important; + top: 150px !important; } .cs-card-size{ - padding: 15px !important; + padding: 0px !important; padding-top: 0px !important; padding-left: 1px !important; } } +@media screen and (min-width: 200px) and (max-width: 300px) and (max-height: 700px){ + .font-text-style{ + font-size: 11px !important; + } + .card-size{ + padding: 0% !important; + left: 7% !important; + bottom: 0% !important; + position: relative; + } + +} + .card-size{ transform: rotate(90deg); - padding: 6%; + padding: 18%; } .qr-style{ width: 70%; margin-top: 0px; position: relative; - left: 200%; + left: 135%; } .name-ar-style{ font-size: 20px; @@ -234,5 +262,5 @@ .cs-card-size{ transform: rotate(90deg); - padding: 25px; + padding: 0px; } \ No newline at end of file From 1cee785d88035c435496373682fb364cbdc45fff Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 11 Nov 2021 14:44:17 +0300 Subject: [PATCH 3/4] fixing business card desgin --- Mohem/src/app/app.component.ts | 2 +- .../business-card.component.html | 26 ++++++++++--------- Mohem/src/app/home/home.page.ts | 2 +- Mohem/src/theme/styles.scss | 9 +++++++ 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 47934fec..a9013537 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -294,7 +294,7 @@ export class AppComponent implements OnInit { //this.userInfo = this.cs.sharedService.getSharedData('bussiness-card-info', false); const modal = await this.modalController.create({ component: BusinessCardComponent, - cssClass: 'digital-id-modal-css', + cssClass: 'business-card-modal-css', componentProps: { 'userInfo': this.userInfo } 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 e9a093f1..ffc247d2 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -1,5 +1,5 @@ - +
@@ -53,14 +48,21 @@ - -
+ --> +
+ https://hmgwebservices.com/images/Moheem/CS.jpg +

{{userInfo.name_en}}

+
{{userInfo.job_en}}
+
{{userInfo.mobile}}
+
{{userInfo.email}}
+
{{userInfo.company_url}}
+
- + + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 0a882f0f..66d3a378 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -795,7 +795,7 @@ export class HomePage implements OnInit { async openBusinessCard() { const modal = await this.modalController.create({ component: BusinessCardComponent, - cssClass: 'digital-id-modal-css' + cssClass: 'business-card-modal-css' }); return await modal.present(); } diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 2d06bd96..ea426604 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1561,6 +1561,15 @@ table.monthview-datetable th small { position: absolute; display: block; } + .business-card-modal-css .modal-wrapper{ + height: 500px; + width: 300px; + top: 50%; + position: absolute; + display: block; + margin-top: -250px; + } + .app-update-modal-css .modal-wrapper{ border-radius: 0px !important; } From 1c315cd62144d68da53e26b5f6ceb3f5fabb6eb1 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 14 Nov 2021 09:12:32 +0300 Subject: [PATCH 4/4] hmg business card --- .../business-card/business-card.component.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) 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 ffc247d2..60ff3b33 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -65,7 +65,7 @@ - + +
+ +
+

{{userInfo.name_en}}

+
{{userInfo.job_en}}
+
{{userInfo.mobile}}
+
{{userInfo.email}}
+
{{userInfo.company_url}}
+
+
+ +
+ +
\ No newline at end of file