Changeset 2054

Timestamp:

Oct 10, 2011, 12:01:51 PM (11 years ago)

Author:

taco@…

Message:

visualization/VisualizeController.groovy, getFields request now checks whether the GSCF-related fields it would return, refer to any data other than null, and no longer returns those fields that do refer only to null

File:

• trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy

@@ -230 +230 @@
                 if( type == "domainfields" ) 
                         collection = domainObjectCallback( category )?.giveDomainFields();
-                else 
+                else
                         collection = templateObjectCallback( category, study )?.template?.fields
 
@@ -237 +237 @@
         // Formatting the data
         fields += formatGSCFFields(type, collection, source, category)
+
+        // Here we will remove those fields, whose set of datapoints only contain null
+        def fieldsToBeRemoved = []
+        fields.each{ field ->
+            def fieldData = getFieldData( study, study.samples, field.id )
+            fieldData.removeAll([null])
+            if(fieldData==[]){
+                // Field only contained nulls, so don't show it as a visualization option
+                fieldsToBeRemoved << field
+            }
+        }
+        fields.removeAll(fieldsToBeRemoved)
 
         return fields