Making sure View field is set at form creation

web/crf/crfVisit.js

@@ -1227,7 +1227,7 @@ function completeWithFlag(config,data,flag){
 	if (debug){
 		if (flag==4) print(config,"complete with review");
 	}
-	//redirect(config);
+	redirect(config);
 
 	
 	
@@ -1267,7 +1267,8 @@ function finalValidation(config){
 		finalRedirect(config);
 	}
 	else{
-		updateSubmitStatus(config,"Form invalid");
+		let el=document.getElementById(config.submitReportId);
+		el.innerHTML="Form invalid";
 	}
 }
 
@@ -1277,27 +1278,25 @@ function finalRedirect(config){
 	c1.schemaName='lists';
 	c1.queryName='crfEntry';
 	c1.filterArray=[LABKEY.Filter.create('entryId',getCRFref(config))];
-	c1.success=function(data){setSubmitStatus(config,data)};
+	c1.success=function(data){uploadData(config,data)};
 	LABKEY.Query.selectRows(c1);
 }
 
-function setSubmitStatus(config,data){
+function uploadData(config,data){
 	let entry=data.rows[0];
 	entry.formStatus=2;//Submitted
+	let el=document.getElementById(config.submitReportId);
+	el.innerHTML="Submitting form";
 	let c1=new Object();
 	c1.schemaName=data.schemaName;
 	c1.queryName=data.queryName;
 	c1.containerPath=config.containerPath;
 	c1.rows=[entry];
-	c1.success=function(data){updateSubmitStatus(config,"Form submitted")};
+	//close window upon success
+	c1.success=function(data){redirect(config)};
 	LABKEY.Query.updateRows(c1);
 }
 
-function updateSubmitStatus(config,msg){
-	let el=document.getElementById(config.submitReportId);
-	el.innerHTML=msg;
-}
-
 function hideErr(config){
 	let el=config.document.getElementById("errorDiv");
 	el.style.display="none";

web/crf/formPortal.js

@@ -401,10 +401,10 @@ function openForm(config,formConfig,crfRef, crfEntry){
 		// The destination wiki page. The name of this parameter is not arbitrary.
 		"userid": crfEntry.UserId, 
 		"entryId": crfRef,
-		"registrationQueryId":formEntry["masterQuery"],
+		"registrationQueryId":"NOT USED",
 		"reviewMode":reviewMode,
 		"formId":formId,
-		"formName":formEntry["formName"]
+		"formName":"NOT USED" 
 	};
 
 	//"formSetupQuery":formEntry["setupQuery"],
@@ -424,6 +424,7 @@ function createForm(config,formConfig,formId){
 	let crfEntry=new Object();
 	crfEntry.entryId=Date.now();
 	crfEntry["Date"]=new Date();
+	crfEntry["View"]="[VIEW]";
 	crfEntry.formStatus=1;//In progress
 	//set other variables
 	//requires studyData as part of formConfig