diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index 3b38814c..73ed3634 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -10,7 +10,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}} *
@@ -255,7 +255,7 @@
- {{ts.trPK('confirmAddEit','start')}} + {{ts.trPK('confirmAddEit','start')}}
\ No newline at end of file diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 10fb5d89..be9894f5 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -219,7 +219,7 @@ ion-card-content.confirm-details{ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -266,7 +266,7 @@ ion-card-content.confirm-details{ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #29B5BF; + --background: #0ca2de; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts index d4a765a3..91c5c664 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts @@ -15,16 +15,17 @@ import { AbsenceAttachmentComponent } from '../absence-attachment/absence-attach import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; import { FileUploader } from 'ng2-file-upload'; import { SubmitAbsenceModalComponent } from '../submit-absence-modal/submit-absence-modal.component'; +import { HomeComponent } from "src/app/notification/home/home.component"; @Component({ selector: 'app-absence-confirm', templateUrl: './absence-confirm.component.html', styleUrls: ['./absence-confirm.component.scss'] }) export class AbsenceConfirmComponent implements OnInit { - direction:string; + direction: string; P_TransactionID: number; approversList = []; - selEmp: string = ''; + selEmp: any = ''; respID: number; absComments: string = ''; selMenu: MenuResponse; @@ -58,7 +59,7 @@ export class AbsenceConfirmComponent implements OnInit { this.P_TransactionID = this.common.sharedService.getSharedData( AbsenceResponse.SHARED_DATA ); - this.getPassNotificationDetails =this.common.sharedService.getSharedData( + this.getPassNotificationDetails = this.common.sharedService.getSharedData( AbsenceNotificatonBodyResponse.NOT_WORKLIST, true ); @@ -89,7 +90,7 @@ export class AbsenceConfirmComponent implements OnInit { this.getApproversList(); } - ngOnInit() {} + ngOnInit() { } startAbApproval() { if (this.attachListOver) { //first call add attach inside success call submit @@ -126,12 +127,12 @@ export class AbsenceConfirmComponent implements OnInit { this.startAbsApprovalProcess(); } else { //stope - let filtered = this.attachListOver.filter(function(el) { + let filtered = this.attachListOver.filter(function (el) { return el.isSuccess == true; }); this.attachListOver = filtered; let msg: string = ''; - // msg = this.translate.translate("addAttach.errorMsg"); + // msg = this.translate.translate("addAttach.errorMsg"); //this.common.showAlert(msg); } } @@ -168,11 +169,12 @@ export class AbsenceConfirmComponent implements OnInit { if (this.common.validResponse(result)) { this.isSubmitBtnClicked = true; //if(this.isResubmitAbs==false){ - let msg: string = this.ts.trPK('general', 'messageSuccess'); - this.common.presentAlert(msg); - + // let msg: string = this.ts.trPK('general', 'messageSuccess'); + // this.common.presentAlert(msg); + this.common.greenToastPK("eit", "approval-message-success") // } // this.navCtrl.popToRoot(); + this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } } @@ -204,61 +206,61 @@ export class AbsenceConfirmComponent implements OnInit { // }); const modal = await this.modalCtrl.create({ component: AbsenceAttachmentComponent, - componentProps:{ indexLastObj: this.attachListOver.length, TransactionID: this.P_TransactionID}, + componentProps: { indexLastObj: this.attachListOver.length, TransactionID: this.P_TransactionID }, keyboardClose: true, animated: false - }); + }); modal.onDidDismiss() - .then((data) => { - if (data == 'cancel' || data == 'undefined') { - return; - } else { - if (!str) { - this.updateFile(data, attachDocID); + .then((data) => { + if (data == 'cancel' || data == 'undefined') { + return; } else { - this.attachListDisplay = data.data; - this.attachItems = this.attachListDisplay.map(function (el) { - var o = Object.assign({}, el); - o.isSuccess = false; - return o; - }); - this.attachListOver = this.attachListOver ? this.attachListOver.concat(this.attachItems) : this.attachItems; + if (!str) { + this.updateFile(data, attachDocID); + } else { + this.attachListDisplay = data.data; + this.attachItems = this.attachListDisplay.map(function (el) { + var o = Object.assign({}, el); + o.isSuccess = false; + return o; + }); + this.attachListOver = this.attachListOver ? this.attachListOver.concat(this.attachItems) : this.attachItems; + } } - } - }); + }); return await modal.present(); } -/*****submit modal********/ -async openSubmitModal() { - this.common.sharedService.setSharedData( this.attachListOver, 'submitAbsAttachmentList'); - this.common.sharedService.setSharedData(this.absComments, 'absComments'); - const modal = await this.modalCtrl.create({ - component: SubmitAbsenceModalComponent, - backdropDismiss: false, + /*****submit modal********/ + async openSubmitModal() { + this.common.sharedService.setSharedData(this.attachListOver, 'submitAbsAttachmentList'); + this.common.sharedService.setSharedData(this.absComments, 'absComments'); + const modal = await this.modalCtrl.create({ + component: SubmitAbsenceModalComponent, + backdropDismiss: false, - }); - modal.cssClass = 'note-modal'; + }); + modal.cssClass = 'note-modal'; - modal.onDidDismiss() - .then((data) => { - console.log(data.data); + modal.onDidDismiss() + .then((data) => { + console.log(data.data); - if (data.data == 'cancel' || data.data == undefined) { - return; - } else { - this.startAbApproval(); - } - }); + if (data.data == 'cancel' || data.data == undefined) { + return; + } else { + this.startAbApproval(); + } + }); - return await modal.present(); + return await modal.present(); -} + } @@ -266,7 +268,7 @@ async openSubmitModal() { removeFile(objectitem) { - + if (this.attachListOver) { let index2 = this.attachListOver.findIndex(item => item == objectitem); if (index2 > -1) { @@ -300,12 +302,12 @@ async openSubmitModal() { } // valid it } - async OpenAttachFiles(value, Type) { + async OpenAttachFiles(value, Type) { this.common.sharedService.setSharedData({ displayData: value, TypeData: Type }, 'WorkListAttachViewPage'); const modal = await this.modalCtrl.create({ component: WorkListAttachViewComponent }); - + modal.onDidDismiss() .then((data) => { }); @@ -314,7 +316,7 @@ async openSubmitModal() { } updateFile(attachList, attachDocID) { - + let req = { P_ATTACHED_DOCUMENT_ID: attachDocID, P_FILE_DATA: attachList[0].P_FILE_DATA, @@ -327,7 +329,7 @@ async openSubmitModal() { let msg: string = ''; // msg = this.translate.translate("addAttach.attachUpdate"); // this.common.showAlert(msg); - + this.getAttachment(this.getPassNotificationDetails.NOTIFICATION_ID); } } // val @@ -345,7 +347,7 @@ async openSubmitModal() { // }); } continueDelete(attach) { - + let req = { P_ATTACHED_DOCUMENT_ID: attach.ATTACHED_DOCUMENT_ID }; @@ -367,9 +369,9 @@ async openSubmitModal() { - /*******************Add attchement Functions*************/ + /*******************Add attchement Functions*************/ - public uploader: FileUploader = new FileUploader({ + public uploader: FileUploader = new FileUploader({ allowedMimeType: ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'], maxFileSize: 10 * 1024 * 1024, formatDataFunctionIsAsync: true, @@ -386,7 +388,7 @@ async openSubmitModal() { }); - onFileSelectedclick(event){ + onFileSelectedclick(event) { event.target.value = ''; } @@ -430,7 +432,7 @@ async openSubmitModal() { pushObject(fileData, name, type) { - console.log('before push: '+ this.index); + console.log('before push: ' + this.index); //this.attachListOver.length++; try { let array = name.split('.'); @@ -438,11 +440,11 @@ async openSubmitModal() { this.attachListOver.push( { - AttachmentID: this.attachListOver.length, + AttachmentID: this.attachListOver.length, P_FILE_CONTENT_TYPE: attachType,//type.split('/')[1], P_FILE_DATA: fileData.split(',')[1], P_FILE_NAME: name,//.split('.')[0], - P_TRANSACTION_ID: this.P_TransactionID + P_TRANSACTION_ID: this.P_TransactionID }) } catch (e) { diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html index d86a6c96..71480043 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html @@ -123,10 +123,10 @@
- + {{'general, submit' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index d40eeabb..cff691d6 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -14,7 +14,7 @@ + [headerText]="headerTitle"> diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 78086d9e..a56d8ae8 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -357,7 +357,7 @@ max-height: 4cm; margin-right: 12px; } .used-label-container{ - // border-top: 5px solid #c2a16b; + // border-top: 5px solid #292F42; // padding: 1px 0px; // margin: 15px 0px width: 12px; diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index b3c4c8cf..83a36c88 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -95,19 +95,20 @@ export class HomeComponent implements OnInit { false ); this.leaveAccrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false); - console.log("this.leaveAccrualBalance>>>>>>>>>>" + this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT); + this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; + //console.log("this.leaveAccrualBalance>>>>>>>>>>" + this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT); /*** ACCRUAL_NET_ENTITLEMENT: 24.59 ACCRUAL_USED_ENTITLEMENT: 0 ACCRUAL_YEARLY_ENTITLEMENT: 50.4*/ - this.accrualNet = this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT; - this.accrualUsed = this.leaveAccrualBalance.ACCRUAL_USED_ENTITLEMENT; - this.accrualYearly = this.leaveAccrualBalance.ACCRUAL_YEARLY_ENTITLEMENT; + this.accrualNet = this.leaveAccrualBalance ? this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT : 0; + this.accrualUsed = this.leaveAccrualBalance ? this.leaveAccrualBalance.ACCRUAL_USED_ENTITLEMENT : 0; + this.accrualYearly = this.leaveAccrualBalance ? this.leaveAccrualBalance.ACCRUAL_YEARLY_ENTITLEMENT : 0; this.totalnumber = this.accrualNet + this.accrualUsed + this.accrualYearly; this.totalnumber = this.totalnumber.toFixed(3); this.request = this.common.sharedService.getSharedData('leaveAccrualBalanceDate', false); - console.log("this.request" + this.request.P_EFFECTIVE_DATE); - this.effectiveDate = this.request.P_EFFECTIVE_DATE; + //console.log("this.request" + this.request.P_EFFECTIVE_DATE); + this.effectiveDate = this.request ? this.request.P_EFFECTIVE_DATE : ''; this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ @@ -262,8 +263,8 @@ export class HomeComponent implements OnInit { this.balance = result.GetAccrualBalancesList; } if (this.balance) { - this.accrualNet = this.balance[0].ACCRUAL_NET_ENTITLEMENT; - this.accrualUsed = this.balance[0].ACCRUAL_USED_ENTITLEMENT; + this.accrualNet = this.balance[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUsed = this.balance[1].ACCRUAL_USED_ENTITLEMENT; // this.accrualYearly = this.balance[0].ACCRUAL_YEARLY_ENTITLEMENT; // this.totalnumber= this.accrualNet + this.accrualUsed + this.accrualYearly; this.totalnumber = this.accrualNet + this.accrualUsed; diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss index 180ea1a7..6f5e22c1 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -14,10 +14,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #29B5BF; + --background: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } 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 159c4842..463eb444 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -322,7 +322,8 @@ export class SubmitAbsenceComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -333,7 +334,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -352,7 +354,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -363,7 +366,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -382,7 +386,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -393,7 +398,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -423,7 +429,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -434,7 +441,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -448,7 +456,8 @@ export class SubmitAbsenceComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -458,7 +467,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( diff --git a/Mohem/src/app/app-routing.module.ts b/Mohem/src/app/app-routing.module.ts index a515c255..1f7867ef 100644 --- a/Mohem/src/app/app-routing.module.ts +++ b/Mohem/src/app/app-routing.module.ts @@ -26,10 +26,15 @@ const routes: Routes = [ { path: 'mowadhafi', loadChildren: './mowadhafi/mowadhafi.module#MowadhafiPageModule' }, { path: 'erm-channel', loadChildren: './erm-channel/erm-channel.module#ErmChannelPageModule' }, { path: 'backend-integrations', loadChildren: './backend-integrations/backend-integrations.module#BackendIntegrationsPageModule' }, - { path: 'sit', loadChildren: './sit/sit.module#SitPageModule' }, { path: 'reports', loadChildren: './reports/reports.module#ReportsPageModule' }, + { path: 'sit', loadChildren: './sit/sit.module#SitPageModule' }, { path: 'termination', loadChildren: './termination/termination.module#TerminationPageModule' }, { path: 'pending-transaction', loadChildren: './pending-transaction/pending-transaction.module#PendingTransactionPageModule' } + + + + + ]; @NgModule({ diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index e5ad5e31..24aa65f7 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -1,13 +1,13 @@ - + -
-
- - -
-
+
-
+

- - - + @@ -45,6 +52,15 @@ + + - -
- - + + + + + - + @@ -108,25 +131,39 @@ -
- - -
+ + + + + + + + - + -
-
- - -
-
+
-
+

- - + @@ -161,6 +206,16 @@ {{ts.trPK('myTeam','myTeam-header')}} + + + - -
- - + - - - + + + - + @@ -248,15 +309,31 @@ --> -
- + + + -
-
@@ -247,8 +378,34 @@ -
-
+
+ + +
{{ts.trPK('myTeam','my-team-members')}}
{{EmployeeTotal}}
+ + + + +

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

@@ -305,15 +502,19 @@

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

-

{{jobName}}

+

{{employee.POSITION_NAME}}

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

{{employee.PAYROLL_NAME}}

+

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

-

{{jobName}}

+

{{employee.POSITION_NAME}}

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

diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 51a35230..2b508f38 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -1,7 +1,8 @@ ion-content { --ion-background-color: whitesmoke; } -ion-title{ + +ion-title { color: white; position: absolute; top: 0; @@ -13,25 +14,27 @@ ion-title{ height: 100%; font-family: WorkSans-Regular; } -.contentBg{ + +.contentBg { padding: 0px 20px; } .contentBg:before { position: absolute; - content: ""; - background: #29B5BF; - height: 140px; - width: 100%; - left: 0; - top: 0px; - z-index: 1; -} - - .user-info{ - text-align: center; - margin-bottom: 15px; - .user-image-container{ + content: ""; + background: #29B5BF; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; +} + +.user-info { + text-align: center; + margin-bottom: 15px; + + .user-image-container { position: relative; width: 100%; height: 24px; @@ -40,101 +43,113 @@ ion-title{ margin: 0 auto; align-items: center; } - // position: relative; - // width: 80px; - // height: 80px; - // display: block; - // margin: 0 auto; - // &:before{ - // position: absolute; - // content: ""; - // width: 20px; - // height: 20px; - // border-radius: 20px; - // border: 1px solid white; - // top: 0; - // right: 0; - // background-color: red; - // z-index: 9; - // } - // &.present:before{ - // background-color: green !important; - // } - } - - @media screen and (min-width: 1px) and (max-width:767px){ - .user-image{ - position: relative; - display: block; - width: 30%; - height: 100%; - border-radius: 80px; - /* border: 1px solid #ccc; */ - margin-top: -125px; - }} - @media screen and (min-width: 768px) and (max-width:1024px){ - .user-image{ + // position: relative; + // width: 80px; + // height: 80px; + // display: block; + // margin: 0 auto; + // &:before{ + // position: absolute; + // content: ""; + // width: 20px; + // height: 20px; + // border-radius: 20px; + // border: 1px solid white; + // top: 0; + // right: 0; + // background-color: red; + // z-index: 9; + // } + // &.present:before{ + // background-color: green !important; + // } +} + +@media screen and (min-width: 1px) and (max-width:767px) { + .user-image { + position: relative; + display: block; + width: 30%; + height: 100%; + border-radius: 80px; + /* border: 1px solid #ccc; */ + margin-top: -125px; + + } +} + +@media screen and (min-width: 768px) and (max-width:1024px) { + .user-image { position: relative; display: block; width: 30%; height: 100%; border-radius: 80px; margin-bottom: 371px; - }} - h1{ - margin: 0; - padding: 0; - font-family: WorkSans-Bold; - font-size: 18px; - margin-bottom: 4px; - } - span{ - font-size: 12px; - display: block; - // color: #888 - - } - - $actionBtnSize : 36px; - .user-actions{ - text-align: center; - margin-left: 1px; - .action-button{ - font-size: 11px; - font-weight: bold; - // white-space: nowrap; - // color: #888; - .action-button-icon{ - width: $actionBtnSize; - height: $actionBtnSize; - border-radius: $actionBtnSize; - margin: 0 auto; - display: block; - background-color: #29B5BF; - line-height: $actionBtnSize; - margin-bottom: 3px; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - display: flex; - img{ - margin: 0 auto; - vertical-align: middle; - } - .span{ + } +} + +h1 { + margin: 0; + padding: 0; + font-family: WorkSans-Bold; + font-size: 18px; + margin-bottom: 4px; +} + +span { + font-size: 12px; + display: block; + // color: #888 + +} + +$actionBtnSize : 36px; + +.user-actions { + text-align: center; + margin-left: 1px; + + .action-button { + font-size: 11px; + font-weight: bold; + + // white-space: nowrap; + // color: #888; + .action-button-icon { + width: $actionBtnSize; + height: $actionBtnSize; + border-radius: $actionBtnSize; + margin: 0 auto; + display: block; + background-color: #29B5BF; + line-height: $actionBtnSize; + margin-bottom: 3px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + display: flex; + + img { + margin: 0 auto; + vertical-align: middle; + } + + .span { font-size: 10px; display: block; font-family: var(--fontFamilyPoppins-SemiBold, inherit); - } - } - } - } + } + } + } +} - .employee-information-indetail{ +.employee-information-indetail { background: #FFFFFF 0% 0% no-repeat padding-box; box-shadow: 0px 0px 5px #00000029; border-radius: 20px; opacity: 1; - } +} + // .employee-information-indetail{ // background: white; // margin-top: 15px; @@ -169,7 +184,7 @@ ion-title{ color: black; } -@media screen and (min-width: 1px) and (max-width:767px){ +@media screen and (min-width: 1px) and (max-width:767px) { .active-Segment { width: 11%; max-width: 11%; @@ -180,15 +195,17 @@ ion-title{ border-radius: 50% !important; // margin-right: 22px; // margin-left: 22px; - margin-left: 19px; + margin-left: 30px; + margin-right: 30px; background-color: #29B5BF; display: flex; - } } - @media screen and (min-width: 768px) and (max-width:1024px){ - .active-Segment{ +} - background: #29B5BF !important; +@media screen and (min-width: 768px) and (max-width:1024px) { + .active-Segment { + + background: #29B5BF !important; // padding-left: 17px; // display: flex; width: 11%; @@ -203,11 +220,12 @@ ion-title{ margin-left: 57px; // margin-left: 14px; display: flex; - - }} - @media screen and (min-width: 1px) and (max-width:767px){ - .normal-Segment { + } +} + +@media screen and (min-width: 1px) and (max-width:767px) { + .normal-Segment { width: 11%; max-width: 11%; min-width: 39px; @@ -217,14 +235,15 @@ ion-title{ border-radius: 50% !important; // margin-right: 22px; // margin-left: 22px; - margin-left: 15px; + margin-left: 30px; background: #414040 !important; display: flex; - - } + margin-right: 30px; } - @media screen and (min-width: 768px) and (max-width:1024px){ - .normal-Segment{ +} + +@media screen and (min-width: 768px) and (max-width:1024px) { + .normal-Segment { width: 11%; max-width: 11%; min-width: 39px; @@ -238,12 +257,13 @@ ion-title{ // margin-left: 14px; background: #414040 !important; display: flex; - }} + } +} - - @media screen and (min-width: 1px) and (max-width:767px){ - .imgSize{ + +@media screen and (min-width: 1px) and (max-width:767px) { + .imgSize { position: absolute; /* right: 15px; */ top: 0; @@ -252,22 +272,28 @@ ion-title{ margin: auto; height: 18px; display: flex; - }} - @media screen and (min-width: 768px) and (max-width:1024px){ - .imgSize{position: absolute; + } +} + +@media screen and (min-width: 768px) and (max-width:1024px) { + .imgSize { + position: absolute; top: 0; bottom: 0; - left: 2px; + left: 2px; margin: auto; height: 28px; - display: flex;}} + display: flex; + } +} - .colum-container{ +.colum-container { padding: 15px; border-bottom: 1px solid #ccc; - } - .img{ +} + +.img { width: 100px; height: 100px; display: inline-flex; @@ -277,21 +303,24 @@ ion-title{ /* top: 34px; */ background: transparent; margin-left: -3px; - } - ///////////////////////// Team Members css //////////////////////@extend +} + +///////////////////////// Team Members css //////////////////////@extend .filters-row { margin-top: 10px; } -.search-dropdown{ +.search-dropdown { background: #29B5BF; + ion-select { - .select-text{ + .select-text { margin-left: -10px; } - .select-icon{ - .select-icon-inner{ + + .select-icon { + .select-icon-inner { opacity: 1; color: white; margin-top: -1px; @@ -300,27 +329,31 @@ ion-title{ } } -.input-container{ +.input-container { background: white; - ion-input{ + + ion-input { border-bottom-color: transparent; } } -.search-container{ +.search-container { margin-top: 15px; - ion-col{ + + ion-col { background: white; border-radius: 12px; padding-right: 10px; flex: none; - ion-icon{ + + ion-icon { margin-right: 3px; font-size: 14px; margin-left: 3px; vertical-align: middle; } - span{ + + span { font-size: 12px; vertical-align: middle; } @@ -329,39 +362,42 @@ ion-title{ /////////////////////////////////////////////////////// Attendance /////////////////////// -.header{ +.header { // margin-top: 20px; margin-top: 1px; } -.slidPrev{ +.slidPrev { margin-left: 10px; background: transparent; } - -.slidNext{ + +.slidNext { background: transparent; margin-top: -1px; margin-left: 43px; } -.activeArrow{ + +.activeArrow { height: 20px; width: 20px; color: #29B5BF; } -.disabledArrow{ + +.disabledArrow { height: 20px; width: 20px; color: gray; } -.activeArrow-ar{ +.activeArrow-ar { height: 20px; - width: 20px; - color: #29B5BF; - margin-right: 275px; + width: 20px; + color: #29B5BF; + margin-right: 275px; } -.disabledArrow-ar{ + +.disabledArrow-ar { height: 20px; width: 20px; color: gray; @@ -369,22 +405,23 @@ ion-title{ margin-right: -251px; } -@media screen and (min-width: 1px) and (max-width:767px){ -.result-graph { - position: relative; - background: white; - // margin-top: 20px; - padding-bottom: 5px; - border-radius: 20px; - z-index: 1; - margin-bottom: 10px; - margin-top: 56px; - border-radius: 20px; - border: 1px solid #ccc; - padding-top: 12px; -}} +@media screen and (min-width: 1px) and (max-width:767px) { + .result-graph { + position: relative; + background: white; + // margin-top: 20px; + padding-bottom: 5px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 56px; + border-radius: 20px; + border: 1px solid #ccc; + padding-top: 12px; + } +} -@media screen and (min-width: 768px) and (max-width:1024px){ +@media screen and (min-width: 768px) and (max-width:1024px) { .result-graph { position: relative; background: white; @@ -397,7 +434,9 @@ ion-title{ border-radius: 20px; border: 1px solid #ccc; padding-top: 114px !important; - }} + } +} + .result-graph-attendence { position: relative; background: white; @@ -418,7 +457,8 @@ ion-title{ margin-bottom: 10px; margin-left: 10px; } -.request-heading-ar{ + +.request-heading-ar { text-align: right; display: block; padding-top: 8px; @@ -435,12 +475,14 @@ ion-title{ display: block; text-align: center; transform: translate(-50%, -50%); + h2 { font-size: 38px; font-family: WorkSans-Bold; margin: 0 auto; line-height: 36px; } + span { width: 125px; display: block; @@ -448,57 +490,61 @@ ion-title{ font-size: 12px; font-family: workSans-Regular; } - } - @media screen and (min-width: 325px){ - .today-graph { - // width: 100%; - max-height: 4cm; - display: block; - height: 132px; - width: 264px; - margin-left: 154px; - }} - @media screen and (min-width: 1px) and (max-width:320px) { - .today-graph { - // width: 100%; - max-height: 4cm; - display: block; - height: 132px; - width: 264px; - margin-left: 84px; - }} +} - .today-graph-ar { +@media screen and (min-width: 325px) { + .today-graph { + // width: 100%; + max-height: 4cm; + display: block; + height: 132px; + width: 264px; + margin-left: 154px; + } +} + +@media screen and (min-width: 1px) and (max-width:320px) { + .today-graph { + // width: 100%; + max-height: 4cm; + display: block; + height: 132px; + width: 264px; + margin-left: 84px; + } +} + +.today-graph-ar { max-height: 4cm; display: block; height: 132px; width: 264px; margin-right: -74px; - } +} -.green-label{ +.green-label { font-size: 12px; margin-top: -13px; } - -.green-amount{ + +.green-amount { font-size: 17px; font-family: WorkSans-Bold; margin-top: -3px; } - -.blue-label{ + +.blue-label { font-size: 12px; margin-top: -13px; } - -.blue-amount{ + +.blue-amount { font-size: 17px; font-family: WorkSans-Bold; margin-top: -4px; } -.labelGrid{ +.labelGrid { background-color: white !important; border-radius: 20px !important; height: 88px !important; @@ -511,21 +557,22 @@ ion-title{ line-height: 11px !important; display: block; } + h2 { font-size: 25px; font-weight: bold; display: block; text-align: right; - margin:0; + margin: 0; position: absolute; bottom: 0; - left:0; + left: 0; width: 100%; padding: 10px; } } -.bodyGrid{ +.bodyGrid { margin-top: 7px !important; margin-left: 15px !important; margin-right: 15px !important; @@ -535,7 +582,7 @@ ion-title{ border: 1px solid #d6d4d4 !important; } -.attendance-information{ +.attendance-information { background: white; border-radius: 20px; padding: 9px; @@ -543,19 +590,20 @@ ion-title{ // border-right: 1px solid rgb(221, 221, 221); // @media screen and (min-width: 300px) and (max-width:359px) { - h2{ - padding: 0; - margin: 0; - font-size: 10px; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - } - span{ - font-size: 10px; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - } - + h2 { + padding: 0; + margin: 0; + font-size: 10px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + } + + span { + font-size: 10px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + } + // } - + // @media screen and (min-width: 360px) { // h2{ // padding: 0; @@ -568,41 +616,49 @@ ion-title{ // font-family: var(--fontFamilyPoppins-SemiBold, inherit); // margin-bottom: 3px; // } - + // } - } - @media screen and (min-width: 325px) { - .statsIcon{ - background: white; - margin-left: 12px; - margin-top: 6px; - }} - @media screen and (min-width: 1px) and (max-width:320px) { - .statsIcon{ - background: white; - margin-left: -15px; - margin-top: 6px; - }} - - @media screen and (min-width: 325px) { - .statsIcon-ar{ - background: white; -// margin-left: 12px; - margin-top: 6px; -}} +} + +@media screen and (min-width: 325px) { + .statsIcon { + background: white; + margin-left: 12px; + margin-top: 6px; + } +} + +@media screen and (min-width: 1px) and (max-width:320px) { + .statsIcon { + background: white; + margin-left: -15px; + margin-top: 6px; + } +} + +@media screen and (min-width: 325px) { + .statsIcon-ar { + background: white; + // margin-left: 12px; + margin-top: 6px; + } +} + @media screen and (min-width: 1px) and (max-width:320px) { -.statsIcon-ar{ - background: white; - margin-right: -2px; - margin-top: 6px; -}} -.month-year-span{ + .statsIcon-ar { + background: white; + margin-right: -2px; + margin-top: 6px; + } +} + +.month-year-span { font-size: 16px; // font-family: WorkSans-Bold; font-weight: bold; } -.green-label-container{ +.green-label-container { // border-top: 5px solid #29B5BF; // padding: 1px 0px; // margin: 15px 0px @@ -611,21 +667,22 @@ ion-title{ padding-right: -10px; border-radius: 100%; background-color: #29B5BF; - + } -.blue-label-container{ - // border-top: 5px solid #c2a16b; +.blue-label-container { + // border-top: 5px solid #292F42; // padding: 1px 0px; // margin: 15px 0px width: 12px; height: 12px; padding-right: -10px; border-radius: 100%; - background-color: #c2a16b; + background-color: #292F42; margin-top: 30px; } -.span-one{ + +.span-one { // display: block; // font-size: 12px; // color: black; @@ -635,9 +692,10 @@ ion-title{ margin-left: 6px; margin-top: -2px; font-weight: bold; - + } -.span-two{ + +.span-two { // display: block; // font-size: 22px; display: block; @@ -647,10 +705,10 @@ ion-title{ margin-top: -2px; font-weight: bold; font-family: WorkSans-Bold; - + } -.spa-one{ +.spa-one { // display: block; // font-size: 12px; // color: black; @@ -660,9 +718,10 @@ ion-title{ margin-left: 6px; margin-top: 28px; font-weight: bold; - + } -.spa-two{ + +.spa-two { // display: block; // font-size: 22px; display: block; @@ -672,138 +731,154 @@ ion-title{ margin-top: 28px; font-weight: bold; font-family: WorkSans-Bold; - + } -.graph-container{ + +.graph-container { margin-left: -50px; position: relative; margin-right: 50px; } -.graph-container-ar{ +.graph-container-ar { margin-right: -50px; position: relative; margin-left: 50px; } -.label-container{ + +.label-container { position: absolute; // width: 20%; // right: 30px; top: 50%; margin-top: -27px; left: 20px; - + } -@media screen and (min-width: 325px){ -.attendance-summary .attendance-information { - span{ - height: 32px; - display: block; - line-height: 14px; - } - h2{ - // text-align: right; - // font-family: WorkSans-Bold; - font-weight: bolder; - font-size: 13px; + +@media screen and (min-width: 325px) { + .attendance-summary .attendance-information { + span { + height: 32px; + display: block; + line-height: 14px; + } + + h2 { + // text-align: right; + // font-family: WorkSans-Bold; + font-weight: bolder; + font-size: 13px; + } + } - -}} +} + @media screen and (min-width: 1px) and (max-width:320px) { -.attendance-summary .attendance-information { - span{ - height: 32px; - display: block; - line-height: 7px; - font-size: 7px; - } - h2{ - // text-align: right; - // font-family: WorkSans-Bold; - font-weight: bolder; - font-size: 13px; + .attendance-summary .attendance-information { + span { + height: 32px; + display: block; + line-height: 7px; + font-size: 7px; + } + + h2 { + // text-align: right; + // font-family: WorkSans-Bold; + font-weight: bolder; + font-size: 13px; + } + } - -}} +} -.calendar-container{ +.calendar-container { background: white; - margin-bottom: 100px; + // margin-bottom: 100px; margin-top: 10px; border-radius: 20px; border: 1px solid #ccc; padding-bottom: 25px; - span{ + + span { text-align: left; display: block; padding-top: 8px; margin-bottom: 10px; margin-left: 10px; } - } - .calendar-container-ar{ +} + +.calendar-container-ar { background: white; - margin-bottom: 100px; + // margin-bottom: 100px; margin-top: 20px; border-radius: 20px; - span{ - text-align: right; - display: block; - padding-top: 8px; - margin-bottom: 6px; - margin-right: 12px; + padding-bottom: 15px; + + span { + text-align: right; + display: block; + padding-top: 8px; + margin-bottom: 6px; + margin-right: 12px; } - } +} - -.Boldtext{ + +.Boldtext { // font-size: 13px; // font-family: WorkSans-Bold; // color: black !important; // display: block !important; text-align: center; - letter-spacing: -0.64px; - color: #2B353E; + letter-spacing: -0.52px; + color: #5C6F79; + font-weight: bold; opacity: 1; font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-size: 16px; line-height: 19px; } -.attendence{ - position: relative; +.attendence { + position: relative; background: white; border-radius: 20px; border: 1px solid #ccc; } -.attendence-text{ +.attendence-text { margin-bottom: 1px; margin-left: 10px; // font-family: WorkSans-Bold; font-size: 16px; font-family: var(--fontFamilyPoppins-SemiBold, inherit); } -.stats{ - color: #289DB8; font-size: 9px; - margin-right: 5px; - font-family: 'WorkSans-Bold'; + +.stats { + color: #289DB8; + font-size: 9px; + margin-right: 5px; + font-family: 'WorkSans-Bold'; } -.stats-ar{ - color: #289DB8; font-size: 9px; - margin-left: 5px; - font-family: 'WorkSans-Bold'; +.stats-ar { + color: #289DB8; + font-size: 9px; + margin-left: 5px; + font-family: 'WorkSans-Bold'; } -.text{ +.text { font-size: 16px; font-weight: bolder; font-family: 'WorkSans-Bold'; margin-top: 27px; } -.number{ +.number { width: 22px; height: 20px; border-radius: 100%; @@ -813,7 +888,7 @@ ion-title{ padding-left: 4px; } -.number-ar{ +.number-ar { width: 22px; height: 20px; border-radius: 100%; @@ -823,7 +898,7 @@ ion-title{ padding-right: 4px; } -.numberEmp{ +.numberEmp { color: white; font-size: 12px; font-weight: bolder; @@ -831,46 +906,52 @@ ion-title{ padding-top: 2px; } -.slider-container{ +.slider-container { padding-bottom: 20px; } .filters-row { margin-top: 10px; margin-left: 20px; - } +} - .disable-filter { - pointer-events: none; - opacity: .3; - } -.favIcon{ - height: 18px; margin-left: 23px; +.disable-filter { + pointer-events: none; + opacity: .3; } -.favIcon-ar{ - height: 18px; margin-right: 23px; +.favIcon { + height: 18px; + margin-left: 23px; } -.call{ +.favIcon-ar { + height: 18px; + margin-right: 23px; +} + +.call { margin-right: 16px; } - -.call-ar{ + +.call-ar { margin-left: 16px; } -.name{ + +.name { text-align: center; letter-spacing: -0.84px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-family: 'Inter' !important; line-height: 21px; font-size: 21px; } -.email{ + +.email { text-align: center; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-family: 'Inter' !important; font-size: 13px; line-height: 6px; letter-spacing: -0.52px; @@ -878,101 +959,119 @@ ion-title{ opacity: 1; padding-top: 3px; } -.subTitle{ + +.subTitle { text-align: center; - letter-spacing: -0.52px; - color: #A2A2A2; + letter-spacing: -0.56px; + color: #004D71; + font-weight: bold; opacity: 1; font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-size: 13px; - line-height: 0px; + line-height: 0px; } -.profile{ - text-align: left; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - line-height: 20px; - font-size: 20px; - letter-spacing: -0.8px; - color: #2B353E; - opacity: 1; - margin-top: 20px; - margin-bottom: 2px; -} -.label1{ + +.profile { + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 20px; + font-size: 20px; + letter-spacing: -0.8px; + color: #004D71; + font-weight: bold; + opacity: 1; + margin-top: 20px; + margin-bottom: 2px; +} + +.label1 { text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 0px; - font-size: 13px; - letter-spacing: -0.52px; - color: #A2A2A2; + font-size: 14px; + letter-spacing: -0.56px; + color: #5C6F79; + font-weight: bold; opacity: 1; } -.label2{ +.label2 { text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 5px; font-size: 16px; letter-spacing: -0.64px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; } -.profile-ar{ +.profile-ar { text-align: right; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - line-height: 20px; - font-size: 20px; - letter-spacing: -0.8px; - color: #2B353E; - opacity: 1; - margin-top: 20px; - margin-bottom: 2px; -} -.label1-ar{ -text-align: right; -font-family: var(--fontFamilyPoppins-SemiBold, inherit); -line-height: 0px; -font-size: 13px; -letter-spacing: -0.52px; -color: #A2A2A2; -opacity: 1; -} - -.label2-ar{ -text-align: right; -font-family: var(--fontFamilyPoppins-SemiBold, inherit); -line-height: 5px; -font-size: 16px; -letter-spacing: -0.64px; -color: #2B353E; -opacity: 1; -} -@media screen and (min-width: 768px) and (max-width:1024px){ -.div{ - position: relative; - display: flex; - margin-left: 48px; - -}} -@media screen and (min-width: 1px) and (max-width:767px){ -.div{ - position: relative; - display: flex; - margin-left: -1px; -}} + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 20px; + font-size: 20px; + letter-spacing: -0.8px; + color: #004D71; + font-weight: bold; + opacity: 1; + margin-top: 20px; + margin-bottom: 2px; + padding: 5px; + font-weight: bold; +} -.MyTeamdiv{ +.label1-ar { + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 0px; + font-size: 18px; + letter-spacing: -0.56px; + color: #5C6F79; + font-weight: bold; + opacity: 1; + padding: 1px 5px 1px 5px; +} + +.label2-ar { + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 5px; + font-size: 18px; + letter-spacing: -0.64px; + color: #004D71; + font-weight: bold; + opacity: 1; + padding: 1px 5px 1px 5px; +} + +@media screen and (min-width: 768px) and (max-width:1024px) { + .div { + position: relative; + display: flex; + margin-left: 48px; + + } +} + +@media screen and (min-width: 1px) and (max-width:767px) { + .div { + position: relative; + display: flex; + margin-left: -1px; + } +} + +.MyTeamdiv { position: relative; display: flex; margin-bottom: -12px; } -.numberEmp{ + +.numberEmp { color: white; font-size: 12px; font-weight: bolder; - /* padding-top: 5px; */ - /* padding-right: 20px; */ margin-left: 13px; width: 23px; height: 23px; @@ -980,17 +1079,14 @@ opacity: 1; background-color: #29B5BF; z-index: 9; margin-top: 25px; - /* padding-left: 4px; */ text-align: center; padding-top: 3px; } -.numberEmp-ar{ +.numberEmp-ar { color: white; font-size: 12px; font-weight: bolder; - /* padding-top: 5px; */ - /* padding-right: 20px; */ margin-right: 13px; width: 23px; height: 23px; @@ -998,12 +1094,11 @@ opacity: 1; background-color: #29B5BF; z-index: 9; margin-top: 25px; - /* padding-left: 4px; */ text-align: center; padding-top: 3px; } -.MyTeamtext{ +.MyTeamtext { text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 11px; @@ -1015,23 +1110,32 @@ opacity: 1; margin-bottom: 28px; } - .btnTitle{ +.btnTitle { text-align: center; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 10px; - font-size: 11px; + font-size: 12px; + color: #4D4D4D; + margin-top: -13px; + font-weight: bold; +} + +.btnTitle_ar { + text-align: center; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 10px; + font-size: 16px; color: #4D4D4D; margin-top: -13px; - } -.btnDiv{ + font-weight: bold; +} + + +.btnDiv { position: relative; display: flex; justify-content: space-between; margin-bottom: -15px; margin-top: -12px; -} - - - - \ No newline at end of file +} \ No newline at end of file diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index cc8c6984..65b6159d 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -235,9 +235,6 @@ export class DetailsComponent implements OnInit { ngOnInit() { this.common.startLoading(); this.intializeMemberDetail(); - 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); @@ -248,10 +245,9 @@ export class DetailsComponent implements OnInit { this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false); console.log(this.employee); - this.jobName = this.employee.JOB_NAME; - // let jobTitle = this.employee.POSITION_NAME.split('.'); + let jobTitle = this.employee.POSITION_NAME; // if (jobTitle && jobTitle.length > 1) { - // this.jobName = jobTitle[0] + " " + jobTitle[1]; + this.jobName = jobTitle; // } const request = { diff --git a/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.html b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.html new file mode 100644 index 00000000..b7286120 --- /dev/null +++ b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.html @@ -0,0 +1,54 @@ + + + + + +
+
    + +
  • + +
  • +
    +
      +
    • + + +
        +
      • + + +
      • +
      +
    • +
    +
+
+ + + + + +
+ + + + + \ No newline at end of file diff --git a/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.scss b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.scss new file mode 100644 index 00000000..fd551c7a --- /dev/null +++ b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.scss @@ -0,0 +1,163 @@ +.contentBg { + padding: 0px 15px; + margin-top: 20px; +} + + +.current-employee, .current-employee-ar { + padding: 0px 20px; +} + + +ul { + margin:10px; + padding:0; + } + + .current-employee, .current-employee-ar li { + list-style-type: none; + margin: 10px 0 10px 10px; + position: relative; + } + .current-employee li:before { + content: ""; + position: absolute; + top: -15px !important; + left: -20px; + border-left: 2px solid #000; + border-bottom: 2px solid #000; + width: 20px; + height: 15px; + } + .current-employee li:after { + position: absolute; + content: ""; + top: -15px !important; + left: -14px !important; + border-left: 2px solid #000; + border-top: 2px solid #000; + width: 20px; + height: 110px !important; + } + .current-employee-ar li:after { + position: absolute; + content: ""; + top: -22px !important; + right: -16px !important; + border-right: 2px solid #000 !important; + border-top: 2px solid #000; + width: 20px; + height: 176px !important; + + } + +// .current-employee li:last-child:after { +// display: none; +// } + + .supervisor li:after { + position: absolute; + content: ""; + top: 5px; + left: -20px; + border-left: 2px solid #000; + border-top: 0; + width: 20px; + height: 100%; + } + .supervisor-ar li:after { + position: absolute; + content: ""; + top: 46px; + right: -16px; + border-right: 2px solid #000; + border-top: 0; + width: 16px; + height: 74px; + } + .supervisor li, .supervisor-ar li { + list-style-type: none; + margin: 10px 0 10px 10px; + position: relative; + } + + .supervisor li:before { + content: ""; + position: absolute; + top: -10px; + left: -20px; + border-left: 2px solid #000; + border-bottom: 2px solid #000; + width: 20px; + height: 55px; + + } + .supervisor-ar li:before { + content: ""; + position: absolute; + top: -12px; + right: -16px; + border-bottom: 2px solid #000; + width: 15px; + height: 62px; + border-right: 2px solid #000; + + } +// li:last-child:after, li:last-child:before { +// display: none; +// } + .supervisor li:last-child:after, .supervisor-ar li:last-child:after{ + visibility: hidden; + } + .supervisor-li li:last-child:after, li.supervisor-li:last-of-type::after, .supervisor-li-ar li:last-child:after, li.supervisor-li-ar:last-of-type::after{ + visibility: hidden; +} + + +li.supervisor-li:first-of-type::before{ + border-top: 0; + top: -20px; + height: 65px; + border-left: 0; +} +li.supervisor-li-ar:first-of-type::before{ + border-top: 0; + top: 45px; + height: 0px; +} + +li.supervisor-li:first-of-type::after{ + top: 45px; +} +li.supervisor-li-ar:first-of-type::after{ + top: 45px; +} +.current-employee li.subordinate:before{ + top: -13px !important; +} +ul.current-employee, .current-employee ul{ + margin:0; +} +.current-employee li:before{ + left: -14px !important; + top: -15px !important; + width: 13px; +} + + + +.current-employee-ar li.subordinate-ar:before{ + top: -13px !important; +} +ul.current-employee-ar, .current-employee-ar ul{ + margin:0; +} +.current-employee-ar li:before{ + left: -14px !important; + top: -16px !important; + width: 15px; + +} + + + diff --git a/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.spec.ts b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.spec.ts new file mode 100644 index 00000000..a4134423 --- /dev/null +++ b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EmployeeHierarchyComponent } from './employee-hierarchy.component'; + +describe('EmployeeHierarchyComponent', () => { + let component: EmployeeHierarchyComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EmployeeHierarchyComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EmployeeHierarchyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.ts b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.ts new file mode 100644 index 00000000..baca46e8 --- /dev/null +++ b/Mohem/src/app/my-team/employee-hierarchy/employee-hierarchy.component.ts @@ -0,0 +1,84 @@ +import { Component, OnInit } from '@angular/core'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; +import { MyTeamService } from '../service/my-team.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; +import { AnyARecord } from 'dns'; + +@Component({ + selector: 'app-employee-hierarchy', + templateUrl: './employee-hierarchy.component.html', + styleUrls: ['./employee-hierarchy.component.scss'], +}) +export class EmployeeHierarchyComponent implements OnInit { + public personalInfo: any; + public hierarchyData: any; + public subordinateHierarchyList: any; + public supervisorHierarchyList: any; + public currentEmployee: any; + public direction: String; + constructor( + public ts: TranslatorService, + public authService: AuthenticationService, + public common: CommonService, + public myTeamService: MyTeamService, + public cs: CommonService + ) { } + + ngOnInit() { + this.currentEmployee = this.common.sharedService.getSharedData('employee-hierarchy', false); + this.direction = TranslatorService.getCurrentLanguageName(); + if (!this.currentEmployee) { + this.getProfile(); + } else { + this.personalInfo = this.currentEmployee; + this.getEmployeeHierachy(); + } + } + + public getProfile() { + this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { + if (user) { + this.personalInfo = user; + this.getEmployeeHierachy(); + } + }); + } + + public filterArrayOnLVL(incomingArray: any) { + return incomingArray.filter(a => { + return a.LVL != 1; + }); + } + + public getEmployeeHierachy() { + const body = { + P_SELECTED_EMPLOYEE_NUMBER: this.personalInfo.EMPLOYEE_NUMBER, + P_MENU_TYPE: "E", + P_SELECTED_RESP_ID: -999 + }; + this.myTeamService.getEmployeeHierachy(body).subscribe((result: any) => { + if (this.cs.validResponse(result)) { + this.hierarchyData = result.SupervisorHierarchyLists; + + let serverSubordinateData = this.hierarchyData.SubordinateHierarchyList; + this.subordinateHierarchyList = this.filterArrayOnLVL(serverSubordinateData); + + let serverSupervisorHierarchyList = this.hierarchyData.SupervisorHierarchyList; + let serverSupervisorData = serverSupervisorHierarchyList.reverse(); + this.supervisorHierarchyList = this.filterArrayOnLVL(serverSupervisorData); + } + }); + + } + + public getDetails(i: any) { + if (i.NUM_OF_SUBORDINATES > 0) { + this.common.sharedService.setSharedData(i, 'employee-hierarchy'); + this.cs.openEmployeeHierarchy(); + } + } + +} diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 4e0d6b8e..2d769461 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -1,6 +1,5 @@ @@ -40,11 +39,11 @@
- - - + + +
-
+
@@ -52,89 +51,17 @@
- +
{{ts.trPK('myTeam','my-team-members')}}
{{EmployeeTotal}}
- - - - - - - - - - - - + diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index b6de1715..03099276 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -1,4 +1,4 @@ -ion-title{ +ion-title { color: white; position: absolute; top: 0; @@ -11,56 +11,48 @@ ion-title{ } @media only screen and (max-width: 360px) { - .contentBg{ + .contentBg { padding: 0px 15px !important; } } -.contentBg{ +.contentBg { padding: 0px 20px; } .contentBg:before { position: absolute; - content: ""; - background: #29B5BF; - height: 140px; - width: 100%; - left: 0; - top: 0px; - z-index: 1; + content: ""; + background: #29B5BF; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; } + ion-content { --ion-background-color: whitesmoke; } + .request-heading { - padding-left: 15px; + padding-left: 20px; margin-top: 10px; + padding-right: 20px; + span { - // display: block; - // padding-top: 8px; - // padding-left: 15px; - // font-weight: bold; - // font-size: 12px; - // margin-top: 9px; + text-align: left; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 18px; - font-size: 12px; + font-weight: bold; letter-spacing: -0.48px; color: #2B353E; opacity: 1; } } -.search-label{ - // border: 1px solid #ccc; - // margin-left: 15px; - // margin-right: 15px; - // border-radius: 22px; - // margin-top: 24px; - // font-size: 11px; - // color: rgb(143, 141, 141); +.search-label { + border: 1px solid #ccc; margin-left: 15px; margin-right: 15px; @@ -70,6 +62,7 @@ ion-content { color: #8f8d8d; margin-right: 15px !important; padding: 10px; + font-family: 'Inter' !important; } .result-graph { @@ -80,8 +73,9 @@ ion-content { border-radius: 20px; z-index: 1; border: 1px solid #ccc; - } - .result-text-container { +} + +.result-text-container { padding: 0; margin: 0; position: absolute; @@ -90,12 +84,14 @@ ion-content { display: block; text-align: center; transform: translate(-50%, -50%); + h2 { font-size: 38px; font-family: WorkSans-Bold; margin: 0 auto; line-height: 36px; } + span { width: 125px; display: block; @@ -103,35 +99,42 @@ ion-content { font-size: 12px; font-family: workSans-Regular; } - } - .today-graph { +} + +.today-graph { width: 100%; max-height: 4cm; - } +} .swiper-container { margin: 0 !important; width: 100% !important; } + .filters-row { margin-top: 10px; } + .search-input { margin-top: 15px; background: white; border-radius: 15px; + ion-input { border-bottom-color: transparent; } } -.search-dropdown{ + +.search-dropdown { background: #29B5BF; + ion-select { - .select-text{ + .select-text { margin-left: -10px; } - .select-icon{ - .select-icon-inner{ + + .select-icon { + .select-icon-inner { opacity: 1; color: white; margin-top: -1px; @@ -139,36 +142,41 @@ ion-content { } } } -.input-container{ + +.input-container { background: white; - ion-input{ + + ion-input { border-bottom-color: transparent; } } -.user-image-container{ +.user-image-container { position: relative; width: 80px; height: 80px; display: block; margin: 0 auto; - &:before{ - position: absolute; - content: ""; - width: 20px; - height: 20px; - border-radius: 20px; - border: 1px solid white; - top: 0; - right: 0; - background-color: red; - z-index: 9; - } - &.present:before{ - background-color: green !important; - } + + &:before { + position: absolute; + content: ""; + width: 20px; + height: 20px; + border-radius: 20px; + border: 1px solid white; + top: 0; + right: 0; + background-color: red; + z-index: 9; + } + + &.present:before { + background-color: green !important; + } } -.user-image{ + +.user-image { overflow: hidden; position: relative; display: block; @@ -179,101 +187,104 @@ ion-content { margin: 0px auto 6px; } -.search-container{ - // margin-top: 15px; - // margin-top: -35px; - // margin-left: 262px; +.search-container { + width: 30px; height: 30px; position: absolute; top: 45px; right: 38px; z-index: 999999; - ion-col{ - // background: white; - // border-radius: 12px; - // padding-right: 10px; + + ion-col { + flex: none; + + ion-icon { + margin-right: 3px; + font-size: 14px; + margin-left: 3px; + vertical-align: middle; + } + + span { + font-size: 12px; + vertical-align: middle; + } + } +} + +.search-container-ar { + + width: 30px; + height: 30px; + position: absolute; + top: 45px; + left: 38px; + z-index: 999999; + + ion-col { flex: none; - ion-icon{ + + ion-icon { margin-right: 3px; font-size: 14px; margin-left: 3px; vertical-align: middle; } - span{ + + span { font-size: 12px; vertical-align: middle; } } } -// .myClass .toggle-icon { -// background-color: purple; // this changes the background, ie the grey stripe. -// .toggle-inner { -// background-color: yellow; // this changes the backgroundcolor of the toggle dot. -// } -// } @media only screen and (max-width: 375px) { - .text-label{ + .text-label { margin-left: 6px !important; - } + } } @media only screen and (max-width: 320px) { - .text-label{ + .text-label { margin-left: 2px !important; - } + } } -.text-label{ - // --color: black !important; - // font-size: 13px; - // margin-left: 15px; - // margin-right: 18px; +.text-label { text-align: left; - // font: normal normal 600 12px/18px Poppins; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 18px; font-size: 12px; letter-spacing: -0.48px; color: #575757 !important; opacity: 1; - margin-left: 15px; - margin-right: 18px; -} + margin-left: 5px; + margin-right: 5px; + font-weight: bold; +} -.radio-list{ +.radio-list { background: white; - // margin-left: 18px; - /* margin-right: 10px; */ - // margin-top: 12px; } -// .selected .radio-icon { -// border-color: #0064D9; -// color: red; -// } - - .radio-icon{ - -.custom-radio .radio-icon { - margin: 0px; - border-radius: 50%; - border-width: var(--border-width); - border-style: var(--border-style); - border-color: #dcdcdc; - margin-top: 6px !important; - border-color: #d8d4d4 !important;} +.radio-icon { + + .custom-radio .radio-icon { + margin: 0px; + border-radius: 50%; + border-width: var(--border-width); + border-style: var(--border-style); + border-color: #dcdcdc; + margin-top: 6px !important; + border-color: #d8d4d4 !important; + } } -.text{ - // font-size: 16px; - // font-weight: bolder; - // font-family: 'WorkSans-Bold'; - // margin-top: 27px; + +.text { + text-align: left; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 11px; font-size: 20px; letter-spacing: -0.8px; @@ -281,27 +292,12 @@ ion-content { opacity: 1; margin-top: 30px; margin-bottom: 28px; + font-weight: bold; } -// .number{ -// width: 21px; -// height: 21px; -// padding-right: -10px; -// border-radius: 100%; -// background-color: #29B5BF; -// z-index: 9; -// margin-top: 26px; -// } - -// .numberEmp{ -// color: white; -// font-size: 12px; -// font-weight: bolder; -// margin-left: 3px; -// padding-top: 2px; -// } -.number{ + +.number { width: 22px; height: 20px; border-radius: 100%; @@ -310,7 +306,8 @@ ion-content { margin-top: 25px; padding-left: 4px; } -.number-ar{ + +.number-ar { width: 22px; height: 20px; border-radius: 100%; @@ -319,43 +316,65 @@ ion-content { margin-top: 25px; padding-right: 4px; } -.numberEmp{ + +.numberEmp { color: white; font-size: 12px; font-weight: bolder; /* padding-top: 5px; */ /* padding-right: 20px; */ margin-left: 13px; - width: 23px; - height: 23px; + width: 25px; + height: 25px; border-radius: 100%; - background-color: #29B5BF; + color: white; + font-size: 12px; + font-weight: bolder; + margin-left: 13px; + width: 25px; + height: 25px; + border-radius: 100%; + background-color: #004D71; + z-index: 9; + margin-top: 25px; + text-align: center; + padding-top: 5px; z-index: 9; margin-top: 25px; /* padding-left: 4px; */ text-align: center; - padding-top: 3px; + padding-top: 5px; } -.numberEmp-ar{ + +.numberEmp-ar { color: white; - font-size: 12px; + font-size: 11px; font-weight: bolder; - /* padding-top: 5px; */ - /* padding-right: 20px; */ margin-right: 13px; - width: 23px; - height: 23px; + width: 25px; + height: 25px; border-radius: 100%; - background-color: #29B5BF; + color: white; + font-size: 12px; + font-weight: bolder; + margin-left: 13px; + width: 25px; + height: 25px; + border-radius: 100%; + background-color: #004D71; z-index: 9; margin-top: 25px; - /* padding-left: 4px; */ text-align: center; - padding-top: 3px; + padding-top: 5px; + z-index: 9; + margin-top: 25px; + text-align: center; + padding-top: 5px; } -.div{ + +.div { position: relative; display: flex; // justify-content: space-between; margin-bottom: -12px; -} +} \ No newline at end of file diff --git a/Mohem/src/app/my-team/my-team.module.ts b/Mohem/src/app/my-team/my-team.module.ts index 17fa5ede..bed89f55 100644 --- a/Mohem/src/app/my-team/my-team.module.ts +++ b/Mohem/src/app/my-team/my-team.module.ts @@ -11,6 +11,7 @@ import { HmgCommonModule } from '../hmg-common/hmg-common.module'; import { from } from 'rxjs'; import { WorklistService } from '../notification/service/worklist.service'; import { SubordinateLeaveComponent } from './subordinate-leave/subordinate-leave.component'; +import { EmployeeHierarchyComponent } from './employee-hierarchy/employee-hierarchy.component'; const routes: Routes = [ @@ -32,8 +33,15 @@ const routes: Routes = [ { path: 'subordinate-leave', component: SubordinateLeaveComponent + }, + { + path: 'employee-hierarchy', + component: EmployeeHierarchyComponent + }, + { + path: 'employee-hierarchy-2', + component: EmployeeHierarchyComponent } - ] } ]; @@ -52,7 +60,8 @@ const routes: Routes = [ MyTeamPage, HomeComponent, DetailsComponent, - SubordinateLeaveComponent + SubordinateLeaveComponent, + EmployeeHierarchyComponent ] }) export class MyTeamPageModule { } diff --git a/Mohem/src/app/my-team/service/my-team.service.ts b/Mohem/src/app/my-team/service/my-team.service.ts index 81149b41..27b71d9b 100644 --- a/Mohem/src/app/my-team/service/my-team.service.ts +++ b/Mohem/src/app/my-team/service/my-team.service.ts @@ -8,6 +8,7 @@ export class MyTeamService { public static EMPLOYEE_SHARED_DATA = 'employee'; public static getMyTeam = 'Services/ERP.svc/REST/GET_EMPLOYEE_SUBORDINATES'; public static getSubordintesLeaves = 'Services/ERP.svc/REST/GET_SUBORDINATES_LEAVES_TOTAL_VACATIONS'; + public static getEmployeeHierachy = "Services/ERP.svc/REST/GET_SUPERVISOR_HIERARCHY"; // public static getSuborinateStatus = 'Services/ERP.svc/REST/GET_SUBORDINATES_ATTD_STATUS'; @@ -28,6 +29,12 @@ export class MyTeamService { return this.con.post(MyTeamService.getSubordintesLeaves, request, onError, errorLabel); } + public getEmployeeHierachy(employeeQualificationRequest: any, onError?: any, errorLabel?: string) { + const request = employeeQualificationRequest; + this.authService.authenticateRequest(request); + return this.con.post(MyTeamService.getEmployeeHierachy, request, onError, errorLabel); + } + // public getSuborinatesAttStatus(absence: any, onError?: any, errorLabel?: string){ // const request = absence; // this.authService.authenticateRequest(request); diff --git a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html index 8adf1dde..7a6cd979 100644 --- a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html +++ b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html @@ -14,7 +14,7 @@ - {{ts.trPK('general','from')}} + {{ts.trPK('general','from')}} - {{ts.trPK('general','to')}} + {{ts.trPK('general','to')}} @@ -24,7 +23,7 @@ - + - + @@ -61,7 +60,7 @@ -
+
{{formattedData.date}} @@ -100,8 +99,8 @@
- - + + diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 646a065e..d4aed7b0 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -1,27 +1,29 @@ .bar-stable { background-color: var(--cusgray) !important; - } - .tabs{ +} + +.tabs { background-color: var(--cusgray) !important; - } - .icon-size-lg { +} + +.icon-size-lg { font-size: 40px; - } - - /*Timeline*/ - - .pos-absolute-right { - position: absolute; - right: 8px; - } - - .timelineMain { - position: relative; - margin: 15px 0 0 0; - } - - .timelineMain:before { - +} + +/*Timeline*/ + +.pos-absolute-right { + position: absolute; + right: 8px; +} + +.timelineMain { + position: relative; + margin: 15px 0 0 0; +} + +.timelineMain:before { + content: ''; position: absolute; top: 0; @@ -30,305 +32,340 @@ height: 99%; background: #e4e4e4; z-index: 1; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timelineMain .timelineMain-thumb { - + +} + +.timelineMain .timelineMain-thumb { + border-radius: 500px; width: 50px; z-index: 2; position: absolute; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } width: 50px; float: right; top: 0px; - } - - .timelineMain .timelineMain-thumb.timelineMain-icon { - height: 50px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - transform: scale(0.3); - } - +} - - .timelineMain .timelineMain-item { +.timelineMain .timelineMain-thumb.timelineMain-icon { + height: 50px; + transform: scale(0.3); +} + + + +.timelineMain .timelineMain-item { width: 50px; - - } - - .timelineMain .timelineMain-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - - .divider-title { - background: #e4e4e4; - padding: 5px 15px; - } - - - .color-red { - color: var(--danger) !important; - } - - .bg-color-dot { - // background-color: #ff3b30 !important; - background: var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - - } - -.notification-list{ -background: none; -ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } +} + +.timelineMain .timelineMain-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); } + + +.divider-title { + background: #e4e4e4; + padding: 5px 15px; } -.input-wrapper { ---flex:none; + + +.color-red { + color: var(--danger) !important; } -ion-input ,ion-datetime{ -border-bottom: #dedede 1px solid; + +.bg-color-dot { + // background-color: #ff3b30 !important; + background: var(--primary); + background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + + } -.left { ---background: #f0efef; -.timelineMain:before{ -left: 21px; + +.notification-list { + background: none; + + ion-item { + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + + .item-date { + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; + } + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + + } + + } } -.notification-list ion-item{ - padding-left: 3px; - margin-left: -12%; + +.input-wrapper { + --flex: none; } -.timelineMain-thumb{ - left: 9%; - top: 30%; + +ion-input, +ion-datetime { + border-bottom: #dedede 1px solid; } +.left { + --background: #f0efef; + + .timelineMain:before { + left: 21px; + } + + .notification-list ion-item { + padding-left: 3px; + margin-left: -12%; + } + + .timelineMain-thumb { + left: 9%; + top: 30%; + } + } + .right { - --background: #f0efef; -.timelineMain:before{ - right: 62px; + --background: #f0efef; + + .timelineMain:before { + right: 62px; } - .notification-list ion-item{ + + .notification-list ion-item { padding-right: 3px; } - .timelineMain-thumb{ + + .timelineMain-thumb { right: 37px; } } -.menuList{ -margin-left: -40px; -height: 160%; -padding-top: 370%; +.menuList { + margin-left: -40px; + height: 160%; + padding-top: 370%; } -.colorBG{ ---background: #f0efef; + +.colorBG { + --background: #f0efef; } -.menuListCol{ -padding-left: 50px; -margin-left: -33px; +.menuListCol { + padding-left: 50px; + margin-left: -33px; } -.menuListItem{ -padding-top: 9%; -margin: -20%; -padding-left: 13%; + +.menuListItem { + padding-top: 9%; + margin: -20%; + padding-left: 13%; } -.menuListBtn{ -width: 100%; -background: white; ---background: white; + +.menuListBtn { + width: 100%; + background: white; + --background: white; } -.activeTabMenu{ ---background: #ff726f; + +.activeTabMenu { + --background: #ff726f; } -.notifincationList{ -margin-left: 5%; -margin-top: 6%; +.notifincationList { + margin-left: 5%; + margin-top: 6%; } -.itemListNotification{ -padding-bottom: 18px; + +.itemListNotification { + padding-bottom: 18px; } -.footerSearchBtn{ -padding: 0px !important; -background: #f0efef !important; +.footerSearchBtn { + padding: 0px !important; + background: #f0efef !important; } -.viewAndSearch{ -margin-bottom: 13px; +.viewAndSearch { + margin-bottom: 13px; } -.toSearchBtn{ -margin-top: 4%; +.toSearchBtn { + margin-top: 4%; } -.emptyItem{ -white-space: normal; -padding-left: 10%; +.emptyItem { + white-space: normal; + padding-left: 10%; } ///////////////////////////////////////////NEW DESIGN///////////////////////////////////// -.profile-image-container{ -position: relative; -z-index: 999; -img { - width: 32px; - float: right; - border-radius: 20px; - height: 32px; - margin-right: 10px; -} +.profile-image-container { + position: relative; + z-index: 999; + + img { + width: 32px; + float: right; + border-radius: 20px; + height: 32px; + margin-right: 10px; + } } -ion-title{ -color: white; -position: absolute; -top: 0; -text-align: center; -left: 15%; -right: 15%; -font-size: 0.42cm; -font-weight: bold; -height: 100%; + +ion-title { + color: white; + position: absolute; + top: 0; + text-align: center; + left: 15%; + right: 15%; + font-size: 0.42cm; + font-weight: bold; + height: 100%; } .contentBg:before { -position: absolute; -content: ""; -background: #29B5BF; -height: 140px; -width: 100%; -left: 0; -top: 0px; -z-index: 1; + position: absolute; + content: ""; + background: #29B5BF; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; } + ion-content { ---ion-background-color: whitesmoke; + --ion-background-color: whitesmoke; } + .request-heading { -span { - text-align: center; - display: block; - padding-top: 8px; - font-family: workSans-Regular; -} + span { + text-align: center; + display: block; + padding-top: 8px; + font-family: workSans-Regular; + } } .result-graph { -position: relative; -background: white; -margin-right: 20px; -margin-left: 20px; -margin-top: 20px; -padding-bottom: 20px; -border-radius: 20px; -z-index: 1; + position: relative; + background: white; + margin-right: 20px; + margin-left: 20px; + margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; } + .result-text-container { -padding: 0; -margin: 0; -position: absolute; -left: 50%; -top: 50%; -display: block; -text-align: center; -transform: translate(-50%, -50%); -h2 { - font-size: 38px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; -} -span { - width: 125px; + padding: 0; + margin: 0; + position: absolute; + left: 50%; + top: 50%; display: block; - margin: 0 auto; - font-size: 12px; - font-family: workSans-Regular; -} + text-align: center; + transform: translate(-50%, -50%); + + h2 { + font-size: 38px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; + } + + span { + width: 125px; + display: block; + margin: 0 auto; + font-size: 12px; + font-family: workSans-Regular; + } } + .today-graph { -width: 100%; -max-height: 4cm; + width: 100%; + max-height: 4cm; } .swiper-container { -margin: 0 !important; -width: 100% !important; + margin: 0 !important; + width: 100% !important; } + .filters-row { -margin-top: 10px; -margin-left: 20px; -margin-bottom: 20px; + margin-top: 20px; + margin-left: 20px; } + +.filters-row-ar { + margin-top: 20px; + margin-right: 20px; +} + +.worklist-content { + position: relative; +} + +.worklist-content-ar { + position: relative; + margin-right: 20px; +} + .work-list-container { -position: relative; -padding-left: 60px; -clear: both; -min-height: 200px; -margin-bottom: 80px; -padding-top: 15px; -} -.work-list-container:before{ -content: ""; -position: absolute; -height: 100%; -width: 4px; -left: 30px; -top: 15px; -background-color: #dddddd; + position: relative; + padding-left: 60px; + clear: both; + min-height: 200px; + margin-bottom: 80px; + padding-top: 15px; } + +.work-list-container:before { + content: ""; + position: absolute; + height: 100%; + width: 4px; + left: 30px; + top: 15px; + background-color: #dddddd; +} + .work-list-container-ar { position: relative; padding-left: 60px; @@ -336,8 +373,9 @@ background-color: #dddddd; min-height: 200px; margin-bottom: 80px; padding-top: 15px; - } - .work-list-container-ar:before{ +} + +.work-list-container-ar:before { content: ""; position: absolute; height: 100%; @@ -346,79 +384,92 @@ background-color: #dddddd; top: 15px; right: 6px; background-color: #dddddd; - } -.search-container{ -margin-top: 15px; -display: block; -padding: 0 20px; -position: relative; -z-index: 99; -ion-col{ - background: white; - border-radius: 12px; - // padding-right: 30px; - flex: none; - ion-icon{ - margin-right: 3px; - font-size: 20px; - margin-left: 3px; - vertical-align: middle; - } - span{ - font-size: 14px; - vertical-align: middle; - margin: 5px; - } } + +.search-container { + margin-top: 15px; + display: block; + padding: 0 20px; + position: relative; + z-index: 99; + + ion-col { + background: white; + border-radius: 12px; + // padding-right: 30px; + flex: none; + + box-shadow: 0px 0px 3px #cdcdcd; + + ion-icon { + margin-right: 3px; + font-size: 20px; + margin-left: 3px; + vertical-align: middle; + } + + span { + font-size: 14px; + vertical-align: middle; + margin: 5px; + } + } } + .date-span { -position: relative; -display: block; -margin-bottom: 10px; -} -.date-span:before{ -content: ""; -position: absolute; -left: -35px; -border-radius: 50%; -width: 15px; -height: 15px; -background-color: #29B5BF; -top: 1px; -} - -.date-span-ar{ + position: relative; + display: block; + margin-bottom: 10px; +} + +.date-span:before { + content: ""; + position: absolute; + left: -35px; + border-radius: 50%; + width: 15px; + height: 15px; + background-color: #004D71; + top: 1px; +} + +.date-span-ar { position: relative; display: block; margin-bottom: 10px; /* margin-top: 10px; */ margin-right: 30px; - } - .date-span-ar:before{ - content: ""; - position: absolute; - right: -29px; - border-radius: 50%; - width: 15px; - height: 15px; - background-color: #38c9b3; - top: 1px; - } +} + +.date-span-ar:before { + content: ""; + position: absolute; + right: -29px; + border-radius: 50%; + width: 15px; + height: 15px; + background-color: #29B5BF; + top: 1px; +} -.date-data{ -background-color: white; -padding: 1px; -border-radius: 20px; -font-family: WorkSans-Regular; -padding-left: 15px; -margin-right: 20px; -margin-bottom: 15px; -p{ - font-size: 14px; -} +.date-data { + background-color: white; + padding: 1px; + border-radius: 20px; + font-family: WorkSans-Regular; + padding-left: 15px; + margin-right: 20px; + margin-bottom: 15px; + padding-right: 15px; + box-shadow: 0px 0px 3px #cdcdcd; + + p { + font-size: 14px; + } } + .no-data-available { background: white; font-family: WorkSans-Regular; @@ -427,43 +478,55 @@ p{ left: 85px; bottom: 20%; } + .disable-filter { -pointer-events: none; -opacity: .3; + pointer-events: none; + opacity: .3; } + .total-result { -margin-top: 55px; -padding-left: 20px; -color: #888; -font-size: 15px; -} -.text-span{ -font-size: 12px; -color: #888; -background-color: white; -width: auto; -height: 40px; -border: 1px solid; -border-radius: 30px; -padding: 10px 30px; -} - -.text-span-active{ -font-size: 12px; -color:white; -background-color:#29B5BF; -width: auto; -height: 40px; -border: 1px solid; -border-radius: 30px; -padding: 10px 30px; -} -.slideCss{ -width: auto !important; -} - -.spinner-custom-class{ + margin-top: 55px; + padding-left: 20px; + color: #888; + font-size: 15px; +} + +.text-span { + font-size: 12px; + color: #888; + background-color: white; + width: auto; + height: 40px; + border: 1px solid; + border-radius: 30px; + padding: 10px 30px; +} + +.text-span-active { + font-size: 12px; + color: white; + background-color: #29B5BF; + width: auto; + height: 40px; + border: 1px solid; + border-radius: 30px; + padding: 10px 30px; +} + +.slideCss { + width: auto !important; +} + +.spinner-custom-class { position: absolute; right: 160px; top: 100px; +} + +.float-r { + float: right; + } + +.float-l { + float: left; } \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 11657c30..f92f63d8 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -12,6 +12,7 @@ import { DatePipe } from '@angular/common'; import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; +import { COCRequest } from '../models/COCRequest'; @Component({ selector: 'app-home', @@ -47,6 +48,7 @@ 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; @@ -75,8 +77,10 @@ export class HomeComponent implements OnInit { public totalHR = 0; public totalPO = 0; public totalPR = 0; + public totalMR = 0; public totalIC = 0; public totalStamp = 0; + public worklistLength = 0; public showChart = false; @@ -112,22 +116,54 @@ export class HomeComponent implements OnInit { key: 'HRSSA', disable: false }, - { - value: 0, - name: 'PR', - active: false, - color: '#114475', - key: 'REQAPPRV', - disable: false - }, - { - value: 0, - name: 'PO', - active: false, - color: '#38c9b3', - key: 'POAPPRV', - disable: false - } + // { + // value: 0, + // name: 'MR', + // active: false, + // color: '#3cb9d5', + // key: 'INVMOA', + // disable: false + // }, + // { + // value: 0, + // name: 'PR', + // active: false, + // color: '#114475', + // key: 'REQAPPRV', + // disable: false + // }, + // { + // value: 0, + // name: 'PO', + // active: false, + // 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 + // } ]; public slideOptsOne = { @@ -171,7 +207,9 @@ export class HomeComponent implements OnInit { this.data = values.data; this.filters = values.filters; - const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); + // const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); + const loadWorkList = true; + if (loadWorkList) { this.receivedITGCount = false; this.showChart = false; @@ -190,36 +228,28 @@ export class HomeComponent implements OnInit { this.resetData(); this.direction = TranslatorService.getCurrentLanguageName(); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); - this.openNotificationsDashboard(); + + // var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED); + var isWorklistChanged = true; + + if (isWorklistChanged) { + this.openNotificationsDashboard() + } + this.openNotificationsDashboardLocal(); } } callWorkListServices() { + // if (this.countChanged) { + // this.Count(); + // } this.getAllPushNotificationFun(); } - openNotificationsDashboard() { - // if (this.countChanged) { - - // this.DS.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { - // if (this.common.validResponse(result)) { - // this.countChanged = false; - // this.worklistNotifications = result; - // this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; - //this.resetFiltersUI(); - // this.assignDataToFilters(); - // this.common.sharedService.setSharedData(result, 'worklistNotifications'); + openNotificationsDashboardLocal() { // this.Details(); this.callWorkListServices(); - // } - // }); - // } else { - // this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; - // this.resetFiltersUI(); - // this.assignDataToFilters(); - // this.Details(); - // this.callWorkListServices(); - // } + } assignDataToFilters() { @@ -229,20 +259,30 @@ export class HomeComponent implements OnInit { if (notification.ITEM_TYPE === 'HRSSA') { this.filters[0].value = notification.OPEN_NTF_NUMBER; this.data.datasets[0].data[0] = notification.OPEN_NTF_NUMBER; - } else if (notification.ITEM_TYPE === 'REQAPPRV') { - this.filters[2].value = this.totalPR; - this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER; - } else if (notification.ITEM_TYPE === 'POAPPRV') { - this.filters[3].value = this.totalPO; - this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER; } + // else if (notification.ITEM_TYPE === 'INVMOA') { + // this.filters[1].value = notification.OPEN_NTF_NUMBER; + // this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER; + // } else if (notification.ITEM_TYPE === 'REQAPPRV') { + // this.filters[2].value = notification.OPEN_NTF_NUMBER; + // this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER; + // } else if (notification.ITEM_TYPE === 'POAPPRV') { + // this.filters[3].value = notification.OPEN_NTF_NUMBER; + // this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER; + // } else if (notification.ITEM_TYPE === 'INVITEM') { + // this.filters[5].value = notification.OPEN_NTF_NUMBER; + // this.data.datasets[0].data[5] = notification.OPEN_NTF_NUMBER; + // } else if (notification.ITEM_TYPE === 'STAMP') { + // this.filters[6].value = notification.OPEN_NTF_NUMBER; + // this.data.datasets[0].data[6] = notification.OPEN_NTF_NUMBER; + // } } this.showChart = true; this.isLoading = false; } checkLoadingStatus() { - if (this.showChart) { + if (this.showChart && this.receivedITGCount) { this.common.stopLoading(); return true; } else { @@ -278,7 +318,7 @@ export class HomeComponent implements OnInit { } activeFilter(index: number) { - if (index !== this.currentActiveIndex) { + if (index !== this.currentActiveIndex && index !== 7) { if (index !== 4) { this.common.startLoading(); } @@ -389,6 +429,7 @@ export class HomeComponent implements OnInit { } this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { + this.worklistLength = result.GetWorkList.length; this.handleWorkListResult(result.GetWorkList); } } @@ -481,7 +522,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.isLoading = false; } @@ -513,6 +554,8 @@ 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 { @@ -553,6 +596,7 @@ export class HomeComponent implements OnInit { if (!this.isReachEnd && this.selectedFilter !== 'ITG') { this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { + this.worklistLength = result.GetWorkList.length; this.handleWorkListResult(result.GetWorkList); } }); @@ -603,30 +647,10 @@ export class HomeComponent implements OnInit { } Details() { - // var result = this.common.sharedService.getSharedData(MenuResponse.ITG_COUNTS, false); - // if (this.countChanged) { - // this.workListService.getITGDetails('', '', this.isPostNoLoad) - // .subscribe((result: any) => { - // this.countChanged = false; - // this.ITGCount = result.TotalCount; - // // this.totalRequestCount = this.totalRequestCount + result.TotalCount; - // this.data.datasets[0].data[4] = this.ITGCount; - // this.filters[4].value = result.TotalCount; - // this.receivedITGCount = true; - // }) - // } else { - - //this.workListService.getITGDetails('', '', this.isPostNoLoad) - //.subscribe((result: any) => { this.ITGCount = this.common.filterKeys['ITG'];//result.TotalCount; - // this.totalRequestCount = this.totalRequestCount + result.TotalCount; - this.data.datasets[0].data[3] = this.common.filterKeys['ITG'];//this.ITGCount; - this.filters[3].value = this.common.filterKeys['ITG']; + this.data.datasets[0].data[4] = this.common.filterKeys['ITG'];//this.ITGCount; + this.filters[4].value = this.common.filterKeys['ITG']; this.receivedITGCount = true; - //}); - //} - - } searchBtn() { @@ -683,4 +707,63 @@ export class HomeComponent implements OnInit { } this.openITG(ITEM, NAME); } + + openNotificationsDashboard() { + this.common.startLoading(); + this.totalRequestCount = 0; + this.DS.getOpenNotifications('', '', false).subscribe((result: GetOpenNotificationsResponse) => { + if (this.common.validResponse(result)) { + const key = 'P_OPEN_NTF_NUMBER'; + // this.totalRequestCount = ; + // this.ITGCountAllNotification(result[key]); + this.common.setFilterValues(result['GetOpenNotificationsList']); + const values = this.common.getFiltersData(); + this.data = values.data; + this.filters = values.filters; + this.totalRequestCount = Math.floor(result[key]); + this.common.sharedService.setSharedData(this.totalRequestCount, 'total-count'); + + this.common.stopLoading() + this.common.sharedService.setSharedData( + result, + 'worklistNotifications' + ); + + } + }); + } + ITGCountAllNotification(count) { + this.workListService.getITGDetails('', '', this.isPostNoLoad).subscribe((result: any) => { + this.common.sharedService.setSharedData(result, MenuResponse.ITG_COUNTS); + this.common.filterKeys['ITG'] = result.TotalCount; + const values = this.common.getFiltersData(); + this.data = values.data; + this.filters = values.filters; + this.totalRequestCount = Math.floor(count + result.TotalCount); + this.common.sharedService.setSharedData(this.totalRequestCount, 'total-count'); + this.getCOCNotificationCount(); + this.common.stopLoading(); + }); + } + getCOCNotificationCount() { + const request = new COCRequest(); + request.ItgPageSize = 1; + request.ItgPageNo = 1; + request.Date = moment(new Date()).format("YYYY-MM-DD"); + + this.workListService.getCOCCount(request, '', '', this.isPostNoLoad).subscribe((result: any) => { + console.log(result); + const countResult = result.Mohemm_ITG_Pending_Task_ResponseItem; + const totalCount = countResult.escalation + countResult.waitingToClose + countResult.waitingForAcceptance + countResult.extendTATRequest; + this.common.filterKeys['COC'] = totalCount; + + + this.totalRequestCount = Math.floor(this.totalRequestCount + totalCount); + + this.common.sharedService.setSharedData(this.totalRequestCount, 'total-count'); + + this.common.stopLoading(); + }); + } + } diff --git a/Mohem/src/app/notification/models/COCRequest.ts b/Mohem/src/app/notification/models/COCRequest.ts new file mode 100644 index 00000000..97e45176 --- /dev/null +++ b/Mohem/src/app/notification/models/COCRequest.ts @@ -0,0 +1,8 @@ +import { Request } from 'src/app/hmg-common/services/models/request'; + +export class COCRequest extends Request { + public ItgPageSize: number; + public ItgPageNo: number; + public Date: string; + public EmployeeNumber: string; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts index cd32d6ec..d644d815 100644 --- a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts +++ b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts @@ -5,10 +5,10 @@ export class WorkListSubmitterInfoRequest extends Request{ public P_NOTIFICATION_TYPE: string;//string public P_SELECTED_EMPLOYEE_NUMBER: string;//String public P_SELECTED_RESP_ID: Number;//NUMBER -public P_PAGE_NUM : Number; -public P_PAGE_LIMIT : Number; -public P_SEARCH_USER_NAME:String; -public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; -public P_SEARCH_EMAIL_ADDRESS:String; +// public P_PAGE_NUM : Number; +// public P_PAGE_LIMIT : Number; +// public P_SEARCH_USER_NAME:String; +// public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; +// public P_SEARCH_EMAIL_ADDRESS:String; } \ No newline at end of file diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index 76bc3e93..1fb96de3 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -20,12 +20,15 @@ import { QuotationAnalysisResponse } from '../models/quotationAnalysisRes'; import { Request } from 'src/app/hmg-common/services/models/request'; import { LoginModel } from '../../authentication/models/LoginModel'; import { itgRequest } from '../models/itgFormDetailsRequest'; +import { COCRequest } from '../models/COCRequest'; + import { UserItemTypes } from "../models/userItemTypeRequest"; @Injectable() export class WorklistMainService { public static getEITNotificationBody = "Services/ERP.svc/REST/GET_EIT_NOTIFICATION_BODY"; - public static getSITNotificationBody = "Services/ERP.svc/REST/GET_SIT_NOTIFICATION_BODY"; + public static getOPMNotificationBody = "Services/ERP.svc/REST/GET_OPM_NOTIFICATION_BODY"; + public static getOLMNotificationBody = "Services/ERP.svc/REST/GET_OLM_NOTIFICATION_BODY"; public static getAbsenceNotificationBody = "Services/ERP.svc/REST/GET_ABSENCE_NOTIFICATION_BODY"; public static getPoNotificationBody = "Services/ERP.svc/REST/GET_PO_NOTIFICATION_BODY"; public static getMONotificationBody = "Services/ERP.svc/REST/GET_MO_NOTIFICATION_BODY"; @@ -42,12 +45,14 @@ export class WorklistMainService { public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY"; public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY"; public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS"; - public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; + // public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; + public static getUserInfo = "Services/ERP.svc/REST/Get_Notification_UserInformation"; public static getNotificationAction = "Services/ERP.svc/REST/NOTIFICATION_ACTIONS"; public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES"; public static getQutationAnalysisUrl = "Services/ERP.svc/REST/GET_QUOTATION_ANALYSIS"; public static getITGFormTaskCount = 'Services/COCWS.svc/REST/ITGGetTaskCountRequestType'; public static getITGFormTaskDetails = 'Services/COCWS.svc/REST/ITGFormsPendingTasks'; + public static getCOCCount = 'Services/COCWS.svc/REST/Mohemm_ITG_ReviewerAdmin_Pending_Tasks'; public static getITGFormDetails = 'Services/COCWS.svc/REST/ITGGetFormDetials'; public static getWorklistNotificationURL = 'Services/ERP.svc/REST/GET_USER_ITEM_TYPES'; public static updateWorklistNotificationURL = 'Services/ERP.svc/REST/UPDATE_USER_ITEM_TYPES'; @@ -74,15 +79,31 @@ export class WorklistMainService { ); } - public getSITNotificationBody( + + public getOPMNotificationBody( WorkListBodyRequest: any, onError?: any, errorLabel?: string - ): Observable { + ): Observable { + const request = WorkListBodyRequest; + this.authService.authenticateRequest(request); + return this.api.post( + WorklistMainService.getOPMNotificationBody, + request, + onError, + errorLabel + ); + } + + public getOLMNotification( + WorkListBodyRequest: any, + onError?: any, + errorLabel?: string + ): Observable { const request = WorkListBodyRequest; this.authService.authenticateRequest(request); return this.api.post( - WorklistMainService.getSITNotificationBody, + WorklistMainService.getOLMNotificationBody, request, onError, errorLabel @@ -447,6 +468,28 @@ export class WorklistMainService { } } + public getCOCCount( request: COCRequest, onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { + // const request = new Request(); + console.log(request); + this.authService.authenticateRequest(request); + request.EmployeeNumber = request.UserName; + if (isPostNoLoad) { + return this.api.postNoLoad( + WorklistMainService.getCOCCount, + request, + onError, + errorLabel + ); + } else { + return this.api.post( + WorklistMainService.getCOCCount, + request, + onError, + errorLabel + ); + } + } + public getITGActionRequest(itgrequest:itgRequest,actionURL:string, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(itgrequest); diff --git a/Mohem/src/app/notification/work-list-details/work-list-details.component.ts b/Mohem/src/app/notification/work-list-details/work-list-details.component.ts index 2635ee81..6a07340c 100644 --- a/Mohem/src/app/notification/work-list-details/work-list-details.component.ts +++ b/Mohem/src/app/notification/work-list-details/work-list-details.component.ts @@ -32,13 +32,15 @@ export class WorkListDetailsComponent implements OnInit { } ngOnInit() { - this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = 100; - this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; + // this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = 100; + // this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; this.WorkListSubmitterInfoObj.P_SELECTED_EMPLOYEE_NUMBER = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.WorkListSubmitterInfoObj.P_SELECTED_RESP_ID = -999; - this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; - this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; - this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; + this.WorkListSubmitterInfoObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; + + // this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; + // this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; + // this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; this.getsubmitterInfo(this.WorkListSubmitterInfoObj); this.handleNotificationBody(); diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index e7dec45b..13606458 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -566,7 +566,7 @@ - + Skip diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index f31cf456..fba4d82a 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -193,12 +193,14 @@ export class WorkListMainItgComponent implements OnInit { }); } - skip() { + skip(flag?) { // check if the user clicked on all type of request - this.common.setTotalNumberOfWorklistRequest(); - // this.common.assignDataToFilters(this.common.sharedService.getSharedData('worklistNotifications', false), 'ITG'); - if (this.common.filterKeys['ITG'] != 0) - this.common.filterKeys['ITG'] = (this.common.filterKeys['ITG'] - 1) + if (flag != 'skip') { + this.common.setTotalNumberOfWorklistRequest(); + // this.common.assignDataToFilters(this.common.sharedService.getSharedData('worklistNotifications', false), 'ITG'); + if (this.common.filterKeys['ITG'] != 0) + this.common.filterKeys['ITG'] = (this.common.filterKeys['ITG'] - 1) + } if (this.is_all_items_sents) { for (let i = 1; i < this.all_request_names.length; i++) { for (let j = 0; j < this.all_request_names[i].data.length; j++) { @@ -218,6 +220,7 @@ export class WorkListMainItgComponent implements OnInit { } } else if (this.index === this.all_request_names.length) { // if its the end request redirecte to worklist home this.common.sharedService.setSharedData(true, 'loadWorkList'); + this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); return false; } @@ -233,6 +236,7 @@ export class WorkListMainItgComponent implements OnInit { return; } else { this.common.sharedService.setSharedData(true, 'loadWorkList'); + this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); return; } @@ -240,6 +244,7 @@ export class WorkListMainItgComponent implements OnInit { } } this.common.sharedService.setSharedData(true, 'loadWorkList'); + this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); return; } @@ -498,8 +503,8 @@ export class WorkListMainItgComponent implements OnInit { } if (this.actionSelected === 'Delegate') { this.common.sharedService.setSharedData(info, 'selectedEmpInfo'), - this.common.sharedService.setSharedData('Delegate','pressedBtn') - this.presentModal(4); + this.common.sharedService.setSharedData('Delegate', 'pressedBtn') + this.presentModal(4); } if (this.actionSelected === 'Doable') { this.actionService(1, this.commentText); @@ -517,7 +522,7 @@ export class WorkListMainItgComponent implements OnInit { this.actionService(2, this.commentText); } if (this.actionSelected === 'RequestInformation') { - this.common.sharedService.setSharedData('RequestInformation','pressedBtn') + this.common.sharedService.setSharedData('RequestInformation', 'pressedBtn') this.presentModal(3); } if (this.actionSelected === 'ReportGenerated') { 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 72d200ca..685af282 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 @@ -170,6 +170,10 @@ +
+ {{searchKey}} +
+ -
-
-
--> +
+
@@ -320,14 +324,14 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
-
+ --> diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index 16c465a0..78700141 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -7,34 +7,42 @@ position: relative; bottom: 4px; } + ion-radio { - --color-checked: #269db8; + --color-checked: #29B5BF; } + .center { text-align: center; } + .boldTxtNav { text-align: start; font-weight: bold; padding: 12px; } + .employee-details { display: inline-block; margin: 10px; } + .empImgeRep { display: inline-block; height: 40px; width: 40px; } + .star-fav { float: right; margin: 10px; } + .star-fav-left { float: left; margin: 10px 5px; } + .uk-margin { margin: 15px 15px 0px 15px; font-weight: bold; @@ -42,9 +50,11 @@ ion-radio { position: relative; top: 10px; } + .uk-padding { padding: 20px; } + .uk-padding .employee-details { bottom: 10px; position: relative; @@ -55,18 +65,22 @@ ion-radio { border-radius: 21px; padding-left: 10px !important; } + .filterInput-ar { border: solid var(--gray) 1px; border-radius: 21px; --padding-start: 10px !important; } + .square-container { width: 100%; clear: both; } + .square { clear: both; } + .top-radio-row { font-size: 12px; } @@ -104,6 +118,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { position: relative; top: 0; } + .profileImage { width: 60px !important; } @@ -111,9 +126,11 @@ button.item-button.button.button-md.button-clear.button-clear-md { .activated { border: #209a83 0.02cm solid; } + .deactivated { border: #e4e4e4 0.02cm solid; } + .repContentDiv { text-align: center; width: 85%; @@ -124,6 +141,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { margin-top: -9px; margin-right: -35px; } + .selIEmpDiv { text-align: right; margin-bottom: -26px; @@ -143,6 +161,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { margin: 8px 17px 0px 17px; padding: 10px 2px 10px 2px; } + .filterInput { border: solid var(--gray) 1px; border-radius: 21px; @@ -161,6 +180,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-right: 129px; //margin-right: -136px; } + .filterBtn { background: var(--newgreen); --background: var (--newgreen); @@ -168,6 +188,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { height: 60px; width: 60px; } + .filterBtn-ar { // background: var(--newgreen); // --background: var (--newgreen); @@ -191,6 +212,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding: 8px; width: 100%; } + .square { // width:calc(100% / 2); width: 100%; @@ -223,17 +245,21 @@ button.item-button.button.button-md.button-clear.button-clear-md { position: relative; bottom: 4px; } + ion-radio { - --color-checked: #269db8; + --color-checked: #29B5BF; } + .center { text-align: center; padding: 5px; } + .boldTxtNav { font-weight: bold; padding: 5px; } + .employee-details { display: inline-block; margin: 10px; @@ -241,15 +267,18 @@ ion-radio { white-space: nowrap; width: 70%; } + .empImgeRep { display: inline-block; height: 40px; width: 40px; } + .star-fav { float: right; margin: 15px 0px 0px 0px; } + .uk-margin { margin: 15px 15px 0px 15px; font-weight: bold; @@ -257,9 +286,11 @@ ion-radio { position: relative; top: 10px; } + .uk-padding { padding: 20px; } + .uk-padding .employee-details { bottom: 10px; position: relative; @@ -275,39 +306,64 @@ ion-radio { padding-bottom: 25px; padding-top: 15px; } + .textSearchType { padding-top: 8px; font-size: 12px; } .isFavLetterActive { - color: #269db8; - display: block; - width: 60%; - float: right; - transition-duration: 0ms; + color: #29B5BF; + display: block; + width: 60%; + float: right; + transition-duration: 0ms; height: 35px; } + .vl { border-left: 2px solid lightgray; height: 42px; } -.searchText{ + +.searchText { background: transparent; - color: #269db8; + color: #29B5BF; font-weight: bold; text-decoration: underline; } -.letterDiv{ - font-weight: bold; - width: 10%; +.letterDiv { + font-weight: bold; + width: 10%; float: right; } -.letterDivLoop{ - display: block; - width: 60%; - float: right; - transition-duration: 0ms; + +.letterDivLoop { + display: block; + width: 60%; + float: right; + transition-duration: 0ms; height: 35px; } + +.square-selected { + box-shadow: 5px 2px 8px #ccc; + padding: 0px 10px 0px 10px; + margin: 0px 15px; + border-radius: 10px; + position: relative; + bottom: 20px; +} + +.square-selected img { + height: 20px; + width: 20px; + bottom: 3px; + position: relative; + +} + +.square-selected span { + white-space: normal; +} \ No newline at end of file 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 9426bf97..c2888b0f 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 @@ -48,7 +48,7 @@ export class WorkListReplacementItgComponent implements OnInit { spaceBetween: 5 }; - public activeSelectedLetter:string; + public activeSelectedLetter: string; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, @@ -368,7 +368,7 @@ export class WorkListReplacementItgComponent implements OnInit { this.selectedLetter(this.activeSelectedLetter); } else { this.favLetter.forEach((obj, index) => { - if(this.activeSelectedLetter) {} + if (this.activeSelectedLetter) { } if (index === 0) { // this.selectedLetter(obj); this.favIsActive.push(true); @@ -446,7 +446,7 @@ export class WorkListReplacementItgComponent implements OnInit { if (letter === el) { this.favIsActive[index] = true; this.activeSelectedLetter = el; - this.worklistService.getFavoriteByLetter(letter,() => { + this.worklistService.getFavoriteByLetter(letter, () => { }).subscribe((result) => { if (this.cs.validResponse(result)) { this.cs.stopLoading(); @@ -466,4 +466,10 @@ export class WorkListReplacementItgComponent implements OnInit { returnIsActiveFunction(i) { return this.favIsActive[i]; } + resetSelected() { + + this.searchKey = ''; + this.userSelected = false; + + } } 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 3d40e1b0..7af23728 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 @@ -90,7 +90,7 @@
- +

{{'replacementRoll, workflow' | translate}}

-

{{'replacementRoll, favorite' | translate}}

+

{{'replacementRoll, employee-id' | translate}}

{{'replacementRoll, employee-email' | translate}}

{{'replacementRoll, employee-name' | translate}}

@@ -125,7 +125,12 @@
- + +
+ {{inputSearch}} +
+ +
@@ -175,14 +180,14 @@ {{employee.NAME}} -
-
+
--> @@ -209,14 +214,14 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
-
+ --> @@ -258,14 +263,14 @@ -
-
+ --> @@ -305,16 +310,16 @@
{{'general, submit' | translate}} {{'general, submit' | translate}} - {{'general, cancel' | 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 2584b446..d72ed0a3 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 @@ -31,6 +31,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { position: relative; top: 0; } + .profileImage { width: 60px !important; } @@ -38,9 +39,11 @@ button.item-button.button.button-md.button-clear.button-clear-md { .activated { border: #209a83 0.02cm solid; } + .deactivated { border: #e4e4e4 0.02cm solid; } + .repContentDiv { text-align: center; width: 85%; @@ -51,6 +54,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { margin-top: -9px; margin-right: -35px; } + .selIEmpDiv { text-align: right; margin-bottom: -26px; @@ -70,6 +74,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { margin: 8px 17px 0px 17px; padding: 10px 2px 10px 2px; } + .filterInput { border: solid var(--gray) 1px; border-radius: 21px; @@ -88,6 +93,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-right: 129px; //margin-right: -136px; } + .filterBtn { background: var(--newgreen); --background: var (--newgreen); @@ -95,6 +101,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { height: 60px; width: 60px; } + .filterBtn-ar { // background: var(--newgreen); // --background: var (--newgreen); @@ -118,6 +125,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding: 8px; width: 100%; } + .square { // width:calc(100% / 2); width: 100%; @@ -150,19 +158,22 @@ button.item-button.button.button-md.button-clear.button-clear-md { position: relative; bottom: 4px; } -ion-radio{ + +ion-radio { --color-checked: #29B5BF; - } -.center{text-align: center;padding: 5px;} -.boldTxtNav{ - font-weight: bold; +} + +.center { + text-align: center; padding: 5px; } + .boldTxtNav { text-align: start; font-weight: bold; padding: 12px; } + .employee-details { display: inline-block; margin: 10px; @@ -170,15 +181,18 @@ ion-radio{ white-space: nowrap; width: 70%; } + .empImgeRep { display: inline-block; height: 40px; width: 40px; } + .star-fav { float: right; margin: 15px 0px 0px 0px; } + .uk-margin { margin: 15px 15px 0px 15px; font-weight: bold; @@ -186,9 +200,11 @@ ion-radio{ position: relative; top: 10px; } + .uk-padding { padding: 20px; } + .uk-padding .employee-details { bottom: 10px; position: relative; @@ -198,57 +214,86 @@ ion-radio{ float: left; margin: 10px 5px; } + .top-radio-row { font-size: 12px; display: block; padding-bottom: 25px; padding-top: 15px; } + .textSearchType { padding-top: 8px; font-size: 12px; } + .isFavLetterActive { - // background: #269db8; + // background: #29B5BF; // width: 55px; // border-radius: 60px; - color: #269db8; - display: block; - width: 60%; - float: right; - transition-duration: 0ms; + color: #29B5BF; + display: block; + width: 60%; + float: right; + transition-duration: 0ms; height: 35px; } + .vl { border-left: 2px solid lightgray; height: 42px; } -.clearText{ + +.clearText { background: transparent; color: #D55D5C; font-weight: bold; text-decoration: underline; } -.searchText{ + +.searchText { background: transparent; - color: #269db8; + color: #29B5BF; font-weight: bold; text-decoration: underline; } -.filterClass input{ + +.filterClass input { box-shadow: none !important; -webkit-box-shadow: none !important; } -.letterDiv{ - font-weight: bold; - width: 10%; +.letterDiv { + font-weight: bold; + width: 10%; float: right; } -.letterDivLoop{ - display: block; - width: 60%; - float: right; - transition-duration: 0ms; + +.letterDivLoop { + display: block; + width: 60%; + float: right; + transition-duration: 0ms; height: 35px; +} + +.square-selected { + box-shadow: 5px 2px 8px #ccc; + padding: 0px 10px 0px 10px; + margin: 0px 15px; + border-radius: 10px; + position: relative; + bottom: 20px; +} + +.square-selected img { + height: 20px; + width: 20px; + bottom: 3px; + position: relative; + +} + +.square-selected span { + white-space: normal; } \ No newline at end of file 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 0e2a6346..b65a3cbc 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 @@ -682,4 +682,10 @@ export class WorkListReplacementRollComponent implements OnInit { clearSearchInput() { this.inputSearch = ''; } + resetSelected() { + + this.inputSearch = ''; + this.userSelected = false; + + } } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html index d856fe4d..c8e3ad4c 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html @@ -76,10 +76,10 @@
- + {{'general, submit' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index e8e41c87..15fe102f 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -7,6 +7,7 @@ import { WorklistService } from '../service/worklist.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { ModalController } from '@ionic/angular'; +import { HomeComponent } from '../home/home.component'; @Component({ selector: 'app-work-list-rfc', @@ -39,7 +40,7 @@ export class WorkListRfcComponent implements OnInit { public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController - ) { + ) { this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo'); this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr'); @@ -124,11 +125,14 @@ export class WorkListRfcComponent implements OnInit { if (this.cs.validResponse(result)) { if (result.MessageStatus == 1) { this.cs.sharedService.setSharedData(true, 'loadWorkList'); + let itemType = this.getPassNotificationDetails.ITEM_TYPE; + if (this.cs.filterKeys[itemType] != 0) { + this.cs.filterKeys[itemType] = (this.cs.filterKeys[itemType] - 1) + } - - this.messageSuccess = true; + // this.messageSuccess = true; - setTimeout(() => { + // setTimeout(() => { this.messageSuccess = false; //this.cs.openNotificationPage(); // this.modalCtrl.dismiss(); @@ -137,7 +141,8 @@ export class WorkListRfcComponent implements OnInit { data: "Success" }); - }, 5000); + // }, 1000); + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.cs.openNotificationPage(); } @@ -178,18 +183,18 @@ export class WorkListRfcComponent implements OnInit { this.modalCtrl.dismiss(); } - select(selectEmp,index){ + select(selectEmp, index) { console.log(selectEmp.USER_NAME); console.log(selectEmp.SEQ); - this.radioButtonValue=selectEmp.USER_NAME + this.radioButtonValue = selectEmp.USER_NAME this.seqNo = selectEmp.SEQ; -////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////// // let emp: any = this.RFCEmployeeListListRes[v]; // this.seqNo = emp.SEQ; // this.radioButtonValue = emp.USER_NAME; - this.active=index; + this.active = index; } } diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index a185754a..f270f1d2 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -1,8 +1,8 @@ -
-

{{ts.trPK('general','advanced-search')}}

- -
+
+

{{ts.trPK('general','advanced-search')}}

+ +
@@ -47,14 +47,14 @@ {{ts.trPK('vacation-rule','itemType')}} - - HR - PO + {{text}} + diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss index bef3801b..59a2927e 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss @@ -1,50 +1,74 @@ -.search-header{ +.search-header { display: inline-block; + h2 { display: inline-block; margin-left: 20px; font-family: WorkSans-Regular; font-size: 18px; margin-top: 12px; + margin-right: 20px; } + ion-icon { display: inline-block; font-size: 23px; position: absolute; + top: 10px; + } +} + +.position-en{ + ion-icon { right: 15px; - top: 8px; } } + +.position-ar { + ion-icon { + left: 15px !important; + } +} + .search-container { margin-right: 15px; margin-left: 15px; // padding-bottom: 100px; margin-top: 5px; - ion-item{ + + ion-item { border: 2px solid #eaeaea; border-radius: 25px; margin-bottom: 20px; } } -.cancel-ar{ +.cancel-ar { margin-right: 239px; } -.search-button{ - background: #3dcab3; + +.search-button { + background: #44A7A1; height: 50px; text-align: center; font-family: WorkSans-Regular; border-radius: 22px; margin-top: 20px; line-height: 50px; - span{ + + span { color: white; } } -.custom-width{ + +.custom-width { max-width: 100% !important; } -.enable-overflow{ + +.enable-overflow { overflow: visible !important; +} + +.myCustomSelect{ + max-width: 100% !important; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts index 319c5c60..3b822625 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts @@ -17,6 +17,7 @@ export class WorklistAdvancedSearchComponent implements OnInit { public notificationType = ''; public itemType; public direction: string; + public text = 'HR'; constructor( public modalController: ModalController, @@ -25,7 +26,9 @@ export class WorklistAdvancedSearchComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName(); } - ngOnInit() {} + ngOnInit() { + this.text = this.direction == 'en' ? 'HR': 'الموارد البشرية'; + } public dismissModal() { this.modalController.dismiss(); diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html index b22aa453..0206f5a4 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html @@ -414,7 +414,7 @@ - + {{approve_label}} @@ -426,7 +426,7 @@ - + {{reject_label}} @@ -435,7 +435,7 @@ {{reqInfo_label}} - + {{'worklistMain, skip' | translate}} diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts index bb4f13d3..d4d94682 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts @@ -429,10 +429,11 @@ export class WorklistMainIcComponent implements OnInit { this.common.sharedService.setSharedData(true, 'loadWorkList'); // this.messageSuccess = true; this.common.greenToastPK('worklist', 'done-successfully'); + this.common.setTotalNumberOfWorklistRequest(); setTimeout(() => { - this.common.setTotalNumberOfWorklistRequest(); + this.nextNotfification(); - }, 5000); + }, 300); } else { this.common.redToastPK('worklist', 'save-error'); } @@ -460,7 +461,7 @@ export class WorklistMainIcComponent implements OnInit { // } // } - public nextNotfification() { + public nextNotfification(flag?) { if (document.getElementById('notificationDynamicFieldsPO') != null) { document.getElementById('notificationDynamicFieldsPO').innerHTML = ''; } @@ -469,7 +470,7 @@ export class WorklistMainIcComponent implements OnInit { let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo); let previousRequest = this.notificationArray[index].REQUEST_TYPE; let previousRequestType = this.notificationArray[index].ITEM_TYPE; - if (this.common.filterKeys[previousRequestType] != 0) + if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip') this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1) index += 1; @@ -482,10 +483,12 @@ export class WorklistMainIcComponent implements OnInit { } else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) { this.checkRequestType(index); } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } @@ -494,16 +497,16 @@ export class WorklistMainIcComponent implements OnInit { checkRequestType(index) { if (this.notificationArray[index].REQUEST_TYPE === 'PO') { - this.intializeNotificationDetail(); - } else - if (this.notificationArray[index].REQUEST_TYPE === 'PR') { + this.common.openWorklistMainPOPage(); + } else if (this.notificationArray[index].REQUEST_TYPE === 'PR') { this.common.openWorklistMainPRPage(); - } else - if (this.notificationArray[index].REQUEST_TYPE === 'MO') { + } else if (this.notificationArray[index].REQUEST_TYPE === 'MO') { this.common.openWorklistMainMRPage(); - } else { + } else if (this.notificationArray[index].REQUEST_TYPE === 'ITEM_CREATION') { + this.intializeNotificationDetail(); + } else { this.common.openWorklistMainPage(); - } + } } actionButton(action) { @@ -541,8 +544,8 @@ export class WorklistMainIcComponent implements OnInit { // } if ( - ButtonAction == "APPROVE" || - ButtonAction == "REJECT" || + ButtonAction == "APPROVED" || + ButtonAction == "REJECTED" || ButtonAction == "DEL" || ButtonAction == "CLOSE" ) { @@ -557,10 +560,10 @@ export class WorklistMainIcComponent implements OnInit { // this.WorkListActionObj, // WorklistMainPRComponent.PASS_NOTIFICATION_INFO // ); - if (ButtonAction == "APPROVE") { + if (ButtonAction == "APPROVED") { this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg') } - else if (ButtonAction == "REJECT") { + else if (ButtonAction == "REJECTED") { this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg') } @@ -650,7 +653,8 @@ export class WorklistMainIcComponent implements OnInit { ButtonAction == "TRANSFER" || ButtonAction == "TRANSFER_INFO" || ButtonAction == "APPROVE_AND_FORWARD" || - ButtonAction == "FORWARD" + ButtonAction == "FORWARD" || + ButtonAction == "RETURNED" ) { @@ -1219,10 +1223,11 @@ export class WorklistMainIcComponent implements OnInit { // this.openNotificationsDashboard(); // this.messageSuccess = true; this.common.greenToastPK('worklist', 'done-successfully'); + this.common.setTotalNumberOfWorklistRequest(); setTimeout(() => { - this.common.setTotalNumberOfWorklistRequest(); + this.nextNotfification(); - }, 100); + }, 300); // this.nextNotfification(); } else { 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 59a8ead5..de2dff5f 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 @@ -665,7 +665,7 @@ - + {{'worklistMain, skip' | translate}} 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 446da7f1..bfdf25c6 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 @@ -406,7 +406,7 @@ export class WorklistMainMRComponent implements OnInit { // } - public nextNotfification() { + public nextNotfification(flag?) { //let itemExist = false; if (document.getElementById("notificationDynamicFieldsMR") != null) { document.getElementById("notificationDynamicFieldsMR").innerHTML = ""; @@ -417,7 +417,7 @@ export class WorklistMainMRComponent implements OnInit { let previousRequest = this.notificationArray[index].REQUEST_TYPE; let previousRequestType = this.notificationArray[index].ITEM_TYPE; - if (this.common.filterKeys[previousRequestType] != 0) + if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip') this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1) index += 1; @@ -430,10 +430,12 @@ export class WorklistMainMRComponent implements OnInit { } else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) { this.checkRequestType(index); } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index 55ef6125..bd933831 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -114,7 +114,7 @@
- {{Lines.PROMISED_DATE | date}} + {{Lines.PROMISED_DATE}} @@ -141,7 +141,7 @@ {{Lines.REQUESTOR}} - +
@@ -633,7 +633,7 @@ {{reqInfo_label}} - + {{'worklistMain, skip' | translate}} diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index 74a65fac..f2e79a55 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -262,7 +262,7 @@ export class WorklistMainPoComponent implements OnInit { this.worklistMainService .getPONotificationBody(notificationBodyObj) .subscribe((result: PONotificatonBodyResponse) => { - // console.log(result.SFH_GetPoNotificationBodyList.POHeader[0].BUYER); + // console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); this.handleWorkListBodyResult(result, "PO"); }); } @@ -309,11 +309,11 @@ export class WorklistMainPoComponent implements OnInit { } } else if (Type == "PO") { - if (result.SFH_GetPoNotificationBodyList) { + if (result.GetPoNotificationBodyList) { // console.log("PO"); - this.POHeader = result.SFH_GetPoNotificationBodyList.POHeader; - this.POLines = result.SFH_GetPoNotificationBodyList.POLines; + this.POHeader = result.GetPoNotificationBodyList.POHeader; + this.POLines = result.GetPoNotificationBodyList.POLines; for (var i = 0; i < this.POHeader.length; i++) { this.PO_NUMBER = this.POHeader[i].PO_NUMBER; @@ -332,7 +332,7 @@ export class WorklistMainPoComponent implements OnInit { // HDR_ATTRIBUTE_VALUE } this.notificationBodyRes = - result.SFH_GetPoNotificationBodyList; + result.GetPoNotificationBodyList; } }// } @@ -437,7 +437,7 @@ export class WorklistMainPoComponent implements OnInit { // } // } - public nextNotfification() { + public nextNotfification(flag?) { if (document.getElementById('notificationDynamicFieldsPO') != null) { document.getElementById('notificationDynamicFieldsPO').innerHTML = ''; } @@ -447,7 +447,7 @@ export class WorklistMainPoComponent implements OnInit { let previousRequest = this.notificationArray[index].REQUEST_TYPE; let previousRequestType = this.notificationArray[index].ITEM_TYPE; - if (this.common.filterKeys[previousRequestType] != 0) + if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip') this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1) index += 1; @@ -460,10 +460,12 @@ export class WorklistMainPoComponent implements OnInit { } else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) { this.checkRequestType(index); } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } @@ -1040,10 +1042,10 @@ export class WorklistMainPoComponent implements OnInit { this.worklistMainService.getPONotificationBody(this.WorkListBodyObj). subscribe((result: any) => { if (this.common.validResponse(result)) { - if (result.SFH_GetPoNotificationBodyList != undefined) { + if (result.GetPoNotificationBodyList != undefined) { this.P_PAGE_NUM++; this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; - (result.SFH_GetPoNotificationBodyList).forEach(element => { + (result.GetPoNotificationBodyList).forEach(element => { if (element.ROW_NUM == element.NO_OF_ROWS) { this.IsReachEnd = true; } else { 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 ccc730ee..69de2e55 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 @@ -411,7 +411,7 @@ {{reqInfo_label}} - + {{'worklistMain, skip' | translate}} 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 766f7c6e..74cc53ce 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 @@ -307,12 +307,12 @@ export class WorklistMainPRComponent implements OnInit { result.GetAbsenceCollectionNotificationBodyList; } } else if (Type == 'PR') { - if (result.SFH_GetPrNotificationBodyList) { + if (result.GetPrNotificationBodyList) { console.log('PR'); - this.pInformation = result.SFH_GetPrNotificationBodyList.P_INFORMATION; + this.pInformation = result.GetPrNotificationBodyList.P_INFORMATION; - this.PRHeader = result.SFH_GetPrNotificationBodyList.PRHeader; - this.PRLines = result.SFH_GetPrNotificationBodyList.PRLines; + this.PRHeader = result.GetPrNotificationBodyList.PRHeader; + this.PRLines = result.GetPrNotificationBodyList.PRLines; for (var i = 0; i < this.PRHeader.length; i++) { if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total') { this.totalH = this.PRHeader[i].HDR_ATTRIBUTE_NAME; @@ -329,7 +329,7 @@ export class WorklistMainPRComponent implements OnInit { // HDR_ATTRIBUTE_VALUE } this.notificationBodyRes = - result.SFH_GetPrNotificationBodyList; + result.GetPrNotificationBodyList; } } } @@ -425,7 +425,7 @@ export class WorklistMainPRComponent implements OnInit { // } - public nextNotfification() { + public nextNotfification(flag?) { //let itemExist = false; if (document.getElementById("notificationDynamicFieldsPR") != null) { @@ -438,7 +438,7 @@ export class WorklistMainPRComponent implements OnInit { let previousRequest = this.notificationArray[index].REQUEST_TYPE; let previousRequestType = this.notificationArray[index].ITEM_TYPE; - if (this.common.filterKeys[previousRequestType] != 0) + if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip') this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1) index += 1; @@ -451,10 +451,12 @@ export class WorklistMainPRComponent implements OnInit { } else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) { this.checkRequestType(index); } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } } else { + //this.common.setTotalNumberOfWorklistRequest(true); this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.common.openNotificationPage(); } @@ -960,11 +962,11 @@ export class WorklistMainPRComponent implements OnInit { this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj). subscribe((result: any) => { if (this.common.validResponse(result)) { - if (result.SFH_GetPrNotificationBodyList != undefined) { + if (result.GetPrNotificationBodyList != undefined) { this.P_PAGE_NUM++; this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; - (result.SFH_GetPrNotificationBodyList).forEach(element => { + (result.GetPrNotificationBodyList).forEach(element => { if (element.ROW_NUM == element.NO_OF_ROWS) { this.IsReachEnd = true; } 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 0a05a4a6..08d0eb1f 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -52,6 +52,8 @@ getPassNotificationDetails?.REQUEST_TYPE != 'CONTACT' && getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' && getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'OPM' && + getPassNotificationDetails?.REQUEST_TYPE != 'OLM' && getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
@@ -301,6 +303,8 @@ getPassNotificationDetails?.REQUEST_TYPE == 'CONTACT' && getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' && getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'OPM' && + getPassNotificationDetails?.REQUEST_TYPE != 'OLM' && getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">

{{'worklist, loading'| translate}} -

Current

+

{{ 'general, current' | translate}}

-

Proposed

+

{{ 'general, proposed' | translate}}

@@ -351,6 +355,8 @@ getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' && getPassNotificationDetails?.REQUEST_TYPE == 'PHONE_NUMBERS' && getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'OPM' && + getPassNotificationDetails?.REQUEST_TYPE != 'OLM' && getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">

{{'worklist, loading'| translate}}

{{'worklist, loading'| translate}}

{{'worklist, loading'| translate}}

+ + + +
+

{{'worklist, loading'| translate}}

+
+ +
+

{{ 'general, empty' | translate}}

+
+
+
+ +

{{'worklist, enrollmentDetails' | translate}}

+ + + + + + +

{{ 'worklist, courseName' | translate}}

+
+
+ + +

{{item.COURSE_NAME}}

+
+
+
+ + + + +

{{ 'worklist, startDate' | translate}}

+
+
+ + +

{{item.START_DATE}}

+
+
+
+ + + + +

{{ 'worklist, timeZone' | translate}}

+
+
+ + +

{{item.TIMEZONE}}

+
+
+
+ + + + +

{{ 'worklist, trainingCenter' | translate}}

+
+
+ + +

{{item.TRAINING_CENTER}}

+
+
+
+ + + + +

{{ 'worklist, enrollmentJustification' | translate}}

+
+
+ + +

{{item.ENROLLMENT_JUSTIFICATION}}

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

{{ 'worklist, className' | translate}}

+
+
+ + +

{{item.CLASS_NAME}}

+
+
+
+ + + + +

{{ 'worklist, endDate' | translate}}

+
+
+ + +

{{item.END_DATE}}

+
+
+
+ + + + +

{{ 'worklist, deliveryMode' | translate}}

+
+
+ + +

{{item.DELIVERY_MODE}}

+
+
+
+ + + + +

{{ 'worklist, language' | translate}}

+
+
+ + +

{{item.LANGUAGE}}

+
+
+
+ + + + +

{{ 'worklist, Note' | translate}}

+
+
+ + +

{{item.NOTE}}

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

{{'worklist, loading'| translate}}

+
+ +
+

{{ 'general, empty' | translate}}

+
+ + +
+

{{'worklist, overallRating' | translate}}

+
+ + + + + +

{{ 'worklist, rateName' | translate}}

+
+
+ + +

{{item.RATE_NAME}}

+
+
+
+ + + +

{{ 'worklist, overalLPerformanceID' | translate}}

+
+
+ + +

{{item.OVERALL_PERFORMANCE_LEVEL_ID}}

+
+
+
+ + + +

{{ 'worklist, overallRating' | translate}}

+
+
+ + +

{{item.OVERALL_RATING}}

+
+
+
+ + + +

{{ 'worklist, comments' | translate}}

+
+
+ + +

{{item.COMMENTS}}

+
+
+
+
+
+
+
+ + +
+

{{'worklist, objectiveRating' | translate}}

+
+ + + + + +

{{ 'worklist, objectiveName' | translate}}

+
+
+ + +

{{item.OBJECTIVE_NAME}}

+
+
+
+ + + +

{{ 'worklist, weightingPercent' | translate}}

+
+
+ + +

{{item.WEIGHTING_PERCENT}}

+
+
+
+ + + +

{{ 'worklist, targetValue' | translate}}

+
+
+ + +

{{item.TARGET_VALUE}}

+
+
+
+ + + +

{{ 'worklist, actualVALUE' | translate}}

+
+
+ + +

{{item.ACTUAL_VALUE}}

+
+
+
+ + + + +

{{ 'worklist, appraisedPerformance' | translate}}

+
+
+ + +

{{item.APPRAISED_PERFORMANCE}}

+
+
+
+ + + + +

{{ 'worklist, appraisedPerformanceDesc' | translate}}

+
+
+ + +

{{item.APPRAISED_PERFORMANCE_DESC}}

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

{{'worklist, competenciesRating' | translate}}

+
+ + + + + +

{{ 'worklist, competencyName' | translate}}

+
+
+ + +

{{item.COMPETENCY_NAME}}

+
+
+
+ + + +

{{ 'worklist, targetValue' | translate}}

+
+
+ + +

{{item.TARGET_VALUE}}

+
+
+
+ + + +

{{ 'worklist, weightingPercent' | translate}}

+
+
+ + +

{{item.WEIGHTING_PERCENT}}

+
+
+
+ + + +

{{ 'worklist, actualVALUE' | translate}}

+
+
+ + +

{{item.ACTUAL_VALUE}}

+
+
+
+ + + + +

{{ 'worklist, appraisedPerformance' | translate}}

+
+
+ + +

{{item.APPRAISED_PERFORMANCE}}

+
+
+
+ + + + +

{{ 'worklist, appraisedPerformanceDesc' | translate}}

+
+
+ + +

{{item.APPRAISED_PERFORMANCE_DESC}}

+
+
+
+
+
+
+
+
+ @@ -451,7 +875,7 @@
- + @@ -544,7 +968,7 @@
- +
@@ -560,7 +984,7 @@
- +
@@ -634,7 +1058,7 @@
- +
- {{returnDateTime(actionHistory.NOTIFICATION_DATE)}} + {{actionHistory.NOTIFICATION_DATE}} - @@ -745,14 +1169,14 @@
-
+ @@ -821,7 +1245,7 @@ {{reqInfo_label}} - + {{'worklistMain, skip' | translate}} 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 57334993..5817c5af 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -1,264 +1,281 @@ +.actionBtn { - - .actionBtn{ - - height: auto; - min-height: 35px !important; - padding: 10px; - font-size: 12px; - white-space: normal; - - } - button.actionBtn.button.button-md, - button.actionBtn.button.button-ios, - button.actionBtn.button.button - { - width: 90%; + height: auto; + min-height: 35px !important; + padding: 10px; + font-size: 12px; + white-space: normal; + +} + +button.actionBtn.button.button-md, +button.actionBtn.button.button-ios, +button.actionBtn.button.button { + width: 90%; +} + +.actionBtnCol { + text-align: center; +} + +.actionBtnGrid { + + padding: 0px; +} + +.notColBtn { + + min-height: 150px !important; + padding: 0px; + background: transparent; + border: 2px solid #e4e5e7; + + p { + color: var(--secondary); + margin-top: 0px; + margin-bottom: 0px; + font-weight: normal; + font-size: 14px; + white-space: normal; + padding: 3px 0px; + min-height: 50px; } - .actionBtnCol{ - text-align: center; + + span { + display: block; + } - .actionBtnGrid{ - - padding:0px; + + .serviceItemImg { + min-width: 60px !important; + min-height: 70px !important; + width: 70px; + height: 70px; + margin: 10px auto; + background: transparent !important; } - .notColBtn { - - min-height: 150px !important; - padding: 0px; - background: transparent; - border: 2px solid #e4e5e7; - p{ - color: var(--secondary); - margin-top: 0px; margin-bottom:0px; - font-weight: normal; - font-size: 14px; - white-space: normal; - padding: 3px 0px; - min-height: 50px; - } - span { - display: block; - - } - - .serviceItemImg { - min-width: 60px !important; - min-height: 70px !important; - width: 70px; - height: 70px; - margin: 10px auto; - background: transparent !important; - } - - } - .notColBtn.button,.notColBtn.button-md, .notColBtn.button-ios{ - background: transparent !important; - color: var(--dark); - box-shadow: none; - -webkit-box-shadow:none; - -moz-box-shadow: none; - padding: 0px; - color: var(--secondary); - border: 2px solid var(--gray); - min-width: auto; - } + +} + +.notColBtn.button, +.notColBtn.button-md, +.notColBtn.button-ios { + background: transparent !important; + color: var(--dark); + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + padding: 0px; + color: var(--secondary); + border: 2px solid var(--gray); + min-width: auto; +} + //////////////////////// - .itemHISBtn{ - padding: 5px; - color: var(--light); - background: var(--darkgray); - border-radius: 3px; - width: 85%; - height: 40px; - } - - - .rowBtn{ - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - background: white; - } - - - - .rowBorder{ - border-bottom: solid 0.02cm var(--grayBG); - - - } - .colBorder{ - border-right: solid 0.02cm var(--grayBG); - - } - - .dateActionHistory{ - display: inline-block; - margin-left: 5px; - text-align: left; - } - .req_info{ - width: 25px; - height: 25px; - display: inline-block; - margin: 0; - } - - .deligate{ - margin-left: 25px; - } - .actionBtn{ - --border-radius: 50% !important; - height: 55px; - width: 55px; - --background: var(--newgreen); // will be dynamic - background: transparent; - margin:10px; - } - - .itemAttch{ - border-radius: 11px; - margin: 8px; - --min-height: 60px; - --max-height: 60px; - } - - .less { - max-height: 54px; - } - - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - } - - .no-data-div{ - background: #ffffff; - height: 100%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - } - - .container { - font-size: 14px; - line-height: 14px; - height: 15px; - overflow: hidden; - text-align: justify; - } - - .show { - overflow: visible; - height: auto; - } - - .showMore{ - padding: 0px; - background: transparent; - color: blue; - text-decoration: underline; - font-size: 14px; - } - - // .succssfullMSG{ - // height: 100%; - // width: 100%; - // background: var(--newgreen); - // color: white; - // font-weight: bold; - // font-size: 20px; - // text-align: center; - // vertical-align: middle; - // padding-top: 30px; - // } - - // .succssfullIcon{ - // width: 60%; - // text-align: center; - // height: 36%; - // padding-top: 100px; - // } - //////////////////////////////// - .subOrdinateList{ - // margin: 10px; - // border-top-left-radius: 45px; - // border-bottom-left-radius: 45px; - // border: var(--cusgray) 1px solid !important; - --background: transparent; - margin-left: -15px; - margin-right: 6px; - margin-bottom:8px; -} -.status{ +.itemHISBtn { + padding: 5px; + color: var(--light); + background: var(--darkgray); + border-radius: 3px; + width: 85%; + height: 40px; +} + + +.rowBtn { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + background: white; +} + + + +.rowBorder { + border-bottom: solid 0.02cm var(--grayBG); + + +} + +.colBorder { + border-right: solid 0.02cm var(--grayBG); + +} + +.dateActionHistory { + display: inline-block; + margin-left: 5px; + text-align: left; +} + +.req_info { + width: 22px; + height: 22px; + display: inline-block; + margin: 0px 7px 0px 7px; +} + +.deligate { + margin-left: 25px; +} + +.actionBtn { + --border-radius: 50% !important; + height: 55px; + width: 55px; + --background: var(--newgreen); // will be dynamic + background: transparent; + margin: 10px; +} + +.itemAttch { + border-radius: 11px; + margin: 8px; + --min-height: 60px; + --max-height: 60px; +} + +.less { + max-height: 54px; +} + +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; +} + +.no-data-div { + background: #ffffff; + height: 100%; text-align: center; -// background: green; -border-radius: 10px; -font-size: 10px !important; -height: 40px; -color: white; -position: relative; -} -.rowHeader{ + padding-top: 1px; + border-radius: 10px; + margin: 10px; +} + +.container { + font-size: 14px; + line-height: 14px; + height: 15px; + overflow: hidden; + text-align: justify; +} + +.show { + overflow: visible; + height: auto; +} + +.showMore { + padding: 0px; + background: transparent; + color: blue; + text-decoration: underline; + font-size: 14px; +} + +// .succssfullMSG{ +// height: 100%; +// width: 100%; +// background: var(--newgreen); +// color: white; +// font-weight: bold; +// font-size: 20px; +// text-align: center; +// vertical-align: middle; +// padding-top: 30px; +// } + +// .succssfullIcon{ +// width: 60%; +// text-align: center; +// height: 36%; +// padding-top: 100px; +// } +//////////////////////////////// +.subOrdinateList { + // margin: 10px; + // border-top-left-radius: 45px; + // border-bottom-left-radius: 45px; + // border: var(--cusgray) 1px solid !important; + --background: transparent; + margin-left: -15px; + margin-right: 6px; + margin-bottom: 8px; +} + +.status { + text-align: center; + // background: green; + border-radius: 10px; + font-size: 10px !important; + height: 40px; + color: white; + position: relative; +} + +.rowHeader { border-bottom: 1px solid var(--cusgray); padding-bottom: 10px; margin-bottom: -17px; } -.container{ - position:relative; +.container { + position: relative; } -.overflow-hid-div{ - overflow:hidden; - margin-left:50px; - width:200px; + +.overflow-hid-div { + overflow: hidden; + margin-left: 50px; + width: 200px; height: 200px; - background-color:red; - + background-color: red; + } -.inner{ - width:50px; + +.inner { + width: 50px; height: 50px; - background-color:green; + background-color: green; position: absolute; - left:25px; - top:25px; - + left: 25px; + top: 25px; + } -.gridSubordinates{ - margin-left: 3%;//38px; - border-top-left-radius: 16px;//28px; - border-bottom-left-radius: 16px;//40px; - // padding-left: 8px; - background:var(--light); - border-top-right-radius: 16px; - border-bottom-right-radius: 16px; + +.gridSubordinates { + margin-left: 3%; //38px; + border-top-left-radius: 16px; //28px; + border-bottom-left-radius: 16px; //40px; + // padding-left: 8px; + background: var(--light); + border-top-right-radius: 16px; + border-bottom-right-radius: 16px; } -.subOrdinateDiv{ +.subOrdinateDiv { z-index: 4; - margin-left: 0px;//-32px; + margin-left: 0px; //-32px; // position: absolute; - top: 5px;//-2px; + top: 5px; //-2px; float: left; margin-right: 10px; } -.subOrdinateImg{ - width: 85px; - border: #e4e4e4 solid 2px; - -moz-border-radius: 50%; - border-radius: 50%; - border: 3px solid #f0efef; + +.subOrdinateImg { + width: 85px; + border: #e4e4e4 solid 2px; + -moz-border-radius: 50%; + border-radius: 50%; + border: 3px solid #f0efef; } -.subOrdinateRow{ +.subOrdinateRow { margin-left: 55px; } @@ -270,7 +287,8 @@ position: relative; margin-right: -13px; margin-bottom: 8px; } -.gridSubordinates-Ar{ + +.gridSubordinates-Ar { border-top-right-radius: 28px; border-bottom-right-radius: 40px; background: var(--light); @@ -289,39 +307,46 @@ position: relative; position: absolute; top: -2px; } + /////////////////////////////////////////////// -.label{ -font-size: 14px; +.label { + font-size: 14px; } -.subjectNotification{ +.subjectNotification { text-align: center; padding-top: 10px; font-weight: bold; } -.action-history ion-card-content{ - padding:0; + +.action-history ion-card-content { + padding: 0; } + ion-card.action-history { - margin:10px + margin: 10px } -.submitterInfo{ + +.submitterInfo { padding-top: 10px; padding-bottom: 10px; } -ion-card{ + +ion-card { color: black !important; } + //// -.tabBar{ - height:70px +.tabBar { + height: 70px } -.cardAlignTextEn{ +.cardAlignTextEn { text-align: left; } -.cardAlignTextAr{ + +.cardAlignTextAr { text-align: right; } @@ -331,35 +356,51 @@ ion-card{ .active-Segment { font-size: 0.3cm !important; - background: #29B5BF !important; + background: #6d6e71 !important; text-transform: none; --color-checked: none; border-radius: 100px; - border:0; + border: 0; } -.active-Segment ion-label{ + +.active-Segment ion-label { font-size: 11px; color: white !important; } -.normal-Segment ion-label{ + +.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; } + .action-btn { white-space: pre-wrap; font-size: 11px; } -.name{ - color:black !important ;font-weight: bold; + +.name { + color: black !important; + font-weight: bold; } -.timeline-item{ + +.timeline-item { margin: 0; white-space: nowrap; font-size: 10px; +} + +ion-item { + margin: 10px; + border-bottom: 1.5px solid #ececec; +} + +ion-item:last-child { + border: none; } \ 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 c55e7902..ebfdf160 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -36,6 +36,7 @@ import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-mo import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; import { IonSlides } from '@ionic/angular'; import { ActivatedRoute } from '@angular/router'; +import * as moment from "moment"; @Component({ selector: "app-worklist-main", @@ -256,13 +257,14 @@ export class WorklistMainComponent implements OnInit { this.WorkListAttachObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; - this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; + // this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + // this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; this.WorkListSubmitterInfoObj.P_SELECTED_EMPLOYEE_NUMBER = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.WorkListSubmitterInfoObj.P_SELECTED_RESP_ID = -999; - this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; - this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; - this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; + this.WorkListSubmitterInfoObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; + // this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; + // this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; + // this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; this.getsubmitterInfo(this.WorkListSubmitterInfoObj); @@ -272,8 +274,8 @@ export class WorklistMainComponent implements OnInit { this.getAttachmentNotification(this.WorkListAttachObj); this.getActionHistory(this.WorkListActionHistoryObj); - if (this.getPassNotificationDetails.REQUEST_TYPE == "SIT") { - this.getSITNotificationDetails(this.WorkListBodyObj); + if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + this.getEITNotificationDetails(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.getAbsenceNotificationDetails(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO") { @@ -298,6 +300,10 @@ export class WorklistMainComponent implements OnInit { this.getContactNotificationDetails(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'CEI') { this.getCEINotification(this.WorkListBodyObj); + } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'OPM') { + this.getOPMNotification(this.WorkListBodyObj); + } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'OLM') { + this.getOLMNotification(this.WorkListBodyObj); } } @@ -386,12 +392,30 @@ export class WorklistMainComponent implements OnInit { }); } - getSITNotificationDetails(notificationBodyObj) { + getEITNotificationDetails(notificationBodyObj) { this.notificationBodyRes = [] this.worklistMainService - .getSITNotificationBody(notificationBodyObj) + .getEITNotificationBody(notificationBodyObj) .subscribe((result: EITNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "SIT"); + this.handleWorkListBodyResult(result, "EIT"); + }); + } + + getOPMNotification(notificationBodyObj) { + this.notificationBodyRes = [] + this.worklistMainService + .getOPMNotificationBody(notificationBodyObj) + .subscribe((result: EITNotificatonBodyResponse) => { + this.handleWorkListBodyResult(result, "OPM"); + }); + } + + getOLMNotification(notificationBodyObj) { + this.notificationBodyRes = [] + this.worklistMainService + .getOLMNotification(notificationBodyObj) + .subscribe((result: EITNotificatonBodyResponse) => { + this.handleWorkListBodyResult(result, "OLM"); }); } @@ -409,10 +433,10 @@ export class WorklistMainComponent implements OnInit { if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; - if (Type == "SIT") { - if (result.GetSITCollectionNotificationBodyList) { + if (Type == "EIT") { + if (result.GetEITCollectionNotificationBodyList) { this.notificationBodyRes = - result.GetSITCollectionNotificationBodyList; + result.GetEITCollectionNotificationBodyList; if (this.notificationBodyRes[0].Collection_Notification) { console.log(this.notificationBodyRes[0].Collection_Notification); } @@ -437,6 +461,7 @@ export class WorklistMainComponent implements OnInit { result.GetAbsenceCollectionNotificationBodyList; } } else if (Type === "ADDRESS") { + console.log(result.GetAddressNotificationBodyList) if (result.GetAddressNotificationBodyList) { this.notificationBodyRes = result.GetAddressNotificationBodyList; @@ -490,6 +515,16 @@ export class WorklistMainComponent implements OnInit { console.log(result); } } + else if (Type === "OPM") { + if (result.OPM_Notification_Body) { + this.notificationBodyRes = result.OPM_Notification_Body; + } + } + else if (Type === "OLM") { + if (result.OLM_Notification_Body) { + this.notificationBodyRes = result.OLM_Notification_Body.P_ENROLLMENT_DETAILS_LIST; + } + } } } //End handleWorkListBodyResult @@ -560,11 +595,10 @@ export class WorklistMainComponent implements OnInit { // } // this.messageSuccess = true; this.common.greenToastPK('worklist', 'done-successfully'); - + this.common.setTotalNumberOfWorklistRequest(); setTimeout(() => { - this.common.setTotalNumberOfWorklistRequest(); this.nextNotfification(); - }, 100); + }, 300); } else { this.common.redToastPK('worklist', 'save-error'); } @@ -596,7 +630,7 @@ export class WorklistMainComponent implements OnInit { // } - public nextNotfification() { + public nextNotfification(flag?) { if (document.getElementById("notificationDynamicFields") != null) { document.getElementById("notificationDynamicFields").innerHTML = ""; } @@ -613,7 +647,7 @@ export class WorklistMainComponent implements OnInit { } else { previousRequest = itemType; } - if (this.common.filterKeys[previousRequest] != 0) + if (this.common.filterKeys[previousRequest] != 0 && flag != 'skip') this.common.filterKeys[previousRequest] = (this.common.filterKeys[previousRequest] - 1) index += 1; @@ -631,14 +665,14 @@ export class WorklistMainComponent implements OnInit { this.intializeNotificationDetail(); } else { this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); - + //this.common.setTotalNumberOfWorklistRequest(true); this.common.openNotificationPage(); } } } } else { this.common.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); - + //this.common.setTotalNumberOfWorklistRequest(true); this.common.openNotificationPage(); } @@ -817,7 +851,7 @@ export class WorklistMainComponent implements OnInit { ButtonAction == "UPDATE_ACTION" || ButtonAction == "CONTINUE_ACTION" ) { - if (this.getPassNotificationDetails.REQUEST_TYPE == "SIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { this.common.sharedService.setSharedData( this.notificationBodyRes, EITNotificatonBodyResponse.SHARED_DATA @@ -929,7 +963,7 @@ export class WorklistMainComponent implements OnInit { } openNotificationBody() { - if (this.getPassNotificationDetails.REQUEST_TYPE == "SIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { this.common.sharedService.setSharedData( this.notificationBodyRes, EITNotificatonBodyResponse.SHARED_DATA @@ -939,7 +973,7 @@ export class WorklistMainComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("WorkListDetailsPage", { NotBodyType: "EIT" }); - this.common.sharedService.setSharedData("SIT", "NotBodyType"); + this.common.sharedService.setSharedData("EIT", "NotBodyType"); this.common.openNotificationDetailsPage(); } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( @@ -1160,7 +1194,7 @@ export class WorklistMainComponent implements OnInit { setTimeout(() => { // this.messageSuccess = false; this.nextNotfification(); - }, 100); + }, 300); // this.nextNotfification(); } else { this.common.redToastPK('worklist', 'save-error'); @@ -1290,7 +1324,7 @@ export class WorklistMainComponent implements OnInit { showLoading(notificationList) { if (notificationList.length < 0) { return true; - } else if (notificationList === []) { + } else if (notificationList.length == 0) { return false; } else { return true; } } diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss index 927b8dc3..858b90ec 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss @@ -1,7 +1,7 @@ .header-toolbar{ - --background: #269DB8; + --background: #29B5BF; } ion-toggle{ - --background-checked: #269DB8; + --background-checked: #29B5BF; } \ No newline at end of file diff --git a/Mohem/src/app/offersdiscount/home/home.component.html b/Mohem/src/app/offersdiscount/home/home.component.html index b84354f8..678dc3e8 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.html +++ b/Mohem/src/app/offersdiscount/home/home.component.html @@ -54,7 +54,8 @@ -
+ + {{item.Title}} {{item.Title_AR}}
diff --git a/Mohem/src/app/offersdiscount/home/home.component.scss b/Mohem/src/app/offersdiscount/home/home.component.scss index 64c1ee5c..46e5e3b4 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.scss +++ b/Mohem/src/app/offersdiscount/home/home.component.scss @@ -4,11 +4,11 @@ width: 100%; position: absolute; - background: #29B5BF; + background: #259CB8; top: 0; } .header-toolbar{ - --background: #29B5BF !important; + --background: #259CB8 !important; } .bottom{ height: 100%; diff --git a/Mohem/src/app/offersdiscount/home/home.component.ts b/Mohem/src/app/offersdiscount/home/home.component.ts index 8eadda68..354daa36 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.ts +++ b/Mohem/src/app/offersdiscount/home/home.component.ts @@ -39,6 +39,7 @@ export class HomeComponent implements AfterViewInit { public cs: CommonService, public offersService: OfferDiscountService, public route: ActivatedRoute, + private sanitizer: DomSanitizer ) { this.route @@ -115,11 +116,17 @@ export class HomeComponent implements AfterViewInit { if (data['data']) { var parseJSON = data['data']; var offers = JSON.parse(parseJSON); - this.offersData = offers; + console.log(offers); + this.offersData = this.filterActiveItems(offers); + console.log(this.offersData); this.tempSearch = this.offersData; } } - + filterActiveItems(offers) { + return offers.filter((res) => { + return res['IsActive'] == 'True'; + }); + } filterOffers(key) { if (this.direction === 'ltr') { this.activeClass = key.categoryName_en; @@ -181,7 +188,8 @@ export class HomeComponent implements AfterViewInit { this.offersService.getOffers({}, () => { }, this.ts.trPK('general', 'retry'), this.itemCounter, this.itemType).subscribe((res) => { const data = JSON.parse(res['Mohemm_ITG_ResponseItem']); if (data['result']) { - const allItem = JSON.parse(data.result['data']); + var allItem = JSON.parse(data.result['data']); + allItem = this.filterActiveItems(allItem); if (allItem) { allItem.forEach(element => { this.offersData.push(element); @@ -198,7 +206,8 @@ export class HomeComponent implements AfterViewInit { this.offersService.getOffers({}, () => { }, this.ts.trPK('general', 'retry'), this.itemCounter).subscribe((res) => { const data = JSON.parse(res['Mohemm_ITG_ResponseItem']); if (data['result']) { - const allItem = JSON.parse(data.result['data']); + var allItem = JSON.parse(data.result['data']); + allItem = this.filterActiveItems(allItem); if (allItem) { allItem.forEach(element => { this.offersData.push(element); @@ -210,4 +219,9 @@ export class HomeComponent implements AfterViewInit { }, 1000); } } + + sanitize(img) { + return this.sanitizer.bypassSecurityTrustUrl(img); + } + } diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html index e089da6a..dfb21ae9 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html @@ -11,9 +11,11 @@
-
- - + + + {{details.Title}} {{details.Title_AR}} @@ -67,8 +69,8 @@ -
- + + {{item.Title}}
diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.scss b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.scss index 27e5d768..5ea4054b 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.scss +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.scss @@ -3,11 +3,11 @@ width: 100%; position: absolute; - background: #29B5BF; + background: #259CB8; top: 0; } .header-toolbar{ - --background: #29B5BF !important; + --background: #259CB8 !important; } .bottom{ height: 88%; diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts index ee364abe..7498fd51 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts @@ -2,7 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { OfferDiscountService } from '../services/service'; -import { SocialSharing } from '@ionic-native/social-sharing/ngx'; +// import { SocialSharing } from '@ionic-native/social-sharing/ngx'; +import { DomSanitizer } from '@angular/platform-browser'; @Component({ selector: 'app-offer-details', templateUrl: './offer-details.component.html', @@ -12,7 +13,7 @@ export class OfferDetailsComponent implements OnInit { public details: any; public direction: String; public related: any; - constructor(public ts: TranslatorService, private socialSharing: SocialSharing, public cs: CommonService, public offersService: OfferDiscountService) { } + constructor(public ts: TranslatorService, public cs: CommonService, public offersService: OfferDiscountService, private sanitizer: DomSanitizer) { } ngOnInit() { this.direction = TranslatorService.getCurrentDirection(); @@ -44,9 +45,9 @@ export class OfferDetailsComponent implements OnInit { subject: this.stripHtml(offerSubject), files: [this.details.Banner_Image] } - this.socialSharing.shareWithOptions(options).then((result) => { - console.log(result); - }) + // this.socialSharing.shareWithOptions(options).then((result) => { + // console.log(result); + // }) } openRelated(item) { this.cs.sharedService.setSharedData(item, OfferDiscountService.selected_offers); @@ -68,4 +69,8 @@ export class OfferDetailsComponent implements OnInit { this.openLocation(); }) } + sanitize(img) { + return this.sanitizer.bypassSecurityTrustUrl(img); + } + } diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts index b4062b63..320de606 100644 --- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts +++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { Routes, RouterModule } from '@angular/router'; -import { SocialSharing } from '@ionic-native/social-sharing/ngx'; +// import { SocialSharing } from '@ionic-native/social-sharing/ngx'; import { IonicModule } from '@ionic/angular'; import { OffersdiscountPage } from './offersdiscount.page'; @@ -12,6 +12,7 @@ import { HmgCommonModule } from '../hmg-common/hmg-common.module'; import { OfferDiscountService } from './services/service'; import { FilterComponent } from './filter/filter.component'; import { LocationComponent } from './location/location.component'; +import { ImageModalModule } from '../hmg-common/ui/image-modal/image-modal.module'; @@ -48,11 +49,12 @@ const routes: Routes = [ FormsModule, IonicModule, HmgCommonModule, + ImageModalModule, RouterModule.forChild(routes) ], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent, FilterComponent, LocationComponent], entryComponents: [FilterComponent], - providers: [OfferDiscountService, SocialSharing], + providers: [OfferDiscountService], }) export class OffersdiscountPageModule { } diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 400a9859..25848f2d 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -98,7 +98,7 @@ - +
-
+
-
+

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

{{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
- +
@@ -172,7 +172,7 @@ - @@ -180,7 +180,7 @@ - + @@ -191,10 +191,10 @@ - + - + @@ -205,10 +205,10 @@ - + - + @@ -229,10 +229,10 @@ - + - + @@ -255,7 +255,7 @@ - + diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 73141205..e7e4305c 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -1,80 +1,87 @@ -.rowAccordin{ - border: none; - } -.gridAccordin{ - margin: 10px; - background: #ffffff; - border-radius: 5px; +.rowAccordin { + border: none; +} + +.gridAccordin { + margin: 10px; + background: #ffffff; + border-radius: 5px; } -.colPayslip{ +.colPayslip { border-right: 1px solid #cac8c8; - border-bottom-left-radius: -10px !important; - padding-top: 8px; - padding-bottom: 8px; - margin-left: 8px; - font-size: 12px !important; + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 8px; + font-size: 12px !important; } -.colPayslip-ar{ + +.colPayslip-ar { border-left: 1px solid #cac8c8; border-bottom-left-radius: -10px !important; padding-top: 8px; padding-bottom: 8px; - margin-left: 8px; + margin-right: 8px; font-size: 12px !important; } -.colPayslips{ - border-bottom-left-radius: -10px !important; - padding-top: 8px; - padding-bottom: 8px; - margin-left: 18px; - font-size: 12px !important; - } +.colPayslips { + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 18px; + font-size: 12px !important; +} -.label{ +.label { font-size: 15px !important; - text-align: center; + // text-align: center; margin-bottom: 1px; - margin-left: 8px; + font-weight: bold; + // margin-left: 8px; } -.label-bold{ + +.label-bold { font-size: 13px !important; - // font-weight: bold !important; - font-family: WorkSans-Bold; - margin-left: 8px; + font-weight: bold !important; + // font-family: WorkSans-Bold; + // margin-left: 8px; } -.earingTotH{ - text-align: right; - font-weight: bold; - font-size:20px !important; - padding-right: 15px; + +.earingTotH { + text-align: right; + font-weight: bold; + font-size: 20px !important; + padding-right: 15px; } -.earingTotG{ - text-align: left; - padding-left: 15px; - font-weight: bold; - font-size: 20px !important; - color: var(--green); - +.earingTotG { + text-align: left; + padding-left: 15px; + font-weight: bold; + font-size: 20px !important; + color: var(--green); + } -.earingTotR{ - text-align: left; - padding-left: 15px; - font-weight: bold; - font-size: 20px !important; - color: var(--red); - +.earingTotR { + text-align: left; + padding-left: 15px; + font-weight: bold; + font-size: 20px !important; + color: var(--red); + } -.header-toolbar-new{ + +.header-toolbar-new { --background: #29B5BF; } -.colorBG{ - --background: #f0efef; - } + +.colorBG { + --background: #f0efef; +} .header-div { background-color: #29B5BF; @@ -83,251 +90,248 @@ position: relative; display: block; margin-bottom: -28px; - } - .Title{ - text-align: center; - color: white; - margin-top: -33px; - font-size: 17px; - } +} - .Imgdiv{ - padding-top: -38px; - margin-top: -32px; - } - .Imgsrc{ - width: 23px; - height: 24px; - /* display: -webkit-inline-box; */ - /* display: inline-flex; */ - overflow: hidden; - background: transparent; - border-radius: 70% !important; - /* position: relative; */ - top: 7px; - margin-left: 344px !important; - margin-top: -46px; - } +.Title { + text-align: center; + color: white; + margin-top: -33px; + font-size: 17px; +} -.p{ +.Imgdiv { + padding-top: -38px; + margin-top: -32px; +} + +.Imgsrc { + width: 23px; + height: 24px; + /* display: -webkit-inline-box; */ + /* display: inline-flex; */ + overflow: hidden; + background: transparent; + border-radius: 70% !important; + /* position: relative; */ + top: 7px; + margin-left: 344px !important; + margin-top: -46px; +} + +.p { font-weight: bold; margin-top: -7px; font-size: 14px; } - - .slidBtn{ - margin-top: 8px; - margin-left: 10px; - background: transparent; - } - .activeArrow{ - height: 26px; - width: 26px; - color: white; - background: transparent !important; - --background: transparent !important; - - - } - .activeArrow-ar{ - height: 26px; - width: 26px; - color: white; - background: transparent !important; - --background: transparent !important; - -webkit-transform: scaleX(-1); - -moz-transform: scaleX(-1); - -o-transform: scaleX(-1); - transform: scaleX(-1); - margin-right: 38px; - margin-left: -45px; - } -.slidbtn{ + +.slidBtn { + margin-top: 8px; + margin-left: 10px; + background: transparent; +} + +.activeArrow { + height: 26px; + width: 26px; + color: white; + background: transparent !important; + --background: transparent !important; + + +} + +.activeArrow-ar { + height: 26px; + width: 26px; + color: white; + background: transparent !important; + --background: transparent !important; + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); + margin-right: 38px; + margin-left: -45px; +} + +.slidbtn { background: transparent; margin-bottom: -59px; margin-top: 8px; margin-left: 65px; } - .disabledArrow{ - height: 26px; - width: 26px; - color: #908d8d; - background: transparent !important; - --background: transparent !important; - } - .disabledArrow-ar{ - height: 26px; - width: 26px; - color: #908d8d; - background: transparent !important; - --background: transparent !important; - margin-right: 3px; - // margin-left: -124px; - margin-left: -105px; - -webkit-transform: scaleX(-1); - -moz-transform: scaleX(-1); - -o-transform: scaleX(-1); - transform: scaleX(-1); - } - .today-graph{ - display: block !important; - height: 162px; - width: 335px; - /* padding-left: 51px; */ - margin-left: 3px !important; - } - .today-graph-ar{ - display: block !important; - height: 162px; - width: 335px; - margin-right: 45px; - margin-left: -25px !important; +.disabledArrow { + height: 26px; + width: 26px; + color: #908d8d; + background: transparent !important; + --background: transparent !important; } - .result-graph{ - font-size: 14px; - margin-left: -48px; - margin-right: 3px; - } +.disabledArrow-ar { + height: 26px; + width: 26px; + color: #908d8d; + background: transparent !important; + --background: transparent !important; + margin-right: 3px; + // margin-left: -124px; + margin-left: -105px; + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); +} - .result-graph-ar{ - font-size: 14px; - margin-right: -48px; - margin-left: 3px; - } - .headerGrid{ - background-color: white !important; - border: 1px solid #cac8c8 !important; - border-radius: 20px !important; - padding-top: 13px; - padding-bottom: 14px; - // margin-left: 26px; - // margin-right: 28px; - margin-left: 19px; - margin-right: 19px; - margin-top: -2px; - margin-bottom: 10px; - padding-right: 21px; - - } - - .result-text-container-ar { - padding: 0; - margin: 0; - position: absolute; - // left: 54%; - left: 45%; - top: 50%; - display: block; - text-align: center; - transform: translate(-50%, -50%); +.today-graph { + display: block !important; + height: 162px; + width: 335px; + /* padding-left: 51px; */ + // margin-left: 3px !important; +} + +.today-graph-ar { + display: block !important; + height: 162px; + width: 335px; + margin-right: 45px; + margin-left: -25px !important; +} + +.result-graph { + font-size: 14px; + position: relative; +} + +.result-graph-ar { + font-size: 14px; + position: relative; +} + +.headerGrid { + background-color: white !important; + border: 1px solid #cac8c8 !important; + border-radius: 20px !important; + padding-top: 13px; + padding-bottom: 14px; + margin-left: 15px; + margin-right: 15px; + margin-bottom: 10px; + padding-right: 25px; - h2 { +} - font-size: 23px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; +.result-text-container { + padding: 0; + // margin: 0px -5px 0px -5px; + position: absolute; + top: 30%; + display: block; + text-align: center; + width: 100%; - } + h2 { - span { + font-size: 23px; + // font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; - width: 125px; - display: block; - margin: 0 auto; - font-size: 14px; - font-family: workSans-Regular; - } } + span { - .result-text-container { - padding: 0; - margin: 0; - position: absolute; - left: 40%; - top: 50%; + width: 125px; display: block; - text-align: center; - transform: translate(-50%, -50%); + margin: 0 auto; + font-size: 14px; + // font-family: workSans-Regular; + } +} + - h2 { +.result-text-container { - font-size: 25px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; - } + h2 { - span { + font-size: 25px; + // font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; - width: 125px; - display: block; - margin: 0 auto; - font-size: 15px; - font-family: workSans-Regular; - } } -.green-label{ - font-size: 10px; - margin-top: -13px; + + span { + + width: 125px; + display: block; + margin: 0 auto; + font-size: 15px; + // font-family: workSans-Regular; + } +} + +.green-label { + font-size: 10px; + margin-top: -13px; } -.green-amount{ +.green-amount { font-size: 13px; - font-family: WorkSans-Bold; - margin-top: -3px; + // font-family: WorkSans-Bold; + margin-top: 0px; } -.blue-label{ +.blue-label { font-size: 10px; margin-top: -13px; - } - - .blue-amount{ - font-size: 13px; - font-family: WorkSans-Bold; - margin-top: -4px; - } +} - .grids{ - border-radius: 20px !important; - background: white; - padding-left: 1px; - padding-right: 1px; - margin: 13px; - padding-top: 0px; - padding-bottom: 3px; - padding-left: 13px; - padding-right: 13px; - border: 1px solid #cac8c8; - } - - .header{ - - margin-top: -119px; - } - .bgcolor { - - color: white; - border-top-right-radius: 19px; - border-top-left-radius: 15px; - padding-top: 1; - padding-bottom: 0; - margin-top: 0; - margin-bottom: 0; - /* border-radius: 12px !important; */ - background: #29B5BF; - border-bottom: 1px solid #a7a4a4; - border-top: 1px solid #cac8c8; - margin-left: -13px; - margin-right: -13px; - } - -.rowtable{ +.blue-amount { + font-size: 13px; + // font-family: WorkSans-Bold; + margin-top: 0px; +} + +.grids { + border-radius: 20px !important; + background: white; + padding-left: 1px; + padding-right: 1px; + margin: 13px; + padding-top: 0px; + padding-bottom: 3px; + padding-left: 13px; + padding-right: 13px; + border: 1px solid #cac8c8; +} + +.header { + + margin-top: -119px; +} + +.bgcolor { + + color: white; + border-top-right-radius: 19px; + border-top-left-radius: 15px; + padding-top: 1; + padding-bottom: 0; + margin-top: 0; + margin-bottom: 0; + /* border-radius: 12px !important; */ + background: #29B5BF; + border-bottom: 1px solid #a7a4a4; + border-top: 1px solid #cac8c8; + margin-left: -13px; + margin-right: -13px; +} + +.rowtable { padding-top: 0; padding-bottom: 0; margin-top: 0; @@ -337,7 +341,8 @@ margin-right: -13px; } -.rowtables{ + +.rowtables { padding-top: 0; padding-bottom: 0; margin-top: 0; @@ -346,60 +351,72 @@ margin-right: -13px; } -.col{ + +.col { font-size: 15px; - font-family: WorkSans-Bold; + // font-family: WorkSans-Bold; } -.hrTitle{ - margin-left: 11px !important; + +.hrTitle { + margin-left: 25px !important; font-size: 15px !important; - margin-right: 11px !important; + margin-right: 25px !important; } -.date{ + +.date { font-size: 15px !important; margin-left: 58px; margin-bottom: 12px; padding-right: 5px; + font-weight: bold; + font-family: 'Inter' !important; +} + +.number { + font-size: 'Inter' !important; +} + +.date-label { + font-family: 'Inter' !important; } -.div-green{ + +.div-green { // left: 77%; // width: 20%; height: 6px; position: relative; - left: 83%; - bottom: 117px; - color: black; - background-color: #29B5BF; - width: 16%; - height: 6px; -} -.div-green-ar{ - // position: relative; - // left: 77%; - // bottom: 117px; - // color: black; - // background-color: #29B5BF; - // width: 20%; height: 6px; - position: relative; - left: 4%; - bottom: 117px; - color: black; - background-color: #29B5BF; - width: 15%; - height: 6px; -} -.div-blue{ + left: 83%; + bottom: 117px; + color: black; + background-color: #43A6A0; + width: 16%; + height: 6px; +} + +.div-green-ar { + + position: relative; + left: 4%; + bottom: 117px; + color: black; + background-color: #43A6A0; + width: 15%; + height: 6px; +} + +.div-blue { // left: 77%; // width: 20%; height: 6px; position: relative; - left: 83%; - bottom: 67px; - color: black; - background-color: #29B5BF; - width: 16%; - height: 6px; -} -.div-blue-ar{ + left: 83%; + bottom: 67px; + color: black; + background-color: #29B5BF; + width: 16%; + height: 6px; +} + +.div-blue-ar { //position: relative; // left: 77%; // bottom: 67px; diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 609f419d..22657215 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit, ViewChild, SimpleChanges } from '@angular/core'; -import {PayslipService} from '../service/payslip.service' +import { PayslipService } from '../service/payslip.service' import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; import { DeductionRequest } from '../model/deductionReq'; -import { IonInfiniteScroll,IonSlides} from '@ionic/angular'; +import { IonInfiniteScroll, IonSlides } from '@ionic/angular'; import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; import { UIChart } from 'primeng/components/chart/chart'; @@ -19,99 +19,72 @@ export class HomeComponent implements OnInit { selEmp: string; respID: number; selMenu: MenuResponse; - GetPayslipList:any=''; - GetSummaryOfPaymentList:any=''; - GetPaymentInformationList:any=''; - showPaySlip:any=[]; - ActionContextID:any; + GetPayslipList: any = ''; + GetSummaryOfPaymentList: any = ''; + GetPaymentInformationList: any = ''; + showPaySlip: any = []; + ActionContextID: any; public static ACTION_CONTEXT_ID = "passActionContectID"; - GetEarningsList: any=''; - GetDeductionsList: any=''; + GetEarningsList: any = ''; + GetDeductionsList: any = ''; earingTotal: any; deductionTotal: any; firstPayslip: any; defultSelected: any; IsReachEnd: any; private deductionReq: DeductionRequest; - doinfiniteDedReq:any; - doinfinitEarReq:any; + doinfiniteDedReq: any; + doinfinitEarReq: any; personalInfo: any; - setImage:any; + setImage: any; imageSrc: any = "../assets/imgs/profile.png"; slideView: any; sliderOne: any; - payslipIndex :any; - data:any; + payslipIndex: any; + data: any; public direction: string; @ViewChild('slides') slides: IonSlides; @ViewChild('slideWithNav') slideWithNav: IonSlides; - @ViewChild('chart') chart: UIChart; + @ViewChild('chart') chart: UIChart; slideOptsOne = { initialSlide: 0, slidesPerView: 1, - autoplay:true + autoplay: true }; + public userData: any; @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; - public options = { - cutoutPercentage: 85, - tooltips: { enabled: false }, - legend: { display: false }}; - gaugeType = "full"; - - // gaugeValue = 11.200; - // gaugeLabel = ""; - + public options = { + cutoutPercentage: 85, + tooltips: { enabled: false }, + legend: { display: false } + }; + gaugeType = "full"; + + // gaugeValue = 11.200; + // gaugeLabel = ""; + constructor( - public payslipService:PayslipService, + public payslipService: PayslipService, public ts: TranslatorService, public common: CommonService, public sharedData: SharedDataService, public authService: AuthenticationService, public cs: CommonService, - - - ) { - this.direction = TranslatorService.getCurrentDirection(); - } + + + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { this.direction = TranslatorService.getCurrentLanguageName() - // this.selEmp = this.common.sharedService.getSharedData( - // MenuResponse.SHARED_SEL_EMP, - // false - // ); - // if(this.selEmp){}else{ - // this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { - // if (user) { - // this.selEmp = user.ASSIGNMENT_NUMBER; - - // } - // }); - // } - - // console.log(" this.selEmp" + this.selEmp); - // this.respID = this.common.sharedService.getSharedData( - // MenuResponse.SHARED_SEL_RESP_ID, - // false - // ); - // if(this.respID){}else{ - // this.respID=-999; - // } - // console.log(" this.respID" + this.respID); - - // this.selMenu = new MenuResponse(); - // this.selMenu = this.common.sharedService.getSharedData( - // MenuResponse.SHARED_DATA, - // false - // ); - // console.log(" this.selMenu" + this.selMenu); - - + this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false); + this.getPayslip(); - // this.getProfile(); + // this.getProfile(); } @@ -119,7 +92,7 @@ export class HomeComponent implements OnInit { if (changes.inputData.currentValue) { // update this.data here - // then chart is getting updated + // then chart is getting updated setTimeout(() => { this.chart.reinit(); }, 100); @@ -127,201 +100,172 @@ export class HomeComponent implements OnInit { } slideNext(object, slideView) { - if(this.payslipIndex!=0){ - this.payslipIndex=this.payslipIndex-1; - this.showInfo(); + if (this.payslipIndex != 0) { + this.payslipIndex = this.payslipIndex - 1; + this.showInfo(); + } } -} -slidePrev(object, slideView) { - if(this.payslipIndex { - // if (user) { - // this.personalInfo = user; - // if(this.cs.getUpdateImage().status){ - // // this.imageSrc = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+this.cs.getUpdateImage().img); - // this.imageSrc = "data:image/png;base64,"+this.cs.getUpdateImage().img; - // // alert("this.imageSrc"+ this.imageSrc); - // }else{ - // this.imageSrc = user.EMPLOYEE_IMAGE - // ? "data:image/png;base64," + user.EMPLOYEE_IMAGE - // : this.imageSrc; - // console.log("2-"+user); - // } - // } - // else { - // console.log("3-"+user); - // } - // }); - // } - - - - - - getPayslip(){ - // this.selEmp ="13777"; - console.log("this.selEmp????????"+this.selEmp) - this.respID=-999; + + + + getPayslip() { + this.respID = -999; const request = { - P_SELECTED_EMPLOYEE_NUMBER: this.selEmp,//'125346',//this.selEmp, - P_MENU_TYPE:"E",// 'E',//this.selMenu.List_Menu.MENU_TYPE, + P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER,//'125346',//this.selEmp, + P_MENU_TYPE: "E",// 'E',//this.selMenu.List_Menu.MENU_TYPE, P_SELECTED_RESP_ID: this.respID//"-999" //this.respID, // P_PAGE_NUM: this.P_PAGE_NUM, // P_PAGE_LIMIT: this.P_PAGE_LIMIT }; - this.payslipService.getPayslip(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleRespondGetPayslipResult(result); + this.payslipService.getPayslip(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleRespondGetPayslipResult(result); } ); } - handleRespondGetPayslipResult(result){ - + handleRespondGetPayslipResult(result) { + if (result.GetPayslipList != null) { this.GetPayslipList = result.GetPayslipList; - this.firstPayslip= this.GetPayslipList[0] - this.defultSelected=this.firstPayslip.PAYSLIP_CHOICE + this.firstPayslip = this.GetPayslipList[0] + this.defultSelected = this.firstPayslip.PAYSLIP_CHOICE } this.showPaySlip = this.GetPayslipList[0]; - this.payslipIndex=0; + this.payslipIndex = 0; this.getAllPayslipData(this.GetPayslipList[0].ACTION_CONTEXT_ID); } - showInfo(){ - - //console.log(event.detail.value); - //const index = parseInt(event.detail.value); - this.showPaySlip =this.GetPayslipList[this.payslipIndex]; - this.ActionContextID=this.GetPayslipList[this.payslipIndex].ACTION_CONTEXT_ID; - this.getAllPayslipData(this.ActionContextID); + showInfo() { + + //console.log(event.detail.value); + //const index = parseInt(event.detail.value); + this.showPaySlip = this.GetPayslipList[this.payslipIndex]; + this.ActionContextID = this.GetPayslipList[this.payslipIndex].ACTION_CONTEXT_ID; + this.getAllPayslipData(this.ActionContextID); } - getAllPayslipData(ActionContextID){ - this.common.sharedService.setSharedData(ActionContextID,HomeComponent.ACTION_CONTEXT_ID); + getAllPayslipData(ActionContextID) { + this.common.sharedService.setSharedData(ActionContextID, HomeComponent.ACTION_CONTEXT_ID); this.getSummeryOfPayment(ActionContextID); this.getPaymentInfo(ActionContextID); this.getDeduction(ActionContextID); this.getEarings(ActionContextID); } - getSummeryOfPayment(ActionContextID){ + getSummeryOfPayment(ActionContextID) { const request = { P_ACTION_CONTEXT_ID: ActionContextID, }; - - this.payslipService.getSummeryOFPayment(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleSummeryOfPaymentResult(result); + + this.payslipService.getSummeryOFPayment(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleSummeryOfPaymentResult(result); } ); } - handleSummeryOfPaymentResult(result){ + handleSummeryOfPaymentResult(result) { if (result.GetSummaryOfPaymentList != null) { this.GetSummaryOfPaymentList = result.GetSummaryOfPaymentList[0]; - this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT; - this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT; + this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT; + this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT; this.data = { - + labels: ['earingTotal', 'deductionTotal'], datasets: [ - { data: [this.earingTotal,this.deductionTotal], - backgroundColor: [ - '#29B5BF', - '#29B5BF', ], - borderWidth: 2 - } - ] - }; } + { + data: [this.earingTotal, this.deductionTotal], + backgroundColor: [ + '#43A6A0', + '#29B5BF',], + borderWidth: 2 + } + ] + }; + } } -getPaymentInfo(ActionContextID){ - const request = { - P_ACTION_CONTEXT_ID: ActionContextID, - }; - - this.payslipService.getPaymentInfo(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleGetPaymentInfoResult(result); - } - ); -} + getPaymentInfo(ActionContextID) { + const request = { + P_ACTION_CONTEXT_ID: ActionContextID, + }; -handleGetPaymentInfoResult(result){ - if (result.GetPaymentInformationList != null) { - this.GetPaymentInformationList = result.GetPaymentInformationList; + this.payslipService.getPaymentInfo(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleGetPaymentInfoResult(result); + } + ); } -} -openEarings(){ - this.common.openEarningsPage(); + handleGetPaymentInfoResult(result) { + if (result.GetPaymentInformationList != null) { + this.GetPaymentInformationList = result.GetPaymentInformationList; + } + } -} -openDeductions(){ - this.common.openDeductionsPage(); -} + openEarings() { + this.common.openEarningsPage(); -getEarings(ActionContextID){ - console.log("getEarings"); - - // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID; - // this.deductionReq.P_PAGE_NUM=1; - // this.deductionReq.P_PAGE_LIMIT=100; - const request ={ - P_ACTION_CONTEXT_ID:ActionContextID, - P_PAGE_NUM:1, - P_PAGE_LIMIT:100 - } - this.doinfinitEarReq=request; - this.payslipService.getEarings(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleGetEaringsResult(result); } - ); -} + openDeductions() { + this.common.openDeductionsPage(); + } + + getEarings(ActionContextID) { + console.log("getEarings"); -handleGetEaringsResult(result){ - if (result.GetEarningsList != null) { - this.GetEarningsList = result.GetEarningsList; + // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID; + // this.deductionReq.P_PAGE_NUM=1; + // this.deductionReq.P_PAGE_LIMIT=100; + const request = { + P_ACTION_CONTEXT_ID: ActionContextID, + P_PAGE_NUM: 1, + P_PAGE_LIMIT: 100 + } + this.doinfinitEarReq = request; + this.payslipService.getEarings(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleGetEaringsResult(result); + } + ); } + handleGetEaringsResult(result) { + if (result.GetEarningsList != null) { + this.GetEarningsList = result.GetEarningsList; + } -} -getDeduction(ActionContextID){ - console.log("getDeduction"); - const request ={ - P_ACTION_CONTEXT_ID:ActionContextID, - P_PAGE_NUM:1, - P_PAGE_LIMIT:100 } - // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID; - // this.deductionReq.P_PAGE_NUM=1; - // this.deductionReq.P_PAGE_LIMIT=100; - this.doinfiniteDedReq=request; - - this.payslipService.getDeduction(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleGetDeductionResult(result); + + getDeduction(ActionContextID) { + console.log("getDeduction"); + const request = { + P_ACTION_CONTEXT_ID: ActionContextID, + P_PAGE_NUM: 1, + P_PAGE_LIMIT: 100 + } + // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID; + // this.deductionReq.P_PAGE_NUM=1; + // this.deductionReq.P_PAGE_LIMIT=100; + this.doinfiniteDedReq = request; + + this.payslipService.getDeduction(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleGetDeductionResult(result); } ); } - handleGetDeductionResult(result){ + handleGetDeductionResult(result) { if (result.GetDeductionsList != null) { this.GetDeductionsList = result.GetDeductionsList; } @@ -389,6 +333,6 @@ getDeduction(ActionContextID){ } else { if (this.infiniteScroll) this.infiniteScroll.complete(); } - } + } } diff --git a/Mohem/src/app/payslip/service/payslip.service.ts b/Mohem/src/app/payslip/service/payslip.service.ts index 2b3c6bbe..db3b0fa7 100644 --- a/Mohem/src/app/payslip/service/payslip.service.ts +++ b/Mohem/src/app/payslip/service/payslip.service.ts @@ -23,7 +23,6 @@ export class PayslipService { public getPayslip(PayslipRequest: any , onError?: any,errorLabel?: string): Observable { const request = PayslipRequest; this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.api.post(PayslipService.getPayslip, request, onError, errorLabel); } public getSummeryOFPayment(PayslipRequest: any, onError?: any,errorLabel?: string): Observable { diff --git a/Mohem/src/app/pending-transaction/home/home.component.html b/Mohem/src/app/pending-transaction/home/home.component.html index 1aff4ba1..04c33c16 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.html +++ b/Mohem/src/app/pending-transaction/home/home.component.html @@ -71,7 +71,7 @@
-
{{transaction.CREATION_DATE}}
+
{{transaction.CREATION_DATE}}

{{'transaction, created-for' | translate}}

@@ -93,9 +93,9 @@
- + {{'general, submit' | translate}} - + {{'general, reset' | translate}}
diff --git a/Mohem/src/app/pending-transaction/home/home.component.scss b/Mohem/src/app/pending-transaction/home/home.component.scss index 1f4f2512..d5c8e7ac 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.scss +++ b/Mohem/src/app/pending-transaction/home/home.component.scss @@ -17,7 +17,7 @@ .color-black{ color:#000; } -.date{ +.date-en{ position: absolute; font-size: 14px; padding: 10px; @@ -26,6 +26,15 @@ color:#969696; margin: -8px; } +.date-ar{ + position: absolute; + font-size: 14px; + padding: 10px; + left: 10px; + width: 100px; + color:#969696; + margin: -8px; +} .transaction-list{ margin-top:20px; } diff --git a/Mohem/src/app/pending-transaction/home/home.component.ts b/Mohem/src/app/pending-transaction/home/home.component.ts index e722d588..a0835bba 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.ts +++ b/Mohem/src/app/pending-transaction/home/home.component.ts @@ -3,6 +3,8 @@ import { EitService } from 'src/app/eit/services/eit.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { ServiceService } from '../service/service.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; @Component({ selector: 'app-home', @@ -16,19 +18,30 @@ export class HomeComponent implements OnInit { public dateTo: any; public dateFrom: any; public transactionDetails; - constructor(public cs: CommonService, private elementRef: ElementRef, public trServcice: ServiceService, public ts: TranslatorService, public eitService: EitService) { } + public personalInfo: any; + constructor(public cs: CommonService, private elementRef: ElementRef, public trServcice: ServiceService, public ts: TranslatorService, public eitService: EitService, public authService: AuthenticationService) { } ngOnInit() { - - - this.getPendingTransaction(); + this.getProfile(); this.direction = TranslatorService.getCurrentLanguageName(); + } + public getProfile() { + this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { + if (user) { + this.personalInfo = user; + this.getPendingTransaction(); + } + }); } + + getPendingTransaction() { this.cs.startLoading(); this.trServcice.getPendingRequests({ + 'P_MENU_TYPE': 'E', + 'P_SELECTED_EMPLOYEE_NUMBER': this.personalInfo.EMPLOYEE_NUMBER }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { this.cs.stopLoading(); this.transactions = response['GetPendingReqFunctionsList']; @@ -37,6 +50,8 @@ export class HomeComponent implements OnInit { getPendingRequestDetails() { this.cs.startLoading(); this.trServcice.getPendingRequestDetails({ + 'P_MENU_TYPE': 'E', + 'P_SELECTED_EMPLOYEE_NUMBER': this.personalInfo.EMPLOYEE_NUMBER, 'P_FUNCTION_ID': this.selectedTransaction, 'P_CREATION_DATE_FROM': "/Date(" + Date.parse(this.dateFrom) + '+0300' + ")/", 'P_CREATION_DATE_TO': "/Date(" + Date.parse(this.dateTo) + '+0300' + ")/", diff --git a/Mohem/src/app/pending-transaction/service/service.service.ts b/Mohem/src/app/pending-transaction/service/service.service.ts index f5521403..c3e25155 100644 --- a/Mohem/src/app/pending-transaction/service/service.service.ts +++ b/Mohem/src/app/pending-transaction/service/service.service.ts @@ -19,7 +19,7 @@ export class ServiceService { getPendingRequests(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.P_SELECTED_EMPLOYEE_NUMBER; return this.con.postNoLoad( ServiceService.GET_PENDING_REQ_FUNCTIONS, request, @@ -29,7 +29,6 @@ export class ServiceService { } getPendingRequestDetails(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.con.postNoLoad( ServiceService.GET_PENDING_REQ_DETAILS, request, diff --git a/Mohem/src/app/profile/add-address/add-address.component.html b/Mohem/src/app/profile/add-address/add-address.component.html index 695cd8b3..ef083651 100644 --- a/Mohem/src/app/profile/add-address/add-address.component.html +++ b/Mohem/src/app/profile/add-address/add-address.component.html @@ -9,17 +9,17 @@ - + + {{'vacation-rule, effectiveDate' | translate}} { + setTimeout(()=>{ + console.log(event.target as Element); + var e = event.target as Element; + e.scrollIntoView(true); + },1000) + }) + } elem.addEventListener(changeEvent, e => { + if (obj.FORMAT_TYPE == "N") { + const maxSize = obj.MAXIMUM_SIZE; + const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value; + (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value; + } elem.classList.remove("requiredClassElm"); if ( obj.CHILD_SEGMENTS_VS_Splited && @@ -1113,6 +1140,7 @@ export class AddAddressComponent implements OnInit { } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1151,6 +1179,7 @@ export class AddAddressComponent implements OnInit { } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1173,6 +1202,7 @@ export class AddAddressComponent implements OnInit { textValue = x.value; if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss index c9bacd69..c46b24ad 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss @@ -33,10 +33,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #29B5BF; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } .country{ diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts index 2e1f8ea0..64d574c1 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core"; import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry"; import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; import { BasicRequest } from "../models/basic.request"; -import { ModalController } from "@ionic/angular"; +import { ModalController, Platform } from "@ionic/angular"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { EITTransactionsRequest } from "../models/EITTransactionsReq"; import { ProfileService } from "../service/profile.service"; @@ -49,7 +49,7 @@ export class AddBasicDetailsComponent implements OnInit { private hiddenInput: HiddenInput; private eitResponse: any; private eitColResponse: any; - + private eitVALSettoCall: any = []; private comtransNo: number = 0; getPassMnuEntryObj: MenuEntry; @@ -65,7 +65,7 @@ export class AddBasicDetailsComponent implements OnInit { isResubmit: boolean = false; private updatedValues: any = []; addEITData: any; - direction:string; + direction: string; public targetValue: any; public employeeBasicDetails: any = []; public mutualBasicDetailsArray: any = []; @@ -79,7 +79,8 @@ export class AddBasicDetailsComponent implements OnInit { private ts: TranslatorService, private profileService: ProfileService, public datePicker: DatePicker, - public router: ActivatedRoute + public router: ActivatedRoute, + public platform: Platform ) { this.router.queryParams.subscribe(params => { @@ -135,7 +136,7 @@ export class AddBasicDetailsComponent implements OnInit { } } - ngOnInit() {} + ngOnInit() { } ngAfterViewInit() { this.getEitDffStructure(); @@ -171,7 +172,7 @@ export class AddBasicDetailsComponent implements OnInit { this.drawEitFieldsStatic(result.GetBasicDetColsStructureList); } } - + public handleBasicDffStructureResult(result) { if (result.GetBasicDetDffStructureList != null) { this.getColumnStructure(); @@ -187,60 +188,69 @@ export class AddBasicDetailsComponent implements OnInit { let defaultVal: string = ""; let defaultValText: string = ""; + let mobileEnabled = 'Y'; + if (feildsList[i].READ_ONLY == 'Y') { + mobileEnabled = 'N'; + } + if (feildsList[i].DISPLAY_FLAG != "N") { - //text , date , time - if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList === null) { - // character - this.textInput = new TextInput( - feildsList[i].SEGMENT_PROMPT, - feildsList[i].APPLICATION_COLUMN_NAME, - defaultVal, - containerId, - defaultValText, - feildsList[i].MOBILE_ENABLED, - feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG - ); - } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { - this.selectInput = new SelectInput( - feildsList[i].SEGMENT_PROMPT, - feildsList[i].APPLICATION_COLUMN_NAME, - defaultVal, - containerId, - feildsList[i].MOBILE_ENABLED, - feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG - ); - this.fillStaticDropdownList( - feildsList[i].SEGMENT_NAME, - feildsList[i].ObjectValuesList, - feildsList[i].APPLICATION_COLUMN_NAME - ); - } else if (feildsList[i].DATATYPE == "NUMBER") { - this.numberInput = new NumberInput( - feildsList[i].SEGMENT_PROMPT, - feildsList[i].APPLICATION_COLUMN_NAME, - defaultVal, - containerId, - feildsList[i].MOBILE_ENABLED, - feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG - ); - } else if (feildsList[i].DATATYPE == "DATE" && this.targetValue === 'new') { - this.dateInput = new DateInput( - feildsList[i].SEGMENT_PROMPT, - feildsList[i].APPLICATION_COLUMN_NAME, - "", - containerId, - feildsList[i].MOBILE_ENABLED, - feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG, - this.direction - ); - + //text , date , time + if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList === null) { + // character + this.textInput = new TextInput( + feildsList[i].SEGMENT_PROMPT, + feildsList[i].APPLICATION_COLUMN_NAME, + defaultVal, + containerId, + defaultValText, + mobileEnabled, + feildsList[i].DISPLAY_FLAG, + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP + ); + } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { + this.selectInput = new SelectInput( + feildsList[i].SEGMENT_PROMPT, + feildsList[i].APPLICATION_COLUMN_NAME, + defaultVal, + containerId, + mobileEnabled, + feildsList[i].DISPLAY_FLAG, + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP + ); + this.fillStaticDropdownList( + feildsList[i].SEGMENT_NAME, + feildsList[i].ObjectValuesList, + feildsList[i].APPLICATION_COLUMN_NAME + ); + } else if (feildsList[i].DATATYPE == "NUMBER") { + this.numberInput = new NumberInput( + feildsList[i].SEGMENT_PROMPT, + feildsList[i].APPLICATION_COLUMN_NAME, + defaultVal, + containerId, + mobileEnabled, + feildsList[i].DISPLAY_FLAG, + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP + ); + } else if (feildsList[i].DATATYPE == "DATE" && this.targetValue === 'new') { + this.dateInput = new DateInput( + feildsList[i].SEGMENT_PROMPT, + feildsList[i].APPLICATION_COLUMN_NAME, + "", + containerId, + mobileEnabled, + feildsList[i].DISPLAY_FLAG, + feildsList[i].REQUIRED_FLAG, + this.direction, + feildsList[i].REQ_COL_TIP + ); + } + } } - } this.fillBasicDetailsStructure(); } @@ -251,7 +261,7 @@ export class AddBasicDetailsComponent implements OnInit { let numbervalue: any = 0; let dateValue: any = null; let transNo: number = 1; - let textValue : any; + let textValue: any; for (let i = 0; i < this.eitColResponse.length; i++) { varcharValue = null; @@ -260,10 +270,10 @@ export class AddBasicDetailsComponent implements OnInit { if (this.eitColResponse[i].DISPLAY_FLAG != "N") { if (this.eitColResponse[i].ObjectValuesList === null) { - let elem = document.getElementById( this.eitColResponse[i].APPLICATION_COLUMN_NAME) as HTMLInputElement; - let elemVal = elem !== null ? (document.getElementById( this.eitColResponse[i].APPLICATION_COLUMN_NAME ) as HTMLInputElement).value : ''; + let elem = document.getElementById(this.eitColResponse[i].APPLICATION_COLUMN_NAME) as HTMLInputElement; + let elemVal = elem !== null ? (document.getElementById(this.eitColResponse[i].APPLICATION_COLUMN_NAME) as HTMLInputElement).value : ''; textValue = elemVal; - + if (this.eitColResponse[i].DATATYPE == "VARCHAR2" || this.eitColResponse[i].DATATYPE == "NUMBER") { elemVal = elemVal; } else if (this.eitColResponse[i].DATATYPE == "DATE" && this.targetValue === 'new') { @@ -272,11 +282,12 @@ export class AddBasicDetailsComponent implements OnInit { } else if (this.eitColResponse[i].DATATYPE == "DATE" && this.targetValue === 'correct') { // date elemVal = this.customiseDate(this.effectiveDate); - } + } if (this.targetValue === 'new') { if (this.eitColResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); return false; } else { elem.classList.remove("requiredClassElm"); @@ -301,14 +312,15 @@ export class AddBasicDetailsComponent implements OnInit { } else { let x = document.getElementById(this.eitColResponse[i].APPLICATION_COLUMN_NAME) as HTMLSelectElement; - let val = x.options[x.selectedIndex] ? x.options[x.selectedIndex].value : null; - let txt = x.options[x.selectedIndex] ? x.options[x.selectedIndex].text : null; - varcharValue = val; - textValue = txt; - + let val = x.options[x.selectedIndex] ? x.options[x.selectedIndex].value : null; + let txt = x.options[x.selectedIndex] ? x.options[x.selectedIndex].text : null; + varcharValue = val; + textValue = txt; + if (x !== null) { if (this.eitColResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); return false; } else { x.classList.remove("requiredClassElm"); @@ -323,7 +335,7 @@ export class AddBasicDetailsComponent implements OnInit { DATE_VALUE: dateValue }); } - } else { + } else { let x = document.getElementById(this.eitColResponse[i].APPLICATION_COLUMN_NAME) as HTMLSelectElement; let val = x !== null ? x.dataset.colmText : ''; textValue = x !== null ? x.value : ''; @@ -331,6 +343,7 @@ export class AddBasicDetailsComponent implements OnInit { if (x !== null) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); return false; } else { x.classList.remove("requiredClassElm"); @@ -398,7 +411,8 @@ export class AddBasicDetailsComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList.REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { this.numberInput = new NumberInput( @@ -408,7 +422,8 @@ export class AddBasicDetailsComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -427,7 +442,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -438,7 +454,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -457,7 +474,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -468,7 +486,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -490,7 +509,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -501,7 +521,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -515,7 +536,8 @@ export class AddBasicDetailsComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -525,7 +547,8 @@ export class AddBasicDetailsComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, @@ -702,6 +725,7 @@ export class AddBasicDetailsComponent implements OnInit { } bindHtmlElemEvents(id, obj) { + const isIOS = this.platform.is('ios'); const elem = document.getElementById(id); console.log(elem); console.log(obj); @@ -711,7 +735,23 @@ export class AddBasicDetailsComponent implements OnInit { if (elemType == "SELECT") changeEvent = "change"; try { + + if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) { + elem.addEventListener("ionFocus", event => { + setTimeout(()=>{ + console.log(event.target as Element); + var e = event.target as Element; + e.scrollIntoView(true); + },1000) + }) + } + elem.addEventListener(changeEvent, e => { + if (obj.FORMAT_TYPE == "N") { + const maxSize = obj.MAXIMUM_SIZE; + const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value; + (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value; + } elem.classList.remove("requiredClassElm"); if ( obj.CHILD_SEGMENTS_VS_Splited && @@ -815,8 +855,8 @@ export class AddBasicDetailsComponent implements OnInit { let obj = this.handleDefaultValueResult(result); let val = obj.value; let text = obj.text; - if (val==null){val="";} - if (text==null){text="";} + if (val == null) { val = ""; } + if (text == null) { text = ""; } if (isStandardDate) { console.log("isStandardDate"); elem.value = this.cs.reverseFormatDate(val); @@ -834,7 +874,7 @@ export class AddBasicDetailsComponent implements OnInit { if (val) { elem.dataset.dtvalue = val; elem.innerHTML = val; - elem.value=val; + elem.value = val; } else { elem.dataset.dtvalue = ""; elem.innerHTML = ""; @@ -843,11 +883,11 @@ export class AddBasicDetailsComponent implements OnInit { if (isSelectElement) { let elem = this.getSelectElementByName(segmentName); elem = document.getElementById(elem), - elem.value = val; + elem.value = val; } else { - elem.value = val; - elem.innerText = text; - elem.setAttribute("value", val); + elem.value = val; + elem.innerText = text; + elem.setAttribute("value", val); } } if (isHidden || isReadOnlyList) { @@ -1234,7 +1274,7 @@ export class AddBasicDetailsComponent implements OnInit { } public customiseDate(date: any) { - let formatedDate = date.slice(0,9); + let formatedDate = date.slice(0, 10); let newDate = formatedDate.split("/").reverse(); const tmp = newDate[2]; newDate[2] = newDate[1]; @@ -1248,7 +1288,7 @@ export class AddBasicDetailsComponent implements OnInit { public fillBasicDetailsStructure() { this.mutualBasicDetailsArray = this.mutualBasicDetailsArray.concat(this.eitResponse, this.eitColResponse); - + for (let i = 0; i < this.employeeBasicDetails.length; i++) { let val: any; if (this.employeeBasicDetails[i].VARCHAR2_VALUE) { @@ -1256,13 +1296,13 @@ export class AddBasicDetailsComponent implements OnInit { } else if (this.employeeBasicDetails[i].DATE_VALUE) { val = this.customiseDate(this.employeeBasicDetails[i].DATE_VALUE); if (this.employeeBasicDetails[i].APPLICATION_COLUMN_NAME === 'EFFECTIVE_DATE') { - this.effectiveDate = this.employeeBasicDetails[i].DATE_VALUE; + this.effectiveDate = this.employeeBasicDetails[i].DATE_VALUE; this.showEffectiveDate = this.employeeBasicDetails[i].SEGMENT_VALUE_DSP; } } else if (this.employeeBasicDetails[i].NUMBER_VALUE) { val = this.employeeBasicDetails[i].NUMBER_VALUE; } - const elem = document.getElementById( this.employeeBasicDetails[i].APPLICATION_COLUMN_NAME ) as HTMLInputElement; + const elem = document.getElementById(this.employeeBasicDetails[i].APPLICATION_COLUMN_NAME) as HTMLInputElement; if (elem) { if (val) { let feldDetails = this.mutualBasicDetailsArray.find( @@ -1367,7 +1407,7 @@ export class AddBasicDetailsComponent implements OnInit { let numbervalue: any = 0; let dateValue: any = null; let transNo: number = 1; - let textValue : any; + let textValue: any; // if(this.ExtraObj.transactionNo) // transNo=this.ExtraObj.transactionNo; for (let i = 0; i < this.eitResponse.length; i++) { @@ -1413,24 +1453,25 @@ export class AddBasicDetailsComponent implements OnInit { this.eitResponse[i].DISPLAY_FLAG != "N" ) { //time - if(elemVal.length>5){ - elemVal = elemVal.substring(11, 16); - }else{ - elemVal = elemVal; - } + if (elemVal.length > 5) { + elemVal = elemVal.substring(11, 16); + } else { + elemVal = elemVal; + } } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { elem.classList.remove("requiredClassElm"); } - // if (elemVal != 'null'){ - varcharValue = elemVal; + // if (elemVal != 'null'){ + varcharValue = elemVal; //} else{ - // elemVal = null; - // } + // elemVal = null; + // } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, @@ -1459,6 +1500,7 @@ export class AddBasicDetailsComponent implements OnInit { } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1481,6 +1523,7 @@ export class AddBasicDetailsComponent implements OnInit { textValue = x.value; if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1759,15 +1802,15 @@ export class AddBasicDetailsComponent implements OnInit { P_SELECTED_RESP_ID: this.respID, P_FUNCTION_NAME: this.selMenu.GetMenuEntriesList.FUNCTION_NAME, EITTransactionTBL: allStatisDynamicValues, - P_ACTION_TYPE: this.targetValue === 'correct' ? 'CORRECT' : 'CHANGE' + P_ACTION_TYPE: this.targetValue === 'correct' ? 'CORRECT' : 'CHANGE' }; console.log(this.basicRequest); this.profileService.submitBasicDetailsTransaction(this.basicRequest).subscribe((result: any) => { - this.handleBasicdetailsResult(result); + this.handleBasicdetailsResult(result); }); } } - + } diff --git a/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts b/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts index f8aaf42a..557c5762 100644 --- a/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts +++ b/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts @@ -232,7 +232,8 @@ export class AddUpdateContactComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { this.selectInput = new SelectInput( @@ -242,7 +243,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillStaticDropdownList( feildsList[i].SEGMENT_NAME, @@ -257,7 +259,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "DATE") { this.dateInput = new DateInput( @@ -268,7 +271,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } @@ -429,7 +433,8 @@ export class AddUpdateContactComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { this.numberInput = new NumberInput( @@ -439,7 +444,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -458,7 +464,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -469,7 +476,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -488,7 +496,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -499,7 +508,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -521,7 +531,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -532,7 +543,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -546,7 +558,8 @@ export class AddUpdateContactComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -556,7 +569,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); if (isDff) { this.fillDropdownListDff( diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.html b/Mohem/src/app/profile/confirm-address/confirm-address.component.html index a3a64748..b4eb950d 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.html +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.html @@ -1,9 +1,14 @@ - + + + + @@ -11,7 +16,11 @@ -
{{'general, addAttach' | translate}}
+
+ {{'general, addAttach' | translate}} + * +
+
@@ -261,7 +270,7 @@
- + {{ (isDelete ? 'general, delete' : 'general, submit') | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss index bd1c1bdc..c26b777a 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -243,10 +243,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #29B5BF; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } .approvalTitle-ar{ diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts index f84248f9..06597c82 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts @@ -10,6 +10,7 @@ import { SubmitEitModalComponent } from 'src/app/eit/submit-eit-modal/submit-eit import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { HomeComponent } from 'src/app/notification/home/home.component'; import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; import { WorkListButtonRequest } from 'src/app/notification/models/NotificationButtonReq'; import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; @@ -63,6 +64,8 @@ export class ConfirmAddressComponent implements OnInit { filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; isContact: boolean; + isAttachmentGET_MENU: string = 'N'; + constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) { this.direction = TranslatorService.getCurrentLanguageName() @@ -77,6 +80,8 @@ export class ConfirmAddressComponent implements OnInit { this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); + this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; + // this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; // if (this.isResubmitEIT) { // this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** @@ -103,6 +108,7 @@ export class ConfirmAddressComponent implements OnInit { if (this.isContact) { this.itemKey = this.addrespList.SubmitPhonesTransactionList.P_ITEM_KEY; this.P_TransactionID = this.addrespList.SubmitPhonesTransactionList.P_TRANSACTION_ID; + this.headerTitle = this.ts.trPK('general', 'contact'); } else { this.itemKey = this.addrespList.SubmitAddressTransactionList.P_ITEM_KEY; this.P_TransactionID = this.addrespList.SubmitAddressTransactionList.P_TRANSACTION_ID; @@ -263,13 +269,17 @@ export class ConfirmAddressComponent implements OnInit { if (this.cs.validResponse(result)) { this.isSubmitBtnClicked = true; //if(this.isResubmitEIT==false){ - let msg: string = this.ts.trPK("eit", "approval-message-success"); - this.cs.presentAlert(msg); + // let msg: string = this.ts.trPK("eit", "approval-message-success"); + // this.cs.presentAlert(msg); + this.cs.greenToastPK("eit", "contact-approval-message-success") // } // this.navCtrl.popToRoot(); - + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); // this.cs.openHome(); - this.cs.openNotificationPage(); + //this.cs.setTotalNumberOfWorklistRequest(true); + // this.cs.openProfile('sideMenu'); + this.cs.openHome(); + //this.cs.openNotificationPage(); } } @@ -599,6 +609,8 @@ export class ConfirmAddressComponent implements OnInit { // } - + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } } diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html index 0505227b..ce1a1e77 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html @@ -1,9 +1,15 @@ - + + + + @@ -11,7 +17,11 @@ -
{{'general, addAttach' | translate}}
+
+ {{'general, addAttach' | translate}} + * +
+
@@ -122,7 +132,7 @@
- + {{ 'general, submit' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss index bd1c1bdc..cfa056b3 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -243,10 +243,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #29B5BF; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important } .approvalTitle-ar{ diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts index ef49d9e4..043704a7 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts @@ -15,6 +15,7 @@ import { WorkListButtonRequest } from 'src/app/notification/models/NotificationB import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; import { ProfileService } from '../service/profile.service'; import { SubmitAddressModalComponent } from '../submit-eit-modal/submit-address-modal.component'; +import { HomeComponent } from 'src/app/notification/home/home.component'; @Component({ selector: 'app-confirm-basic-details', @@ -62,7 +63,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { indexLastObj: any = 0; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; - + isAttachmentGET_MENU: string = 'N'; constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) { this.direction = TranslatorService.getCurrentLanguageName() @@ -75,9 +76,9 @@ export class ConfirmBasicDetailsComponent implements OnInit { this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false); - + this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER; - + this.menuType = this.selMenu.List_Menu.MENU_TYPE; this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; this.basicResponseList = this.cs.sharedService.getSharedData('basic-details-response', false); @@ -87,7 +88,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { // this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete; this.getApproversList(); - + } getApproversList() { @@ -98,7 +99,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { P_PAGE_LIMIT: 1000 } this.eitService.getApproversList(body).subscribe((result: any) => { - this.handleApproversResult(result); + this.handleApproversResult(result); }); } @@ -191,9 +192,13 @@ export class ConfirmBasicDetailsComponent implements OnInit { handleResults(result) { if (this.cs.validResponse(result)) { this.isSubmitBtnClicked = true; - let msg: string = this.ts.trPK("eit", "approval-message-success"); - this.cs.presentAlert(msg); - this.cs.openNotificationPage(); + // let msg: string = this.ts.trPK("eit", "approval-message-success"); + // this.cs.presentAlert(msg); + this.cs.greenToastPK("eit", "basic-approval-message-success"); + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); + // this.cs.openProfile('sideMenu'); + this.cs.openHome(); + //this.cs.openNotificationPage(); } } @@ -301,7 +306,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { modal.onDidDismiss() .then((data) => { - }); + }); return await modal.present(); } @@ -430,6 +435,10 @@ export class ConfirmBasicDetailsComponent implements OnInit { } catch (e) { } } - + + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } + } diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html index 0505227b..5fe909cb 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html @@ -11,7 +11,11 @@ -
{{'general, addAttach' | translate}}
+
+ {{'general, addAttach' | translate}} + * +
+
@@ -122,7 +126,7 @@
- + {{ 'general, submit' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss index 2ed98379..d38f4fed 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -227,7 +227,7 @@ } .header-toolbar-new{ - --background: #269DB8; + --background: #29B5BF; } .title{ margin-top: -37px; @@ -243,7 +243,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #269DB8; + background-color: #0ca2de; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts index 688e3443..05178b59 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts @@ -15,6 +15,7 @@ import { WorkListButtonRequest } from 'src/app/notification/models/NotificationB import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; import { ProfileService } from '../service/profile.service'; import { SubmitAddressModalComponent } from '../submit-eit-modal/submit-address-modal.component'; +import { HomeComponent } from 'src/app/notification/home/home.component'; @Component({ @@ -63,6 +64,7 @@ export class ConfirmContactComponent implements OnInit { indexLastObj: any = 0; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; + isAttachmentGET_MENU: string = 'N'; constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) { @@ -78,6 +80,7 @@ export class ConfirmContactComponent implements OnInit { this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false); this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER; + this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; this.menuType = this.selMenu.List_Menu.MENU_TYPE; this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; @@ -192,9 +195,13 @@ export class ConfirmContactComponent implements OnInit { handleResults(result) { if (this.cs.validResponse(result)) { this.isSubmitBtnClicked = true; - let msg: string = this.ts.trPK("eit", "approval-message-success"); - this.cs.presentAlert(msg); - this.cs.openNotificationPage(); + // let msg: string = this.ts.trPK("eit", "approval-message-success"); + // this.cs.presentAlert(msg); + this.cs.greenToastPK("eit", "approval-message-success"); + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); + // this.cs.openProfile('sideMenu'); + this.cs.openHome(); + //this.cs.openNotificationPage(); } } @@ -432,4 +439,8 @@ export class ConfirmContactComponent implements OnInit { } } + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } + } diff --git a/Mohem/src/app/profile/contact-us/contact-us.component.html b/Mohem/src/app/profile/contact-us/contact-us.component.html new file mode 100644 index 00000000..a76061a4 --- /dev/null +++ b/Mohem/src/app/profile/contact-us/contact-us.component.html @@ -0,0 +1,11 @@ + + + + +
+

{{ts.trPK('myTeam','dear')}} {{personalInfo.EMPLOYEE_NAME}}

+

{{ts.trPK('myTeam','contact-text')}}

+
+
diff --git a/Mohem/src/app/profile/contact-us/contact-us.component.scss b/Mohem/src/app/profile/contact-us/contact-us.component.scss new file mode 100644 index 00000000..c55da629 --- /dev/null +++ b/Mohem/src/app/profile/contact-us/contact-us.component.scss @@ -0,0 +1,6 @@ + +.main-div-contact { + padding-right: 20px; + padding-left: 20px; + margin-top: 20%; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/contact-us/contact-us.component.spec.ts b/Mohem/src/app/profile/contact-us/contact-us.component.spec.ts new file mode 100644 index 00000000..08625f19 --- /dev/null +++ b/Mohem/src/app/profile/contact-us/contact-us.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ContactUsComponent } from './contact-us.component'; + +describe('ContactUsComponent', () => { + let component: ContactUsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ContactUsComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ContactUsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/profile/contact-us/contact-us.component.ts b/Mohem/src/app/profile/contact-us/contact-us.component.ts new file mode 100644 index 00000000..fd03e8af --- /dev/null +++ b/Mohem/src/app/profile/contact-us/contact-us.component.ts @@ -0,0 +1,36 @@ +import { Component, OnInit } from '@angular/core'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + +@Component({ + selector: 'app-contact-us', + templateUrl: './contact-us.component.html', + styleUrls: ['./contact-us.component.scss'], +}) +export class ContactUsComponent implements OnInit { + + public personalInfo: any; + + constructor( + public authService: AuthenticationService, + public ts: TranslatorService + ) { } + + ngOnInit() { + this.getProfile(); + } + + public getProfile() { + + this.authService + .loadAuthenticatedUser() + .subscribe((user: AuthenticatedUser) => { + if (user) { + console.log(user); + this.personalInfo = user; + } + }); + } + +} diff --git a/Mohem/src/app/profile/contact/contact.component.html b/Mohem/src/app/profile/contact/contact.component.html index 8fed9814..4504ec2b 100644 --- a/Mohem/src/app/profile/contact/contact.component.html +++ b/Mohem/src/app/profile/contact/contact.component.html @@ -1,9 +1,11 @@ - -
+ + - - -
+ +
@@ -45,7 +47,7 @@
- + {{'userProfile, update' | translate}}
diff --git a/Mohem/src/app/profile/contact/contact.component.ts b/Mohem/src/app/profile/contact/contact.component.ts index e137b838..189358a3 100644 --- a/Mohem/src/app/profile/contact/contact.component.ts +++ b/Mohem/src/app/profile/contact/contact.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, NgZone } from '@angular/core'; import { AddEitResponse } from 'src/app/eit/models/add.eit.response'; import { EitRequest } from 'src/app/eit/models/eit.request'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; @@ -20,7 +20,7 @@ export class ConatactComponent implements OnInit { respID: any; selMenu: any; submitrequest: any; - constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService,) { + constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService, public ngzone: NgZone) { this.direction = TranslatorService.getCurrentLanguageName(); this.selEmp = this.cs.sharedService.getSharedData( MenuResponse.SHARED_SEL_EMP, @@ -40,10 +40,13 @@ export class ConatactComponent implements OnInit { ngOnInit() { - this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false); - this.setIsUpdated(); - this.direction = TranslatorService.getCurrentLanguageName(); - this.getObjectValue(); + this.ngzone.run(() => { + this.phoneNumbers = []; + this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false); + this.setIsUpdated(); + this.direction = TranslatorService.getCurrentLanguageName(); + this.getObjectValue(); + }) } setIsUpdated() { this.phoneNumbers.forEach(element => { @@ -54,7 +57,8 @@ export class ConatactComponent implements OnInit { getObjectValue() { this.profileService.getObjectValue({ 'P_OBJECT_TYPE': 'LOOKUP', - 'P_OBJECT_NAME': 'PHONE_TYPE' + 'P_OBJECT_NAME': 'PHONE_TYPE', + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { if (this.cs.validResponse(response)) { console.log(response); @@ -69,19 +73,16 @@ export class ConatactComponent implements OnInit { } }); } - updatePhone() { + updatePhone() { this.setIsDeletedStatus(); console.log(this.phoneNumbers); this.submitrequest = { - P_MENU_TYPE: this.selMenu.List_Menu.MENU_TYPE, P_SELECTED_RESP_ID: this.respID, //this.selMenu.List_Menu.RESP_ID,//-999, P_FUNCTION_NAME: this.selMenu.GetMenuEntriesList.FUNCTION_NAME, P_MBL_PHONES_TBL: this.phoneNumbers, - - - + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp }; this.profileService.submitPhoneTransaction(this.submitrequest, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { if (this.cs.validResponse(response)) { @@ -95,6 +96,14 @@ export class ConatactComponent implements OnInit { addNewRow() { this.phoneNumbers.push({ 'PHONE_NUMBER': '', 'PHONE_TYPE': '', 'ACTION': 'NEW_ROW', 'OBJECT_VERSION_NUMBER': null, 'PHONE_ID': null }) } + + ionViewDidLeave() { + this.phoneNumbers = this.phoneNumbers.filter(function( obj ) { + return obj.ACTION !== 'NEW_ROW'; + }); + this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE); + + } deleteRow(row) { row['DELETE_ROW'] = true; // this.phoneNumbers = diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 682c8590..5eb3c359 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -39,25 +39,26 @@
- - + + {{ts.trPK('general','personal-info')}}
- - + + {{ts.trPK('general','basic-details')}}
- - + + {{ts.trPK('userProfile','contact-details')}}
+
@@ -69,7 +70,7 @@
+ style="background: #44A7A1; border-radius: 0px 0px 10px 10px;"> -
+

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

@@ -359,7 +405,7 @@

{{data.RELATIONSHIP}}

-
+

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

diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 8cc51c0a..0b6b0ff3 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -17,9 +17,11 @@ .header-toolbar-new { --background: #29B5BF; } + .colorBG { --background: #f0efef; } + .header-div { text-transform: capitalize; background: #29B5BF; @@ -84,6 +86,7 @@ ion-thumbnail.menu-thumb { // margin-left: 30px; // margin-right: 30px; } + .gridService-ar { // margin-top: 87px; // border-radius: 10px; @@ -101,6 +104,7 @@ ion-thumbnail.menu-thumb { // padding-top: 19px; // padding-bottom: 26px; } + .columns-ar { // margin: 10px; // background: #0B4775; @@ -119,17 +123,20 @@ ion-thumbnail.menu-thumb { // font-weight: bold; font-family: var(--fontFamilyPoppins-SemiBold, inherit); } + .services { font-size: 12px; color: white; } + .service-ar { - font-size: 20px; + font-size: 18px; color: white; // letter-spacing: 1px; font-weight: bold; margin-right: 10px; } + .services-ar { font-size: 20px; color: white; @@ -144,19 +151,23 @@ ion-thumbnail.menu-thumb { border: #bebbbb !important; padding: 2px; } + .p { color: black !important; font-size: medium; text-align: center; border-bottom: rgb(190, 187, 187) solid 1px; } + .itemline { border-bottom: rgb(190, 187, 187) solid 1px; } + .itemlins { border-bottom: rgb(190, 187, 187) solid 1px; margin-bottom: 209px; } + .empName { margin: 0; padding: 0; @@ -166,6 +177,7 @@ ion-thumbnail.menu-thumb { font-size: 16px; margin-top: 38px; } + .empJob { margin: 0; padding: 0; @@ -174,10 +186,12 @@ ion-thumbnail.menu-thumb { font-size: 16px; margin-top: 4px; } + .arrow { width: 20px; height: 22px !important; } + .arrow-ar { float: left; font-size: 25px; @@ -198,14 +212,16 @@ ion-thumbnail.menu-thumb { width: 85%; margin: -12px 0px 0px 25px; } + .service-row-ar { - width: 108%; + width: 104%; margin: -12px 0px 0px 0px; } ion-content { --ion-background-color: whitesmoke; } + ion-title { color: white; position: absolute; @@ -218,6 +234,7 @@ ion-title { height: 100%; font-family: WorkSans-Regular; } + .contentBg { padding: 0px 20px; } @@ -236,6 +253,7 @@ ion-title { .user-info { text-align: center; margin-bottom: 15px; + .user-image-container { position: relative; width: 100%; @@ -245,6 +263,7 @@ ion-title { margin: 0 auto; align-items: center; } + // position: relative; // width: 80px; // height: 80px; @@ -278,6 +297,7 @@ ion-title { margin-top: -125px; } } + @media screen and (min-width: 768px) and (max-width: 1024px) { .user-image { // position: relative; @@ -307,6 +327,7 @@ ion-title { margin-top: -125px; } } + @media screen and (min-width: 768px) and (max-width: 1024px) { .user-image-ar { // position: relative; @@ -322,7 +343,9 @@ ion-title { border-radius: 80px; margin-bottom: 321px; margin-right: 52px; - }} + } +} + h1 { margin: 0; padding: 0; @@ -330,6 +353,7 @@ h1 { font-size: 18px; margin-bottom: 4px; } + span { font-size: 11px; display: block; @@ -337,11 +361,14 @@ span { } $actionBtnSize: 36px; + .user-actions { text-align: center; + .action-button { font-size: 11px; font-weight: bold; + // white-space: nowrap; // color: #888; .action-button-icon { @@ -353,6 +380,7 @@ $actionBtnSize: 36px; background-color: #29B5BF; line-height: $actionBtnSize; margin-bottom: 3px; + img { margin: 0 auto; vertical-align: middle; @@ -360,6 +388,7 @@ $actionBtnSize: 36px; } } } + .employee-information-indetail { background: white; margin-top: 15px; @@ -367,10 +396,12 @@ $actionBtnSize: 36px; margin-bottom: 15px; border-radius: 20px; border: 1px solid #ccc; + ion-col { padding: 15px; // border-bottom: 1px solid #ccc; } + h2 { font-size: 13px; // font-family: WorkSans-Bold; @@ -378,6 +409,7 @@ $actionBtnSize: 36px; font-weight: bold; color: rgb(128, 124, 124); } + p { font-size: 13px; margin: 0; @@ -408,6 +440,7 @@ $actionBtnSize: 36px; background-color: #29B5BF; } } + @media screen and (min-width: 768px) and (max-width: 1024px) { .active-Segment { width: 11%; @@ -438,6 +471,7 @@ $actionBtnSize: 36px; background: #414040 !important; } } + @media screen and (min-width: 768px) and (max-width: 1024px) { .normal-Segment { width: 11%; @@ -465,6 +499,7 @@ $actionBtnSize: 36px; height: 18px; } } + @media screen and (min-width: 768px) and (max-width: 1024px) { .imgSize { position: absolute; @@ -480,6 +515,7 @@ $actionBtnSize: 36px; padding: 15px; border-bottom: 1px solid #ccc; } + .img { width: 100px; height: 100px; @@ -491,6 +527,7 @@ $actionBtnSize: 36px; background: transparent; margin-left: 119%; } + .img-ar { width: 100px; height: 100px; @@ -502,6 +539,7 @@ $actionBtnSize: 36px; background: transparent; margin-right: 119%; } + ///////////////////////// Team Members css //////////////////////@extend .filters-row { @@ -510,10 +548,12 @@ $actionBtnSize: 36px; .search-dropdown { background: #29B5BF; + ion-select { .select-text { margin-left: -10px; } + .select-icon { .select-icon-inner { opacity: 1; @@ -526,6 +566,7 @@ $actionBtnSize: 36px; .input-container { background: white; + ion-input { border-bottom-color: transparent; } @@ -533,17 +574,20 @@ $actionBtnSize: 36px; .search-container { margin-top: 15px; + ion-col { background: white; border-radius: 12px; padding-right: 10px; flex: none; + ion-icon { margin-right: 3px; font-size: 14px; margin-left: 3px; vertical-align: middle; } + span { font-size: 12px; vertical-align: middle; @@ -567,11 +611,13 @@ $actionBtnSize: 36px; margin-top: -1px; margin-left: 43px; } + .activeArrow { height: 20px; width: 20px; color: #29B5BF; } + .disabledArrow { height: 20px; width: 20px; @@ -584,6 +630,7 @@ $actionBtnSize: 36px; color: #29B5BF; margin-right: 275px; } + .disabledArrow-ar { height: 20px; width: 20px; @@ -608,6 +655,7 @@ $actionBtnSize: 36px; width: 90%; left: 5%; } + .result-graph-ar { position: relative; background: white; @@ -658,6 +706,7 @@ $actionBtnSize: 36px; right: 5%; } } + .result-graph-attendence { position: relative; background: white; @@ -678,6 +727,7 @@ $actionBtnSize: 36px; margin-bottom: 10px; margin-left: 10px; } + .request-heading-ar { text-align: right; display: block; @@ -695,12 +745,14 @@ $actionBtnSize: 36px; display: block; text-align: center; transform: translate(-50%, -50%); + h2 { font-size: 38px; font-family: WorkSans-Bold; margin: 0 auto; line-height: 36px; } + span { width: 125px; display: block; @@ -709,6 +761,7 @@ $actionBtnSize: 36px; font-family: workSans-Regular; } } + .today-graph { // width: 100%; max-height: 4cm; @@ -753,6 +806,7 @@ $actionBtnSize: 36px; line-height: 11px !important; display: block; } + h2 { font-size: 25px; font-weight: bold; @@ -790,6 +844,7 @@ $actionBtnSize: 36px; margin: 0; font-size: 14px; } + span { font-size: 9px; } @@ -801,6 +856,7 @@ $actionBtnSize: 36px; margin: 0; font-size: 14px; } + span { font-size: 11px; margin-bottom: 3px; @@ -826,16 +882,17 @@ $actionBtnSize: 36px; } .blue-label-container { - // border-top: 5px solid #c2a16b; + // border-top: 5px solid #292F42; // padding: 1px 0px; // margin: 15px 0px width: 12px; height: 12px; padding-right: -10px; border-radius: 100%; - background-color: #c2a16b; + background-color: #292f42; margin-top: 30px; } + .span-one { // display: block; // font-size: 12px; @@ -847,6 +904,7 @@ $actionBtnSize: 36px; margin-top: -2px; font-weight: bold; } + .span-two { // display: block; // font-size: 22px; @@ -870,6 +928,7 @@ $actionBtnSize: 36px; margin-top: 28px; font-weight: bold; } + .spa-two { // display: block; // font-size: 22px; @@ -881,11 +940,13 @@ $actionBtnSize: 36px; font-weight: bold; font-family: WorkSans-Bold; } + .graph-container { margin-left: -50px; position: relative; margin-right: 50px; } + .label-container { position: absolute; // width: 20%; @@ -894,12 +955,14 @@ $actionBtnSize: 36px; margin-top: -27px; left: 20px; } + .attendance-summary .attendance-information { span { height: 32px; display: block; line-height: 14px; } + h2 { // text-align: right; // font-family: WorkSans-Bold; @@ -910,11 +973,12 @@ $actionBtnSize: 36px; .calendar-container { background: white; - margin-bottom: 100px; + // margin-bottom: 100px; margin-top: 10px; border-radius: 20px; border: 1px solid #ccc; padding-bottom: 25px; + span { text-align: left; display: block; @@ -923,11 +987,14 @@ $actionBtnSize: 36px; margin-left: 10px; } } + .calendar-container-ar { background: white; - margin-bottom: 100px; + // margin-bottom: 100px; margin-top: 20px; border-radius: 20px; + padding-bottom: 15px; + span { text-align: right; display: block; @@ -958,6 +1025,7 @@ $actionBtnSize: 36px; font-family: WorkSans-Bold; font-size: 16px; } + .stats { color: #289db8; font-size: 9px; @@ -1013,66 +1081,78 @@ $actionBtnSize: 36px; text-align: center; width: 20px; } -@media screen and (min-width: 1px) and (max-width:766px){ -.grid-card { - right: 5px; - position: relative; - display: block; - z-index: 5; - width: 103%; -}} -@media screen and (min-width: 1px) and (max-width:766px){ -.grid-card-ar { - left: 5px; - position: relative; - display: block; - z-index: 5; - width: 103%; -}} -@media screen and (min-width: 768px) and (max-width:1050px){ -.grid-card { - right: 5px; - position: relative; - display: block; - z-index: 5; - width: 101%; -}} -@media screen and (min-width: 768px) and (max-width:1050px){ -.grid-card-ar { - left: 5px; - position: relative; - display: block; - z-index: 5; - width: 101%; -}} -@media screen and (min-width: 1px) and (max-width:766px){ -.changeImgBtn { - position: absolute; - background: #f0ecec; - min-height: 25px; - width: 24px !important; - height: 20px; - border-radius: 50%; - bottom: 55px; - right: 36%; - top: -15%; - z-index: 99; -}} -@media screen and (min-width: 768px) and (max-width:1050px){ -.changeImgBtn { - position: absolute; - background: #f0ecec; - min-height: 25px; - width: 24px !important; - height: 20px; - border-radius: 50%; - bottom: 55px; - right: 41%; - top: -10%; - z-index: 99; -}} -@media screen and (min-width: 1060px) and (max-width:1090px){ +@media screen and (min-width: 1px) and (max-width:766px) { + .grid-card { + right: 5px; + position: relative; + display: block; + z-index: 5; + width: 103%; + } +} + +@media screen and (min-width: 1px) and (max-width:766px) { + .grid-card-ar { + left: 5px; + position: relative; + display: block; + z-index: 5; + width: 103%; + } +} + +@media screen and (min-width: 768px) and (max-width:1050px) { + .grid-card { + right: 5px; + position: relative; + display: block; + z-index: 5; + width: 101%; + } +} + +@media screen and (min-width: 768px) and (max-width:1050px) { + .grid-card-ar { + left: 5px; + position: relative; + display: block; + z-index: 5; + width: 101%; + } +} + +@media screen and (min-width: 1px) and (max-width:766px) { + .changeImgBtn { + position: absolute; + background: #f0ecec; + min-height: 25px; + width: 24px !important; + height: 20px; + border-radius: 50%; + bottom: 55px; + right: 36%; + top: -15%; + z-index: 99; + } +} + +@media screen and (min-width: 768px) and (max-width:1050px) { + .changeImgBtn { + position: absolute; + background: #f0ecec; + min-height: 25px; + width: 24px !important; + height: 20px; + border-radius: 50%; + bottom: 55px; + right: 41%; + top: -10%; + z-index: 99; + } +} + +@media screen and (min-width: 1060px) and (max-width:1090px) { .changeImgBtn { position: absolute; background: #f0ecec; @@ -1084,9 +1164,10 @@ $actionBtnSize: 36px; right: 41%; top: -10%; z-index: 99; - }} + } +} -@media screen and (min-width: 1px) and (max-width:766px){ +@media screen and (min-width: 1px) and (max-width:766px) { .changeImgBtn-ar { position: absolute; background: #f0ecec; @@ -1098,8 +1179,10 @@ $actionBtnSize: 36px; left: 36%; top: -15%; z-index: 99; - }} - @media screen and (min-width: 768px) and (max-width:1050px){ + } +} + +@media screen and (min-width: 768px) and (max-width:1050px) { .changeImgBtn-ar { position: absolute; background: #f0ecec; @@ -1111,20 +1194,23 @@ $actionBtnSize: 36px; left: 41%; top: -10%; z-index: 99; - }} - @media screen and (min-width: 1060px) and (max-width:1090px){ - .changeImgBtn-ar { - position: absolute; - background: #f0ecec; - min-height: 25px; - width: 24px !important; - height: 20px; - border-radius: 50%; - bottom: 55px; - left: 46%; - top: -10%; - z-index: 99; - }} + } +} + +@media screen and (min-width: 1060px) and (max-width:1090px) { + .changeImgBtn-ar { + position: absolute; + background: #f0ecec; + min-height: 25px; + width: 24px !important; + height: 20px; + border-radius: 50%; + bottom: 55px; + left: 46%; + top: -10%; + z-index: 99; + } +} .menubutton { background: #f0ecec; @@ -1165,20 +1251,20 @@ $actionBtnSize: 36px; border: none; } -.card-size-info-en{ +.card-size-info-en { // width: 88%; // left: 2%; // width: 89%; // left: 10px; - width: 90%; - left: 5%; - padding-left: 0px; - margin-left: 0px; + width: 90%; + left: 5%; + padding-left: 0px; + margin-left: 0px; } -.card-size-info-ar{ +.card-size-info-ar { width: 90%; - right: 5%; + right: 1%; padding-right: 0px; margin-left: 0px; } @@ -1203,12 +1289,18 @@ $actionBtnSize: 36px; // color: #2B353E; // opacity: 1; // } -.update{ - --background: #20A169; background: white; width: 100%; +.update { + --background: #20A169; + background: white; + width: 100%; } -.add{ - --background: #00bcd4; background: white; width: 100%; + +.add { + --background: #00bcd4; + background: white; + width: 100%; } + .add-icon-styling { background-color: #191814; width: 35px; @@ -1216,199 +1308,231 @@ $actionBtnSize: 36px; color: white; border-radius: 50%; position: absolute; - right: 30px; + left: 20px; + right: 20px; } -.name{ +.name { text-align: center; letter-spacing: -0.84px; - color: #2B353E; + color: #004D71; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-weight: bold; line-height: 21px; font-size: 21px; } -.email{ + +.email { text-align: center; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + margin: 10px; font-size: 13px; line-height: 6px; letter-spacing: -0.52px; - color: #A2A2A2; + color: #004D71; opacity: 1; + font-family: 'Inter' !important; } -.subTitle{ +.subTitle { text-align: center; letter-spacing: -0.52px; - color: #A2A2A2; + color: #004D71; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - font-size: 13px; - line-height: 0px; + font-weight: bold; + font-size: 16px; + line-height: 0px; margin-bottom: 7px; } -.boldText{ +.boldText { text-align: center; letter-spacing: -0.64px; - color: #2B353E; + color: #5C6F79 !important; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - font-size: 16px; + font-family: 'Inter' !important; + font-size: 14px; line-height: 19px; + top: 5px; + position: relative; } -.btnTitle{ +.btnTitle { text-align: center; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - line-height: 10px; - font-size: 11px; + line-height: 12px; + font-size: 11px; color: #4D4D4D; + margin-top: 5px; } -.Profileheader-label-text-form{ +.Profileheader-label-text-form { text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: 12px; margin-bottom: 2px; } -.header-label-text-form{ - text-align: left; +.header-label-text-form { + text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: -3px; margin-bottom: 2px; - margin-left: -11px;} + margin-left: -11px; +} -.type-label-text-form{ +.type-label-text-form { text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 20px; font-size: 13px; letter-spacing: -0.52px; - color: #A2A2A2; + color: #5C6F79; + font-weight: bold; opacity: 1; } -.result-label-text-form{ +.result-label-text-form { text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; } -.Profileheader-label-text-form-ar{ +.Profileheader-label-text-form-ar { text-align: right; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: 12px; margin-bottom: 2px; } -.header-label-text-form-ar{ - text-align: right; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); +.header-label-text-form-ar { + text-align: right; + font-weight: bold; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: -3px; margin-bottom: 2px; - margin-left: -11px;} + margin-left: -11px; +} -.type-label-text-form-ar{ +.type-label-text-form-ar { text-align: right; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 20px; font-size: 13px; letter-spacing: -0.52px; - color: #A2A2A2; + color: #5C6F79; + font-weight: bold; opacity: 1; } -.result-label-text-form-ar{ +.result-label-text-form-ar { text-align: right; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; + font-family: 'Inter' !important; + margin-top: 3px; + font-weight: bold; } -.create-edit{ + +.create-edit { font-size: 20px; } -.profile-green{ - background: #20A16A; - margin-right: 5px; - width: 80px; - height: 8px; + +.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; +.profile-gray { + background: #D9D9D9; + margin-right: 5px; + width: 80px; + height: 8px; border-radius: 5px; } -.family-member-button{ - width: 115px; - height: 45px; - background-color: #F5F5F5; - display: flex; - align-items: center; - padding: 16px; + +.family-member-button { + width: 115px; + height: 45px; + background-color: #F5F5F5; + display: flex; + align-items: center; + padding: 16px; border-radius: 20px; box-shadow: 0px 0px 5px #00000029; } -.profile-note-en{ - margin-left: 20px; - margin-top: 5px; + +.profile-note-en { + margin-left: 20px; + margin-top: 5px; font-size: 13px; } -.profile-note-ar{ - margin-right: 20px; - margin-top: 5px; + +.profile-note-ar { + margin-right: 20px; + margin-top: 5px; font-size: 13px; } -.profile-compilation-en{ - margin-left: 20px; - margin-top: 5px; +.profile-compilation-en { + margin-left: 20px; + margin-top: 5px; font-size: 13px; } -.profile-compilation-ar{ - margin-left: 20px; - margin-top: 5px; + +.profile-compilation-ar { + margin-left: 20px; + margin-top: 5px; font-size: 13px; } -.disabledButton{ - opacity:.5; -pointer-events: none; + +.disabledButton { + opacity: .5; + pointer-events: none; } + +.icon-img { + width: 20px; + height: 20px; + position: relative; + left: 20px; + right: 20px; +} \ 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 11a89923..02f49b68 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -37,6 +37,7 @@ export class HomeComponent implements OnInit { public editAddress = false; public targetValue: any; public employeeBasicDetails: any = []; + public employeeQualifications: any = []; public fullName: string; public maritalStatus: string; public birthDate: any; @@ -44,6 +45,7 @@ export class HomeComponent implements OnInit { public menuEntries: any; public basicDetailsSubMenu: any; public addressSubMenu: any; + public phoneSubMenu: any; public dependentDetails: any; public transactionNo = 0; public address: any; @@ -85,17 +87,18 @@ export class HomeComponent implements OnInit { this.addressSegment = false; this.familyMemberSegment = false; this.contactSegment = false; - this.familyMemberSegment = false; } else if (this.targetValue === 'basicDetails') { this.personalInfoSegment = false; this.basicDetailsSegment = true; this.addressSegment = false; this.familyMemberSegment = false; + this.contactSegment = false; } else if (this.targetValue === 'family') { this.personalInfoSegment = false; this.basicDetailsSegment = false; this.addressSegment = false; this.familyMemberSegment = true; + this.contactSegment = false; } else if (this.targetValue == 'contact') { this.personalInfoSegment = false; @@ -129,39 +132,25 @@ export class HomeComponent implements OnInit { let personalInformationChildren: any; let personalInfoNestedChildren: any; - if (this.targetValue === 'sideMenu') { - for (let i = 0; i < this.menuEntries.length; i++) { - 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 === 5) { - personalInfoNestedChildren = personalInformationChildren[j].children; - for (let k = 0; k < personalInfoNestedChildren.length; k++) { - if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') { - this.basicDetailsSubMenu = personalInfoNestedChildren[k]; - } - if (personalInfoNestedChildren[k].REQUEST_TYPE === 'ADDRESS') { - this.addressSubMenu = personalInfoNestedChildren[k]; - } - if (personalInfoNestedChildren[k].REQUEST_TYPE === 'CONTACT') { - this.dependentDetails = personalInfoNestedChildren[k]; - } + console.log(this.menuEntries); + + //if (this.targetValue === 'sideMenu') { + for (let i = 0; i < this.menuEntries.length; i++) { + if (this.menuEntries[i].MENU_NAME === 'XXX_EMP_PROFILE_SS') { + personalInformationChildren = this.menuEntries[i].children; + for (let j = 0; j < personalInformationChildren.length; j++) { + if (personalInformationChildren[j].REQUEST_TYPE === 'BASIC_DETAILS') { + this.basicDetailsSubMenu = personalInformationChildren[j]; + } + if (personalInformationChildren[j].REQUEST_TYPE === 'ADDRESS') { + this.addressSubMenu = personalInformationChildren[j]; + } + if (personalInformationChildren[j].REQUEST_TYPE === 'CONTACT') { + this.dependentDetails = personalInformationChildren[j]; + } + if (personalInformationChildren[j].REQUEST_TYPE === 'PHONE_NUMBERS') { + this.phoneSubMenu = personalInformationChildren[j]; } - } - } - } - } - } else { - const menuEntriesLocalArray: any = this.menuEntries.children; - for (let i = 0; i < menuEntriesLocalArray.length; i++) { - if (menuEntriesLocalArray[i].REQUEST_TYPE === 'BASIC_DETAILS') { - this.basicDetailsSubMenu = menuEntriesLocalArray[i]; - } - if (menuEntriesLocalArray[i].REQUEST_TYPE === 'ADDRESS') { - this.addressSubMenu = menuEntriesLocalArray[i]; - } - if (menuEntriesLocalArray[i].REQUEST_TYPE === 'CONTACT') { - this.dependentDetails = menuEntriesLocalArray[i]; } } } @@ -177,13 +166,12 @@ export class HomeComponent implements OnInit { if (user) { console.log(user); this.personalInfo = user; - this.jobName = user.JOB_NAME; - // let jobTitle = user.POSITION_NAME.split('.'); - // if (jobTitle && jobTitle.length > 1) { - // this.jobName = jobTitle[0] + " " + jobTitle[1]; - // }​ this.getPhoneNumbers(); this.getContactInfo(); + let jobTitle = user.POSITION_NAME; + // if (jobTitle && jobTitle.length > 1) { + this.jobName = jobTitle; + // } if (this.cs.getUpdateImage().status) { this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img); @@ -198,6 +186,24 @@ export class HomeComponent implements OnInit { }); } + + + // public getEmployeeQualifications() { + // const body = { + // P_SELECTED_EMPLOYEE_NUMBER: this.personalInfo.EMPLOYEE_NUMBER, + // P_MENU_TYPE: "E", + // P_SELECTED_RESP_ID: -999 + // }; + // this.profileService.getEmployeeQualifications(body).subscribe((result: any) => { + // if (this.cs.validResponse(result)) { + // this.employeeQualifications = result.EmployeeQualificationsList[0]; + // this.cs.sharedService.setSharedData(this.employeeQualifications, 'employeeQualifications'); + // console.log(this.employeeQualifications); + // } + // }); + + // } + public getBasicDetails() { const body = { P_SELECTED_EMPLOYEE_NUMBER: this.personalInfo.EMPLOYEE_NUMBER, @@ -383,6 +389,7 @@ export class HomeComponent implements OnInit { if (this.addressSubMenu && this.addressSubMenu.UPDATE_BUTTON === 'Y') { this.presentModal('address'); } else { + this.cs.sharedService.getSharedData(ProfileService.SELECTED_STATUS); this.cs.openAddAddress(); } } @@ -401,6 +408,7 @@ export class HomeComponent implements OnInit { getPhoneNumbers() { this.cs.startLoading(); this.profileService.getPhoneNumbers({ + P_SELECTED_EMPLOYEE_NUMBER: this.personalInfo.EMPLOYEE_NUMBER, P_MENU_TYPE: "E", P_SELECTED_RESP_ID: -999 }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { @@ -415,6 +423,7 @@ export class HomeComponent implements OnInit { getContactInfo() { this.profileService.getContactInfo({ + P_SELECTED_EMPLOYEE_NUMBER: this.personalInfo.EMPLOYEE_NUMBER, P_MENU_TYPE: "E", P_SELECTED_RESP_ID: -999 }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html index e9dab87b..e9c22b92 100644 --- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html @@ -15,7 +15,7 @@ - +

{{ts.trPK('general','new-info')}}

{{ts.trPK('general','new-info-address')}}

@@ -34,7 +34,7 @@ - {{ts.trPK('general','next')}} + {{ts.trPK('general','next')}} diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 716539d2..733cac06 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -5,63 +5,40 @@
- - -
- -
- - - - - -
- -

{{ts.trPK('userProfile','performance-evaluation')}}

- -
- - - - - - - + +
+ +

{{ts.trPK('userProfile','performance-evaluation')}}

+ +
+ + +
+
- -
- - -
-
-
- - -
-
- - -
- - -
-
+
+ + +
+
+ + +
+ + + +
+
+
-
- - - - - -
+ - \ No newline at end of file diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index 425d12f3..80247747 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -168,16 +168,21 @@ } .gauge{ - // transform: translate(-24px, -65px); - margin-bottom: -140px; - margin-top: -70px; - -} -.gauge-ar{ - transform: translate(-24px, -65px); - margin-bottom: -187px; - margin-top: -20px; - margin-right: -56px; + // margin-bottom: -140px; + // margin-top: -70px; + position: relative; + // right: 15px; + width: 100%; + height: 250px; } +// .gauge-ar{ +// // transform: translate(-24px, -65px); +// // margin-bottom: -187px; +// // margin-top: -20px; +// // margin-right: -56px; +// // position: relative; +// // right: 15px; +// } + diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts index 97671c38..0d7ccec8 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -20,7 +20,7 @@ export class PerformanceEvaluationComponent implements OnInit { personalInfo: any; user_image: any = '../assets/imgs/profile.png'; setImage: any; - view: any = [380, 450]; + public performanceData: any = []; public length; public direction: string; @@ -73,9 +73,10 @@ export class PerformanceEvaluationComponent implements OnInit { } - ngAfterViewInit() { - document.querySelector('svg .gauge.chart > text').remove(); - } + // ngAfterViewInit() { + // if(this.performanceData.length) + // document.querySelector('svg .gauge.chart > text').remove(); + // } getProfile() { console.log('getProfile'); @@ -107,14 +108,21 @@ export class PerformanceEvaluationComponent implements OnInit { this.appraisalArr = result.GetPerformanceAppraisalList; this.performanceData = []; for (let i = 0; i < this.appraisalArr.length; i++) { - this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseInt(this.appraisalArr[i].APPRAISAL_SCORE).toFixed() }); + if (!this.appraisalArr[i].APPRAISAL_SCORE) { + this.appraisalArr[i].APPRAISAL_SCORE = 0; + } + this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseFloat(this.appraisalArr[i].APPRAISAL_SCORE)}); } - console.log('PerformanceAppraisalResponse'); this.cs.sharedService.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA); - this.cs.openPerformanceevaluation(); + setTimeout(()=>{ + document.querySelector('svg .gauge.chart > text').remove(); + },100) + // this.cs.openPerformanceevaluation(); } else { let msg: string = this.ts.trPK("userProfile", "no-appraisal"); - this.cs.presentAlert(msg); + this.cs.presentAlert(msg, ()=>{ + this.cs.back(); + }); } } } diff --git a/Mohem/src/app/profile/profile.module.ts b/Mohem/src/app/profile/profile.module.ts index 46faa498..bf8a2f7e 100644 --- a/Mohem/src/app/profile/profile.module.ts +++ b/Mohem/src/app/profile/profile.module.ts @@ -26,6 +26,8 @@ import { ConfirmBasicDetailsComponent } from './confirm-basic-details/confirm-ba import { ConatactComponent } from './contact/contact.component'; import { AddUpdateContactComponent } from './add-update-contact/add-update-contact.component'; import { ConfirmContactComponent } from './confirm-contact/confirm-contact.component'; +import { ContactUsComponent } from './contact-us/contact-us.component'; + const routes: Routes = [ { path: '', @@ -59,6 +61,10 @@ const routes: Routes = [ { path: 'confirm-contact', component: ConfirmContactComponent + }, + { + path: 'contact-us', + component: ContactUsComponent } ], }, @@ -127,14 +133,14 @@ const routes: Routes = [ EditProfileComponent, PerformanceEvaluationComponent, ConfirmAddressComponent, - AddBasicDetailsComponent, ConfirmAddressComponent, ConfirmBasicDetailsComponent, ConatactComponent, AddBasicDetailsComponent, AddUpdateContactComponent, - ConfirmContactComponent + ConfirmContactComponent, + ContactUsComponent ], entryComponents: [EditDetailProfileComponent, SubmitAddressModalComponent], diff --git a/Mohem/src/app/profile/service/profile.service.ts b/Mohem/src/app/profile/service/profile.service.ts index 141d8e04..2458d24b 100644 --- a/Mohem/src/app/profile/service/profile.service.ts +++ b/Mohem/src/app/profile/service/profile.service.ts @@ -8,6 +8,9 @@ import { AuthenticationService } from "src/app/hmg-common/services/authenticatio export class ProfileService { public static updateEmpImage = "Services/ERP.svc/REST/UPDATE_EMPLOYEE_IMAGE"; public static getEmployeeBasicDetails = "Services/ERP.svc/REST/GET_EMPLOYEE_BASIC_DETAILS"; + public static getEmployeeQualifications = "Services/ERP.svc/REST/GET_EMPLOYEE_QUALIFICATIONS"; + public static getEmployeeHierachy = "Services/ERP.svc/REST/GET_SUPERVISOR_HIERARCHY"; + /* EIT Services URLs */ public static getMenuEntries = 'Services/ERP.svc/REST/GET_MENU_ENTRIES'; public static getEITTransctions = 'Services/ERP.svc/REST/GET_EIT_TRANSACTIONS'; @@ -83,6 +86,18 @@ export class ProfileService { return this.con.post(ProfileService.getEmployeeBasicDetails, request, onError, errorLabel); } + public getEmployeeHierachy(employeeQualificationRequest: any, onError?: any, errorLabel?: string): Observable { + const request = employeeQualificationRequest; + this.authService.authenticateRequest(request); + return this.con.post(ProfileService.getEmployeeHierachy, request, onError, errorLabel); + } + + public getEmployeeQualifications(employeeQualificationRequest: any, onError?: any, errorLabel?: string): Observable { + const request = employeeQualificationRequest; + this.authService.authenticateRequest(request); + return this.con.post(ProfileService.getEmployeeQualifications, request, onError, errorLabel); + } + public getBasicDFFStrutre(BASICDFFStrutreReq: any, onError?: any, errorLabel?: string): Observable { const request = BASICDFFStrutreReq; this.authService.authenticateRequest(request); @@ -165,21 +180,19 @@ export class ProfileService { public getObjectValue(request: any, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.P_USER_NAME; return this.con.post(ProfileService.getObjectValues, request, onError, errorLabel); } public getPhoneNumbers(request: any, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.P_USER_NAME; return this.con.post(ProfileService.getPhoneNumbers, request, onError, errorLabel); } public submitPhoneTransaction(request: any, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.P_USER_NAME; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.P_USER_NAME; return this.con.post(ProfileService.submitPhoneTransaction, request, onError, errorLabel); } @@ -187,7 +200,6 @@ export class ProfileService { public getContactInfo(request: any, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.P_USER_NAME; return this.con.post(ProfileService.getContactInfo, request, onError, errorLabel); } diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html index 75fc66f0..5963fb78 100644 --- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html +++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html @@ -8,7 +8,7 @@
- + {{ 'worklist,template-name' | translate}} @@ -16,6 +16,13 @@ {{ program.USER_CONCURRENT_PROGRAM_NAME}} + + + {{ 'worklist,template-name' | translate}} + + + {{ selectedMenu.PROMPT}} +
diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts index 8fb275f0..ac10c0d4 100644 --- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts +++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts @@ -14,6 +14,8 @@ import { SelectInput } from 'src/app/uI-elements/select.input'; import { TextInput } from 'src/app/uI-elements/text.input'; import { TimeInput } from 'src/app/uI-elements/time.input'; import { ReportServiceService } from '../report-service.service'; +import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'app-concurrent-report', @@ -39,9 +41,12 @@ export class ConcurrentReportComponent implements OnInit { public selEmp; public eitRequest; public ExtraObj; - selMenu: MenuResponse; public functionName; + public userData: any; + public fromHome: any = false; + + public headerTitle; getPassdirfromNotifiPage: boolean = false; @@ -51,21 +56,33 @@ export class ConcurrentReportComponent implements OnInit { comtransNo: any = 1; programList: any = []; public template: any; - constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService) { } + constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService, public router: ActivatedRoute) { + this.router.queryParams.subscribe(params => { + console.log(params) + this.fromHome = params.fromHome; + }); + } ngOnInit() { + this.userData =this.cs.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); this.getPassdirfromNotifiPage = this.cs.sharedService.getSharedData('dirfromNotificationPage'); this.selectedMenu = this.cs.sharedService.getSharedData(MenuResponse.SELECTED_MENU, false); - this.getConcurrentProgram(); + this.functionName = this.selectedMenu.FUNCTION_NAME; + + if (this.fromHome == "false") { + this.getConcurrentProgram(); + } else { + this.getCppDiffStructure(this.functionName); + } this.direction = TranslatorService.getCurrentLanguageName(); // this.effectiveDate = new Date(); - this.functionName = this.selectedMenu.FUNCTION_NAME; // this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; } getConcurrentProgram() { this.cs.startLoading(); this.reports.getConcurrentProgram({ - P_REQUEST_GROUP_ID: this.selectedMenu.REQUEST_GROUP_ID + P_REQUEST_GROUP_ID: this.selectedMenu.REQUEST_GROUP_ID, + P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { this.cs.stopLoading(); this.programList = response.GetConcurrentProgramsList; @@ -75,7 +92,8 @@ export class ConcurrentReportComponent implements OnInit { getCppDiffStructure(programList) { this.cs.startLoading(); this.reports.getCPPDiffStructure({ - P_DESC_FLEX_NAME: programList.CONCURRENT_PROGRAM_NAME + P_DESC_FLEX_NAME: this.fromHome == "false" ? programList.CONCURRENT_PROGRAM_NAME : programList, + P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { this.cs.stopLoading(); this.handleDiffStructure(response); @@ -117,7 +135,8 @@ export class ConcurrentReportComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -128,7 +147,8 @@ export class ConcurrentReportComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -147,7 +167,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -158,7 +179,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -177,7 +199,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -188,7 +211,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -210,7 +234,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -221,7 +246,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -235,7 +261,8 @@ export class ConcurrentReportComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -245,7 +272,8 @@ export class ConcurrentReportComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, @@ -923,11 +951,11 @@ export class ConcurrentReportComponent implements OnInit { this.eitRequest = new EitRequest(); const list: any = this.getElementsValues(); this.eitRequest.EITTransactionTBL = list; - this.eitRequest.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; + this.eitRequest.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER; this.eitRequest.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; this.eitRequest.P_SELECTED_RESP_ID = -999;// this.selectedMenu.RESP_ID; // this.selMenu.List_Menu.RESP_ID,//-999, - this.eitRequest.P_FUNCTION_NAME = this.functionName; - this.eitRequest.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + // this.eitRequest.P_FUNCTION_NAME = this.functionName; + this.eitRequest.P_DESC_FLEX_NAME = this.fromHome == "false" ? this.template.CONCURRENT_PROGRAM_NAME: this.functionName; // this.reportSubmitRequest = {} this.cs.startLoading(); this.reports @@ -955,7 +983,9 @@ export class ConcurrentReportComponent implements OnInit { request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; request.P_SELECTED_RESP_ID = -999; request.P_FUNCTION_NAME = this.functionName; - request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + request.P_DESC_FLEX_NAME = this.fromHome == "false" ? this.template.CONCURRENT_PROGRAM_NAME: this.functionName; + request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER; + this.reports.getTransaction(this.eitRequest, {}, this.ts.trPK('general', 'retry')).subscribe((result: any) => { this.cs.stopLoading(); @@ -1290,9 +1320,10 @@ export class ConcurrentReportComponent implements OnInit { return values; } selectTemplates() { - this.elementRef - .nativeElement.querySelectorAll('#containerDiv')[0].innerHTML = ''; - this.getCppDiffStructure(this.template); + this.elementRef.nativeElement.querySelectorAll('#containerDiv')[0].innerHTML = ''; + if (this.template) { + this.getCppDiffStructure(this.template); + } } refreshStatus() { diff --git a/Mohem/src/app/reports/report-service.service.ts b/Mohem/src/app/reports/report-service.service.ts index 9196cb2c..d9157598 100644 --- a/Mohem/src/app/reports/report-service.service.ts +++ b/Mohem/src/app/reports/report-service.service.ts @@ -23,7 +23,7 @@ export class ReportServiceService { getConcurrentProgram(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.con.postNoLoad( ReportServiceService.GET_CONCURRENT_PROGRAM, request, @@ -33,7 +33,7 @@ export class ReportServiceService { } getCPPDiffStructure(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.con.postNoLoad( ReportServiceService.GET_CPP_DIFF_STRUCTURE, request, @@ -43,7 +43,7 @@ export class ReportServiceService { } submitTransaction(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.con.postNoLoad( ReportServiceService.SUBMIT_CPP_REQUEST, request, @@ -53,7 +53,7 @@ export class ReportServiceService { } getTransaction(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.con.postNoLoad( ReportServiceService.SUBMIT_CPP_TRANSACTION, request, @@ -64,7 +64,7 @@ export class ReportServiceService { getCppOutput(request, onError, errorLabel) { this.authService.authenticateRequest(request); - request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + // request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; return this.con.postNoLoad( ReportServiceService.GET_CCP_OUTPUT, request, diff --git a/Mohem/src/app/reports/reports.module.ts b/Mohem/src/app/reports/reports.module.ts index 0fc1953d..789a61cd 100644 --- a/Mohem/src/app/reports/reports.module.ts +++ b/Mohem/src/app/reports/reports.module.ts @@ -10,6 +10,7 @@ import { ConcurrentReportComponent } from './concurrent-report/concurrent-report import { ReportServiceService } from './report-service.service'; import { HmgCommonModule } from '../hmg-common/hmg-common.module'; import { TransactionListComponent } from './transaction-list/transaction-list.component'; +import { TransactionsComponent } from './transactions/transactions.component'; const routes: Routes = [ @@ -25,6 +26,10 @@ const routes: Routes = [ path: 'transaction-list', component: TransactionListComponent }, + { + path: 'transactions', + component: TransactionsComponent + }, ], } ]; @@ -37,7 +42,7 @@ const routes: Routes = [ RouterModule.forChild(routes), HmgCommonModule ], - declarations: [ReportsPage, ConcurrentReportComponent, TransactionListComponent], + declarations: [ReportsPage, ConcurrentReportComponent, TransactionListComponent, TransactionsComponent], providers: [ReportServiceService] }) export class ReportsPageModule { } diff --git a/Mohem/src/app/reports/transaction-list/transaction-list.component.html b/Mohem/src/app/reports/transaction-list/transaction-list.component.html index cfffd088..21a758a7 100644 --- a/Mohem/src/app/reports/transaction-list/transaction-list.component.html +++ b/Mohem/src/app/reports/transaction-list/transaction-list.component.html @@ -1,7 +1,11 @@
- +
diff --git a/Mohem/src/app/reports/transaction-list/transaction-list.component.ts b/Mohem/src/app/reports/transaction-list/transaction-list.component.ts index 53449f9d..9f23766a 100644 --- a/Mohem/src/app/reports/transaction-list/transaction-list.component.ts +++ b/Mohem/src/app/reports/transaction-list/transaction-list.component.ts @@ -6,6 +6,8 @@ import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-respo import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { ReportServiceService } from '../report-service.service'; import { FileOpener } from '@ionic-native/file-opener/ngx'; +import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; + @Component({ selector: 'app-transaction-list', templateUrl: './transaction-list.component.html', @@ -16,10 +18,13 @@ export class TransactionListComponent implements OnInit { selectedMenu: any; template: any; direction: any; + public userData: any; + constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, private platform: Platform, private file: File, private opener: FileOpener, ) { } ngOnInit() { + this.userData =this.cs.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); this.selectedMenu = this.cs.sharedService.getSharedData(MenuResponse.SELECTED_MENU, false); this.transactionList = this.cs.sharedService.getSharedData(ReportServiceService.TRANSACTION_LIST, false); this.template = this.cs.sharedService.getSharedData(ReportServiceService.TEMPLATE, false); @@ -93,7 +98,8 @@ export class TransactionListComponent implements OnInit { request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; request.P_SELECTED_RESP_ID = -999; request.P_FUNCTION_NAME = this.selectedMenu.FUNCTION_NAME; - request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + request.P_DESC_FLEX_NAME = this.template != undefined ? this.template.CONCURRENT_PROGRAM_NAME: this.selectedMenu.FUNCTION_NAME; + request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER; this.reports.getTransaction(request, {}, this.ts.trPK('general', 'retry')).subscribe((result: any) => { this.cs.stopLoading(); diff --git a/Mohem/src/app/reports/transactions/transactions.component.html b/Mohem/src/app/reports/transactions/transactions.component.html new file mode 100644 index 00000000..fce2455c --- /dev/null +++ b/Mohem/src/app/reports/transactions/transactions.component.html @@ -0,0 +1,69 @@ + +
+ + + +
+
+
+ + + +
+ + {{ 'worklist,template-name' | translate}} + + + {{ program.USER_CONCURRENT_PROGRAM_NAME}} + + +
+ +
{{getDate(transaction.REQUEST_DATE)}}
+ + +
+

{{'transaction, request-id' | translate}}

+

+ {{transaction.REQUEST_ID}} +

+
+

{{'transaction, phase' | translate}}

+

{{transaction.CCP_PHASE}}

+
+ + +
+

{{'transaction,program-name' | translate}}

+

{{transaction.CONCURRENT_PROGRAM_NAME}}

+
+
+ + +
+

{{'transaction,output' | translate}}

+

+

+
+ +
+
+ +
+
+ + + +

{{'general, noData' | translate}}

+
+
+ +
+ +
+ + {{'vacation-rule, create-request' | translate}} +
+
diff --git a/Mohem/src/app/reports/transactions/transactions.component.scss b/Mohem/src/app/reports/transactions/transactions.component.scss new file mode 100644 index 00000000..378cb377 --- /dev/null +++ b/Mohem/src/app/reports/transactions/transactions.component.scss @@ -0,0 +1,213 @@ +.display-created { + display: inline-block; + margin: 2px; + color: #000; +} + +#containerDiv { + margin-top: 20px; +} + +.padding { + padding-left: 5px; + padding-right: 5px; +} + +.bold { + font-weight: bold; + font-size: 16px; +} + +.color-black { + color: #000; +} + +.date { + position: absolute; + font-size: 14px; + padding: 10px; + right: 0; + width: 100px; + color: #969696; +} + +.date_ar { + position: absolute; + font-size: 14px; + padding: 10px; + left: 0; + width: 100px; + color: #969696; +} + +.transaction-list { + margin-top: 20px; +} + +.date-container { + margin: 0px 20px; +} + +.label { + font-size: 16px; + // margin-left: 15px; + color: #a2a5a6 !important; + display: block; + overflow: hidden; + -webkit-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + /* font-size: inherit; */ + // text-overflow: ellipsis; + // white-space: nowrap; + white-space: normal; + // padding-top: 10px; + padding: 5px 0px; + padding-left: 10px !important; + margin: 10px auto; + + :root[dir="ltr"] { + font-family: var(--fontFamilySemiBoldEN) !important; + } + + :root[dir="rtl"] { + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + } + + +} + +.Field-en { + border-radius: 30px; + border: 1px solid #a2a5a6 !important; + margin-bottom: 15px; + padding-left: 20px !important; + padding-top: 6px !important; + color: #999999 !important; +} + +.Field-ar { + border-radius: 30px; + border: 1px solid #a2a5a6 !important; + margin-bottom: 20px; + padding-right: 20px !important; + padding-top: 6px !important; + color: #999999 !important; +} + +select { + width: 300px !important; + border: none !important; +} + +.padding_date { + padding-left: 5px !important; +} + +.date-icon { + font-size: 20px; + left: -1px; + position: relative; + top: 2px; +} + +ion-card { + padding: 10px; + border-radius: 11px; + box-shadow: 0px 1px 2px 1px #ccc; +} + +.display-inline { + display: inline-block; + +} + +.red { + color: #CA3332; + font-weight: 600; + margin: 0px 5px; + overflow: hidden; + width: 90%; + white-space: nowrap; + text-overflow: ellipsis; +} + +.inline-display { + display: inline-block; + font-weight: 600; + padding-left: 8px; +} + +.download { + font-size: 26px; + margin: 0px 10px; + position: relative; + top: 5px; + color: #CA3332; +} + +.refresh { + font-size: 22px; + margin: 0px 10px; + position: relative; + top: 5px; + color: #CA3332; +} + +.disabled-icon { + pointer-events: none; + opacity: .5; +} + +.output-container { + position: relative; + bottom: 10px; +} + +@media screen and (min-width: 300px) { + .CreateBtn { + --background: var(--newgreen) !important; + background: var(--newgreen) !important; + white-space: normal; + color: var(--light); + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 7px !important; + border-radius: 7px !important; + --min-height: 1.6cm !important; + width: 315px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + } +} + +@media screen and (min-width: 1px) and (max-width:290px) { + .CreateBtn { + --background: var(--newgreen) !important; + background: var(--newgreen) !important; + white-space: normal; + color: var(--light); + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 7px !important; + border-radius: 7px !important; + --min-height: 1.6cm !important; + width: 257px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + } +} + +.footer { + padding: 15px 0px; + background-color: var(--light) !important; + border: 0px !important; + box-shadow: none !important; + -webkit-box-shadow: none; +} + +.Btn { + margin: auto; + text-align: center; + display: block; +} \ No newline at end of file diff --git a/Mohem/src/app/reports/transactions/transactions.component.spec.ts b/Mohem/src/app/reports/transactions/transactions.component.spec.ts new file mode 100644 index 00000000..38769453 --- /dev/null +++ b/Mohem/src/app/reports/transactions/transactions.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TransactionsComponent } from './transactions.component'; + +describe('TransactionsComponent', () => { + let component: TransactionsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TransactionsComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TransactionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/reports/transactions/transactions.component.ts b/Mohem/src/app/reports/transactions/transactions.component.ts new file mode 100644 index 00000000..38cea1ee --- /dev/null +++ b/Mohem/src/app/reports/transactions/transactions.component.ts @@ -0,0 +1,135 @@ +import { Component, ElementRef, OnInit } from '@angular/core'; +import { FileOpener } from '@ionic-native/file-opener/ngx'; +import { File } from '@ionic-native/file/ngx'; +import { Platform } from '@ionic/angular'; +import { userInfo } from 'os'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { ReportServiceService } from '../report-service.service'; +import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; + +@Component({ + selector: 'app-transactions', + templateUrl: './transactions.component.html', + styleUrls: ['./transactions.component.scss'], +}) +export class TransactionsComponent implements OnInit { + transactionList: any = []; + selectedMenu: any; + template: any; + direction: any; + programList: any = []; + public userData: any; + + constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, private platform: Platform, private file: File, private opener: FileOpener, + ) { } + + ngOnInit() { + + this.selectedMenu = this.cs.sharedService.getSharedData(MenuResponse.SELECTED_MENU, false); + this.userData =this.cs.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); + // this.transactionList = this.cs.sharedService.getSharedData(ReportServiceService.TRANSACTION_LIST, false); + //this.template = this.cs.sharedService.getSharedData(ReportServiceService.TEMPLATE, false); + this.direction = TranslatorService.getCurrentDirection(); + this.getConcurrentProgram(); + + } + getDate(date) { + return this.cs.evaluteDate(date); + } + getCppOutput(transaction) { + var request: any = { + P_REQUEST_ID: transaction['REQUEST_ID'] + }; + this.cs.startLoading(); + this.reports.getCppOutput(request, {}, this.ts.trPK('general', 'retry')).subscribe((result: any) => { + this.saveAndOpenPdf(result.GetCcpOutputList['P_OUTPUT_FILE'], 'report.pdf'); + + console.log(result); + this.cs.stopLoading(); + + }); + } + // saveAndOpenPdf(pdf: string, filename: string) { + + // const linkSource = `data:application/pdf;base64,${pdf}`; + // const downloadLink = document.createElement("a"); + // const fileName = "report.pdf"; + // downloadLink.href = linkSource; + // downloadLink.download = fileName; + // downloadLink.click(); + + // } + + saveAndOpenPdf(pdf: string, filename: string) { + const writeDirectory = this.platform.is('ios') ? this.file.dataDirectory : this.file.externalDataDirectory; + this.file.writeFile(writeDirectory, filename, this.convertBase64ToBlob(pdf, 'data:application/pdf;base64'), { replace: true }) + .then(() => { + this.opener.open(writeDirectory + filename, 'application/pdf') + .catch(() => { + console.log('Error opening pdf file'); + }); + }) + .catch(() => { + console.error('Error writing pdf file'); + }); + } + + convertBase64ToBlob(b64Data, contentType): Blob { + contentType = contentType || ''; + const sliceSize = 512; + b64Data = b64Data.replace(/^[^,]+,/, ''); + b64Data = b64Data.replace(/\s/g, ''); + const byteCharacters = window.atob(b64Data); + const byteArrays = []; + for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) { + const slice = byteCharacters.slice(offset, offset + sliceSize); + const byteNumbers = new Array(slice.length); + for (let i = 0; i < slice.length; i++) { + byteNumbers[i] = slice.charCodeAt(i); + } + const byteArray = new Uint8Array(byteNumbers); + byteArrays.push(byteArray); + } + return new Blob(byteArrays, { type: contentType }); + } + refresh() { + // var request: any = { + // P_REQUEST_ID: transaction['REQUEST_ID'] + // }; + this.cs.startLoading(); + var request: any = {}; + request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; + request.P_SELECTED_RESP_ID = -999; + request.P_FUNCTION_NAME = this.selectedMenu.FUNCTION_NAME; + request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER; + + this.reports.getTransaction(request, {}, this.ts.trPK('general', 'retry')).subscribe((result: any) => { + this.cs.stopLoading(); + this.transactionList = result['GetCcpTransactionsList_New']; + }); + } + getConcurrentProgram() { + this.cs.startLoading(); + this.reports.getConcurrentProgram({ + P_REQUEST_GROUP_ID: this.selectedMenu.REQUEST_GROUP_ID, + P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER + }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { + this.cs.stopLoading(); + this.programList = response.GetConcurrentProgramsList; + + }) + } + selectTemplates() { + // this.elementRef + // .nativeElement.querySelectorAll('#containerDiv')[0].innerHTML = ''; + if (this.template) { + this.refresh(); + } + } + createTransaction() { + this.cs.openConcurrentReport(false); + } +} diff --git a/Mohem/src/app/sit/add-sit/add-sit.component.ts b/Mohem/src/app/sit/add-sit/add-sit.component.ts index a89f064a..044c4a55 100644 --- a/Mohem/src/app/sit/add-sit/add-sit.component.ts +++ b/Mohem/src/app/sit/add-sit/add-sit.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core"; import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry"; import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; import { EitRequest } from "../models/eit.request"; -import { ModalController } from "@ionic/angular"; +import { ModalController, Platform } from "@ionic/angular"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { EITTransactionsRequest } from "../models/EITTransactionsReq"; import { EitService } from "../services/eit.service"; @@ -73,7 +73,8 @@ export class AddSitComponent implements OnInit { public cs: CommonService, private ts: TranslatorService, private eitService: EitService, - public datePicker: DatePicker + public datePicker: DatePicker, + public platform: Platform ) { this.direction = TranslatorService.getCurrentLanguageName(); this.selEmp = this.cs.sharedService.getSharedData( @@ -181,7 +182,8 @@ export class AddSitComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + "" ); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql // this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); @@ -196,7 +198,8 @@ export class AddSitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + "" ); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ // this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); @@ -218,7 +221,8 @@ export class AddSitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + "" ); } else { this.dateInput = new DateInput( @@ -229,7 +233,8 @@ export class AddSitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + "" ); } // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date @@ -255,7 +260,8 @@ export class AddSitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + "" ); } else { this.datetimeInput = new DateTimeInput( @@ -266,7 +272,8 @@ export class AddSitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + "" ); } const elem = document.getElementById( @@ -301,7 +308,8 @@ export class AddSitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + "" ); } else { this.timeInput = new TimeInput( @@ -312,7 +320,8 @@ export class AddSitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + "" ); } } @@ -326,7 +335,8 @@ export class AddSitComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + "" ); } else { // dropdown list missing open in differnt page @@ -339,7 +349,8 @@ export class AddSitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + "" ); // }else{ // this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED); @@ -391,6 +402,7 @@ export class AddSitComponent implements OnInit { if (this.validateEitObj && this.validateEitObj.length > 0) { this.fillEITStructure(); } + this.bindToolTip(); } addFieldToDOM( @@ -524,13 +536,28 @@ export class AddSitComponent implements OnInit { select.value = select.dataset.hiddenval; //select.dataset.hiddenval=""; } else { - select.value = DV.P_ID_COLUMN_NAME; + if (eitObj.DEFAULT_TYPE == "C" && eitObj.DEFAULT_VALUE) { + select.value = eitObj.DEFAULT_VALUE; + } else { + select.value = DV.P_ID_COLUMN_NAME; + } } select.disabled = false; } } + bindToolTip () { + const toolTips = Array.from(document.getElementsByClassName('toolTip')); + toolTips.forEach(toolTip => { + toolTip.addEventListener('click', e => { + const toolTipData = toolTip.getAttribute("data-tooltip"); + this.cs.yellowToast(toolTipData); + }); + }); + } + bindHtmlElemEvents(id, obj) { + const isIOS = this.platform.is('ios'); const elem = document.getElementById(id); console.log(elem); console.log(obj); @@ -540,6 +567,17 @@ export class AddSitComponent implements OnInit { if (elemType == "SELECT") changeEvent = "change"; try { + + if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) { + elem.addEventListener("ionFocus", event => { + setTimeout(()=>{ + console.log(event.target as Element); + var e = event.target as Element; + e.scrollIntoView(true); + },1000) + }) + } + // elem.addEventListener("change", (e) => { elem.addEventListener(changeEvent, e => { //console.log("elem change "+elem.id); @@ -548,6 +586,14 @@ export class AddSitComponent implements OnInit { // if(!x.value) // isEmpty=true; //emptyChildElement + + if (obj.FORMAT_TYPE == "N") { + const maxSize = obj.MAXIMUM_SIZE; + const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value; + (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value; + } + + elem.classList.remove("requiredClassElm"); if ( obj.CHILD_SEGMENTS_VS_Splited && @@ -704,7 +750,7 @@ export class AddSitComponent implements OnInit { }else{ // console.log("else - " + elem.value); elem.value = val; - elem.innerText = text; + // elem.innerText = text; elem.setAttribute("value", val); // console.log("else - " + elem.value); } @@ -869,7 +915,7 @@ export class AddSitComponent implements OnInit { SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME, VALUE_COLUMN_NAME: val, DESCRIPTION: "", - ID_COLUMN_NAME: idColName, + ID_COLUMN_NAME: idColName ? idColName: '', FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME }); break; @@ -899,7 +945,7 @@ export class AddSitComponent implements OnInit { SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME, VALUE_COLUMN_NAME: text, DESCRIPTION: "", - ID_COLUMN_NAME: val, + ID_COLUMN_NAME: val ? val : '' , FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME }); break; @@ -924,7 +970,7 @@ export class AddSitComponent implements OnInit { SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME, VALUE_COLUMN_NAME: text, DESCRIPTION: "", - ID_COLUMN_NAME: val, + ID_COLUMN_NAME: val ? val : '' , FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME }); break; @@ -936,6 +982,12 @@ export class AddSitComponent implements OnInit { ) as HTMLInputElement; let text = x.value; let val = x.dataset.colmText; + + if (this.eitResponse[j].DISPLAY_FLAG == "N" && this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { + const attributeValue = x.getAttribute('value'); + val = attributeValue ? attributeValue : ''; + } + if ( (val == undefined || val == "") && parentsList[i].IsRequired == "REQUIRED" @@ -951,7 +1003,7 @@ export class AddSitComponent implements OnInit { SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME, VALUE_COLUMN_NAME: text, DESCRIPTION: "", - ID_COLUMN_NAME: val, + ID_COLUMN_NAME: val ? val: '', FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME }); break; @@ -965,7 +1017,7 @@ export class AddSitComponent implements OnInit { emptyChildElement(segmentName) { let elem = this.getElementByName(segmentName); elem.value = null; - elem.innerHTML = ""; + // elem.innerHTML = ""; if ("dtvalue" in elem.dataset) { elem.dataset.dtvalue = ""; } @@ -1229,6 +1281,7 @@ export class AddSitComponent implements OnInit { } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1267,6 +1320,7 @@ export class AddSitComponent implements OnInit { } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1287,8 +1341,19 @@ export class AddSitComponent implements OnInit { ) as HTMLSelectElement; let val = x.dataset.colmText; textValue = x.value; + + // below code is to handle fields which are hidden and required and has to have default value. + // So if colmText is empty then get value from value attribute which is already been set initially + if (this.eitResponse[i].DISPLAY_FLAG == "N" && this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { + const attributeValue = x.getAttribute('value'); + val = attributeValue ? attributeValue : ''; + textValue = val; + } + + if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { diff --git a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss index 2ed98379..d38f4fed 100644 --- a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss +++ b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -227,7 +227,7 @@ } .header-toolbar-new{ - --background: #269DB8; + --background: #29B5BF; } .title{ margin-top: -37px; @@ -243,7 +243,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #269DB8; + background-color: #0ca2de; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.ts b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.ts index be177d0f..c0de3bb0 100644 --- a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.ts +++ b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.ts @@ -7,6 +7,7 @@ import { EitService } from 'src/app/eit/services/eit.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { HomeComponent } from 'src/app/notification/home/home.component'; import { WorkListButtonRequest } from 'src/app/notification/models/NotificationButtonReq'; import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; import { BasicRequest } from 'src/app/profile/models/basic.request'; @@ -186,8 +187,10 @@ export class ConfirmTerminationComponent implements OnInit { handleResults(result) { if (this.cs.validResponse(result)) { this.isSubmitBtnClicked = true; - let msg: string = this.ts.trPK("eit", "approval-message-success"); - this.cs.presentAlert(msg); + // let msg: string = this.ts.trPK("eit", "approval-message-success"); + // this.cs.presentAlert(msg); + this.cs.greenToastPK("eit", "approval-message-success"); + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.cs.openNotificationPage(); } } diff --git a/Mohem/src/app/termination/termination-form/termination-form.component.ts b/Mohem/src/app/termination/termination-form/termination-form.component.ts index a874077e..4d348f2f 100644 --- a/Mohem/src/app/termination/termination-form/termination-form.component.ts +++ b/Mohem/src/app/termination/termination-form/termination-form.component.ts @@ -129,7 +129,8 @@ export class TerminationFormComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -140,7 +141,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -159,7 +161,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -170,7 +173,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -189,7 +193,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -200,7 +205,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -222,7 +228,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -233,7 +240,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -247,7 +255,8 @@ export class TerminationFormComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -257,7 +266,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, @@ -1288,7 +1298,8 @@ export class TerminationFormComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { this.selectInput = new SelectInput( @@ -1298,7 +1309,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillStaticDropdownList( feildsList[i].SEGMENT_NAME, @@ -1313,7 +1325,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "DATE") { this.dateInput = new DateInput( @@ -1324,7 +1337,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } diff --git a/Mohem/src/app/time-card/service/time-card.service.ts b/Mohem/src/app/time-card/service/time-card.service.ts index d42b10db..db2b63bc 100644 --- a/Mohem/src/app/time-card/service/time-card.service.ts +++ b/Mohem/src/app/time-card/service/time-card.service.ts @@ -15,6 +15,7 @@ import { GetSwipesResponse } from './models/get-swipes-response'; }) export class TimeCardService { public static getShiftTypeUrl = 'Services/ERP.svc/REST/GET_SHIFT_TYPES'; + public static getEmployeeLeaves = 'Services/ERP.svc/REST/GET_EMPLOYEE_LEAVES'; public static getTimeCardSummaryUrl = 'Services/ERP.svc/REST/GET_TIME_CARD_SUMMARY'; public static getDayHourDetailsUrl = @@ -42,6 +43,21 @@ export class TimeCardService { ); } + public getEmployeeLeaves( + body, + onError?: any, + errorLabel?: string + ): Observable { + const request = body; + this.authService.authenticateRequest(body); + return this.con.post( + TimeCardService.getEmployeeLeaves, + request, + onError, + errorLabel + ); + } + public getTimeCardSummary( timeCardSummaryReq, onError?: any, diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html index 0ac19449..c5c3a5de 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html @@ -9,33 +9,33 @@
- + {{month}} {{year}} - - + + - + {{year}} {{month}} - - + +
-
+ - +
- {{ts.trPK('attendance','monthly-attendance-calendar')}} + {{ts.trPK('attendance','monthly-attendance-calendar')}}
+
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index 22c74deb..834f25bc 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -724,7 +724,7 @@ $actionBtnSize : 36px; position: relative; background: white; margin-top: 20px; - padding-bottom: 20px; + // padding-bottom: 20px; border-radius: 20px; z-index: 1; margin-bottom: 10px; @@ -860,7 +860,7 @@ $actionBtnSize : 36px; .month-year-span { font-size: 20px; font-family: WorkSans-Bold; - color: #0a5d53; + color: white; } .green-label-container{ @@ -870,7 +870,7 @@ $actionBtnSize : 36px; } .blue-label-container{ - border-top: 5px solid #c2a16b; + border-top: 5px solid #292F42; padding: 1px 0px; margin: 15px 0px } @@ -910,9 +910,10 @@ $actionBtnSize : 36px; } .calendar-container{ background: white; - margin-bottom: 100px; + // margin-bottom: 100px; margin-top: 20px; border-radius: 20px; + padding-bottom: 25px; span{ text-align: left; display: block; @@ -923,9 +924,10 @@ $actionBtnSize : 36px; } .calendar-container-ar{ background: white; - margin-bottom: 100px; + // margin-bottom: 100px; margin-top: 20px; border-radius: 20px; + padding-bottom: 15px; span{ text-align: right; display: block; @@ -935,6 +937,15 @@ $actionBtnSize : 36px; } } +.disableIcon { + pointer-events: none; + opacity: .4; +} + +.enableIcon { + pointer-events: unset; +} + diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index ba2e3188..400a4a57 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -8,6 +8,7 @@ import { GetTimeCardSummaryRequest } from 'src/app/time-card/service/models/get- import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import * as moment from 'moment'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { last } from '@angular/router/src/utils/collection'; @Component({ selector: 'app-time-card-details', @@ -22,6 +23,7 @@ export class TimeCardDetailsComponent implements OnInit { preMonth: number; nextMonth: any; public direction: string; + public disableNextPreviousSlides = true; constructor( public timeCardService: TimeCardService, public common: CommonService, @@ -89,8 +91,29 @@ export class TimeCardDetailsComponent implements OnInit { const index = this.monthsNameArray.indexOf(month); this.month = this.direction === 'ltr' ? month : this.common.getMonthNameAr(index + 1); this.year = year; - this.getTimeCardSummaryDetails(month, year); - this.getDayHoursTypeDetails(month, year); + + // GET_EMPLOYEE_LEAVES + const date = new Date(); + const firstDay = moment(new Date(year, index, 1)).format("YYYY-MM-DD"); + const lastDay = moment(new Date(year, index + 1, 0)).format("YYYY-MM-DD"); + + this.getEmployeeLeaves(firstDay, lastDay); + } + + public getEmployeeLeaves(firstDay, lastDay) { + this.selEmp = this.common.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); + const body = { + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, + P_DATE_FROM_STR: firstDay, + P_DATE_TO_STR: lastDay, + P_MENU_TYPE: "E", + P_SELECTED_RESP_ID: -999 + }; + this.timeCardService.getEmployeeLeaves(body).subscribe((result) => { + if (this.common.validResponse(result)) { + this.countAllAttendDays(result.EmployeeLeavesList); + } + }); } public getDayHoursTypeDetails(month?, year?) { @@ -124,36 +147,39 @@ export class TimeCardDetailsComponent implements OnInit { // tslint:disable-next-line:prefer-for-of for (let i = 0; i < allDays.length; i++) { // tslint:disable-next-line: triple-equals - if (allDays[i].ATTENDED_FLAG == 'Y') { + if (allDays[i].LEAVE_TYPE == 'BUSINESS_TRIP') { allDays[i].customPresent = true; allDays[i].customAbsent = false; allDays[i].customDaysOff = false; allDays[i].customSchedule = false; - allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); + allDays[i].customScheduleDate = new Date(allDays[i].EVENT_DATE); // tslint:disable-next-line: triple-equals - } else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].ABSENT_FLAG == 'Y') { + } else if (allDays[i].LEAVE_TYPE == 'ABSENCE') { allDays[i].customPresent = false; allDays[i].customAbsent = true; allDays[i].customDaysOff = false; allDays[i].customSchedule = false; - allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); + allDays[i].customScheduleDate = new Date(allDays[i].EVENT_DATE); // tslint:disable-next-line: triple-equals - } else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].DAY_TYPE === 'OFF') { + } else if (allDays[i].LEAVE_TYPE == 'HOLIDAY') { allDays[i].customPresent = false; allDays[i].customAbsent = false; allDays[i].customDaysOff = true; allDays[i].customSchedule = false; - allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); + allDays[i].customScheduleDate = new Date(allDays[i].EVENT_DATE); } else { allDays[i].customPresent = false; allDays[i].customAbsent = false; allDays[i].customDaysOff = false; allDays[i].customSchedule = true; - allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); + allDays[i].customScheduleDate = new Date(allDays[i].EVENT_DATE); } } this.showData = true; this.dayHoursTypeDetailsList = allDays; + setTimeout(() => { + this.disableNextPreviousSlides = false; + }, 2000); } public getTimeCardSummaryDetails(month?, year?) { @@ -184,7 +210,7 @@ export class TimeCardDetailsComponent implements OnInit { { data: [this.absentDays, this.attendedDays], backgroundColor: [ - '#29B5BF', + '#292F42', '#29B5BF' ], borderWidth: 2 @@ -196,7 +222,9 @@ export class TimeCardDetailsComponent implements OnInit { } nextSlide() { - if (this.currentMonthName !== this.month) { + this.disableNextPreviousSlides = true; + + // if (this.currentMonthName !== this.month) { this.common.startLoading(); this.showData = false; if (this.nextMonth > 12) { @@ -207,10 +235,11 @@ export class TimeCardDetailsComponent implements OnInit { this.calendarConfig(this.common.getMonthName(this.nextMonth) , this.currentYear); this.nextMonth = this.nextMonth + 1; this.preMonth = this.nextMonth - 2; - } + // } } previousSlide() { + this.disableNextPreviousSlides = true; this.common.startLoading(); this.showData = false; if (this.preMonth === 0) { diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index 05e63bad..c0715a89 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -9,7 +9,8 @@ export class DateTimeInput extends UiElement { private disabled: string, private hidden: string, private required: string, - private language: string = 'en') { + private language: string = 'en', + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -21,6 +22,7 @@ export class DateTimeInput extends UiElement { } public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; const doneText = this.language === 'en' ? 'Done' : 'تم'; const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; let disaledClass = ""; @@ -33,6 +35,9 @@ export class DateTimeInput extends UiElement { } if (this.required == 'Y') requiredClass = "requiredClass" + + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} + // let arrayDate=val.split(" "); // elem.value = this.common.reverseFormatDate(arrayDate[0]); // elem.setAttribute('value', elem.value); @@ -45,13 +50,14 @@ export class DateTimeInput extends UiElement { // timeValue=arrayDate[1]; // } const template = - "" + + "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ + "
" + "
" return template; } diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index c0f7b0a6..2ad766e6 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -9,7 +9,8 @@ export class DateInput extends UiElement { private disabled: string, private hidden: string, private required: string, - private language: string = 'en') { + private language: string = 'en', + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); } @@ -23,6 +24,7 @@ export class DateInput extends UiElement { } public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; const doneText = this.language === 'en' ? 'Done' : 'تم'; const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } @@ -36,19 +38,23 @@ export class DateInput extends UiElement { } if (this.required == 'Y') requiredClass = "requiredClass" + + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} + const template = // "
" + // " " + // " "+ // "
"; - "" + + "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ + "
" + "
" return template; diff --git a/Mohem/src/app/uI-elements/number.input.ts b/Mohem/src/app/uI-elements/number.input.ts index e8b68ee9..2406b8c1 100644 --- a/Mohem/src/app/uI-elements/number.input.ts +++ b/Mohem/src/app/uI-elements/number.input.ts @@ -8,7 +8,8 @@ export class NumberInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -16,19 +17,22 @@ export class NumberInput extends UiElement { public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; if (this.required == 'Y') requiredClass = "requiredClass" if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} const template = // "
" + // " " + // " " + // "
"; - " " + + " " + "" + this.label + "" + - " " + + " " + + "
" + "
"; return template; diff --git a/Mohem/src/app/uI-elements/select.input.ts b/Mohem/src/app/uI-elements/select.input.ts index b2f1f756..715c6d1c 100644 --- a/Mohem/src/app/uI-elements/select.input.ts +++ b/Mohem/src/app/uI-elements/select.input.ts @@ -11,7 +11,8 @@ export class SelectInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private toolTipText: string) { super(elementId, containerId, ''); this.direction = TranslatorService.getCurrentLanguageName(); this.createElement(this.getTemplate()); @@ -21,12 +22,14 @@ export class SelectInput extends UiElement { public getTemplate() { let template :string = ""; + let hideToolTipClass: string = ""; let requiredClass: string = ""; if (this.required == 'Y') requiredClass = "requiredClass" if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } - // const template = + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} + // const template = // "
" + // " " + // " "+ + " "+ + "
" + "
"; } else{ template = - "
" + + "
" + " " + - " "+ ""+ ""+ + "
" + "
"; } diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 985563b4..21cecf47 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -1,6 +1,5 @@ import { UiElement } from "./ui-element"; - export class TextInput extends UiElement { constructor( @@ -11,22 +10,26 @@ export class TextInput extends UiElement { private textVal: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); } public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; if (this.required === 'Y') requiredClass = "requiredClass" if (this.disabled === "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden === "N") { this.hidden = "display:none;" } else { this.hidden = "" } + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} const template = // "
" + - "" + + "" + " " + this.label + "" + - " " + + " " + + "
" + "
"; return template; diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index a8d156fa..f51973be 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -10,7 +10,8 @@ export class TimeInput extends UiElement { private disabled: string, private hidden: string, private required: string, - private language: string = 'en') { + private language: string = 'en', + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -26,6 +27,7 @@ export class TimeInput extends UiElement { public getTemplate() { let requiredClass = ''; + let hideToolTipClass: string = ""; let disaledClass = ''; const doneText = this.language === 'en' ? 'Done' : 'تم'; const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; @@ -39,11 +41,13 @@ export class TimeInput extends UiElement { if (this.value === 'currentTime') { this.formatDate(); } + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}; const template = - "" + + "" + " " + this.label + "" + - "" + + "" + + "
" + "
" return template; } diff --git a/Mohem/src/app/uI-elements/ui-element.ts b/Mohem/src/app/uI-elements/ui-element.ts index 2d7ec8f8..4101e54c 100644 --- a/Mohem/src/app/uI-elements/ui-element.ts +++ b/Mohem/src/app/uI-elements/ui-element.ts @@ -24,11 +24,12 @@ export class UiElement { } } + + public onClicked(listener: any) { this.registerEvent('click', listener); } - public onChanged(listener: any) { this.registerEvent('change', listener); } diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts index 0e844ddc..f7ba1f99 100644 --- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts +++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts @@ -302,7 +302,8 @@ export class CreateVacationRuleComponent implements OnInit { handlecreateVacationResult(result) { if (this.cs.validResponse(result)) { //this.navCtrl.pop(); - this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success')) + // this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success')) + this.cs.greenToastPK("vacation-rule", "rule-success"); this.goToStart(); // this.navCtrl.push("VacationRulePage"); // let index= this.navCtrl.indexOf('VacationRulePage'); @@ -503,22 +504,22 @@ export class CreateVacationRuleComponent implements OnInit { if (RespondAttributesList[i].ATTRIBUTE_TYPE == "VARCHAR2") { console.log("1"); - this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", ""); + this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "", RespondAttributesList.REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "LOOKUP") { console.log("2"); //call create WF_LOOKUP //call there or when the got response from responsedAtt - this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); this.getWFLookUp(RespondAttributesList[i].ATTRIBUTE_FORMAT, RespondAttributesList[i].ATTRIBUTE_NAME); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") { console.log("3"); - this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction); + this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction, RespondAttributesList[i].REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") { console.log("4"); - this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); } } } diff --git a/Mohem/src/app/vacation-rule/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index ba2b4758..04d8002a 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -79,7 +79,7 @@ {{notBadge}} -

{{item.RULE_STATUS}}


+

{{item.RULE_STATUS}}


{{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}


{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}

- - @@ -43,7 +43,7 @@ -

+

{{'vacation-rule, skip-step-3' | translate}}

diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss index c4fc2246..2e435d91 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss @@ -21,11 +21,16 @@ p.smallTip { font-size: 12px; color: #acacac; padding: 1px 6px; + margin-left: 20px; +} + +p.smallTip-ar { + margin-right: 20px; } .footer-button { border-radius: 3px; - padding: 0 1.1em; + // padding: 0 1.1em; min-height: 45px; min-width: 200px; } @@ -90,6 +95,7 @@ color: black !important; } .stepHeaderLebal{ margin:0; + color: #29B5BF; } // .progcontainer { @@ -163,6 +169,9 @@ color: black !important; // background-color: #209a83; // } +.label-Select-ar { + margin-right: 25px !important; +} .label-Select{ color: var(--dark); @@ -206,6 +215,10 @@ color: black !important; } } +.label-ar { + margin-right: 25px !important; +} + .label{ font-size: 16px; // margin-left: 15px; 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 acc38009..d6adb920 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 @@ -414,22 +414,22 @@ createVacationDynamicFields(RespondAttributesList) { if (RespondAttributesList[i].ATTRIBUTE_TYPE == "VARCHAR2") { console.log("1"); - this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", ""); + this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "", RespondAttributesList[i].REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "LOOKUP") { console.log("2"); //call create WF_LOOKUP //call there or when the got response from responsedAtt - this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); this.getWFLookUp(RespondAttributesList[i].ATTRIBUTE_FORMAT, RespondAttributesList[i].ATTRIBUTE_NAME); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") { console.log("3"); - this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction); + this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction, RespondAttributesList.REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") { console.log("4"); - this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); } } } @@ -708,7 +708,8 @@ ApplyFunc() { } handlecreateVacationResult(result) { if (this.cs.validResponse(result)) { - this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success')) + // this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success')) + this.cs.greenToastPK("vacation-rule", "rule-success"); this.goToStart(); } diff --git a/Mohem/src/assets/font/Inter-V.ttf b/Mohem/src/assets/font/Inter-V.ttf new file mode 100644 index 00000000..be66f25d Binary files /dev/null and b/Mohem/src/assets/font/Inter-V.ttf differ diff --git a/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf b/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf new file mode 100644 index 00000000..3c9947bc Binary files /dev/null and b/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf differ diff --git a/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf b/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf new file mode 100644 index 00000000..6a2bacbc Binary files /dev/null and b/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf new file mode 100644 index 00000000..ba9166ea Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf new file mode 100644 index 00000000..632d37c5 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf new file mode 100644 index 00000000..42da3f37 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf new file mode 100644 index 00000000..9a73c08f Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf new file mode 100644 index 00000000..9a562814 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf new file mode 100644 index 00000000..a8f68e5d Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf new file mode 100644 index 00000000..b04620fa Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf new file mode 100644 index 00000000..e4fe4dc7 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf new file mode 100644 index 00000000..0d5c9121 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf differ diff --git a/Mohem/src/assets/icon/icon_CS.png b/Mohem/src/assets/icon/icon_CS.png new file mode 100644 index 00000000..11242978 Binary files /dev/null and b/Mohem/src/assets/icon/icon_CS.png differ diff --git a/Mohem/src/assets/icon/moe-logo.png b/Mohem/src/assets/icon/moe-logo.png new file mode 100644 index 00000000..da66b11e Binary files /dev/null and b/Mohem/src/assets/icon/moe-logo.png differ diff --git a/Mohem/src/assets/icon/new-design/BusinessTrip.png b/Mohem/src/assets/icon/new-design/BusinessTrip.png new file mode 100644 index 00000000..c0362daf Binary files /dev/null and b/Mohem/src/assets/icon/new-design/BusinessTrip.png differ diff --git a/Mohem/src/assets/icon/new-design/leave_balance.png b/Mohem/src/assets/icon/new-design/leave_balance.png index c915cc7e..2cda716b 100644 Binary files a/Mohem/src/assets/icon/new-design/leave_balance.png and b/Mohem/src/assets/icon/new-design/leave_balance.png differ diff --git a/Mohem/src/assets/icon/new-design/moe-logo.png b/Mohem/src/assets/icon/new-design/moe-logo.png new file mode 100644 index 00000000..0f36db9e Binary files /dev/null and b/Mohem/src/assets/icon/new-design/moe-logo.png differ diff --git a/Mohem/src/assets/icon/new-design/profile.png b/Mohem/src/assets/icon/new-design/profile.png index 68411233..2a6ed4c3 100644 Binary files a/Mohem/src/assets/icon/new-design/profile.png and b/Mohem/src/assets/icon/new-design/profile.png differ diff --git a/Mohem/src/assets/icon/new-design/ticket_balance.png b/Mohem/src/assets/icon/new-design/ticket_balance.png index f769f41c..a999a076 100644 Binary files a/Mohem/src/assets/icon/new-design/ticket_balance.png and b/Mohem/src/assets/icon/new-design/ticket_balance.png differ diff --git a/Mohem/src/assets/icon/new-design/vacation_rules.png b/Mohem/src/assets/icon/new-design/vacation_rules.png index ab4d5676..22f602e0 100644 Binary files a/Mohem/src/assets/icon/new-design/vacation_rules.png and b/Mohem/src/assets/icon/new-design/vacation_rules.png differ diff --git a/Mohem/src/assets/icon/new-design/vacation_rules_icon.png b/Mohem/src/assets/icon/new-design/vacation_rules_icon.png index ab4d5676..22f602e0 100644 Binary files a/Mohem/src/assets/icon/new-design/vacation_rules_icon.png and b/Mohem/src/assets/icon/new-design/vacation_rules_icon.png differ diff --git a/Mohem/src/assets/icon/new-design/work_list.png b/Mohem/src/assets/icon/new-design/work_list.png index 6b7b2dd6..cc256591 100644 Binary files a/Mohem/src/assets/icon/new-design/work_list.png and b/Mohem/src/assets/icon/new-design/work_list.png differ diff --git a/Mohem/src/assets/icon/update.png b/Mohem/src/assets/icon/update.png deleted file mode 100644 index e461c733..00000000 Binary files a/Mohem/src/assets/icon/update.png and /dev/null differ diff --git a/Mohem/src/assets/icon/update_rocket_image.png b/Mohem/src/assets/icon/update_rocket_image.png index 85862eba..1a029dff 100644 Binary files a/Mohem/src/assets/icon/update_rocket_image.png and b/Mohem/src/assets/icon/update_rocket_image.png differ diff --git a/Mohem/src/assets/imgs/ID_ico_menu.png b/Mohem/src/assets/imgs/ID_ico_menu.png index 68fb7339..89f188c5 100644 Binary files a/Mohem/src/assets/imgs/ID_ico_menu.png and b/Mohem/src/assets/imgs/ID_ico_menu.png differ diff --git a/Mohem/src/assets/imgs/SFHLogo.png b/Mohem/src/assets/imgs/SFHLogo.png deleted file mode 100644 index be73fe21..00000000 Binary files a/Mohem/src/assets/imgs/SFHLogo.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/call-o.svg b/Mohem/src/assets/imgs/call-o.svg index b5a9434a..bd0cdd95 100644 --- a/Mohem/src/assets/imgs/call-o.svg +++ b/Mohem/src/assets/imgs/call-o.svg @@ -1,6 +1,6 @@ - - + + diff --git a/Mohem/src/assets/imgs/call.svg b/Mohem/src/assets/imgs/call.svg index e7b1638d..60216890 100644 --- a/Mohem/src/assets/imgs/call.svg +++ b/Mohem/src/assets/imgs/call.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/Mohem/src/assets/imgs/defaultService.png b/Mohem/src/assets/imgs/defaultService.png new file mode 100644 index 00000000..61b3b356 Binary files /dev/null and b/Mohem/src/assets/imgs/defaultService.png differ diff --git a/Mohem/src/assets/imgs/help.png b/Mohem/src/assets/imgs/help.png new file mode 100644 index 00000000..89e95d1d Binary files /dev/null and b/Mohem/src/assets/imgs/help.png differ diff --git a/Mohem/src/assets/imgs/hierarchy.png b/Mohem/src/assets/imgs/hierarchy.png new file mode 100644 index 00000000..5c194f64 Binary files /dev/null and b/Mohem/src/assets/imgs/hierarchy.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png new file mode 100644 index 00000000..27417cb3 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated-OLD.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png index 27417cb3..d7d38d22 100644 Binary files a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png and b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/data-corrected (4).png b/Mohem/src/assets/imgs/mohemm-action/answer.png similarity index 100% rename from Mohem/src/assets/imgs/mohemm-action/data-corrected (4).png rename to Mohem/src/assets/imgs/mohemm-action/answer.png diff --git a/Mohem/src/assets/imgs/moving.gif b/Mohem/src/assets/imgs/moving.gif index ffefdb00..22b04e38 100644 Binary files a/Mohem/src/assets/imgs/moving.gif and b/Mohem/src/assets/imgs/moving.gif differ diff --git a/Mohem/src/assets/imgs/my_team_icon.png b/Mohem/src/assets/imgs/my_team_icon.png index 93f0a032..ab270054 100644 Binary files a/Mohem/src/assets/imgs/my_team_icon.png and b/Mohem/src/assets/imgs/my_team_icon.png differ diff --git a/Mohem/src/assets/imgs/noData.png b/Mohem/src/assets/imgs/noData.png deleted file mode 100644 index a19748ca..00000000 Binary files a/Mohem/src/assets/imgs/noData.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/pending-transaction.png b/Mohem/src/assets/imgs/pending-transaction.png index d252ad43..15927f52 100644 Binary files a/Mohem/src/assets/imgs/pending-transaction.png and b/Mohem/src/assets/imgs/pending-transaction.png differ diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.png b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.png deleted file mode 100644 index b569617a..00000000 Binary files a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg new file mode 100644 index 00000000..4fc06bdd --- /dev/null +++ b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.png b/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.png deleted file mode 100644 index 413b18ab..00000000 Binary files a/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.svg b/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.svg new file mode 100644 index 00000000..3c2d2019 --- /dev/null +++ b/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/editingWhite.png b/Mohem/src/assets/imgs/profile-icons/editingWhite.png new file mode 100644 index 00000000..6adddb71 Binary files /dev/null and b/Mohem/src/assets/imgs/profile-icons/editingWhite.png differ diff --git a/Mohem/src/assets/imgs/profile-icons/family-g.svg b/Mohem/src/assets/imgs/profile-icons/family-g.svg index 553b6086..dc24ec27 100644 --- a/Mohem/src/assets/imgs/profile-icons/family-g.svg +++ b/Mohem/src/assets/imgs/profile-icons/family-g.svg @@ -1,6 +1,13 @@ - - - - + + + + + + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/family.svg b/Mohem/src/assets/imgs/profile-icons/family.svg index 7bc06a07..3572b704 100644 --- a/Mohem/src/assets/imgs/profile-icons/family.svg +++ b/Mohem/src/assets/imgs/profile-icons/family.svg @@ -1,6 +1,13 @@ - - - - + + + + + + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/info-a@2x.png b/Mohem/src/assets/imgs/profile-icons/info-a@2x.png deleted file mode 100644 index 79c470d6..00000000 Binary files a/Mohem/src/assets/imgs/profile-icons/info-a@2x.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg b/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg new file mode 100644 index 00000000..712dc65f --- /dev/null +++ b/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/info@2x.png b/Mohem/src/assets/imgs/profile-icons/info@2x.png deleted file mode 100644 index 30d0bede..00000000 Binary files a/Mohem/src/assets/imgs/profile-icons/info@2x.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile-icons/info@2x.svg b/Mohem/src/assets/imgs/profile-icons/info@2x.svg new file mode 100644 index 00000000..3500927c --- /dev/null +++ b/Mohem/src/assets/imgs/profile-icons/info@2x.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png deleted file mode 100644 index df4dce43..00000000 Binary files a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg new file mode 100644 index 00000000..22efb0ff --- /dev/null +++ b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/Mohem/src/assets/imgs/profile-icons/main-address@2x.png b/Mohem/src/assets/imgs/profile-icons/main-address@2x.png deleted file mode 100644 index 03c87f8a..00000000 Binary files a/Mohem/src/assets/imgs/profile-icons/main-address@2x.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile-icons/main-address@2x.svg b/Mohem/src/assets/imgs/profile-icons/main-address@2x.svg new file mode 100644 index 00000000..00c17845 --- /dev/null +++ b/Mohem/src/assets/imgs/profile-icons/main-address@2x.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/Mohem/src/assets/imgs/profile.png b/Mohem/src/assets/imgs/profile.png deleted file mode 100644 index 8413eaa4..00000000 Binary files a/Mohem/src/assets/imgs/profile.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/profile_icon.png b/Mohem/src/assets/imgs/profile_icon.png index 94a671d8..f8c864f0 100644 Binary files a/Mohem/src/assets/imgs/profile_icon.png and b/Mohem/src/assets/imgs/profile_icon.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 28957b14..3c5b1d00 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -249,6 +249,14 @@ } }, "general": { + "current": { + "en": "Current", + "ar": "تيار" + }, + "proposed": { + "en": "Proposed", + "ar": "مقترح" + }, "fav-showData": { "en": "Please select an alphabet to see your favourites", "ar": "الرجاء تحديد الأبجدية لرؤية المفضلة لديك" @@ -258,8 +266,8 @@ "ar": "لا توجد بيانات متاحة للمفضلة" }, "concurrent-report": { - "en": "Concurrent Report", - "ar": "تقرير متزامن" + "en": "Reports", + "ar": "تقرير" }, "update-contact": { "en": "Update contact information", @@ -290,8 +298,8 @@ "ar": "نهاية" }, "pending-transaction": { - "en": "Pending Transactions", - "ar": "المعاملات المعلقة" + "en": "Notices", + "ar": "إشعارات" }, "huawei-plugin-issue": { "en": "Error while initializing Huawei Location Plugin", @@ -415,7 +423,7 @@ }, "close": { "en": "Close", - "ar": "إغلق" + "ar": "إغلاق" }, "back": { "en": "Back", @@ -467,7 +475,7 @@ }, "send-copy": { "en": "Send Copy", - "ar": "أرسل نسخة" + "ar": "تقديم نسخة" }, "personal-info": { "en": "Personal Information", @@ -647,7 +655,7 @@ }, "submit": { "en": "Submit", - "ar": "أرسل" + "ar": "تقديم" }, "enter-sms-code": { "en": "Enter verification code", @@ -1085,13 +1093,37 @@ "en": "Basic Details", "ar": "المعلومات الاساسية" }, + "employee-qualifications": { + "en": "Employee Qualifications", + "ar": "مؤهلات الموظف" + }, "full-name": { "en": "Full Name", "ar": "الاسم كامل" }, + "establishment-name": { + "en": "Establishment Name", + "ar": "اسم المؤسسة" + }, + "qualification-grade": { + "en": "Grade", + "ar": "درجة" + }, + "qualification-grade-description": { + "en": "Grade Description", + "ar": "وصف الصف" + }, + "qualification-type": { + "en": "Type", + "ar": "يكتب" + }, + "qualification-status": { + "en": "Status", + "ar": "حالة" + }, "marital-status": { "en": "Marital Status", - "ar": "الاحالة الاجتماعية" + "ar": "الحالة الاجتماعية" }, "civil-identity-number": { "en": "Civil identity number", @@ -1191,6 +1223,10 @@ "en": "Leave Balance", "ar": "رصيد الإجازات" }, + "business-balance": { + "en": "Business Trip Balance", + "ar": "رصيد رحلة العمل" + }, "": { "en": "", "ar": "" @@ -1232,16 +1268,28 @@ "ar": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟" }, "monthly-attendance": { - "en": "Monthly Attendance", - "ar": "الحضور الشهري" + "ar":"التقويم", + "en": "Calendar" + }, + "absence-name": { + "ar":"إجازة", + "en": "Absence" + }, + "holiday-name": { + "ar":"انتداب", + "en": "Business Trip" + }, + "businesstrip-name": { + "ar":"إجازة رسمية", + "en": "Holiday" }, "monthly-time-sheet-view": { "en": "View your Profile Details", "ar": "عرض تفاصيل ملف التعريف الخاص بك" }, "view-detail": { - "en": "View Profile", - "ar": "عرض الصفحة الشخصية" + "en": "View Detail", + "ar": "عرض التفاصيل" }, "time-left": { "en": "Time Left Today", @@ -1352,16 +1400,16 @@ "ar": "الوصف" }, "MyHR-request": { - "en": "MY HR REQUEST", - "ar": "طلباتي" + "en": "Mowadhafhi Request", + "ar": "طلب Mowadhafhi" }, "createHR-Request": { - "en": "CREATE HR REQUEST", - "ar": "انشاء طلب" + "en": "Create Mowadhafhi Request", + "ar": "انشاء Mowadhafhi طلب" }, "HR-Request": { - "en": "HR Request", - "ar": "HR طلبات" + "en": "Mowadhafhi", + "ar": "Mowadhafhi" }, "performance-evaluation": { "en": "Performance Evaluation", @@ -1409,7 +1457,7 @@ }, "role": { "en": "Role", - "ar": "الدور الوظيفي" + "ar": "المسمى الوظيفي" }, "address": { "en": "Address", @@ -1521,7 +1569,7 @@ }, "contact-details": { "en": "Contact Details", - "ar": "بيانات المتصل" + "ar": "بيانات الهواتف" }, "family-members": { "en": "Family Members", @@ -1612,12 +1660,12 @@ "en": "Attendance" }, "monthly-attendance": { - "ar": "الحضور الشهري", - "en": "Monthly Attendance" + "ar": "التقويم يترك", + "en": "Leaves Calendar" }, "monthly-attendance-calendar": { - "ar": "سجل الحضور الشهري", - "en": "Monthly Attendance" + "ar": "التقويم يترك", + "en": "Leaves Calendar" }, "completed": { "ar": "منجز", @@ -1735,7 +1783,7 @@ }, "start-date": { "en": "Start Date", - "ar": "تاريخ البدء" + "ar": "تاريخ البداية" }, "end-date": { "en": "End Date", @@ -1943,6 +1991,10 @@ "en": "Ticket Balance", "ar": "رصيد التذاكر" }, + "my-request": { + "en": "My Requests", + "ar": "طلباتي" + }, "selectType": { "en": "Select Type", "ar": "اختر النوع" @@ -1995,6 +2047,34 @@ "en": "My Team", "ar": "فريقي" }, + "employee-hierarchy": { + "en": "Hierarchy", + "ar": "تَسَلسُل" + }, + "help": { + "en": "Help", + "ar": "يساعد" + }, + "dear": { + "en": "Dear", + "ar": "عزيزي" + }, + "contact-text": { + "en": "For assistance, you can submit the request on the Saeed system or call the unified call center on 8310200", + "ar": "للمساعدة يمكنك تقديم طلب على نظام ساعد أو الاتصال على مركز الاتصال الموحد 8310200" + }, + "search-email": { + "en": "Search By Email", + "ar": "البحث عن طريق البريد الإلكتروني" + }, + "search-name": { + "en": "Search By Name", + "ar": "البحث عن طريق الإسم" + }, + "search-username": { + "en": "Search By Username", + "ar": "البحث باسم المستخدم" + }, "total": { "en": "TOTAL", "ar": "عدد" @@ -2063,6 +2143,10 @@ } }, "eit": { + "required-text": { + "en": "Please fill the required fields!", + "ar": "يرجى تعبئة جميع الحقول المطلوبة!" + }, "done-text": { "en": "Done", "ar": "تم" @@ -2075,6 +2159,10 @@ "en": "My Requests", "ar": "طلباتي" }, + "my-reports": { + "en": "My Reports", + "ar": "تقاريري" + }, "added": { "en": "Added", "ar": "وأضاف" @@ -2104,8 +2192,16 @@ "ar": "فشل تحميل بعض الملفات المرفقة" }, "approval-message-success": { - "en": "Your request has been submitted for approvals.", - "ar": "تم إرسال طلبك للحصول على الموافقات." + "en": "Your request has been submitted successfully!", + "ar": "تم تقديم الطلب بنجاح" + }, + "basic-approval-message-success": { + "en": "Your request has been submitted successfully!", + "ar": "تم تقديم الطلب بنجاح" + }, + "contact-approval-message-success": { + "en": "Your request has been submitted successfully!", + "ar": "تم تقديم الطلب بنجاح" }, "delete-perm": { "en": "Are you sure from deleting this file permanently?", @@ -2443,9 +2539,109 @@ } }, "worklist": { - "loading":{ - "en":"Loading", - "ar":"يتم التحميل" + "competencies": { + "en": "Competencies", + "ar": "الكفاءات" + }, + "information": { + "en": "Information", + "ar": "معلومات" + }, + "competenciesRating": { + "en": "Competencies Rating", + "ar": "الجدارات" + }, + "appraisedPerformance": { + "en": "Appraisal Performance", + "ar": "أداء التقييم" + }, + "competencyName": { + "en": "Competency Name", + "ar": "الجدارة" + }, + "targetValue": { + "en": "Target Value", + "ar": "القيمة المستهدف تحققيقها" + }, + "objectiveRating": { + "en": "Objective Rating", + "ar": "الأهداف" + }, + "overallRating": { + "en": "Overall Rating", + "ar": "التقييم العام و الملاحظات" + }, + "overalLPerformanceID": { + "en": "Overall Performance ID", + "ar": "رقم الأداء العام" + }, + "objectiveName": { + "en": "Objective Name", + "ar": "اسم الهدف" + }, + "enrollmentDetails": { + "en": "Enrollment Details", + "ar": "تفاصيل التسجيل" + }, + "courseName": { + "en": "Course Name", + "ar": "اسم البرنامج التدريبي" + }, + "className": { + "en": "Class Name", + "ar": "اسم الفصل الدراسي" + }, + "timeZone": { + "en": "Timezone", + "ar": "منطقة التوقيت" + }, + "trainingCenter": { + "en": "Training Center", + "ar": "مركز التدريب" + }, + "enrollmentJustification": { + "en": "Enrollment Justification", + "ar": "تبرير التسجيل" + }, + "deliveryMode": { + "en": "Delivery Mode", + "ar": "طريقة التقديم" + }, + "language": { + "en": "Language", + "ar": "اللغة" + }, + "Note": { + "en": "Note", + "ar": "ملاحظات" + }, + "actualVALUE": { + "en": "Actual Value", + "ar": "القيمة المحققة" + }, + "weightingPercent": { + "en": "Weighting Percentage", + "ar": "الوزن النسبي" + }, + "appraisedPerformanceDesc": { + "en": "Appraisal Performance Description", + "ar": "وصف تقييم الأداء" + }, + "rateName": { + "en": "Rate Name", + "ar": "اسم التقييم" + }, + "comments": { + "en": "Comments", + "ar": "تعليقات" + }, + "startDate": { + "en": "Start Date", + "ar": "تاريخ البداية" + }, + "endDate": { + "en": "End Date", + "ar": "تاريخ الانتهاء" }, "view": { "en": "View", @@ -2601,7 +2797,7 @@ }, "template-name": { "en": "Template Name", - "ar": "اسم القالب" + "ar": "اسم التقرير" }, "item-creation-status": { "en": "Item Creation Status", @@ -3464,12 +3660,12 @@ "ar": "وقت العمل لم ينتهي بعد" }, "shift-time": { - "en": "Shift Time", - "ar": "وقت المناوبة " + "en": "Leave Details", + "ar": "تفاصيل الإجازة" }, "shift-type": { - "en": "Shift Type", - "ar": "نوع المناوبة" + "en": "Attendance Type", + "ar": "نوع الحضور" } }, "sms": { @@ -3534,7 +3730,7 @@ "ar": "نوع الطلب" }, "request-generated": { - "en": "Your Request for resport has been sent to the server, click below link to check status", + "en": "Your Request for report has been sent to the server, click below link to check status", "ar": "تم إرسال طلبك عن التقرير إلى الخادم، انقر فوق الرابط أدناه للتحقق من الحالة" }, "check-status": { @@ -3554,8 +3750,8 @@ "ar": "طلب معرف" }, "output": { - "en": "Output", - "ar": "انتاج" + "en": "Download", + "ar": "تحميل" } } } \ No newline at end of file diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 465f3bfc..67125b05 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1,187 +1,283 @@ +body { + ion-app[lang="en"] { + font-family: var(--fontFamilyBoldEN) !important; + } -// $font-family-base: "WorkSans-Regular" !default; -body{ - :root[dir="rtl"]{ - font-family: var(--fontFamilyIOSAR) !important; - } - :root[dir="ltr"]{ - font-family: var(--fontFamilyMediumEN) !important; + ion-app[lang="ar"] { + font-family: var(--fontFamilyIOSAR) !important; + line-height: 1.3; } - } - input, textarea, p ,label,div{ - font-size: 16px; - :root[dir="rtl"]{ - font-family: var(--fontFamilyIOSAR) !important; - } - :root[dir="ltr"]{ - font-family: var(--fontFamilyLightEN) !important; + +} + +ion-app[lang="en"] { + + input, + textarea, + p, + label, + div, + h1, + h2, + h3, + button, + ion-button, + ion-title, + span { + font-size: 16px; + font-family: var(--fontFamilyBoldEN) !important; } - } - h1, h2,h3, button { - :root[dir="rtl"]{ - font-family: var(--fontFamilyIOSAR) !important; +} + +ion-app[lang="ar"] { + + + p, + label, + div, + h1, + h2, + h3, + button, + ion-button, + ion-title, + span { + font-family: var(--fontFamilyIOSAR) !important; + line-height: 1.3; } - :root[dir="ltr"]{ - font-family: var(--fontFamilyMediumEN) !important; } - - } - .header-toolbar { +.header-toolbar { --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); - } +} -ion-label{ - color:var(--labelColor) !important; +ion-app[lang="en"] { + + .boldTxt, + p.boldTxt, + .boldTxt>label { + + font-family: var(--fontFamilyBoldEN) !important; + } } -.tipsPadding{ +ion-app[lang="ar"] { + + .boldTxt, + p.boldTxt, + .boldTxt>label { + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + line-height: 1.3; + } +} + +ion-app[lang="en"] { + + ion-label.boldTxtNav.label.label-md, + ion-label.boldTxtNav.label.label-ios, + ion-label { + // font-weight: bold; + color: var(--dark); + + + font-family: var(--fontFamilyBoldEN) !important; + } +} + +ion-app[lang="ar"] { + + ion-label.boldTxtNav.label.label-md, + ion-label.boldTxtNav.label.label-ios, + ion-label { + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + line-height: 1.3; + } + +} + +ion-label { + color: var(--labelColor) !important; +} + +.tipsPadding { padding: 0px 10px; } -.profileDiv{ + +.profileDiv { margin: 5px auto !important; } -.profileDiv-ar{ + +.profileDiv-ar { margin: 16px auto !important; } -.full-modal{ - --height:100%; - --width:100%; + +.full-modal { + --height: 100%; + --width: 100%; } -.profileImg{ + +.profileImg { width: 160px; height: 160px; display: inline-flex; overflow: hidden; background: transparent; - -webkit-border-radius:50% !important; - -moz-border-radius:50% !important; + -webkit-border-radius: 50% !important; + -moz-border-radius: 50% !important; border-radius: 20% !important; position: relative; top: 7px; - // margin:0 auto 40px; - img{ - -webkit-border-radius:50% !important; - -moz-border-radius:50% !important; + + // margin:0 auto 40px; + img { + -webkit-border-radius: 50% !important; + -moz-border-radius: 50% !important; border-radius: 50% !important; width: 90px; height: 90px; } + //box-shadow: 0px 0px 0px 10px #8c8c8c; } -.loading-gif{ + +.loading-gif { background: transparent !important; - width:100px; - height: 100px; + width: 100px; + height: 120px; } -#custom-progress-loader .container{ + +#custom-progress-loader .container { background: transparent !important; box-shadow: none; - -webkit-box-shadow:none; + -webkit-box-shadow: none; -moz-box-shadow: none; width: 150px; } /***********change header color***************/ -.headerBtn{ +.headerBtn { background-color: transparent; } -.headerImg{ + +.headerImg { width: 36px; } -.header-toolbar{ + +.header-toolbar { --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); } -.btnBack{ + +.btnBack { background: transparent !important; } /***************/ -.attachImg{ +.attachImg { max-width: 30px; width: 30px; } + img.attachImg { max-width: 30px; width: 30px; } -.attachImgBtn{ + +.attachImgBtn { background-color: transparent; } -.toolbar-title,.toolbar-title-md,.toolbar-title-ios{ - color:(--light); + +.toolbar-title, +.toolbar-title-md, +.toolbar-title-ios { + color: (--light); font-size: 18px; } + ion-header ion-icon.back-button-icon.icon { color: (--light); font-size: 25px; } -ion-header ion-icon.icon.icon-ios.ion-ios-back{ + +ion-header ion-icon.icon.icon-ios.ion-ios-back { font-size: 25px; } + ion-header ion-icon.icon.icon-md.ion-md-back, ion-header ion-icon.icon.icon-md.ion-md-search, -ion-header ion-icon.icon.icon-ios.ion-ios-search{ +ion-header ion-icon.icon.icon-ios.ion-ios-search { color: (--light); font-size: 18px; } -button.disable-hover.item-button.button.button-md.button-clear.button-clear-md , -button.disable-hover.item-button.button.button-ios.button-clear.button-clear-ios{ +button.disable-hover.item-button.button.button-md.button-clear.button-clear-md, +button.disable-hover.item-button.button.button-ios.button-clear.button-clear-ios { background: transparent; font-size: 16px; - color:(--darkgray); + color: (--darkgray); } + button.item-button.button.button-md.button-clear.button-clear-md, button.item-button.button.button-ios.button-clear.button-clear-ios { background: transparent; font-size: 16px; - color:(--darkgray); + color: (--darkgray); } + ion-header ion-icon.icon.icon-md.ion-md-close, -ion-header ion-icon.icon.icon-ios.ion-ios-close{ +ion-header ion-icon.icon.icon-ios.ion-ios-close { color: (--light); } + ion-header ion-icon.icon.icon-md.ion-md-add, -ion-header ion-icon.icon.icon-ios.ion-ios-add{ +ion-header ion-icon.icon.icon-ios.ion-ios-add { color: (--light); } - ion-icon.icon.icon-md.ion-md-search, - ion-icon.icon.icon-ios.ion-ios-search{ + +ion-icon.icon.icon-md.ion-md-search, +ion-icon.icon.icon-ios.ion-ios-search { color: (--darkgray); } + .toolbar-background { - background: var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='var(--primary)', endColorstr='--var(customnavy)',GradientType=1 ); + background: var(--primary); + background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='var(--primary)', endColorstr='--var(customnavy)', GradientType=1); } + /***************button bckground***************/ -a{ - color:var(--primary); -} -.button,.button-md, button-ios{ - background:var(--customnavy); - white-space: normal; -// background: $primary; -// background: -moz-linear-gradient(45deg, $primary 0%, $secondary 36%, $secondary 59%, $customnavy 100%); -// background: -webkit-linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); -// background: linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); -// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary', endColorstr='$customnavy',GradientType=1 ); -color:var(--light); -text-transform: capitalize; -// min-width: 200px; -min-height: 45px; -} -.iconButton{ +a { + color: var(--primary); +} + +.button, +.button-md, +button-ios { + background: var(--customnavy); + white-space: normal; + // background: $primary; + // background: -moz-linear-gradient(45deg, $primary 0%, $secondary 36%, $secondary 59%, $customnavy 100%); + // background: -webkit-linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); + // background: linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); + // filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary', endColorstr='$customnavy',GradientType=1 ); + color: var(--light); + text-transform: capitalize; + // min-width: 200px; + min-height: 45px; +} + +.iconButton { min-width: auto; min-height: auto; } + /*********select style************/ ion-item.item.item-block.item-md.item-select.ng-touched, ion-item.item.item-block.item-ios.item-select.ng-touched, @@ -196,96 +292,125 @@ ion-item.item.item-block.item-md.item-datetime.ng-touched.input-has-value.item-i ion-item.item.item-block.item-ios.item-datetime.ng-touched.input-has-value.item-input-has-value { border-bottom: 0px; } + /********center element****************/ -.centerDiv{ - margin:auto; +.centerDiv { + margin: auto; text-align: center; display: block; + // .button,.button-md, button-ios{ // min-width: 200px; // } - .iconButton{ + .iconButton { min-width: auto; min-height: auto; } } + /***********item icon************/ - .item-icon{ - width:25px; - height:25px; +.item-icon { + width: 25px; + height: 25px; } -[dir="ltr"] .item-icon{ + +[dir="ltr"] .item-icon { margin: 9px 8px 9px 0; } -[dir="rtl"] .item-icon{ + +[dir="rtl"] .item-icon { margin: 6px 0px 9px 9px; } + /**********text format**********/ -p.text-caps{ +p.text-caps { text-transform: uppercase; } -.boldTxt,p.boldTxt,.boldTxt>label { - :root[dir="ltr"]{ + +.boldTxt, +p.boldTxt, +.boldTxt>label { + :root[dir="ltr"] { font-family: var(--fontFamilyBoldEN) !important; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { font-family: var(--fontFamilyIOSAR) !important; font-weight: bold; } } -.boldTxtNav,p.boldTxtNav,.boldTxtNav>label { + +.boldTxtNav, +p.boldTxtNav, +.boldTxtNav>label { color: var(--dark) !important; - :root[dir="ltr"]{ + + :root[dir="ltr"] { font-family: var(--fontFamilyBoldEN) !important; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { font-family: var(--fontFamilyIOSAR) !important; font-weight: bold; } } -ion-label.boldTxtNav.label.label-md,ion-label.boldTxtNav.label.label-ios{ + +ion-label.boldTxtNav.label.label-md, +ion-label.boldTxtNav.label.label-ios { // font-weight: bold; - color:var(--dark); - :root[dir="ltr"]{ + color: var(--dark); + + :root[dir="ltr"] { font-family: var(--fontFamilySemiBoldEN) !important; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { font-family: var(--fontFamilyIOSAR) !important; font-weight: bold; } - + } + /******* label stacked***********/ -.label-md[stacked], .label-ios[stacked] { -font-size: 16px; +.label-md[stacked], +.label-ios[stacked] { + font-size: 16px; } + /**********input **************/ input.text-input.text-input-md, -input.text-input.text-input-ios{ +input.text-input.text-input-ios { font-size: 16px; - :root[dir="ltr"]{ - text-align: left; - } - :root[dir="rtl"]{ - text-align: right; - } + + :root[dir="ltr"] { + text-align: left; + } + + :root[dir="rtl"] { + text-align: right; + } } + ion-datetime.datetime.datetime-md.ng-valid.ng-dirty.ng-touched, ion-datetime.datetime.datetime-ios.ng-valid.ng-dirty.ng-touched { direction: ltr !important; text-align: left !important; } + /**********background************/ -.gray-bg{ - background-color:var(--gray); +.gray-bg { + background-color: var(--gray); margin-top: 10px; } + /***************select and alert ************/ -.alert-md .alert-head,.alert-ios .alert-head{ - background-color:var(--grayBG); +.alert-md .alert-head, +.alert-ios .alert-head { + background-color: var(--grayBG); color: var(--light); } + /********profile grid************/ // .profile-grid{ // .col{ @@ -293,23 +418,25 @@ ion-datetime.datetime.datetime-ios.ng-valid.ng-dirty.ng-touched { // } // } /**********card**********/ -ion-card ,ion-card-md ,ion-card-ios { +ion-card, +ion-card-md, +ion-card-ios { box-shadow: black; - // background-color: #99999938; - -webkit-border-top-left-radius: 10px !important; - -webkit-border-top-right-radius: 10px !important; - -moz-border-radius-topleft: 10px !important; - -moz-border-radius-topright: 10px !important; - border-top-left-radius: 10px !important; - border-top-right-radius: 10px !important; - + // background-color: #99999938; + -webkit-border-top-left-radius: 10px !important; + -webkit-border-top-right-radius: 10px !important; + -moz-border-radius-topleft: 10px !important; + -moz-border-radius-topright: 10px !important; + border-top-left-radius: 10px !important; + border-top-right-radius: 10px !important; + } ion-card-content { background-color: white; } -ion-card-header{ +ion-card-header { padding: 0px 10px !important; color: var(--light) !important; -webkit-border-top-left-radius: 10px; @@ -319,47 +446,59 @@ ion-card-header{ border-top-left-radius: 10px; border-top-right-radius: 10px; background: var(--grayBG); - .hrTitle{ + + .hrTitle { white-space: normal; padding: 5px; padding-top: 12px; - width:85%; + width: 85%; min-height: 45px; + @media screen and (max-width: var(--break-big)) { width: 80%; - } + } + @media screen and (max-width: var(--break-small)) { width: 74%; - } - - :root[dir="ltr"]{ - float:left; } - :root[dir="rtl"]{ - float:right; + + :root[dir="ltr"] { + float: left; + } + + :root[dir="rtl"] { + float: right; } + line-height: 1.2; } - .button,.button-md, button-ios{ + + .button, + .button-md, + button-ios { background: transparent; box-shadow: none; - -webkit-box-shadow:none; + -webkit-box-shadow: none; -moz-box-shadow: none; min-width: auto; padding: 0px !important; - margin:0px 5px !important; - :root[dir="ltr"]{ - float:right; + margin: 0px 5px !important; + + :root[dir="ltr"] { + float: right; } - :root[dir="rtl"]{ - float:left; + + :root[dir="rtl"] { + float: left; } } } -ion-col.colBold,ion-col.colBold>label{ + +ion-col.colBold, +ion-col.colBold>label { // font-weight: bold; - color:var(--customnavy); - font-weight:bold; + color: var(--customnavy); + font-weight: bold; // :root[dir="ltr"]{ // font-family: var(--fontFamilyBoldEN) !important; @@ -368,8 +507,9 @@ ion-col.colBold,ion-col.colBold>label{ // font-family: var(--fontFamilyIOSAR) !important; // font-weight: bold; // } - font-size: 15px; + font-size: 15px; } + // .boldTxt{ // font-weight: bold; // } @@ -402,7 +542,7 @@ ion-col.colBold,ion-col.colBold>label{ .floating-form { - width:320px; + width: 320px; } // /**** floating-Lable style start ****/ @@ -545,14 +685,18 @@ ion-col.colBold,ion-col.colBold>label{ /*****************dynamic form*******************/ -.dynamicField{ +.dynamicField { border-radius: 30px; - border: 1px solid #a2a5a6!important; + border: 1px solid #a2a5a6 !important; margin-bottom: 20px; } - -.daynamicForm-Label{ +.ion-item-position { + position: relative; +} + + +.daynamicForm-Label { font-size: 16px; // margin-left: 15px; color: #a2a5a6 !important; @@ -570,18 +714,20 @@ ion-col.colBold,ion-col.colBold>label{ padding: 5px 0px; padding-left: 10px !important; margin: 10px auto; - :root[dir="ltr"]{ + + :root[dir="ltr"] { font-family: var(--fontFamilySemiBoldEN) !important; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { font-family: var(--fontFamilyIOSAR) !important; font-weight: bold; } } - -.ardaynamicForm-Label{ + +.ardaynamicForm-Label { font-size: 16px; // margin-left: 15px; color: #a2a5a6 !important; @@ -600,56 +746,58 @@ ion-col.colBold,ion-col.colBold>label{ padding-left: 10px !important; margin: 10px auto; margin-right: 12px !important; - :root[dir="ltr"]{ + + :root[dir="ltr"] { font-family: var(--fontFamilySemiBoldEN) !important; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { font-family: var(--fontFamilyIOSAR) !important; font-weight: bold; } } -img.flipImg{ - :root[dir="rtl"]{ - -webkit-transform: scaleX(-1); - transform: scaleX(-1); +img.flipImg { + :root[dir="rtl"] { + -webkit-transform: scaleX(-1); + transform: scaleX(-1); } - } +} -.daynamicForm-Input{ +.daynamicForm-Input { width: 100%; border: none; border-bottom: var(--gray) solid 1px; border-radius: 0px; // margin-left: 10px; // text-align: right; - color: var(--dark); + color: var(--dark); font-size: 15px; padding: 6px 0px; } -.daynamicForm-Button{ - background:var(--customnavy); +.daynamicForm-Button { + background: var(--customnavy); white-space: normal; - // background: $primary; - // background: -moz-linear-gradient(45deg, $primary 0%, $secondary 36%, $secondary 59%, $customnavy 100%); - // background: -webkit-linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); - // background: linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); - // filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary', endColorstr='$customnavy',GradientType=1 ); - color:var(--light); - text-transform: capitalize; - min-width: 200px; - min-height: 45px; - - + // background: $primary; + // background: -moz-linear-gradient(45deg, $primary 0%, $secondary 36%, $secondary 59%, $customnavy 100%); + // background: -webkit-linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); + // background: linear-gradient(45deg, $primary 0%,$secondary 36%,$secondary 59%,$customnavy 100%); + // filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary', endColorstr='$customnavy',GradientType=1 ); + color: var(--light); + text-transform: capitalize; + min-width: 200px; + min-height: 45px; + + font-weight: 500; - + border: none; border-radius: 2px; - -ms-flex: 1; + -ms-flex: 1; flex: 1; font-size: 14px; padding: 0 1.1em; @@ -657,12 +805,13 @@ img.flipImg{ justify-content: center; } -.custom-button-element{ +.custom-button-element { //margin-top: 10px; margin: 10px auto; text-align: center; } -.daynamicForm-DateTime{ + +.daynamicForm-DateTime { color: var(--dark); font-size: 15px; border: none; @@ -678,11 +827,12 @@ img.flipImg{ -moz-appearance: none; text-indent: 1px; box-shadow: none; - -webkit-box-shadow:none; + -webkit-box-shadow: none; -moz-box-shadow: none; margin-bottom: 8px; } -.daynamicForm-DateTime:after{ + +.daynamicForm-DateTime:after { width: 0; height: 0; border-left: 6px solid transparent; @@ -691,18 +841,22 @@ img.flipImg{ border-radius: 0px; position: absolute; top: 40%; - :root[dir="ltr"]{ - right: 5px; + + :root[dir="ltr"] { + right: 5px; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { left: 5px; - } + } + content: ""; z-index: 98; margin-left: 31px; - + } -.daynamicForm-Select{ + +.daynamicForm-Select { color: var(--dark); font-size: 15px; // background: url(http://i62.tinypic.com/15xvbd5.png) no-repeat 96% 0; @@ -727,30 +881,31 @@ img.flipImg{ text-indent: 1px; // text-overflow: ''; box-shadow: none; - -webkit-box-shadow:none; + -webkit-box-shadow: none; -moz-box-shadow: none; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - :root[dir="ltr"]{ - background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); - background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; - background-size: 6px 6px, 6px 6px, 2.9em 2.9em; - background-repeat: no-repeat; - padding-right: 20px; + :root[dir="ltr"] { + background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); + background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; + background-size: 6px 6px, 6px 6px, 2.9em 2.9em; + background-repeat: no-repeat; + padding-right: 20px; } - :root[dir="rtl"]{ - background-image: linear-gradient(-135deg, #999 50%, transparent 50%),linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); + + :root[dir="rtl"] { + background-image: linear-gradient(-135deg, #999 50%, transparent 50%), linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%; background-size: 6px 6px, 6px 6px, 2.9em 2.9em; background-repeat: no-repeat; padding-left: 20px; - } + } } -.ardaynamicForm-Select{ +.ardaynamicForm-Select { color: var(--dark); font-size: 15px; // background: url(http://i62.tinypic.com/15xvbd5.png) no-repeat 96% 0; @@ -774,30 +929,31 @@ img.flipImg{ text-indent: 1px; // text-overflow: ''; box-shadow: none; - -webkit-box-shadow:none; + -webkit-box-shadow: none; -moz-box-shadow: none; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - :root[dir="ltr"]{ - background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); - background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; - background-size: 6px 6px, 6px 6px, 2.9em 2.9em; - background-repeat: no-repeat; - padding-right: 20px; + :root[dir="ltr"] { + background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); + background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; + background-size: 6px 6px, 6px 6px, 2.9em 2.9em; + background-repeat: no-repeat; + padding-right: 20px; } - :root[dir="rtl"]{ - background-image: linear-gradient(-135deg, #999 50%, transparent 50%),linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); + + :root[dir="rtl"] { + background-image: linear-gradient(-135deg, #999 50%, transparent 50%), linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%; background-size: 6px 6px, 6px 6px, 2.9em 2.9em; background-repeat: no-repeat; padding-left: 20px; - } + } } -.daynamicForm-Select:after{ +.daynamicForm-Select:after { width: 0; height: 0; border-radius: 0px; @@ -806,61 +962,74 @@ img.flipImg{ border-top: 6px solid #999; position: absolute; top: 40%; - :root[dir="ltr"]{ - right: 5px; + + :root[dir="ltr"] { + right: 5px; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { left: 5px; - } - + } + z-index: 98; - + } -.requiredClass::before{ - content:"* "; + +.requiredClass::before { + content: "* "; } -.requiredClassElm{ - border-bottom:2px solid var(--danger); + +.requiredClassElm { + border-bottom: 2px solid var(--danger); } -textarea:disabled, input:disabled ,.daynamicForm-Select:disabled, .daynamicForm-DateTime:disabled{ +textarea:disabled, +input:disabled, +.daynamicForm-Select:disabled, +.daynamicForm-DateTime:disabled { background: rgba(204, 204, 204, 0.11); } -div.daynamicForm-DateTime.disabled{ - background: rgba(204, 204, 204, 0.11); + +div.daynamicForm-DateTime.disabled { + background: rgba(204, 204, 204, 0.11); } -.iconButton{ +.iconButton { background: transparent; - -webkit-box-shadow:none; --moz-box-shadow: none; -box-shadow: none; -} -.imgSize{ -width: 22px !important; -height: 22px; --webkit-box-shadow:none; --moz-box-shadow: none; -box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } + +.imgSize { + width: 22px !important; + height: 22px; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + /************footer****************/ ion-footer { -padding:15px 0px; -background-color: var(--light) !important; -border: 0px !important; -box-shadow: none !important; --webkit-box-shadow:none; --moz-box-shadow: none; -} -.footer-md::before,.footer-ios::before{ + padding: 15px 0px; + background-color: var(--light) !important; + border: 0px !important; + box-shadow: none !important; + -webkit-box-shadow: none; + -moz-box-shadow: none; +} + +.footer-md::before, +.footer-ios::before { background-color: var(--light) !important; - background-image:none; + background-image: none; border: 0px !important; box-shadow: none !important; - -webkit-box-shadow:none; --moz-box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; } + /*************progress bar****************/ .progcontainer { margin: auto; @@ -868,31 +1037,39 @@ box-shadow: none !important; width: 100%; min-height: 100px; } + .cusprogressbar { counter-reset: step; padding: 0px; } + .cusprogressbar li { list-style-type: none; width: 33.333%; - :root[dir="ltr"]{ + + :root[dir="ltr"] { float: left; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { float: right; } + font-size: 12px; position: relative; text-align: center; color: var(--darkgray); - :root[dir="ltr"]{ - font-family:var(--fontFamilySemiBoldEN); + + :root[dir="ltr"] { + font-family: var(--fontFamilySemiBoldEN); } - :root[dir="rtl"]{ + + :root[dir="rtl"] { font-family: var(--fontFamilyIOSAR); font-weight: bold; } } + .cusprogressbar li:before { width: 40px; height: 40px; @@ -907,6 +1084,7 @@ box-shadow: none !important; margin: 0 auto 10px auto; border-radius: 50%; } + .cusprogressbar li:after { width: 100%; height: 2px; @@ -914,30 +1092,37 @@ box-shadow: none !important; position: absolute; background-color: var(--cusgray); top: 20px; - :root[dir="ltr"]{ + + :root[dir="ltr"] { left: -50%; } - :root[dir="rtl"]{ + + :root[dir="rtl"] { right: -50%; } - + z-index: -1; } + .cusprogressbar li:first-child:after { content: none; } + .cusprogressbar li.active { color: var(--custgreen); } + .cusprogressbar li.active:before { background-color: var(--custgreen); } + //.cusprogressbar li.active + li:after { - // background-color: #55b776; - //color: $custgreen; +// background-color: #55b776; +//color: $custgreen; //} /**************badge **********************/ -.badge-md,.badge-ios { +.badge-md, +.badge-ios { color: #fff; background-color: #327eff; background: red; @@ -946,37 +1131,46 @@ box-shadow: none !important; min-height: 30px; line-height: 2; } + /**********no data div***********/ -div.no-dataDiv{ -.row { - border-bottom: 1px solid; - border-color:var(--cusgray); - } -h4 { -font-size: 140%; -text-align: center; -color: #888888; +div.no-dataDiv { + .row { + border-bottom: 1px solid; + border-color: var(--cusgray); + } -} -.empty-data { - font-size: 10.2em; - display: block; - margin: .2em auto 0; - color: var(--custgreen); - } + h4 { + font-size: 140%; + text-align: center; + color: #888888; + + } + + .empty-data { + font-size: 10.2em; + display: block; + margin: .2em auto 0; + color: var(--custgreen); + } } -.toast-md .toast-message,.toast-ios .toast-message { +.toast-md .toast-message, +.toast-ios .toast-message { background-color: var(--secondary); } + /*************picker style*********************/ - .picker-md .picker-opt,.picker-ios .picker-opt{ - font-size: 18px; - } - .picker-md .picker-col,.picker-ios .picker-col { - padding: 0px 2px !important; +.picker-md .picker-opt, +.picker-ios .picker-opt { + font-size: 18px; +} + +.picker-md .picker-col, +.picker-ios .picker-col { + padding: 0px 2px !important; } -.progress-loading-page{ + +.progress-loading-page { position: fixed; height: 100%; z-index: 1000000; @@ -988,6 +1182,7 @@ color: #888888; bottom: 0; display: flex; } + .progress-loading-page .container { background: transparent !important; box-shadow: none; @@ -995,14 +1190,18 @@ color: #888888; -moz-box-shadow: none; width: 100px !important; margin: auto; - + } + .progress-loading-page .loading-gif { margin-top: 0.42cm; - width:100%; - + width: 100%; + +} + +.centerDiv .button { + width: 200px; } -.centerDiv .button{width:200px;} .note-modal { // width: 90%; @@ -1018,16 +1217,16 @@ color: #888888; --height: 12cm !important; // --width: 80% !important; --border-radius: 0.4cm; - + } .replaceRoll-modal { - + padding: 30% 1% !important; --height: 15cm !important; --width: 100% !important; --border-radius: 0.4cm; - + } .slides-gray-bullets { @@ -1041,26 +1240,26 @@ color: #888888; .slides-gray-bullets .swiper-pagination { top: 0.2cm !important; - + } -.swiper-container-horizontal>.swiper-pagination-bullets { - width: initial; - top: 34%; - right: 0; - bottom: inherit; +.swiper-container-horizontal>.swiper-pagination-bullets { + width: initial; + top: 34%; + right: 0; + bottom: inherit; // left: inherit; } -.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet { - margin: 5px; +.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet { + margin: 5px; width: 12px; height: 12px; } // .skipbutton,.button-md, button-ios{ -.skipbutton{ +.skipbutton { width: 100px; --background: var(--orange); white-space: normal; @@ -1071,47 +1270,53 @@ color: #888888; float: right; border-top-left-radius: 7px; border-top-right-radius: 7px; - + --background-focused: none; --background-hover: none; - } - - .cancelBtn { - background:var(--darkblue) !important; - white-space: normal !important; - color:var(--light) !important; - text-transform: capitalize !important; - // min-width: 200px; - min-height: 45px !important; - border-radius: 5px !important; - width:125px !important; +} + +.cancelBtn { + background: var(--darkblue) !important; + white-space: normal !important; + color: var(--light) !important; + text-transform: capitalize !important; + // min-width: 200px; + min-height: 45px !important; + border-radius: 5px !important; + --border-radius: 5px !important; + width: 125px !important; min-width: 5px !important; width: 10px !important; margin: 8px !important; - --background:transparent; + --background: transparent; + --box-shadow: none; + +} - } .confirmBtn { - background:var(--newgreen) !important; - white-space: normal !important; - color:var(--light) !important; - text-transform: capitalize !important; - // min-width: 200px; - min-height: 45px !important; - border-radius: 5px !important; - width:125px !important; + background: var(--newgreen) !important; + white-space: normal !important; + color: var(--light) !important; + text-transform: capitalize !important; + // min-width: 200px; + min-height: 45px !important; + border-radius: 5px !important; + --border-radius: 5px !important; + width: 125px !important; min-width: 5px !important; width: 10px !important; margin: 8px !important; - --background:transparent; - } + --background: transparent; + --box-shadow: none; +} -.checkOutOkBtn{ - margin-left: 50px !important; - margin-right: 55px !important; +.checkOutOkBtn { + margin-left: 50px !important; + margin-right: 55px !important; margin-top: 10px !important; - margin-bottom: 10px !important; + margin-bottom: 10px !important; border-radius: 5px !important; + --border-radius: 5px !important; height: 40px !important; min-height: 40px !important; background: var(--lightblue) !important; @@ -1123,15 +1328,16 @@ color: #888888; border: none !important; width: 80%; --background: var(--lightblue) !important; - + --box-shadow: none; } -.checkOutCancelBtn{ - margin-left: 50px !important; - margin-right: 55px !important; - margin-top: 10px !important; - margin-bottom: 10px !important; +.checkOutCancelBtn { + margin-left: 50px !important; + margin-right: 55px !important; + margin-top: 10px !important; + margin-bottom: 10px !important; border-radius: 5px !important; + --border-radius: 5px !important; height: 40px !important; min-height: 40px !important; background: var(--darkblue) !important; @@ -1143,9 +1349,10 @@ color: #888888; border: none !important; width: 80%; --background: var(--darkblue) !important; + --box-shadow: none; } - .buttonClassWhite { +.buttonClassWhite { border-radius: 10px !important; width: 95% !important; height: 3.7cm !important; @@ -1170,9 +1377,9 @@ color: #888888; } .logo { -max-width:150%; -width:150%; -border:0px + max-width: 150%; + width: 150%; + border: 0px } .logoHeader { @@ -1180,7 +1387,8 @@ border:0px width: 130%; border: 0px; } -.headerTxt{ + +.headerTxt { font-size: 20px; font-weight: bold; } @@ -1189,21 +1397,22 @@ border:0px .login-input { border: none; } -.item-input-login{ + +.item-input-login { --min-height: 1.0cm !important; --border-radius: 12px; --ion-color-base: white !important; // --background: color: var(--darkgray) !important; // background: #7f8c8d !important; - border-radius: 33px; - --border: solid #9999992b !important; - border: solid #9999992b !important; - margin-bottom :12px; - margin-left: 12px; - margin-right: 12px; + border-radius: 33px; + --border: solid #9999992b !important; + border: solid #9999992b !important; + margin-bottom: 12px; + margin-left: 12px; + margin-right: 12px; } -.button-login{ +.button-login { --background: var(--newgreen) !important; background: var(--newgreen) !important; @@ -1221,7 +1430,7 @@ border:0px .active-Segment { border-radius: 25px !important; // font-size: 0.3cm !important; - background: var(--newgreen) !important; + background: #004C70 !important; color: var(--light) !important; font-weight: bold !important; text-transform: none; @@ -1249,6 +1458,8 @@ border:0px border-radius: 25px !important; border: 1px solid #cccccc; margin-top: 10px; + width: 98%; + margin: 10px 0; } @@ -1260,7 +1471,7 @@ border:0px padding: 30% 10% !important; --height: 12cm !important; --border-radius: 0.4cm; - + } // .swiper-container-horizontal>.swiper-pagination-bullets, .swiper-pagination-custom, .swiper-pagination-fraction { @@ -1280,13 +1491,16 @@ border:0px --width: 88% !important; --border-radius: 0.6cm; } + .slideFullWidth { - margin-left:-15px; - margin-right:-15px; + margin-left: -10px; + margin-right: -1-px; } + .slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child { - margin-left:15px; + margin-left: 15px; } + .alert-button-group.sc-ion-alert-md, .alert-button.sc-ion-alert-ios { text-align: center; @@ -1306,43 +1520,50 @@ border:0px .alert-button-inner.sc-ion-alert-md { justify-content: center !important; } + .replaceRoll-modal { - + padding: 30% 1% !important; --height: 15cm !important; --width: 100% !important; --border-radius: 0.4cm; - + } + .replaceRoll-modal2 { - + padding: 5% 1% !important; --height: 100% !important; --width: 100% !important; --border-radius: 0.4cm; - + } + .header-md:after { height: 0px !important; display: none !important; } + .attendance-home .header-toolbar-new { - --background: #6d6e71 !important; + --background: #094773 !important; } + .header-toolbar-new { --background: #29B5BF; } -.boldText{ +.boldText { color: var(--dark) !important; font-weight: bold; font-size: 20px; } -.boldP{ - + +.boldP { + font-size: 20px; } + // .select-text{ // --margin-left: -10px; // margin-left:0; @@ -1363,7 +1584,10 @@ border:0px // } // } -.monthview-primary-with-event, .absent, .present, .dayoff { +.monthview-primary-with-event, +.absent, +.present, +.dayoff { background-color: #fff !important; z-index: 1; @@ -1398,25 +1622,26 @@ border:0px .monthview-datetable { @media screen and (min-width: 300px) and (max-width:360px) { - *{ + * { font-size: 9px !important; font-weight: normal !important; } } - + @media screen and (min-width: 361px) { - *{ - font-size: 11px !important; + * { + font-size: 9px !important; font-weight: normal !important; } } thead th { - border:none !important; - color:#888; + border: none !important; + color: #888; } - tbody td{ - border:none !important; + + tbody td { + border: none !important; line-height: 40px !important; background: none !important; padding: 0 !important; @@ -1428,34 +1653,38 @@ border:0px &.monthview-selected { color: black; } - + &.monthview-selected.present, &.present { - color:#fff !important; + color: #fff !important; + &:before { - background-color: #29B5BF !important; + background-color: #004D71 !important; } } - + &.monthview-selected.absent, &.absent { - color:#fff !important; + color: #fff !important; + &:before { - background-color:#c2a16b !important; + background-color: #db5b6a !important; } } &.monthview-selected.dayoff, &.dayoff { - color:#555 !important; + color: #fff !important; + &:before { - background-color:#e5e5e5 !important; + background-color: #43a6a0 !important; } } - + &.monthview-selected.scheduleDay, &.scheduleDay { color: #000 !important; + &:before { background-color: #fff !important; border: 1px solid #ccc !important; @@ -1474,9 +1703,10 @@ border:0px } } -.table-bordered{ - border:none !important; +.table-bordered { + border: none !important; } + // .monthview-primary-with-event::after, .absent::after, .present::after, .dayoff::after { // content: " "; // width: 80%; @@ -1520,7 +1750,7 @@ table.monthview-datetable th small { } -.modal-wrapper{ +.modal-wrapper { border-radius: 20px !important; } @@ -1530,113 +1760,264 @@ table.monthview-datetable th small { } // .replaceRoll-modal { - + // padding: 30% 1% !important; // --height: 15cm !important; // --width: 100% !important; // --border-radius: 0.4cm; - + // } -.calendar-modal .swiper-container-horizontal > .swiper-pagination-bullets{ +.calendar-modal .swiper-container-horizontal>.swiper-pagination-bullets { top: auto; bottom: -8px; + .swiper-pagination-bullet-active { background: #29B5BF; } } .alert-wrapper { - min-width: 80% !important;//what ever you like - } + min-width: 80% !important; //what ever you like +} - .disable-button-opacity { - opacity: .2; - } +.disable-button-opacity { + opacity: .2; +} - .digital-id-modal-css .modal-wrapper { +.digital-id-modal-css .modal-wrapper { height: 90%; width: 90%; top: 3%; - position: absolute; - display: block; - } - .business-card-modal-css .modal-wrapper{ + position: absolute; + display: block; +} + +.business-card-modal-css .modal-wrapper { height: 500px; width: 300px; top: 50%; - position: absolute; + position: absolute; display: block; margin-top: -250px; - } +} + +.app-update-modal-css .modal-wrapper { + border-radius: 0px !important; +} - .app-update-modal-css .modal-wrapper{ - border-radius: 0px !important; - } - .fav-employee-details{ +.fav-employee-details { font-size: 20px; position: absolute; bottom: 85px; font-weight: bold; color: black !important; padding: 5px; - } - .fav-profileImageDiv{ +} + +.fav-profileImageDiv { width: 100%; text-align: start; } + ion-segment-button { --indicator-color: transparent !important; --indicator-color-checked: transparent !important; - } - #surveyRatingNew ion-button{ +} + +#surveyRatingNew ion-button { background: #fff !important; - } - #surveyRatingNew ion-buttons{ - border-radius: 12px; - background: #fff; - width: 75%; - margin: auto; - } - .filter-modal .modal-wrapper{ +} + +#surveyRatingNew ion-buttons { + border-radius: 12px; + background: #fff; + width: 75%; + margin: auto; +} + +.filter-modal .modal-wrapper { border-radius: 0px !important; - } - .offers-discount-card ion-card-content div{ +} + +.offers-discount-card ion-card-content div { font-size: 11px !important; - } +} - .searchbar-input-container.sc-ion-searchbar-ios{ +.searchbar-input-container.sc-ion-searchbar-ios { height: 48px; background: #FFFFFF 0% 0% no-repeat padding-box; border: 10px solid white; border-radius: 50px; width: 345px; left: 3px; - } +} - .searchbar-input.sc-ion-searchbar-md { - border-radius: 25px; - } +.searchbar-input.sc-ion-searchbar-md { + border-radius: 25px; +} - .top svg { +.top svg { height: 30px !important; - } +} + - .top-filter svg { margin-top: 15px !important; } -.disabledField{ +.disabledField { opacity: .5; pointer-events: none; } -.filterClass input{ +.filterClass input { box-shadow: none !important; -webkit-box-shadow: none !important; +} + +.select-alert .alert-radio-label { + + font-size: 12px !important; +} + +.modal-image-viewer-landscape { + --height: 35% !important; + --width: 90% !important; + --border-radius: 0.4cm; +} + +.modal-image-viewer-portrait { + --height: 45% !important; + --width: 60% !important; + --border-radius: 0.4cm; +} + +.menu-label { + margin-left: 5px; + margin-bottom: 7px; +} + +ion-app[dir="rtl"] { + + .slideFullWidth { + margin-right: 0px !important; + } + + .menu-label { + margin-right: 10px !important; + } + + + .iconBox img { + margin: 5px !important; + } + + .pClass { + font-size: 10px; + } + +} + +.ion-color-secondary { + --ion-color-base: #004D71 !important; +} + +ion-app[dir="ltr"] { + + .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-left: 5px !important; + } + + + + + app-my-team { + .request-heading span { + margin: 0 !important; + padding: 0 !important; + } + } +} + +ion-app[dir="rtl"] { + + .slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-right: 10px; + } + + .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-right: 10px !important; + } + + .attendance-module { + margin-left: 0px !important; + margin-right: 10px !important; + ion-button { + height: 40px !important; + } + } + + .slideFullWidth { + margin-right: 0px !important; + } + + .menu-label { + margin-right: 10px !important; + } + + + .iconBox img { + margin: 5px !important; + } +} + + +.float-right-moe { + float: right; +} + +.float-left-moe { + float: left; +} + +[dir="ltr"] .toolTip { + position: absolute; + right: 20px; + top: 20px; + z-index: 999; +} + +[dir="rtl"] .toolTip { + position: absolute; + left: 20px; + top: 20px; + z-index: 999; +} + +[dir="rtl"] .text-span-moe { + font-size: 8px !important; +} + +.toolTip-inside { + position: relative; + left: 0; + right: 0; + height: 10px; + width: 10px; + display: inline-block; + margin: 0px 5px 5px 10px; } - .select-alert .alert-radio-label{ - - font-size: 12px !important; - } \ No newline at end of file +.toolTip-inside ion-icon{ + position: absolute; +} + + .current-employee{ + .name{ + font-size: 14px !important; + margin-left: -5px !important; + } + .title{ + margin-left: -5px !important; + } +} \ No newline at end of file diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index c776c5e9..31d173c1 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -1,43 +1,53 @@ -@font-face { +@font-face { font-family: WorkSans-Light; src: url('../assets/font/WorkSans-Light.otf'); } + @font-face { font-family: GE_SS_TWO_MEDIUM; src: url('../assets/font/GE_SS_TWO_MEDIUM.otf'); } + @font-face { font-family: WorkSans-Medium; src: url('../assets/font/WorkSans-Medium.otf'); } + @font-face { font-family: GE_SS_Two_Light; src: url('../assets/font/GE_SS_Two_Light.otf'); } + @font-face { font-family: WorkSans-Regular; src: url('../assets/font/WorkSans-Regular.otf'); } + @font-face { font-family: GE_SS_Two_Bold; src: url('../assets/font/GE_SS_Two_Bold.otf'); } + @font-face { font-family: WorkSans-SemiBold; src: url('../assets/font/WorkSans-SemiBold.otf'); } + @font-face { font-family: GE_SS_Two_Bold; src: url('../assets/font/GE_SS_Two_Bold.otf'); } + @font-face { font-family: WorkSans-Bold; src: url('../assets/font/WorkSans-Bold.otf'); } + @font-face { font-family: Poppins-SemiBold; src: url('../assets/font/Poppins-SemiBold.ttf'); } + @font-face { font-family: Poppins-Medium; src: url('../assets/font/Poppins-Medium.ttf'); @@ -47,52 +57,81 @@ font-family: Poppins-Bold; src: url('../assets/font/Poppins/Poppins-Bold.ttf'); } + @font-face { font-family: Poppins-Medium; src: url('../assets/font/Poppins/Poppins-Medium.ttf'); } + @font-face { font-family: Poppins; src: url('../assets/font/Poppins/Poppins-Regular.ttf'); } + +@font-face { + font-family: Inter; + src: url('../assets/font/Inter-V.ttf'); +} + +@font-face { + font-family: Kufi; + src: url('../assets/font/NotoKufiArabic-Regular-1.ttf'); +} + +@font-face { + font-family: Kufi; + src: url('../assets/font/notokufi/NotoKufiArabic-Regular.ttf'); +} + +@font-face { + font-family: Kufi-Semibold; + src: url('../assets/font/notokufi/NotoKufiArabic-SemiBold.ttf'); +} + +@font-face { + font-family: Kufi-Bold; + src: url('../assets/font/notokufi/NotoKufiArabic-Bold.ttf'); +} + :root { ---ion-font-family: 'Poppins'; ---break-small: 450px; ---break-big:565px; -//$break-large: 1200px; ---fontFamilyLightEN:'Poppins'; ---ontFamilyLightAR:'GE_SS_Two_Light'; ---fontFamilyRegularEN:'Poppins'; ---fontFamilyRegularAR:'GE_SS_TWO_MEDIUM'; ---fontFamilyMediumEN:'Poppins-Regular'; ---fontFamilyMediumAR:'GE_SS_TWO_MEDIUM'; ---fontFamilyBoldEN:'Poppins-Bold'; ---fontFamilyBoldAR:'GE_SS_Two_Bold'; ---fontFamilySemiBoldEN:'Poppins-Bold'; ---fontFamilySemiBoldAR:'GE_SS_Two_Bold'; ---fontFamilyIOSAR:-apple-system, "Helvetica Neue", "Roboto", sans-serif; ---fontFamilyAndroidAR:"Roboto", "Helvetica Neue", sans-serif; - --primary: #3ac1f1; - --secondary: #19a163; - --danger: #f53d3d; - --customnavy: #1a586d; - --light: #ffffff; - --dark: #000000; - --gray: #e4e5e7; - --custgreen: #209a83; - --cusgray:#d9d9d9; - --darkgray:#7F8C8D; - --grayBG:#acacac; - --labelColor:#999; - --orange:#F7941D; - --green:#209B48; - --red:#BE1E2D; - --blue:#223262; - --cyanblue:#1b75bc; - --newgreen:#29B5BF; - --darkblue:#29B5BF; - --lightblue:#3cb9d5; - --newred:#cb3232; + --ion-font-family: 'Inter'; + --break-small: 450px; + --break-big: 565px; + //$break-large: 1200px; + --fontFamilyLightEN: 'Inter'; + --ontFamilyLightAR: 'Kufi'; + --fontFamilyRegularEN: 'Inter'; + --fontFamilyRegularAR: 'Kufi'; + --fontFamilyMediumEN: 'Inter'; + --fontFamilyMediumAR: 'Kufi'; + --fontFamilyBoldEN: 'Inter'; + --fontFamilyBoldAR: 'Kufi'; + --fontFamilySemiBoldEN: 'Inter'; + --fontFamilySemiBoldAR: 'Kufi'; + --fontFamilyIOSAR: 'Kufi'; + --fontFamilyIOSARSEMIBOLD: 'Kufi-Semibold'; + --fontFamilyAndroidAR: 'Kufi'; + --primary: #3ac1f1; + --secondary: #19a163; + --danger: #f53d3d; + --customnavy: #44A7A1; + --light: #ffffff; + --dark: #000000;; + --gray: #e4e5e7; + --custgreen: #44A7A1; + --cusgray: #d9d9d9; + --darkgray: #7F8C8D; + --grayBG: #acacac; + --labelColor: #999; + --orange: #F7941D; + --green: #209B48; + --red: #BE1E2D; + --blue: #223262; + --cyanblue: #1b75bc; + --newgreen: #44A7A1; + --darkblue: #29B5BF; + --lightblue: #3cb9d5; + --newred: #cb3232; --fontFamilyPoppins-SemiBold: 'Poppins-SemiBold'; --fontFamilyPoppins-Medium: 'Poppins-Medium'; // $font-family-base: $fontFamilyMediumEN !default; @@ -104,7 +143,7 @@ // font-size: 1.4rem; // background-color: #fff; // } - + // ion-app.md { // font-family: "Roboto", "Helvetica Neue", sans-serif; // font-size: 1.4rem; @@ -113,43 +152,43 @@ // $text-input-md-highlight-color:--primary; // $text-input-ios-highlight-color:--primary; - + // $label-md-text-color-focused:--primary; // $label-ios-text-color-focused:--primary; - + // $alert-md-button-text-color:--primary; // $alert-ios-button-text-color:--primary; - + // $alert-md-input-border-color-focused:--primary; // $alert-ios-checkbox-background-color-on:--primary; // $alert-ios-checkbox-border-color-on:--primary; - + // $checkbox-md-icon-background-color-on:$primary; // $checkbox-ios-background-color-on:$primary; // $checkbox-md-icon-border-color-on:$primary; - + // $toggle-ios-background-color-on:$primary; // $toggle-md-active-color:$primary; - + // $radio-md-color-on:$primary; // $radio-ios-color-on:$primary; - + // $button-ios-background-color:$primary; - + // $picker-md-button-text-color:$primary; // $picker-md-option-selected-color:$primary; // $picker-ios-button-text-color:$primary; - + // $range-md-bar-active-background-color:$primary; // $range-ios-bar-active-background-color:$primary; // $text-input-ios-highlight-color:$primary; - - + + // $loading-md-spinner-color:$primary; - - + + // $text-input-highlight-color-invalid:$danger; // $text-input-ios-highlight-color-invalid:$danger; // $text-input-md-highlight-color-invalid:$danger; // $text-input-ios-show-focus-highlight: true; - } \ No newline at end of file +} \ No newline at end of file diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index cb20fcf3..4311fa49 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -1,136 +1,137 @@ -.colorBG{ - --background: #f0efef !important; - background: #f0efef !important; +.colorBG { + --background: #f0efef !important; + background: #f0efef !important; - } - .footerSearchBtn{ - padding: 50px !important; - background: #f0efef !important; } - -.headerRow{ - padding-top: 10px; - padding-bottom: 10px; +.footerSearchBtn { + background: #f0efef !important; + height: 15% !important; } -.itemReqList{ - background: #f0efef; - margin-top: 20px; - width: 100%; - // width: 95%; - // margin-left:9px -} -.gridItemReq{ - //width:95%; + +.headerRow { + padding-top: 10px; + padding-bottom: 10px; } +.itemReqList { + background: #f0efef; + margin-top: 20px; + width: 100%; + // width: 95%; + // margin-left:9px -.itemReqContent{ - // margin-top: 17px; - margin-bottom: 10px; - border-radius: 7px; - text-align: left; } -.itemReqDiv{ - padding:10px; - width: 100%; - // padding-bottom: 10px; - // padding-top: 10px; + +.itemReqContent { + // margin-top: 17px; + margin-bottom: 10px; + border-radius: 7px; + text-align: left; } -.arrowIcon{ -width: 18px !important; -margin-right: -21px !important; -margin-left: 10px !important; +.itemReqDiv { + padding: 10px; + width: 100%; + // padding-bottom: 10px; + // padding-top: 10px; } -.actionList{ - // position: fixed; - // bottom: 0px; - bottom: -7px; - width: 215px; - border-top-left-radius: 7px; - border-top-right-radius: 7px + +.arrowIcon { + width: 18px !important; + + margin-right: -21px !important; + margin-left: 10px !important; } -.cardContent{ - // width:100%; - // margin-top: 33px + +.actionList { + // position: fixed; + // bottom: 0px; + bottom: -7px; + width: 215px; + border-top-left-radius: 7px; + border-top-right-radius: 7px } -.colItemReq{ - color: var(--darkblue); - font-weight: bold !important;; - font-size: 16px ; - text-align: left; - display: contents; - font-family: var(--ion-font-family,inherit); - font-size: inherit; - text-overflow: ellipsis; - white-space: normal; - overflow: hidden; - box-sizing: border-box; + +.colItemReq { + color: var(--darkblue); + font-weight: bold !important; + ; + font-size: 16px; + text-align: left; + display: contents; + font-family: var(--ion-font-family, inherit); + font-size: inherit; + text-overflow: ellipsis; + white-space: normal; + overflow: hidden; + box-sizing: border-box; } -.colItemReqHeader{ -text-align: justify; -color: var(--cyanblue); -font-weight: bold; +.colItemReqHeader { + text-align: justify; + color: var(--cyanblue); + font-weight: bold; } -.labelTotal{ - color: var(--danger); - font-weight: bold; - font-size: 17px; + +.labelTotal { + color: var(--danger); + font-weight: bold; + font-size: 17px; } -.labelAction{ -color:var(--customnavy) !important; -font-weight:bold; + +.labelAction { + color: var(--customnavy) !important; + font-weight: bold; } -.colItems{ -padding-bottom: 10px + +.colItems { + padding-bottom: 10px } ion-label.labelValue.sc-ion-label-ios-h.sc-ion-label-ios-s.ios.hydrated, -ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated -{ - white-space: pre-wrap !important; - --color: initial; - display: contents; - color: var(--color); - font-family: var(--ion-font-family,inherit); - font-size: inherit; - text-overflow: ellipsis; - overflow: hidden; - -webkit-box-sizing: border-box; - box-sizing: border-box +ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated { + white-space: pre-wrap !important; + --color: initial; + display: contents; + color: var(--color); + font-family: var(--ion-font-family, inherit); + font-size: inherit; + text-overflow: ellipsis; + overflow: hidden; + -webkit-box-sizing: border-box; + box-sizing: border-box } -.segmentPR{ +.segmentPR { - // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04); - // --background-activated: var(--danger); - // --color: rgba(--primary); - --color-checked: var(--dark); - --indicator-color-checked: var(--secondary); - --background: #f0efef; - --background-activated: #f0efef; - --background-hover:#f0efef; - --background-activated:#f0efef; - --background-checked:#f0efef; + // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04); + // --background-activated: var(--danger); + // --color: rgba(--primary); + --color-checked: var(--dark); + --indicator-color-checked: var(--secondary); + --background: #f0efef; + --background-activated: #f0efef; + --background-hover: #f0efef; + --background-activated: #f0efef; + --background-checked: #f0efef; } .ion-modal#ion-overlay-1 { - width: 90%; - height: 50%; - top: 20%; - left: 5%; - right: 5%; - bottom: 5%; - border: solid 1px red; + width: 90%; + height: 50%; + top: 20%; + left: 5%; + right: 5%; + bottom: 5%; + border: solid 1px red; } @@ -145,477 +146,508 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated // top: 6px !important; // bottom: 0px !important; // } - + // .swiper-pagination { // top: 6px; // } .bar-stable { - background-color: var(--cusgray) !important; - } - .tabs{ - background-color: var(--cusgray) !important; - } - .icon-size-lg { - font-size: 40px; - } - - /*Timeline*/ - - .pos-absolute-right { - position: absolute; - right: 8px; - } - - .timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); - } - - .timeline:before { - - content: ''; - position: absolute; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timeline-en .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } + background-color: var(--cusgray) !important; +} - .timeline-ar .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } - - .timeline .timeline-thumb.timeline-icon { - height: 67px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); - } - +.tabs { + background-color: var(--cusgray) !important; +} - - .timeline .timeline-item { - // width: 40px; - - } - - .timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - - .divider-title { - background: #e4e4e4; - padding: 5px 15px; - } - - - .color-red { - color: var(--danger) !important; - } - - .bg-color-dot { - - background: var(--gray); - - /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */ - // border: var(--secondary) solid 1px; - // background-color: #ff3b30 !important; - // background: var(--primary); - //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - +.icon-size-lg { + font-size: 40px; +} + +/*Timeline*/ + +.pos-absolute-right { + position: absolute; + right: 8px; +} + +.timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); +} + +.timeline:before { + + content: ''; + position: absolute; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ +} + +.timeline-en .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline-ar .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline .timeline-thumb.timeline-icon { + height: 67px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); +} + + + +.timeline .timeline-item { + // width: 40px; + +} + +.timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + +} + + +.divider-title { + background: #e4e4e4; + padding: 5px 15px; +} + + +.color-red { + color: var(--danger) !important; +} + +.bg-color-dot { + + background: var(--gray); + + /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */ + // border: var(--secondary) solid 1px; + // background-color: #ff3b30 !important; + // background: var(--primary); + //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + + +} + +.bg-blue-dot { + + border: var(--blue) solid 1px; + + background-repeat: no-repeat; + background-image: url("/assets/imgs/profile.png"); + background-size: 100% 100%; + +} + +.bg-orange-dot { + + border: var(--orange) solid 1px; + // background: var(--gray); + background-repeat: no-repeat; + background-image: url("/assets/imgs/profile.png"); + background-size: 100% 100%; +} + +.bg-red-dot { + + border: var(--red) solid 1px; + // background: var(--gray); + background-repeat: no-repeat; + background-image: url("/assets/imgs/profile.png"); + background-size: 100% 100%; + +} + +.bg-green-dot { + + border: var(--green) solid 1px; + // background: var(--gray); + background-repeat: no-repeat; + background-image: url("/assets/imgs/profile.png"); + background-size: 100% 100%; +} + + +.bg-blue-txt { + + color: var(--light) !important; + font-weight: bold; + background: var(--blue); + border-radius: 9px; + text-align: center; + margin-top: 10px; + position: relative; + width: auto; + height: 100%; + display: inline-block !important; + padding: 0px 7px 0px 7px; + + +} + +.bg-orange-txt { + font-weight: bold; + + color: var(--light) !important; + background: var(--orange); + border-radius: 9px; + text-align: center; + width: 30%; + margin-top: 10px; + position: relative; + width: auto; + height: 100%; + display: inline-block !important; + padding: 0px 7px 0px 7px; + +} + +.bg-red-txt { + font-weight: bold; + color: var(--light) !important; + background: var(--red); + border-radius: 9px; + text-align: center; + width: 30%; + margin-top: 10px; + position: relative; + width: auto; + height: 100%; + display: inline-block !important; + padding: 0px 7px 0px 7px; - } - .bg-blue-dot { - - border: var(--blue) solid 1px; - - background-repeat: no-repeat; - background-image: url("/assets/imgs/profile.png"); - background-size: 100% 100%; - - } - .bg-orange-dot { - - border: var(--orange) solid 1px; - // background: var(--gray); - background-repeat: no-repeat; - background-image: url("/assets/imgs/profile.png"); - background-size: 100% 100%; - } - .bg-red-dot { - - border: var(--red) solid 1px; - // background: var(--gray); - background-repeat: no-repeat; - background-image: url("/assets/imgs/profile.png"); - background-size: 100% 100%; - - } - .bg-green-dot { - - border: var(--green) solid 1px; - // background: var(--gray); - background-repeat: no-repeat; - background-image: url("/assets/imgs/profile.png"); - background-size: 100% 100%; - } - - - .bg-blue-txt { - - color: var(--light) !important; - font-weight:bold; - background: var( --blue); - border-radius: 9px; - text-align: center; - margin-top: 10px; - position: relative; - width: auto; - height: 100%; - display: inline-block !important; - padding: 0px 7px 0px 7px; - - - } - .bg-orange-txt { - font-weight:bold; - - color: var(--light) !important; - background: var( --orange); - border-radius: 9px; - text-align: center; - width: 30%; - margin-top: 10px; - position: relative; - width: auto; - height: 100%; - display: inline-block !important; - padding: 0px 7px 0px 7px; - - } - .bg-red-txt { - font-weight:bold; - color: var(--light) !important; - background: var( --red); - border-radius: 9px; - text-align: center; - width: 30%; - margin-top: 10px; - position: relative; - width: auto; - height: 100%; - display: inline-block !important; - padding: 0px 7px 0px 7px; - - - } - .bg-green-txt { - font-weight:bold; - color: var(--light) !important; - background: var( --green); - border-radius: 9px; - text-align: center; - width: 30%; - margin-top: 10px; - position: relative; - width: auto; - height: 100%; - display: inline-block !important; - padding: 0px 7px 0px 7px; - - } - - - - - -.notification-list{ -ion-item{ +} + +.bg-green-txt { + font-weight: bold; + color: var(--light) !important; + background: var(--green); + border-radius: 9px; + text-align: center; + width: 30%; + margin-top: 10px; + position: relative; + width: auto; + height: 100%; + display: inline-block !important; + padding: 0px 7px 0px 7px; + +} + + + + + +.notification-list { + ion-item { // margin-top: 5px; // margin-bottom: 5px; - + background-color: transparent; - .item-date{ - width: 55px; - font-size: 14px !important; - font-weight: bold; - - text-align: center; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 0; + + .item-date { + width: 55px; + font-size: 14px !important; + font-weight: bold; + + text-align: center; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 0; } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px !important; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px !important; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + } + } } -} + .input-wrapper { ---flex:none; + --flex: none; } -ion-input ,ion-datetime{ -// border-bottom: #dedede 1px solid; + +ion-input, +ion-datetime { + // border-bottom: #dedede 1px solid; } + .left { -.timeline:before{ -left: 66px; -} -.notification-list ion-item{ + .timeline:before { + left: 66px; + } + + .notification-list ion-item { padding-left: 3px; -} -.timeline-thumb{ + } + + .timeline-thumb { left: 37px; + } } -} + .right { -.timeline:before{ + .timeline:before { right: 62px; - } - .notification-list ion-item{ - padding-right: 3px; - } - .timeline-thumb{ - right: 37px; - } + } + + .notification-list ion-item { + padding-right: 3px; + } + + .timeline-thumb { + right: 37px; + } } -.itemHISBtn{ - padding: 5px; - color: var(--light); - background: var(--darkgray); - border-radius: 3px; - width: 85%; - height: 40px; - display: block; - margin: 0 auto; - margin-top: 10px; +.itemHISBtn { + padding: 5px; + color: var(--light); + background: var(--darkgray); + border-radius: 3px; + width: 85%; + height: 40px; + display: block; + margin: 0 auto; + margin-top: 10px; } -.rowBtn{ - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - background: white; +.rowBtn { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + background: white; } -.rowBorder{ - border-bottom: solid 0.02cm var(--grayBG); +.rowBorder { + border-bottom: solid 0.02cm var(--grayBG); } -.colBorder{ - border-right: solid 0.02cm var(--grayBG); + +.colBorder { + border-right: solid 0.02cm var(--grayBG); } -.colBorder-ar{ + +.colBorder-ar { border-left: solid 0.02cm var(--grayBG); } -.dateActionHistory{ - text-align: start; - // margin-top: -25px; +.dateActionHistory { + text-align: start; + // margin-top: -25px; } -.actionBtn{ - --border-radius: 50% !important; - height: 55px; - width: 55px; - --background: var(--newgreen); // will be dynamic - background: transparent; - margin:10px; +.actionBtn { + --border-radius: 50% !important; + height: 55px; + width: 55px; + --background: var(--newgreen); // will be dynamic + background: transparent; + margin: 10px; } -.itemAttch{ - border-radius: 11px; - margin: 8px; - --min-height: 60px; - --max-height: 60px; +.itemAttch { + border-radius: 11px; + margin: 8px; + --min-height: 60px; + --max-height: 60px; } .less { - max-height: 54px; - } - .tipsPadding{ - padding: 10px 10px; - border-radius: 10px; - margin: 10px; - border: 2px solid #e4e5e7; - color: var(--darkblue); - background: white; - font-weight: bold; - text-align: justify; - - } + max-height: 54px; +} - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - } +.tipsPadding { + padding: 10px 10px; + border-radius: 10px; + margin: 10px; + border: 2px solid #e4e5e7; + color: var(--darkblue); + background: white; + font-weight: bold; + text-align: justify; - .containerNote { - font-size: 14px; - line-height: 14px; - height: 30px; - overflow: hidden; - text-align: justify; - } - - .show { - overflow: visible; - height: auto; - } +} - .showMore{ - padding: 0px; - background: transparent; - color: blue; - text-decoration: underline; - font-size: 14px; - } - .succssfullMSG{ - height: 100%; - width: 100%; - background: var(--newgreen); - color: white; - font-weight: bold; - font-size: 20px; - text-align: center; - vertical-align: middle; - padding-top: 30px; - } +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; +} - .succssfullIcon{ - width: 60%; - text-align: center; - height: 36%; - padding-top: 100px; - } - .subjectNotification{ - text-align: center; - padding-top: 10px; - font-weight: bold; - } - .tabBar{ - height:70px - } - .empImge{ - border-radius: 50% !important; - width: 60px !important; - height: 60px !important; - border: #dedede solid 1px; +.containerNote { + font-size: 14px; + line-height: 14px; + height: 30px; + overflow: hidden; + text-align: justify; +} - } - .empImgeRep { - border-radius: 50% !important; - width: 80px; - height: 80px; - border: #dedede solid 1px; - } - .empImgeSub{ - border-radius: 50%; - width: 85px; - height: 85px; - border: #dedede solid 1px; +.show { + overflow: visible; + height: auto; +} - } +.showMore { + padding: 0px; + background: transparent; + color: blue; + text-decoration: underline; + font-size: 14px; +} - ion-card{ - color:black !important; - } +.succssfullMSG { + height: 100%; + width: 100%; + background: var(--newgreen); + color: white; + font-weight: bold; + font-size: 20px; + text-align: center; + vertical-align: middle; + padding-top: 30px; +} - .line{ - padding-bottom:87px; - } +.succssfullIcon { + width: 60%; + text-align: center; + height: 36%; + padding-top: 100px; +} - ion-segment-button ion-label { - max-width: 100px; - overflow: hidden; - padding: 10px; - font-size: 14px; - color: black !important; - } +.subjectNotification { + text-align: center; + padding-top: 10px; + font-weight: bold; +} + +.tabBar { + height: 70px +} - .colItems ion-label { - color: black !important; +.empImge { + border-radius: 50% !important; + width: 60px !important; + height: 60px !important; + border: #dedede solid 1px; - } - .approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; - } - ion-input .replacmentSearchBar .native-input{ - position: absolute !important; - } +} + +.empImgeRep { + border-radius: 50% !important; + width: 80px; + height: 80px; + border: #dedede solid 1px; +} + +.empImgeSub { + border-radius: 50%; + width: 85px; + height: 85px; + border: #dedede solid 1px; + +} + +ion-card { + color: black !important; +} + +.line { + padding-bottom: 87px; +} + +ion-segment-button ion-label { + max-width: 100px; + overflow: hidden; + padding: 10px; + font-size: 14px; + color: black !important; +} + +.colItems ion-label { + color: black !important; + +} + +.approvalTitle { + font-weight: bold; + font-size: 16px; + text-align: left; +} + +ion-input .replacmentSearchBar .native-input { + position: absolute !important; +} - ion-input .replacmentSearchBar .input-clear-icon{ - display: none !important; - } \ No newline at end of file +ion-input .replacmentSearchBar .input-clear-icon { + display: none !important; +} \ No newline at end of file