Merge branch 'feature-WG-491' into 'feature-QC'

WebGde/WebContent/WebGde-Widgets/DataInputWidget/DataInputWidget.css

@@ -235,6 +235,14 @@ label {
 	margin-left: 10px;
 }
 
+.titleContainer{
+	margin-left: 0px !important;
+}
+
+.title{
+	font-size: 20px !important;
+}
+
 .inputContainer {
 	display: inline-block;
 	width: 100%;
@@ -429,6 +437,10 @@ select::-ms-expand {
     padding: 11px 16px !important;
 }
 
+.select2-container{
+	width: 100% !important;
+}
+
 .select2-selection__rendered{
     line-height: normal !important;
     padding: 0px !important;

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

 //Data Input Field Config
-export var SCHEMA_FILE_PATH = "./WebGde-Widgets/sample_schema/REG-INP.json";
+export var SCHEMA_FILE_PATH = "./WebGde-Widgets/sample_schema/DEV_SCHEMA2.json";
 //DBLookup Webservice URL
 export var DB_URL = "http://localhost:8080/WebGde/svc/gfs-rest/db-lookup"
\ No newline at end of file

WebGde/WebContent/WebGde-Widgets/ElementListWidget/ElementListWidget.js

@@ -431,6 +431,14 @@ export class ElementListWidget {
 		// Continue with the original logic
 		await createWebGdeInterface(null);
 
+		// Get current timestamp
+		const currentTimeStamp = Date.now();
+		const currentDate = new Date(currentTimeStamp);
+		const humanReadableTime = currentDate.toLocaleString();
+
+		// Save to session storage
+		sessionStorage.setItem("timeStart", humanReadableTime);
+
 		// Create and style a new container for the selected element's details
 		const detailsContainer = document.createElement('div');
 		detailsContainer.classList.add('encode-details-container');

WebGde/WebContent/WebGde-Widgets/Submit/XMLWriter/XML_Saver.js

@@ -153,7 +153,7 @@ async function createNonBPOXML(fields, metrics, doctype, section, fieldOrder){
         "totalRec":"0",
         "maxRec": "1",
         "totalKeystroke": metrics[0],
-        "procTime": "",
+        "procTime": sessionStorage.getItem("timeStart") + "-" + sessionStorage.getItem("timeEnd"),
         "procDuration": metrics[1],
         "eob": "",
         "exceptionRemark": "",
@@ -204,7 +204,7 @@ async function createBPOXML(fields, metrics, doctype, section, fieldOrder){
         "totalRec":"1",
         "maxRec": "1",
         "totalKeystroke": metrics[0],
-        "procTime": "",
+        "procTime": sessionStorage.getItem("timeStart") + "-" + sessionStorage.getItem("timeEnd"),
         "procDuration": metrics[1],
         "eob": "",
         "exceptionRemark": "",

WebGde/WebContent/WebGde-Widgets/Submit/submit.js

@@ -4,7 +4,6 @@ import { checkValidValues, validateInput, validateReturnInput } from "../DataInp
 import { goBackToElementListViewer } from "../ElementListWidget/ElementListWidget.js";
 import { uploadFile } from "../FileUpload/fileUpload.js";
 import { createLoadingModal, removeLoadingModal } from "../LoadingModal/LoadingModal.js";
-import { global_end_time, saveMetrics, stopMetricCapture, setGlobalEndTime, interval } from "../captureMetrics/captureMetrics.js";
 import { IS_RETRIEVE_FROM_BPO, SHOW_ELEMENT_LIST_VIEWER } from "../config.js";
 import { createConfirmationModal, createErrorModal, createInfoModal } from "../genericPopup/genericPopup.js";
 import { DISPLAY_FIELD_OBJECT } from "../globalVariable.js";
@@ -15,7 +14,14 @@ import { GFS_ROOT_FOLDER, GFS_URL, PROJECT_CODE, TEMPORARY_FOLDER } from "./conf
 
 export const submitForm = async (e) => {
 	try {
-		setGlobalEndTime(new Date().toLocaleString());
+		// Get current timestamp
+		const currentTimeStamp = Date.now();
+		const currentDate = new Date(currentTimeStamp);
+		const humanReadableTime = currentDate.toLocaleString();
+
+		// Save to session storage
+		sessionStorage.setItem("timeEnd", humanReadableTime);
+
 		const Form = document.getElementById("fields");
 		const { elements } = Form
 		let error = false;
@@ -375,7 +381,7 @@ function validateMedia(key) {
 export async function completeToNextNode(elementId) {
 	let requestJSON = {
 		"productionOutputUnits": {
-			"keystroke": {
+			"KEYSTROKE": {
 				"outputCount": 0,
 				"errorCount": 0
 			}

WebGde/WebContent/WebGde-Widgets/config.js

@@ -28,11 +28,11 @@ export let BPO_URL = DOMAIN + "bpo/";
 // export const CURRENT_NODE = "Web_GDE_DEV"
 export let CURRENT_NODE = ""
 export const ENCODING_PASS = "PASS1"
-export const NEXT_NODE = "Complete"
+export const NEXT_NODE = "Completed"
 export const EXCEPTION_NODE = "Exception"
 export const SHOW_ELEMENT_LIST_VIEWER = "Y"
 export const ADD_NEW_OPTION = "N"
-export const DISPLAYED_DETAILS = "Address|Cassandra_Key" //pipe-delimited
+export const DISPLAYED_DETAILS = "Extra1|Extra2|Extra3" //pipe-delimited
 
 export const PDF_EXTENSION = ".pdf"
 export const JPG_EXTENSION = ".jpg"

WebGde/WebContent/WebGde-Widgets/sample_schema/DEV_SCHEMA2.json

+{
+  "DEV-SCHEMA" : {
+    "Section1" : {
+      "header_ng_ina_mo":{
+        "fieldLabel" : "Header ng Ina mo",
+        "validation" : {
+          "collection" : "title"
+        }
+      },
+      "additional_findings_and_observation" : {
+        "fieldLabel" : "Additional findings and observation",
+        "aka" : "field2",
+        "validation" : {
+          "fieldLength" : 20.0,
+          "collection" : "alphanumeric",
+          "mandatory" : false
+        },
+        "readOnly" : false
+      },
+      "evr_date" : {
+        "fieldLabel" : "Date",
+        "aka" : "field3",
+        "validation" : {
+          "fieldLength" : 10.0,
+          "collection" : "datepicker",
+          "mandatory" : false
+        },
+        "readOnly" : false
+      },
+      "email_address" : {
+        "fieldLabel" : "Email Address",
+        "aka" : "field4",
+        "validation" : {
+          "fieldLength" : 20.0,
+          "collection" : "email",
+          "mandatory" : false
+        },
+        "readOnly" : false
+      },
+      "material_recovery_facility" : {
+        "fieldLabel" : "Material recovery Facility",
+        "aka" : "field5",
+        "validation" : {
+          "fieldLength" : 1.0,
+          "collection" : "radiolist",
+          "items" : [ "Yes", "No", "Not Required/Not Applicable" ],
+          "mandatory" : false
+        },
+        "readOnly" : true
+      },
+      "age" : {
+        "fieldLabel" : "Age",
+        "aka" : "field6",
+        "validation" : {
+          "fieldLength" : 3.0,
+          "collection" : "numeric",
+          "mandatory" : false
+        },
+        "readOnly" : true
+      },
+      "identification_card_presented" : {
+        "fieldLabel" : "Identification Card Presented",
+        "aka" : "field7",
+        "validation" : {
+          "fieldLength" : 1.0,
+          "collection" : "dropdown",
+          "options" : [ "Airman License", "Company ID Card", "Driver's License", "Fishworker's License issued by BFAR", "GSIS Card", "Health or Medical Card", "OWWA E-Card", "Phil Health ID Card", "Philippine Postal ID", "PNP Firearm License Card", "Police Clearance", "PRC ID Card", "School ID Card", "Seafarer's Record Book (SRB)", "Senior Citizen ID", "SSS Card", "Student Permit issued by LTO", "TIN Card", "UMID Card", "Voter's ID" ],
+          "mandatory" : false
+        },
+        "readOnly" : true
+      },
+      "nature_of_offense" : {
+        "fieldLabel" : "Nature of Offense",
+        "aka" : "field8",
+        "validation" : {
+          "fieldLength" : 1.0,
+          "collection" : "checklist",
+          "items" : [ "Urinating/Defecating/Indiscriminate Disposal", "Littering", "Dirty Frontage/Surroundings", "Improper Disposal", "Dumping of Grease/Fat/Lard and Oil Residue in Drainage/waterways", "Disposal of Untreated wasteways", "sludge", "chemicals in waterways", "No Trash can in Public Utility Jeep", "Illegal Spillage/Scattering", "Illegal Recycling/Sorting", "Burning of Waste", "No Canvass Cover", "Unsanitized Truck", "No Proper Cleaning/Clearing Materials" ],
+          "mandatory" : false
+        },
+        "readOnly" : true
+      },
+      "place" : {
+        "fieldLabel" : "Place",
+        "aka" : "field9",
+        "validation" : {
+          "fieldLength" : 20.0,
+          "collection" : "timepicker",
+          "mandatory" : false
+        },
+        "readOnly" : true
+      }
+    }
+  }
+}
\ No newline at end of file

WebGde/WebContent/script.js

@@ -38,6 +38,14 @@ async function initializeWebGDE() {
 
 		new ElementListWidget(CURRENT_NODE, 'containerId');
 	} else {
+		// Get current timestamp
+		const currentTimeStamp = Date.now();
+		const currentDate = new Date(currentTimeStamp);
+		const humanReadableTime = currentDate.toLocaleString();
+
+		// Save to session storage
+		sessionStorage.setItem("timeStart", humanReadableTime);
+		
 		await createWebGdeInterface(null);
 		setDocumentControlObject(new DocumentControlWidget());
 		document.getElementById("input-field-container").appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());