#394 feature - Added quick filter to listing

Roberto Sánchez

2014-01-08 02c2bc80c76440e849a73e9e7b58f1051f3cc47d

 securis/src/main/resources/static/js/admin.js
..
..
@@ -39,7 +39,7 @@
39
39
 						method : "PUT"
40
40
 					}
41
41
 				}),
42
-				licensetype : $resource('/licenseType/:licenseTypeId', {
42
+				licensetype : $resource('/licensetype/:licenseTypeId', {
43
43
 					licenseTypeId : '@id'
44
44
 				}, {
45
45
 					update : {
..
..
@@ -99,9 +99,9 @@
99
99
 				}
100
100
 				return resource.remove({}, data, success, fail)
101
101
 			},
102
-			query: function(catalog, callback) {
102
+			query: function(catalog) {
103
103
 				console.log('HI catalog ???? ' + catalog);
104
-				var resource = CatalogsService.resources[catalog.toLowerCase()];
104
+				var resource = CatalogsService.resources[catalog];
105
105
 				function success(data) {
106
106
 					console.log('success')
107
107
 					console.log(data)
..
..
@@ -124,6 +124,8 @@
124
124
 			'$http',
125
125
 			'Catalogs',
126
126
 			function($scope, $http, Catalogs) {
127
+				$scope.showForm = true;
128
+				$scope.isNew = false;
127
129
 				$scope.formu = {};
128
130
 				$scope.catalogIndex = 0;
129
131
 				$scope.catalogs = Catalogs.list(function() {
..
..
@@ -141,11 +143,13 @@
141
143
 				$scope.edit = function(data) {
142
144
 					$scope.showForm = true;
143
145
 					$scope.isNew = false;
146
+					$scope.formu = {}
144
147
 					for (var k in data) {
145
148
 						if (k.indexOf('$') !== 0) $scope.formu[k] = data[k]
146
149
 					}
147
-					// TODO: Load in formu values for Form
148
-					// $scope.formu = {};
150
+					console.log('$scope.edit')
151
+					console.log($scope.formu)
152
+					
149
153
 				}
150
154
 				$scope.delete = function(data) {
151
155
 					BootstrapDialog.confirm('The record will be deleted, are you sure?', function(result){
..
..
@@ -167,17 +171,32 @@
167
171
 
168
172
 	app.controller('CatalogFormCtrl', [ '$scope', '$http', 'toaster', 'Catalogs',
169
173
 			function($scope, $http, toaster, Catalogs) {
170
-				$scope.showForm = false;
171
174
 				$scope.scope = $scope;
172
175
 				console.log('Form: currentCatalog:' + $scope.cataLogIndex);
176
+				
177
+				$scope.inputType = function(field) {
178
+					
179
+					if (field.readOnly && field.type === 'date')
180
+						return 'readonly_date';
181
+					if (field.readOnly)
182
+						return 'readonly';
183
+					if (field.type === 'select')
184
+						return 'select';
185
+					if (!field.multiline)
186
+						return 'normal';
187
+					if (field.multiline)
188
+						return 'textarea';
173
189
 
190
+				}
191
+				
174
192
 				$scope.editNew = function() {
175
-					$scope.showForm = true;
176
-					$scope.isNew = true;
177
-					$scope.formu = {};
193
+					$('#name').focus();
194
+					$scope.$parent.showForm = true;
195
+					$scope.$parent.isNew = true;
196
+					$scope.$parent.formu = {};
178
197
 				}
179
198
 				$scope.cancel = function() {
180
-					$scope.showForm = false;
199
+					$scope.$parent.showForm = false;
181
200
 				}
182
201
 
183
202
 				$scope.saveCatalog = function() {
..
..
@@ -188,12 +207,11 @@
188
207
 						var promise = Catalogs.save(catalogName, $scope.formu).$promise;
189
208
 						promise.then(function(data, otro) {
190
209
 							if ($scope.isNew) {
191
-								$scope.formu = {}
210
+								$scope.$parent.formu = {}
192
211
 								$('#name').focus();
193
212
 							} else {
194
213
 								$scope.cancel();
195
214
 							}
196
-						//	$scope.formu = {};
197
215
 							$scope.$parent.list = Catalogs.query(catalogName);
198
216
 						}, function(error, otro) {
199
217
 							console.log('then error');