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 1d16e33a..360a5175 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -443,9 +443,9 @@ export class SubmitAbsenceComponent implements OnInit { this.textInput = new TextInput( feildsList[i].SEGMENT_PROMPT, feildsList[i].APPLICATION_COLUMN_NAME, - defaultValText, + defaultVal, containerId, - defaultVal, + defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html index 0f28d541..841a2b96 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.html +++ b/Mohem/src/app/authentication/check-user/check-user.component.html @@ -23,7 +23,7 @@ - {{ts.trPK('login','check-user-text1')}} + {{ts.trPK('login','check-user-place-holder')}} diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index 9e1c419b..95971d3d 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -32,8 +32,8 @@

{{ts.trPK('login','verify-login-with')}}

-

{{ts.trPK('login','verify-fingerprint')}}

-

{{ts.trPK('login','verify-faceId')}}

+

{{ts.trPK('login','verify-fingerprint')}}

+

{{ts.trPK('login','verify-faceId')}}

diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 4e76841a..2865efee 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -147,8 +147,18 @@ export class ConfirmLoginComponent implements OnInit { this.selectedOption = this.selectedOption && !this.onlySMSBox ? this.selectedOption : el.value; switch (el.value) { case 1: - localStorage.setItem('login-type', el.value); - this.loginWithSMS(el); + + console.log(el.value); + localStorage.setItem("login-type",el.value); + console.log("login-type: "+ localStorage.getItem("login-type")) + if(this.FFloginType == 3 || this.FFloginType == 2 ){ + this.cs.setActiveTypeLogin(el.value); + }else{ + this.cs.setActiveTypeLogin(0); + + } + this.loginWithSMS(el); + break; case 2: localStorage.setItem('login-type', el.value); @@ -159,7 +169,16 @@ export class ConfirmLoginComponent implements OnInit { this.faceReconization(el); break; case 4: - localStorage.setItem('login-type', el.value); + + console.log(el.value); + + localStorage.setItem("login-type",el.value); + if(this.FFloginType == 3 || this.FFloginType == 2 ){ + this.cs.setActiveTypeLogin(el.value); + }else{ + this.cs.setActiveTypeLogin(0); + + } this.loginWithWhatsapp(el); break; default: @@ -197,11 +216,33 @@ export class ConfirmLoginComponent implements OnInit { this.authService.setPublicFields(request); request.OTP_SendType = type; request.MobileNumber = this.loginData.MobileNumber; - request.IsMobileFingerPrint = 0; - request.P_USER_NAME = this.loginData.P_USER_NAME; - request.LogInTokenID = this.loginData.LogInTokenID; - request.P_LEGISLATION_CODE = 'SA'; - this.authService.sendActivationCodeByType(request, () => { }, this.ts.trPK('general', 'ok')) + + request.IsMobileFingerPrint =0; + + request.P_USER_NAME=this.loginData.P_USER_NAME; + + request.LogInTokenID =this.loginData.LogInTokenID; + + request.P_LEGISLATION_CODE =this.loginData.P_LEGISLATION_CODE;//"SA"; + + // request.VersionID ="2.0"; + + + +// request.LanguageID = imeiData && imeiData.PreferredLanguage || request.LanguageID; + + this.authService + + .sendActivationCodeByType( + + request, + + () => { }, + + this.ts.trPK("general", "ok") + + ) + .subscribe((result: any) => { if (result.isSMSSent) { // tslint:disable-next-line: max-line-length diff --git a/Mohem/src/app/authentication/models/LoginModel.ts b/Mohem/src/app/authentication/models/LoginModel.ts index edff37b9..c68d516c 100644 --- a/Mohem/src/app/authentication/models/LoginModel.ts +++ b/Mohem/src/app/authentication/models/LoginModel.ts @@ -6,4 +6,5 @@ export class LoginModel { EMPLOYEE_DISPLAY_NAME: string; EMPLOYEE_NAME:string; EmployeeName:string; + P_LEGISLATION_CODE:string; } diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 194c34c6..c9d9d569 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -21,9 +21,9 @@

{{'verificationcode,title' | translate}} {{'verificationcode,verificationcode' | translate}} {{'verificationcode,by' | translate}} - {{'verificationcode , sms' | translate}} - {{'verificationcode , whatsapp' | translate}} - + {{'verificationcode , sms' | translate}} + {{'verificationcode , whatsapp' | translate}} + {{'verificationcode,instruct' | translate}} {{'general,submit' | translate}}

diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index c3f4819f..631dcd70 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -47,6 +47,7 @@ export class SmsPageComponent implements OnInit { user_name: string; public isPostNoLoad = true; loginType: any; + activeType: any; constructor( @@ -60,6 +61,8 @@ export class SmsPageComponent implements OnInit { ) {} ngOnInit() { + this.activeType=this.common.getActiveTypeLogin(); + console.log("activeType :"+this.activeType); this.count = 0; this.initTimer(); this.startTimer(); @@ -73,7 +76,14 @@ export class SmsPageComponent implements OnInit { } console.log('deviceToken :' + this.deviceToken); this.loginTypeData = this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); - this.loginType = this.loginTypeData.loginType; + if( this.loginTypeData){ + this.loginType=this.loginTypeData.loginType; + + console.log("loginType :"+this.loginTypeData.loginType); + }else{ + this.loginType=1; + } + } initTimer() { diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.html b/Mohem/src/app/eit/add-eit/add-eit.component.html index 57c528f6..9b604048 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.html +++ b/Mohem/src/app/eit/add-eit/add-eit.component.html @@ -16,17 +16,18 @@ --> - + (trigger)="closeModal()" + > + - - + -->
diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index d1b4ac7f..6b784633 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -417,7 +417,8 @@ export class AddEitComponent implements OnInit { } } - closemodal() { + closeModal() { + console.log("closeModal"); this.updatedValues = []; this.modalController.dismiss(); } @@ -664,6 +665,8 @@ export class AddEitComponent implements OnInit { let obj = this.handleDefaultValueResult(result); let val = obj.value; let text = obj.text; + if (val==null){val="";} + if (text==null){text="";} if (isStandardDate) { console.log("isStandardDate"); elem.value = this.cs.reverseFormatDate(val); @@ -681,6 +684,7 @@ export class AddEitComponent implements OnInit { if (val) { elem.dataset.dtvalue = val; elem.innerHTML = val; + elem.value=val; } else { elem.dataset.dtvalue = ""; elem.innerHTML = ""; @@ -1216,7 +1220,11 @@ export class AddEitComponent implements OnInit { this.eitResponse[i].DISPLAY_FLAG != "N" ) { //time + if(elemVal.length>5){ elemVal = elemVal.substring(11, 16); + }else{ + elemVal = elemVal; + } } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); @@ -1225,11 +1233,11 @@ export class AddEitComponent implements OnInit { } else { elem.classList.remove("requiredClassElm"); } - if (elemVal != 'null'){ + // if (elemVal != 'null'){ varcharValue = elemVal; - } else{ - elemVal = null; - } + //} else{ + // elemVal = null; + // } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index 0b8b64df..a3a64748 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -1,10 +1,11 @@ - {{headerTitle}} + {{headerTitle}} + diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index 70247b93..dcfa8ed2 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -229,7 +229,14 @@ .header-toolbar-new{ --background: #22c6b3; } - +.title{ + margin-top: -37px; + margin-left: 85px; +} +.title-ar{ + margin-top: -37px; + margin-right: 101px; +} .confirmEitOkButton{ white-space: normal !important; text-transform: capitalize !important; diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts index 6a8681bf..98431cd3 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts @@ -46,12 +46,17 @@ export class EitUpdateListComponent implements OnInit { modal.onDidDismiss() .then((data: any) => { - console.log("data" + data); - console.log("data" + data.data.updated); - console.log("data" + data.data.eitRequest.EITTransactionTBL); + // console.log("data" + data); + // console.log("data" + data.data.updated); + // console.log("data" + data.data.eitRequest.EITTransactionTBL); - if (data) { + + if(data.data == undefined) + { + return; + } + else if (data.data) { this.updatedData = this.updatedData ? this.updatedData.concat(data.data.updated) : data.data.updated; this.notificationBodyRes[index].Collection_Notification = data.data.updated; this.updateTransactionList(data.data.eitRequest.EITTransactionTBL); diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 42d94901..557390a6 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -81,6 +81,7 @@ export class CommonService { public updateImage:boolean=false; public setUpdateImg:any; DT: any; + activeType: any; constructor( public nav: NavController, public router: Router, @@ -1430,5 +1431,12 @@ public getMonthNameAr(value: number): string { return this.DT; } - + setActiveTypeLogin(activeType){ + this.activeType=activeType; + } + + getActiveTypeLogin(){ + return this.activeType; + } + } diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index e1ce2293..38a135ac 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -64,6 +64,31 @@ public static host = 'https://uat.hmgwebservices.com/'; ); } + public postItg( + service: string, + data: any, + onError: any, + errorLabel?: string + ): Observable { + this.cs.startLoading(); + return this.httpClient + .post( + ConnectorService.host + service, + data, + ConnectorService.httpOptions + ) + .pipe( + timeout(ConnectorService.timeOut), + retry(ConnectorService.retryTimes), + tap( + res => this.handleResponseItg(res, onError, errorLabel), + error => this.handleError(error, onError, errorLabel) + ) + ); + } + + + // public postNoLoad(service: string, data: any, onError: any): Observable { // return this.httpClient // .post( @@ -170,7 +195,10 @@ public static host = 'https://uat.hmgwebservices.com/'; this.cs.stopLoading(); this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { this.cs.sharedService.clearAll(); + // this.cs.setIsTimeSessionOut(result.IsAuthenticated); + this.cs.openLogin(); + }); return false; } else if (result.ErrorType === 2 || result.ErrorType === 4) { @@ -183,10 +211,48 @@ public static host = 'https://uat.hmgwebservices.com/'; errorLabel, result.ErrorEndUserMessage ); + //add flag if user not auth + } } } + public handleResponseItg(result: Response, onError: any, errorLabel: string, isPostNoLoad = false) { + console.log("handleResponseItg"); + if (!isPostNoLoad) { + this.cs.stopLoading(); + } + if (!this.cs.validResponse(result)) { + if (result.IsAuthenticated === false) { + this.cs.stopLoading(); + this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { + console.log("presentAcceptDialog"); + this.cs.sharedService.clearAll(); + // this.cs.setIsTimeSessionOut(result.IsAuthenticated); + + this.cs.openLogin(); + + }); + return false; + } else if (result.ErrorType === 2 || result.ErrorType === 4) { + console.log("ErrorType if"); + + // console.log("error expired"); + this.cs.stopLoading(); + } else { + console.log("ErrorType else"); + + this.cs.stopLoading(); + // this.cs.showErrorMessageDialog( + // onError, + // errorLabel, + // result.Message + // ); + //add flag if user not auth + + } + } + } public getURLText( url: string, onError: any, diff --git a/Mohem/src/app/hmg-common/services/models/response.ts b/Mohem/src/app/hmg-common/services/models/response.ts index cd054b8f..56ff9657 100644 --- a/Mohem/src/app/hmg-common/services/models/response.ts +++ b/Mohem/src/app/hmg-common/services/models/response.ts @@ -13,5 +13,6 @@ export class Response { */ public MessageStatus: number; public SuccessMsg; + public Message; } diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts index 7f393498..105d71a1 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts @@ -75,7 +75,8 @@ export class FileUploderProfileComponent implements OnInit { async openFile() { const actionSheet = await this.actionSheetCtrl.create({ - header: 'Change Profile Photo', + // header: 'Change Profile Photo', + header: this.ts.trPK('userProfile', 'changeImg'), buttons: [{ // text: 'Delete Current Image', // role: 'destructive', @@ -85,7 +86,8 @@ export class FileUploderProfileComponent implements OnInit { // this.deleteCurrent(); // } // },{ - text: 'Take Photo', + // text: 'Take Photo', + text: this.ts.trPK('general', 'takePhoto'), icon: 'camera', handler: () => { console.log('Take Photo'); @@ -94,7 +96,8 @@ export class FileUploderProfileComponent implements OnInit { } }, { - text: 'Choose from Library', + // text: 'Choose from Library', + text: this.ts.trPK('general', 'Choose-from-Library'), icon: 'images', handler: () => { console.log('Favorite clicked'); @@ -102,7 +105,8 @@ export class FileUploderProfileComponent implements OnInit { } }, { - text: 'Cancel', + // text: 'Cancel', + text: this.ts.trPK('general', 'cancel'), icon: 'close', role: 'cancel', handler: () => { diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index fa1450e9..5af1f667 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -45,7 +45,7 @@ - + diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html index da57e57b..8aac3734 100644 --- a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html +++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html @@ -13,7 +13,7 @@ style="margin-right: -22px;margin-top: -10px;"> -

More Action

+

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

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 2876fe15..b4d19488 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -301,7 +301,7 @@ export class WorklistMainService { itgrequest.EmployeeNumber = itgrequest.P_USER_NAME; console.log(itgrequest); console.log(actionURL); - return this.api.post( + return this.api.postItg( actionURL, itgrequest, onError, 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 dfd4f5e3..cd5c6e5b 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 @@ -218,6 +218,7 @@ export class WorkListMainItgComponent implements OnInit { actionService(action, comments?, grantRequests?) { + let url: string; let request = new itgRequest(); request.RequestType = this.request_name; @@ -233,17 +234,35 @@ export class WorkListMainItgComponent implements OnInit { url = WorkListMainItgComponent.APPROVAL; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + if (result.MessageStatus != 1) { + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + + } else if (result.MessageStatus == 1) { + console.log("hello action 1"); + this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + + this.confirmMsg(1) // this.common.openNotificationPage(); this.skip(); + } }); } else if (action == 2) {//reject url = WorkListMainItgComponent.REJECT; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + console.log("hello action 2"); + + if (result.MessageStatus != 1) { + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + + } else if (result.MessageStatus == 1) { + this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + this.confirmMsg(2) // this.common.openNotificationPage(); this.skip(); + } }); } else if (action == 3) {//request more info request.NewUserEMPId = this.replcamentID; @@ -254,9 +273,20 @@ export class WorkListMainItgComponent implements OnInit { request.Comments = comments; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { - this.confirmMsg(3) + console.log("hello action 3"); + + if (result.MessageStatus != 1) { + //this.common.presentAlert(result.Message); + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + } + + if (result.MessageStatus == 1) { + this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + + this.confirmMsg(3) // this.common.openNotificationPage(); this.skip(); + } }); } } else if (action == 4) {//delegate @@ -264,9 +294,18 @@ export class WorkListMainItgComponent implements OnInit { url = WorkListMainItgComponent.DELEGATE; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + console.log("hello action 4"); + + if (result.MessageStatus != 1) { + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + + } else if (result.MessageStatus == 1) { + this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + this.confirmMsg(4) // this.common.openNotificationPage(); this.skip(); + } }); } else if (action == 5) { //answer url = WorkListMainItgComponent.ANSWER; @@ -275,9 +314,18 @@ export class WorkListMainItgComponent implements OnInit { } else { this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + console.log("hello action 5"); + + if (result.MessageStatus != 1) { + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + + } else if (result.MessageStatus == 1) { + this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + this.confirmMsg(5) // this.common.openNotificationPage(); this.skip(); + } }); } } else if (action == 6) { //grant @@ -290,9 +338,17 @@ export class WorkListMainItgComponent implements OnInit { request.AdditionalFields = this.grantRequest; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + console.log("hello action 6"); + if (result.MessageStatus != 1) { + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + + } else if (result.MessageStatus == 1) { + this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + this.confirmMsg(6) // this.common.openNotificationPage(); this.skip(); + } }); } else { this.common.presentAlert(this.ts.trPK('worklist', 'empty-comment')); @@ -312,6 +368,7 @@ export class WorkListMainItgComponent implements OnInit { } confirmMsg(action) { + console.log("confirmMsg"); if (action === 1) { return this.ts.trPK('worklist', 'approveMsg'); } 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 1b542584..d856fe4d 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 @@ -10,9 +10,9 @@
-
+ -
Employee Detail
+
{{'userProfile, emp-detail' | 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 6ee10295..6ecdd443 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -1,11 +1,4 @@ -.tipsPadding{ - padding: 10px 10px; - border-radius: 10px; - margin: 10px; - border: 2px solid #e4e5e7; - color: var(--customnavy); - - } + .actionBtn{ diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 59845218..3e914c50 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -3,6 +3,7 @@ + {{ts.trPK('userProfile','changepicture')}} diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index 2c7d5591..e0dbce93 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -45,7 +45,7 @@ export class TimeInput extends UiElement { const template = "" + " " + this.label + "" + - "" + + "" + "" return template; } diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html index e7dc61b3..997f0b79 100644 --- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html +++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html @@ -41,13 +41,15 @@ {{'vacation-rule, start-date' | translate}} - + {{'vacation-rule, end-date' | translate}} - + {{'vacation-rule, message-label' | translate}} diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index a216c9cc..f4fa3715 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -118,12 +118,14 @@ {{'vacation-rule, start-date' | translate}} + placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}" + doneText="{{ts.trPK('general','done')}}"> {{'vacation-rule, end-date' | translate}} + placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}" + doneText="{{ts.trPK('general','done')}}"> {{'vacation-rule, message-label' | translate}} diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 83a0b64f..7d008191 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -161,10 +161,14 @@ "en": "Verify its you", "ar": "Verify its you" }, - "check-user-text1":{ + "check-user-place-holder":{ "en":"Employee ID", "ar":"رقم الموظف " }, + "check-user-text1": { + "en": "Please Enter your Employee ID, A ", + "ar": "يرجى ادخال رقم الموظف " + }, "check-user-text2": { "en": "login Code ", "ar": "رمز تسجيل الدخول" @@ -225,6 +229,11 @@ "en": " The connection timeout expired due to an error in the network or servers may be busy!", "ar": " انتهت مهلة الاتصال بسبب خطأ في الشبكة أو الخوادم قد تكون مشغولة!" }, + "error-itg": { + "en": "Dear, this service is not available now, please try again later", + "ar": " هذه الخدمة غير متاحة الآن ، يرجى المحاولة مرة أخرى في وقت لاحق" + }, + "details": { "en": "Details", "ar": "التفاصيل" @@ -253,10 +262,22 @@ "en": "Cancel", "ar": "إلغاء" }, + "takePhoto": { + "en": "Take Photo", + "ar": "أخذ صورة" + }, + "Choose-from-Library": { + "en": "Choose from Library", + "ar": " الإختيار من قائمة الصور" + }, "done": { "en": "Done", "ar": "تم" }, + "moreAction": { + "en": "More Action", + "ar": "المزيد" + }, "close": { "en": "Close", "ar": "إغلق" @@ -998,7 +1019,7 @@ }, "changepicture": { "en": "Change Picture", - "ar": "تغيير الصوره" + "ar": "تغيير الصورة" }, "empNo": { "en": "Employee Number", @@ -1938,6 +1959,10 @@ } }, "worklistMain": { + "no-employee-available": { + "en": "No employees available to return for correction", + "ar": "لا يوجد موظفون متاحون للعودة للتصحيح" + }, "more": { "en": "More", "ar": "المزيد" @@ -1974,6 +1999,10 @@ "en": "Employee Information", "ar": "معلومات الموظف" }, + "employee-on-leave": { + "en": "Employee will also on leave", + "ar": "الموظف سوف يكون في اجازة ايضا" + }, "info": { "en": "Info", "ar": "تفاصيل" diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index c10ea687..424b3686 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -494,6 +494,17 @@ left: 66px; .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; + + } .noDataDiv{ background: #ffffff;