added eit fixes in other forms

MOE_MAIN-COLOR_CHANGES
umasoodch 3 years ago
parent 1ca8e60b05
commit 172ae240d7

@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry"; import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry";
import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
import { EitRequest } from "../models/eit.request"; import { EitRequest } from "../models/eit.request";
import { ModalController } from "@ionic/angular"; import { ModalController, Platform } from "@ionic/angular";
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
import { EITTransactionsRequest } from "../models/EITTransactionsReq"; import { EITTransactionsRequest } from "../models/EITTransactionsReq";
import { EitService } from "../services/eit.service"; import { EitService } from "../services/eit.service";
@ -73,7 +73,8 @@ export class AddEitComponent implements OnInit {
public cs: CommonService, public cs: CommonService,
private ts: TranslatorService, private ts: TranslatorService,
private eitService: EitService, private eitService: EitService,
public datePicker: DatePicker public datePicker: DatePicker,
public platform: Platform
) { ) {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
this.selEmp = this.cs.sharedService.getSharedData( this.selEmp = this.cs.sharedService.getSharedData(
@ -557,6 +558,7 @@ export class AddEitComponent implements OnInit {
} }
bindHtmlElemEvents(id, obj) { bindHtmlElemEvents(id, obj) {
const isIOS = this.platform.is('ios');
const elem = document.getElementById(id); const elem = document.getElementById(id);
console.log(elem); console.log(elem);
console.log(obj); console.log(obj);
@ -567,13 +569,16 @@ export class AddEitComponent implements OnInit {
try { try {
elem.addEventListener("ionFocus", event => { if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
setTimeout(()=>{ elem.addEventListener("ionFocus", event => {
console.log(event.target as Element); setTimeout(()=>{
var e = event.target as Element; console.log(event.target as Element);
e.scrollIntoView(true); var e = event.target as Element;
},1000) e.scrollIntoView(true);
}) },1000)
})
}
// elem.addEventListener("change", (e) => { // elem.addEventListener("change", (e) => {
elem.addEventListener(changeEvent, e => { elem.addEventListener(changeEvent, e => {

@ -1,6 +1,6 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { DatePicker } from '@ionic-native/date-picker/ngx'; import { DatePicker } from '@ionic-native/date-picker/ngx';
import { ModalController } from '@ionic/angular'; import { ModalController, Platform } from '@ionic/angular';
import * as moment from 'moment'; import * as moment from 'moment';
import { AddEitResponse } from 'src/app/eit/models/add.eit.response'; import { AddEitResponse } from 'src/app/eit/models/add.eit.response';
import { EitAddressRequest } from 'src/app/eit/models/eit-address.request'; import { EitAddressRequest } from 'src/app/eit/models/eit-address.request';
@ -76,7 +76,8 @@ export class AddAddressComponent implements OnInit {
public ts: TranslatorService, public ts: TranslatorService,
private eitService: EitService, private eitService: EitService,
public datePicker: DatePicker, public datePicker: DatePicker,
public profileService: ProfileService public profileService: ProfileService,
public platform: Platform
) { ) {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
this.selEmp = this.cs.sharedService.getSharedData( this.selEmp = this.cs.sharedService.getSharedData(
@ -457,6 +458,7 @@ export class AddAddressComponent implements OnInit {
} }
bindHtmlElemEvents(id, obj) { bindHtmlElemEvents(id, obj) {
const isIOS = this.platform.is('ios');
const elem = document.getElementById(id); const elem = document.getElementById(id);
console.log(elem); console.log(elem);
console.log(obj); console.log(obj);
@ -466,7 +468,21 @@ export class AddAddressComponent implements OnInit {
if (elemType == "SELECT") changeEvent = "change"; if (elemType == "SELECT") changeEvent = "change";
try { try {
if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
elem.addEventListener("ionFocus", event => {
setTimeout(()=>{
console.log(event.target as Element);
var e = event.target as Element;
e.scrollIntoView(true);
},1000)
})
}
elem.addEventListener(changeEvent, e => { elem.addEventListener(changeEvent, e => {
if (obj.FORMAT_TYPE == "N") {
const maxSize = obj.MAXIMUM_SIZE;
const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
(document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
}
elem.classList.remove("requiredClassElm"); elem.classList.remove("requiredClassElm");
if ( if (
obj.CHILD_SEGMENTS_VS_Splited && obj.CHILD_SEGMENTS_VS_Splited &&
@ -1124,6 +1140,7 @@ export class AddAddressComponent implements OnInit {
} }
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
elem.classList.add("requiredClassElm"); elem.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {
@ -1162,6 +1179,7 @@ export class AddAddressComponent implements OnInit {
} }
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
x.classList.add("requiredClassElm"); x.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {
@ -1184,6 +1202,7 @@ export class AddAddressComponent implements OnInit {
textValue = x.value; textValue = x.value;
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
x.classList.add("requiredClassElm"); x.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {

@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry"; import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry";
import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response"; import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
import { BasicRequest } from "../models/basic.request"; import { BasicRequest } from "../models/basic.request";
import { ModalController } from "@ionic/angular"; import { ModalController, Platform } from "@ionic/angular";
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
import { EITTransactionsRequest } from "../models/EITTransactionsReq"; import { EITTransactionsRequest } from "../models/EITTransactionsReq";
import { ProfileService } from "../service/profile.service"; import { ProfileService } from "../service/profile.service";
@ -79,7 +79,8 @@ export class AddBasicDetailsComponent implements OnInit {
private ts: TranslatorService, private ts: TranslatorService,
private profileService: ProfileService, private profileService: ProfileService,
public datePicker: DatePicker, public datePicker: DatePicker,
public router: ActivatedRoute public router: ActivatedRoute,
public platform: Platform
) { ) {
this.router.queryParams.subscribe(params => { this.router.queryParams.subscribe(params => {
@ -719,6 +720,7 @@ export class AddBasicDetailsComponent implements OnInit {
} }
bindHtmlElemEvents(id, obj) { bindHtmlElemEvents(id, obj) {
const isIOS = this.platform.is('ios');
const elem = document.getElementById(id); const elem = document.getElementById(id);
console.log(elem); console.log(elem);
console.log(obj); console.log(obj);
@ -728,7 +730,23 @@ export class AddBasicDetailsComponent implements OnInit {
if (elemType == "SELECT") changeEvent = "change"; if (elemType == "SELECT") changeEvent = "change";
try { try {
if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
elem.addEventListener("ionFocus", event => {
setTimeout(()=>{
console.log(event.target as Element);
var e = event.target as Element;
e.scrollIntoView(true);
},1000)
})
}
elem.addEventListener(changeEvent, e => { elem.addEventListener(changeEvent, e => {
if (obj.FORMAT_TYPE == "N") {
const maxSize = obj.MAXIMUM_SIZE;
const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
(document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
}
elem.classList.remove("requiredClassElm"); elem.classList.remove("requiredClassElm");
if ( if (
obj.CHILD_SEGMENTS_VS_Splited && obj.CHILD_SEGMENTS_VS_Splited &&

Loading…
Cancel
Save