Merge branch 'master' of ssh://git0.fmf.uni-lj.si:2222/studen/crf

web/crf/crfVisit.js

@@ -946,6 +946,7 @@ function afterRegistration(config,configUpload,data){
 		print(config,msg);
 		return;
 	}
+	print(config,'registration participant field: '+config.registrationParticipantIdField);
 	configUpload.participantId=
 		registrationData.rows[0][config.registrationParticipantIdField];
 	//could be a lookup field

web/crf/formPortal.js

@@ -94,7 +94,21 @@ function afterPopulatingStudyData(config,formConfig,data){
 	let qconfig=new Object();
 
 	qconfig.schemaName="study";
-	qconfig.queryName="demographicData";
+	let demographicDataId=formConfig.dataForms.rows[0].masterQuery;
+	let demographicDataQuery="NONE";
+	for (let i=0;i<formConfig.inputLists.rows.length;i++){
+		let entry=formConfig.inputLists.rows[i];
+		print(config,"inputList ["+i+"] ["+entry.Key+"] "+entry.queryName);
+		if (entry.Key==demographicDataId){
+			demographicDataQuery=entry.queryName;
+			break;
+		}
+	}
+	print(config,'Setting demographic query to '+demographicDataQuery);
+
+	qconfig.queryName=demographicDataQuery;
+	//qconfig.queryName="demographicData";
+	
 	qconfig.success=function(data){afterPopulatingDemographicData(config,formConfig,data)};
 	LABKEY.Query.selectRows(qconfig);
 }