about to make some changes to take advantage of the deferred api

GuyTheFlower · GuyTheFlower · commit 8aba2c05b640 · 2014-02-25T16:43:23.000-08:00
diff --git a/learning_web_proj/angularLearning/app/controllers/reportConfigController.js b/learning_web_proj/angularLearning/app/controllers/reportConfigController.js
@@ -121,21 +121,44 @@ var cntrlFunction = function ($scope, $routeParams, $location, runReportFactory,
         $scope.showprogress = true;
         $scope.progressMessage = 'Getting data... (can take a few minutes)'
         $scope.progressbarState = 100;
-        // TODO: modify this query to run a separate query per product
-        //$scope.products = productConfig.query({}, function() {
-            //console.log("products:" + $scope.products );
-	        $scope.reportData = runReportFactory.query(
+        $scope.products = productConfig.query(function() {
+        	console.log('got the products!');
+        	for (var i=0; i<$scope.products.length; i+=1) {
+        		console.log("  product:" + $scope.products[i]['data']);
+        		//console.log("  keys: " + Object.keys($scope.products[i]));
+        	
+        	$scope.chartObject = runReportFactory.query(
 	                                {'startDate': utcStart, 
 	                                'endDate': utcEnd, 
-	                                'reportResolution': reportResolution}, function() {
+	                                'reportResolution': reportResolution,
+	                                'product': $scope.products[i]['data']}, function() {
 	            var i, j, row, chartData;
-	            chartData = restructData($scope.reportData);
-	            $scope.chartObject = chartData;
+	            //chartData = restructData($scope.reportData);
+	            //$scope.chartObject = $scope.reportData;
 	            console.log('chartObject');
-	            console.log(JSON.stringify(chartData));
+	            console.log(JSON.stringify($scope.chartObject));
 	            $scope.showprogress = false;
 	        });
-        //) 
+	        }
+        	
+        	
+        });
+        // TODO: modify this query to run a separate query per product
+        // $scope.products = productConfig.query( function() {
+            // console.log("products:" + $scope.products );
+	        // $scope.reportData = runReportFactory.query(
+	                                // {'startDate': utcStart, 
+	                                // 'endDate': utcEnd, 
+	                                // 'reportResolution': reportResolution}, function() {
+	            // var i, j, row, chartData;
+	            // console.log("report data: " + $scope.reportData);
+	            // //chartData = restructData($scope.reportData);
+	            // $scope.chartObject = $scope.reportData;
+	            // console.log('chartObject');
+	            // console.log(JSON.stringify(chartData));
+	            // $scope.showprogress = false;
+	        // });
+        // ) ;
     };
     
     function restructData(inData) {
diff --git a/learning_web_proj/angularLearning/app/factories/esriStatsFactory.js b/learning_web_proj/angularLearning/app/factories/esriStatsFactory.js
@@ -61,7 +61,10 @@ esriStatsServices.factory('runReportFactory', ['$resource',
             baseUrl + 'report/:st/:ed/:res', 
                 {st:'@startDate', 
                  ed: '@endDate',
-                 res: '@reportResolution'}
+                 res: '@reportResolution'}, 
+                 {
+                 	query: {method: 'GET', params: {}, isArray: false}
+                 }
         );
 }]);
 
