diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index e1a10ef5..82e86daf 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -9,8 +9,9 @@ + {{ts.trPK('submitAbsence','absenceType')}} - + {{item.ABSENCE_ATTENDANCE_TYPE_NAME}} 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 9513fa16..c1d93be2 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -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() { 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 8c93b89f..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 = 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/'; diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 2d0905e7..8dcf9cc4 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -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;