Skip to content

Commit 0d25049

Browse files
GuyTheFlowerGuyTheFlower
committed
pre-refactor commit
1 parent e1af055 commit 0d25049

8 files changed

Lines changed: 184 additions & 13 deletions

File tree

‎learning_web_proj/angularLearning/Content/EsriStatsStyles.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@
99
width: 60px !important;
1010
margin-left: 0;
1111
margin-right: 0;
12+
}
13+
14+
.vertAlignColumn {
15+
display:table-cell;
16+
vertical-align:middle;
17+
text-align:center;
1218
}

‎learning_web_proj/angularLearning/angular_1.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<script src="http://code.angularjs.org/1.2.10/angular.min.js"></script>
1111
<script src='//ajax.googleapis.com/ajax/libs/angularjs/1.2.10/angular-route.js'></script>
1212
<script src="app/routes/EsriStatsModule.js"></script>
13-
<script src='app/controllers/controllers.js'></script>
13+
<script src='app/controllers/backEndConfigCtrl.js'></script>
1414
<script src='app/controllers/reportConfigController.js'></script>
15+
<script src='app/directives/directives.js'></script>
1516
<script src='scripts/ui-bootstrap-tpls-0.10.0.min.js'></script>
1617
</head>
1718
<body>

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

Lines changed: 81 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,83 @@
1-
var cntrlFunction = function ($scope, $routeParams, $location) {
2-
$scope.a = 5;
3-
$scope.b = 6; //reportConfigController
1+
var cntrlFunction = function ($scope) {
2+
var i;
3+
4+
var getListObject = function() {
5+
var listObj = {};
6+
listObj.data = [];
7+
listObj.selected = null;
8+
listObj.value2Add = null;
9+
10+
listObj.add = function(data) {
11+
listObj.data = data;
12+
};
13+
14+
listObj.deleteSelected = function() {
15+
console.log('sel: ' + listObj.selected);
16+
for ( i=0; i<listObj.data.length; i+=1) {
17+
if (listObj.productSelected === listObj.data[i]) {
18+
listObj.data.splice(i, 1);
19+
listObj.selected = listObj.data[0];
20+
}
21+
}
22+
};
23+
24+
productInfo.add = function() {
25+
console.log("value to enter is: " + listObj.value2Add);
26+
if (listObj.value2Add !== null) {
27+
listObj.value2Add = listObj.value2Add.trim();
28+
if (listObj.value2Add !== null && listObj.value2Add !== '') {
29+
console.log("valeu to enter is: " + listObj.value2Add);
30+
listObj.data.push(listObj.value2Add);
31+
}
32+
}
33+
listObj.value2Add = null;
34+
};
35+
return productInfo;
36+
};
37+
38+
var productInfo = {};
39+
40+
productInfo.products = ['ARC/INFO', 'EDITOR', 'VIEWER'];
41+
productInfo.productSelected = productInfo.products[0];
42+
productInfo.deleteSelectedProduct = function() {
43+
console.log('sel prod' + productInfo.productSelected);
44+
for ( i=0; i<productInfo.products.length; i+=1) {
45+
if (productInfo.productSelected === productInfo.products[i]) {
46+
productInfo.products.splice(i, 1);
47+
productInfo.productSelected = productInfo.products[0];
48+
}
49+
}
50+
};
51+
productInfo.value2Add = null;
52+
productInfo.addProduct = function() {
53+
console.log("valeu to enter is: " + productInfo.value2Add);
54+
if (productInfo.value2Add !== null) {
55+
productInfo.value2Add = productInfo.value2Add.trim();
56+
if (productInfo.value2Add !== null && productInfo.value2Add !== '') {
57+
console.log("valeu to enter is: " + productInfo.value2Add);
58+
productInfo.products.push(productInfo.value2Add);
59+
}
60+
}
61+
productInfo.value2Add = null;
62+
};
63+
64+
65+
66+
$scope.productInfo = productInfo;
67+
68+
var users = {};
69+
70+
users.usersOmit = ['HPRARC', 'REPLICAT','WINS', 'SYSTEM',
71+
'SRMOIAS', 'ESRI'];
72+
users.userSelected = users.usersOmit[0];
73+
74+
$scope.tmpTablePrefix = 'esritmp_';
75+
76+
$scope.deleteSelectedProduct = function() {
77+
};
78+
79+
$scope.add;
80+
481
};
582

6-
ESRIStatsApp.controller('backEndConfigCtrl', ['$scope', '$routeParams', cntrlFunction]);
83+
ESRIStatsApp.controller('backEndConfigCtrl', [ '$scope', cntrlFunction]);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ var cntrlFunction = function ($scope, $routeParams, $location) {
9393

9494
};
9595

96-
ESRIStatsApp.controller('reportConfigController', ['$scope', '$routeParams', cntrlFunction]);
96+
ESRIStatsApp.controller('reportConfigController', ['$scope', '$routeParams', '$location', cntrlFunction]);

‎learning_web_proj/angularLearning/app/directives/directives.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ESRIStatsApp.directive('ngEnter', function () {
2+
return function (scope, element, attrs) {
3+
element.bind("keydown keypress", function (event) {
4+
if(event.which === 13) {
5+
scope.$apply(function (){
6+
scope.$eval(attrs.ngEnter);
7+
});
8+
9+
event.preventDefault();
10+
}
11+
});
12+
};
13+
});

‎learning_web_proj/angularLearning/app/partials/backendConfig.html‎

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,76 @@
1-
<div>
2-
This is the backend configuration view
3-
</div>
1+
2+
<div class='container'>
3+
<form role='form' class="form">
4+
<div class="form-group">
5+
<div >
6+
<h3 align='center'>ESRI Licence Reporting Configuration</h3>
7+
</div>
8+
</div>
9+
10+
<div class="form-group">
11+
<div >
12+
<label> Products to Report on:</label>
13+
</div>
14+
<div >
15+
<!-- <label for='product2ReportOn'>Products Reporting on:</label> -->
16+
<select class='form-control' size=4 ng-model='productInfo.productSelected'>
17+
<option ng-repeat='product in productInfo.products' value='{{product}}'>{{product}}</option>
18+
</select>
19+
20+
21+
<button id='DeleteProduct' class='btn btn-default form-control' type='button' ng-click="productInfo.deleteSelectedProduct()">
22+
Delete
23+
</button>
24+
<label class='sr-only'>New Value to Enter</label>
25+
<div class='input-group'>
26+
<input type='text' class='form-control' id='product2ReportOn' ng-enter="productInfo.addProduct()" ng-model='productInfo.value2Add'>
27+
<span class="input-group-btn">
28+
<button id='enterNewProduct' class='btn btn-default form-control' type='button' ng-click="productInfo.addProduct()">
29+
Add
30+
</button>
31+
</span>
32+
</div>
33+
</div>
34+
</div>
35+
<div class="form-group">
36+
<div >
37+
<label> Users to Omit from Report:</label>
38+
</div>
39+
<div >
40+
<!-- <label for='product2ReportOn'>Products Reporting on:</label> -->
41+
<select class='form-control' size=5>
42+
<option value='volvo'>Volvo</option>
43+
<option value='saab'>saab</option>
44+
<option value='challenger'>challenger</option>
45+
<option value='beemer'>beemer</option>
46+
<option value='shitbox'>shitbox</option>
47+
</select>
48+
<button id='enterNewProduct' class='btn btn-default form-control' type='button' ng-click="enterNewProduct()">
49+
Delete
50+
</button>
51+
<label class='sr-only'>New Value to Enter</label>
52+
<div class='input-group'>
53+
<input type='text' class='form-control' id='product2ReportOn'>
54+
<span class="input-group-btn">
55+
<button id='enterNewProduct' class='btn btn-default form-control' type='button' ng-click="enterNewProduct()">
56+
Add
57+
</button>
58+
</span>
59+
</div>
60+
</div>
61+
</div>
62+
<div class="form-group">
63+
<div>
64+
<label> Oracle Temp Table Prefix </label>
65+
</div>
66+
<div>
67+
<input type='text' class='form-control' id='product2ReportOn' value='esritmp_'>
68+
</div>
69+
</div>
70+
<div class="form-group">
71+
72+
73+
</div>
74+
</form>
75+
</div>
76+
{{tmpTablePrefix}}

‎learning_web_proj/angularLearning/app/partials/reportConfig.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ <h5>
4848
<h4>Report Resolution:</h4>
4949
</div>
5050
<div class="btn-group">
51+
<!-- could use a button group here! -->
5152
<div ng-repeat="repRes in reportResolution.values" class="col-xs-2 resolutionButtons">
5253
<button type="button" class="btn btn-primary resolutionButtons" ng-model="reportResolution.selected" btn-radio="'{{repRes}}'" >{{repRes}}</button>
5354
<!-- {{repRes}} and {{model}} -->
@@ -57,8 +58,8 @@ <h4>Report Resolution:</h4>
5758
<div class='row'>
5859
<div class='col-xs-6' align='right'>
5960
<h5>
60-
<button id='setReportEndTime' class='btn btn-default' type='button' ng-click="go('#/backendConfig.html')">
61-
Configure
61+
<button id='config' class='btn btn-default' ng-click="go('/config')">
62+
Configure
6263
</button></h5>
6364
</div>
6465
<div class='col-xs-6' align='left'>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var ESRIStatsApp = angular.module('ESRIStatsApp', ['ngRoute', 'ui.bootstrap']);
33

44
var routeFunction = function($routeProvider) {
55
$routeProvider.
6-
when('/', {
6+
when('/report', {
77
templateUrl: 'app/partials/reportConfig.html',
88
controller: 'reportConfigController'
99
}).
@@ -12,7 +12,7 @@ var routeFunction = function($routeProvider) {
1212
controller: 'backEndConfigCtrl'
1313
}).
1414
otherwise({
15-
redirectTo: '/'
15+
redirectTo: '/report'
1616
})};
1717

1818

0 commit comments

Comments
 (0)