Merge pull request #71 from LabKey/fb_merge_discvr-20.11

Merge discvr-20.11 to develop

Author: bbimber

LDK/resources/web/LDK/field/SimpleCombo.js

@@ -12,6 +12,8 @@ Ext4.define('LDK.form.field.SimpleCombo', {
     typeAhead: true,
     queryMode: 'local',
     triggerAction: 'all',
+    joinReturnValue: false,
+    delimiter: ';',
 
     initComponent: function(){
         Ext4.apply(this, {
@@ -48,5 +50,28 @@ Ext4.define('LDK.form.field.SimpleCombo', {
         vals = Ext4.unique(vals);
 
         return vals;
+    },
+
+    getSubmitValue: function(){
+        var val = this.callParent(arguments);
+        if (!this.joinReturnValue) {
+            return val;
+        }
+
+        return val && val.length ? val.join(this.delimiter) : null;
+    },
+
+    getToolParameterValue : function(){
+        return this.getSubmitValue();
+    },
+
+    setValue: function(val) {
+        if (this.multiSelect && val && Ext4.isString(val)) {
+            val = val.split(this.delimiter);
+            this.callParent([val]);
+        }
+        else {
+            this.callParent(arguments);
+        }
     }
 });

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -729,6 +729,7 @@ private void tabbedReportToggleTest()
 
         Ext4ComboRef field = _ext4Helper.queryOne("#projectField", Ext4ComboRef.class);
         field.setComboByDisplayValue("Project1");
+        assertNotNull(field.getValue());
 
         // we toggle back to a panel with a single tab, where that tab has already been loaded.
         // since the filter set has changed, this tab should update to reflect that

laboratory/resources/web/laboratory/panel/ProjectFilterType.js

@@ -52,11 +52,11 @@ Ext4.define('Laboratory.panel.ProjectFilterType', {
                 items: [{
                     boxLabel: 'Include if subject was ever a member of the project/group',
                     inputValue: 'allProjects',
-                    checked: ctx.projectFilterMode != 'overlappingProjects'
+                    checked: ctx.projectFilterMode !== 'overlappingProjects'
                 },{
                     boxLabel: 'Include only if the sample date overlaps with assignment to that project/group',
                     inputValue: 'overlappingProjects',
-                    checked: ctx.projectFilterMode == 'overlappingProjects'
+                    checked: ctx.projectFilterMode === 'overlappingProjects'
                 }]
             }]
         });
@@ -79,9 +79,9 @@ Ext4.define('Laboratory.panel.ProjectFilterType', {
 
         var filters = this.getFilters();
         var report = tab.report;
-        var projectFieldName = (filters.projectFilterMode == 'overlappingProjects') ? report.overlappingProjectsFieldName : report.allProjectsFieldName;
+        var projectFieldName = (filters.projectFilterMode === 'overlappingProjects') ? report.overlappingProjectsFieldName : report.allProjectsFieldName;
         if (!projectFieldName){
-            if (filters.projectFilterMode == 'overlappingProjects' && !report.overlappingProjectsFieldName){
+            if (filters.projectFilterMode === 'overlappingProjects' && !report.overlappingProjectsFieldName){
                 projectFieldName = report.allProjectsFieldName;
 
                 if (projectFieldName)
@@ -100,15 +100,16 @@ Ext4.define('Laboratory.panel.ProjectFilterType', {
             }
         }
 
-        projectFieldName = projectFieldName + '/' + filters.projects[0] + '::lastStartDate';
+        var fieldName = filters.projects[0].replace(/\//g, '$S');
+        projectFieldName = projectFieldName + '/' + fieldName + '::lastStartDate';
         filterArray.nonRemovable.push(LABKEY.Filter.create(projectFieldName, null, LABKEY.Filter.Types.NONBLANK));
 
         return filterArray;
     },
 
     isValid: function(){
         var val = this.down('#projectField').getValue();
-        if(!val || !val.length){
+        if (!val || !val.length){
             return false;
         }
 
@@ -139,10 +140,11 @@ Ext4.define('Laboratory.panel.ProjectFilterType', {
 
     getProjects: function(){
         var projectArray = this.down('#projectField').getValue();
-        if (projectArray || !Ext4.isArray(projectArray))
+        if (projectArray && !Ext4.isArray(projectArray)) {
             projectArray = [projectArray];
+        }
 
-        if (projectArray.length > 0){
+        if (projectArray && projectArray.length > 0){
             projectArray = Ext4.unique(projectArray);
             projectArray.sort();
         }