fix po attachment + Mo Action

mekawy-issues
ashwaq 6 years ago
parent c7eb6c97a2
commit d4ef8bf7ec

@ -186,7 +186,7 @@ ion-card-content.confirm-details{
.timeline .timeline-item { .timeline .timeline-item {
width: 40px; // width: 40px;
} }
@ -199,8 +199,8 @@ ion-card-content.confirm-details{
.empImge{ .empImge{
border-radius: 50%; border-radius: 50%;
width:100%; width:60px;
height: 100%; height: 60px;
border: #dedede solid 1px; border: #dedede solid 1px;
} }

@ -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 { CommonService } from "src/app/hmg-common/services/common/common.service";
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
import { MenuService } from "src/app/hmg-common/services/menu/menuservice.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 datePicker: DatePicker,
public ts: TranslatorService, public ts: TranslatorService,
private elementRef: ElementRef, private elementRef: ElementRef,
private changeDetectorRef: ChangeDetectorRef
) { ) {
////*new add*///// ////*new add*/////
@ -101,6 +102,7 @@ export class SubmitAbsenceComponent implements OnInit {
this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER;
this.respID = -999; this.respID = -999;
this.submitAbsObjList = this.common.sharedService.getSharedData('submitAbsObjList'); this.submitAbsObjList = this.common.sharedService.getSharedData('submitAbsObjList');
console.log()
} else { } else {
this.action = "CREATE"; this.action = "CREATE";
this.selEmp = this.common.sharedService.getSharedData( this.selEmp = this.common.sharedService.getSharedData(
@ -172,6 +174,7 @@ export class SubmitAbsenceComponent implements OnInit {
} }
} }
calcDay() { calcDay() {
console.log("calcDay" );
let msg: string = ""; let msg: string = "";
if ( if (
this.startDate == undefined || this.startDate == undefined ||
@ -263,10 +266,13 @@ export class SubmitAbsenceComponent implements OnInit {
} }
public onTypeAbsenceChange() { public onTypeAbsenceChange() {
console.log("this.absenceType: "+ this.absenceType);
if (this.absenceType) { if (this.absenceType) {
let obj: any = this.absenceTypeList.find( let obj: any = this.absenceTypeList.find(
s => s.ABSENCE_ATTENDANCE_TYPE_ID == this.absenceType s => s.ABSENCE_ATTENDANCE_TYPE_ID == this.absenceType
); );
console.log("obj : "+ obj);
if (obj) this.absenceTypeName = obj.DESC_FLEX_CONTEXT_CODE; if (obj) this.absenceTypeName = obj.DESC_FLEX_CONTEXT_CODE;
else this.absenceTypeName = null; else this.absenceTypeName = null;
this.getAbsenceDffStructure(); this.getAbsenceDffStructure();
@ -1141,6 +1147,8 @@ export class SubmitAbsenceComponent implements OnInit {
this.action = this.submitAbsObjList[i].ACTION; this.action = this.submitAbsObjList[i].ACTION;
if (this.submitAbsObjList[i].SEGMENT_NAME == "ABSENCE_TYPE") { if (this.submitAbsObjList[i].SEGMENT_NAME == "ABSENCE_TYPE") {
this.absenceType = val; this.absenceType = val;
this.changeDetectorRef.detectChanges();
} }
if (this.submitAbsObjList[i].SEGMENT_NAME == "DESC_FLEX_CONTEXT_CODE") { if (this.submitAbsObjList[i].SEGMENT_NAME == "DESC_FLEX_CONTEXT_CODE") {
this.absenceTypeName = val; this.absenceTypeName = val;

@ -21,7 +21,7 @@ export class ConnectorService {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }) headers: new HttpHeaders({ 'Content-Type': 'application/json' })
}; };
public static retryTimes = 0; 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 = 'http://10.50.100.113:6060/'; // development service
public static host = 'https://uat.hmgwebservices.com/'; public static host = 'https://uat.hmgwebservices.com/';

@ -8,7 +8,7 @@
</ion-header> </ion-header>
<ion-content *ngIf="!messageSuccess" class="colorBG"> <ion-content class="colorBG">
<div *ngIf="!messageSuccess" > <div *ngIf="!messageSuccess" >
<div class="subjectNotification">{{getPassNotificationDetails.SUBJECT}}</div> <div class="subjectNotification">{{getPassNotificationDetails.SUBJECT}}</div>
@ -659,13 +659,12 @@
<ion-tabs> <ion-tabs>
<ion-tab-bar class="tabBar" slot="bottom"> <ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')"> <ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<img src="../assets/imgs/action-approve.png"> <img src="../assets/imgs/action-approve.png">
<ion-label>Approve</ion-label> <ion-label>Approve</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT <ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
')">
<img src="../assets/imgs/action-reject.png"> <img src="../assets/imgs/action-reject.png">
<ion-label>Reject</ion-label> <ion-label>Reject</ion-label>
</ion-tab-button> </ion-tab-button>
@ -679,7 +678,7 @@
<ion-label>Skip</ion-label> <ion-label>Skip</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button (click)="openMoreActions()"> <ion-tab-button [disabled]="moreDisabled" (click)="openMoreActions()">
<img src="../assets/imgs/action-more.png"> <img src="../assets/imgs/action-more.png">
<ion-label>More</ion-label> <ion-label>More</ion-label>
</ion-tab-button> </ion-tab-button>

@ -400,15 +400,15 @@ export class WorklistMainMRComponent implements OnInit {
this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg') this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg')
} }
this.openApplyModal(this.WorkListActionObj); // this.openApplyModal(this.WorkListActionObj);
// this.common.confirmAlertDialogAction( this.common.confirmAlertDialogAction(
// () => { () => {
// this.applyAction(this.WorkListActionObj); this.applyAction(this.WorkListActionObj);
// }, this.ts.trPK('general', 'ok'), }, this.ts.trPK('general', 'ok'),
// () => { }, this.ts.trPK('general', 'cancel'), () => { }, this.ts.trPK('general', 'cancel'),
// this.ts.trPK('vacation-rule', 'confirmation'), this.ts.trPK('vacation-rule', 'confirmation'),
// this.confirmMsg); this.confirmMsg);
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////

@ -547,10 +547,6 @@ export class WorklistMainComponent implements OnInit {
); );
// this.navCtrl.push("EitUpdateListPage"); // this.navCtrl.push("EitUpdateListPage");
this.common.eitUpdate();// must be test this.common.eitUpdate();// must be test
<<<<<<< HEAD
=======
>>>>>>> a0e265ba550a4baab02eceba5e138cf08c3efe21
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") {
this.common.sharedService.setSharedData( this.common.sharedService.setSharedData(
this.notificationBodyRes, this.notificationBodyRes,

@ -232,7 +232,7 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated
.timeline .timeline-item { .timeline .timeline-item {
width: 40px; // width: 40px;
} }
@ -548,9 +548,9 @@ left: 66px;
height:70px height:70px
} }
.empImge{ .empImge{
border-radius: 50%; border-radius: 50% !important;
width:100%; width: 60px !important;
height: 100%; height: 60px !important;
border: #dedede solid 1px; border: #dedede solid 1px;
} }

Loading…
Cancel
Save