Merge branch 'feature-WG-337' into 'development-mobile'

WebGde/.classpath

@@ -24,11 +24,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="fish.payara.eclipse.tools.server.lib.system">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -42,5 +37,10 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.payara.tools.lib.system">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

WebGde/.settings/org.eclipse.ltk.core.refactoring.prefs

+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

WebGde/.settings/org.eclipse.wst.common.project.facet.core.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Payara"/>
+  <runtime name="Payara Server 5 (5.2022.5)"/>
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>

WebGde/WebContent/WebGde-Widgets/BPO/rejectElement.js

 import { createLoadingScreen, resetGDE } from "../../script.js";
+import { SCHEMA_FILE_PATH } from "../DataInputWidget/config.js";
 import { validateInput } from "../DataInputWidget/validateInput.js";
 import { PROJECT_CODE } from "../Submit/config.js";
-import { ENCODING_PASS, REASON_LIST, SCHEMA_FILE } from "../config.js";
+import { ENCODING_PASS, REASON_LIST } from "../config.js";
 import { createInfoModal, createModal } from "../genericPopup/genericPopup.js";
 import { BPO_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from "../globalVariable.js";
 import { getRejectElement } from "./bpoService.js";
@@ -331,20 +332,20 @@ function saveExceptionToXml(){
         "projCode": PROJECT_CODE,
         "userId": sessionStorage.getItem("user_id"),
         "elementId": elementId,
-        "schema": SCHEMA_FILE,
-        "totalRec":  urls.length,
+        "schema": SCHEMA_FILE_PATH,
+        "totalRec":"0",
         "maxRec": "1",
-        "totalKeystroke": 0,
+        "totalKeystroke": "",
         "procTime": "",
-        "procDuration": 0,
+        "procDuration": "",
         "eob": "",
         "exceptionRemark": selected,
-        "recordNo": "1",
+        "recordNo": "0",
         "totalSubRec": "1",
         "maxSubRec": "1",
-        "imageName": urls[parseInt(sessionStorage.getItem("display_counter"))],
+        "imageName": "",
         "subRecordNo": "1",
-        "eor": "",
+        "eor": "N",
         "fields": {},
         "outputDir": sessionStorage.getItem("element_file_loc") + "/" + (ENCODING_PASS == "PASS1" ? elementId + ".DTA" : elementId + ".DTB"),
         "doctype": doctype,

WebGde/WebContent/WebGde-Widgets/BPO/returnElement.js

 import { createLoadingScreen, removeLoadingScreen, resetGDE } from "../../script.js";
+import { SCHEMA_FILE_PATH } from "../DataInputWidget/config.js";
 import { validateInput } from "../DataInputWidget/validateInput.js";
 import { PROJECT_CODE } from "../Submit/config.js";
 import { interval } from "../captureMetrics/captureMetrics.js";
-import { SCHEMA_FILE } from "../config.js";
 import { createInfoModal, createModal } from "../genericPopup/genericPopup.js";
 import { BPO_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from "../globalVariable.js";
 import { getUrlReturnElement } from "./bpoService.js";
@@ -59,21 +59,21 @@ function returnSaveXML(){
         "projCode": PROJECT_CODE,
         "userId": sessionStorage.getItem("user_id"),
         "elementId": elementId,
-        "schema": SCHEMA_FILE,
-        "totalRec": filePaths.length,
+        "schema": SCHEMA_FILE_PATH,
+        "totalRec":"0",
         "maxRec": "1",
-        "totalKeystroke": 0,
+        "totalKeystroke": "",
         "procTime": "",
-        "procDuration": 0,
+        "procDuration": "",
         "eob": "",
         "exceptionRemark": "",
-        "recordNo": parseInt(sessionStorage.getItem("display_counter")) + 1,
+        "recordNo": "0",
         "totalSubRec": "1",
         "maxSubRec": "1",
-        "imageName": filePaths[parseInt(sessionStorage.getItem("display_counter"))],
+        "imageName": "",
         "subRecordNo": "1",
-        "eor": "",
-        "fields": {},
+        "eor": "N",
+        "fields": fields,
         "outputDir": sessionStorage.getItem("element_file_loc") + "/" + (ENCODING_PASS == "PASS1" ? elementId + ".DTA" : elementId + ".DTB"),
         "doctype": doctype,
         "section": section

WebGde/WebContent/WebGde-Widgets/DataInputWidget/AndroidInterface/androidInterface.js

@@ -3,6 +3,10 @@ export function imageCapture(key) {
     window.ImageCaptureInterface.captureImage(key);
 }
 
+export function videoCapture(key){
+    window.VideoCaptureInterface.captureVideo(key);
+}
+
 export function selfieCapture(key) {
     // Call Android function via javaScript interface
     window.ImageCaptureInterface.captureSelfie(key);

WebGde/WebContent/WebGde-Widgets/DataInputWidget/VideoCapture/captureVideo.js

+export function processVideoCapture(key, videoFilename){
+    const form = document.getElementById('fields');
+	const thumb = document.getElementById(`${key}_thumbnail`);
+	const filename = document.getElementById(`${key}_fname`);
+	const x = document.getElementById(`${key}_x`);
+    // const filenameString = generateMediaFileName(sessionStorage.getItem('user_id'));
+	const filenameString = videoFilename;
+
+	// Create hidden inputs for fname and file content
+	const hiddenFnameInput = document.createElement('input');
+	hiddenFnameInput.setAttribute('id', `${key}`);
+	hiddenFnameInput.setAttribute('type', 'hidden');
+	hiddenFnameInput.setAttribute('name', 'hidden_fname');
+	form.appendChild(hiddenFnameInput);
+
+	const hiddenFileContentInput = document.createElement('input');
+	hiddenFileContentInput.setAttribute('id', `${key}`);
+	hiddenFileContentInput.setAttribute('type', 'hidden');
+	hiddenFileContentInput.setAttribute('name', 'hidden_file_content');
+	form.appendChild(hiddenFileContentInput);
+
+	thumb.style.display = 'inline';
+	thumb.style.width = '100%';
+	thumb.style.height = '100%';
+
+	filename.textContent = filenameString;
+	filename.style.display = 'inline';
+
+	// Set the hidden inputs when a file is selected
+	hiddenFnameInput.value = filenameString;
+	hiddenFnameInput.display = '';
+	hiddenFileContentInput.value = thumb.src; // This will store the base64-encoded content of the file
+	hiddenFileContentInput.display = '';
+
+	document.getElementById(`${key}_buttonsContainer-video`).style.display = 'none';
+	x.style.display = 'block';
+	x.style.position = 'absolute';
+    document.getElementById(`${key}_x`).addEventListener('click', () => {
+		thumb.style.display = 'none';
+		x.style.display = 'none';
+		filename.style.display = 'none';
+		document.getElementById(`${key}_buttonsContainer-video`).style.display = 'flex';
+
+		// Clear the hidden fields
+		hiddenFnameInput.display = 'none';
+		hiddenFnameInput.value = '';
+		hiddenFileContentInput.display = 'none';
+		hiddenFileContentInput.value = '';
+	});
+
+}
\ No newline at end of file

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

@@ -158,17 +158,17 @@ async function createBPOXML(fields, metrics, doctype, section){
         "userId": sessionStorage.getItem("user_id"),
         "elementId": elementId,
         "schema": SCHEMA_FILE_PATH,
-        "totalRec":filePaths.length,
+        "totalRec":"0",
         "maxRec": "1",
         "totalKeystroke": metrics[0],
         "procTime": "",
         "procDuration": metrics[1],
         "eob": "",
         "exceptionRemark": "",
-        "recordNo": parseInt(sessionStorage.getItem("display_counter")) + 1,
+        "recordNo": "0",
         "totalSubRec": "1",
         "maxSubRec": "1",
-        "imageName": filePaths[parseInt(sessionStorage.getItem("display_counter"))],
+        "imageName": "",
         "subRecordNo": "1",
         "eor": "N",
         "fields": fields,

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

@@ -111,7 +111,11 @@ export const submitForm = async (e) => {
 					});
 					console.log(await getFile.text());
 					// await uploadTOGFS(await getFile.text(), sessionStorage.getItem("recentlySavedFileName"));
-			}else if(IS_RETRIEVE_FROM_BPO === "Y"){
+				} else {
+					createInfoModal(null, 'OK', 'Error while uploading');
+					return false
+				}
+			}else {
 				let response = await WriteForm(e, [], doctype, section);
 				await batchUpload(Form);
 				if (response !== false) {
@@ -128,12 +132,6 @@ export const submitForm = async (e) => {
 					});
 				}
 			}
-
-
-			}else{
-				createInfoModal(null, 'OK', 'Error while uploading');
-				return false
-			}
 			// saveForm(sessionStorage.getItem("display_counter"));
 		}
 		return true

WebGde/WebContent/WebGde-Widgets/config.js

@@ -10,9 +10,9 @@ 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
-export const  DOMAIN = "http://54.208.45.179:8080"
+export const  DOMAIN = "http://100.24.19.34:8080"
 export const  CONTEXTROOT = "gfs-explorer-ws"
-export const  GDE_URL = DOMAIN + "/MobileGde/svc/gfs-rest"
+export const  GDE_URL = DOMAIN + "/MobileGdeDev/svc/gfs-rest"
 export const  FOLDER_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/"
 export const  DOWNLOAD_URL = DOMAIN + "/" + CONTEXTROOT +  "/svc/gfs-rest/get-download-link"
 export const  IS_RETRIEVE_FROM_GFS = "N"
@@ -20,7 +20,7 @@ export const  IS_RETRIEVE_FROM_GFS = "N"
 export const  INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLock,Pause,PageUp,PageDown,Insert,Delete,Control"
 
 //BPO CONFIG
-export const  IS_RETRIEVE_FROM_BPO = "Y"
+export const  IS_RETRIEVE_FROM_BPO = "N"
 // export const  BPO_URL = "http://35.171.20.94:8080/bpo-sqa/"
 // export const  CURRENT_NODE = "Web GDE"
 export const  BPO_URL = DOMAIN + "/bpo/";

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

@@ -13,7 +13,7 @@
         "fieldLabel" : "Patient Image",
         "aka" : "field1",
         "validation" : {
-          "collection" : "image-capture",
+          "collection" : "video-capture",
           "mandatory" : true
         }
       },

WebGde/WebContent/script.js

@@ -44,16 +44,17 @@ async function initializeWebGDE() {
 
 
 	// UNCOMMENTED BY ADAM 9/25/2023
+	sessionStorage.setItem("element_id","element1");
 
-	/*await createWebGdeInterface(null);*/
+	await createWebGdeInterface(null);
 	setDocumentControlObject(new DocumentControlWidget());
-	/*document.getElementById("input-field-container").appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());*/
+	document.getElementById("input-field-container").appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());
 
 	var mainLogInScreenContainer = document.getElementById("logInMainContainer");
 	mainLogInScreenContainer.remove();
 	removeLoadingScreen();
 
-	new ElementListWidget('Web_GDE_DEV', 'containerId');
+	// new ElementListWidget('Web_GDE_DEV', 'containerId');
 
 }
 
@@ -135,17 +136,12 @@ export function removeLoadingScreen() {
 
 }
 
-<<<<<<< WebGde/WebContent/script.js
 export async function resetGDE(){
     // TO-DO
 }
 
 function init(){
     console.log("Application Started");
-=======
-function init() {
-	console.log("Application Started");
->>>>>>> WebGde/WebContent/script.js
 }
 
 function testFunction() {

WebGde/WebContent/style.css

@@ -289,7 +289,7 @@ input[type=radio] {
     display: none;
 }
 
-.image-capture, .fingerprint-capture {
+.image-capture, .fingerprint-capture, .file-upload {
     display: flex;
     flex-direction: column;
     width: 100%;
@@ -689,7 +689,7 @@ span#filename {
         background-color: yellow;
     }
 
-    .image-capture, .fingerprint-capture {
+    .image-capture, .fingerprint-capture, .file-upload {
         display: flex;
         flex-direction: column;
         width: 100%;