From f605919faad6586a15257f474db6e77802af5e56 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 9 Apr 2020 17:07:10 +0300 Subject: [PATCH 1/4] edit time input --- Mohem/src/app/eit/add-eit/add-eit.component.ts | 1 + Mohem/src/app/uI-elements/time.input.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index d1b4ac7f..4c826c19 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -681,6 +681,7 @@ export class AddEitComponent implements OnInit { if (val) { elem.dataset.dtvalue = val; elem.innerHTML = val; + elem.value=val; } else { elem.dataset.dtvalue = ""; elem.innerHTML = ""; diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index 2c7d5591..e0dbce93 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -45,7 +45,7 @@ export class TimeInput extends UiElement { const template = "" + " " + this.label + "" + - "" + + "" + "" return template; } From 3ec23b0a222dbde2f10bd7f4f2f1409fdbb67e42 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 9 Apr 2020 20:09:54 +0300 Subject: [PATCH 2/4] fix time input issue --- Mohem/src/app/eit/add-eit/add-eit.component.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 4c826c19..8cf70232 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -1217,7 +1217,11 @@ export class AddEitComponent implements OnInit { this.eitResponse[i].DISPLAY_FLAG != "N" ) { //time + if(elemVal.length>5){ elemVal = elemVal.substring(11, 16); + }else{ + elemVal = elemVal; + } } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); From 1c7ec038472ef6ec6e613a258551e5ec0ede1ea8 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 9 Apr 2020 20:47:15 +0300 Subject: [PATCH 3/4] fix leave request issue --- .../app/absence/submit-absence/submit-absence.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1d16e33a..360a5175 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -443,9 +443,9 @@ export class SubmitAbsenceComponent implements OnInit { this.textInput = new TextInput( feildsList[i].SEGMENT_PROMPT, feildsList[i].APPLICATION_COLUMN_NAME, - defaultValText, + defaultVal, containerId, - defaultVal, + defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG From b183e6ed942395d77eacb2ceeed7ceb6ef5c584c Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Sun, 12 Apr 2020 14:00:46 +0300 Subject: [PATCH 4/4] edit default value null --- Mohem/src/app/eit/add-eit/add-eit.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 8cf70232..9e06cc57 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -664,6 +664,8 @@ export class AddEitComponent implements OnInit { let obj = this.handleDefaultValueResult(result); let val = obj.value; let text = obj.text; + if (val==null){val="";} + if (text==null){text="";} if (isStandardDate) { console.log("isStandardDate"); elem.value = this.cs.reverseFormatDate(val); @@ -1230,11 +1232,11 @@ export class AddEitComponent implements OnInit { } else { elem.classList.remove("requiredClassElm"); } - if (elemVal != 'null'){ + // if (elemVal != 'null'){ varcharValue = elemVal; - } else{ - elemVal = null; - } + //} else{ + // elemVal = null; + // } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME,