Changeset 2056

Timestamp:

Oct 13, 2011, 12:57:58 PM (12 years ago)

Author:

taco@…

Message:

visualization/VisualizeController.groovy, 'formatData' function, Fixed bug that really bugged me, which occurred when sorting the 'valueAxis' or 'data' items, based on the sorting of the 'groupAxis'

File:

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

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

@@ -332 +332 @@
             groupedData = groupFieldData( inputData.visualizationType, data ); // Don't indicate axis ordering, standard <"x", "y"> will be used
         }
-                
         // Format data so it can be rendered as JSON
         def returnData
@@ -344 +343 @@
             returnData = formatData( inputData.visualizationType, groupedData, fields, groupAxisType, valueAxisType ); // Don't indicate axis ordering, standard <"x", "y"> will be used
         }
+        println "returnData: "+returnData
         return sendResults(returnData)
         }
@@ -674 +674 @@
                 // We want to sort the data based on the group-axis, but keep the values on the value-axis in sync. 
                 // The only way seems to be to combine data from both axes.
-                def combined = []
-                groupedData[ groupAxis ].eachWithIndex { group, i ->
-                        combined << [ "group": group, "value": groupedData[ valueAxis ][ i ] ]
-                }
-                combined.sort { it.group }
-                
+        def combined = []
+        if(type=="table"){
+            groupedData[ groupAxis ].eachWithIndex { group, i ->
+                combined << [ "group": group, "data": groupedData[ 'data' ][ i ] ]
+            }
+            combined.sort { it.group }
+            groupedData[groupAxis] = renderTimesAndDatesHumanReadable(combined*.group, groupAxisType)
+            groupedData[valueAxis] = renderTimesAndDatesHumanReadable(groupedData[valueAxis], valueAxisType)
+            groupedData["data"] = combined*.data
+        } else {
+            groupedData[ groupAxis ].eachWithIndex { group, i ->
+                combined << [ "group": group, "value": groupedData[ valueAxis ][ i ] ]
+            }
+            combined.sort { it.group }
+            groupedData[groupAxis] = renderTimesAndDatesHumanReadable(combined*.group, groupAxisType)
+            groupedData[valueAxis] = renderTimesAndDatesHumanReadable(combined*.value, valueAxisType)
+        }
+
         // TODO: Handle name and unit of fields correctly
         def valueAxisTypeString = (valueAxisType==CATEGORICALDATA || valueAxisType==DATE || valueAxisType==RELTIME ? "categorical" : "numerical")
         def groupAxisTypeString = (groupAxisType==CATEGORICALDATA || groupAxisType==DATE || groupAxisType==RELTIME ? "categorical" : "numerical")
-        groupedData[groupAxis] = renderTimesAndDatesHumanReadable(combined*.group, groupAxisType)
-        groupedData[valueAxis] = renderTimesAndDatesHumanReadable(combined*.value, valueAxisType)
 
         if(type=="table"){
@@ -725 +735 @@
     def renderTimesAndDatesHumanReadable(data, axisType){
         if(axisType==RELTIME){
+            println "RELTIME"
             data = renderTimesHumanReadable(data)
         }
         if(axisType==DATE){
+            println "DATE"
            data = renderDatesHumanReadable(data)
         }
+        println "NO JOY"
         return data
     }
@@ -741 +754 @@
         def tmpTimeContainer = []
         data. each {
+            println "\t"+it
             if(it instanceof Number) {
                 try{
@@ -762 +776 @@
         def tmpDateContainer = []
         data. each {
+            println "\t"+it
             if(it instanceof Number) {
                 try{