Merge 20.6 to 20.7

labkey-tchad · labkey-tchad · commit 78eca0929ae9 · 2020-09-03T13:44:55.000-07:00
diff --git a/LDK/resources/web/LDK/StoreUtils.js b/LDK/resources/web/LDK/StoreUtils.js
@@ -60,6 +60,7 @@ LDK.StoreUtils = new function(){
          * @param config.fileName
          * @param config.labelProperty
          * @param config.skippedColumns
+         * @param config.includeDescription
          */
         createExcelTemplate: function(config){
             Ext4.applyIf(config, {
@@ -72,7 +73,16 @@ LDK.StoreUtils = new function(){
                     if (config.skippedColumns && Ext4.Array.contains(config.skippedColumns, field.name))
                         return;
 
-                    header.push(field[config.labelProperty]);
+                    //Sending label property and comment in case of including description
+                    if (config.includeDescription){
+                        header.push({
+                            value:       field[config.labelProperty],
+                            cellComment: field['description']
+                        });
+                    }
+                    else{
+                        header.push(field[config.labelProperty]);
+                    }
                 }
             }, this);
 
diff --git a/LDK/resources/web/LDK/Utils.js b/LDK/resources/web/LDK/Utils.js
@@ -538,7 +538,7 @@ LDK.Utils = new function(){
             window.location = LABKEY.ActionURL.buildURL('ldk', 'updateQuery', null, params);
         },
 
-        splitIds: function(subjectArray, unsorted){
+        splitIds: function(subjectArray, unsorted, preserveDuplicates){
             if (!subjectArray){
                 return [];
             }
@@ -556,7 +556,9 @@ LDK.Utils = new function(){
             }
 
             if (subjectArray.length > 0) {
-                subjectArray = Ext4.unique(subjectArray);
+                if (!preserveDuplicates) {
+                    subjectArray = Ext4.unique(subjectArray);
+                }
                 if (!unsorted) {
                     subjectArray.sort();
                 }
diff --git a/LDK/resources/web/LDK/panel/TabbedReportPanel.js b/LDK/resources/web/LDK/panel/TabbedReportPanel.js
@@ -548,7 +548,7 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
                 }, this);
             }
         }
-        
+
         return subjects;
     },
 
@@ -764,19 +764,34 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
             scope: this
         };
 
-        //special case these two properties because they are common
-        if (tab.report.viewName){
-            queryConfig.viewName = tab.report.viewName;
-        }
-
-        if (tab.report.containerPath){
-            queryConfig.containerPath = tab.report.containerPath;
-        }
-
-        //allow any other supported properties to be applied through here
-        if (tab.report.queryConfig){
-            Ext4.apply(queryConfig, tab.report.queryConfig);
-        }
+        //
+        // Define a list of configuration options.  These can be set on the report tab to override default values.
+        // This list can be obtained by going to the URL for the
+        // LABKEY.QueryWebPart API, and looking in the config summary table.  If you'd like to get it programatically,   // https://www.labkey.org/download/clientapi_docs/javascript-api/symbols/LABKEY.QueryWebPart.html#constructor
+        // run the function commented out to the right of this message (you'll need to load jQuery first).  It will      //
+        // output an array of configuration options.                                                                     //getConfigOptions = function() {
+        //                                                                                                               //    var summaryTable = jQuery('table.summaryTable')
+        var configOptions = [                                                                                            //            // Filter for the table with the config object
+            "aggregates",             "allowChooseQuery",     "allowChooseView",        "bodyClass",                     //            .filter(function(index,element){ return jQuery(element).attr("summary").match(/config object/); });
+            "buttonBar",              "buttonBarPosition",    "containerFilter",        "containerPath",                 //
+            "dataRegionName",         "deleteURL",            "detailsURL",             "errorType",                     //    var options = [];
+            "failure",                "filters",              "frame",                  "importURL",                     //
+            "insertURL",              "linkTarget",           "maskEl",                 "maxRows",                       //    var configRegex = /^config\./;
+            "metadata",               "offset",               "parameters",             "queryName",                     //    summaryTable.find('td.nameDescription a').each(function(index,element){
+            "removeableFilters",      "removeableSort",       "renderTo",               "reportId",                      //        var configOption = jQuery(element).text();
+            "schemaName",             "scope",                "shadeAlternatingRows",   "showBorders",                   //
+            "showDeleteButton",       "showDetailsColumn",    "showExportButtons",      "showInsertNewButton",           //
+            "showPagination",         "showRecordSelectors",  "showReports",            "showRows",                      //        if (configOption.match(configRegex)) {
+            "showSurroundingBorder",  "showUpdateColumn",     "showViewPanel",          "sort",                          //            options.push(configOption.replace(configRegex, ''));
+            "sql",                    "success",              "suppressRenderErrors",   "timeout",                       //        }
+            "title",                  "titleHref",            "updateURL",              "viewName"                       //    });
+        ];                                                                                                               //
+
+        Ext4.each(configOptions, function(option, index, list) {
+            if (option in tab.report) {
+                queryConfig[option] = tab.report[option];
+            }
+        });
 
         tab.add({
             xtype: 'ldk-querycmp',
diff --git a/LDK/resources/web/LDK/ux/DateTimeField.js b/LDK/resources/web/LDK/ux/DateTimeField.js
@@ -165,6 +165,12 @@ Ext4.define('Ext.ux.form.field.DateTime', {
         }, me.timeConfig));
         me.items.push(me.timeField);
 
+        // Allow times in the style of "1423" to be accepted by the time field, instead of requiring colons
+        // for 24 hour fields.
+        var formats = me.timeField.altFormats.split("|");
+        formats.push("Hi");
+        me.timeField.altFormats = formats.join("|");
+
         for (; i < me.items.length; i++) {
             if(me.items[i].xtype == 'splitter')
                 continue;
diff --git a/LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java b/LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java
@@ -190,7 +190,6 @@ public void addRecordsToAssayTemplate(String[][] data, List<String> expectedColu
         }
 
         _test.waitForText("Sample Information");
-        _test._ext4Helper.waitForMaskToDisappear();
         _test.waitAndClick(Ext4Helper.Locators.ext4Button("Add From Spreadsheet"));
         _test.waitForElement(Ext4Helper.Locators.window("Spreadsheet Import"));
 
diff --git a/laboratory/resources/web/laboratory/panel/AbstractAssayPanel.js b/laboratory/resources/web/laboratory/panel/AbstractAssayPanel.js
@@ -584,7 +584,7 @@ Ext4.define('Laboratory.panel.AbstractAssayPanel', {
                                 importMethodToggle: importMethod
                             });
 
-                            imf.fireEvent('change', this, imf.getValues, current);
+                            imf.fireEvent('change', this, imf.getValue(), current);
                         }
 
                         var target = this.down('#templatePreviewPanel');
diff --git a/laboratory/resources/web/laboratory/panel/AssayTemplatePanel.js b/laboratory/resources/web/laboratory/panel/AssayTemplatePanel.js
@@ -79,13 +79,13 @@ Ext4.define('Laboratory.panel.AssayTemplatePanel', {
         }, this);
     },
 
-    appendDownloadMenuItems: function(){
+    appendDownloadMenuItems: function() {
         var btn = this.down('#downloadBtn');
         if(!this.templateMetadata.hideDownloadBtn)
             btn.setVisible(true);
     },
 
-    validateForm: function(){
+    validateForm: function() {
         var title = this.down('#templateTitle').getValue();
         if (!title){
             Ext4.Msg.alert('Error', 'Must choose a name for this run');
@@ -267,8 +267,18 @@ Ext4.define('Laboratory.panel.AssayTemplatePanel', {
             scope: this,
             failure: LDK.Utils.getErrorCallback(),
             success: function(results){
-                if (results.rows.length)
-                    this.setTemplate(results.rows[0], true);
+                if (results.rows.length) {
+                    var row = results.rows[0];
+                    if (row.importMethod) {
+                        this.selectedMethod = this.getImportMethodByName(row.importMethod);
+                        var field = this.down('#templateImportMethod');
+                        if (field) {
+                            field.setValue(this.selectedMethod.name);
+                        }
+                        this.toggleImportMethod();
+                    }
+                    this.setTemplate(row, true);
+                }
             }
         })
     },
@@ -456,4 +466,4 @@ Ext4.define('Laboratory.panel.AssayTemplatePanel', {
             resultFields.setVisible(false);
         }
     },
-});
+});
diff --git a/laboratory/resources/web/laboratory/panel/WellLayoutPanel.js b/laboratory/resources/web/laboratory/panel/WellLayoutPanel.js
@@ -50,13 +50,14 @@ Ext4.define('Laboratory.ext.WellLayoutPanel', {
     },
 
     drawWell: function(){
-        if (!this.store.getCount()){
+        var platePanel = this.down('#plate');
+        var legendPanel = this.down('#legend');
+
+        if (!this.store.getCount() || !platePanel || !legendPanel){
             this.store.on('load', this.drawWell, this, {single: true});
             return;
         }
 
-        var platePanel = this.down('#plate');
-        var legendPanel = this.down('#legend');
         var notAssigned = 0;
         var unknownWells = [];
 

Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ LDK.Utils = new function(){`
`538`	`538`	`window.location = LABKEY.ActionURL.buildURL('ldk', 'updateQuery', null, params);`
`539`	`539`	`},`
`540`	`540`
`541`		`- splitIds: function(subjectArray, unsorted){`
	`541`	`+ splitIds: function(subjectArray, unsorted, preserveDuplicates){`
`542`	`542`	`if (!subjectArray){`
`543`	`543`	`return [];`
`544`	`544`	`}`
`@@ -556,7 +556,9 @@ LDK.Utils = new function(){`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`if (subjectArray.length > 0) {`
`559`		`- subjectArray = Ext4.unique(subjectArray);`
	`559`	`+ if (!preserveDuplicates) {`
	`560`	`+ subjectArray = Ext4.unique(subjectArray);`
	`561`	`+ }`
`560`	`562`	`if (!unsorted) {`
`561`	`563`	`subjectArray.sort();`
`562`	`564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,6 @@ public void addRecordsToAssayTemplate(String[][] data, List<String> expectedColu`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`_test.waitForText("Sample Information");`
`193`		`- _test._ext4Helper.waitForMaskToDisappear();`
`194`	`193`	`_test.waitAndClick(Ext4Helper.Locators.ext4Button("Add From Spreadsheet"));`
`195`	`194`	`_test.waitForElement(Ext4Helper.Locators.window("Spreadsheet Import"));`
`196`	`195`
Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ Ext4.define('Laboratory.panel.AbstractAssayPanel', {`
`584`	`584`	`importMethodToggle: importMethod`
`585`	`585`	`});`
`586`	`586`
`587`		`- imf.fireEvent('change', this, imf.getValues, current);`
	`587`	`+ imf.fireEvent('change', this, imf.getValue(), current);`
`588`	`588`	`}`
`589`	`589`
`590`	`590`	`var target = this.down('#templatePreviewPanel');`