Fixing phenotype setting

Scan-o-Matic · Aug 3, 2018 · e7ede6c · e7ede6c
1 parent 3592ca6
commit e7ede6c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/scanomatic/ui_server_data/js/qc_normAPIHelper.js b/scanomatic/ui_server_data/js/qc_normAPIHelper.js
@@ -159,7 +159,11 @@ function GetRunPhenotypes(url, key, callback) {
         else {
             var phenotypes = [];
             for (var i = 0; i < json.phenotypes.length; i++) {
-                phenotypes.push({ name: json.names[i], url: json.phenotype_urls[i] });
+                phenotypes.push({
+                    name: json.names[i],
+                    phenotype: json.phenotypes[i],
+                    url: json.phenotype_urls[i],
+                });
             }
             callback(phenotypes);
         }
@@ -209,12 +213,11 @@ function GetPlateData(url, isNormalized, metaDataPath, phenotypePlaceholderMetaD
                             var plate = {
                                 plate_data: json.data,
                                 plate_phenotype: json.phenotype,
-                                plate_qIdxSort: qIdxSort,
                                 Plate_metadata : {
-                                    plate_BadData: json.BadData,
-                                    plate_Empty: json.Empty,
-                                    plate_NoGrowth: json.NoGrowth,
-                                    plate_UndecidedProblem: json.UndecidedProblem
+                                    badData: json.BadData,
+                                    empty: json.Empty,
+                                    noGrowth: json.NoGrowth,
+                                    undecidedProblem: json.UndecidedProblem
                                 },
                                 Growth_metaData: {
                                     gt: isNormalized === true ? null : gtData,

diff --git a/scanomatic/ui_server_data/js/qc_normDrawPlate.js b/scanomatic/ui_server_data/js/qc_normDrawPlate.js
@@ -348,10 +348,10 @@ d3.scanomatic.plateHeatmap = function () {
 
             //compose from plate metadata
             var plateMetaDataComp = [];
-            plateMetaDataComp.push(addmetaDataType(plateMetaData.plate_BadData, plateMetaDataType.BadData));
-            plateMetaDataComp.push(addmetaDataType(plateMetaData.plate_Empty, plateMetaDataType.Empty));
-            plateMetaDataComp.push(addmetaDataType(plateMetaData.plate_NoGrowth, plateMetaDataType.NoGrowth));
-            plateMetaDataComp.push(addmetaDataType(plateMetaData.plate_UndecidedProblem, plateMetaDataType.UndecidedProblem));
+            plateMetaDataComp.push(addmetaDataType(plateMetaData.badData, plateMetaDataType.BadData));
+            plateMetaDataComp.push(addmetaDataType(plateMetaData.empty, plateMetaDataType.Empty));
+            plateMetaDataComp.push(addmetaDataType(plateMetaData.noGrowth, plateMetaDataType.NoGrowth));
+            plateMetaDataComp.push(addmetaDataType(plateMetaData.undecidedProblem, plateMetaDataType.UndecidedProblem));
 
             //compose from plate data and growth metadata
             var plate = [];

diff --git a/scanomatic/ui_server_data/js/qc_normHelper.js b/scanomatic/ui_server_data/js/qc_normHelper.js
@@ -338,7 +338,7 @@ function drawRunPhenotypeSelection(path) {
             .data(runPhenotypes)
             .enter()
             .append('option');
-        options.attr('value', d => d.url);
+        options.attr('value', d => d.phenotype);
         options.text(d => d.name);
         selPhen.on('change', drawPhenotypePlatesSelection);
         $(`#${selRunPhenotypesName}`).selectedIndex = 0;
@@ -358,7 +358,7 @@ function drawRunNormalizedPhenotypeSelection(path) {
             .data(runPhenotypes)
             .enter()
             .append('option');
-        options.attr('value', d => d.url);
+        options.attr('value', d => d.phenotype);
         options.text(d => d.name);
         selPhen.on('change', drawPhenotypePlatesSelection);
         $(`#${selRunNormPhenotypesName}`).toggle();
@@ -371,8 +371,11 @@ function drawPhenotypePlatesSelection() {
     const isNormalized = $('#ckNormalized').is(':checked');
     const selectedPhen = $(`#${selRunPhenotypesName}`).val();
     const selectedNromPhen = $(`#${selRunNormPhenotypesName}`).val();
-    const path = isNormalized ? selectedNromPhen : selectedPhen;
-    window.qc.actions.setPhenotype(path);
+    const phenotype = isNormalized ? selectedNromPhen : selectedPhen;
+    if (!phenotype) return;
+    const project = window.qc.selectors.getProject();
+    const path = `/api/results/${isNormalized ? 'normalized_phenotype' : 'phenotype'}/${phenotype}/${project}`;
+    window.qc.actions.setPhenotype(phenotype);
     if (!path) { return; }
     projectSelectionStage('Plates');
     console.log(`plates: ${path}`);