From 02c2bc80c76440e849a73e9e7b58f1051f3cc47d Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Wed, 08 Jan 2014 18:11:31 +0000
Subject: [PATCH] #394 feature - Added quick filter to listing
---
securis/src/main/resources/static/js/admin.js | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/securis/src/main/resources/static/js/admin.js b/securis/src/main/resources/static/js/admin.js
index 7bd2645..6b4ecec 100644
--- a/securis/src/main/resources/static/js/admin.js
+++ b/securis/src/main/resources/static/js/admin.js
@@ -39,7 +39,7 @@
method : "PUT"
}
}),
- licensetype : $resource('/licenseType/:licenseTypeId', {
+ licensetype : $resource('/licensetype/:licenseTypeId', {
licenseTypeId : '@id'
}, {
update : {
@@ -99,9 +99,9 @@
}
return resource.remove({}, data, success, fail)
},
- query: function(catalog, callback) {
+ query: function(catalog) {
console.log('HI catalog ???? ' + catalog);
- var resource = CatalogsService.resources[catalog.toLowerCase()];
+ var resource = CatalogsService.resources[catalog];
function success(data) {
console.log('success')
console.log(data)
@@ -124,6 +124,8 @@
'$http',
'Catalogs',
function($scope, $http, Catalogs) {
+ $scope.showForm = true;
+ $scope.isNew = false;
$scope.formu = {};
$scope.catalogIndex = 0;
$scope.catalogs = Catalogs.list(function() {
@@ -141,11 +143,13 @@
$scope.edit = function(data) {
$scope.showForm = true;
$scope.isNew = false;
+ $scope.formu = {}
for (var k in data) {
if (k.indexOf('$') !== 0) $scope.formu[k] = data[k]
}
- // TODO: Load in formu values for Form
- // $scope.formu = {};
+ console.log('$scope.edit')
+ console.log($scope.formu)
+
}
$scope.delete = function(data) {
BootstrapDialog.confirm('The record will be deleted, are you sure?', function(result){
@@ -167,17 +171,32 @@
app.controller('CatalogFormCtrl', [ '$scope', '$http', 'toaster', 'Catalogs',
function($scope, $http, toaster, Catalogs) {
- $scope.showForm = false;
$scope.scope = $scope;
console.log('Form: currentCatalog:' + $scope.cataLogIndex);
+
+ $scope.inputType = function(field) {
+
+ if (field.readOnly && field.type === 'date')
+ return 'readonly_date';
+ if (field.readOnly)
+ return 'readonly';
+ if (field.type === 'select')
+ return 'select';
+ if (!field.multiline)
+ return 'normal';
+ if (field.multiline)
+ return 'textarea';
+ }
+
$scope.editNew = function() {
- $scope.showForm = true;
- $scope.isNew = true;
- $scope.formu = {};
+ $('#name').focus();
+ $scope.$parent.showForm = true;
+ $scope.$parent.isNew = true;
+ $scope.$parent.formu = {};
}
$scope.cancel = function() {
- $scope.showForm = false;
+ $scope.$parent.showForm = false;
}
$scope.saveCatalog = function() {
@@ -188,12 +207,11 @@
var promise = Catalogs.save(catalogName, $scope.formu).$promise;
promise.then(function(data, otro) {
if ($scope.isNew) {
- $scope.formu = {}
+ $scope.$parent.formu = {}
$('#name').focus();
} else {
$scope.cancel();
}
- // $scope.formu = {};
$scope.$parent.list = Catalogs.query(catalogName);
}, function(error, otro) {
console.log('then error');
--
Gitblit v1.3.2