fix continue action - worklist

master
ashwaq 6 years ago
parent 788b3bfb6e
commit ee4e36d9fc

@ -9,8 +9,9 @@
<ion-content padding>
<ion-item class='dynamicField'>
<ion-label position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','absenceType')}} </ion-label>
<ion-select (ionChange)="calcDay()" okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="absenceType" (ionChange)="onTypeAbsenceChange()" required>
<ion-select (ionChange)="calcDay()" okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="absenceType" (ionChange)="onTypeAbsenceChange()" required>
<!-- let item of AbsenceType; let i=index; -->
<ion-select-option value= "{{item.ABSENCE_ATTENDANCE_TYPE_ID}}" *ngFor="let item of absenceTypeList; let i=index;">{{item.ABSENCE_ATTENDANCE_TYPE_NAME}} </ion-select-option>
</ion-select>

@ -1,9 +1,9 @@
import { Component, OnInit, ElementRef, ChangeDetectorRef } from "@angular/core";
import { Component, OnInit, ElementRef, ChangeDetectorRef, ViewChild } 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";
import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
import { ModalController } from "@ionic/angular";
import { ModalController ,IonSelectOption ,IonSelect } from "@ionic/angular";
import { SubmitAbsenceService } from "../service/submit.absence.service";
import { AbsenceAttahcmentResponse } from "../models/abs.attach.response";
import { AbsenceListService } from "../service/service.service";
@ -28,6 +28,9 @@ 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",
@ -76,6 +79,9 @@ export class SubmitAbsenceComponent implements OnInit {
getPassdirfromNotifiPage: boolean = false;
functionName: string = "";
private submitAbsObjList: any = [];
SelectedYearIdValue : any ;
@ViewChild(IonSelect) select: IonSelect;
// private updatedValues:any=[];
constructor(
public submitAbsService: SubmitAbsenceService,
@ -266,12 +272,12 @@ 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;
@ -1152,6 +1158,7 @@ export class SubmitAbsenceComponent implements OnInit {
}
if (this.submitAbsObjList[i].SEGMENT_NAME == "DESC_FLEX_CONTEXT_CODE") {
this.absenceTypeName = val;
this.select.selectedText = this.absenceTypeName;
} else if (this.submitAbsObjList[i].SEGMENT_NAME == "START_DATE") {
this.startDate = moment(val).format("YYYY-MM-DD");
} else if (this.submitAbsObjList[i].SEGMENT_NAME == "END_DATE") {
@ -1170,7 +1177,6 @@ export class SubmitAbsenceComponent implements OnInit {
this.absComments = val;
}
}
this.onTypeAbsenceChange();
}
fillAbsStructure() {

@ -21,7 +21,7 @@ export class ConnectorService {
headers: new HttpHeaders({ 'Content-Type': 'application/json' })
};
public static retryTimes = 0;
public static timeOut = 240 * 1000;
public static timeOut = 120 * 1000;
// public static host = 'http://10.50.100.113:6060/'; // development service
public static host = 'https://uat.hmgwebservices.com/';

@ -838,7 +838,7 @@ div.daynamicForm-DateTime.disabled{
box-shadow: none;
}
.imgSize{
width: 22px;
width: 22px !important;
height: 22px;
-webkit-box-shadow:none;
-moz-box-shadow: none;

Loading…
Cancel
Save