From d4ef8bf7ec7d99a15ed5f664c66fc0fe242b01dd Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 16 Mar 2020 14:24:24 +0300 Subject: [PATCH] fix po attachment + Mo Action --- .../absence-confirm.component.scss | 6 +++--- .../submit-absence/submit-absence.component.ts | 10 +++++++++- .../services/connector/connector.service.ts | 2 +- .../worklist-main-mr.component.html | 9 ++++----- .../worklist-main-mr.component.ts | 18 +++++++++--------- .../worklist-main/worklist-main.component.ts | 4 ---- Mohem/src/theme/worklist.scss | 8 ++++---- 7 files changed, 30 insertions(+), 27 deletions(-) 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/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index ffe60b9f..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"; @@ -85,6 +85,7 @@ export class SubmitAbsenceComponent implements OnInit { public datePicker: DatePicker, public ts: TranslatorService, private elementRef: ElementRef, + private changeDetectorRef: ChangeDetectorRef ) { ////*new add*///// @@ -101,6 +102,7 @@ export class SubmitAbsenceComponent implements OnInit { this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.respID = -999; this.submitAbsObjList = this.common.sharedService.getSharedData('submitAbsObjList'); + console.log() } else { this.action = "CREATE"; this.selEmp = this.common.sharedService.getSharedData( @@ -172,6 +174,7 @@ export class SubmitAbsenceComponent implements OnInit { } } calcDay() { + console.log("calcDay" ); let msg: string = ""; if ( this.startDate == undefined || @@ -263,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(); @@ -1141,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/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 1335e79d..a494567f 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/'; diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 266ae61b..73eb40a0 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -8,7 +8,7 @@ - +
{{getPassNotificationDetails.SUBJECT}}
@@ -659,13 +659,12 @@ - + Approve - + Reject @@ -679,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 101757c6..dcc0410d 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 @@ -400,15 +400,15 @@ export class WorklistMainMRComponent implements OnInit { this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg') } - 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.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); ////////////////////////////////////////////////////////// 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 bd24c4f9..d800c8da 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -547,10 +547,6 @@ export class WorklistMainComponent implements OnInit { ); // this.navCtrl.push("EitUpdateListPage"); this.common.eitUpdate();// must be test -<<<<<<< HEAD -======= - ->>>>>>> a0e265ba550a4baab02eceba5e138cf08c3efe21 } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( this.notificationBodyRes, diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index eee25155..eb1d83b5 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -232,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; } @@ -548,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; }