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 2439bfae..905d542f 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -75,7 +75,7 @@ (click)="OpenAttachFiles(attachRes.FILE_DATA,attachRes.FILE_CONTENT_TYPE)"> - @@ -100,7 +100,7 @@
{{'confirmAddEit, approverList' | translate}}
-
+

{{ 'general, empty' | translate}}

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 96965e58..fb652af8 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -186,7 +186,7 @@ ion-card-content.confirm-details{ .timeline .timeline-item { - width: 40px; + // width: 40px; } @@ -199,8 +199,8 @@ ion-card-content.confirm-details{ .empImge{ border-radius: 50%; - width:100%; - height: 100%; + width:60px; + height: 60px; border: #dedede solid 1px; } 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 87c43df9..7e556283 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts @@ -1,6 +1,6 @@ -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 { 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 { ApproversList } from '../models/approvers'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { WorkListButtonRequest } from 'src/app/eit/models/NotificationButtonReq'; @@ -16,23 +16,23 @@ import { WorkListAttachViewComponent } from 'src/app/notification/work-list-atta import { FileUploader } from 'ng2-file-upload'; import { SubmitAbsenceModalComponent } from '../submit-absence-modal/submit-absence-modal.component'; @Component({ - selector: "app-absence-confirm", - templateUrl: "./absence-confirm.component.html", - styleUrls: ["./absence-confirm.component.scss"] + selector: 'app-absence-confirm', + templateUrl: './absence-confirm.component.html', + styleUrls: ['./absence-confirm.component.scss'] }) export class AbsenceConfirmComponent implements OnInit { direction:string; P_TransactionID: number; - approversList: ApproversList; - selEmp: string = ""; + approversList = []; + selEmp: string = ''; respID: number; - absComments: string = ""; + absComments: string = ''; selMenu: MenuResponse; attachItems: any; attachListDisplay: any; isTrue: any = 0; getPassNotificationDetails: any; - menuType: string = ""; + menuType: string = ''; attachmentRes: any; objIndex1: any; attachListOver: any = []; @@ -63,7 +63,7 @@ export class AbsenceConfirmComponent implements OnInit { true ); this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; - this.menuType = "E"; + this.menuType = 'E'; this.respID = -999; // this.getApproversList(); // console.log("this.getPassNotificationDetails.P_NOTIFICATION_ID :"+this.getPassNotificationDetails.NOTIFICATION_ID); @@ -130,7 +130,7 @@ export class AbsenceConfirmComponent implements OnInit { return el.isSuccess == true; }); this.attachListOver = filtered; - let msg: string = ""; + let msg: string = ''; // msg = this.translate.translate("addAttach.errorMsg"); //this.common.showAlert(msg); } @@ -168,7 +168,7 @@ 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"); + let msg: string = this.ts.trPK('general', 'messageSuccess'); this.common.presentAlert(msg); // } @@ -180,7 +180,7 @@ export class AbsenceConfirmComponent implements OnInit { getApproversList() { let body: any = { P_TRANSACTION_ID: this.P_TransactionID, - P_AME_TRANSACTION_TYPE: "SSHRMS", + P_AME_TRANSACTION_TYPE: 'SSHRMS', P_PAGE_NUM: 1, P_PAGE_LIMIT: 1000 }; @@ -210,7 +210,7 @@ export class AbsenceConfirmComponent implements OnInit { }); modal.onDidDismiss() .then((data) => { - if (data == "cancel" || data == "undefined") { + if (data == 'cancel' || data == 'undefined') { return; } else { if (!str) { @@ -246,7 +246,7 @@ async openSubmitModal() { .then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; } else { this.startAbApproval(); @@ -324,7 +324,7 @@ async openSubmitModal() { this.submitConService.updateAttach(req).subscribe((result: any) => { if (this.common.validResponse(result)) { if (result.MessageStatus == 1) { - let msg: string = ""; + let msg: string = ''; // msg = this.translate.translate("addAttach.attachUpdate"); // this.common.showAlert(msg); @@ -351,7 +351,7 @@ async openSubmitModal() { }; this.submitConService.delteAttach(req).subscribe((result: any) => { if (this.common.validResponse(result)) { - if (result.DeleteAttachmentList.P_RETURN_STATUS === "S") { + if (result.DeleteAttachmentList.P_RETURN_STATUS === 'S') { this.getAttachment(this.getPassNotificationDetails.NOTIFICATION_ID); // let msg: string = ""; // msg = this.translate.translate("addAttach.deleteAttach"); @@ -391,8 +391,8 @@ async openSubmitModal() { // this.uploader.onWhenAddingFileFailed = function (item: any, filter: any, options: any){ if (!(this.filterAllowedType.indexOf(input.target.files[0].type) > -1)) { - let msg: string = ""; - msg = this.ts.trPK("general", "notSupport"); + let msg: string = ''; + msg = this.ts.trPK('general', 'notSupport'); this.common.presentAlert(msg); return } // todo: show alert that you tried uploading wrong files @@ -427,7 +427,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('.'); diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 1856df8d..0ca580f6 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -186,9 +186,9 @@ getAbsenceTransaction() { } } } -doInfinite() { +doInfinite(event: any) { if (!this.IsReachEnd) { - //this.P_PAGE_NUM++; + // this.P_PAGE_NUM++; const request = { P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, P_MENU_TYPE: this.selMenu.List_Menu.MENU_TYPE, diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.ts b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.ts index 53dc2393..eee3bd58 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.ts +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.ts @@ -9,9 +9,9 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl styleUrls: ['./submit-absence-modal.component.scss'], }) export class SubmitAbsenceModalComponent implements OnInit { - submitAbsAttachmentList :any =[]; + submitAbsAttachmentList: any = []; absComments: string; - constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){ + constructor( public ts: TranslatorService, private modalCtrl: ModalController, private cs: CommonService){ this.submitAbsAttachmentList = this.cs.sharedService.getSharedData('submitAbsAttachmentList', false); this.absComments = this.cs.sharedService.getSharedData('absComments', false); } 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 cd019974..9513fa16 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ElementRef } from "@angular/core"; +import { Component, OnInit, ElementRef, ChangeDetectorRef } 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 { MenuService } from "src/app/hmg-common/services/menu/menuservice.service"; @@ -27,6 +27,7 @@ import {ReplacementListComponent} from "../../vacation-rule/replacement-list/rep import {ReplacmentResponse} from "../models/replacment-response"; import { AbsenceResponse } from '../models/absence.response'; import { AbsenceReplacementListComponent } from '../absence-replacement-list/absence-replacement-list.component'; +import { AbsenceNotificatonBodyResponse } from 'src/app/notification/models/AbsenceNotificationBodyRes'; @Component({ selector: "app-submit-absence", templateUrl: "./submit-absence.component.html", @@ -84,10 +85,13 @@ export class SubmitAbsenceComponent implements OnInit { public datePicker: DatePicker, public ts: TranslatorService, private elementRef: ElementRef, + private changeDetectorRef: ChangeDetectorRef ) { ////*new add*///// /**********resubmit************ */ + this.getPassNotificationDetails = this.common.sharedService.getSharedData(AbsenceNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassdirfromNotifiPage = this.common.sharedService.getSharedData('dirfromNotificationPage'); //this.getPassNotificationDetails = this.common.sharedService.getSharedData(AbsenceNotificatonBodyResponse.NOT_WORKLIST, true); // this.getPassdirfromNotifiPage = this.navParams.get('dirfromNotificationPage'); if (this.getPassdirfromNotifiPage) { @@ -97,7 +101,8 @@ export class SubmitAbsenceComponent implements OnInit { this.notificationId = this.getPassNotificationDetails.NOTIFICATION_ID; this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.respID = -999; - //this.submitAbsObjList = this.navParams.get('submitAbsObjList'); + this.submitAbsObjList = this.common.sharedService.getSharedData('submitAbsObjList'); + console.log() } else { this.action = "CREATE"; this.selEmp = this.common.sharedService.getSharedData( @@ -169,6 +174,7 @@ export class SubmitAbsenceComponent implements OnInit { } } calcDay() { + console.log("calcDay" ); let msg: string = ""; if ( this.startDate == undefined || @@ -260,10 +266,13 @@ export class SubmitAbsenceComponent implements OnInit { } public onTypeAbsenceChange() { + console.log("this.absenceType: "+ this.absenceType); if (this.absenceType) { let obj: any = this.absenceTypeList.find( s => s.ABSENCE_ATTENDANCE_TYPE_ID == this.absenceType ); + console.log("obj : "+ obj); + if (obj) this.absenceTypeName = obj.DESC_FLEX_CONTEXT_CODE; else this.absenceTypeName = null; this.getAbsenceDffStructure(); @@ -1138,6 +1147,8 @@ export class SubmitAbsenceComponent implements OnInit { this.action = this.submitAbsObjList[i].ACTION; if (this.submitAbsObjList[i].SEGMENT_NAME == "ABSENCE_TYPE") { this.absenceType = val; + this.changeDetectorRef.detectChanges(); + } if (this.submitAbsObjList[i].SEGMENT_NAME == "DESC_FLEX_CONTEXT_CODE") { this.absenceTypeName = val; diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.ts b/Mohem/src/app/absence/view-attachments/view-attachments.component.ts index e126968c..dce19a90 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.ts +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.ts @@ -1,21 +1,21 @@ -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 { ModalController } from "@ionic/angular"; -import { WorkListAttachViewComponent } from "src/app/notification/work-list-attach-view/work-list-attach-view.component"; -import { AbsenceAttahcment } from "../models/abs.attach"; -import { AbsenceAttahcmentResponse } from "../models/abs.attach.response"; +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 { ModalController } from '@ionic/angular'; +import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; +import { AbsenceAttahcment } from '../models/abs.attach'; +import { AbsenceAttahcmentResponse } from '../models/abs.attach.response'; @Component({ - selector: "app-view-attachments", - templateUrl: "./view-attachments.component.html", - styleUrls: ["./view-attachments.component.scss"] + selector: 'app-view-attachments', + templateUrl: './view-attachments.component.html', + styleUrls: ['./view-attachments.component.scss'] }) export class ViewAttachmentsComponent implements OnInit { AttachmentList: AbsenceAttahcment[]; constructor( public common: CommonService, public modalCtrl: ModalController, - private ts: TranslatorService + public ts: TranslatorService ) {} ngOnInit() { @@ -26,7 +26,7 @@ export class ViewAttachmentsComponent implements OnInit { async OpenAttachFiles(value, Type) { this.common.sharedService.setSharedData( { displayData: value, TypeData: Type }, - "WorkListAttachViewPage" + 'WorkListAttachViewPage' ); const modal = await this.modalCtrl.create({ component: WorkListAttachViewComponent diff --git a/Mohem/src/app/accrual-balances/home/home.component.ts b/Mohem/src/app/accrual-balances/home/home.component.ts index d26f4574..1171adb0 100644 --- a/Mohem/src/app/accrual-balances/home/home.component.ts +++ b/Mohem/src/app/accrual-balances/home/home.component.ts @@ -33,7 +33,7 @@ export class HomeComponent implements OnInit { } }); } - private getAccrualBalance() { + public getAccrualBalance() { if (this.Sdate) { let today = new Date(this.Sdate); let day = today.getDate(); diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 36557be0..1cd935c5 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -179,7 +179,7 @@
-
+
@@ -258,6 +258,16 @@ + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + + + + @@ -275,14 +285,7 @@ --> - - - - - - {{ts.trPK('myTeam','myTeam-header')}} - - + diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 0a08df19..6021ea82 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -129,7 +129,8 @@ export class AppComponent implements OnInit, AfterViewInit { this.events.subscribe('myTeamFlag', myTeamFlag => { this.TeamFlag = myTeamFlag; }); - console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); + // this.TeamFlag = this.cs.sharedService.getSharedData("myTeamFlag",false); + // console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); } private initializeDirection() { this.direction = TranslatorService.getCurrentDirection(); @@ -155,7 +156,8 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.enable(false); this.logoutFlage=true; this.events.publish('logoutFlage', this.logoutFlage); - + this.cs.setUpdateImage("",false); + this.TeamFlag ="false"; this.getLastLoginInfo(); // this.cs.openLogin(); diff --git a/Mohem/src/app/attendance/home/home.component.ts b/Mohem/src/app/attendance/home/home.component.ts index 345c16c9..4e9fe3dc 100644 --- a/Mohem/src/app/attendance/home/home.component.ts +++ b/Mohem/src/app/attendance/home/home.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Geolocation } from '@ionic-native/geolocation/ngx'; import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + @Component({ selector: 'app-home', @@ -9,39 +11,38 @@ import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; }) export class HomeComponent implements OnInit { - zbarOptions:any; - scannedResult:any; - lat : any; - longt : any; - constructor(private zbar: ZBar, private geolocation: Geolocation) { + zbarOptions: any; + scannedResult: any; + lat: any; + longt: any; + constructor(public ts: TranslatorService, private zbar: ZBar, private geolocation: Geolocation) { this.zbarOptions = { flash: 'off', drawSight: false - } - console.log("your currnt location is"); + }; + console.log('your currnt location is'); this.geolocation.getCurrentPosition().then((resp) => { // resp.coords.latitude // resp.coords.longitude - //console.log("Loc 2"); + // console.log("Loc 2"); console.log(resp.coords.latitude); console.log(resp.coords.longitude); - this.lat=resp.coords.latitude; - this.longt=resp.coords.longitude; + this.lat = resp.coords.latitude; + this.longt = resp.coords.longitude; }).catch((error) => { console.log('Error getting location', error); }); - this.scanCode(); + this.scanCode(); } ngOnInit() {} - onClick() - { + onClick() { this.scanCode(); } - scanCode(){ + scanCode() { this.zbar.scan(this.zbarOptions) .then(result => { console.log(result); // Scanned code diff --git a/Mohem/src/app/authentication/change-password/change-password.component.html b/Mohem/src/app/authentication/change-password/change-password.component.html index 939e66ba..7f25dbc6 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -27,33 +27,42 @@ - +

{{'changePassword,newPassword' | translate}}

+ + + - +
- + +
\ No newline at end of file diff --git a/Mohem/src/app/authentication/change-password/change-password.component.scss b/Mohem/src/app/authentication/change-password/change-password.component.scss index baffb4ff..727737ed 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.scss +++ b/Mohem/src/app/authentication/change-password/change-password.component.scss @@ -29,3 +29,7 @@ width: 315px; } +.disabledButton{ + opacity:.5; + +} diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index 455ffffb..6ad7b9be 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -12,6 +12,7 @@ import { SharedDataService } from 'src/app/hmg-common/services/shared-data-servi import {LoginComponent} from "src/app/authentication/login/login.component"; import { Password } from '../models/password'; import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +//import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-change-password', @@ -20,14 +21,19 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo }) export class ChangePasswordComponent implements OnInit { private loginData = new LoginModel(); - public P_NEW_PASSWORD: string; - public P_Confirm_NEW_PASSWORD : string; - public P_OLD_PASSWORD : string; + public P_NEW_PASSWORD: string = ""; + public P_Confirm_NEW_PASSWORD : string = ""; + public P_OLD_PASSWORD : string = ""; public P_USER_NAME : string; public logo = "assets/icon/login/lock.png"; userData: any = {}; public isExpiredPwd: boolean = false; + public NEW_PASSWORD: boolean = false; + public Confirm_NEW_PASSWORD: boolean = false; + public OLD_PASSWORD: boolean = false; + //public profile_form: FormGroup; + constructor( public cs: CommonService, public authService: AuthenticationService, @@ -36,7 +42,9 @@ export class ChangePasswordComponent implements OnInit { public ts: TranslatorService, public smsService: SmsReaderService, public changeDetector: ChangeDetectorRef, - public sharedData: SharedDataService) { + public sharedData: SharedDataService, + // public formBuilder: FormBuilder, + ) { console.log("change password constructor"); } @@ -48,6 +56,11 @@ export class ChangePasswordComponent implements OnInit { this.P_USER_NAME =data.P_USER_NAME; console.log(this.isExpiredPwd); console.log(this.P_USER_NAME); + + + // this.profile_form = this.formBuilder.group({ + // password: ['', Validators.compose([Validators.minLength(8)])] + // }); // this.authService // .loadAuthenticatedUser() // .subscribe((user: AuthenticatedUser) => { @@ -119,6 +132,43 @@ export class ChangePasswordComponent implements OnInit { } }); } + onChangeCNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_Confirm_NEW_PASSWORD.length >= 3) { + this.Confirm_NEW_PASSWORD=true; + + }else{ + this.Confirm_NEW_PASSWORD=false; + + } } + +onChangeNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_NEW_PASSWORD.length >= 3) { + this.NEW_PASSWORD=true; + +}else{ + this.NEW_PASSWORD=false; + +} + +} +onChangeOP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_OLD_PASSWORD.length >= 3) { + this.OLD_PASSWORD=true; + +}else{ + this.OLD_PASSWORD=false; + +} + +} + +} 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 0e57adf1..a4a934f8 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -44,7 +44,7 @@ - + diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 159c97af..46cecfb8 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -59,7 +59,7 @@
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index c1dd4c25..5736609d 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -1,56 +1,28 @@ -import { Component, OnInit, NgZone, OnDestroy } from "@angular/core"; -import { CommonService } from "src/app/hmg-common/services/common/common.service"; -import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; -import { Router } from "@angular/router"; -import { AlertController, Platform, Events } from "@ionic/angular"; -import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; -import { CheckUserAuthenticationResponse } from "src/app/hmg-common/services/authentication/models/check-user-auth.response"; -import { SmsReaderService } from "src/app/hmg-common/services/sms/sms-reader.service"; -import { FingerprintAIO } from "@ionic-native/fingerprint-aio/ngx"; -import { Device } from "@ionic-native/device/ngx"; -import { SplashScreen } from "@ionic-native/splash-screen/ngx"; -import { SharedDataService } from "src/app/hmg-common/services/shared-data-service/shared-data.service"; -import { LoginModel } from "../models/LoginModel"; -import { LoginRequest } from "src/app/hmg-common/services/authentication/models/login.request"; +import { Component, OnInit, NgZone, OnDestroy } from '@angular/core'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { Router } from '@angular/router'; +import { AlertController, Platform, Events } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/authentication/models/check-user-auth.response'; +import { SmsReaderService } from 'src/app/hmg-common/services/sms/sms-reader.service'; +import { FingerprintAIO } from '@ionic-native/fingerprint-aio/ngx'; +import { Device } from '@ionic-native/device/ngx'; +import { SplashScreen } from '@ionic-native/splash-screen/ngx'; +import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; +import { LoginModel } from '../models/LoginModel'; +import { LoginRequest } from 'src/app/hmg-common/services/authentication/models/login.request'; import { Password } from '../models/password'; import { CheckUserAuthenticationRequest } from 'src/app/hmg-common/services/authentication/models/check-user-auth.request'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; import { PushService } from 'src/app/hmg-common/services/push/push.service'; @Component({ - selector: "login", - templateUrl: "./login.component.html", - styleUrls: ["./login.component.scss"] + selector: 'login', + templateUrl: './login.component.html', + styleUrls: ['./login.component.scss'] }) export class LoginComponent implements OnInit, OnDestroy { - appLang: number = 1; - isExpired: boolean = false; - isSupportAr: boolean = false; - isAppleStore: boolean = false; - memberLogin: any = {}; - private password: string; - private language: string; - private username: string; - private remeberMe: boolean; - private iosLink: string; - private androidLink: string; - private currentLang: any = 1; - private patientOutSA: boolean; - private loginTokenID: string; - private isMobileFingerPrint: boolean; - private FingerPrintPatientIdentificationID: string; - private loginData = new LoginModel(); - private empname:any; - private logintype:any; - public loginDiv:boolean =true; - public welcomeBack:boolean =false; - public logo = "assets/icon/login/password.png"; - deviceToken: any=""; - user: boolean =false; - DeviceType: string; - requestGetLoginInfo:any; - logoutFlage: boolean ; - getuser:any=""; constructor( public cs: CommonService, @@ -60,20 +32,21 @@ export class LoginComponent implements OnInit, OnDestroy { public ts: TranslatorService, public smsService: SmsReaderService, private faio: FingerprintAIO, - public events:Events, + public events: Events, public ngZone: NgZone, public device: Device, public splash: SplashScreen, public sharedData: SharedDataService, public plt: Platform, public pushService: PushService - ) { - this.events.subscribe("logoutFlage", logoutFlage => { - console.log("login compont logoutFlage: "+logoutFlage); - if(logoutFlage == true){ - console.log(" subscribe check logoutFlage: "+logoutFlage); + ) { + this.events.subscribe('logoutFlage', logoutFlage => { + console.log('login compont logoutFlage: ' + logoutFlage); + // tslint:disable-next-line: triple-equals + if (logoutFlage == true) { + console.log(' subscribe check logoutFlage: ' + logoutFlage); this.logoutFlage = logoutFlage; - localStorage.setItem('logoutFlage',logoutFlage); + localStorage.setItem('logoutFlage', logoutFlage); } }); @@ -82,15 +55,44 @@ export class LoginComponent implements OnInit, OnDestroy { false ); // alert(" this.getuser "+this.getuser); - if(this.getuser){ + if (this.getuser) { this.user = true; - } - else{ + } else { this.user = false; - + } } + appLang = 1; + isExpired = false; + isSupportAr = false; + isAppleStore = false; + memberLogin: any = {}; + public password: string; + private language: string; + public username: string; + public remeberMe: boolean; + private iosLink: string; + private androidLink: string; + public currentLang: any = 1; + private patientOutSA: boolean; + private loginTokenID: string; + private isMobileFingerPrint: boolean; + private FingerPrintPatientIdentificationID: string; + private loginData = new LoginModel(); + private empname: any; + private logintype: any; + public loginDiv = true; + public welcomeBack = false; + public logo = 'assets/icon/login/password.png'; + deviceToken: any = ''; + user = false; + DeviceType: string; + requestGetLoginInfo: any; + logoutFlage: boolean ; + getuser: any = ''; + + private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { console.log("ENAD TEST!!!") @@ -103,7 +105,7 @@ export class LoginComponent implements OnInit, OnDestroy { this.currentLang = TranslatorService.getCurrentLanguageCode(); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) - + // this.getuser = this.cs.sharedService.getSharedData( // AuthenticationService.IMEI_USER_DATA, @@ -116,61 +118,62 @@ export class LoginComponent implements OnInit, OnDestroy { // } - this.events.subscribe("user", user => { - console.log("login compont: "+user); + this.events.subscribe('user', user => { + console.log('login compont: ' + user); this.user = user; - + }); - - - - this.deviceToken= localStorage.getItem('devicyeToken'); - console.log("let deviceToken" + this.deviceToken); - if (this.deviceToken) { + + + this.deviceToken = localStorage.getItem('devicyeToken'); + console.log('let deviceToken' + this.deviceToken); + + if (this.deviceToken) { console.log('login enabled first time: ' + this.deviceToken); } else { - console.log("no deviceToken" ); + console.log('no deviceToken' ); - this.pushService.startReceiving(); - setTimeout(() => { + this.pushService.startReceiving(); + setTimeout(() => { // alert('login enabled second time: ' + this.deviceToken); }, 1000); } - + // setTimeout(() => { // alert("this.logoutFlage in setTime" +localStorage.getItem('logoutFlage')); // alert("this.this.user in setTime" + this.user); // if(localStorage.getItem('logoutFlage')== "true"){ // this.getLastLoginInfo(); - + // } // },1000); - - - //here will delete below part and depdding on user (response from getMobileInfo) - this.username = localStorage.getItem("user"); - this.password = localStorage.getItem("password"); //****// - let remember = localStorage.getItem("remember");//****// - this.empname= localStorage.getItem("emp-name"); - this.logintype= localStorage.getItem("login-type"); - if (remember == "true") { this.remeberMe = true } else { this.remeberMe = false } - //here will be check on user if exite then s part and depdding on user (response from getMobileInfo) - if(this.user){ + // here will delete below part and depdding on user (response from getMobileInfo) + this.username = localStorage.getItem('user'); + this.password = localStorage.getItem('password'); // ****// + const remember = localStorage.getItem('remember'); // ****// + this.empname = localStorage.getItem('emp-name'); + this.logintype = localStorage.getItem('login-type'); + // tslint:disable-next-line: triple-equals + if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; } + + // here will be check on user if exite then s part and depdding on user (response from getMobileInfo) + + if (this.user) { // this.loginDiv=false; // this.welcomeBack=true; - }else{ + } else { // this.user=true; // this.welcomeBack=false; } @@ -200,8 +203,7 @@ export class LoginComponent implements OnInit, OnDestroy { this.currentLang = TranslatorService.getCurrentLanguageCode(); } } - - private forgetPasswordPage() { + public forgetPasswordPage() { this.cs.openUserForgot(); } @@ -213,15 +215,15 @@ export class LoginComponent implements OnInit, OnDestroy { } public addValue(e): void { - // console.log(e.currentTarget.checked); - this.remeberMe = true;//e.currentTarget.checked; + // console.log(e.currentTarget.checked); + this.remeberMe = true; // e.currentTarget.checked; this.remeberMyInfo(); } public remeberMyInfo() { // if (this.remeberMe) { - if(this.username){localStorage.setItem("user", this.username);} - if(this.password){localStorage.setItem("password", this.password);} - localStorage.setItem("remember", "true"); + if (this.username) {localStorage.setItem('user', this.username); } + if (this.password) {localStorage.setItem('password', this.password); } + localStorage.setItem('remember', 'true'); // } else { // localStorage.setItem("user", ""); // localStorage.setItem("password", ""); @@ -230,21 +232,21 @@ export class LoginComponent implements OnInit, OnDestroy { } public onLogin() { - console.log("onLogin"); + console.log('onLogin'); // this.checkAppUpdated(); // this.checkUserAuthentication(); - this.deviceToken = localStorage.getItem('deviceToken'); - console.log("let deviceToken" + this.deviceToken); + this.deviceToken = localStorage.getItem('deviceToken'); + console.log('let deviceToken' + this.deviceToken); - if (this.deviceToken) { + if (this.deviceToken) { console.log('login enabled first time: ' + this.deviceToken); this.checkAppUpdated(); } else { - console.log("no deviceToken" ); + console.log('no deviceToken' ); - this.pushService.startReceiving(); - setTimeout(() => { + this.pushService.startReceiving(); + setTimeout(() => { this.deviceToken = localStorage.getItem('deviceToken'); this.checkAppUpdated(); console.log('login enabled second time: ' + this.deviceToken); @@ -257,31 +259,34 @@ export class LoginComponent implements OnInit, OnDestroy { () => { /* Write code for error */ }).subscribe((result: CheckAppVersionResponse) => { + // tslint:disable-next-line: triple-equals if (result.MessageStatus == 2 && result.ErrorType == 4) { - this.cs.presentAcceptDialog(result.ErrorEndUserMessage,()=>{ - this.handleAppUpdate(result) + this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { + this.handleAppUpdate(result); }); + // tslint:disable-next-line: triple-equals } else if (result.MessageStatus == 1) { this.checkUserAuthentication(); } }); } - private handleAppUpdate(result){ + private handleAppUpdate(result) { this.iosLink = result.IOSLink; this.androidLink = result.AndroidLink; if (this.plt.is('android')) { - if (this.androidLink) + if (this.androidLink) { window.open(this.androidLink, '_system'); - } - else if (this.plt.is('ios')) { - if (this.iosLink) + } + } else if (this.plt.is('ios')) { + if (this.iosLink) { window.open(this.iosLink, '_system'); + } } } private checkUserAuthentication() { - console.log("debug Here!!"); + console.log('debug Here!!'); console.log(this.username); console.log(this.language); console.log(this.password); @@ -294,13 +299,13 @@ export class LoginComponent implements OnInit, OnDestroy { console.log(request); this.authService .login(request, () => { - console.log("error here"); - //console.log(result.MessageStatus); - //this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); - //this.userCheck(); - }, this.ts.trPK("general", "ok")) + console.log('error here'); + // console.log(result.MessageStatus); + // this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); + // this.userCheck(); + }, this.ts.trPK('general', 'ok')) .subscribe((result: CheckUserAuthenticationResponse) => { - console.log("success"); + console.log('success'); this.cs.stopLoading(); if (this.cs.validResponse(result)) { // alert("result.MemberLoginList.EMPLOYEE_NAME :" + result.MemberLoginList[0].EMPLOYEE_NAME); @@ -312,14 +317,14 @@ export class LoginComponent implements OnInit, OnDestroy { this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); this.remeberMyInfo(); - //this.cs.openSMSPage(); phase#1 one type of OTP + // this.cs.openSMSPage(); phase#1 one type of OTP // if(!this.welcomeBack){ - this.cs.openConfirmLoginPage();//phase#2 add 4 types for OTP + this.cs.openConfirmLoginPage(); // phase#2 add 4 types for OTP // } } else { - console.log("result.IsPasswordExpired"); + console.log('result.IsPasswordExpired'); console.log(result.IsPasswordExpired); if (result.IsPasswordExpired) { this.presentPasswordExpiredDialog(); @@ -334,11 +339,11 @@ export class LoginComponent implements OnInit, OnDestroy { async presentPasswordExpiredDialog() { const alert = await this.alertController.create({ - header: this.ts.trPK("general", "confirm"), - message: this.ts.trPK("login", "password-expired"), + header: this.ts.trPK('general', 'confirm'), + message: this.ts.trPK('login', 'password-expired'), buttons: [ { - text: this.ts.trPK("general", "ok"), + text: this.ts.trPK('general', 'ok'), handler: () => { console.log('Confirm Okay'); this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); @@ -371,23 +376,21 @@ export class LoginComponent implements OnInit, OnDestroy { }); } - private checkUserResult: CheckUserAuthenticationResponse; - private sendSMSForForgotPassword() { this.cs.startLoading(); - let changePwdObj = new LoginRequest(); + const changePwdObj = new LoginRequest(); changePwdObj.MobileNumber = this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER; changePwdObj.P_USER_NAME = this.username; changePwdObj.P_MOBILE_NUMBER = this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER; this.authService.sendPublicSMS( changePwdObj, () => { - //this.sendSMSForForgotPassword(); + // this.sendSMSForForgotPassword(); /* Write code for error */ }, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => { if (this.cs.validResponse(result)) { this.checkUserResult = result; - console.log("2"); + console.log('2'); console.log(result); this.loginData.LogInTokenID = result.LogInTokenID; this.loginData.P_USER_NAME = this.username; @@ -403,31 +406,31 @@ export class LoginComponent implements OnInit, OnDestroy { } login() { - console.log("login emit"); - console.log("login"); - // this.checkUserAuthentication(); - //this.loginDiv=true; - this.user=false; + console.log('login emit'); + console.log('login'); + // this.checkUserAuthentication(); + // this.loginDiv=true; + this.user = false; } - - + + loginWithUser() { - console.log("loginWithUser") + console.log('loginWithUser'); this.cs.openConfirmLoginPage(); } /// - getLastLoginInfo(){ - this.requestGetLoginInfo= { - DeviceType:this.cs.getDeviceType(),//"Android",//this.cs.getDeviceType(), - DeviceToken:this.deviceToken//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken - } - this.authService.getLoginInfo(this.requestGetLoginInfo,() => {}, this.ts.trPK('general', 'ok')).subscribe(res => { + getLastLoginInfo() { + this.requestGetLoginInfo = { + DeviceType: this.cs.getDeviceType(), // "Android",//this.cs.getDeviceType(), + DeviceToken: this.deviceToken// "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken + }; + this.authService.getLoginInfo(this.requestGetLoginInfo, () => {}, this.ts.trPK('general', 'ok')).subscribe(res => { if (this.cs.validResponse(res)) { - if(res.Mohemm_GetMobileLoginInfoList.length > 0){ + if (res.Mohemm_GetMobileLoginInfoList.length > 0) { this.cs.sharedService.setSharedData( // res.Patient_SELECTDeviceIMEIbyIMEIList[0], @@ -436,15 +439,14 @@ export class LoginComponent implements OnInit, OnDestroy { ); this.user = true; - } - else{ - this.user=false + } else { + this.user = false; } } }); } - - + + } 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 f9101271..384143a2 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -21,6 +21,8 @@ import { DatePicker } from "@ionic-native/date-picker/ngx"; import { EIT_ACTION } from "../models/submit.eit.action"; import { AddEitResponse } from "../models/add.eit.response"; import { element } from '@angular/core/src/render3'; +// import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; +import { EITNotificatonBodyResponse } from "../models/EITNotificationBodyRes"; @Component({ selector: "app-add-eit", @@ -87,6 +89,8 @@ export class AddEitComponent implements OnInit { false ); this.addEITData = this.cs.sharedService.getSharedData("AddEITData", false); + console.log("addEITData: " + this.addEITData); + console.log("dirfromNotificationPage: " + this.addEITData.dirfromNotificationPage); this.eitRequest = new EitRequest(); @@ -94,7 +98,7 @@ export class AddEitComponent implements OnInit { ////*new add*///// /**********resubmit************ */ - // this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false);//WARINING this.getPassdirfromNotifiPage = this.addEITData.dirfromNotificationPage; if (this.getPassdirfromNotifiPage) { this.functionName = this.getPassNotificationDetails.FUNCTION_NAME; //;this.getPassNotificationDetails.NOTIFICATION_NAME; @@ -1555,6 +1559,7 @@ export class AddEitComponent implements OnInit { validateEITTransaction() { // let EITTransactionValues:any= []; + this.arrValues = this.getElementsValues(); if (this.arrValues) { this.eitRequest = { @@ -1586,7 +1591,8 @@ export class AddEitComponent implements OnInit { data.eitRequest = this.eitRequest; data.updated = this.updatedValues; // this.viewCtrl.dismiss(data); - this.closemodal(); + this.modalController.dismiss(data); + // this.closemodal(); } else { this.submitEit(); // this.navCtrl.push("ConfirmAddEitPage"); diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index 576200f4..f8a6c040 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -24,7 +24,7 @@ export class ConfirmAddEitComponent implements OnInit { private P_TransactionID: number; private eitRequest: EitRequest; - approversList: ApproversList; + approversList = []; addrespList: any;//EitRespModel; eitComments: string = ""; menuType: string = ""; @@ -36,7 +36,7 @@ export class ConfirmAddEitComponent implements OnInit { headerTitle: string = ""; isTrue: any = 0; attachItems: any; - private isResubmitEIT: boolean = false; + public isResubmitEIT: boolean = false; private itemKey: string = ""; private pActionMode: string = "SUBMIT"; attachReqObj: WorkListButtonRequest = new WorkListButtonRequest(); @@ -78,11 +78,12 @@ export class ConfirmAddEitComponent implements OnInit { this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; if (this.isResubmitEIT) { - this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); this.P_TransactionID = this.cs.sharedService.getSharedData("TransactionIDResubmit", true); - let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); - this.itemKey = notification.ITEM_KEY; + // let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + + this.itemKey = this.getPassNotificationDetails.ITEM_KEY; this.pActionMode = "RESUBMIT"; this.menuType = "E"; this.respID = -999; diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index b8c2c570..665dafc7 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -122,7 +122,7 @@ --> @@ -202,7 +202,7 @@ --> - +
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 2576093b..5b43290c 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -19,27 +19,26 @@ export class EitListComponent implements OnInit { P_PAGE_NUM: number; P_PAGE_LIMIT: number; - IsReachEnd: boolean = false; + IsReachEnd = false; userName: any; - isDelete: boolean = false; + isDelete = false; getResEITTransactionList: any = []; eitAddedList: any = []; getPassMnuEntryObj: any; selMenu: MenuResponse = new MenuResponse(); - //getMenuResponse :MenuResponse=new MenuResponse EITTransactionsListObj: EITTransactionsRequest = new EITTransactionsRequest(); selEmp: string; respID: number; - transactionNo: number = 0; - menuType: string = ""; - private functionName: string = ""; + transactionNo = 0; + menuType = ''; + public functionName = ''; private eitRequest: EitRequest; private eitTransactionTbl: any = []; private validEitTransactionTbl: any = []; - private desxFlexCode: string = ""; + private desxFlexCode = ''; private selectedIndex: number; - private pAction: number = 0; - public headerTitle: string = ""; + private pAction = 0; + public headerTitle = ''; data: any; accrualNetInfants: any; accrualUNetChild: any; @@ -49,15 +48,16 @@ export class EitListComponent implements OnInit { cutoutPercentage: 80, tooltips: { enabled: false }, legend: { display: false }}; - gaugeType = "full"; + gaugeType = 'full'; accrualBalancesList: any; common: any; direction: string; // gaugeValue = 11.200; // gaugeLabel = ""; - constructor(private cs: CommonService, private EITService: EitService, private ts: TranslatorService, private modalCtrl: ModalController) { - this.direction = TranslatorService.getCurrentLanguageName() + // tslint:disable-next-line: max-line-length + constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, private modalCtrl: ModalController) { + this.direction = TranslatorService.getCurrentLanguageName(); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); @@ -65,32 +65,31 @@ export class EitListComponent implements OnInit { this.menuType = this.selMenu.List_Menu.MENU_TYPE; this.transactionNo = 0; this.functionName = this.getPassMnuEntryObj.FUNCTION_NAME; - console.log("fN>>>>>>>>>>>>>>>>>"+this.functionName); this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; this.validEitTransactionTbl = []; this.P_PAGE_NUM = 1; this.P_PAGE_LIMIT = 50; } - ngOnInit() { + ngOnInit() { this.getEITTransactions(); this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false); // accrualNetInfants // accrualUNetChild // accrualNetAdult - this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; - this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; - this. accrualNetInfants= this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; - + this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; + this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; + this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ { data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult], backgroundColor: [ '#1FA269', - '#22C6B3', - '#3CB9D5',], + '#22C6B3', + '#3CB9D5', ], borderWidth: 2 } ] @@ -98,7 +97,7 @@ export class EitListComponent implements OnInit { } getEITTransactions() { - console.log("jkfdjkdfsffjhfsdahffg"); + console.log('jkfdjkdfsffjhfsdahffg'); this.IsReachEnd = false; this.EITTransactionsListObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; @@ -118,9 +117,10 @@ export class EitListComponent implements OnInit { this.getResEITTransactionList = result.GetEITTransactionList; this.P_PAGE_NUM++; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; - let lastItemIndex = this.getResEITTransactionList.length - 1; + const lastItemIndex = this.getResEITTransactionList.length - 1; if (result.GetEITTransactionList[lastItemIndex] && result.GetEITTransactionList[lastItemIndex].Collection_Transaction[0]) { - let lastitem = result.GetEITTransactionList[lastItemIndex].Collection_Transaction[0]; + const lastitem = result.GetEITTransactionList[lastItemIndex].Collection_Transaction[0]; + // tslint:disable-next-line: triple-equals if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { this.IsReachEnd = true; } else { @@ -155,31 +155,33 @@ export class EitListComponent implements OnInit { this.IsReachEnd = true; } } - //this.P_PAGE_NUM++; - if (infiniteScroll) + // this.P_PAGE_NUM++; + if (infiniteScroll) { infiniteScroll.target.complete(); + } }, (Error) => console.log(Error), () => infiniteScroll.target.complete()); } else { - if (infiniteScroll) + if (infiniteScroll) { infiniteScroll.target.complete(); + } } } - addEITRrq(i) { + addEITRrq(i?) { this.pAction = EIT_ACTION.ADD; // this.sharedData.setSharedData(this.getResEITTransactionList[i].Collection_Transaction,EITTransactionsRequest.SHARED_DATA); this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION); // this.navCtrl.push("AddEitPage"); - //this.openEit(i); + // this.openEit(i); this.openEitNew(i); } updateEITRrq(i) { this.pAction = EIT_ACTION.UPDATE; this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA); this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION); - //this.fillEitTransactionTable(i); - //this.navCtrl.push("AddEitPage"); - //this.openEit(i); + // this.fillEitTransactionTable(i); + // this.navCtrl.push("AddEitPage"); + // this.openEit(i); this.openEitNew(i); } deleteEIT(i) { @@ -193,21 +195,22 @@ export class EitListComponent implements OnInit { } deleteEITRrq(i) { - let list: any = this.getResEITTransactionList[i]; + const list: any = this.getResEITTransactionList[i]; + // tslint:disable-next-line: triple-equals if (list.statusID != 2) { this.selectedIndex = i; // if(this.transactionNo==0) this.transactionNo++; this.pAction = EIT_ACTION.DELETE; - //this.sharedData.setSharedData(this.getResEITTransactionList[i].Collection_Transaction,EITTransactionsRequest.SHARED_DATA); + // this.sharedData.setSharedData(this.getResEITTransactionList[i].Collection_Transaction,EITTransactionsRequest.SHARED_DATA); // this.sharedData.setSharedData(EIT_ACTION.DELETE,EITTransactionsRequest.SUBMIT_EIT_ACTION); this.fillEitTransactionTable(i); this.validateEITTransaction(); // this.submitEit(); - //this.navCtrl.push("AddEitPage"); + // this.navCtrl.push("AddEitPage"); } else { - let msg: string = ""; - msg = this.ts.trPK("general", "attemptDel"); + let msg = ''; + msg = this.ts.trPK('general', 'attemptDel'); this.cs.presentAlert(msg); // alert("You are attempting to delete a row that has already been deleted."); @@ -215,19 +218,24 @@ export class EitListComponent implements OnInit { } openEitNew(index) { let item: any = []; - if (this.pAction == EIT_ACTION.UPDATE) + if (this.pAction == EIT_ACTION.UPDATE) { item = this.getResEITTransactionList[index].Collection_Transaction; + } this.transactionNo++; - this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }, 'AddEITData') + // tslint:disable-next-line: max-line-length + this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }, 'AddEITData'); this.cs.openAddEitPage(); // this.navCtrl.push('AddEitPage', { dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }); } async openEit(index) { let item: any = []; - if (this.pAction == EIT_ACTION.UPDATE) + // tslint:disable-next-line: triple-equals + if (this.pAction == EIT_ACTION.UPDATE) { item = this.getResEITTransactionList[index].Collection_Transaction; + } this.transactionNo++; - this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }, 'AddEITData') + // tslint:disable-next-line: max-line-length + this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }, 'AddEITData'); const modalPage = await this.modalCtrl.create({ component: AddEitComponent }); @@ -237,26 +245,29 @@ export class EitListComponent implements OnInit { .then((data: any) => { if (data) { // this.transactionNo++; - //this.updatedData=this.updatedData?this.updatedData.concat(data.updated):data.updated; + // this.updatedData=this.updatedData?this.updatedData.concat(data.updated):data.updated; // this.notificationBodyRes[index].Collection_Transaction=data.updated; this.selectedIndex = index; this.desxFlexCode = data.eitRequest.P_DESC_FLEX_CONTEXT_CODE; + // tslint:disable-next-line: triple-equals if (this.pAction == EIT_ACTION.ADD) { index = this.eitAddedList.length + 1; - let status = this.ts.trPK("eit", ".added"); - let statusID = EIT_ACTION.ADD; - let obj = { status: status, statusID: statusID, Collection_Transaction: data.updated }; + const status = this.ts.trPK('eit', '.added'); + const statusID = EIT_ACTION.ADD; + const obj = { status, statusID, Collection_Transaction: data.updated }; this.eitAddedList.push(obj); } else { - let status = this.ts.trPK("eit", ".updated"); - let statusID = EIT_ACTION.UPDATE; + const status = this.ts.trPK('eit', '.updated'); + const statusID = EIT_ACTION.UPDATE; this.getResEITTransactionList[this.selectedIndex].status = status; this.getResEITTransactionList[this.selectedIndex].statusID = statusID; } this.updateTransactionList(data.eitRequest.EITTransactionTBL, false); } else { - if (this.transactionNo != 0) + // tslint:disable-next-line: triple-equals + if (this.transactionNo != 0) { this.transactionNo--; + } } }); @@ -291,14 +302,18 @@ export class EitListComponent implements OnInit { } fillEitTransactionTable(index) { - var obj = { peiObjVer: null, peiExtraInfoID: null }; - let list: any = this.getResEITTransactionList[index].Collection_Transaction; + let obj = { peiObjVer: null, peiExtraInfoID: null }; + const list: any = this.getResEITTransactionList[index].Collection_Transaction; let valuseArr: any = []; + // tslint:disable-next-line: prefer-for-of for (let i = 0; i < list.length; i++) { - let item = list[i]; - if (item.APPLICATION_COLUMN_NAME != "PEI_ACTION" && item.APPLICATION_COLUMN_NAME != "PEI_EXTRA_INFO_ID" && item.APPLICATION_COLUMN_NAME != "PEI_OBJECT_VERSION_NUMBER") { + const item = list[i]; + // tslint:disable-next-line: triple-equals + // tslint:disable-next-line: max-line-length + if (item.APPLICATION_COLUMN_NAME != 'PEI_ACTION' && item.APPLICATION_COLUMN_NAME != 'PEI_EXTRA_INFO_ID' && item.APPLICATION_COLUMN_NAME != 'PEI_OBJECT_VERSION_NUMBER') { this.desxFlexCode = item.DESC_FLEX_CONTEXT_CODE; - if (item.DATE_VALUE == "") { + // tslint:disable-next-line: triple-equals + if (item.DATE_VALUE == '') { item.DATE_VALUE = null; } valuseArr.push( @@ -309,17 +324,19 @@ export class EitListComponent implements OnInit { NUMBER_VALUE: item.NUMBER_VALUE, DATE_VALUE: item.DATE_VALUE, } - ) + ); } else { - if (item.APPLICATION_COLUMN_NAME == "PEI_OBJECT_VERSION_NUMBER") + if (item.APPLICATION_COLUMN_NAME == 'PEI_OBJECT_VERSION_NUMBER') { obj.peiObjVer = item.NUMBER_VALUE; - else if (item.APPLICATION_COLUMN_NAME == "PEI_EXTRA_INFO_ID") + } + else if (item.APPLICATION_COLUMN_NAME == 'PEI_EXTRA_INFO_ID') { obj.peiExtraInfoID = item.NUMBER_VALUE; + } } - }// end for - //} - valuseArr = this.fillExtraInformation(valuseArr, "DELETE_ROW", obj.peiExtraInfoID, obj.peiObjVer, this.transactionNo); + }// end for + // } + valuseArr = this.fillExtraInformation(valuseArr, 'DELETE_ROW', obj.peiExtraInfoID, obj.peiObjVer, this.transactionNo); this.eitTransactionTbl = valuseArr; } @@ -327,7 +344,7 @@ export class EitListComponent implements OnInit { values.push( { TRANSACTION_NUMBER: transNo, - NAME: "PEI_ACTION", + NAME: 'PEI_ACTION', VARCHAR2_VALUE: peiAction, NUMBER_VALUE: null, DATE_VALUE: null @@ -335,7 +352,7 @@ export class EitListComponent implements OnInit { values.push( { TRANSACTION_NUMBER: transNo, - NAME: "PEI_EXTRA_INFO_ID", + NAME: 'PEI_EXTRA_INFO_ID', VARCHAR2_VALUE: null, NUMBER_VALUE: peiExtraInfoID, DATE_VALUE: null @@ -343,7 +360,7 @@ export class EitListComponent implements OnInit { values.push( { TRANSACTION_NUMBER: transNo, - NAME: "PEI_OBJECT_VERSION_NUMBER", + NAME: 'PEI_OBJECT_VERSION_NUMBER', VARCHAR2_VALUE: null, NUMBER_VALUE: peiObjVer, DATE_VALUE: null @@ -354,11 +371,11 @@ export class EitListComponent implements OnInit { submitEit() { this.eitRequest = new EitRequest(); - let list: any = this.fixTransactionNo(); + const list: any = this.fixTransactionNo(); this.eitRequest.EITTransactionTBL = list; this.eitRequest.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; this.eitRequest.P_MENU_TYPE = this.menuType; - this.eitRequest.P_SELECTED_RESP_ID = this.respID;//this.selMenu.List_Menu.RESP_ID,//-999, + this.eitRequest.P_SELECTED_RESP_ID = this.respID; // this.selMenu.List_Menu.RESP_ID,//-999, this.eitRequest.P_FUNCTION_NAME = this.functionName; this.eitRequest.P_DESC_FLEX_CONTEXT_CODE = this.desxFlexCode; @@ -370,14 +387,14 @@ export class EitListComponent implements OnInit { if (this.cs.validResponse(result)) { this.cs.sharedService.setSharedData(this.eitRequest, EitRequest.SHARED_DATA); this.cs.sharedService.setSharedData(result, AddEitResponse.SHARED_DATA); - //this.addrespList=result.SubmitEITTransactionList; + // this.addrespList=result.SubmitEITTransactionList; // this.itemKey=this.addrespList.P_ITEM_KEY; // this.P_TransactionID=result.SubmitEITTransactionList.P_TRANSACTION_ID; // this.sharedData.setSharedData(result,AddEitResponse.SHARED_DATA); // //this.cs.sharedService.setSharedData(result.SubmitEITTransactionList.P_TRANSACTION_ID,"TransactionIDResubmit"); // // this.sharedData.setSharedData(this.eitRequest,EitRequest.SHARED_DATA); - this.cs.sharedService.setSharedData({ isResubmit: false, isDelete: this.isDelete }, 'confirmAddEITData') + this.cs.sharedService.setSharedData({ isResubmit: false, isDelete: this.isDelete }, 'confirmAddEITData'); this.cs.openConfirmEitPage(); // this.navCtrl.push("ConfirmAddEitPage", { isResubmit: false, isDelete: this.isDelete }); } @@ -391,7 +408,7 @@ export class EitListComponent implements OnInit { P_FUNCTION_NAME: this.functionName, P_DESC_FLEX_CONTEXT_CODE: this.desxFlexCode, EITTransactionTBL: this.eitTransactionTbl - } + }; this.EITService.validateEITTransaction(this.eitRequest).subscribe((result: any) => { this.handleEITValidateTr(result); @@ -400,22 +417,23 @@ export class EitListComponent implements OnInit { private handleEITValidateTr(result) { if (this.cs.validResponse(result)) { // public static SHARED_DATA = 'login-request'; - //this.sharedData.setSharedData(this.eitRequest, EitRequest.SHARED_DATA); - let status = this.ts.trPK("eit", ".deleted"); - let statusID = EIT_ACTION.DELETE; + // this.sharedData.setSharedData(this.eitRequest, EitRequest.SHARED_DATA); + const status = this.ts.trPK('eit', '.deleted'); + const statusID = EIT_ACTION.DELETE; this.isDelete = true; this.getResEITTransactionList[this.selectedIndex].status = status; this.getResEITTransactionList[this.selectedIndex].statusID = statusID; this.updateTransactionList(this.eitTransactionTbl, false); this.submitEit(); } else { - if (this.transactionNo != 0) + if (this.transactionNo != 0) { this.transactionNo--; + } } } updateTransactionList(list, isRemove) { - //let newlist = this.validEitTransactionTbl.map(a => a.NAME='PEI_EXTRA_INFO_ID'); - let isAnewRow: boolean = false; + // let newlist = this.validEitTransactionTbl.map(a => a.NAME='PEI_EXTRA_INFO_ID'); + let isAnewRow = false; let updateDelTransNo: number; if (this.cs.hasData(this.validEitTransactionTbl)) { this.validEitTransactionTbl.forEach(element => { @@ -429,42 +447,45 @@ export class EitListComponent implements OnInit { } list.forEach(element => { // NAME=PEI_EXTRA_INFO_ID - //const index = this.validEitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); + // const index = this.validEitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); // let newlist = this.validEitTransactionTbl.map(a => a.NAME==='PEI_EXTRA_INFO_ID'); if (isAnewRow == true) { - let index: number = this.validEitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); - //if(index!=-1) - //this.validEitTransactionTbl.splice(index, 1); + const index: number = this.validEitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); + // if(index!=-1) + // this.validEitTransactionTbl.splice(index, 1); } else { - let index: number = this.validEitTransactionTbl.findIndex(x => x.NAME === 'PEI_EXTRA_INFO_ID' && x.NUMBER_VALUE === element.NUMBER_VALUE); + const index: number = this.validEitTransactionTbl.findIndex(x => x.NAME === 'PEI_EXTRA_INFO_ID' && x.NUMBER_VALUE === element.NUMBER_VALUE); if (index != -1) { - //this.validEitTransactionTbl.splice(index, 1); - if (!updateDelTransNo) + // this.validEitTransactionTbl.splice(index, 1); + if (!updateDelTransNo) { updateDelTransNo = this.validEitTransactionTbl[index].TRANSACTION_NUMBER; + } } } }); - if (updateDelTransNo) + if (updateDelTransNo) { this.removeItems(updateDelTransNo); - if (isRemove == false) + } + if (isRemove == false) { this.validEitTransactionTbl = this.validEitTransactionTbl ? this.validEitTransactionTbl.concat(list) : list; + } } fixTransactionNo(): any[] { - let list: any = []; - let newIndex: number = 1; - let length: number = this.validEitTransactionTbl.length; + const list: any = []; + let newIndex = 1; + const length: number = this.validEitTransactionTbl.length; for (let i = 0; i < length; i++) { // let item :any={}; const item = Object.assign({}, this.validEitTransactionTbl[i]); - let transNo: number = item.TRANSACTION_NUMBER; - let obj: any = item; + const transNo: number = item.TRANSACTION_NUMBER; + const obj: any = item; if (i == 0) { obj.TRANSACTION_NUMBER = newIndex; list.push(obj); } else { - let prevEl: any = this.validEitTransactionTbl[i - 1].TRANSACTION_NUMBER; + const prevEl: any = this.validEitTransactionTbl[i - 1].TRANSACTION_NUMBER; if (transNo == prevEl) { obj.TRANSACTION_NUMBER = newIndex; list.push(obj); @@ -478,19 +499,21 @@ export class EitListComponent implements OnInit { return list; } removeItems(transNo) { - let list = []; + const list = []; for (let i = 0; i < this.validEitTransactionTbl.length; i++) { - if (this.validEitTransactionTbl[i].TRANSACTION_NUMBER != transNo) + if (this.validEitTransactionTbl[i].TRANSACTION_NUMBER != transNo) { list.push(this.validEitTransactionTbl[i]); + } } this.validEitTransactionTbl = list; } removeAddedItem(index) { - let list = []; + const list = []; let item: any = []; for (let i = 0; i < this.eitAddedList.length; i++) { - if (i != index) + if (i != index) { list.push(this.eitAddedList[i]); + } } item = this.eitAddedList[index]; this.eitAddedList = list; diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html index 5c562226..5ea12523 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html @@ -1,5 +1,5 @@ - + {{'eit, update-title' | translate}} @@ -11,34 +11,51 @@ -
{{'workListMain, notfDetails' | translate}}
+
{{'worklistMain, notfDetails' | translate}}
- +
+ + + -
+ +
- - - - + + +
+ +
+
+ +
+ + + + + + +
- + {{ 'general, next' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss index e69de29b..8b091c54 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss @@ -0,0 +1,17 @@ +.addEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #22c6b3; + width: 80% !important; + color: white!important; + border-radius: 16px !important; + } + + .editIconDiv{ + right: 10px; + position: absolute; + top: 10px; + } \ No newline at end of file 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 7218ba91..6a8681bf 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 @@ -25,8 +25,8 @@ export class EitUpdateListComponent implements OnInit { private descFlex: string; constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) { - this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, true); - let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); + let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); this.itemKey = notification.ITEM_KEY; this.notificationId = notification.NOTIFICATION_ID; this.functionName = notification.FUNCTION_NAME; @@ -35,7 +35,7 @@ export class EitUpdateListComponent implements OnInit { this.fillEitTransactionTable(); } - ngOnInit() { } + ngOnInit() { console.log("ngOnInit");} async updateEitNot(index) { let item = this.notificationBodyRes[index].Collection_Notification; @@ -46,10 +46,15 @@ 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); + + if (data) { - this.updatedData = this.updatedData ? this.updatedData.concat(data.updated) : data.updated; - this.notificationBodyRes[index].Collection_Notification = data.updated; - this.updateTransactionList(data.eitRequest.EITTransactionTBL); + 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/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 5008b103..9285fd19 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -15,7 +15,7 @@ - + @@ -33,7 +33,7 @@ + (click)="openPage(subPage, i2)">  {{subPage.PROMPT}} @@ -54,7 +54,7 @@ - + @@ -73,7 +73,7 @@ + (click)="openPage(subPage, i2)">  {{subPage.PROMPT}} diff --git a/Mohem/src/app/eit/home/home.component.ts b/Mohem/src/app/eit/home/home.component.ts index a4ae5018..7bd5660a 100644 --- a/Mohem/src/app/eit/home/home.component.ts +++ b/Mohem/src/app/eit/home/home.component.ts @@ -17,10 +17,10 @@ export class HomeComponent implements OnInit { // Selected Side Menu selectedMenu: any; direction: string; - pageType :string; + pageType: string; constructor(private cs: CommonService, private ts: TranslatorService) { - this.direction = TranslatorService.getCurrentLanguageName() + this.direction = TranslatorService.getCurrentLanguageName(); this.menu = this.cs.sharedService.getSharedData('menuEntries', false); this.pageType = this.cs.sharedService.getSharedData('homemenuentries', false); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); @@ -44,7 +44,7 @@ export class HomeComponent implements OnInit { this.selectedMenu = index; } } - console.log("selected>>>>>>>"+this.selectedMenu); + console.log('selected>>>>>>>' + this.selectedMenu); } goToRequest(menuEntry) { @@ -57,7 +57,7 @@ export class HomeComponent implements OnInit { } else if (menuEntry.REQUEST_TYPE === 'EIT') { this.cs.openEitListPage(); } - if (menuEntry.REQUEST_TYPE === 'PAYSLIP'){ + if (menuEntry.REQUEST_TYPE === 'PAYSLIP') { this.cs.openPayslipPage(); } if (menuEntry.REQUEST_TYPE === 'TIME_CARD') { diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts index 81ff9ffc..41e6c26a 100644 --- a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.ts @@ -11,7 +11,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl export class SubmitEitModalComponent implements OnInit { submitAttachmentList :any =[]; eitComments: string; - constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){ + constructor( public ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){ this.submitAttachmentList = this.cs.sharedService.getSharedData('submitAttachmentList', false); this.eitComments = this.cs.sharedService.getSharedData('eitComments', false); } diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index ca469fcd..78c49b25 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -55,7 +55,7 @@ import { TabsBarComponent } from './ui/tabs-bar/tabs-bar.component'; import { PageTrailerComponent } from './ui/spacer/page-trailer/page-trailer.component'; // import { GeofencingService } from './services/geofencing/geofencing.service'; // import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; -import { ButtonComponent } from './ui/button/button.component'; +import { ButtonComponent, Modal } from './ui/button/button.component'; import { ToolbarButtonComponent } from './ui/toolbar-button/toolbar-button.component'; import { ListboxModule } from 'primeng/listbox'; import { GenderSelectComponent } from './ui/gender-select/gender-select.component'; @@ -91,7 +91,8 @@ import { RateService } from './services/rate/rate.service'; // import { PaymentService } from './ui/payment/service/payment.service'; import { MenuService } from './services/menu/menuservice.service'; import { ReplacementListComponent } from '../vacation-rule/replacement-list/replacement-list.component'; -import { FileSelectDirective } from 'ng2-file-upload'; +import { FileUploadModule } from 'ng2-file-upload'; +// import { FileSelectDirective } from 'ng2-file-upload'; import { PdfViewerModule } from 'ng2-pdf-viewer'; import { WorkListAttachViewComponent } from '../notification/work-list-attach-view/work-list-attach-view.component'; import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; @@ -129,7 +130,8 @@ import { ChartModule } from 'primeng/chart'; NgCircleProgressModule.forRoot(), NgCalendarModule, ChartModule, - NgxGaugeModule + NgxGaugeModule, + FileUploadModule ], declarations: [ FabButtonComponent, @@ -183,7 +185,7 @@ import { ChartModule } from 'primeng/chart'; DetailButtonComponent, HeaderButtonComponent, ReplacementListComponent, - FileSelectDirective, + // FileSelectDirective, WorkListAttachViewComponent, FileUploderProfileComponent, AccordinTabCustomComponent, @@ -195,8 +197,8 @@ import { ChartModule } from 'primeng/chart'; EmployeeInformationComponent, ConfirmLoginComponent, CircleCalendarComponent, - DateInfoModalComponent - + DateInfoModalComponent, + Modal ], exports: [ FabButtonComponent, @@ -247,7 +249,7 @@ import { ChartModule } from 'primeng/chart'; DetailButtonComponent, HeaderButtonComponent, ReplacementListComponent, - FileSelectDirective, + // FileSelectDirective, WorkListAttachViewComponent, FileUploderProfileComponent, AccordinTabCustomComponent, @@ -264,8 +266,9 @@ import { ChartModule } from 'primeng/chart'; CircleCalendarComponent, DateInfoModalComponent, NgCalendarModule, - ChartModule - + ChartModule, + FileUploadModule, + Modal ], providers: [ AttendScanService, diff --git a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts index dc780d83..2dbbe194 100644 --- a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts +++ b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts @@ -5,15 +5,15 @@ import { SharedDataService } from '../shared-data-service/shared-data.service'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { AttendanceService } from 'src/app/home/services/attendance.services'; import { ZBar } from '@ionic-native/zbar/ngx'; -import { Geolocation } from "@ionic-native/geolocation/ngx"; +import { Geolocation } from '@ionic-native/geolocation/ngx'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { AuthenticatedUser } from '../authentication/models/authenticated-user'; import { CommonService } from '../common/common.service'; import { TranslatorService } from '../translator/translator.service'; -import { Response } from "src/app/hmg-common/services/models/response"; -import { Camera, CameraOptions,PictureSourceType} from "@ionic-native/Camera/ngx"; -import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service' -import { Device } from "@ionic-native/device/ngx"; +import { Response } from 'src/app/hmg-common/services/models/response'; +import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; +import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service'; +import { Device } from '@ionic-native/device/ngx'; @Injectable({ @@ -28,50 +28,49 @@ export class AttendScanService { scannedResult: any; userData: any = {}; constructor(private device: Device, - private zbar: ZBar, - private geolocation: Geolocation, - private attendance_service: AttendanceService, - private barcodeScanner: BarcodeScanner, - private cameraController: Camera, - public sharedData: SharedDataService, - private sanitizer: DomSanitizer, - private permissions: DevicePermissionsService, - public common:CommonService, - public ts: TranslatorService,) { - this.userData =this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); + private zbar: ZBar, + private geolocation: Geolocation, + private attendance_service: AttendanceService, + private barcodeScanner: BarcodeScanner, + private cameraController: Camera, + public sharedData: SharedDataService, + private sanitizer: DomSanitizer, + private permissions: DevicePermissionsService, + public common: CommonService, + public ts: TranslatorService, ) { + this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false); } public getDeviceLocation() { - let isVirtual = this.device.isVirtual; - if(isVirtual==true){ - alert("emulater>>>>>>>"+isVirtual); - alert("You are using virtual device"); + const isVirtual = this.device.isVirtual; + // tslint:disable-next-line: triple-equals + if (isVirtual == true) { + alert('emulater>>>>>>>' + isVirtual); + alert('You are using virtual device'); return false; } - + this.permissions.requestLocationAutherization().then(granted => { this.location = granted as boolean; if (this.location) { this.geolocation .getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }) .then(resp => { - // console.log(resp.coords.latitude); - // console.log(resp.coords.longitude); this.lat = resp.coords.latitude; this.longt = resp.coords.longitude; this.attendance(); }) .catch(error => { - console.log("Error getting location", error); + console.log('Error getting location', error); }); - + } else { return false; } }); - + } - + public attendance() { this.permissions.requestCameraAutherization().then(granted => { this.camera = granted as boolean; @@ -81,43 +80,43 @@ export class AttendScanService { } ); } - - + + public scanCode() { this.barcodeScanner.scan().then(barcodeData => { - console.log('Barcode data', barcodeData); - // let strResult = JSON.parse(barcodeData); - // console.log(strResult.QRValue); - this.scannedResult = barcodeData; - this.deviceID = this.device.uuid; - this.swipeAttendance(); + if (!barcodeData.cancelled) { + this.scannedResult = barcodeData; + this.deviceID = this.device.uuid; + this.swipeAttendance(); + } }).catch(err => { console.log('Error', err); }); } - - + + public swipeAttendance() { - let request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); + const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); request.Latitude = this.lat; request.Longitude = this.longt; request.QRValue = this.scannedResult.text; request.UID = this.deviceID; request.UserName = this.userData.EMPLOYEE_NUMBER; - console.log("request"); + console.log('request'); console.log(JSON.stringify(request)); this.attendance_service .attendanceSwipeScanner(request, () => { - console.log("Error inside in swipe attendance"); + console.log('Error inside in swipe attendance'); }) .subscribe((result: Response) => { if (this.common.validResponse(result)) { - console.log("response"); + console.log('response'); console.log(result); - this.common.presentAlert(this.ts.trPK("home", "swipeAlertSuccess")); - } else { - this.common.presentAlert(this.ts.trPK("home", "swipeAlertFailed")); + this.common.presentAlert(this.ts.trPK('home', 'swipeAlertSuccess')); } + // else { + // this.common.presentAlert(this.ts.trPK("home", "swipeAlertFailed")); + // } }); } } 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 08163c91..31f9a7cd 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1171,6 +1171,11 @@ public getMonthNameAr(value: number): string { public openItemHistoryPage() { this.nav.navigateForward(['/notification/item-history-PO']); } + + public openMOItemHistoryPage(){ + this.nav.navigateForward(["/notification/item-history-MO"]); + + } public openQutationAnalysisPage() { this.nav.navigateForward(['/notification/qutation-analysis-PO']); } @@ -1211,8 +1216,12 @@ public getMonthNameAr(value: number): string { public openPerformanceevaluation() { this.nav.navigateForward(["/profile/performanceevaluation"]); } + public eitUpdate() { + this.nav.navigateForward(["/eit/eit-update-list"]); + } + public navigatePage(path) { this.nav.navigateForward([path]); } @@ -1399,10 +1408,10 @@ public getMonthNameAr(value: number): string { return FormatedDate; } - public setUpdateImage (image){ + public setUpdateImage (image,status?){ console.log('setUpdateImage'); this.setUpdateImg=image; - this.updateImage=true; + this.updateImage=status; } public getUpdateImage(){ console.log('getUpdateImage'); 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 1335e79d..1f34b0ad 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -21,7 +21,7 @@ export class ConnectorService { headers: new HttpHeaders({ 'Content-Type': 'application/json' }) }; public static retryTimes = 0; - public static timeOut = 30 * 1000; + public static timeOut = 120 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service public static host = 'https://uat.hmgwebservices.com/'; @@ -174,7 +174,9 @@ public static host = 'https://uat.hmgwebservices.com/'; return false; } else if (result.ErrorType === 2 || result.ErrorType === 4) { // console.log("error expired"); + this.cs.stopLoading(); } else { + this.cs.stopLoading(); this.cs.showErrorMessageDialog( onError, errorLabel, diff --git a/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts b/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts index b34ae6a3..01f7a2b9 100644 --- a/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts +++ b/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts @@ -13,22 +13,25 @@ import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; providedIn: 'root' }) export class DevicePermissionsService { + + constructor( + public diagnostic: Diagnostic, + public cs: CommonService, + public nativeStorage: NativeStorage, + public ts: TranslatorService, + public nativeSettings: OpenNativeSettings) { } public static GRANTED = 'GRANTED'; public static DENIED_ALWAYS = 'DENIED_ALWAYS'; public static CAMERA_MIC = 'camera_mic_permission'; public static LOCATION = 'location_permission'; + + public static APP_SETTINGS = 'application_details'; + public onSucess; public onerror; - constructor( - public diagnostic: Diagnostic, - public cs: CommonService, - public nativeStorage: NativeStorage, - public ts: TranslatorService, - public nativeSettings: OpenNativeSettings) { } - public requestCameraPermission(): Observable { return Observable.create(observer => { @@ -37,16 +40,17 @@ export class DevicePermissionsService { } private requestCamera(observer: any) { - //console.log("Camera permission????????") this.hasCameraPermission().then((isAvailable) => { if (isAvailable) { // this.requestMicophonePermission(observer); this.observerDone(observer, true); } else { this.diagnostic.requestCameraAuthorization(true).then((value) => { + // tslint:disable-next-line: triple-equals if (value == DevicePermissionsService.GRANTED) { - //this.requestMicophonePermission(observer); + // this.requestMicophonePermission(observer); this.observerDone(observer, true); + // tslint:disable-next-line: triple-equals } else if (value == DevicePermissionsService.DENIED_ALWAYS) { // this.setAlwaysDenied(DevicePermissionsService.CAMERA_MIC, true); this.observerDone(observer, false); @@ -77,8 +81,10 @@ export class DevicePermissionsService { this.observerDone(observer, true); } else { this.diagnostic.requestMicrophoneAuthorization().then((value) => { + // tslint:disable-next-line: triple-equals if (value == DevicePermissionsService.GRANTED) { this.observerDone(observer, true); + // tslint:disable-next-line: triple-equals } else if (value == DevicePermissionsService.DENIED_ALWAYS) { this.setAlwaysDenied(DevicePermissionsService.CAMERA_MIC, true); this.observerDone(observer, false); @@ -112,8 +118,8 @@ export class DevicePermissionsService { } public async hasCameraAndMicPermissions(): Promise { - let camera = await this.hasCameraPermission(); - //let mic = await this.diagnostic.isMicrophoneAuthorized(); + const camera = await this.hasCameraPermission(); + // let mic = await this.diagnostic.isMicrophoneAuthorized(); if (camera) { // await this.setAlwaysDenied(DevicePermissionsService.CAMERA_MIC, false); return true; @@ -128,7 +134,7 @@ export class DevicePermissionsService { resolve(true); }, this.ts.trPK('general', 'accept'), () => { - resolve(false) + resolve(false); }, this.ts.trPK('general', 'not-now'), this.ts.trPK('general', 'confirm'), message ); }); @@ -140,15 +146,12 @@ export class DevicePermissionsService { resolve(true); }, this.ts.trPK('general', 'settings'), () => { - resolve(false) + resolve(false); }, this.ts.trPK('general', 'not-now'), this.ts.trPK('general', 'confirm'), message ); }); } - - public static APP_SETTINGS = 'application_details'; - public async openApplicationSettings() { // return new Promise((resolver, reject) => { // this.nativeSettings.open(DevicePermissionsService.APP_SETTINGS).then(result => { @@ -208,13 +211,13 @@ export class DevicePermissionsService { if (await this.hasCameraAndMicPermissions()) { return true; } else { - let message = this.ts.trPK('permissions', 'camera'); + const message = this.ts.trPK('permissions', 'camera'); // if (await this.isPermissionAlwaysDenied(DevicePermissionsService.CAMERA_MIC)) { // if (await this.permissionSettingsDialog(message)) { // return this.openCameraAndMicSettings(); // } // } else { - if (await this.permissionRequestDialog(message)) { + if (await this.permissionRequestDialog(message)) { return this.requestCameraPermission().toPromise(); } // } @@ -227,17 +230,16 @@ export class DevicePermissionsService { public async requestLocationAutherization() { if ( await this.isLocationEnabled()) { - if (await this.hasLocationPermissions()) { return true; } else { - let message = this.ts.trPK('permissions', 'location'); + const message = this.ts.trPK('permissions', 'location'); // if (await this.isPermissionAlwaysDenied(DevicePermissionsService.LOCATION)) { // if (await this.permissionSettingsDialog(message)) { // return this.openLocationSettings(); // } // } else { - if (await this.permissionRequestDialog(message)) { + if (await this.permissionRequestDialog(message)) { return this.requestLocationPermission(); } // } @@ -249,7 +251,7 @@ export class DevicePermissionsService { } private async isLocationEnabled() { - let isAvailable = await this.diagnostic.isLocationEnabled(); + const isAvailable = await this.diagnostic.isLocationEnabled(); if (!isAvailable) { this.cs.presentAlert(this.ts.trPK('permissions', 'enable-location'), () => { }); @@ -258,7 +260,7 @@ export class DevicePermissionsService { } public async hasLocationPermissions(): Promise { - let location = await this.diagnostic.isLocationAvailable(); + const location = await this.diagnostic.isLocationAvailable(); if (location) { await this.setAlwaysDenied(DevicePermissionsService.LOCATION, false); return true; @@ -280,12 +282,14 @@ export class DevicePermissionsService { private async requestLocationPermission() { - let hasPermissions = await this.hasLocationPermissions(); + const hasPermissions = await this.hasLocationPermissions(); if (!hasPermissions) { - let value = await this.diagnostic.requestLocationAuthorization(); + const value = await this.diagnostic.requestLocationAuthorization(); + // tslint:disable-next-line: triple-equals if (value == DevicePermissionsService.GRANTED) { return true; + // tslint:disable-next-line: triple-equals } else if (value == DevicePermissionsService.DENIED_ALWAYS) { this.setAlwaysDenied(DevicePermissionsService.LOCATION, true); } diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html index 48c55d3e..ab15461a 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html @@ -1,5 +1,5 @@ - - + diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 096e04ab..ca98d91b 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -203,18 +203,22 @@ height: 360px !important; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; } + + .slider-container { + padding-bottom: 20px; + } .col{ border-bottom: 1px solid rgb(204, 204, 204); - border-right: 1px solid rgb(204, 204, 204); - flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + border-right: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); } .col-ar{ border-bottom: 1px solid rgb(204, 204, 204); - border-left: 1px solid rgb(204, 204, 204); - flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + border-left: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); } - \ No newline at end of file + diff --git a/Mohem/src/app/hmg-common/ui/file-uploader/file-uploader.component.ts b/Mohem/src/app/hmg-common/ui/file-uploader/file-uploader.component.ts index 77483e15..9df5a0c8 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploader/file-uploader.component.ts +++ b/Mohem/src/app/hmg-common/ui/file-uploader/file-uploader.component.ts @@ -89,7 +89,7 @@ export class FileUploaderComponent implements OnInit { const fileInput = this.getFileElement(); fileInput.click(); } - private deleteFiles(index: number) { + public deleteFiles(index: number) { this.inputFiles.splice(index, 1); this.fileSelected.emit( { name: null, diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html index 6f53759d..4912ef99 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html @@ -26,11 +26,10 @@ -
+ 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 06364263..7f393498 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 @@ -1,13 +1,11 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { ActionSheetController,Events, NavController } from '@ionic/angular'; -import {CameraOptions,Camera,PictureSourceType} from '@ionic-native/Camera/ngx'; -// import { FileChooser } from '@ionic-native/file-chooser'; -import { FilePath } from "@ionic-native/file-path/ngx"; -import { File } from "@ionic-native/file/ngx"; +import { ActionSheetController, Events, NavController } from '@ionic/angular'; +import {CameraOptions, Camera, PictureSourceType} from '@ionic-native/Camera/ngx'; +import { FilePath } from '@ionic-native/file-path/ngx'; +import { File } from '@ionic-native/file/ngx'; import { TranslatorService } from '../../services/translator/translator.service'; -import { Base64 } from "@ionic-native/base64/ngx"; +import { Base64 } from '@ionic-native/base64/ngx'; import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service'; -// import { Chooser } from '@ionic-native/chooser'; @Component({ selector: 'app-file-uploder-profile', @@ -15,7 +13,6 @@ import { DevicePermissionsService } from '../../services/device-permissions/devi styleUrls: ['./file-uploder-profile.component.scss'], }) export class FileUploderProfileComponent implements OnInit { - @Input() multiupload = false; @Input() attachmentname = 'attachment-loader'; public attachmentData: string; @@ -26,22 +23,22 @@ export class FileUploderProfileComponent implements OnInit { public attachmentImg = 'assets/icon/attachment.png'; public deleteImg = 'assets/icon/delete.png'; public defultProfile = '../../../../assets/imgs/profile.png'; - public selectedImage:any; + public selectedImage: any; public nativePath: any; - public errorMsg:any; - public allowdType: any = ["jpg", "jpeg", "png"]; - camera: boolean - - constructor( - public cameraController:Camera, - public actionSheetCtrl:ActionSheetController, - public event:Events, + public errorMsg: any; + public allowdType: any = ['jpg', 'jpeg', 'png']; + camera: boolean; + + constructor( + public cameraController: Camera, + public actionSheetCtrl: ActionSheetController, + public event: Events, public nav: NavController, private filePath: FilePath, // public FileChooser:FileChooser, private file: File, public ts: TranslatorService, - public base64:Base64, + public base64: Base64, private permissions: DevicePermissionsService // private chooser: Chooser @@ -60,10 +57,10 @@ export class FileUploderProfileComponent implements OnInit { return this.image; } - //open the presentsheet - //selected attach - //need convert - //insert or display + // open the presentsheet + // selected attach + // need convert + // insert or display private permissionsToOpenCamera() { this.permissions.requestCameraAutherization().then(granted => { @@ -75,8 +72,8 @@ export class FileUploderProfileComponent implements OnInit { ); } - - async openFile(){ + + async openFile() { const actionSheet = await this.actionSheetCtrl.create({ header: 'Change Profile Photo', buttons: [{ @@ -96,7 +93,7 @@ export class FileUploderProfileComponent implements OnInit { } }, { - + text: 'Choose from Library', icon: 'images', handler: () => { @@ -117,35 +114,35 @@ export class FileUploderProfileComponent implements OnInit { } public takePicture(sourceType: PictureSourceType) { - console.log("sourceType: "+sourceType); + console.log('sourceType: ' + sourceType); const options: CameraOptions = { quality: 50, destinationType: this.cameraController.DestinationType.DATA_URL, encodingType: this.cameraController.EncodingType.JPEG, - sourceType: sourceType, - correctOrientation:true, + sourceType, + correctOrientation: true, targetWidth: 512, targetHeight: 512 }; - this.cameraController.getPicture(options).then(imageData => { - const data = "data:image/jpeg;base64," + imageData; - this.event.publish('Image', {message:"hello"}); - this.selectedImage = "data:image/jpeg;base64, " + imageData; + this.cameraController.getPicture(options).then(imageData => { + const data = 'data:image/jpeg;base64,' + imageData; + this.event.publish('Image', {message: 'hello'}); + this.selectedImage = 'data:image/jpeg;base64, ' + imageData; this.onimgLoad.emit(this.selectedImage); }); } - - public deleteCurrent(){ + + public deleteCurrent() { // send empty image - //this.onimgLoad.emit(""); - console.log("deleteCurrent"); + // this.onimgLoad.emit(""); + console.log('deleteCurrent'); this.encodeFiles(this.defultProfile); } - + readFile(fileUrl: any) { this.filePath.resolveNativePath(fileUrl).then(filePathResult => { this.nativePath = filePathResult; @@ -155,7 +152,7 @@ export class FileUploderProfileComponent implements OnInit { this.errorMsg = null; this.encodeFiles(entry); } else { - this.errorMsg = this.ts.trPK("general", "large-file"); + this.errorMsg = this.ts.trPK('general', 'large-file'); } }); }); @@ -163,15 +160,15 @@ export class FileUploderProfileComponent implements OnInit { } encodeFiles(entry) { - alert("encodeFiles") - this.base64.encodeFile(entry).then( + alert('encodeFiles'); + this.base64.encodeFile(entry).then( (base64File: string) => { // const type = this.nativePath.substr( // this.nativePath.lastIndexOf(".") + 1 // ); - alert("base64File 1" + base64File); + alert('base64File 1' + base64File); // if (this.allowdType.includes(type.toLowerCase())) { // } else { @@ -184,6 +181,6 @@ export class FileUploderProfileComponent implements OnInit { } ); } - + } diff --git a/Mohem/src/app/hmg-common/ui/mobile-number/international-mobile/international-mobile.component.ts b/Mohem/src/app/hmg-common/ui/mobile-number/international-mobile/international-mobile.component.ts index 1367825e..2c322ea6 100644 --- a/Mohem/src/app/hmg-common/ui/mobile-number/international-mobile/international-mobile.component.ts +++ b/Mohem/src/app/hmg-common/ui/mobile-number/international-mobile/international-mobile.component.ts @@ -34,6 +34,7 @@ export class InternationalMobileComponent implements OnInit { public options: OptionModel[]; private dataLoaded = false; private phoneSetProgramatically = false; + public default = ''; @ViewChild( SearchableSelectComponent) searchableSelectComponent: SearchableSelectComponent; constructor( public cs: CommonService, diff --git a/Mohem/src/app/hmg-common/ui/sms/sms.page.html b/Mohem/src/app/hmg-common/ui/sms/sms.page.html index a783455d..dce4f537 100644 --- a/Mohem/src/app/hmg-common/ui/sms/sms.page.html +++ b/Mohem/src/app/hmg-common/ui/sms/sms.page.html @@ -25,12 +25,12 @@ - +
- +
\ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/sms/sms.page.ts b/Mohem/src/app/hmg-common/ui/sms/sms.page.ts index fc7242ca..b684a622 100644 --- a/Mohem/src/app/hmg-common/ui/sms/sms.page.ts +++ b/Mohem/src/app/hmg-common/ui/sms/sms.page.ts @@ -18,31 +18,14 @@ import { AlertController } from '@ionic/angular'; styleUrls: ['./sms.page.scss'], }) export class SmsPage implements OnInit { - public timeInSeconds : number ; - public time : number; - public runTimer : boolean; - public static SHARED_DATA = 'h2o-login-details'; - public hasStarted : boolean; - public countryCode: CountryCode; - public hasFinished : boolean; - public remainingTime : number; - public displayTime : string = ""; - // public userData: UserDetailsModel; - public mobile : string; - public country_code : string; - public id : string; - public MobileNumber : string; - public token : string; - public resend : boolean = false; - public smc_code : any; constructor(public cs: CommonService, - public ts: TranslatorService, - public alertController: AlertController, - public smsService: SmsReaderService, - public sharedData: SharedDataService, - private modalCtrl:ModalController, - private navParams: NavParams, - public smsservice: SMSService) { + public ts: TranslatorService, + public alertController: AlertController, + public smsService: SmsReaderService, + public sharedData: SharedDataService, + private modalCtrl: ModalController, + private navParams: NavParams, + public smsservice: SMSService) { this.initTimer(); this.startTimer(); @@ -59,13 +42,30 @@ export class SmsPage implements OnInit { // } // }); } + public static SHARED_DATA = 'h2o-login-details'; + public timeInSeconds: number ; + public time: number; + public runTimer: boolean; + public hasStarted: boolean; + public countryCode: CountryCode; + public hasFinished: boolean; + public remainingTime: number; + public displayTime = ''; + // public userData: UserDetailsModel; + public mobile: string; + // tslint:disable-next-line: variable-name + public country_code: string; + public id: string; + public MobileNumber: string; + public token: string; + public resend = false; + public smc_code: any; ngOnInit() { } - - closeModal() - { + + closeModal() { this.modalCtrl.dismiss(); } @@ -74,8 +74,8 @@ export class SmsPage implements OnInit { } initTimer() { - if (!this.timeInSeconds) { - this.timeInSeconds = 60; + if (!this.timeInSeconds) { + this.timeInSeconds = 60; } this.time = this.timeInSeconds; this.runTimer = false; @@ -84,22 +84,22 @@ export class SmsPage implements OnInit { this.remainingTime = this.timeInSeconds; this.displayTime = this.getSecondsAsDigitalClock(this.remainingTime); } - + startTimer() { this.runTimer = true; this.hasStarted = true; this.resend = false; this.timerTick(); } - + pauseTimer() { this.runTimer = false; } - + resumeTimer() { this.startTimer(); } - + timerTick() { setTimeout(() => { if (!this.runTimer) { return; } @@ -107,31 +107,29 @@ export class SmsPage implements OnInit { this.displayTime = this.getSecondsAsDigitalClock(this.remainingTime); if (this.remainingTime > 0) { this.timerTick(); - } - else { + } else { this.hasFinished = true; this.resend = true; } }, 1000); } - + getSecondsAsDigitalClock(inputSeconds: number) { - var sec_num = parseInt(inputSeconds.toString(), 10); // don't forget the second param - var hours = Math.floor(sec_num / 3600); - var minutes = Math.floor((sec_num - (hours * 3600)) / 60); - var seconds = sec_num - (hours * 3600) - (minutes * 60); - var hoursString = ''; - var minutesString = ''; - var secondsString = ''; - hoursString = (hours < 10) ? "0" + hours : hours.toString(); - minutesString = (minutes < 10) ? "0" + minutes : minutes.toString(); - secondsString = (seconds < 10) ? "0" + seconds : seconds.toString(); + let sec_num = parseInt(inputSeconds.toString(), 10); // don't forget the second param + let hours = Math.floor(sec_num / 3600); + let minutes = Math.floor((sec_num - (hours * 3600)) / 60); + let seconds = sec_num - (hours * 3600) - (minutes * 60); + let hoursString = ''; + let minutesString = ''; + let secondsString = ''; + hoursString = (hours < 10) ? '0' + hours : hours.toString(); + minutesString = (minutes < 10) ? '0' + minutes : minutes.toString(); + secondsString = (seconds < 10) ? '0' + seconds : seconds.toString(); return minutesString + ':' + secondsString; } - validate() - { - //this.checkSMSActivationCode(this.smc_code); + validate() { + // this.checkSMSActivationCode(this.smc_code); SMSService.code = this.smc_code; this.stopSMSMonitoring(); this.modalCtrl.dismiss(); @@ -160,16 +158,15 @@ export class SmsPage implements OnInit { this.smsService.stopSMSMonitoring(); } - public ResendOTP() - { - this.id= SMSService.national_id; - this.mobile= SMSService.mobile_number; - this.country_code= SMSService.country_code; + public ResendOTP() { + this.id = SMSService.national_id; + this.mobile = SMSService.mobile_number; + this.country_code = SMSService.country_code; console.log(this.id); console.log(this.mobile); console.log(this.country_code); - - let zip =this.country_code; + + const zip = this.country_code; // if (this.country_code.indexOf('+') !== -1) { // zip = this.country_code.substring(this.country_code.indexOf('+') + 1); // } diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 76e163fa..dcb05139 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -25,19 +25,6 @@
- - @@ -71,9 +58,6 @@ > - - @@ -103,7 +87,7 @@
- +
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 314dd5a9..60dfc34f 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -249,7 +249,7 @@ export class HomePage implements OnInit { this.attendance(); }) .catch(error => { - console.log('Error getting location', error); + this.common.presentAlert(this.ts.trPK('home', 'position-error')); }); } else { return false; @@ -283,18 +283,6 @@ export class HomePage implements OnInit { // }); // } - ionViewDidEnter() { - this.geolocation - .getCurrentPosition() - .then(resp => { - this.lat = resp.coords.latitude; - this.longt = resp.coords.longitude; - }) - .catch(error => { - console.log('Error getting location', error); - }); - } - private openMenu() { this.menu.toggle(); } @@ -331,7 +319,6 @@ export class HomePage implements OnInit { this.showOpenMissingSwipes(); this.showAttendanceTracking(); this.getAccrualBalance(); - // this.common.stopLoading(); } public Vacation_Rule() { @@ -372,6 +359,7 @@ export class HomePage implements OnInit { for (let i = 0; i < this.menuList.length; i++) { if (this.menuList[i].MENU_TYPE === 'M') { this.events.publish('myTeamFlag', 'true'); + // this.common.sharedService.setSharedData('true', "myTeamFlag"); } } @@ -487,9 +475,11 @@ export class HomePage implements OnInit { this.barcodeScanner .scan() .then(barcodeData => { - this.scannedResult = barcodeData; - this.deviceID = this.device.uuid; - this.swipeAttendance(); + if (!barcodeData.cancelled) { + this.scannedResult = barcodeData; + this.deviceID = this.device.uuid; + this.swipeAttendance(); + } }) .catch(err => { console.log('Error', err); diff --git a/Mohem/src/app/my-specialist/home/home.component.ts b/Mohem/src/app/my-specialist/home/home.component.ts index d820bbaf..ea4bf9f2 100644 --- a/Mohem/src/app/my-specialist/home/home.component.ts +++ b/Mohem/src/app/my-specialist/home/home.component.ts @@ -133,7 +133,7 @@ export class HomeComponent implements OnInit { } } - private getSpecialistInfo(i) { + public getSpecialistInfo(i) { // this.navCtrl.push("MyTeamPage", { employee: this.specialistEmpList[i], isSpecialist: true }); this.cs.sharedService.setSharedData(this.specialistEmpList[i], MyTeamService.EMPLOYEE_SHARED_DATA); this.cs.sharedService.setSharedData(true, 'isSpecialist'); diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index af154d2f..0fb04cdb 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -159,7 +159,7 @@
{{ts.trPK('attendance-tracking','non-analyzed')}} -

{{timeCardSummaryData.UNAUTHORIZED_LEAVE}}

+

{{timeCardSummaryData.NOT_ANALYZED_DAYS}}

diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index a5e58229..087df5da 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -75,7 +75,7 @@ export class DetailsComponent implements OnInit { }; public data = {}; - + public isPostNoLoad = true; public previousActiveIndex = 0; public currentActiveIndex = 0; public searchNameOrUserName = ''; @@ -96,11 +96,13 @@ export class DetailsComponent implements OnInit { ) { } ngOnInit() { + this.common.startLoading(); this.intializeMemberDetail(); this.showAttendanceTracking(); } showAttendanceTracking() { + this.common.startLoading(); this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false); const request = { P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER @@ -116,6 +118,7 @@ export class DetailsComponent implements OnInit { public segmentChanged(event: any) { this.activeSegment = event.detail.value; if (this.activeSegment === 'Attendance') { + this.common.startLoading(); this.initAttendance(); } } @@ -139,7 +142,6 @@ export class DetailsComponent implements OnInit { } public getDayHoursTypeDetails(month?, year?) { - console.log('getDayHoursTypeDetails'); const dayAndHoursReqObj = new GetDayAndHoursDetailsRequest(); this.monthName = month; this.yearDate = year; @@ -156,17 +158,17 @@ export class DetailsComponent implements OnInit { dayAndHoursReqObj.P_PAGE_NUM = this.dayAndHoursPageNumber; dayAndHoursReqObj.P_PAGE_LIMIT = 100; - this.timeCardService.getDayHoursTypeDetails(dayAndHoursReqObj).subscribe((result) => { + this.timeCardService.getDayHoursTypeDetails(dayAndHoursReqObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { console.log(result.GetDayHoursTypeDetailsList); this.common.sharedService.setSharedData(result.GetDayHoursTypeDetailsList, 'RTP_IDs'); this.countAllAttendDays(result.GetDayHoursTypeDetailsList); } }); - } nextSlide() { + this.common.startLoading(); if (this.currentMonthName !== this.month) { this.showData = false; if (this.nextMonth > 12) { @@ -181,6 +183,7 @@ export class DetailsComponent implements OnInit { } previousSlide() { + this.common.startLoading(); this.showData = false; if (this.preMonth === 0) { this.currentYear = this.currentYear - 1; @@ -255,17 +258,11 @@ export class DetailsComponent implements OnInit { timeCardSummaryReqObj.SearchMonth = this.monthName; timeCardSummaryReqObj.SearchYear = this.yearDate; - this.timeCardService.getTimeCardSummary(timeCardSummaryReqObj).subscribe((result) => { + this.timeCardService.getTimeCardSummary(timeCardSummaryReqObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { - this.timeCardSummaryData = result.GetTimeCardSummaryList[0]; this.absentDays = this.timeCardSummaryData.ABSENT_DAYS; this.attendedDays = this.timeCardSummaryData.ATTENDED_DAYS; - - // this.totalAttendancePrecentage = this.timeCardSummaryData.PERIOD_DAYS - this.timeCardSummaryData.OFF_DAYS; - // if (this.absentDays === 0 && this.attendedDays === 0) { - // this.futrueDays = this.totalAttendancePrecentage; - // } this.totalAttendancePrecentage = this.absentDays + this.attendedDays; if (this.totalAttendancePrecentage > 0) { this.data = { diff --git a/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts b/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts index 7750f3d9..43ea2773 100644 --- a/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts +++ b/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts @@ -25,7 +25,7 @@ export class ApplyActionModalComponent implements OnInit { messageSuccess: boolean; - constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService,public worklistMainService: WorklistMainService, + constructor( public ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService,public worklistMainService: WorklistMainService, ) { this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo',false); diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index d24f510f..e2a26be5 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -25,7 +25,7 @@
- + - + @@ -63,7 +63,7 @@
-
+
{{formattedData.date}}
@@ -73,12 +73,25 @@
-
+ +
+ +
{{segmentInfo.ModifiedDate |date}}

{{segmentInfo.Title}}

+ +
+
+ {{data.ModifiedDate | date}} +
+

{{data.Title}}

+
+
+
+
{{ts.trPK('work-list','No-data-available')}} diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 33973344..5997d8ce 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -11,6 +11,7 @@ import { WorklistAdvancedSearchComponent } from '../worklist-advanced-search/wor 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 { timeout } from 'rxjs/operators'; @Component({ selector: 'app-home', @@ -23,6 +24,8 @@ export class HomeComponent implements OnInit { public static ALL_REQUEST = 'all_request'; public static NOTIFICATION_DATA = 'notification_data'; public static NOTIFICATION_ARR = 'notification_arr'; + public static NAMES_ALL_iTEMS = 'names-all-items'; + public static IS_ALL_NAME = 'is_all_names'; @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; private WorkListObj: WorkListRequest; WorkListResObj: any; @@ -50,10 +53,11 @@ export class HomeComponent implements OnInit { // public direction = 'ltr'; public direction: string; public ITGCount = 0; - public ITGSegment: {name: string, code: any, data: any, style: boolean} [] = []; + public ITGSegment: { name: string, code: any, data: any, style: boolean, names?: any }[] = []; public ITGAllItem: any = []; public selectedITGToActive = false; public ITGItem: any = []; + public ITGAllItems: any = []; public activeSegment: any; public currentActiveIndex = 0; @@ -81,17 +85,17 @@ export class HomeComponent implements OnInit { }; public data = { datasets: [ - { - data: [0, 0, 0, 0, 0], - backgroundColor: [ - '#18a169', - '#38c9b3', - '#114475', - '#3cb9d5', - '#cc3232' - ], - borderWidth: 5 - }] + { + data: [0, 0, 0, 0, 0], + backgroundColor: [ + '#18a169', + '#38c9b3', + '#114475', + '#3cb9d5', + '#cc3232' + ], + borderWidth: 5 + }] }; public filters = [ { @@ -166,20 +170,15 @@ export class HomeComponent implements OnInit { this.WorkListObj.P_PAGE_LIMIT = 50; } - - - ionViewDidEnter() { - console.log("ionViewDidEnter"); - - - // this.direction = TranslatorService.getCurrentDirection(); - this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); + console.log('ionViewDidEnter'); + // this.direction = TranslatorService.getCurrentDirection(); + this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); } ngOnInit() { + this.common.startLoading(); this.direction = TranslatorService.getCurrentLanguageName(); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); - this.common.startLoading(); this.openNotificationsDashboard(); } @@ -224,6 +223,7 @@ export class HomeComponent implements OnInit { } } this.showChart = true; + this.common.stopLoading(); } activeFilter(index: number) { @@ -246,15 +246,15 @@ export class HomeComponent implements OnInit { disableFilters() { for (const filter of this.filters) { if (filter.key === this.itemType) { - filter.disable = false; - filter.active = true; - this.selectedFilter = filter.name; + filter.disable = false; + filter.active = true; + this.selectedFilter = filter.name; } else if (this.itemType === '') { filter.disable = false; filter.active = false; } else { - filter.disable = true; - filter.active = false; + filter.disable = true; + filter.active = false; } } if (this.itemType === '') { @@ -425,12 +425,14 @@ export class HomeComponent implements OnInit { } else { this.newWorkListResponse = this.newWorkListResponse.concat(result); } - const categorizedWorkListResponse = this.categorizeData(this.newWorkListResponse); - this.assignDataToFilters(); - this.showFormattedData = this.sortArray(categorizedWorkListResponse); - this.allFormattedData = this.showFormattedData; - this.common.sharedService.setSharedData(this.newWorkListResponse, HomeComponent.NOTIFICATION_ARR); - this.common.stopLoading(); + let categorizedWorkListResponse = []; + categorizedWorkListResponse = this.categorizeData(this.newWorkListResponse); + if (categorizedWorkListResponse.length > 0) { + this.showFormattedData = this.sortArray(categorizedWorkListResponse); + this.allFormattedData = this.showFormattedData; + this.common.sharedService.setSharedData(this.newWorkListResponse, HomeComponent.NOTIFICATION_ARR); + this.assignDataToFilters(); + } } else { this.newWorkListResponse = []; } @@ -478,57 +480,67 @@ export class HomeComponent implements OnInit { } doInfinite(infiniteScroll) { - if (!this.isReachEnd && this.selectedFilter !== 'ITG') { - this.WorklistService.getWorkList(this.WorkListObj).subscribe((result) => { - if (this.common.validResponse(result)) { - this.handleWorkListResult(result.GetWorkList); - } - }); - } else { - if (this.infiniteScroll) { - this.infiniteScroll.complete(); + if (!this.isReachEnd && this.selectedFilter !== 'ITG') { + this.common.startLoading(); + this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { + if (this.common.validResponse(result)) { + this.handleWorkListResult(result.GetWorkList); } + }); + } else { + if (this.infiniteScroll) { + this.infiniteScroll.complete(); } + } } Count() { - this.workListService.getITGCount('', '', this.isPostNoLoad) - .subscribe((result: any) => { - for (let i = 0; i < result.RequestType.length; i++) { - this.ITGSegment[i] = { - name: result.RequestType[i].RequestTypeName, - code: result.RequestType[i].RequestTypeCode, - data: result.RequestType[i].RequestDetails, - style: false - }; - } - if(this.ITGSegment.length != 0 ){ - this.setActive(this.ITGSegment[0].code); - } - console.log(this.ITGSegment); - }); + const datas = []; + const names = []; + this.ITGSegment[0] = { + name: 'All', + code: 'All', + data: null, + style: false + }; + this.workListService.getITGCount('', '', this.isPostNoLoad) + .subscribe((result: any) => { + for (let i = 1; i < result.RequestType.length; i++) { + this.ITGSegment[i] = { + name: result.RequestType[i].RequestTypeName, + code: result.RequestType[i].RequestTypeCode, + data: result.RequestType[i].RequestDetails, + style: false + }; + datas[i] = result.RequestType[i].RequestDetails; + names[i] = result.RequestType[i].RequestTypeCode; + } + this.ITGSegment[0].data = datas; + this.ITGSegment[0].names = names; + this.setActive(this.ITGSegment[0].code); + }); } Details() { - this.workListService.getITGDetails('', '', this.isPostNoLoad) - .subscribe((result: any) => { - this.ITGCount = result.TotalCount; - this.totalRequestCount = this.totalRequestCount + result.TotalCount; - this.filters[5].value = result.TotalCount; - }); + this.workListService.getITGDetails('', '', this.isPostNoLoad) + .subscribe((result: any) => { + this.totalRequestCount = this.totalRequestCount + result.TotalCount; + this.filters[5].value = result.TotalCount; + }); } ITGNotification() { - this.isAll = false; - this.isPR = false; - this.isPO = false; - this.isMR = false; - this.isHR = false; - this.isITG = true; + // this.Details(); + this.isAll = false; + this.isPR = false; + this.isPO = false; + this.isMR = false; + this.isHR = false; + this.isITG = true; } searchBtn() { - this.isSearch = !this.isSearch; + this.isSearch = !this.isSearch; } setActive(selectedSegment) { @@ -545,13 +557,38 @@ export class HomeComponent implements OnInit { this.ITGSegment[i].style = false; } } + console.log(this.ITGSegment); } - openITG(segmentInfo) { + openITG(segmentInfo, name?) { + if (name) { + this.common.sharedService.setSharedData(name, HomeComponent.REQUSET_NAME); + this.common.sharedService.setSharedData(this.ITGSegment, HomeComponent.NAMES_ALL_iTEMS); + this.common.sharedService.setSharedData(true, HomeComponent.IS_ALL_NAME); + } else { + this.common.sharedService.setSharedData(this.activeSegment, HomeComponent.REQUSET_NAME); + this.common.sharedService.setSharedData(false, HomeComponent.IS_ALL_NAME); + } this.common.sharedService.setSharedData(segmentInfo, HomeComponent.REQUSET_INFO); - this.common.sharedService.setSharedData(this.activeSegment, HomeComponent.REQUSET_NAME); this.common.sharedService.setSharedData(this.ITGItem, HomeComponent.ALL_REQUEST); this.common.openWorklistITGPage(); } + + openITGAll(id, item) { + let count = 0; + let ITEM: any; + let NAME: any; + for (let i = 1; i < this.ITGSegment.length; i++) { + // tslint:disable-next-line: prefer-for-of + for (let j = 0; j < this.ITGSegment[i].data.length; j++) { + if (this.ITGSegment[i].data[j].ID === id && this.ITGSegment[i].data[j].ItemID === item) { + ITEM = this.ITGSegment[i].data[j]; + NAME = this.ITGSegment[i].code; + count++; + } + } + } + this.openITG(ITEM, NAME); + } } diff --git a/Mohem/src/app/notification/item-history/item-history.component.ts b/Mohem/src/app/notification/item-history/item-history.component.ts index fba66ff8..5016f982 100644 --- a/Mohem/src/app/notification/item-history/item-history.component.ts +++ b/Mohem/src/app/notification/item-history/item-history.component.ts @@ -26,7 +26,7 @@ export class ItemHistoryComponent implements OnInit { constructor( public worklistMainService: WorklistMainService, private cs: CommonService, - private ts: TranslatorService, + public ts: TranslatorService, private modalCtrl: ModalController, public worklistService: WorklistService ) { diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html index 846a9cfe..e89751b5 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html @@ -1,3 +1,226 @@ -

- mo-item-history works! -

+ + + + + {{ts.trPK('worklistMain','ITEM_HIS')}} + + + + + + + + + + + + + +
+

{{ 'general, empty' | translate}}

+
+ + + + +
+ + + + + + + + + + + + +
+ + {{itemHistory.REQUEST_NUMBER}} +
+ + + + +
+ + {{itemHistory.UNIT_OF_MEASURE}} +
+
+ + + + +
+ + {{itemHistory.QUANTITY}} +
+ + + + +
+ + {{itemHistory.DATE_REQUIRED}} + +
+
+ + + + + +
+ + {{itemHistory.LINE_STATUS_DIS}} +
+ + + + + +
+ + {{itemHistory.STATUS_DATE}} +
+ +
+ + + + + +
+ + {{itemHistory.TRANSACTION_TYPE_NAME}} +
+ + + + + +
+ + {{itemHistory.ORGANIZATION_NAME}} +
+ +
+ + + + + +
+ + {{itemHistory.ORGANIZATION_CODE}} +
+ + + + + +
+ + {{itemHistory.OPERATING_UNIT_NAME}} +
+ +
+ + + + + +
+ + {{itemHistory.FROM_SUBINVENTORY_CODE}} +
+ + + + + +
+ + {{itemHistory.FROM_LOCATOR}} +
+ +
+ + + + + +
+ + {{itemHistory.TO_SUBINVENTORY_CODE}} +
+ + + + + +
+ + {{itemHistory.TO_LOCATOR}} +
+ +
+ + + + + +
+ + {{itemHistory.SHIP_TO_LOCATION}} +
+ + +
+
+ +
+ +
+
+ + + + + +
diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss index e69de29b..ae11a4d9 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss @@ -0,0 +1,31 @@ +.itemeHistoryist { + background: #f0efef; + padding: 6px; + /* margin-top: 20px; */ + /* width: 100%;*/ +} +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: block; + // 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 + + + + --color: initial; + display: contents !important; + font-family: var(--ion-font-family, inherit); + font-size: inherit; + text-overflow: ellipsis !important; + white-space: pre; + overflow: hidden; + box-sizing: border-box; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts index 67073b99..f67d319d 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts @@ -1,4 +1,11 @@ import { Component, OnInit } from '@angular/core'; +import { WorklistMainService } from '../service/work-list.main.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 { WorklistService } from '../service/worklist.service'; +import { MOItemHistoryReq } from '../models/MOItemHistoryReq'; +import { MOItemHistoryRes } from '../models/MOItemHistoryRes'; @Component({ selector: 'app-mo-item-history', @@ -6,12 +13,111 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./mo-item-history.component.scss'], }) export class MoItemHistoryComponent implements OnInit { + getPassMOInfo: any; + itemHistoryRes: any; + IsReachEnd: boolean = false; + P_PAGE_NUM: number = 1; + P_PAGE_LIMIT: number = 50; + MOItemHistoryReq: any; - constructor() { } + constructor( + public worklistMainService: WorklistMainService, + private cs: CommonService, + private ts: TranslatorService, + public worklistService: WorklistService + ) { + this.getPassMOInfo = this.cs.sharedService.getSharedData('passMOReq'); + + this.MOItemHistoryReq = new MOItemHistoryReq(); + this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + this.MOItemHistoryReq.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.MOItemHistoryReq.P_ITEM_ID= this.getPassMOInfo.P_ITEM_ID; + this.MOItemHistoryReq.P_ORG_ID= this.getPassMOInfo.P_ORG_ID; + + } ngOnInit() { + this.getMOItemHistory(this.getPassMOInfo.P_ITEM_ID,this.getPassMOInfo.P_ORG_ID); + + + + } + + getMOItemHistory(itemID ,orgID) { + console.log(itemID); + this.IsReachEnd = false; + const request = new MOItemHistoryReq(); + request.P_ITEM_ID = parseInt(itemID); + request.P_PAGE_LIMIT = 100; + request.P_PAGE_NUM = 1; + request.P_ORG_ID= parseInt(orgID); + + + + this.worklistMainService.getMOItemHistory(request). + subscribe((result: MOItemHistoryRes) => { + + this.handleItemHistoryResult(result); + }); + } + + + handleItemHistoryResult(result) { + if (this.cs.validResponse(result)) { + if (this.cs.hasData(result.GetMoItemHistoryList)) { + this.itemHistoryRes = result.GetMoItemHistoryList; + this.P_PAGE_NUM++; + this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + let lastItemIndex = this.itemHistoryRes.length - 1; + if (result.GetMoItemHistoryList[lastItemIndex]) { + let lastitem = result.GetMoItemHistoryList[lastItemIndex]; + if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + } + } + + } + +} + + +doInfinite(infiniteScroll) { + if (!this.IsReachEnd) { + // this.POItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getMOItemHistory(this.MOItemHistoryReq). + subscribe((result: any) => { + if (this.cs.validResponse(result)) { + if (result.GetMoItemHistoryList != undefined) { + this.MOItemHistoryReq.P_PAGE_NUM=this.P_PAGE_NUM++; + (result.GetMoItemHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.itemHistoryRes.push(element); + }, (Error) => console.log(Error), () => infiniteScroll.target.complete()); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + infiniteScroll.target.complete(); + + }); + } else { + if (infiniteScroll) + infiniteScroll.target.complete(); } +}//end infiniteScroll + + + } diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts index 3a52bbc2..5057534b 100644 --- a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts +++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts @@ -11,7 +11,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl export class MoreActionModalComponent implements OnInit { actionBtns :any =[]; radioButtonValue: any; - constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){} + constructor( public ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){} ngOnInit() { console.log("modal"); diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts index caa8cc34..e191db27 100644 --- a/Mohem/src/app/notification/notification.module.ts +++ b/Mohem/src/app/notification/notification.module.ts @@ -27,10 +27,10 @@ import { QutationAnalysisComponent } from './qutation-analysis/qutation-analysis import { WorklistMainMRComponent } from './worklist-main-mr/worklist-main-mr.component'; import { WorklistAdvancedSearchComponent } from './worklist-advanced-search/worklist-advanced-search.component'; import { WorkListMainItgComponent } from './work-list-main-itg/work-list-main-itg.component'; - // import { WorklistMainComponent } from './worklist-main/worklist-main.component'; -import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component' +import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component' import { WorkListReplacementItgComponent } from './work-list-replacement-itg/work-list-replacement-itg.component'; +import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component'; const routes: Routes = [ @@ -114,7 +114,11 @@ const routes: Routes = [ { path: 'worklist-replacement-itg', component: WorkListReplacementItgComponent - } + }, + { + path: 'item-history-MO', + component: MoItemHistoryComponent + } ] } ]; @@ -148,7 +152,8 @@ const routes: Routes = [ WorklistMainMRComponent, WorklistAdvancedSearchComponent, WorkListMainItgComponent, - WorkListReplacementItgComponent + WorkListReplacementItgComponent, + MoItemHistoryComponent // WorklistMainComponent ], entryComponents: [ diff --git a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts index 3739b984..e7b915c4 100644 --- a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts +++ b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts @@ -28,7 +28,7 @@ export class QutationAnalysisComponent implements OnInit { doInfiniteReq: any; constructor(public worklistMainService: WorklistMainService, private cs: CommonService, - private ts: TranslatorService, + public ts: TranslatorService, private modalCtrl: ModalController, public worklistService: WorklistService) { this.getPassPOItemID = this.cs.sharedService.getSharedData('passPOInfo',false); 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 55721b2a..2876fe15 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -34,7 +34,7 @@ export class WorklistMainService { public static getPRNotificationBody = "Services/ERP.svc/REST/GET_PR_NOTIFICATION_BODY"; public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY"; - public static getMOItemHistory = "GET_MO_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"; 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 41f21f98..c6848fb7 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 @@ -8,7 +8,7 @@ -
+ [ngClass]="{'bg-blue-dot' : approvalInfo.Action === 'Submit', 'bg-green-dot':approvalInfo.Action === 'Approved', 'bg-red-dot':approvalInfo.Action === 'Rejected', 'bg-gray-dot':approvalInfo.Action === 'Pending'}" + [class]="direction == 'en'? 'timeline-thumb-en timeline-icon': 'timeline-thumb-ar timeline-icon'" + [ngClass]="{'bg-gray-dot' : approvalInfo.Action === ''}">

{{approvalInfo.Action}}

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 d42e7929..5de8fd21 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 @@ -26,6 +26,8 @@ export class WorkListMainItgComponent implements OnInit { public request_info: any; public request_name: any; public all_request: any; + public all_request_names: any; + public is_all_items_sents: any; public request = new itgRequest(); public activeSegment: any = "info"; public request_details: any; @@ -49,7 +51,9 @@ export class WorkListMainItgComponent implements OnInit { public ExchangeServerSelected: any; public ExchangeServerDBSelected: any; public actionBTN: { name: string, image: string, isAvailable: boolean }[] = []; + index2: number; direction: string; + defaultSegment = ''; constructor( public common: CommonService, public ts: TranslatorService, @@ -61,6 +65,8 @@ export class WorkListMainItgComponent implements OnInit { this.request_info = this.common.sharedService.getSharedData(HomeComponent.REQUSET_INFO); this.request_name = this.common.sharedService.getSharedData(HomeComponent.REQUSET_NAME); this.all_request = this.common.sharedService.getSharedData(HomeComponent.ALL_REQUEST); + this.all_request_names = this.common.sharedService.getSharedData(HomeComponent.NAMES_ALL_iTEMS); + this.is_all_items_sents = this.common.sharedService.getSharedData(HomeComponent.IS_ALL_NAME); this.all_request = this.all_request[0]; this.changeITGForm(this.request_info, this.request_name); } @@ -78,10 +84,9 @@ export class WorkListMainItgComponent implements OnInit { this.workListService.getITGFormDetails(this.request).subscribe((result: any) => { this.request_details = result.ITGRequest; this.grantInfo = result.ITGRequest.GrantFields; - let count = 0; for (let i = 0; i < result.ITGRequest.FieldGoups.length; i++) { this.segmentsArray[i] = { name: result.ITGRequest.FieldGoups[i].Title, number: i }; - this.segmentData[i] = { name: result.ITGRequest.FieldGoups[i].Title, data: result.ITGRequest.FieldGoups[i].Fields} + this.segmentData[i] = { name: result.ITGRequest.FieldGoups[i].Title, data: result.ITGRequest.FieldGoups[i].Fields } } this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length } this.workList = this.request_details.WFHistory; @@ -89,7 +94,9 @@ export class WorkListMainItgComponent implements OnInit { this.activeSegment = this.segmentsArray[0].name; for (let i = 0; i < this.options.length; i++) { this.imageURL(this.options[i].Action); - this.actionBTN[i] = { name: this.options[i].Action, image: this.imageURL(this.options[i].Action), isAvailable: this.options[i].IsAvailable } + this.actionBTN[i] = { + name: this.options[i].Action, image: this.imageURL(this.options[i].Action), isAvailable: this.options[i].IsAvailable + }; } if (this.grantInfo) { @@ -136,20 +143,44 @@ export class WorkListMainItgComponent implements OnInit { } skip() { - for (let i = 0; i < this.all_request.length; i++) { // search for the request that clicked on all request - if (this.request_info.ID == this.all_request[i].ID) { // check if the ID for the request is found. - this.index = i + 1; - if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request. - this.clearDataArray(); - this.changeITGForm(this.all_request[this.index], this.request_name); - break; + 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++) { + if (this.request_info.ID === this.all_request_names[i].data[j].ID + && this.request_info.ItemID === this.all_request_names[i].data[j].ItemID) { + this.index2 = j + 1; + this.index = i + 1; + if (this.all_request_names[i].data.length !== this.index2) {// if there is another request with same type + this.clearDataArray(); + this.changeITGForm(this.all_request_names[i].data[this.index2], this.all_request_names[i].code); + return false; + } else if (this.index !== this.all_request_names.length) { // if there is another deffernet type. + this.clearDataArray(); + this.changeITGForm(this.all_request_names[this.index].data[j], this.all_request_names[this.index].code); + return false; + } + } else if (this.index === this.all_request_names.length) { //if its the end request redirecte to worklist home + this.common.openNotificationPage(); + return false; + } + } + } + } else { + for (let i = 0; i < this.all_request.length; i++) { // search for the request that clicked on all request + if (this.request_info.ID == this.all_request[i].ID) { // check if the ID for the request is found. + this.index = i + 1; + if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request. + this.clearDataArray(); + this.changeITGForm(this.all_request[this.index], this.request_name); + break + } else { + this.common.openNotificationPage(); + break + } } else { this.common.openNotificationPage(); - break; + break } - } else { - this.common.openNotificationPage(); - break; } } } 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 24c7ebb4..04757f13 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 @@ -11,7 +11,7 @@ {{'replacementRoll, searchBy' | translate}} + [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)"> {{'addAttach, name' | translate}} {{'login, username' | translate}} {{'general, email' | translate}} @@ -19,11 +19,11 @@ - + - + - @@ -408,6 +408,25 @@ + + + + +
+ + +
+ + +
+
+ + @@ -640,13 +659,12 @@ - + Approve - + Reject @@ -660,7 +678,7 @@ Skip - + More 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 17fdaffe..ce610cf9 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 @@ -1,17 +1,17 @@ -import { Component, OnInit, ElementRef } 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 { WorkListBodyRequest } from "../models/NotificationBodyReq"; -import { EITNotificatonBodyResponse } from "../models/EITNotificationBodyRes"; -import { AbsenceNotificatonBodyResponse } from "../models/AbsenceNotificationBodyRes"; -import { NotificatonButtonResponse } from "../models/NotificationButtonRes"; -import { WorkListActionRequest } from "../models/NotificationActionReq"; -import { WorkListButtonRequest } from "../models/NotificationButtonReq"; +import { Component, OnInit, ElementRef } 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 { WorkListBodyRequest } from '../models/NotificationBodyReq'; +import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; +import { AbsenceNotificatonBodyResponse } from '../models/AbsenceNotificationBodyRes'; +import { NotificatonButtonResponse } from '../models/NotificationButtonRes'; +import { WorkListActionRequest } from '../models/NotificationActionReq'; +import { WorkListButtonRequest } from '../models/NotificationButtonReq'; // import { isDate } from 'angular6-json-schema-form'; -import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; -import { LoginRequest } from "src/app/hmg-common/services/authentication/models/login.request"; -import { WorklistMainService } from "../service/work-list.main.service"; -import { HomeComponent } from "src/app/notification/home/home.component"; +import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; +import { LoginRequest } from 'src/app/hmg-common/services/authentication/models/login.request'; +import { WorklistMainService } from '../service/work-list.main.service'; +import { HomeComponent } from 'src/app/notification/home/home.component'; import { TextInput } from 'src/app/uI-elements/text.input'; import { TextAreaInput } from 'src/app/uI-elements/text-area.input'; import { MenuService } from 'src/app/hmg-common/services/menu/menuservice.service'; @@ -31,6 +31,8 @@ import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-mo import { MoreActionModalComponent } from '../more-action-modal/more-action-modal.component'; import { WorkListReplacementRollComponent } from '../work-list-replacement-roll/work-list-replacement-roll.component'; import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; +import { MOItemHistoryRes } from '../models/MOItemHistoryRes'; +import { MOItemHistoryReq } from '../models/MOItemHistoryReq'; @Component({ selector: 'app-worklist-main-mr', @@ -45,17 +47,17 @@ export class WorklistMainMRComponent implements OnInit { private WorkListActionHistoryObj: WorkListActionHistoryRequest; private WorkListAttachObj: WorkListButtonRequest; private PRList: PRNotificatonBodyList - public static PASS_NOTIFICATION_INFO = "passNotificationInfo"; - public static PASS_ACTION_MODE = "passActionMode"; + public static PASS_NOTIFICATION_INFO = 'passNotificationInfo'; + public static PASS_ACTION_MODE = 'passActionMode'; getPassNotificationDetails: any; - public static PASS_RES_ATTR = "passResAttr"; + public static PASS_RES_ATTR = 'passResAttr'; TransactionID: number = -999; notificationBodyRes: any; actionHistoryRes: any; notificationButtonRes: any; actionMode: any; - pInformation: string = ""; - pQuestion: string = ""; + pInformation: string = ''; + pQuestion: string = ''; RespondAttributesListRes: any; schemaNotific: any; NotRespondAttributeList: any; @@ -66,7 +68,7 @@ export class WorklistMainMRComponent implements OnInit { dataOfAttr: any; P_RESPOND_ATTRIBUTES_TBL: any; selEmployeeID: any; - actionType: string = ""; + actionType: string = ''; notificationArray: any; notificationDynamicAttributeArr: any; private textInput: TextInput; @@ -87,7 +89,7 @@ export class WorklistMainMRComponent implements OnInit { confirmMsg: string; delMsg: string; closeMsg: string; - activeSegment: any = "item-req"; + activeSegment: any = 'item-req'; lines_note_limit: any = 24; orgNote: string; truncating: boolean; @@ -99,8 +101,10 @@ export class WorklistMainMRComponent implements OnInit { approveDis: boolean = false; rejectDis: boolean = false; requestDis: boolean = false; + public static PASS_MO_REQ = "passMOReq"; + moreDisabled: boolean = true; direction: string; - + defaultSegment = ''; constructor( @@ -133,14 +137,14 @@ export class WorklistMainMRComponent implements OnInit { } public segmentChanged(event: any) { this.activeSegment = event.detail.value; - console.log(" event.detail.value: " + event.detail.value); + console.log(' event.detail.value: ' + event.detail.value); } intializeNotificationDetail() { if (this.messageSuccess) { - document.getElementById("notificationDynamicFields").innerHTML = ""; + document.getElementById('notificationDynamicFields').innerHTML = ''; } - console.log("intializeNotificationDetail"); + console.log('intializeNotificationDetail'); this.getPassNotificationDetails = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_DATA, false @@ -163,9 +167,9 @@ export class WorklistMainMRComponent implements OnInit { this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; this.WorkListActionObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; - this.WorkListActionObj.P_ACTION_MODE = ""; - this.WorkListActionObj.P_COMMENTS = ""; + this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ''; + this.WorkListActionObj.P_ACTION_MODE = ''; + this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.P_APPROVER_INDEX = null; this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; @@ -178,15 +182,15 @@ export class WorklistMainMRComponent implements OnInit { this.getNotificationResAttr(this.WorkListButtonsObj); this.getActionHistory(this.WorkListActionHistoryObj); this.getAttachmentNotification(this.WorkListAttachObj); - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == 'EIT') { this.getEITNotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'ABSENCE') { this.getAbsenceNotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'PO') { this.getPONotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "MO") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'MO') { this.getMONotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'PR') { this.getPRNotificationDetails(this.WorkListBodyObj); } } @@ -195,7 +199,7 @@ export class WorklistMainMRComponent implements OnInit { this.worklistMainService .getPRNotificationBody(notificationBodyObj) .subscribe((result: PRNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "PR"); + this.handleWorkListBodyResult(result, 'PR'); }); } @@ -203,7 +207,7 @@ export class WorklistMainMRComponent implements OnInit { this.worklistMainService .getMONotificationBody(notificationBodyObj) .subscribe((result: MONotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "MO"); + this.handleWorkListBodyResult(result, 'MO'); }); } @@ -212,7 +216,7 @@ export class WorklistMainMRComponent implements OnInit { .getPONotificationBody(notificationBodyObj) .subscribe((result: PONotificatonBodyResponse) => { console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); - this.handleWorkListBodyResult(result, "PO"); + this.handleWorkListBodyResult(result, 'PO'); }); } @@ -220,7 +224,7 @@ export class WorklistMainMRComponent implements OnInit { this.worklistMainService .getEITNotificationBody(notificationBodyObj) .subscribe((result: EITNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "EIT"); + this.handleWorkListBodyResult(result, 'EIT'); }); } @@ -228,16 +232,16 @@ export class WorklistMainMRComponent implements OnInit { this.worklistMainService .getAbsencesNotificationBody(notificationBodyObj) .subscribe((result: AbsenceNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "ABSENCE"); + this.handleWorkListBodyResult(result, 'ABSENCE'); }); } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + this.notificationBodyRes = []; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; - if (Type == "MO") { + if (Type == 'MO') { if (result.GetMoNotificationBodyList) { this.notificationBodyRes = result.GetMoNotificationBodyList; @@ -262,18 +266,25 @@ export class WorklistMainMRComponent implements OnInit { // this.sharedData.setSharedData(result, WorKListResponse.SHARED_DATA); if (result.GetNotificationButtonsList != null) { this.notificationButtonRes = result.GetNotificationButtonsList; - this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore"); - console.log("test" + this.notificationButtonRes.length); + this.common.sharedService.setSharedData(this.notificationButtonRes, 'passActionMore'); + console.log('test' + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { - if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED" ) { this.approveDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED" ) { this.rejectDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { + if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') { this.requestDis = true; } // if result == null + else if( + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + { + this.moreDisabled = false; + + } + } // valid it } // if result == null @@ -328,7 +339,7 @@ export class WorklistMainMRComponent implements OnInit { } actionButton(action) { - console.log("actionButton" + action); + console.log('actionButton' + action); // alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; @@ -337,13 +348,13 @@ export class WorklistMainMRComponent implements OnInit { for (let i = 0; i < this.notificationDynamicAttributeArr.length; i++) { let obj: any = {}; obj.ATTRIBUTE_NAME = this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME; - if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE === "number") { + if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE === 'number') { obj.ATTRIBUTE_NUMBER_VALUE = (document.getElementById(this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME) as HTMLInputElement).value; } // else if (isDate(responseAttrDic[key])) { // obj.ATTRIBUTE_DATE_VALUE = responseAttrDic[key]; // } - else if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE == "VARCHAR2") { + else if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE == 'VARCHAR2') { obj.ATTRIBUTE_TEXT_VALUE = (document.getElementById(this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME) as HTMLInputElement).value; } this.P_RESPOND_ATTRIBUTES_TBL.push(obj); @@ -351,20 +362,20 @@ export class WorklistMainMRComponent implements OnInit { let repUserName = this.selEmployeeID; if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { let obj: any = {}; - repUserName = ""; + repUserName = ''; obj.ATTRIBUTE_NAME = this.hideForwordEmployee.ATTRIBUTE_NAME; obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID; this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } if ( - ButtonAction == "APPROVE" || - ButtonAction == "REJECT" || + ButtonAction == "APPROVED" || + ButtonAction == "REJECTED" || ButtonAction == "DEL" || ButtonAction == "CLOSE" ) { - this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; + this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ''; this.WorkListActionObj.P_ACTION_MODE = ButtonAction; - this.WorkListActionObj.P_COMMENTS = ""; + this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; //sheardData @@ -374,30 +385,30 @@ export class WorklistMainMRComponent implements OnInit { ); ///////////////////////////////////////////// - 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') } - else if (ButtonAction == "DEL") { + else if (ButtonAction == 'DEL') { this.confirmMsg = this.ts.trPK('worklistMain', 'delMsg') } - else if (ButtonAction == "CLOSE") { + else if (ButtonAction == 'CLOSE') { this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg') } - this.openApplyModal(this.WorkListActionObj); + // this.openApplyModal(this.WorkListActionObj); - // this.common.confirmAlertDialogAction( - // () => { - // this.applyAction(this.WorkListActionObj); - // }, this.ts.trPK('general', 'ok'), - // () => { }, this.ts.trPK('general', 'cancel'), - // this.ts.trPK('vacation-rule', 'confirmation'), - // this.confirmMsg); + this.common.confirmAlertDialogAction( + () => { + this.applyAction(this.WorkListActionObj); + }, this.ts.trPK('general', 'ok'), + () => { }, this.ts.trPK('general', 'cancel'), + this.ts.trPK('vacation-rule', 'confirmation'), + this.confirmMsg); ////////////////////////////////////////////////////////// @@ -416,7 +427,7 @@ export class WorklistMainMRComponent implements OnInit { ////////////this.applyAction(this.WorkListActionObj); } - if (ButtonAction == "RFC") { + if (ButtonAction == 'RFC') { // alert("Return For Correction"); this.WorkListActionObj.P_ACTION_MODE = ButtonAction; // this.navCtrl.push("WorkListRfcPage", { @@ -438,9 +449,9 @@ export class WorklistMainMRComponent implements OnInit { ); // this.common.openWorklistRFCPage(); this.openRFCModal(); - } else if (ButtonAction == "ANSWER_INFO") { + } else if (ButtonAction == 'ANSWER_INFO') { - this.common.sharedService.setSharedData(this.pQuestion, "pQuestion"); + this.common.sharedService.setSharedData(this.pQuestion, 'pQuestion'); this.common.sharedService.setSharedData( this.getPassNotificationDetails, WorklistMainMRComponent.PASS_NOTIFICATION_INFO @@ -456,12 +467,12 @@ export class WorklistMainMRComponent implements OnInit { //this.common.openWorklistRollReplacement(); this.openReplacementRoll(); } else if ( - ButtonAction == "DELEGATE" || - ButtonAction == "REQUEST_INFO" || - ButtonAction == "TRANSFER" || - ButtonAction == "TRANSFER_INFO" || - ButtonAction == "APPROVE_AND_FORWARD" || - ButtonAction == "FORWARD" + ButtonAction == 'DELEGATE' || + ButtonAction == 'REQUEST_INFO' || + ButtonAction == 'TRANSFER' || + ButtonAction == 'TRANSFER_INFO' || + ButtonAction == 'APPROVE_AND_FORWARD' || + ButtonAction == 'FORWARD' ) { @@ -487,10 +498,10 @@ export class WorklistMainMRComponent implements OnInit { // this.common.openWorklistRollReplacement(); this.openReplacementRoll(); } else if ( - ButtonAction == "UPDATE_ACTION" || - ButtonAction == "CONTINUE_ACTION" + ButtonAction == 'UPDATE_ACTION' || + ButtonAction == 'CONTINUE_ACTION' ) { - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == 'EIT') { this.common.sharedService.setSharedData( this.notificationBodyRes, EITNotificatonBodyResponse.SHARED_DATA @@ -500,7 +511,7 @@ export class WorklistMainMRComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("EitUpdateListPage"); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'ABSENCE') { this.common.sharedService.setSharedData( this.notificationBodyRes, AbsenceNotificatonBodyResponse.SHARED_DATA @@ -518,15 +529,15 @@ export class WorklistMainMRComponent implements OnInit { } else if (this.notificationButtonRes.length > 0 && !ButtonAction) { (this.elementRef.nativeElement.querySelectorAll( - "ion-item" + 'ion-item' ) as HTMLElement[]).forEach(x => { - if (x.classList.contains("requiredItem")) { - x.classList.add("ng-touched"); - x.classList.remove("ng-untouched"); + if (x.classList.contains('requiredItem')) { + x.classList.add('ng-touched'); + x.classList.remove('ng-untouched'); } }); this.common.presentAlert( - this.ts.trPK("worklistMain", "actionRequird") + this.ts.trPK('worklistMain', 'actionRequird') ); } } @@ -569,7 +580,7 @@ export class WorklistMainMRComponent implements OnInit { this.NotRespondAttributeList = result.NotificationGetRespondAttributesList; if ( - result.NotificationRespondRolesList != "" && + result.NotificationRespondRolesList != '' && result.NotificationRespondRolesList[0].ATTRIBUTE_NAME != null && result.NotificationRespondRolesList[0].ATTRIBUTE_NAME != undefined ) { @@ -592,20 +603,20 @@ export class WorklistMainMRComponent implements OnInit { notificationDynamicFields(notificationAttr) { const containerId = 'notificationDynamicFields'; for (let i = 0; i < notificationAttr.length; i++) { - if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") { - this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); - } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") { + if (notificationAttr[i].ATTRIBUTE_TYPE == 'VARCHAR2') { + this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, '', containerId, '', '', ''); + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'ROLE') { - } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") { + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'DATE') { - } else if (notificationAttr[i].ATTRIBUTE_TYPE == "NUMBER") { + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'NUMBER') { } } } openNotificationBody() { - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == 'EIT') { this.common.sharedService.setSharedData( this.notificationBodyRes, EITNotificatonBodyResponse.SHARED_DATA @@ -615,9 +626,9 @@ export class WorklistMainMRComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("WorkListDetailsPage", { NotBodyType: "EIT" }); - this.common.sharedService.setSharedData("EIT", "NotBodyType"); + this.common.sharedService.setSharedData('EIT', 'NotBodyType'); this.common.openNotificationDetailsPage(); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'ABSENCE') { this.common.sharedService.setSharedData( this.notificationBodyRes, AbsenceNotificatonBodyResponse.SHARED_DATA @@ -626,7 +637,7 @@ export class WorklistMainMRComponent implements OnInit { this.getPassNotificationDetails, AbsenceNotificatonBodyResponse.NOT_WORKLIST ); - this.common.sharedService.setSharedData("ABSENCE", "NotBodyType"); + this.common.sharedService.setSharedData('ABSENCE', 'NotBodyType'); //this.navCtrl.push("WorkListDetailsPage", { NotBodyType: "ABSENCE" }); this.common.openNotificationDetailsPage(); } @@ -641,7 +652,7 @@ export class WorklistMainMRComponent implements OnInit { if (this.notificationCount <= 0) { this.notificationCount = null; } - this.events.publish("getNotCount", this.notificationCount); + this.events.publish('getNotCount', this.notificationCount); } }); } @@ -699,7 +710,7 @@ export class WorklistMainMRComponent implements OnInit { async openNoteDetail(note, sender) { // let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note }); // modalPage.present(); - console.log("note" + note); + console.log('note' + note); this.common.sharedService.setSharedData(note, 'ViewNoteModalPage') this.common.sharedService.setSharedData(sender, 'ViewNoteModalPageSender') @@ -715,7 +726,7 @@ export class WorklistMainMRComponent implements OnInit { } doInfinite(infiniteScroll) { - console.log("doInfinite action history MR"); + console.log('doInfinite action history MR'); if (!this.IsReachEnd) { this.worklistService.getActionHistory(this.WorkListActionHistoryObj). @@ -800,7 +811,7 @@ export class WorklistMainMRComponent implements OnInit { doInfiniteNotificationBody(infiniteScroll) { - console.log("doInfiniteNotificationBody MR"); + console.log('doInfiniteNotificationBody MR'); if (!this.IsReachEnd) { this.worklistMainService.getMONotificationBody(this.WorkListActionHistoryObj). subscribe((result: any) => { @@ -835,9 +846,9 @@ export class WorklistMainMRComponent implements OnInit { loadMoreNotificationBody() { - console.log("loadMoreNotificationBody MR"); + console.log('loadMoreNotificationBody MR'); if (!this.IsReachEnd) { - console.log("this.IsReachEnd" + this.IsReachEnd); + console.log('this.IsReachEnd' + this.IsReachEnd); this.worklistMainService.getMONotificationBody(this.WorkListBodyObj). subscribe((result: any) => { @@ -855,7 +866,7 @@ export class WorklistMainMRComponent implements OnInit { this.notificationBodyRes.push(element); }, (Error) => console.log(Error), () => //infiniteScroll.target.complete() - console.log("test") + console.log('test') ); }// if list length >0 else { @@ -872,7 +883,7 @@ export class WorklistMainMRComponent implements OnInit { } }//end infiniteScroll loadMoreActionHistory() { - console.log("doInfinite action history MR"); + console.log('doInfinite action history MR'); if (!this.IsReachEnd) { this.worklistService.getActionHistory(this.WorkListActionHistoryObj). @@ -891,7 +902,7 @@ export class WorklistMainMRComponent implements OnInit { this.actionHistoryRes.push(element); }, (Error) => console.log(Error), () => //infiniteScroll.target.complete() - console.log("TEST")); + console.log('TEST')); }// if list length >0 else { this.IsReachEnd = true; @@ -922,7 +933,7 @@ export class WorklistMainMRComponent implements OnInit { .then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; } else { @@ -945,7 +956,7 @@ export class WorklistMainMRComponent implements OnInit { /////////////////////////////////////////// public checkLines(note) { - console.log(note.split("\n").length); + console.log(note.split('\n').length); console.log(note.length); if (note && note != null) { @@ -970,7 +981,7 @@ export class WorklistMainMRComponent implements OnInit { } this.actionHistoryRes = actionHis; - console.log("test"); + console.log('test'); } @@ -986,9 +997,9 @@ export class WorklistMainMRComponent implements OnInit { modal.onDidDismiss().then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; - } else if (data.data == "Success") { + } else if (data.data == 'Success') { this.getNotificationCountAfterSubmit(); this.nextNotfification(); @@ -1018,9 +1029,9 @@ export class WorklistMainMRComponent implements OnInit { .then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; - } else if (data.data == "Success") { + } else if (data.data == 'Success') { this.getNotificationCountAfterSubmit(); this.nextNotfification(); @@ -1035,4 +1046,52 @@ export class WorklistMainMRComponent implements OnInit { } + getMOItemHistory(itemID ,orgID) { + console.log(itemID); + this.IsReachEnd = false; + const request = new MOItemHistoryReq(); + request.P_ITEM_ID = parseInt(itemID); + request.P_PAGE_LIMIT = 100; + request.P_PAGE_NUM = 1; + request.P_ORG_ID= parseInt(orgID); + + + + this.worklistMainService.getMOItemHistory(request). + subscribe((result: MOItemHistoryRes) => { + // this.common.sharedService.setSharedData( + // result.GetItemHistoryList, + // WorklistMainPoComponent.ItemHistoryList + // ); + this.common.sharedService.setSharedData( + request, + WorklistMainMRComponent.PASS_MO_REQ + ); + //open page + // this.common.openItemHistoryPage(); + this.handleItemHistoryResult(result); + }); + } + + + handleItemHistoryResult(result) { + if (this.common.validResponse(result)) { + if (this.common.hasData(result.GetMoItemHistoryList)) { + this.common.openMOItemHistoryPage(); + + } + } + else { + this.common.presentAlert( + this.ts.trPK("general", "empty") + ); + } + + } + + } + + + + 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 0daad28e..74f64e09 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 @@ -15,7 +15,7 @@
{{getPassNotificationDetails.SUBJECT}}
- Skip
- + More 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 c09b1ab0..d6655739 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 @@ -115,8 +115,9 @@ export class WorklistMainPoComponent implements OnInit { approveDis: boolean = false; rejectDis: boolean = false; requestDis: boolean = false; + moreDisabled: boolean = true; direction: string; - + defaultSegment = ''; constructor( public common: CommonService, @@ -307,6 +308,13 @@ export class WorklistMainPoComponent implements OnInit { if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { this.requestDis = true; } // if result == null + else if ( + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + { + this.moreDisabled = false; + + } + } // valid it } // valid it 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 9d065530..2546220a 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 @@ -12,7 +12,7 @@
{{getPassNotificationDetails.SUBJECT}}
- Skip
- + More 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 e83e6977..6d9d4ee0 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 @@ -1,17 +1,17 @@ -import { Component, OnInit, ElementRef } 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 { WorkListBodyRequest } from "../models/NotificationBodyReq"; -import { EITNotificatonBodyResponse } from "../models/EITNotificationBodyRes"; -import { AbsenceNotificatonBodyResponse } from "../models/AbsenceNotificationBodyRes"; -import { NotificatonButtonResponse } from "../models/NotificationButtonRes"; -import { WorkListActionRequest } from "../models/NotificationActionReq"; -import { WorkListButtonRequest } from "../models/NotificationButtonReq"; +import { Component, OnInit, ElementRef } 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 { WorkListBodyRequest } from '../models/NotificationBodyReq'; +import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; +import { AbsenceNotificatonBodyResponse } from '../models/AbsenceNotificationBodyRes'; +import { NotificatonButtonResponse } from '../models/NotificationButtonRes'; +import { WorkListActionRequest } from '../models/NotificationActionReq'; +import { WorkListButtonRequest } from '../models/NotificationButtonReq'; // import { isDate } from 'angular6-json-schema-form'; -import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; -import { LoginRequest } from "src/app/hmg-common/services/authentication/models/login.request"; -import { WorklistMainService } from "../service/work-list.main.service"; -import { HomeComponent } from "src/app/notification/home/home.component"; +import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; +import { LoginRequest } from 'src/app/hmg-common/services/authentication/models/login.request'; +import { WorklistMainService } from '../service/work-list.main.service'; +import { HomeComponent } from 'src/app/notification/home/home.component'; import { TextInput } from 'src/app/uI-elements/text.input'; import { TextAreaInput } from 'src/app/uI-elements/text-area.input'; import { MenuService } from 'src/app/hmg-common/services/menu/menuservice.service'; @@ -45,17 +45,17 @@ export class WorklistMainPRComponent implements OnInit { private WorkListActionHistoryObj: WorkListActionHistoryRequest; private WorkListAttachObj: WorkListButtonRequest; private PRList: PRNotificatonBodyList - public static PASS_NOTIFICATION_INFO = "passNotificationInfo"; - public static PASS_ACTION_MODE = "passActionMode"; + public static PASS_NOTIFICATION_INFO = 'passNotificationInfo'; + public static PASS_ACTION_MODE = 'passActionMode'; getPassNotificationDetails: any; - public static PASS_RES_ATTR = "passResAttr"; + public static PASS_RES_ATTR = 'passResAttr'; TransactionID: number = -999; notificationBodyRes: any; actionHistoryRes: any; notificationButtonRes: any; actionMode: any; - pInformation: string = ""; - pQuestion: string = ""; + pInformation: string = ''; + pQuestion: string = ''; RespondAttributesListRes: any; schemaNotific: any; NotRespondAttributeList: any; @@ -66,7 +66,7 @@ export class WorklistMainPRComponent implements OnInit { dataOfAttr: any; P_RESPOND_ATTRIBUTES_TBL: any; selEmployeeID: any; - actionType: string = ""; + actionType: string = ''; notificationArray: any; notificationDynamicAttributeArr: any; private textInput: TextInput; @@ -96,11 +96,13 @@ export class WorklistMainPRComponent implements OnInit { demoeAttach: any = []; notiActionBtnMore: any = []; messageSuccess: boolean = false; - activeSegment: any = "item-req"; + activeSegment: any = 'item-req'; approveDis: boolean; rejectDis: boolean; requestDis: boolean; + moreDisabled: boolean = true; direction: string; + defaultSegment = ''; constructor( @@ -137,10 +139,10 @@ export class WorklistMainPRComponent implements OnInit { intializeNotificationDetail() { if (this.messageSuccess) { - document.getElementById("notificationDynamicFields").innerHTML = ""; + document.getElementById('notificationDynamicFields').innerHTML = ''; } - console.log("intializeNotificationDetail"); + console.log('intializeNotificationDetail'); this.getPassNotificationDetails = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_DATA, false @@ -163,9 +165,9 @@ export class WorklistMainPRComponent implements OnInit { this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; this.WorkListActionObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; - this.WorkListActionObj.P_ACTION_MODE = ""; - this.WorkListActionObj.P_COMMENTS = ""; + this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ''; + this.WorkListActionObj.P_ACTION_MODE = ''; + this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.P_APPROVER_INDEX = null; this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; @@ -179,28 +181,28 @@ export class WorklistMainPRComponent implements OnInit { this.getActionHistory(this.WorkListActionHistoryObj); this.getAttachmentNotification(this.WorkListAttachObj); - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == 'EIT') { this.getEITNotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'ABSENCE') { this.getAbsenceNotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'PO') { this.getPONotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "MO") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'MO') { this.getMONotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'PR') { this.getPRNotificationDetails(this.WorkListBodyObj); } } public segmentChanged(event: any) { this.activeSegment = event.detail.value; - console.log(" event.detail.value: " + event.detail.value); + console.log(' event.detail.value: ' + event.detail.value); } getPRNotificationDetails(notificationBodyObj) { this.worklistMainService .getPRNotificationBody(notificationBodyObj) .subscribe((result: PRNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "PR"); + this.handleWorkListBodyResult(result, 'PR'); }); } @@ -217,7 +219,7 @@ export class WorklistMainPRComponent implements OnInit { .getPONotificationBody(notificationBodyObj) .subscribe((result: PONotificatonBodyResponse) => { console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); - this.handleWorkListBodyResult(result, "PO"); + this.handleWorkListBodyResult(result, 'PO'); }); } @@ -225,7 +227,7 @@ export class WorklistMainPRComponent implements OnInit { this.worklistMainService .getEITNotificationBody(notificationBodyObj) .subscribe((result: EITNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "EIT"); + this.handleWorkListBodyResult(result, 'EIT'); }); } @@ -233,7 +235,7 @@ export class WorklistMainPRComponent implements OnInit { this.worklistMainService .getAbsencesNotificationBody(notificationBodyObj) .subscribe((result: AbsenceNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "ABSENCE"); + this.handleWorkListBodyResult(result, 'ABSENCE'); }); } @@ -242,20 +244,20 @@ export class WorklistMainPRComponent implements OnInit { if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; - if (Type == "EIT") { + if (Type == 'EIT') { if (result.GetEITCollectionNotificationBodyList) { this.notificationBodyRes = result.GetEITCollectionNotificationBodyList; } - } else if (Type == "ABSENCE") { - console.log("ABSENCE"); + } else if (Type == 'ABSENCE') { + console.log('ABSENCE'); if (result.GetAbsenceCollectionNotificationBodyList) { this.notificationBodyRes = result.GetAbsenceCollectionNotificationBodyList; } - } else if (Type == "PR") { + } else if (Type == 'PR') { if (result.GetPrNotificationBodyList) { - console.log("PR"); + console.log('PR'); this.PRHeader = result.GetPrNotificationBodyList.PRHeader; this.PRLines = result.GetPrNotificationBodyList.PRLines; @@ -296,18 +298,24 @@ export class WorklistMainPRComponent implements OnInit { // this.sharedData.setSharedData(result, WorKListResponse.SHARED_DATA); if (result.GetNotificationButtonsList != null) { this.notificationButtonRes = result.GetNotificationButtonsList; - this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore"); - console.log("test" + this.notificationButtonRes.length); + this.common.sharedService.setSharedData(this.notificationButtonRes, 'passActionMore'); + console.log('test' + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { - if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") { + if (this.notificationButtonRes[i].BUTTON_ACTION == 'APPROVE') { this.approveDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") { + if (this.notificationButtonRes[i].BUTTON_ACTION == 'REJECT') { this.rejectDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { + if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') { this.requestDis = true; } // if result == null + else if ( + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + { + this.moreDisabled = false; + + } } // valid it } } // valid it @@ -361,7 +369,7 @@ export class WorklistMainPRComponent implements OnInit { actionButton(action) { - console.log("actionButton" + action); + console.log('actionButton' + action); //alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; @@ -372,13 +380,13 @@ export class WorklistMainPRComponent implements OnInit { for (let i = 0; i < this.notificationDynamicAttributeArr.length; i++) { let obj: any = {}; obj.ATTRIBUTE_NAME = this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME; - if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE === "number") { + if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE === 'number') { obj.ATTRIBUTE_NUMBER_VALUE = (document.getElementById(this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME) as HTMLInputElement).value; } // else if (isDate(responseAttrDic[key])) { // obj.ATTRIBUTE_DATE_VALUE = responseAttrDic[key]; // } - else if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE == "VARCHAR2") { + else if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE == 'VARCHAR2') { obj.ATTRIBUTE_TEXT_VALUE = (document.getElementById(this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME) as HTMLInputElement).value; } this.P_RESPOND_ATTRIBUTES_TBL.push(obj); @@ -386,20 +394,20 @@ export class WorklistMainPRComponent implements OnInit { let repUserName = this.selEmployeeID; if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { let obj: any = {}; - repUserName = ""; + repUserName = ''; obj.ATTRIBUTE_NAME = this.hideForwordEmployee.ATTRIBUTE_NAME; obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID; this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } if ( - ButtonAction == "APPROVE" || - ButtonAction == "REJECT" || - ButtonAction == "DEL" || - ButtonAction == "CLOSE" + ButtonAction == 'APPROVE' || + ButtonAction == 'REJECT' || + ButtonAction == 'DEL' || + ButtonAction == 'CLOSE' ) { - this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; + this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ''; this.WorkListActionObj.P_ACTION_MODE = ButtonAction; - this.WorkListActionObj.P_COMMENTS = ""; + this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; //sheardData @@ -407,18 +415,18 @@ export class WorklistMainPRComponent implements OnInit { // this.WorkListActionObj, // WorklistMainPRComponent.PASS_NOTIFICATION_INFO // ); - if (ButtonAction == "APPROVE") { + if (ButtonAction == 'APPROVE') { this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg') } - else if (ButtonAction == "REJECT") { + else if (ButtonAction == 'REJECT') { this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg') } - else if (ButtonAction == "DEL") { + else if (ButtonAction == 'DEL') { this.confirmMsg = this.ts.trPK('worklistMain', 'delMsg') } - else if (ButtonAction == "CLOSE") { + else if (ButtonAction == 'CLOSE') { this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg') } @@ -448,7 +456,7 @@ export class WorklistMainPRComponent implements OnInit { ////////////this.applyAction(this.WorkListActionObj); } - if (ButtonAction == "RFC") { + if (ButtonAction == 'RFC') { // alert("Return For Correction"); this.WorkListActionObj.P_ACTION_MODE = ButtonAction; // this.navCtrl.push("WorkListRfcPage", { @@ -470,14 +478,14 @@ export class WorklistMainPRComponent implements OnInit { ); // this.common.openWorklistRFCPage(); this.openRFCModal(); - } else if (ButtonAction == "ANSWER_INFO") { + } else if (ButtonAction == 'ANSWER_INFO') { // this.navCtrl.push("WorkListReplacmentRollPage", { // pQuestion: this.pQuestion, // passNotificationInfo: this.getPassNotificationDetails, // passActionMode: ButtonAction, // passResAttr: this.P_RESPOND_ATTRIBUTES_TBL // }); - this.common.sharedService.setSharedData(this.pQuestion, "pQuestion"); + this.common.sharedService.setSharedData(this.pQuestion, 'pQuestion'); this.common.sharedService.setSharedData( this.getPassNotificationDetails, WorklistMainPRComponent.PASS_NOTIFICATION_INFO @@ -493,12 +501,12 @@ export class WorklistMainPRComponent implements OnInit { // this.common.openWorklistRollReplacement(); this.openRepRolModal(); } else if ( - ButtonAction == "DELEGATE" || - ButtonAction == "REQUEST_INFO" || - ButtonAction == "TRANSFER" || - ButtonAction == "TRANSFER_INFO" || - ButtonAction == "APPROVE_AND_FORWARD" || - ButtonAction == "FORWARD" + ButtonAction == 'DELEGATE' || + ButtonAction == 'REQUEST_INFO' || + ButtonAction == 'TRANSFER' || + ButtonAction == 'TRANSFER_INFO' || + ButtonAction == 'APPROVE_AND_FORWARD' || + ButtonAction == 'FORWARD' ) { @@ -524,10 +532,10 @@ export class WorklistMainPRComponent implements OnInit { // this.common.openWorklistRollReplacement(); this.openRepRolModal(); } else if ( - ButtonAction == "UPDATE_ACTION" || - ButtonAction == "CONTINUE_ACTION" + ButtonAction == 'UPDATE_ACTION' || + ButtonAction == 'CONTINUE_ACTION' ) { - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == 'EIT') { this.common.sharedService.setSharedData( this.notificationBodyRes, EITNotificatonBodyResponse.SHARED_DATA @@ -537,7 +545,7 @@ export class WorklistMainPRComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("EitUpdateListPage"); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'ABSENCE') { this.common.sharedService.setSharedData( this.notificationBodyRes, AbsenceNotificatonBodyResponse.SHARED_DATA @@ -555,15 +563,15 @@ export class WorklistMainPRComponent implements OnInit { } else if (this.notificationButtonRes.length > 0 && !ButtonAction) { (this.elementRef.nativeElement.querySelectorAll( - "ion-item" + 'ion-item' ) as HTMLElement[]).forEach(x => { - if (x.classList.contains("requiredItem")) { - x.classList.add("ng-touched"); - x.classList.remove("ng-untouched"); + if (x.classList.contains('requiredItem')) { + x.classList.add('ng-touched'); + x.classList.remove('ng-untouched'); } }); this.common.presentAlert( - this.ts.trPK("worklistMain", "actionRequird") + this.ts.trPK('worklistMain', 'actionRequird') ); } } @@ -606,7 +614,7 @@ export class WorklistMainPRComponent implements OnInit { this.NotRespondAttributeList = result.NotificationGetRespondAttributesList; if ( - result.NotificationRespondRolesList != "" && + result.NotificationRespondRolesList != '' && result.NotificationRespondRolesList[0].ATTRIBUTE_NAME != null && result.NotificationRespondRolesList[0].ATTRIBUTE_NAME != undefined ) { @@ -629,20 +637,20 @@ export class WorklistMainPRComponent implements OnInit { notificationDynamicFields(notificationAttr) { const containerId = 'notificationDynamicFields'; for (let i = 0; i < notificationAttr.length; i++) { - if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") { - this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); - } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") { + if (notificationAttr[i].ATTRIBUTE_TYPE == 'VARCHAR2') { + this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, '', containerId, '', '', ''); + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'ROLE') { - } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") { + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'DATE') { - } else if (notificationAttr[i].ATTRIBUTE_TYPE == "NUMBER") { + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'NUMBER') { } } } openNotificationBody() { - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { + if (this.getPassNotificationDetails.REQUEST_TYPE == 'EIT') { this.common.sharedService.setSharedData( this.notificationBodyRes, EITNotificatonBodyResponse.SHARED_DATA @@ -652,9 +660,9 @@ export class WorklistMainPRComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("WorkListDetailsPage", { NotBodyType: "EIT" }); - this.common.sharedService.setSharedData("EIT", "NotBodyType"); + this.common.sharedService.setSharedData('EIT', 'NotBodyType'); this.common.openNotificationDetailsPage(); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { + } else if (this.getPassNotificationDetails.REQUEST_TYPE == 'ABSENCE') { this.common.sharedService.setSharedData( this.notificationBodyRes, AbsenceNotificatonBodyResponse.SHARED_DATA @@ -663,7 +671,7 @@ export class WorklistMainPRComponent implements OnInit { this.getPassNotificationDetails, AbsenceNotificatonBodyResponse.NOT_WORKLIST ); - this.common.sharedService.setSharedData("ABSENCE", "NotBodyType"); + this.common.sharedService.setSharedData('ABSENCE', 'NotBodyType'); //this.navCtrl.push("WorkListDetailsPage", { NotBodyType: "ABSENCE" }); this.common.openNotificationDetailsPage(); } @@ -678,7 +686,7 @@ export class WorklistMainPRComponent implements OnInit { if (this.notificationCount <= 0) { this.notificationCount = null; } - this.events.publish("getNotCount", this.notificationCount); + this.events.publish('getNotCount', this.notificationCount); } }); } @@ -735,7 +743,7 @@ export class WorklistMainPRComponent implements OnInit { async openNoteDetail(note, sender) { // let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note }); // modalPage.present(); - console.log("note" + note); + console.log('note' + note); this.common.sharedService.setSharedData(note, 'ViewNoteModalPage') this.common.sharedService.setSharedData(sender, 'ViewNoteModalPageSender') @@ -832,9 +840,9 @@ export class WorklistMainPRComponent implements OnInit { loadMoreNotificationBody() { - console.log("loadMoreNotificationBody PR"); + console.log('loadMoreNotificationBody PR'); if (!this.IsReachEnd) { - console.log("this.IsReachEnd" + this.IsReachEnd); + console.log('this.IsReachEnd' + this.IsReachEnd); this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj). subscribe((result: any) => { @@ -852,7 +860,7 @@ export class WorklistMainPRComponent implements OnInit { this.notificationBodyRes.push(element); }, (Error) => console.log(Error), () => //infiniteScroll.target.complete() - console.log("test") + console.log('test') ); }// if list length >0 else { @@ -869,7 +877,7 @@ export class WorklistMainPRComponent implements OnInit { } }//end infiniteScroll loadMoreActionHistory() { - console.log("doInfinite action history MR"); + console.log('doInfinite action history MR'); if (!this.IsReachEnd) { this.worklistService.getActionHistory(this.WorkListActionHistoryObj). @@ -887,7 +895,7 @@ export class WorklistMainPRComponent implements OnInit { this.actionHistoryRes.push(element); }, (Error) => console.log(Error), () => //infiniteScroll.target.complete() - console.log("TEST")); + console.log('TEST')); }// if list length >0 else { this.IsReachEnd = true; @@ -905,7 +913,7 @@ export class WorklistMainPRComponent implements OnInit { //////////////////////////////////////////////////////// public checkLines(note) { - console.log(note.split("\n").length); + console.log(note.split('\n').length); console.log(note.length); if (note && note != null) { @@ -935,7 +943,7 @@ export class WorklistMainPRComponent implements OnInit { // return obj; // }) this.actionHistoryRes = actionHis; - console.log("test"); + console.log('test'); } @@ -955,7 +963,7 @@ export class WorklistMainPRComponent implements OnInit { .then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; } else { @@ -989,9 +997,9 @@ export class WorklistMainPRComponent implements OnInit { .then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; - } else if (data.data == "Success") { + } else if (data.data == 'Success') { this.getNotificationCountAfterSubmit(); this.nextNotfification(); @@ -1020,7 +1028,7 @@ export class WorklistMainPRComponent implements OnInit { .then((data) => { console.log(data.data); - if (data.data == "cancel" || data.data == undefined) { + if (data.data == 'cancel' || data.data == undefined) { return; } 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 ae5fe709..2d6b35f0 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -10,7 +10,7 @@
{{getPassNotificationDetails.SUBJECT}}
- @@ -68,7 +68,7 @@
Employee will also on leave
- + 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 7fe45a26..6ee10295 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -185,6 +185,7 @@ --background: transparent; margin-left: -15px; margin-right: 6px; + margin-bottom:8px; } .status{ text-align: center; 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 038bbe41..fda530d3 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -94,7 +94,9 @@ export class WorklistMainComponent implements OnInit { rejectDis: boolean = false; requestDis: boolean = false; moreDisabled: boolean = true; + dirfromNotificationPage: boolean = false; direction: string; + defaultSegment = ''; constructor( public worklistService: WorklistService, @@ -312,7 +314,7 @@ export class WorklistMainComponent implements OnInit { if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { this.requestDis = true; } // if result == null - else ( + else if( this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") { this.moreDisabled = false; @@ -545,6 +547,7 @@ export class WorklistMainComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("EitUpdateListPage"); + this.common.eitUpdate();// must be test } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( this.notificationBodyRes, @@ -558,7 +561,18 @@ export class WorklistMainComponent implements OnInit { // dirfromNotificationPage: true, // submitAbsObjList: this.notificationBodyRes[0].Collection_Notification // }); - this.common.openConfirmAbsece(); + //this.common.openConfirmAbsece(); + this.dirfromNotificationPage=true, + this.common.sharedService.setSharedData( + this.dirfromNotificationPage, + "dirfromNotificationPage" + ); + this.common.sharedService.setSharedData( + this.notificationBodyRes[0].Collection_Notification, + "submitAbsObjList" + ); + + this.common.openSubmitAbsencePage(); } } else if (this.notificationButtonRes.length > 0 && !ButtonAction) { diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 82bd19e4..da4642cd 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -76,7 +76,7 @@
- + diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index 47abf5dd..df97d9e0 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -8,7 +8,7 @@
-
+
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts index e57431f8..2e2a11aa 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { Platform, Events, MenuController } from "@ionic/angular"; -import { CommonService } from "src/app/hmg-common/services/common/common.service"; -import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; -import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; -import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +import { Platform, Events, MenuController } from '@ionic/angular'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; import { PerformanceAppraisalResponse } from 'src/app/hmg-common/services/dashbored/performance-appraisal.response'; import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; @@ -19,13 +19,13 @@ import { DomSanitizer } from '@angular/platform-browser'; export class EditProfileComponent implements OnInit { - User_name_Emp: string = ""; + User_name_Emp: string = ''; User_Job_name: string; public direction: string; private menu: MenuController; setImage:any; // imageSrc: any = "../assets/imgs/profile.png"; - user_image: any = "../assets/imgs/profile.png"; + user_image: any = '../assets/imgs/profile.png'; personalInfo: any; appraisalArr :any =[]; public performanceData: any=[]; @@ -45,9 +45,9 @@ export class EditProfileComponent implements OnInit { ) { this.direction = TranslatorService.getCurrentDirection(); - this.events.subscribe("img-change", displayImg => { - console.log("app compont: "+displayImg); - this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); + this.events.subscribe('img-change', displayImg => { + console.log('app compont: '+displayImg); + this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); }); @@ -59,7 +59,7 @@ export class EditProfileComponent implements OnInit { } getProfile() { - console.log("getProfile"); + console.log('getProfile'); this.authService .loadAuthenticatedUser() .subscribe((user: AuthenticatedUser) => { @@ -68,16 +68,16 @@ export class EditProfileComponent implements OnInit { this.User_name_Emp=this.personalInfo.EMPLOYEE_NAME; this.User_Job_name=this.personalInfo.JOB_NAME; if(this.cs.getUpdateImage().status){ - this.user_image =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.cs.getUpdateImage().img); + this.user_image =this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,'+this.cs.getUpdateImage().img); }else{ this.user_image = user.EMPLOYEE_IMAGE - ? "data:image/png;base64," + user.EMPLOYEE_IMAGE - : "../assets/imgs/profile.png"; + ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE + : '../assets/imgs/profile.png'; } - console.log("name: "+ this.personalInfo.EMPLOYEE_NAME); - console.log("user name: "+ user.EMPLOYEE_NAME); - console.log("name: "+ this.personalInfo.JOB_NAME); - console.log("job name: "+ user.JOB_NAME); + console.log('name: '+ this.personalInfo.EMPLOYEE_NAME); + console.log('user name: '+ user.EMPLOYEE_NAME); + console.log('name: '+ this.personalInfo.JOB_NAME); + console.log('job name: '+ user.JOB_NAME); }}); @@ -110,7 +110,7 @@ private handlePerformanceAppraisalResult(result){ for(let i=0;i -->
-
+
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 6b1903bb..befdf290 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -1,19 +1,19 @@ -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 { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; -import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; -import { Events } from "@ionic/angular"; +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 { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; +import { Events } from '@ionic/angular'; import { DomSanitizer } from '@angular/platform-browser'; @Component({ - selector: "app-home", - templateUrl: "./home.component.html", - styleUrls: ["./home.component.scss"] + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] }) export class HomeComponent implements OnInit { personalInfo: any; setImage:any; - imageSrc: any = "../assets/imgs/profile.png"; + imageSrc: any = '../assets/imgs/profile.png'; public direction: string; // user_image: any = "../assets/imgs/profile.png"; constructor( @@ -26,11 +26,11 @@ export class HomeComponent implements OnInit { ) { this.direction = TranslatorService.getCurrentDirection(); - this.events.subscribe("img-change", displayImg => { + this.events.subscribe('img-change', displayImg => { // alert("1 - profile home : "+displayImg); //this.user_image = "data:image/png;base64"+displayImg; - this.setImage = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); - this.imageSrc = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); + this.setImage = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); + this.imageSrc = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); }); @@ -41,33 +41,33 @@ export class HomeComponent implements OnInit { this.getProfile(); } getProfile() { - console.log("getProfile"); + console.log('getProfile'); this.authService .loadAuthenticatedUser() .subscribe((user: AuthenticatedUser) => { if (user) { this.personalInfo = user; - console.log("name: "+ this.personalInfo.EMPLOYEE_NAME); - console.log("user name: "+ user.EMPLOYEE_NAME); + console.log('name: '+ this.personalInfo.EMPLOYEE_NAME); + console.log('user name: '+ user.EMPLOYEE_NAME); if(this.cs.getUpdateImage().status){ // this.imageSrc = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+this.cs.getUpdateImage().img); - this.imageSrc =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.cs.getUpdateImage().img); + this.imageSrc =this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,'+this.cs.getUpdateImage().img); }else{ this.imageSrc = user.EMPLOYEE_IMAGE - ? "data:image/png;base64," + user.EMPLOYEE_IMAGE + ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : this.imageSrc; - console.log("2-"+user); + console.log('2-'+user); } } else { - console.log("3-"+user); + console.log('3-'+user); } }); } - private ChangeImage() { + public ChangeImage() { this.cs.openChangeImagePage(); } } 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 16e9298b..9903b387 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -32,7 +32,7 @@ + [smallSegments]="10"> 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 9c0807ed..6b14fc93 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit, NgModule } from '@angular/core'; -import { Platform, Events, MenuController } from "@ionic/angular"; -import { CommonService } from "src/app/hmg-common/services/common/common.service"; -import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; -import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; +import { Platform, Events, MenuController } from '@ionic/angular'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; import { PerformanceAppraisalResponse } from 'src/app/hmg-common/services/dashbored/performance-appraisal.response'; // import { DomSanitizer } from '@angular/platform-browser'; // import {NgxGaugeModule} from 'ngx-gauge'; -import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; @@ -18,7 +18,7 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo }) export class PerformanceEvaluationComponent implements OnInit { personalInfo: any; - user_image: any = "../assets/imgs/profile.png"; + user_image: any = '../assets/imgs/profile.png'; setImage: any; view: any = [380, 450]; public performanceData: any = []; @@ -64,7 +64,7 @@ export class PerformanceEvaluationComponent implements OnInit { for (let i = 0; i < this.performanceData.length; i++) { this.performanceData[i].color = this.colorScheme.domain[i]; - console.log(i + " : " + this.performanceData[i].name) + console.log(i + ' : ' + this.performanceData[i].name) } console.log(this.performanceData[0].color) @@ -72,19 +72,19 @@ export class PerformanceEvaluationComponent implements OnInit { } ngAfterViewInit() { - document.querySelector("svg .gauge.chart > text").remove(); + document.querySelector('svg .gauge.chart > text').remove(); } getProfile() { - console.log("getProfile"); + console.log('getProfile'); this.authService .loadAuthenticatedUser() .subscribe((user: AuthenticatedUser) => { if (user) { this.personalInfo = user; this.user_image = user.EMPLOYEE_IMAGE - ? "data:image/png;base64," + user.EMPLOYEE_IMAGE - : "../assets/imgs/profile.png"; + ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE + : '../assets/imgs/profile.png'; } diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.ts b/Mohem/src/app/profile/profile-image/profile-image.component.ts index e62cb912..e2a22857 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.ts +++ b/Mohem/src/app/profile/profile-image/profile-image.component.ts @@ -75,7 +75,7 @@ public setImage:any; handleUpdateImageProfileResult(result) { if (this.common.validResponse(result)) { - this.common.setUpdateImage(this.displayImg); + this.common.setUpdateImage(this.displayImg,true); this.event.publish('img-change', this.displayImg); let msg: string = this.ts.trPK("userProfile", "successChange"); this.common.presentAlert(msg); diff --git a/Mohem/src/app/time-card/select-period/select-period.component.ts b/Mohem/src/app/time-card/select-period/select-period.component.ts index 5ecc7a18..cb93ce56 100644 --- a/Mohem/src/app/time-card/select-period/select-period.component.ts +++ b/Mohem/src/app/time-card/select-period/select-period.component.ts @@ -13,6 +13,7 @@ export class SelectPeriodComponent implements OnInit { public dateFrom: any; public dateTo: any; public selectedShiftType: any; + public Select = ''; public filtersArray: any = [ { 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 b4fba9fe..d42b10db 100644 --- a/Mohem/src/app/time-card/service/time-card.service.ts +++ b/Mohem/src/app/time-card/service/time-card.service.ts @@ -45,31 +45,51 @@ export class TimeCardService { public getTimeCardSummary( timeCardSummaryReq, onError?: any, - errorLabel?: string + errorLabel?: string, + isPostNoLoad = false ): Observable { const request = timeCardSummaryReq; this.authService.authenticateRequest(request); + if (isPostNoLoad) { + return this.con.postNoLoad( + TimeCardService.getTimeCardSummaryUrl, + request, + onError, + errorLabel + ); + } else { return this.con.post( TimeCardService.getTimeCardSummaryUrl, request, onError, errorLabel ); + } } public getDayHoursTypeDetails( dayHoursDetailsReq, onError?: any, - errorLabel?: string + errorLabel?: string, + isPostNoLoad = false ): Observable { const request = dayHoursDetailsReq; this.authService.authenticateRequest(request); - return this.con.post( - TimeCardService.getDayHourDetailsUrl, - request, - onError, - errorLabel - ); + if (isPostNoLoad) { + return this.con.postNoLoad( + TimeCardService.getDayHourDetailsUrl, + request, + onError, + errorLabel + ); + } else { + return this.con.post( + TimeCardService.getDayHourDetailsUrl, + request, + onError, + errorLabel + ); + } } public getShiftDetail( 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 9b565624..1bb869c7 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 @@ -3,7 +3,6 @@ import { TimeCardService } from 'src/app/time-card/service/time-card.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 { ModalController, IonSlides } from '@ionic/angular'; -import { SelectPeriodComponent } from '../select-period/select-period.component'; import { GetDayAndHoursDetailsRequest } from 'src/app/time-card/service/models/get-day-hours-type-details.request'; import { GetTimeCardSummaryRequest } from 'src/app/time-card/service/models/get-time-card-summary.request'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; @@ -66,7 +65,7 @@ export class TimeCardDetailsComponent implements OnInit { public currentYear = new Date().getFullYear(); public dayHoursTypeDetailsList = []; public currentDate = new Date(); - + public isPostNoLoad = true; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, @@ -75,6 +74,7 @@ export class TimeCardDetailsComponent implements OnInit { public data = {}; ngOnInit() { + this.common.startLoading(); this.showData = false; this.nextMonth = new Date().getMonth() + 2; this.preMonth = new Date().getMonth(); @@ -106,7 +106,7 @@ export class TimeCardDetailsComponent implements OnInit { dayAndHoursReqObj.P_PAGE_NUM = this.dayAndHoursPageNumber; dayAndHoursReqObj.P_PAGE_LIMIT = 100; - this.timeCardService.getDayHoursTypeDetails(dayAndHoursReqObj).subscribe((result) => { + this.timeCardService.getDayHoursTypeDetails(dayAndHoursReqObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { console.log(result.GetDayHoursTypeDetailsList); this.common.sharedService.setSharedData(result.GetDayHoursTypeDetailsList, 'RTP_IDs'); @@ -168,17 +168,11 @@ export class TimeCardDetailsComponent implements OnInit { timeCardSummaryReqObj.SearchMonth = this.monthName; timeCardSummaryReqObj.SearchYear = this.yearDate; - this.timeCardService.getTimeCardSummary(timeCardSummaryReqObj).subscribe((result) => { + this.timeCardService.getTimeCardSummary(timeCardSummaryReqObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { - this.timeCardSummaryData = result.GetTimeCardSummaryList[0]; this.absentDays = this.timeCardSummaryData.ABSENT_DAYS; this.attendedDays = this.timeCardSummaryData.ATTENDED_DAYS; - - // this.totalAttendancePrecentage = this.timeCardSummaryData.PERIOD_DAYS - this.timeCardSummaryData.OFF_DAYS; - // if (this.absentDays === 0 && this.attendedDays === 0) { - // this.futrueDays = this.totalAttendancePrecentage; - // } this.totalAttendancePrecentage = this.absentDays + this.attendedDays; if (this.totalAttendancePrecentage > 0) { this.data = { @@ -198,6 +192,7 @@ export class TimeCardDetailsComponent implements OnInit { } nextSlide() { + this.common.startLoading(); if (this.currentMonthName !== this.month) { this.showData = false; if (this.nextMonth > 12) { @@ -212,6 +207,7 @@ export class TimeCardDetailsComponent implements OnInit { } previousSlide() { + this.common.startLoading(); this.showData = false; if (this.preMonth === 0) { this.currentYear = this.currentYear - 1; diff --git a/Mohem/src/app/vacation-rule/home/home.component.ts b/Mohem/src/app/vacation-rule/home/home.component.ts index fb95a2a3..05615334 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.ts +++ b/Mohem/src/app/vacation-rule/home/home.component.ts @@ -27,6 +27,8 @@ export class HomeComponent implements OnInit { RespondAttributeList: any; add:any='add'; button: ButtonInput; + direction = ''; + notBadge = ''; // dateTime: DateTimeInput; // date: DateInput; // numberInput: NumberInput; diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html index 44770b53..5833733c 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html @@ -16,7 +16,7 @@ {{'vacation-rule, search-by' | translate}} + [(ngModel)]="searchKeySelect" (ionChange)="onChangeSelect($event)"> {{'vacation-rule, search-by-name' | translate}} {{'vacation-rule, search-by-username' | translate}} {{'vacation-rule, search-by-email' | translate}} @@ -24,14 +24,14 @@ - + - + - + - +
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index 31ba8d46..8212dc68 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -164,4 +164,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: #dedede solid 1px; } +.disabledButton{ + opacity:.5; +} diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts index d136c2a1..b583fae8 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts @@ -29,12 +29,20 @@ export class ReplacementListComponent implements OnInit { isAbs: boolean = false; isSave: boolean = false; active: any; + isSelect: boolean =false; + searchKeyEnter: boolean = false; + request: ReplacementServiceRequest; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { } - ngOnInit() { } + ngOnInit() { + this.request = new ReplacementServiceRequest(); + + } SearchReplacementList() { + console.log("this.searchKeySelect" + this.searchKeySelect); + this.ReplacementList = []; this.IsReachEnd = false; this.P_PAGE_NUM = 1; @@ -73,15 +81,15 @@ export class ReplacementListComponent implements OnInit { this.P_SEARCH_EMAIL_ADDRESS = ""; } - const request = new ReplacementServiceRequest(); - request.P_SEARCH_USER_NAME = this.P_SEARCH_USER_NAME; - request.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.P_SEARCH_EMPLOYEE_DISPLAY_NAME; - request.P_SEARCH_EMAIL_ADDRESS = this.P_SEARCH_EMAIL_ADDRESS; - request.P_PAGE_NUM = this.P_PAGE_NUM; - request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; - request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; + // const request = new ReplacementServiceRequest(); + this.request.P_SEARCH_USER_NAME = this.P_SEARCH_USER_NAME; + this.request.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.P_SEARCH_EMPLOYEE_DISPLAY_NAME; + this.request.P_SEARCH_EMAIL_ADDRESS = this.P_SEARCH_EMAIL_ADDRESS; + this.request.P_PAGE_NUM = this.P_PAGE_NUM; + this.request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; - this.vacationRuleService.getReplacementList(request). + this.vacationRuleService.getReplacementList(this.request). subscribe((result: any) => { this.handleReplacment(result); }); @@ -161,13 +169,14 @@ export class ReplacementListComponent implements OnInit { if (!this.IsReachEnd) { - const request = new ReplacementServiceRequest(); - request.P_PAGE_NUM = this.P_PAGE_NUM; - request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + ///const request = new ReplacementServiceRequest(); + console.log(this.request.P_SEARCH_USER_NAME + "-" + this.request.P_SEARCH_EMAIL_ADDRESS + "-" + this.request.P_SEARCH_EMPLOYEE_DISPLAY_NAME ) + this.request.P_PAGE_NUM = this.P_PAGE_NUM; + this.request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // request.P_SELECTED_EMPLOYEE_NUMBER=this.selEmp; - this.vacationRuleService.getReplacementList(request). + this.vacationRuleService.getReplacementList(this.request). subscribe((result: any) => { if (this.cs.validResponse(result)) { if (this.cs.hasData(result.ReplacementList)) { @@ -198,4 +207,27 @@ export class ReplacementListComponent implements OnInit { infiniteScroll.target.complete(); } } + + onChangeSelect(select){ + console.log(select.detail.value); + let selectValue= select.detail.value; + + if(selectValue == "1" || selectValue == "2" ||selectValue == "3"){ + this.isSelect=true; + } + else{ + this.isSelect=false; + + } + } + + onChangeInput(){ + if (this.searchKey.length >0) { + this.searchKeyEnter=true; + + }else{ + this.searchKeyEnter=false; + + } + } } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index abca23ca..5e7dd4f5 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -868,6 +868,10 @@ } }, "home": { + "position-error": { + "en": "Error getting your location. Please try again!", + "ar": "Error getting your location. Please try again!" + }, "dashboard": { "en": "My Dashboard", "ar": "الرئيسية" @@ -2283,6 +2287,10 @@ "line_details":{ "en": "Line Details", "ar":"Line Details" + }, + "request_number":{ + "en": "Request Number", + "ar":"Request Number" } }, @@ -2459,8 +2467,8 @@ "ar":" check out" }, "confirm-alert3":{ - "en":"You did't complate today shift", - "ar":"You did't complate today shift" + "en":"You didn't complete today shift", + "ar":"You didn't complete today shift" }, "shift-time":{ "en":"Shift Time", diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index fb6321fd..4436582d 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1368,7 +1368,7 @@ border:0px } .calendar-modal { - --height: 13.5cm !important; + --height: 14.5cm !important; --width: 88% !important; --border-radius: 0.4cm; } @@ -1506,3 +1506,11 @@ table.monthview-datetable th small { // --border-radius: 0.4cm; // } + +.calendar-modal .swiper-container-horizontal > .swiper-pagination-bullets{ + top: auto; + bottom: -8px; + .swiper-pagination-bullet-active { + background: #094875; + } +} diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 0b82b6c6..eb1d83b5 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -33,6 +33,7 @@ } .itemReqDiv{ padding:10px; + width: 100%; // padding-bottom: 10px; // padding-top: 10px; } @@ -231,7 +232,7 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated .timeline .timeline-item { - width: 40px; + // width: 40px; } @@ -547,9 +548,9 @@ left: 66px; height:70px } .empImge{ - border-radius: 50%; - width:100%; - height: 100%; + border-radius: 50% !important; + width: 60px !important; + height: 60px !important; border: #dedede solid 1px; }