From d624f0794c4478a0493680ff646ad8ac062a5d69 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 3 Nov 2021 11:11:27 +0300 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 04/11] 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 From e7f39ba02f3db7c065e1856ebb2943d33f7adc0d Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 16 Nov 2021 10:09:31 +0300 Subject: [PATCH 05/11] added page to turn on or off worklist notification and add indecator in my profile --- Mohem/src/app/hmg-common/hmg-common.module.ts | 6 +- .../services/connector/connector.service.ts | 4 +- .../generic-header.component.html | 6 ++ .../generic-header.component.ts | 15 ++++- .../app/notification/home/home.component.html | 1 + .../worklist-setting.component.html | 32 ++++++++++ .../worklist-setting.component.scss | 7 +++ .../worklist-setting.component.spec.ts | 27 +++++++++ .../worklist-setting.component.ts | 60 +++++++++++++++++++ .../src/app/profile/home/home.component.html | 57 ++++++++++++++++-- .../src/app/profile/home/home.component.scss | 16 +++++ Mohem/src/app/profile/home/home.component.ts | 1 + Mohem/src/assets/localization/i18n.json | 28 +++++++++ 13 files changed, 250 insertions(+), 10 deletions(-) create mode 100644 Mohem/src/app/notification/worklist-setting/worklist-setting.component.html create mode 100644 Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss create mode 100644 Mohem/src/app/notification/worklist-setting/worklist-setting.component.spec.ts create mode 100644 Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index c0d8c8f9..447e5d00 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -111,6 +111,7 @@ import { GenericHeaderComponent } from './ui/generic-header/generic-header.compo import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component'; import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component'; +import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component'; @NgModule({ imports: [ @@ -194,7 +195,8 @@ import { CardCalendarComponent } from './ui/card-calendar/card-calendar.componen Modal, GenericHeaderComponent, AttendanceOptionsComponent, - CardCalendarComponent + CardCalendarComponent, + WorklistSettingComponent ], exports: [ FabButtonComponent, @@ -306,7 +308,7 @@ import { CardCalendarComponent } from './ui/card-calendar/card-calendar.componen BarcodeScanner, BackgroundGeolocation ], - entryComponents: [DateInfoModalComponent], + entryComponents: [DateInfoModalComponent, WorklistSettingComponent], }) export class HmgCommonModule { } diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index dc119ce4..c869c5ef 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 120 * 1000; - // public static host = 'https://uat.hmgwebservices.com/'; - public static host = 'https://hmgwebservices.com/'; + public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html index 7d62b3c5..ddc592b6 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html @@ -30,6 +30,12 @@ --> + +
+ +
+
+ \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts index 75dc2703..6589c50d 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { WorklistSettingComponent } from 'src/app/notification/worklist-setting/worklist-setting.component'; import { CommonService } from '../../services/common/common.service'; @Component({ @@ -16,10 +18,13 @@ export class GenericHeaderComponent implements OnInit { @Input() updateDirection = false; @Input() headerText = ''; @Input() backLink: string; + @Input() worklistSetting = false; @Output() trigger = new EventEmitter(); public close = 'assets/imgs/cancel.png'; - constructor(public common: CommonService) { } + constructor( + public common: CommonService, + public modalController: ModalController) { } ngOnInit() { if (this.updateDirection) { @@ -35,4 +40,12 @@ export class GenericHeaderComponent implements OnInit { this.trigger.emit(); } + async openNotifictionSetting() { + const modal = await this.modalController.create({ + component: WorklistSettingComponent, + cssClass: 'app-update-modal-css', + }); + return await modal.present(); + } + } diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index fe0b6141..95668d4d 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -1,6 +1,7 @@ diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html new file mode 100644 index 00000000..b4c26a10 --- /dev/null +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html @@ -0,0 +1,32 @@ + + + {{ 'worklist, worklist-setting' | translate}} + + + + + + + + + +
+

{{ 'worklist, turn-on-notification' | translate}}

+
+
+ + + + +

{{data.nameEn}}

+

{{data.nameAr}}

+
+ +
+
+
+
+ + + {{ 'worklist, save-changes' | translate}} + \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss new file mode 100644 index 00000000..927b8dc3 --- /dev/null +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss @@ -0,0 +1,7 @@ +.header-toolbar{ + --background: #269DB8; +} + +ion-toggle{ + --background-checked: #269DB8; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.spec.ts b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.spec.ts new file mode 100644 index 00000000..627b60c6 --- /dev/null +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WorklistSettingComponent } from './worklist-setting.component'; + +describe('WorklistSettingComponent', () => { + let component: WorklistSettingComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WorklistSettingComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WorklistSettingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts new file mode 100644 index 00000000..3280ecfd --- /dev/null +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts @@ -0,0 +1,60 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + +@Component({ + selector: 'app-worklist-setting', + templateUrl: './worklist-setting.component.html', + styleUrls: ['./worklist-setting.component.scss'], +}) +export class WorklistSettingComponent implements OnInit { + + notificationList = [ + { + id: 0, + nameEn: "Human Resource (HR)", + nameAr: "الموارد البشرية (HR)", + isChecked: false + }, + { + id: 1, + nameEn: "Purchase Order (PO)", + nameAr: "امر شراء (PO)", + isChecked: false + }, + { + id: 2, + nameEn: "Purchase Requesr (PR)", + nameAr: "طلب شراء (PR)", + isChecked: false + }, + { + id: 3, + nameEn: "Move Request (MR)", + nameAr: "طلب نقل (MR)", + isChecked: false + }, + { + id: 4, + nameEn: "Item Creation (IC)", + nameAr: "انشاء عنصر (IC)", + isChecked: false + } + ]; + + public direction: string; + + constructor(public modalController: ModalController, public ts: TranslatorService) { } + + ngOnInit() { + this.direction = TranslatorService.getCurrentDirection(); + } + + + dismiss() { + this.modalController.dismiss({ + 'dismissed': true + }); + } + +} diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 96b8ea1b..63fd3145 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -37,25 +37,32 @@ -
+

+
+
+
+
+
+
+
{{ts.trPK('userProfile','profile-compitation')}} {{profileProgress}}%
@@ -184,6 +198,39 @@ + + + + + + +

{{ts.trPK('userProfile','phone-no')}}

+
+
+ + + + + + + +
+
+
+ +

{{ts.trPK('general','mobile')}}

+
+

0567845661

+
+
+ +

{{ts.trPK('userProfile','work')}}

+
+

4922

+
+
+
+ diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 97bbfbb6..625ec624 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1352,4 +1352,20 @@ $actionBtnSize: 36px; letter-spacing: -0.64px; color: #2B353E; opacity: 1; +} + +.profile-green{ + background: #20A16A; + margin-right: 5px; + width: 80px; + height: 8px; + border-radius: 5px; +} + +.profile-gray{ + background: #D9D9D9; + margin-right: 5px; + width: 80px; + height: 8px; + border-radius: 5px; } \ No newline at end of file diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 6c05dd04..8a0cbfe8 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -51,6 +51,7 @@ export class HomeComponent implements OnInit { public country: any; public employeeAdress: any = []; public jobName: any; + public profileProgress = 84; constructor( public ts: TranslatorService, diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index fed4e386..c0a4b48f 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1434,6 +1434,22 @@ "postal-code": { "en": "Postal Code", "ar": "الرمز البريدي" + }, + "contact-details":{ + "en":"Contact Details", + "ar":"بيانات المتصل" + }, + "family-members":{ + "en":"Family Members", + "ar":"أفراد الأسرة" + }, + "profile-compitation":{ + "en":"Profile Completions", + "ar":"استكمال الملف الشخصي" + }, + "work":{ + "en":"Work", + "ar":"العمل" } }, "changePassword": { @@ -2487,6 +2503,18 @@ "urgent": { "en": "Urgent", "ar": "عاجل" + }, + "worklist-setting":{ + "en":"WORKLIST SETTINGS", + "ar":"اعدادات اشعارات" + }, + "turn-on-notification":{ + "en":"Turn on notification for", + "ar":"تفعيل الاشعارات " + }, + "save-changes":{ + "en":"Save Changes", + "ar":"حفظ التغيرات" } }, "worklistMain": { From 47b9209497ea544e943cd9c5c22b135144c50d89 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 16 Nov 2021 11:45:11 +0300 Subject: [PATCH 06/11] fixed vacation rule issue --- .../vacation-type/vacation-type.component.html | 6 +++--- .../vacation-type/vacation-type.component.ts | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index 15900c2a..3d8f1032 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -33,9 +33,9 @@
- + +
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts index eeef7508..acc38009 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts @@ -26,7 +26,7 @@ import { WorkListReplacementRollComponent } from 'src/app/notification/work-list }) export class VacationTypeComponent implements OnInit { ruleTypeList: any; - index: any; + index = 'noType'; vactionRuleSelected:any =-1; notificationTypeSelected: number; notification_list: any; //// @@ -165,13 +165,11 @@ export class VacationTypeComponent implements OnInit { } - vacationRuleSel(event){ - this.vactionRuleSelected=event.detail.value; + vacationRuleSel(){ + this.vactionRuleSelected = this.index; if(this.notificationTypeShow){ - //this.notificationTypeShow = false this.notificationTypeShow = false this.notifTypeSelP2 = "*"; - //this.part3show = false } if (this.createVacationRuleShow){ this.createVacationRuleShow = false @@ -180,11 +178,6 @@ export class VacationTypeComponent implements OnInit { } - - - - - console.log("event: "+ event.detail.value); } notificationSel(event){ From 3ce01fc610a6e851e486d426fdcb42d7b56a8e8e Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 21 Nov 2021 09:45:08 +0300 Subject: [PATCH 07/11] added family member segment and design --- .../worklist-setting.component.html | 4 +- .../src/app/profile/home/home.component.html | 66 ++++++++++++++++++- .../src/app/profile/home/home.component.scss | 18 ++++- Mohem/src/app/profile/home/home.component.ts | 36 ++++++++++ .../assets/imgs/profile-icons/family-g.svg | 6 ++ .../src/assets/imgs/profile-icons/family.svg | 6 ++ 6 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 Mohem/src/assets/imgs/profile-icons/family-g.svg create mode 100644 Mohem/src/assets/imgs/profile-icons/family.svg diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html index b4c26a10..93b94944 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html @@ -18,8 +18,8 @@ -

{{data.nameEn}}

-

{{data.nameAr}}

+

{{data.nameEn}}

+

{{data.nameAr}}

diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 63fd3145..907ad3ff 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -58,10 +58,10 @@ {{ts.trPK('userProfile','contact-details')}} - +
- - + + {{ts.trPK('userProfile','family-members')}}
@@ -125,6 +125,8 @@
{{ts.trPK('userProfile','profile-compitation')}} {{profileProgress}}%
+
Add or update information about your beneficarie of dependants
+ Note: People you enter here become dependants or beneficiaries only after you complete benefits enrollment
@@ -282,7 +284,65 @@
+ + +
+
+
+ + + +

{{data.name}}

+
+ +
+ +

update

+
+
+
+ + +

{{data.relation}}

+
+ +
+ +

Remove

+
+
+
+
+
+