diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index e700abcf..a0f03621 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -137,8 +137,8 @@ export class AppComponent implements OnInit { this.authService.checkAds({ EmployeeNumber: '', - ItgEnableAt: "Before Service Initiation", //After Service Submission - ItgServiceName: "Ticket" + ItgEnableAt: "After Service Submission", //After Service Submission + ItgServiceName: "Login" }, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => { var result = JSON.parse(res.Mohemm_ITG_ResponseItem).result.data; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 0bd553d1..da6e073c 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -169,11 +169,11 @@ export class HomePage implements OnInit { ngOnInit() { let openDigitalIDCard = this.sharedData.getSharedData("loginWithDigitalIDButton", true); - this.platform.backButton.subscribeWithPriority(9999, () => { - if (this.router.isActive('/home', true)) { - this.common.openHome(); - } - }); + // this.platform.backButton.subscribeWithPriority(9999, () => { + // if (this.router.isActive('/home', true)) { + // this.common.openHome(); + // } + // }); this.direction = TranslatorService.getCurrentLanguageName(); this.myTeamTitle = this.ts.trPK('myTeam', 'myTeam-header'); this.vacationRuleTitle = this.ts.trPK('vacation-rule', 'vacationRule'); diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts index 76fd5350..6a529cfc 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts @@ -95,6 +95,7 @@ export class HrRequestFormComponent implements OnInit { this.getTicketsByEmployee(); this.getTicketTypes(); this.getProject(); + //this.getCreateTicket(); @@ -295,6 +296,7 @@ export class HrRequestFormComponent implements OnInit { this.MowadhafiService.getCreateTicket(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { this.cs.stopLoading(); this.handlegetCreateTicketResult(result); + this.checkERM('After Service Submission'); }) } @@ -404,4 +406,44 @@ export class HrRequestFormComponent implements OnInit { } + + checkERM(status) { + + this.authService.checkAds({ + EmployeeNumber: '', + ItgEnableAt: status, //After Service Submission + ItgServiceName: "Ticket" + }, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => { + + var result = JSON.parse(res.Mohemm_ITG_ResponseItem).result.data; + + this.cs.sharedService.setSharedData( + result, + AuthenticationService.SERVEY_DATA + ) + if (!CommonService.SKIP && result) { + if (result.notificationType == 'Survey') { + this.cs.navigateForward('/erm-channel/survey'); + } else { + this.authService.adsDetails({ + "ItgNotificationMasterId": result['notificationMasterId'] + }, + () => { }, this.ts.trPK('general', 'ok') + ).subscribe((result) => { + var data = result.Mohemm_ITG_ResponseItem; + if (data) { + this.cs.sharedService.setSharedData( + JSON.parse(data), + AuthenticationService.ADS_DATA + ); + this.cs.navigateForward('/erm-channel/home'); + } + + }) + } + } + }) + + } + } diff --git a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts index 3f6aa2cf..ddcf1639 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts @@ -19,108 +19,145 @@ import { FileUploader } from 'ng2-file-upload'; }) export class HRRequestComponent implements OnInit { - public EmpName : string; - public EmpNum : string; - public EmpGroup : string; - public EmpMobile : string; - public EmpJob : string; - public EmpOrgName : string; - public EmpPayrol : string; - public EmpPosition : string; - public EmpEmail: string; - public EmpCatMeaning:string; - public EmpGRADENAME : string; - public EmpLocation : string; - public EmpImg : string; + public EmpName: string; + public EmpNum: string; + public EmpGroup: string; + public EmpMobile: string; + public EmpJob: string; + public EmpOrgName: string; + public EmpPayrol: string; + public EmpPosition: string; + public EmpEmail: string; + public EmpCatMeaning: string; + public EmpGRADENAME: string; + public EmpLocation: string; + public EmpImg: string; public userImage: any = '../assets/imgs/profile.png'; public loginData = new LoginModel(); public searchKeySelect = 'Complaints'; myColor: string = 'secondary'; public showRequestDetails = false; - public proID= "CS" + public proID = "CS" public inquiry: string; - public HR : string; - public complaints:string; - public Projectresult:any; - public EmpRelations:any; - public Hr:any; - public Payroll:any; - public GovRelation:any; - public projName:any; - public topicName:any; + public HR: string; + public complaints: string; + public Projectresult: any; + public EmpRelations: any; + public Hr: any; + public Payroll: any; + public GovRelation: any; + public projName: any; + public topicName: any; public departTypeList: any; - public topicTypeList:any; - public sectionTypeList:any; + public topicTypeList: any; + public sectionTypeList: any; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; - public projectDetial:any; - public projectDep:any; - public sectionDep:any; - - - public direction: string; - constructor( - public ts: TranslatorService, - public cs: CommonService, - public authService: AuthenticationService, - public sharedData: SharedDataService, - public events: Events, - public MowadhafiService: MowadhafiService, - private location: Location, - private menu: MenuController, - - ) { - this.direction = TranslatorService.getCurrentLanguageName(); - } + public projectDetial: any; + public projectDep: any; + public sectionDep: any; + + + public direction: string; + constructor( + public ts: TranslatorService, + public cs: CommonService, + public authService: AuthenticationService, + public sharedData: SharedDataService, + public events: Events, + public MowadhafiService: MowadhafiService, + private location: Location, + private menu: MenuController, + + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() { this.getUserInformation(); - + this.checkERM('Before Service Initiation'); + - } goback() { - this.location.back(); - + this.location.back(); + } - getUserInformation(){ + getUserInformation() { const request = { // P_SELECTED_EMPLOYEE_NUMBER:"121816", - P_SELECTED_RESP_ID:-999, - P_PAGE_NUM:1, - P_PAGE_LIMIT:1 + P_SELECTED_RESP_ID: -999, + P_PAGE_NUM: 1, + P_PAGE_LIMIT: 1 }; - this.MowadhafiService.getUserInfo(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleUserInfoResult(result); - - }) - } + this.MowadhafiService.getUserInfo(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleUserInfoResult(result); + + }) + } - handleUserInfoResult(result){ - this.EmpName = result.MemberInformationList[0].EMPLOYEE_NAME; - console.log("____________" + this.EmpName); - this.EmpNum = result.MemberInformationList[0].EMPLOYEE_NUMBER; - this.EmpGroup = result.MemberInformationList[0].BUSINESS_GROUP_NAME; - this.EmpMobile = result.MemberInformationList[0].EMPLOYEE_MOBILE_NUMBER; - this.EmpJob = result.MemberInformationList[0].JOB_NAME; - this.EmpOrgName = result.MemberInformationList[0].ORGANIZATION_NAME; - this.EmpPayrol = result.MemberInformationList[0].PAYROLL_NAME; - this.EmpPosition = result.MemberInformationList[0].POSITION_NAME; - this.EmpEmail = result.MemberInformationList[0].EMPLOYEE_EMAIL_ADDRESS; - this.EmpCatMeaning = result.MemberInformationList[0].EMPLOYMENT_CATEGORY_MEANING; - this.EmpGRADENAME = result.MemberInformationList[0].GRADE_NAME; - this.EmpLocation = result.MemberInformationList[0].LOCATION_NAME; - this.EmpImg = result.MemberInformationList[0].EMPLOYEE_IMAGE - // console.log("total no "+this.EmpTotal) + handleUserInfoResult(result) { + this.EmpName = result.MemberInformationList[0].EMPLOYEE_NAME; + console.log("____________" + this.EmpName); + this.EmpNum = result.MemberInformationList[0].EMPLOYEE_NUMBER; + this.EmpGroup = result.MemberInformationList[0].BUSINESS_GROUP_NAME; + this.EmpMobile = result.MemberInformationList[0].EMPLOYEE_MOBILE_NUMBER; + this.EmpJob = result.MemberInformationList[0].JOB_NAME; + this.EmpOrgName = result.MemberInformationList[0].ORGANIZATION_NAME; + this.EmpPayrol = result.MemberInformationList[0].PAYROLL_NAME; + this.EmpPosition = result.MemberInformationList[0].POSITION_NAME; + this.EmpEmail = result.MemberInformationList[0].EMPLOYEE_EMAIL_ADDRESS; + this.EmpCatMeaning = result.MemberInformationList[0].EMPLOYMENT_CATEGORY_MEANING; + this.EmpGRADENAME = result.MemberInformationList[0].GRADE_NAME; + this.EmpLocation = result.MemberInformationList[0].LOCATION_NAME; + this.EmpImg = result.MemberInformationList[0].EMPLOYEE_IMAGE + // console.log("total no "+this.EmpTotal) + } + + + public createRequest() { + this.cs.openHRRequestFormPage(); + // this.menu.toggle(); + } + checkERM(status) { + + this.authService.checkAds({ + EmployeeNumber: '', + ItgEnableAt: status, //After Service Submission + ItgServiceName: "Ticket" + }, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => { + + var result = JSON.parse(res.Mohemm_ITG_ResponseItem).result.data; + + this.cs.sharedService.setSharedData( + result, + AuthenticationService.SERVEY_DATA + ) + if (!CommonService.SKIP && result) { + if (result.notificationType == 'Survey') { + this.cs.navigateForward('/erm-channel/survey'); + } else { + this.authService.adsDetails({ + "ItgNotificationMasterId": result['notificationMasterId'] + }, + () => { }, this.ts.trPK('general', 'ok') + ).subscribe((result) => { + var data = result.Mohemm_ITG_ResponseItem; + if (data) { + this.cs.sharedService.setSharedData( + JSON.parse(data), + AuthenticationService.ADS_DATA + ); + this.cs.navigateForward('/erm-channel/home'); + } + + }) + } } + }) - - public createRequest() { - this.cs.openHRRequestFormPage(); - // this.menu.toggle(); - } + } }