Changeset 2091

Timestamp:

Nov 7, 2011, 4:28:37 PM (11 years ago)

Author:

tjeerd@…

Message:

VIS-36 fixed, added field.unit to the fields and show them in the graphs

File:

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

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

@@ -194 +194 @@
         def urlVars = "assayToken="+assay.assayUUID
         try {
-            callUrl = ""+assay.module.url + "/rest/getMeasurements/query?"+urlVars
+            callUrl = ""+assay.module.url + "/rest/getMeasurementMetaData/query?"+urlVars
             def json = moduleCommunicationService.callModuleRestMethodJSON( assay.module.url /* consumer */, callUrl );
-
+            println(callUrl)
             def collection = []
             json.each{ jason ->
@@ -204 +204 @@
             collection.each { field ->
                 // For getting this field from this assay
-                fields << [ "id": createFieldId( id: field, name: field, source: assay.id, type: ""+assay.name), "source": source, "category": ""+assay.name, "name": field ]
+                fields << [ "id": createFieldId( id: field.name, name: field.name, source: ""+assay.id, type: ""+assay.name, unit: (field.unit?:"")), "source": source, "category": ""+assay.name, "name": field.name + (field.unit?" ("+field.unit+")":"")  ]
             }
         } catch(Exception e){
@@ -283 +283 @@
             // This is a single field. Format it and return the result.
             if(type=="domainfields"){
-                fields << [ "id": createFieldId( id: collectionOfFields.name, name: collectionOfFields.name, source: source, type: category ), "source": source, "category": category, "name": collectionOfFields.name ]
+                fields << [ "id": createFieldId( id: collectionOfFields.name, name: collectionOfFields.name, source: source, type: category, unit: (collectionOfFields.unit?:"") ), "source": source, "category": category, "name": collectionOfFields.name + (collectionOfFields.unit?" ("+collectionOfFields.unit+")":"") ]
             }
             if(type=="templatefields"){
-                fields << [ "id": createFieldId( id: collectionOfFields.id.toString(), name: collectionOfFields.name, source: source, type: category ), "source": source, "category": category, "name": collectionOfFields.name ]
+                fields << [ "id": createFieldId( id: collectionOfFields.id.toString(), name: collectionOfFields.name, source: source, type: category, unit: (collectionOfFields.unit?:"") ), "source": source, "category": category, "name": collectionOfFields.name + (collectionOfFields.unit?" ("+collectionOfFields.unit+")":"")]
             }
             return fields
@@ -703 +703 @@
             def return_data = [:]
             return_data[ "type" ] = type
-            return_data.put("yaxis", ["title" : parseFieldId( fields[ valueAxis ] ).name, "unit" : "", "type":valueAxisTypeString ])
-            return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": "", "type":groupAxisTypeString ])
+            return_data.put("yaxis", ["title" : parseFieldId( fields[ valueAxis ] ).name, "unit" : parseFieldId( fields[ valueAxis ] ).unit, "type":valueAxisTypeString ])
+            return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": parseFieldId( fields[ groupAxis ] ).unit, "type":groupAxisTypeString ])
             return_data.put("series", [[
                     "x": groupedData[ groupAxis ].collect { it.toString() },
@@ -717 +717 @@
             def return_data = [:]
             return_data[ "type" ] = type
-            return_data.put("yaxis", ["title" : yName, "unit" : "", "type":valueAxisTypeString ])
-            return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": "", "type":groupAxisTypeString  ])
+            return_data.put("yaxis", ["title" : yName, "unit" : parseFieldId( fields[ valueAxis ] ).unit, "type":valueAxisTypeString ])
+            return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": parseFieldId( fields[ groupAxis ] ).unit, "type":groupAxisTypeString  ])
             return_data.put("series", [[
                 "name": yName,