Changeset 2018

Timestamp:

Sep 15, 2011, 12:10:13 PM (12 years ago)

Author:

tjeerd@…

Message:

VIS-16 and VIS-14. Changes in VisualizeController? (VIS-16), index.gsp (VIS-14), visualization.css (both) and visualization.js (both)

Location:

trunk

Files:

• grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (2 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

@@ -119 +119 @@
         }
 
-                return sendResults(fields)
+                return sendResults(['studyIds': studies, 'fields': fields])
         }
 
@@ -152 +152 @@
         def types = determineVisualizationTypes(rowType, columnType)
 
-        println "types: "+types
+        println "types: "+types+", determined this based on "+rowType+" and "+columnType
         return sendResults(types)
         }

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

@@ -80 +80 @@
             <h1>Visualize your study</h1>
 
-            <div id="message_counter" onclick="errorDiv(); return false;">0</div>
+            <div id="message_counter" onClick="errorDiv(); return false;">0</div>
 
             <div id="message_container">

trunk/web-app/css/visualization.css

@@ -19 +19 @@
     padding: 5px 35px;
     margin: 2px 10px;
-    display: none;
 }
 

trunk/web-app/js/visualization.js

@@ -25 +25 @@
 function changeStudy() {
     $( "#menu_study" ).find("div.formulier").hide();
+    $( '#rows, #columns, #types' ).empty();
+    clearStep(".menu_item");
+
+    if( visualization )
+        visualization.destroy();
+
+    $( "#menu_study" ).addClass("menu_item_fill");
 
     if($( '#study option:selected' ).val()!="") {
@@ -33 +40 @@
             "errorMessage": "An error occurred while retrieving variables from the server. Please try again or contact a system administrator.",
             "success": function( data, textStatus, jqXHR ) {
-                // Remove all previous entries from the list
-                $( '#rows, #columns, #types' ).empty();
-
-                if( visualization )
-                    visualization.destroy();
+
 
                 if(data.infoMessage) {
@@ -43 +46 @@
                 }
 
-                clearStep(".menu_item");
-                
                 // Add all fields to the lists
-                if( data.returnData ) {
-                    var returnData = data.returnData;
+                if( data.returnData.studyIds==$( '#study option:selected' ).val() ) {
+                    var returnData = data.returnData.fields;
+
+                    clearStep("#menu_study");
 
                     var prevCat = "";
@@ -66 +69 @@
             }
         },'menu_study');
-    } else {
-        $( '#rows, #columns, #types' ).empty();
-        clearStep(".menu_item");
-
-        $( "#menu_study" ).addClass("menu_item_fill");
     }
 }