Errors in crfReview. Also, making sure only prior curves are plotted in plotParticipant

web/crf/crfReview.js

@@ -88,7 +88,7 @@ function selectRowsCallback(renderConfig, measureStore) {
 			continue;
 		}
 		record[participantField].value=renderConfig.labelOthers;
-		otherParticipantData.push(record);
+		if (!pMatch || sMatch) otherParticipantData.push(record);
 		measureStore.records().splice(i,1);	
 
 	}
@@ -403,7 +403,7 @@ function plotAll() {
         	}
         	queryConfig.success = function(data){
 			selectRowsCallback(renderConfig,data);};
-        	queryConfig.containerPath = "/iPNUMMretro/Study";
+        	queryConfig.containerPath = LABKEY.ActionURL.getContainer();
         	LABKEY.Query.MeasureStore.selectRows(queryConfig);
 	}
 };
@@ -413,7 +413,10 @@ function plotParticipant() {
 	let participantField=document.getElementById('participantField').innerHTML;
 	let participantCode=document.getElementById('participantCode').innerHTML;
 	let visitField=document.getElementById('visitField').innerHTML;
-	document.getElementById('debugCode').value+='\n'+participantField;
+	let visitCode=document.getElementById('visitCode').innerHTML;
+
+	let visitValue=parseInt(visitCode.split('_')[1])+1;
+	document.getElementById('debugCode').value+='\n'+visitValue;
 
 	let organs=["3","4","5"];
 		
@@ -430,7 +433,7 @@ function plotParticipant() {
 		renderConfig.plot="percentile";
 		renderConfig.max=10;
 		renderConfig.title="SUV cumulative distribution";
-		
+		renderConfig.visitThreshold=visitValue;
 
 		// When all the dependencies are loaded we then load the data via the MeasureStore selectRows API.
 		// The queryConfig object stores all the information needed to make a selectRows request
@@ -446,7 +449,7 @@ function plotParticipant() {
 	        queryConfig.maxRows=-1;
         	queryConfig.sort="lsid";
 	        queryConfig.method="POST";
-        	queryConfig.columns=["percentile","value",participantField,visitField];
+        	queryConfig.columns=["SequenceNum","percentile","value",participantField,visitField];
 	        queryConfig.filterArray=new Array();
         	queryConfig.filterArray.push({
 			"name":"patientCode",
@@ -553,7 +556,7 @@ function plotTime() {
         	}
         	queryConfig.success = function(data){
 			selectRowsCallback(renderConfig,data);};
-        	queryConfig.containerPath = "/iPNUMMretro/Study";
+        	queryConfig.containerPath = LABKEY.ActionURL.getContainer();
         	LABKEY.Query.MeasureStore.selectRows(queryConfig);
 	}
 };