Skip to content

Commit aa93e16

Browse files
GuyTheFlowerGuyTheFlower
committed
committing before I re-work some of the angular controllers.
1 parent 2678e00 commit aa93e16

5 files changed

Lines changed: 112 additions & 30 deletions

File tree

‎learning_web_proj/angularLearning/angular_1.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
<link rel="stylesheet" href="Content/EsriStatsStyles.css">
99

1010
<script src="http://code.angularjs.org/1.2.10/angular.min.js"></script>
11+
<script src="http://code.angularjs.org/1.2.10/angular-resource.min.js"></script>
12+
1113
<script src='//ajax.googleapis.com/ajax/libs/angularjs/1.2.10/angular-route.js'></script>
1214
<script src="app/routes/EsriStatsModule.js"></script>
1315
<script src='app/controllers/backEndConfigCtrl.js'></script>
1416
<script src='app/controllers/reportConfigController.js'></script>
1517
<script src='app/directives/directives.js'></script>
18+
<script src='app/factories/esriStatsFactory.js'></script>
1619
<script src='scripts/ui-bootstrap-tpls-0.10.0.min.js'></script>
1720
</head>
1821
<body>

‎learning_web_proj/angularLearning/app/controllers/backEndConfigCtrl.js‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
22
/*global define */
33

4-
var cntrlFunction = function ($scope, $location, $http) {
4+
var cntrlFunction = function ($scope, $location, $http, usageStats, config) {
55
"use strict";
66
var i, productInfo, users, getListObject;
77

@@ -16,6 +16,18 @@ var cntrlFunction = function ($scope, $location, $http) {
1616
listObj.selected = data[0];
1717
};
1818

19+
listObj.setDataFromService = function(serviceData) {
20+
var i, data, curData;
21+
curData = [];
22+
serviceData.$promise.then(function(data) {
23+
for (i=0; i<data.length; i+=1) {
24+
curData.push(data[i].data);
25+
}
26+
});
27+
listObj.data = curData;
28+
listObj.selected = curData[0];
29+
};
30+
1931
listObj.deleteSelected = function() {
2032
testfunc();
2133
console.log('sel: ' + listObj.selected);
@@ -30,25 +42,18 @@ var cntrlFunction = function ($scope, $location, $http) {
3042
};
3143

3244
function testfunc() {
33-
// var requestObj = {
34-
// method: 'GET',
35-
// url:'http://subban.no-ip.biz/esriStats/bozak/',
36-
// headers: {'Access-Control-Allow-Origin': '*',
37-
// 'Access-Control-Allow-Headers': 'Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token',
38-
// 'Access-Control-Allow-Methods': 'GET'
39-
// }
40-
// };
41-
var requestObj = {
42-
method: 'GET',
43-
url:'http://subban.no-ip.biz/esriStats/bozak',
44-
};
45-
45+
var i;
46+
// test the factory:
47+
var data = config.query();
48+
// var data = usageStats.get();
4649

47-
console.log("makding the request");
48-
$http(requestObj ).success(function(data, status, headers, config) {
49-
console.log('data is: ' + data + ' type: ' + typeof data );
50+
// retrieving the deferred data
51+
data.$promise.then(function(data) {
52+
53+
for (i=0; i<data.length; i++) {
54+
console.log('data is' + data[i].data);
55+
}
5056
});
51-
5257
};
5358

5459
listObj.add = function() {
@@ -66,17 +71,18 @@ var cntrlFunction = function ($scope, $location, $http) {
6671
};
6772

6873
productInfo = getListObject();
69-
productInfo.setData(['ARC/INFO', 'EDITOR', 'VIEWER']);
74+
var productsArray = config.query();
75+
//productInfo.setData(['ARC/INFO', 'EDITOR', 'VIEWER']);
76+
productInfo.setDataFromService(productsArray);
7077
$scope.productInfo = productInfo;
7178

7279
users = getListObject();
7380
users.setData(['HPRARC', 'REPLICAT','WINS', 'SYSTEM',
7481
'SRMOIAS', 'ESRI']);
75-
$scope.users = users;
82+
$scope.users = users;
7683

7784

7885
$scope.tmpTablePrefix = 'esritmp_';
79-
8086
$scope.backPath = '/report';
8187

8288
$scope.proceed = function() {
@@ -94,4 +100,4 @@ var cntrlFunction = function ($scope, $location, $http) {
94100

95101
};
96102

97-
ESRIStatsApp.controller('backEndConfigCtrl', [ '$scope', '$location', '$http', cntrlFunction]);
103+
ESRIStatsApp.controller('backEndConfigCtrl', [ '$scope', '$location', '$http', 'usageStats', 'config', cntrlFunction]);

‎learning_web_proj/angularLearning/app/factories/esriStatsFactory.js‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
2+
var esriStatsServices = angular.module('esriStatsServices', ['ngResource']);
3+
4+
esriStatsServices.factory('usageStats', ['$resource',
5+
function($resource) {
6+
var baseUrl = 'http://subban.no-ip.biz/esriStats/bozak';
7+
return $resource(baseUrl, {} , {
8+
get: {method: 'GET'}
9+
})
10+
}]
11+
);
12+
13+
esriStatsServices.factory('config', ['$resource',
14+
function($resource) {
15+
var baseUrl = 'http://subban.no-ip.biz/esriStats/';
16+
return $resource(baseUrl + 'config/:configType', {verb: 'config', confType: 'products'}, {
17+
query: {method: 'GET', params: {}, isArray: true}
18+
})
19+
}]);
20+
21+
22+
// ESRIStatsApp.factory('esriStatsFactory', ['$http', function($http) {
23+
//
24+
// //var baseUrl = '/user/123/card';
25+
//
26+
// baseUrl = 'http://subban.no-ip.biz/esriStats/';
27+
//
28+
// return {
29+
// get: function() {
30+
// console.log("calling the bozak url");
31+
// return $http.get(baseUrl + '/bozak');
32+
// },
33+
// // save: function(card) {
34+
// // var url = card.id ? baseUrl + '/' + card.id : baseUrl;
35+
// // return $http.post(url, card);
36+
// // },
37+
// query: function() {
38+
// return $http.get(baseUrl);
39+
// },
40+
// charge: function(card) {
41+
// return $http.post(baseUrl + '/' + card.id, card, {params: {charge: true}});
42+
// }
43+
// };
44+
// }]);

‎learning_web_proj/angularLearning/app/factories/factories.js‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
var appObj = angular.module("ESRIStatsApp", []);
21

3-
var factoryFunction = function() {
2+
var esriStatsObj = function() {
43
var factory = {};
54
//new Date(year, month, day, hours, minutes, seconds, milliseconds);
65
// eventually want to replace this with a query to a service, but this
76
// will do for now as a very small sample of data.
8-
var usageStats = [{sample_time: new Date(2013, 1, 1),
7+
var dummyData = [{sample_time: new Date(2013, 1, 1),
98
arcinfo: 133,
109
editor: 21,
1110
viewer: 129},
@@ -24,10 +23,40 @@ var factoryFunction = function() {
2423
{sample_time: new Date(2013, 5, 1),
2524
arcinfo: 124,
2625
editor: 3,
27-
viewer: 156}]};
26+
viewer: 156}];
2827

29-
factory.getData = function() {
30-
return usageStats;
28+
factory.getDummyData = function() {
29+
return dummyData;
3130
};
3231

33-
appObj.factory('getData', factoryFunction).controller('esriStatsControllers')
32+
factory.getData = function () {
33+
34+
var requestObj = {
35+
method: 'GET',
36+
url:'http://subban.no-ip.biz/esriStats/bozak',
37+
};
38+
39+
console.log("makding the request");
40+
$http(requestObj ).success(function(data, status, headers, config) {
41+
var i, keys;
42+
console.log('data is: ' + data + ' type: ' + typeof data );
43+
if (typeof data === 'object') {
44+
console.log("object data");
45+
keys = Object.keys(data);
46+
for (i=0; i<keys.length; i+=1){
47+
console.log("key:" + keys[i] + ' value: ' + data[keys[i]]);
48+
}
49+
}
50+
}).error(function(data, status, headers, config) {
51+
console.log("error encountered!");
52+
});
53+
};
54+
55+
56+
57+
58+
59+
return factory;
60+
};
61+
62+
ESRIStatsApp.factory('esriStatsFactory', esriStatsObj);

‎learning_web_proj/angularLearning/app/routes/EsriStatsModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var ESRIStatsApp = angular.module('ESRIStatsApp', ['ngRoute', 'ui.bootstrap']);
1+
var ESRIStatsApp = angular.module('ESRIStatsApp', ['ngRoute', 'ui.bootstrap', 'esriStatsServices']);
22

33

44
var routeFunction = function($routeProvider) {

0 commit comments

Comments
 (0)