From 95009a1e802c309d12b80182d8c387a7fa05a997 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 22 Nov 2021 10:22:59 +0300 Subject: [PATCH] pushed sfh changes --- Mohem/src/app/app.component.html | 8 +- Mohem/src/app/app.component.scss | 8 +- Mohem/src/app/app.component.ts | 10 +- .../digital-id/digital-id.component.ts | 9 +- .../services-button.component.html | 2 +- .../services-button.component.scss | 5 + .../services-button.component.ts | 5 +- Mohem/src/app/home/home.page.html | 23 +- Mohem/src/app/home/home.page.ts | 22 +- .../my-team/details/details.component.html | 211 +----------------- .../app/my-team/details/details.component.ts | 14 +- .../src/app/my-team/home/home.component.html | 2 +- .../app/notification/home/home.component.html | 8 +- .../app/notification/home/home.component.ts | 92 +------- .../worklist-main.component.html | 4 +- Mohem/src/app/profile/home/home.component.ts | 14 +- Mohem/src/assets/icon/new-design/profile.png | Bin 0 -> 2482 bytes Mohem/src/assets/localization/i18n.json | 10 +- 18 files changed, 96 insertions(+), 351 deletions(-) create mode 100644 Mohem/src/assets/icon/new-design/profile.png diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 2e8eef89..079b58c9 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -27,14 +27,14 @@
- + @@ -125,14 +125,14 @@
- + diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 94ba6e4c..7633833b 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -343,10 +343,12 @@ button.menu-item.item.item-block.item-ios { margin-bottom: 70px; } .logoImg{ - width: 77px; - // position: relative; + // width: 77px; + // margin-top: -1px; + // margin-bottom: 180px; + width: 120px; margin-top: -1px; - margin-bottom: 180px; + margin-bottom: 135px; } .companyTxt { font-size: 12px; diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index b5a8ab2e..90a6786c 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -204,11 +204,11 @@ export class AppComponent implements OnInit { } else { this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'; } - // this.User_Job_name = user.JOB_NAME; - let jobTitle = user.POSITION_NAME.split('.'); - if (jobTitle && jobTitle.length > 1) { - this.User_Job_name = jobTitle[0] + " " + jobTitle[1]; - }​ + this.User_Job_name = user.JOB_NAME; + // let jobTitle = user.POSITION_NAME.split('.'); + // if (jobTitle && jobTitle.length > 1) { + // this.User_Job_name = jobTitle[0] + " " + jobTitle[1]; + // }​ //erm channel // if (!CommonService.SKIP) // this.cs.navigateForward('/erm-channel/survey'); diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.ts b/Mohem/src/app/authentication/digital-id/digital-id.component.ts index ab17b063..dcccde74 100644 --- a/Mohem/src/app/authentication/digital-id/digital-id.component.ts +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.ts @@ -22,10 +22,11 @@ export class DigitalIdComponent implements OnInit { } console.log(this.userInfo); if (this.userInfo) { - let jobTitle = this.userInfo.POSITION_NAME.split('.'); - if (jobTitle && jobTitle.length > 1) { - this.userJobName = jobTitle[0] + " " + jobTitle[1]; - }​ + // let jobTitle = this.userInfo.POSITION_NAME.split('.'); + this.userJobName = this.userInfo.JOB_NAME; + // if (jobTitle && jobTitle.length > 1) { + // this.userJobName = jobTitle[0] + " " + jobTitle[1]; + // }​ } } diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html index 0fa0da32..520f590d 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index 7be7a63d..32be242e 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -31,4 +31,9 @@ margin-top: 10px; color: black; font-weight: bold; +} + +.disable-filter { + pointer-events: none; + opacity: .4; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts index 5b1d9f4c..8c2b03d7 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts @@ -12,6 +12,7 @@ export class ServicesButtonComponent implements OnInit { @Input() buttonClass: any = ''; @Input() icon: string; @Input() title: string; + @Input() requestType: any; @Output() trigger = new EventEmitter(); @Input() focusicon: string; @Input() disabled = false; @@ -24,7 +25,9 @@ export class ServicesButtonComponent implements OnInit { public ts: TranslatorService ) {} - ngOnInit() {} + ngOnInit() { + console.log(this.requestType); + } public onClicked() {} } diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 57726bd5..6c6fe65d 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -29,33 +29,34 @@ - + - + - +
Team Member Image @@ -25,9 +23,6 @@
-

{{employee.EMPLOYEE_NAME}}

@@ -48,8 +43,7 @@
- - @@ -57,7 +51,6 @@ - @@ -65,7 +58,7 @@ {{ts.trPK('myTeam','profile-details')}} - + {{ts.trPK('vacation-rule','create-request')}} - - - - - - - - {{ts.trPK('myTeam','view-attendence')}} - - @@ -100,95 +81,9 @@
- - - -
- -
@@ -217,8 +112,6 @@
-
@@ -256,32 +149,6 @@ -
@@ -380,34 +247,8 @@ -
- - - + + {{ts.trPK('myTeam','my-team-members')}}
{{EmployeeTotal}}
- - - - -

{{ts.trPK('userProfile','profile-details')}}

@@ -510,10 +311,6 @@

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

{{employee.PAYROLL_NAME}}

-

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

{{jobName}}

diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 5edff21e..db913aff 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -235,7 +235,10 @@ export class DetailsComponent implements OnInit { ngOnInit() { this.common.startLoading(); this.intializeMemberDetail(); - this.showAttendanceTracking(); + this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false); + console.log(this.employee); + this.jobName = this.employee.JOB_NAME; + // this.showAttendanceTracking(); // tslint:disable-next-line: max-line-length this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex); } @@ -245,10 +248,11 @@ export class DetailsComponent implements OnInit { this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false); console.log(this.employee); - let jobTitle = this.employee.POSITION_NAME.split('.'); - if (jobTitle && jobTitle.length > 1) { - this.jobName = jobTitle[0] + " " + jobTitle[1]; - } + this.jobName = this.employee.JOB_NAME; + // let jobTitle = this.employee.POSITION_NAME.split('.'); + // if (jobTitle && jobTitle.length > 1) { + // this.jobName = jobTitle[0] + " " + jobTitle[1]; + // } const request = { P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 2280064d..fb9a73ad 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -133,7 +133,7 @@ diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index fe0b6141..2ae57a26 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -10,7 +10,7 @@
{{ts.trPK('work-list','open-analysis')}}
-
+
{{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} {{newWorkListResponse.length}} {{ts.trPK('work-list','of')}}

{{totalRequestCount}}

@@ -18,11 +18,11 @@

{{newWorkListResponse[0].NO_OF_ROWS}}

{{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
- +
- + - + {{ts.trPK('work-list','clear-search')}} diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 13add5f0..a1623c05 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -45,7 +45,6 @@ export class HomeComponent implements OnInit { public isAll = true; public isPR = false; public isPO = false; - public isMR = false; public isHR = false; public noData = false; public isITG = false; @@ -74,7 +73,6 @@ export class HomeComponent implements OnInit { public totalHR = 0; public totalPO = 0; public totalPR = 0; - public totalMR = 0; public totalIC = 0; public totalStamp = 0; @@ -89,17 +87,13 @@ export class HomeComponent implements OnInit { public data = { datasets: [ { - data: [0, 0, 0, 0, 0, 0, 0], + data: [0, 0, 0], backgroundColor: [ '#18a169', - '#3cb9d5', '#114475', - '#38c9b3', - '#cc3232', - '#9e7e97', - '#ff9800' + '#38c9b3' ], - borderWidth: 6 + borderWidth: 5 }] }; public filters = [ @@ -119,14 +113,6 @@ export class HomeComponent implements OnInit { key: 'HRSSA', disable: false }, - { - value: 0, - name: 'MR', - active: false, - color: '#3cb9d5', - key: 'INVMOA', - disable: false - }, { value: 0, name: 'PR', @@ -142,30 +128,6 @@ export class HomeComponent implements OnInit { color: '#38c9b3', key: 'POAPPRV', disable: false - }, - { - value: 0, - name: 'ITG', - active: false, - color: '#cc3232', - key: 'ITG', - disable: false - }, - { - value: 0, - name: 'IC', - active: false, - color: '#9e7e97', - key: 'INVITEM', - disable: false - }, - { - value: 0, - name: 'STAMP', - active: false, - color: '#ff9800', - key: 'STAMP', - disable: false } ]; @@ -227,7 +189,6 @@ export class HomeComponent implements OnInit { } callWorkListServices() { - this.Count(); this.getAllPushNotificationFun(); } @@ -237,7 +198,7 @@ export class HomeComponent implements OnInit { this.worklistNotifications = result; this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; this.common.sharedService.setSharedData(result, 'worklistNotifications'); - this.Details(); + // this.Details(); this.callWorkListServices(); } }); @@ -247,10 +208,8 @@ export class HomeComponent implements OnInit { this.ngZone.run(() => { this.filters[0].value = this.worklistNotifications.P_OPEN_NTF_NUMBER; this.filters[1].value = this.totalHR; - this.filters[2].value = this.totalMR; - this.filters[3].value = this.totalPR; - this.filters[4].value = this.totalPO; - this.filters[6].value = this.totalIC; + this.filters[2].value = this.totalPR; + this.filters[3].value = this.totalPO; }); @@ -266,39 +225,18 @@ export class HomeComponent implements OnInit { this.data.datasets[0].data[2] = 0; } - if (this.totalMR === 0) { - this.data.datasets[0].data[3] = 0; - } - - if (this.totalIC === 0) { - 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) { if (notification.ITEM_TYPE === 'HRSSA') { this.filters[1].value = this.totalHR; this.data.datasets[0].data[0] = notification.OPEN_NTF_NUMBER; - } else if (notification.ITEM_TYPE === 'INVMOA') { - this.filters[2].value = this.totalMR; - this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER; } else if (notification.ITEM_TYPE === 'REQAPPRV') { - this.filters[3].value = this.totalPR; + this.filters[2].value = this.totalPR; this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER; } else if (notification.ITEM_TYPE === 'POAPPRV') { - this.filters[4].value = this.totalPO; + this.filters[3].value = this.totalPO; this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER; - } 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; @@ -308,7 +246,7 @@ export class HomeComponent implements OnInit { } checkLoadingStatus() { - if (this.showChart && this.receivedITGCount) { + if (this.showChart) { this.common.stopLoading(); return true; } else { @@ -453,8 +391,6 @@ export class HomeComponent implements OnInit { this.totalPO = this.totalPO + 1; } else if (workList.ITEM_TYPE === 'REQAPPRV') { this.totalPR = this.totalPR + 1; - } else if (workList.ITEM_TYPE === 'INVMOA') { - this.totalMR = this.totalMR + 1; } else if (workList.ITEM_TYPE === 'INVITEM') { this.totalIC = this.totalIC + 1; } else if (workList.ITEM_TYPE === 'STAMP') { @@ -467,7 +403,6 @@ export class HomeComponent implements OnInit { this.totalHR = 0; this.totalPO = 0; this.totalPR = 0; - this.totalMR = 0; this.totalIC = 0; }) @@ -505,6 +440,7 @@ export class HomeComponent implements OnInit { } private handleWorkListResult(result: any) { + this.common.stopLoading(); console.log(this.filters); const lastItemIndex = result.length - 1; const lastitem = result[lastItemIndex]; @@ -542,7 +478,7 @@ export class HomeComponent implements OnInit { if (this.showFormattedData.length === 0) { this.resetFiltersUI(); } - this.data.datasets[0].data[4] = this.ITGCount; + // this.data.datasets[0].data[4] = this.ITGCount; this.showChart = true; // this.common.stopLoading(); this.isLoading = false; @@ -555,14 +491,10 @@ export class HomeComponent implements OnInit { this.filters[1].value = 0; this.filters[2].value = 0; this.filters[3].value = 0; - this.filters[4].value = 0; - this.filters[6].value = 0; this.data.datasets[0].data[0] = 0; this.data.datasets[0].data[1] = 0; this.data.datasets[0].data[2] = 0; - this.data.datasets[0].data[3] = 0; - this.data.datasets[0].data[5] = 0; }); } @@ -574,8 +506,6 @@ export class HomeComponent implements OnInit { this.common.openWorklistMainPRPage(); } else if (obj.REQUEST_TYPE === 'PO') { this.common.openWorklistMainPOPage(); - } else if (obj.REQUEST_TYPE === 'MO') { - this.common.openWorklistMainMRPage(); } else if (obj.REQUEST_TYPE === 'ITEM_CREATION') { this.common.openWorklistMainICPage(); } else { 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 b013ee39..4af4d073 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -264,7 +264,7 @@
- +
@@ -280,7 +280,7 @@
- +
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 6c05dd04..d1101201 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -105,10 +105,10 @@ export class HomeComponent implements OnInit { if (this.targetValue === 'sideMenu') { for (let i = 0; i < this.menuEntries.length; i++) { - if (this.menuEntries[i].MENU_NAME === 'MBL_E_PROFESSIONALS_01') { + if (this.menuEntries[i].MENU_NAME === 'MBL_E_HR_SS') { personalInformationChildren = this.menuEntries[i].children; for (let j = 0; j < personalInformationChildren.length; j++) { - if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 15) { + if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 5) { personalInfoNestedChildren = personalInformationChildren[j].children; for (let k = 0; k < personalInfoNestedChildren.length; k++) { if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') { @@ -145,11 +145,11 @@ export class HomeComponent implements OnInit { if (user) { console.log(user); this.personalInfo = user; - - let jobTitle = user.POSITION_NAME.split('.'); - if (jobTitle && jobTitle.length > 1) { - this.jobName = jobTitle[0] + " " + jobTitle[1]; - }​ + this.jobName = user.JOB_NAME; + // let jobTitle = user.POSITION_NAME.split('.'); + // if (jobTitle && jobTitle.length > 1) { + // this.jobName = jobTitle[0] + " " + jobTitle[1]; + // }​ if (this.cs.getUpdateImage().status) { this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img); diff --git a/Mohem/src/assets/icon/new-design/profile.png b/Mohem/src/assets/icon/new-design/profile.png new file mode 100644 index 0000000000000000000000000000000000000000..68411233d6402af2ab6b1b5e61b30f87ecd4017d GIT binary patch literal 2482 zcmV;j2~GBiP)i+Za0CW0s=cx)r9~RJSOK=<)v~D7mnC`#6 zx@dZyMu9m!-2DRt91%yOX}OEz&2irSt@Bzn(*f=31n z=;+1q)tT#}ntTp52*w++N6Zr(Ctwm#KCyhF)P=kY`#w9OeH|%!=mi5Aca~!VHvqsh z_--a6aqZ)y#2USrfc88kK}T@J{ho^lZ3V`5d^Ev1Y6*@d)}!Z2iGhu@mkR@+q!ef3 zHhAj_{F}p_fi?`($5C^Pz?eY6qZ33?&y`COivp&-VpsqGfr;O9^-<8|M{*6q2g1Yy zIQu7;Tc)FI1P0FSJIeZKP}F_bMI~`^Zk#F{0~&e;8aj0OtqB~PwPJzM=1|IaMFD;! zD5)&+3+fdgLhGfo3ZU`%8S;s2Jarkoz^p25+1ZrI&(5N;X<;Vku1aqdO5=s<{p z0Vu{^^hb%ea2y6snu8`i2tJgaMg9tdEy_bCfjK?c0bix;=KBzB5*dX$z#uKEe^|y6gx( z!yQE#1dr>a0dQ<>6ru<3$)2RvZ;q%cel;3Y8Zf{62H0*SOl4QNX`C#f|a z7D@xmSg9=6EPaa(jJ^WlZrXOR_&opvh9ds~lWGlCUFYF8(RU8cLZu|E z1!ma(9470#3cTci{|PXOc2D5%ymy@(rv#X?d9BI|pndaVvWRk^d;w3Nr;ZY44I!{( zvx?kYG+&7u2sIwcq-^@BDfI{KYn6OSU#kMgn79==Q8qbId@PB;k%>pDXbly|`FOv@ zIVqn8c}BiDB;0pTzaTpq>m&R`4qjGXY9kS7NvVF7KrcHP#WUbRlToaX){xp#(R!xy zawmoarY>2MS_qQVQ+XyZt>9}}H5@ogk`9??7*O1GLlg_(xThwUmgsQz6@WS_&QsOb zvI7GNEXpBEy+0o{FM-2l&G13Y)Q7<{TTp4Mjn~y|ZJFX`rjk`Af${YsIRLpMl|GNf zcijY(>6S{nu5^9c&|g#MSQh0am7^^e9(OxhEM8e_+!fUl6XHP_9@(_cWq4;`>IQvd zf2R?xBd=X0U3sSRkVi;F~9|A%v@{a#Ts@( zunmZDuZ+5ezdP3cmIMv7JP^>$*n0Geupm`%zwKJuSz0{GNN96SWX_BEPuq^!nuu_5 z0N7b@8&1-MdfdJdK-EEkRakXPCE!8Zs+?t;jS?4N0FELS0_mn9JX$Jx=2|w!bukX! zMeUG)3jvm3LU;kaDI?bkgKZO%(hT&&@P#}djs)VJz?`|%gANI3#Oy`yr4PUyAJmdS zEPB4GZ3AX`1h8l?!YQdes5y?u3SuQ}Z^@-BbP&mA-jfs`CuovML&s>d_>AtVx(&Nc zX^BaOXnlbV(Z!5E{$vi0>Xu0cE*ppyjWo6Com^r&7?8N`!d}~;EHy_L(HL+nSpq6i zm4+E{29G#r@W0vACRb|tUYb(WpqQ9xa7sn!88eR_4Qmb+?FxV3e;2?w+S$cWBABMm1?s!`c=V=I!*-IO_Xul03{uhO1vQv z7rP?Jb!6yc35-kGvdy$*Q()CvMD)2i!5T#l%?j#BBAY>`M>Nue(;*E)t|1x-8kZmqS15S3%W#lt0y zQcEpWuqy#$jeW8UX|TPcX?)1zgk9%E^zYPaW^njQvezxMGz~`1t)S{<^n|1%OSiM~ zy=u9kn@C2t1&)j6n|ce`_6(PSeZu>;0AK@5Q0^hZ}qx@f^#_m;{pz*DPXiglb6C>z(}9bm*Ev$_+qLQ zKA?C3lY(QsS{I++YbcQ%`DE&S04P42R2%S`Gv8`f;cB9@#$*L@xNf5X0+pV$r9rWV zD7;?WH3D0)391q>CTP$)TG2}q<%*XlvckM)1gWG$0Pmv0;odhcg@%|BRfxpqthrb>0o%y;XMo! z*RpFJPBHzq$;dZi#7d7f#!BC|d=l