Changeset 2010

Timestamp:

08-09-11 16:13:40 (3 years ago)

Author:

robert@…

Message:

- Changed visualization button to a real button
- Serverside - Clientside communication is now done with HTTP params instead of JSON

Location:

trunk

Files:

• grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (4 diffs)
• grails-app/views/visualize/index.gsp (modified) (1 diff)
• web-app/css/visualization.css (modified) (1 diff)
• web-app/js/visualization.js (modified) (4 diffs)

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

@@ -203 +203 @@
         def fields = []
         def source = "GSCF"
-
-                def domainObjects = [ 
-                        "subjects": Subject, 
-                        "events": Event, 
-                        "samples": Sample, 
-                        "samplingEvents": SamplingEvent, 
-                        "assays": Assay, 
-                        "studies": Study ]
-                
-                def templateObjects = [ 
-                        "subjects": study?.samples?.parentSubject, 
-                        "events": study?.samples?.parentEventGroup?.events, 
-                        "samples": study?.samples, 
-                        "samplingEvents": study?.samples?.parentEventGroup?.samplingEvents, 
-                        "assays": study?.assays, 
-                        "studies": study ]
                 
                 if( type == "domainfields" ) 
-                        collection = domainObjects[ category ]?.giveDomainFields();
+                        collection = domainObjectCallback( category )?.giveDomainFields();
                 else 
-                        collection = templateObjects[ category ]?.template?.fields
+                        collection = templateObjectCallback( category, study )?.template?.fields
 
         collection?.unique()
@@ -326 +310 @@
                 def studyIds, rowIds, columnIds, visualizationType;
                 
-                def inputData = params.get( 'data' );
-                try{
-                        def input_object = JSON.parse(inputData)
-                        
-                        studyIds = input_object.get('studies')*.id
-                        rowIds = input_object.get('rows')*.id
-                        columnIds = input_object.get('columns')*.id
-                        visualizationType = "barchart"
-                } catch(Exception e) {
-            /* TODO: Find a way to handle these kinds of exceptions without breaking the user interface.
-                Doing things in this way results in the user interface getting a 400.
-                        returnError(400, "An error occured while retrieving the user input")
-            infoMessage = "An error occured while retrieving the user input."
-                        log.error("VisualizationController: parseGetDataParams: "+e)
-            return sendInfoMessage()
-            */
-                }
+                studyIds = params.list( 'study' );
+                rowIds = params.list( 'rows' );
+                columnIds = params.list( 'columns' );
+                visualizationType = params.get( 'types')
 
                 return [ "studyIds" : studyIds, "rowIds": rowIds, "columnIds": columnIds, "visualizationType": visualizationType ];
@@ -618 +589 @@
         
         /**
+        * Returns the domain object that should be used with the given entity string 
+        *
+        * For example:
+        *               What object should be consulted if the user asks for "studies"
+        *               Response: Study
+        * @return       Domain object that should be used with the given entity string
+        */
+   protected def domainObjectCallback( String entity ) {
+           switch( entity ) {
+                   case "Study":
+                   case "studies":
+                           return Study
+                   case "Subject":
+                   case "subjects":
+                           return Subject
+                   case "Sample":
+                   case "samples":
+                           return Sample
+                   case "Event":
+                   case "events":
+                        return Event
+                   case "SamplingEvent":
+                   case "samplingEvents":
+                           return SamplingEvent
+                   case "Assay":
+                   case "assays":
+                                return Assay
+           }
+   }
+
+   /**
+   * Returns the objects within the given study that should be used with the given entity string
+   *
+   * For example:
+   *            What object should be consulted if the user asks for "samples"
+   *            Response: study.samples
+   * @return    List of domain objects that should be used with the given entity string
+   */
+  protected def templateObjectCallback( String entity, Study study ) {
+          switch( entity ) {
+                  case "Study":
+                  case "studies":
+                          return study
+                  case "Subject":
+                  case "subjects":
+                          return study?.samples?.parentSubject
+                  case "Sample":
+                  case "samples":
+                          return study?.samples
+                  case "Event":
+                  case "events":
+                           return study?.samples?.parentEventGroup?.events
+                  case "SamplingEvent":
+                  case "samplingEvents":
+                          return study?.samples?.parentEventGroup?.samplingEvents
+                  case "Assay":
+                  case "assays":
+                                  return study?.assays
+          }
+  }
+        
+        /**
          * Computes the mean value and Standard Error of the mean (SEM) for the given values
          * @param values        List of values to compute the mean and SEM for. Strings and null 
@@ -799 +832 @@
                 // Domainfield or memberclass
                 try{
-                    switch( parsedField.type ) {
-                        case "Study":
-                        case "studies":
-                            return determineCategoryFromClass(Study.class.getDeclaredField(parsedField.name).type)
-                            break
-                        case "Subject":
-                        case "subjects":
-                            return determineCategoryFromClass(Subject.class.getDeclaredField(parsedField.name).type)
-                            break
-                        case "Sample":
-                        case "samples":
-                            return determineCategoryFromClass(Sample.class.getDeclaredField(parsedField.name).type)
-                            break
-                        case "Event":
-                        case "events":
-                            return determineCategoryFromClass(Event.class.getDeclaredField(parsedField.name).type)
-                            break
-                        case "SamplingEvent":
-                        case "samplingEvents":
-                            return determineCategoryFromClass(SamplingEvent.class.getDeclaredField(parsedField.name).type)
-                            break
-                        case "Assay":
-                        case "assays":
-                            return determineCategoryFromClass(Assay.class.getDeclaredField(parsedField.name).type)
-                            break
-                    }
+                                        return determineCategoryFromClass(domainObjectCallback( parsedField.type )?.fields[parsedField.name].type)
                 } catch(Exception e){
                     log.error("VisualizationController: determineFieldType: "+e)

trunk/grails-app/views/visualize/index.gsp

@@ -66 +66 @@
                 <div class="menu_arrow"> </div>
                 <div class="menu_item" id="menu_go">
-                    <div id="button_visualize" onClick="visualize();">Visualize</div>
+                    <button id="button_visualize" onClick="visualize(); return false;" >Visualize</button>
                     <input type="checkbox" name="autovis" id="autovis" CHECKED/><span style="font-size: small;">auto</span></div>
                 <div class="menu_spacer"> </div>

trunk/web-app/css/visualization.css

@@ -146 +146 @@
 
 #button_visualize {
-    border-style: outset;
-    border-width: 2px;
-    border-color: gray;
     margin: 4px;
     padding: 10px;

trunk/web-app/js/visualization.js

@@ -17 +17 @@
     );
     $("#menu_go").unbind('mouseover').unbind('mouseout');
-
-    $('#button_visualize').mousedown(function() {
-        $('#button_visualize').css("border-style", 'inset');
-    });
-    $('#button_visualize').mouseup(function() {
-        $('#button_visualize').css("border-style", 'outset');
-    });
-
 });
 
@@ -48 +40 @@
                 }
 
+                clearStep(".menu_item");
+                
                 // Add all fields to the lists
-                var returnData = data.returnData;
-                $.each( returnData, function( idx, field ) {
-                    $( '#rows, #columns' ).append( $( "<option>" ).val( field.id ).text( field.name ) );
-                });
-
-                clearStep(".menu_item");
-                $( "#menu_study" ).find("div.menu_item_info").html("<br />"+$( '#study option:selected' ).text());
-                $( "#menu_study" ).addClass("menu_item_done");
-                $( "#menu_row, #menu_column" ).addClass("menu_item_fill");
+                if( data.returnData ) {
+                        var returnData = data.returnData;
+                        $.each( returnData, function( idx, field ) {
+                            $( '#rows, #columns' ).append( $( "<option>" ).val( field.id ).text( field.name ) );
+                        });
+                        
+                        $( "#menu_study" ).find("div.menu_item_info").html("<br />"+$( '#study option:selected' ).text());
+                        $( "#menu_study" ).addClass("menu_item_done");
+                        $( "#menu_row, #menu_column" ).addClass("menu_item_fill");
+                }
             }
         },'menu_study');
@@ -280 +275 @@
  */
 function gatherData( type ) {
-        var data = {};
-
-        // different types of request require different data arrays
-        // However, some data is required for all types. For that reason, 
-        // the fallthrough option in the switch statement is used.
-        switch( type ) {
-                case "getData":
-                        var typeElement = $( '#type' );
-                        data[ "type" ] = { "id": typeElement.val() };                                   
-                case "getVisualizationTypes":
-                        var rowsElement = $( '#rows' );
-                        var columnsElement = $( '#columns' );
-                        data[ "rows" ] = [
-                                { "id": rowsElement.val() }
-                        ];                                      
-                        data[ "columns" ] = [
-                                        { "id": columnsElement.val() }
-                        ];                                      
-                case "getFields":
-                        var studyElement = $( '#study' );
-                        data[ "studies" ] = [
-                                { "id": studyElement.val() }
-                        ];                                      
-                        
-                case "getStudies":
-        }
-
-        return data;
+        // For simplicity, we send the whole form to the server. In the
+        // future this might be enhanced, based on the given type
+        return $( 'form#visualizationForm' ).serialize();
 }
 
@@ -347 +317 @@
         $.ajax($.extend({
                 url: visualizationUrls[ action ],
-                data: "data=" + JSON.stringify( data ),
+                data: data,
                 dataType: "json",
         }, ajaxParameters ) );