Merge branch 'master-newdesign' into ashwaq-fix-bug

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

Mohem/src/app/eit/add-eit/add-eit.component.ts

@@ -665,6 +665,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);
@@ -682,6 +684,7 @@ export class AddEitComponent implements OnInit {
         if (val) {
           elem.dataset.dtvalue = val;
           elem.innerHTML = val;
+          elem.value=val;
         } else {
           elem.dataset.dtvalue = "";
           elem.innerHTML = "";
@@ -1217,7 +1220,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");
@@ -1226,11 +1233,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,

Mohem/src/app/uI-elements/time.input.ts

@@ -45,7 +45,7 @@ export class TimeInput extends UiElement {
         const template =
         "<ion-item class='dynamicField' style='" + this.hidden + "'>" +
         " <ion-label position='floating' style='font-size: medium !important;' class='dynamiclable-float " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
-        "<ion-datetime display-format='h:mm' picker-format='h:mm' class='onic-date'  value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
+        "<ion-datetime display-format='HH:mm' picker-format='HH:mm' class='onic-date'  value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
         "</ion-item>"
         return template;
     }