|
|
@@ -126,6 +126,8 @@ function selectRowsCallback(renderConfig, measureStore) {
|
|
|
chartConfig.geomOptions.width=null;
|
|
|
chartConfig.geomOptions.height=null;
|
|
|
chartConfig.geomOptions.pointType="outliers";
|
|
|
+ chartConfig.geomOptions.pointFillColor="3366FF";
|
|
|
+ chartConfig.geomOptions.lineWidth=2;
|
|
|
chartConfig.pointFillColor="3366FF";
|
|
|
chartConfig.lineWidth="3";
|
|
|
chartConfig.lineColor="000000";
|
|
|
@@ -171,6 +173,7 @@ function selectRowsCallback(renderConfig, measureStore) {
|
|
|
let aes = LABKEY.vis.GenericChartHelper.generateAes(
|
|
|
chartType, chartConfig.measures,
|
|
|
responseMetaData.schemaName, responseMetaData.queryName);
|
|
|
+
|
|
|
let valueConversionResponse =
|
|
|
LABKEY.vis.GenericChartHelper.doValueConversion(
|
|
|
chartConfig, aes, chartType, measureStore.records());
|
|
|
@@ -191,6 +194,9 @@ function selectRowsCallback(renderConfig, measureStore) {
|
|
|
aes, measureStore);
|
|
|
let geom = LABKEY.vis.GenericChartHelper.generateGeom(
|
|
|
chartType, chartConfig.geomOptions);
|
|
|
+ document.getElementById('debugCode').value+='\n geom color '+geom.color;
|
|
|
+
|
|
|
+
|
|
|
let labels = LABKEY.vis.GenericChartHelper.generateLabels(
|
|
|
chartConfig.labels);
|
|
|
|
|
|
@@ -230,7 +236,15 @@ function selectRowsCallback(renderConfig, measureStore) {
|
|
|
|
|
|
let plotConfig = LABKEY.vis.GenericChartHelper.generatePlotConfig(
|
|
|
renderConfig.chartId,chartConfig, labels, aes, scales, geom, data);
|
|
|
+ document.getElementById('debugCode').value+='\n plotConfig layers: '+plotConfig.layers.length;
|
|
|
+ for (let i=0;i<plotConfig.layers.length;i++){
|
|
|
+ let l=plotConfig.layers[i];
|
|
|
+ document.getElementById('debugCode').value+='\n color: '+l.aes.color;
|
|
|
+ if (l.data===null)
|
|
|
+ continue;
|
|
|
+ document.getElementById('debugCode').value+='\n data: '+l.data.length;
|
|
|
|
|
|
+ }
|
|
|
let validation = validateChartConfig(chartConfig, aes, scales, measureStore);
|
|
|
renderMessages(renderConfig.chartId, validation.messages);
|
|
|
if (!validation.success)
|
|
|
@@ -280,10 +294,10 @@ function dependencyCallback() {
|
|
|
queryConfig.method="POST";
|
|
|
queryConfig.columns=["percentile","value","ParticipantId"];
|
|
|
queryConfig.filterArray=new Array();
|
|
|
- queryConfig.filterArray.push({
|
|
|
- "name":"patientCode",
|
|
|
- "value":renderConfig.participantCode,
|
|
|
- "type":"eq"});
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
queryConfig.filterArray.push({
|
|
|
"name":"visitCode",
|
|
|
"value":renderConfig.visitCode,
|
