Adding containerPath to select and insertRows calls

web/tecant/crfPortal.js

@@ -29,6 +29,15 @@ function drawForm(par){
 		
 }
 
+function generateQConfig(listName){
+    let qConfig=new Object();
+    qConfig.containerPath="TECANT/Data";
+    qConfig.schemaName="lists";
+    qConfig.queryName=listName;
+    return qConfig;
+ }
+ 
+
 function sourceVar(crfEntryName,elementId,sourceName){
 	let f=new Object();
 	f.masterSelectVarName=crfEntryName;
@@ -82,14 +91,14 @@ function populateSourceTable(par){
 		document.getElementById('formStatus').value +=
 			"\npopulateSourceTable: Starting";
 	}
-	let config=new Object();
+    let config=generateQConfig(par.source.queryName);
+    config.schemaName=par.source.schemaName; 
+	
 	if (!("source" in par)) return;
 	if (debug){
 		print("populateSourceTable ["+par.source.queryName+"]");
 	}
 
-	config.schemaName=par.source.schemaName; 
-	config.queryName=par.source.queryName;
 	config.success=function(data){populateSourceTableData(data,par)};
 	config.failure=function(errorTxt){print("populateSourceData:fail")};
 	LABKEY.Query.selectRows(config);
@@ -316,9 +325,9 @@ function populateSelectTableEntry(parameters,rowId){
 		
 	
 
-	let config=new Object();
-	config.schemaName='lists';
-	if ("filter" in row){
+	let config=generateQConfig(parameters.masterQuery);
+    
+    if ("filter" in row){
 		//populateSelect on authorizationQuery with authSelectVarName
 		let filter=row.filter;
 		if (debug){
@@ -380,9 +389,7 @@ function generateRow(tableId, parameters,rowId){
 	let debug=true;
 	if (debug)
 		document.getElementById('formStatus').value+="\n generateRow: Start";
-	let config=new Object();
-	config.schemaName='lists';
-	config.queryName=parameters.masterQuery;
+	let config=generateQConfig(parameters.masterQuery);
 	config.success=function(data){generateTableRow(data,tableId, parameters,rowId)};
 	LABKEY.Query.selectRows(config);
 	if (debug)
@@ -439,9 +446,8 @@ function populateTableRow(data,parameters,rowId){
 		return;
 	}
 	
-	let config=new Object();
+	let config=generateQConfig(field.lookup.queryName);
 	config.schemaName=field.lookup.schemaName;
-	config.queryName=field.lookup.queryName;
 	config.success=function(lookupData){populateSelect(lookupData,data,parameters,rowId)};
 	LABKEY.Query.selectRows(config);	
 	
@@ -503,9 +509,7 @@ function populateDaughterSelect(parameters,rowId,daughterRowId,entry){
 	if (debug)
 		print("\nAdding filter ["+row.masterSelectVarName+"]:"+varValue);
 
-	let config=new Object();
-	config.schemaName='lists';
-	config.queryName=parameters.masterQuery;
+	let config=generateQConfig(parameters.masterQuery)
 	config.filterArray=[];
 	for (let i=0;i < parameters.filters.length;i++){
 		let filterRowId=parameters.filters[i];
@@ -608,9 +612,7 @@ function addNewEntry(parameters){
 	entry.entryId=Date.now();
 	entry.Date=new Date();
 	entry.formStatus=1;//In Progress
-	let config=new Object();
-	config.schemaName='lists';
-	config.queryName=parameters.masterQuery;
+	let config=generateQConfig(parameters.masterQuery);
 	config.rows=[entry];
 	config.success=function(data){
 		populateDaughterSelect(parameters,"Site","Crf",data.rows[0]);
@@ -651,9 +653,7 @@ function addNew(parameters){
 function startForm(parameters){
 	let crfVar=parameters.vars["Crf"];
 	let el=document.getElementById(crfVar.selectId);
-	let config=new Object();
-	config.schemaName='lists';
-	config.queryName=parameters.masterQuery;
+	let config=generateQConfig(parameters.masterQuery);
 	config.filterArray=[LABKEY.Filter.create(crfVar.masterSelectVarName,el.value)]
        	config.success=function(data){findURL(data,parameters)};
 	LABKEY.Query.selectRows(config);
@@ -672,9 +672,8 @@ function findURL(data,parameters){
 		lookup=fields[f].lookup;
 		break;
 	}
-	let config=new Object();
+	let config=generateQConfig(lookup.queryName);
 	config.schemaName=lookup.schemaName;
-	config.queryName=lookup.queryName;
 	config.filterArray=[LABKEY.Filter.create(lookup.keyColumn,entry[formVarName])];
 	config.success=function(data){finalRedirect(data,entry,parameters)};
 	LABKEY.Query.selectRows(config);