From 8364b53e759e3d7ced36dad2404c2d6b09d60d5b Mon Sep 17 00:00:00 2001
From: bellerbrock <bje24@cornell.edu>
Date: Mon, 17 Oct 2022 13:10:55 -0400
Subject: [PATCH] sort plots for add treatment dialog

---
 js/source/legacy/CXGN/BreedersToolbox/AddTrial.js |  9 ++++++---
 mason/breeders_toolbox/trial/trial_treatments.mas | 12 +++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/js/source/legacy/CXGN/BreedersToolbox/AddTrial.js b/js/source/legacy/CXGN/BreedersToolbox/AddTrial.js
index daf30d395..8878fbea0 100644
--- a/js/source/legacy/CXGN/BreedersToolbox/AddTrial.js
+++ b/js/source/legacy/CXGN/BreedersToolbox/AddTrial.js
@@ -1992,7 +1992,7 @@ jQuery(document).ready(function ($) {
                   'inherits_plot_treatments' : inherits_plot_treatments,
                 },
                 success: function(response) {
-                    console.log(response);
+                    //console.log(response);
                   if (response.error) {
                     alert(response.error);
                   }
@@ -2267,12 +2267,15 @@ jQuery(document).ready(function ($) {
             html += "<table class='table table-hover'><thead><tr><th>plot_name</th><th>accession</th><th>plot_number</th><th>block_number</th><th>rep_number</th><th>is_a_control</th><th>row_number</th><th>col_number</th><th class='table-success'>"+treatment_name+" [Select all <input type='checkbox' name='add_trial_treatment_select_all' />]</th></tr></thead><tbody>";
             var design_hash = JSON.parse(design_array[i]);
             //console.log(design_hash);
-            for (var key in design_hash){
+            var keys = Object.keys(design_hash);
+            keys.sort();
+            keys.forEach(function(key){
                 if (key != 'treatments'){
                     var plot_obj = design_hash[key];
+                    //console.log(plot_obj);
                     html += "<tr><td>"+plot_obj.plot_name+"</td><td>"+plot_obj.stock_name+"</td><td>"+plot_obj.plot_number+"</td><td>"+plot_obj.block_number+"</td><td>"+plot_obj.rep_number+"</td><td>"+plot_obj.is_a_control+"</td><td>"+plot_obj.row_number+"</td><td>"+plot_obj.col_number+"</td><td><input data-plot_name='"+plot_obj.plot_name+"' data-trial_index='"+i+"' data-trial_treatment='"+treatment_name+"'  data-plant_names='"+JSON.stringify(plot_obj.plant_names)+"' data-subplot_names='"+JSON.stringify(plot_obj.subplots_names)+"' type='checkbox' name='add_trial_treatment_input'/></td></tr>";
                 }
-            }
+            });
             html += "</tbody></table>";
         }
         html += "<br/><br/>";
diff --git a/mason/breeders_toolbox/trial/trial_treatments.mas b/mason/breeders_toolbox/trial/trial_treatments.mas
index db5c4b121..0d28b8c33 100644
--- a/mason/breeders_toolbox/trial/trial_treatments.mas
+++ b/mason/breeders_toolbox/trial/trial_treatments.mas
@@ -73,27 +73,29 @@ jQuery(document).ready(function () {
             success: function(response){
                 //console.log(response);
                 var design_hash = response.design;
+                var keys = Object.keys(design_hash);
+                keys.sort();
 
                 var html = "";
                 if(treatment_unit == 'plot'){
                     html += "<table class='table table-hover'><thead><tr><th>plot_name</th><th>accession</th><th>plot_number</th><th>block_number</th><th>rep_number</th><th>is_a_control</th><th>row_number</th><th>col_number</th><th class='table-success'>"+treatment_name+" [Select all <input type='checkbox' name='add_trial_treatment_select_all' />]</th></tr></thead><tbody>";
-                    for (var key in design_hash){
+                    keys.forEach(function(key){
                         var plot_obj = design_hash[key];
                         html += "<tr><td><a href='/stock/"+plot_obj.plot_id+"/view'>"+plot_obj.plot_name+"</a></td><td><a href='/stock/"+plot_obj.accession_id+"/view'>"+plot_obj.accession_name+"</a></td><td>"+plot_obj.plot_number+"</td><td>"+plot_obj.block_number+"</td><td>"+plot_obj.rep_number+"</td><td>"+plot_obj.is_a_control+"</td><td>"+plot_obj.row_number+"</td><td>"+plot_obj.col_number+"</td><td><input data-plot_name='"+plot_obj.plot_name+"' data-trial_treatment='"+treatment_name+"' data-plant_names='"+JSON.stringify(plot_obj.plant_names)+"' data-subplot_names='"+JSON.stringify(plot_obj.subplot_names)+"'  data-tissue_sample_names='"+JSON.stringify(plot_obj.tissue_sample_names)+"' type='checkbox' name='add_trial_treatment_input'/></td></tr>";
-                    }
+                    });
                     html += "</tbody></table>";
                 }
 
                 if(treatment_unit == 'plant'){
                     html += "<table class='table table-hover'><thead><tr><th>plant_name</th><th>accession</th><th>plot_number</th><th>block_number</th><th>rep_number</th><th>is_a_control</th><th>row_number</th><th>col_number</th><th class='table-success'>"+treatment_name+" [Select all <input type='checkbox' name='add_trial_treatment_select_all' />]</th></tr></thead><tbody>";
-                    for (var key in design_hash){
+                    keys.forEach(function(key){
                         var plot_obj = design_hash[key];
                         var plant_names = plot_obj['plant_names'];
                         var plant_ids = plot_obj['plant_ids'];
                         for (var i=0; i<plant_ids.length; i++) {
                             html += "<tr><td><a href='/stock/"+plant_ids[i]+"/view'>"+plant_names[i]+"</a></td><td><a href='/stock/"+plot_obj.accession_id+"/view'>"+plot_obj.accession_name+"</a></td><td>"+plot_obj.plot_number+"</td><td>"+plot_obj.block_number+"</td><td>"+plot_obj.rep_number+"</td><td>"+plot_obj.is_a_control+"</td><td>"+plot_obj.row_number+"</td><td>"+plot_obj.col_number+"</td><td><input data-plant_name='"+plant_names[i]+"' data-trial_treatment='"+treatment_name+"' data-plant_names='"+JSON.stringify(plot_obj.plant_names)+"' data-tissue_sample_names='"+JSON.stringify(plot_obj.tissue_sample_names)+"' type='checkbox' name='add_trial_treatment_input'/></td></tr>";
                         }
-                    }
+                    });
                     html += "</tbody></table>";
                 }
 
@@ -227,7 +229,7 @@ jQuery(document).ready(function () {
                 jQuery("#working_modal").modal("show");
             },
             success: function(response){
-                console.log(response);
+                //console.log(response);
                 jQuery("#working_modal").modal("hide");
                 if (response.error){
                     alert(response.error);
-- 
2.11.4.GIT