climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1494191 - /incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/ParameterSelectCtrl.js
Date Tue, 18 Jun 2013 16:38:17 GMT
Author: joyce
Date: Tue Jun 18 16:38:17 2013
New Revision: 1494191

URL: http://svn.apache.org/r1494191
Log:
Resolve CLIMATE-119 - Make ParameterSelectCtrl use Angular HTTP

- Switch the jQuery AJAX call to an Angular JSONP call to match the new
  backend expectations.

Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/ParameterSelectCtrl.js

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/ParameterSelectCtrl.js
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/ParameterSelectCtrl.js?rev=1494191&r1=1494190&r2=1494191&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/ParameterSelectCtrl.js (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/ParameterSelectCtrl.js Tue
Jun 18 16:38:17 2013
@@ -133,52 +133,46 @@ function($rootScope, $scope, $http, $tim
 			}
 		};
 
-		// You might wonder why this is using a jQuery ajax call instead of a built
-		// in $http.post call. The reason would be that it wasn't working with the 
-		// $http.post call but it is with this. So...there you go! This should be
-		// changed eventually!!
-		$.ajax({
-			type: 'POST',
-			url: $rootScope.baseURL + '/rcmes/run/', 
-			data: { 
-				'obsDatasetId'     : $scope.datasets[obsIndex]['id'],
-				'obsParameterId'   : $scope.datasets[obsIndex]['param'],
-				'startTime'        : $scope.displayParams.start + " 00:00:00",
-				'endTime'          : $scope.displayParams.end + " 00:00:00",
-				'latMin'           : $scope.displayParams.latMin,
-				'latMax'           : $scope.displayParams.latMax,
-				'lonMin'           : $scope.displayParams.lonMin,
-				'lonMax'           : $scope.displayParams.lonMax,
-				'filelist'         : $scope.datasets[modelIndex]['id'],
-				'modelVarName'     : $scope.datasets[modelIndex]['param'],
-				'modelTimeVarName' : $scope.datasets[modelIndex]['time'],
-				'modelLatVarName'  : $scope.datasets[modelIndex]['lat'],
-				'modelLonVarName'  : $scope.datasets[modelIndex]['lon'],
-				'regridOption'     : 'model',
-				'timeRegridOption' : evaluationSettings.getSettings().temporal.selected,
-				'metricOption'     : metricToRun,
-			},
-			success: function(data) {
-				var comp = data['comparisonPath'].split('/');
-				var model = data['modelPath'].split('/');
-				var obs = data['obsPath'].split('/');
-
-				$rootScope.evalResults = {};
-				$rootScope.evalResults.comparisonPath = comp[comp.length - 1];
-				$rootScope.evalResults.modelPath = model[model.length - 1];
-				$rootScope.evalResults.obsPath = obs[obs.length - 1];
-
-				$scope.runningEval = false;
-
-				$timeout(function() {
-					$('#evaluationResults').trigger('modalOpen', true, true);
-				}, 100);
-			},
-			error: function(xhr, status, error) {
-				$scope.runningEval = false;
-			},
+		var data = {params: { 
+			'obsDatasetId'     : $scope.datasets[obsIndex]['id'],
+			'obsParameterId'   : $scope.datasets[obsIndex]['param'],
+			'startTime'        : $scope.displayParams.start + " 00:00:00",
+			'endTime'          : $scope.displayParams.end + " 00:00:00",
+			'latMin'           : $scope.displayParams.latMin,
+			'latMax'           : $scope.displayParams.latMax,
+			'lonMin'           : $scope.displayParams.lonMin,
+			'lonMax'           : $scope.displayParams.lonMax,
+			'filelist'         : $scope.datasets[modelIndex]['id'],
+			'modelVarName'     : $scope.datasets[modelIndex]['param'],
+			'modelTimeVarName' : $scope.datasets[modelIndex]['time'],
+			'modelLatVarName'  : $scope.datasets[modelIndex]['lat'],
+			'modelLonVarName'  : $scope.datasets[modelIndex]['lon'],
+			'regridOption'     : 'model',
+			'timeRegridOption' : evaluationSettings.getSettings().temporal.selected,
+			'metricOption'     : metricToRun,
+			'callback'         : 'JSON_CALLBACK',
+		}};
+
+		$http.jsonp($rootScope.baseURL + '/rcmes/run/', data).
+		success(function(data) {
+			var comp = data['comparisonPath'].split('/');
+			var model = data['modelPath'].split('/');
+			var obs = data['obsPath'].split('/');
+
+			$rootScope.evalResults = {};
+			$rootScope.evalResults.comparisonPath = comp[comp.length - 1];
+			$rootScope.evalResults.modelPath = model[model.length - 1];
+			$rootScope.evalResults.obsPath = obs[obs.length - 1];
+
+			$scope.runningEval = false;
+
+			$timeout(function() {
+				$('#evaluationResults').trigger('modalOpen', true, true);
+			}, 100);
+		}).error(function() {
+			$scope.runningEval = false;
 		});
-	}
+	};
 
 	// Check the Parameter selection boxes after the user has changed input to ensure that valid
 	// values were entered



Mime
View raw message