Merge branch 'Feature-WG-395' into 'development'

WebGde/WebContent/WebGde-Widgets/DataInputWidget/generateFields.js

@@ -389,6 +389,7 @@ const inputDateRange = (key, validation) => { //Input date range is a field main
 		input.setAttribute('id', `${key}`)
 		input.setAttribute('name', 'startDate')
 		input.setAttribute('type', 'date')
+		input.setAttribute('max','9999-12-31')
 		input.addEventListener('focusout', handleInput)
 		mandatory ? input.setAttribute('required', 'true') : null
 		startDate.setAttribute('class', 'dateContainer')
@@ -401,6 +402,7 @@ const inputDateRange = (key, validation) => { //Input date range is a field main
 		input2.setAttribute('id', `${key}`)
 		input2.setAttribute('name', 'endDate')
 		input2.setAttribute('type', 'date')
+		input2.setAttribute('max','9999-12-31')
 		input2.addEventListener('focusout', handleInput)
 		mandatory ? input2.setAttribute('required', 'true') : null
 		endDate.setAttribute('class', 'dateContainer')
@@ -438,6 +440,7 @@ const inputDate = (key, validation) => {
 		input.setAttribute('id', `${key}`)
 		input.setAttribute('name', `${key}`)
 		input.setAttribute('type', 'date')
+		input.setAttribute('max','9999-12-31')
 		input.addEventListener('focusout', handleInput)
 
 		mandatory ? input.setAttribute('required', 'true') : null
@@ -448,6 +451,17 @@ const inputDate = (key, validation) => {
 	}
 }
 
+
+
+
+
+
+
+
+
+
+
+
 /**
  * 
  * @param {*} key

WebGde/WebContent/WebGde-Widgets/DataInputWidget/validateInput.js

@@ -199,7 +199,7 @@ const validateDateRange = (validation, value) => {
 
     try{
         if(mandatory && (value.length===0 || !value.match(/\S/g))) return { valid: false, errors: ['Field is empty'] }
-
+		
         return { valid: true }
     } catch(err) {
         throw err

WebGde/WebContent/WebGde-Widgets/config.js

@@ -8,7 +8,7 @@ export const  HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.
 export const ROOT_FOLDER = "/WebGde-Widgets";
 
 //this determines if the images will be retrieved from the gfs
-const IP = "44.202.63.115"
+const IP = "3.84.233.4"
 const GDE_CONTEXTROOT = "WebGde-v121-b1"
 export const  DOMAIN = `http://${IP}:8080`
 export const  CONTEXTROOT = "gfs-explorer-ws"

WebGde/WebContent/WebGde-Widgets/documentControlWidget/documentControlWidget.js

@@ -5,6 +5,8 @@ import { completeToNextNode, submitForm } from '../Submit/submit.js';
 import { interval, pauseMetricCapture, saveMetrics, stopMetricCapture } from '../captureMetrics/captureMetrics.js';
 import { REASON_LIST, ROOT_FOLDER } from '../config.js';
 import { BPO_OBJECT, DISPLAY_FIELD_OBJECT, DOCUMENT_CONTROL_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from '../globalVariable.js';
+import { createInfoModal } from '../genericPopup/genericPopup.js';
+
 
  import { saveForm } from "../DataInputWidget/generateFields.js";
 
@@ -127,8 +129,6 @@ export class DocumentControlWidget {
 
 
 
-
-
                 
                 if(sessionStorage.getItem("isElementComplete")){
                     //move element then fetch new element
@@ -153,8 +153,13 @@ export class DocumentControlWidget {
                 } else {
                     // document.getElementById("nextRecordImage").click();
                     //DISPLAY_FIELD_OBJECT.generateFields();
-                    DISPLAY_FIELD_OBJECT.clearForm();
-                    displayNextRecord();
+                   
+                   //commented 20230921
+                    //DISPLAY_FIELD_OBJECT.clearForm();
+                    //displayNextRecord();
+                   //commented 20230921
+                    createInfoModal(null, "OK", "Element is not yet complete. Please check all the records for completeness");
+                    
                     console.log("Element is not yet complete. Please check all the records for completeness");
                     //document.getElementById("input-field-container").appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());