Changeset 1999

Timestamp:

Sep 6, 2011, 1:55:43 PM (12 years ago)

Author:

taco@…

Message:

Temporary disabled a piece of functionality that was blocking user progress

File:

• trunk/web-app/js/visualization.js (modified) (6 diffs)

trunk/web-app/js/visualization.js

@@ -34 +34 @@
 
                         // Add all fields to the lists
-            var returndata = data.returnData;
-                        $.each( returndata, function( idx, field ) {
+            var returnData = data.returnData;
+                        $.each( returnData, function( idx, field ) {
                                 $( '#rows, #columns' ).append( $( "<option>" ).val( field.id ).text( field.name ) );
                         });
@@ -70 +70 @@
             $( '#types' ).append( $( "<option>" ).val( "" ).text( "[SELECT OPTION]" ) );
                         // Add all fields to the lists
-            var returndata = data.returnData;
-
-                        $.each( returndata, function( idx, field ) {
+            var returnData = data.returnData;
+
+                        $.each( returnData, function( idx, field ) {
                 if(field.name==oldSelect) {
                     intSelect = iOptionNum;
@@ -120 +120 @@
 
                         // Handle erroneous data
-                        if( !checkCorrectData( returndata ) ) {
+                        /*if( !checkCorrectData( data.returnData ) ) {
                                 showError( "Unfortunately the server returned data in a format that we did not expect." );
                                 return;
-                        }
+                        }*/
                         
                         // Retrieve the datapoints from the json object
@@ -130 +130 @@
 
 
-            var returndata = data.returnData;
-                        $.each(returndata.series, function(idx, element ) {
+            var returnData = data.returnData;
+                        $.each(returnData.series, function(idx, element ) {
                                 dataPoints[ dataPoints.length ] = element.y;
                                 series[ series.length ] = { "label": element.name };
                         });
 
-            var xlabel = returndata[ "xaxis" ].unit=="" ? returndata[ "xaxis" ].title : returndata[ "xaxis" ].title + " (" + returndata[ "xaxis" ].unit + ")";
-            var ylabel = returndata[ "yaxis" ].unit=="" ? returndata[ "yaxis" ].title : returndata[ "yaxis" ].title + " (" + returndata[ "yaxis" ].unit + ")";
+            var xlabel = returnData[ "xaxis" ].unit=="" ? returnData[ "xaxis" ].title : returnData[ "xaxis" ].title + " (" + returnData[ "xaxis" ].unit + ")";
+            var ylabel = returnData[ "yaxis" ].unit=="" ? returnData[ "yaxis" ].title : returnData[ "yaxis" ].title + " (" + returnData[ "yaxis" ].unit + ")";
                         
                         // TODO: create a chart based on the data that is sent by the user and the type of chart
@@ -159 +159 @@
                                         xaxis: {
                                                         renderer: $.jqplot.CategoryAxisRenderer,
-                                                        ticks: returndata.x,
+                                                        ticks: returnData.x,
                                                         label: xlabel,
                                                         labelRenderer: $.jqplot.CanvasAxisLabelRenderer
@@ -283 +283 @@
                 url: visualizationUrls[ action ],
                 data: "data=" + JSON.stringify( data ),
-                dataType: "json",
+                dataType: "json"
         }, ajaxParameters ) );
 }