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 6cc023cc..71a243ac 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -318,6 +318,12 @@ export class ConfirmLoginComponent implements OnInit { 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; @@ -339,7 +345,7 @@ export class ConfirmLoginComponent implements OnInit { console.log(el.value); - + this.faceReconization(el); break; @@ -349,8 +355,12 @@ export class ConfirmLoginComponent implements OnInit { 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; @@ -463,17 +473,13 @@ export class ConfirmLoginComponent implements OnInit { request.LogInTokenID =this.loginData.LogInTokenID; - request.P_LEGISLATION_CODE ="SA"; + request.P_LEGISLATION_CODE =this.loginData.P_LEGISLATION_CODE;//"SA"; // request.VersionID ="2.0"; - - - - - // request.LanguageID = imeiData && imeiData.PreferredLanguage || request.LanguageID; +// request.LanguageID = imeiData && imeiData.PreferredLanguage || request.LanguageID; this.authService 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 2d15e3e7..631dcd70 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -1,510 +1,246 @@ -import { Component, OnInit } from "@angular/core"; - -import { ElementRef } from "@angular/core"; - -import { NavController, Platform } from "@ionic/angular"; - -import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; - -import { CommonService } from "src/app/hmg-common/services/common/common.service"; - -import { SharedDataService } from "src/app/hmg-common/services/shared-data-service/shared-data.service"; - -import { SMSCheckRequest } from "src/app/hmg-common/services/authentication/models/smscheck.request"; - -import { LoginModel } from "../models/LoginModel"; - -import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; - -import { SMSCheckResponse } from "src/app/hmg-common/services/authentication/models/smscheck.response"; - -import { Password } from "../models/password"; - +import { Component, OnInit } from '@angular/core'; +import { ElementRef } from '@angular/core'; +import { NavController, Platform } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; +import { SMSCheckRequest } from 'src/app/hmg-common/services/authentication/models/smscheck.request'; +import { LoginModel } from '../models/LoginModel'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { SMSCheckResponse } from 'src/app/hmg-common/services/authentication/models/smscheck.response'; +import { Password } from '../models/password'; import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/models/get-login-info.request'; -import * as moment from "moment"; - - +import * as moment from 'moment'; @Component({ - - selector: "app-sms-page", - - templateUrl: "./sms-page.page.html", - - styleUrls: ["./sms-page.page.scss"] - + selector: 'app-sms-page', + templateUrl: './sms-page.page.html', + styleUrls: ['./sms-page.page.scss'] }) export class SmsPageComponent implements OnInit { - - public static LOGIN_DATA = "LOGIN_DATA"; - - Channel: number = 0; - + public static LOGIN_DATA = 'LOGIN_DATA'; + Channel = 0; activationCode: string; - P_SESSION_ID: number; - P_USER_NAME: string; - timeInSeconds: any; - time: any; - runTimer: any; - hasStarted: any; - hasFinished: any; - remainingTime: any; - displayTime: any; - loginTokenID: string; - - public isForgetPwd: boolean = false; - - public isExpiredPwd: boolean = false; - - public count: number = 0; - + public isForgetPwd = false; + public isExpiredPwd = false; + public count = 0; private loginData = new LoginModel(); - - public deviceToken:any; - - public loginTypeData:any; - - public logo = "assets/icon/login/password.png"; - + public deviceToken: any; + public loginTypeData: any; + public logo = 'assets/icon/login/password.png'; + // tslint:disable-next-line: variable-name public smc_code: any = []; code: any; + // tslint:disable-next-line: variable-name user_name: string; + public isPostNoLoad = true; loginType: any; + activeType: any; constructor( - public navCtrl: NavController, - public translate: TranslatorService, - public common: CommonService, - private elementRef: ElementRef, - public authService: AuthenticationService, - public sharedData: SharedDataService, - public platform: Platform, - - - ) {} - - ngOnInit() { - + this.activeType=this.common.getActiveTypeLogin(); + console.log("activeType :"+this.activeType); this.count = 0; - this.initTimer(); - this.startTimer(); - - this.isForgetPwd = - - this.sharedData.getSharedData(Password.IS_FORGET_PSW) || false; - - this.isExpiredPwd = - - this.sharedData.getSharedData(Password.IS_EXPIRED_PSW) || false; - - this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); - - console.log("loginData : "+ this.loginData); - // this.loginType=this.loginTypeData.loginType; - this.deviceToken= this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); - - if(this.deviceToken == undefined){ - - this.deviceToken = localStorage.getItem("deviceToken"); - - - - } - - console.log("deviceToken :"+this.deviceToken); - - this.loginTypeData= this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); - this.loginType=this.loginTypeData.loginType; + this.isForgetPwd = this.sharedData.getSharedData(Password.IS_FORGET_PSW) || false; + this.isExpiredPwd = this.sharedData.getSharedData(Password.IS_EXPIRED_PSW) || false; + this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + this.deviceToken = this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); + // tslint:disable-next-line: triple-equals + if (this.deviceToken == undefined) { + this.deviceToken = localStorage.getItem('deviceToken'); + } + console.log('deviceToken :' + this.deviceToken); + this.loginTypeData = this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); + if( this.loginTypeData){ + this.loginType=this.loginTypeData.loginType; console.log("loginType :"+this.loginTypeData.loginType); - - - - + }else{ + this.loginType=1; + } } - - initTimer() { - - // Pomodoro is usually for 25 minutes - if (!this.timeInSeconds) { - this.timeInSeconds = 600; - } - - - this.time = this.timeInSeconds; - this.runTimer = false; - this.hasStarted = false; - this.hasFinished = false; - this.remainingTime = this.timeInSeconds; - - - this.displayTime = this.common.getSecondsAsDigitalClock(this.remainingTime); - } - - startTimer() { - this.runTimer = true; - this.hasStarted = true; - this.timerTick(); - } - - pauseTimer() { - this.runTimer = false; - } - - resumeTimer() { - this.startTimer(); - } - - timerTick() { - setTimeout(() => { - if (!this.runTimer) { - return; - } - this.remainingTime--; - - this.displayTime = this.common.getSecondsAsDigitalClock( - - this.remainingTime - - ); - + this.displayTime = this.common.getSecondsAsDigitalClock(this.remainingTime); if (this.remainingTime > 0) { - this.timerTick(); - } else { - this.hasFinished = true; - this.pauseTimer(); - this.navCtrl.pop(); - } - }, 1000); - } - - ionViewWillLeave() { - this.pauseTimer(); - } - - - checkOTPLength(){ - - console.log(this.activationCode.length); - - if(this.activationCode.length==4){ - + checkOTPLength() { + // tslint:disable-next-line: triple-equals + if (this.activationCode.length == 4) { this.checkVerificationCode(); - } - } checkVerificationCode() { - this.code=this.smc_code.join(''); - + this.code = this.smc_code.join(''); if (this.count < 3) { - - if ( - - this.code == undefined || - - this.code == null || - - this.code == "" - - ) { - + // tslint:disable-next-line: triple-equals + if (this.code == undefined || this.code == null || this.code == '') { // this.common.showAlert(this.translate.translate('verificationcode.emptyCode')); - } else { - this.count = this.count + 1; - if (this.isForgetPwd || this.isExpiredPwd) { - this.checkForgetPwdSMS(); - } else { - console.log("checkSMS"); this.checkSMS(); - } - } - } else { - - let msg: string = this.translate.trPK("general", "noOfTriesLogin"); - - this.common.JustAlertDialog(this.translate.trPK("general", "ok"), msg); - + const msg: string = this.translate.trPK('general', 'noOfTriesLogin'); + this.common.JustAlertDialog(this.translate.trPK('general', 'ok'), msg); } - } - - public checkSMS() { - - // alert("checkSMS in page") - console.log("code" + this.code); - const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); - - const request = new SMSCheckRequest(); - - - - request.LogInTokenID = data.LogInTokenID; - - request.activationCode = this.code; //code;this.activationCode; - - request.P_USER_NAME = data.P_USER_NAME; - - request.MobileNumber = data.MobileNumber; - - - - this.authService - - .checkSMS(request, () => {}, this.translate.trPK("general", "ok")) - - .subscribe((result: SMSCheckResponse) => { - - console.log(result); - + const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + const request = new SMSCheckRequest(); + request.LogInTokenID = data.LogInTokenID; + request.activationCode = this.code; // code;this.activationCode; + request.P_USER_NAME = data.P_USER_NAME; + request.MobileNumber = data.MobileNumber; + this.authService.checkSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { - - AuthenticationService.servicePrivilage=result.Privilege_List; - + AuthenticationService.servicePrivilage = result.Privilege_List; this.authService.setAuthenticatedUser(result).subscribe(() => { - - //call insert Mobile Login - console.log("insert"); - localStorage.setItem("emp-name",result.MemberInformationList[0].EMPLOYEE_NAME); - console.log("empnmae: "+ localStorage.getItem("emp-name")); - // localStorage.setItem("login-at", new Date().toISOString()); - this.user_name=result.MemberInformationList[0].EMPLOYEE_NAME; - - //get date and time of last login - let currDateTime = moment().format('MMM DD , YYYY HH:mm') - localStorage.setItem("login-at",currDateTime); - - if (this.platform.is("cordova")) { - // localStorage.setItem("full-name", result.P_USER_NAME); - + localStorage.setItem('emp-name', result.MemberInformationList[0].EMPLOYEE_NAME); + this.user_name = result.MemberInformationList[0].EMPLOYEE_NAME; + const currDateTime = moment().format('MMM DD , YYYY HH:mm'); + localStorage.setItem('login-at', currDateTime); + if (this.platform.is('cordova')) { this.insertMobileLogin(); - } - this.common.openHome(); - - - }); - } - }); - } - - - public insertMobileLogin(){ - - console.log("loginData" + this.loginData); - - let request = new GetLoginInfoRequest(); - + public insertMobileLogin() { + const request = new GetLoginInfoRequest(); this.authService.setPublicFields(request); - request.MobileNumber = this.loginData.MobileNumber; - - request.P_USER_NAME=this.loginData.P_USER_NAME; - - request.UserName=this.loginData.P_USER_NAME; - - request.LogInTokenID =this.loginData.LogInTokenID; - - request.CompanyID =1;//CompanyID - - request.DeviceType= this.common.getDeviceType(); - - request.DeviceToken=this.deviceToken;//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken; - - request.LoginType=this.loginTypeData.loginType; - - request.EmployeeName=this.user_name; - - this.authService - - .insertMobileLoginInfo( - - request, - - () => { }, - - this.translate.trPK("general", "ok") - - ) - - .subscribe((result: any) => { - - - - - - }); - + request.P_USER_NAME = this.loginData.P_USER_NAME; + request.UserName = this.loginData.P_USER_NAME; + request.LogInTokenID = this.loginData.LogInTokenID; + request.CompanyID = 1; // CompanyID + request.DeviceType = this.common.getDeviceType(); + request.DeviceToken = this.deviceToken; // "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken; + request.LoginType = this.loginTypeData.loginType; + request.EmployeeName = this.user_name; + this.authService.insertMobileLoginInfo(request, () => { }, this.translate.trPK('general', 'ok'), this.isPostNoLoad) + .subscribe((result: any) => { + console.log('successful insertMobileLogin' ); + }); } - - public checkForgetPwdSMS() { - const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); - const request = new SMSCheckRequest(); - - - request.LogInTokenID = data.LogInTokenID; - - request.activationCode =this.code;// this.activationCode; - + request.activationCode = this.code; // this.activationCode; request.P_USER_NAME = data.P_USER_NAME; - - console.log(data.LogInTokenID); - - console.log(data.P_USER_NAME); - - - - this.authService - - .checkForgetSMS(request, () => {}, this.translate.trPK("general", "ok")) - - .subscribe((result: SMSCheckResponse) => { - - console.log(result); - + this.authService.checkForgetSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { - - console.log(result); - if (this.isForgetPwd) { - this.common.openForgotPassword(); - - } - - if(this.isExpiredPwd) { - - this.sharedData.setSharedData(true,Password.IS_EXPIRED_PSW); - + } + if (this.isExpiredPwd) { + this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); this.common.openChangePassword(); - } - } - }); - } + onChange() { - const filtered = this.smc_code.filter(function (el) { + // tslint:disable-next-line: only-arrow-functions + const filtered = this.smc_code.filter(function(el) { if (el) { return el; } }); if (filtered.length === 4) { - //this.validate(); - console.log("validate"); this.checkVerificationCode(); } } goToNextInput(e) { - // let value = e.target.value; - // if (value.length === 1) { const key = e.which; const t = e.target; - let sib = t.nextElementSibling; - let sibPre =t.previousElementSibling; + const sib = t.nextElementSibling; + const sibPre = t.previousElementSibling; if (key !== 9 && (key < 48 || key > 57)) { if (key === 8 || key === 46) { - - - return true; } else { e.preventDefault(); @@ -515,22 +251,13 @@ export class SmsPageComponent implements OnInit { if (key === 9) { return true; } + if (sib) { - //sib = document.querySelector('input'); - if (e.target.value ==="") { - sibPre.setFocus()} - else{ + if (e.target.value === '') { + sibPre.setFocus(); + } else { sib.setFocus(); - } } } - // } else { - // e.target.value = value.substring(0, value.length - 1); - // } - - - - - - -} \ No newline at end of file + } +} 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/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/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index d418cfc5..9c2bcca4 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -555,10 +555,14 @@ export class AuthenticationService { - public insertMobileLoginInfo(request: GetLoginInfoRequest,onError: any, errorLabel: string): Observable { + // tslint:disable-next-line: max-line-length + public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable { this.authenticateRequest(request); - - return this.con.post(AuthenticationService.insertMobileLoginInfo,request,onError,errorLabel); + if (isPostNoLoad) { + return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); + } else { + return this.con.post(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); + } } 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/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 eeb5f349..b39d8768 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 @@ -208,6 +208,7 @@ export class WorkListMainItgComponent implements OnInit { actionService(action, comments?, grantRequests?) { + let url: string; let request = new itgRequest(); request.RequestType = this.request_name; @@ -223,17 +224,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; @@ -244,9 +263,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 @@ -254,9 +284,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; @@ -265,9 +304,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 @@ -280,9 +328,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')); @@ -291,7 +347,10 @@ export class WorkListMainItgComponent implements OnInit { } }, this.ts.trPK('general', 'ok'), - () => { this.actionSelected = '' }, this.ts.trPK('general', 'cancel'), + () => { + this.actionSelected = '' + }, + this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), this.confirmMsg(action)); @@ -299,6 +358,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-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 74d460f2..2a655824 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 @@ -56,12 +56,11 @@
- {{"replacementRoll, question" | translate}} : - {{pQuestion}} ? - {{"replacementRoll, answer" | translate}} - - {{"replacementRoll, enterNote" | translate}} - + {{"replacementRoll, question" | translate}} : + {{pQuestion}} ? + {{"replacementRoll, answer" | translate}} + + @@ -147,13 +146,10 @@ -
- {{"replacementRoll, question" | translate}} : - {{pQuestion}} ? - {{"replacementRoll, answer" | translate}} - - {{"replacementRoll, enterNote" | translate}} - +
+ + {{"replacementRoll, enterNote" | translate}} + 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 @@
-
+