Feature: Added timeout / loading button for vouchers and a few other forms.
This commit is contained in:
1 parent
66aca999e2
commit
e5f8a4f86f
16 files changed
+31
-30
No files matched your search
@@ -13,7 +13,7 @@ var AttendanceCtrl = ['$scope', '$location', 'dateFilter', 'Attendance', 'attend
|
||||
if (angular.isDate($scope.info.Date)) {
|
||||
$scope.info.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
|
||||
}
|
||||
$scope.info.$save(function (u, putResponseHeaders) {
|
||||
return $scope.info.$save(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: u.Code});
|
||||
}, function (data, status) {
|
||||
$scope.toasts.push({Type: 'Danger', Message: data.data});
|
||||
|
||||
@@ -37,7 +37,7 @@ var EmployeeFunctionsCtrl = ['$scope', '$http', 'dateFilter', function ($scope,
|
||||
}
|
||||
var fd = new FormData();
|
||||
fd.append("uploadedFile", $scope.uploadedFile);
|
||||
$http
|
||||
return $http
|
||||
.post('/api/Fingerprint', fd, {
|
||||
headers: {
|
||||
'Content-Type': undefined
|
||||
|
||||
@@ -111,7 +111,7 @@ var IssueCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'voucher',
|
||||
}
|
||||
}, true);
|
||||
|
||||
$scope.resetVoucher = function (voucherid) {
|
||||
$scope.resetVoucher = function () {
|
||||
var date = $scope.voucher.Date;
|
||||
var source = getDebitCredit($scope.voucher.Journals, -1);
|
||||
var destination = getDebitCredit($scope.voucher.Journals, 1);
|
||||
@@ -151,7 +151,7 @@ var IssueCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'voucher',
|
||||
};
|
||||
|
||||
$scope.delete = function () {
|
||||
$scope.voucher.$delete(function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$delete(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
var date = u.Date;
|
||||
var source = getDebitCredit(u.Journals, -1);
|
||||
@@ -219,8 +219,9 @@ var IssueCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'voucher',
|
||||
}]
|
||||
});
|
||||
modalInstance.result.then(function () {
|
||||
$scope.delete();
|
||||
return $scope.delete();
|
||||
});
|
||||
return modalInstance;
|
||||
};
|
||||
|
||||
$scope.batches = function ($viewValue) {
|
||||
|
||||
@@ -74,7 +74,7 @@ var JournalCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'Ac
|
||||
if (angular.isDate($scope.voucher.Date)) {
|
||||
$scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
|
||||
}
|
||||
$scope.voucher.$save({type: 'Journal'}, function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$save({type: 'Journal'}, function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
$location.path('/Journal/' + u.VoucherID);
|
||||
}, function (data, status) {
|
||||
@@ -92,7 +92,7 @@ var JournalCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'Ac
|
||||
};
|
||||
|
||||
$scope.post = function () {
|
||||
$scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
}, function (data, status) {
|
||||
$scope.toasts.push({Type: 'Danger', Message: data.data});
|
||||
|
||||
@@ -75,7 +75,7 @@ var PaymentCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'le
|
||||
if (angular.isDate($scope.voucher.Date)) {
|
||||
$scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
|
||||
}
|
||||
$scope.voucher.$save({type: 'Payment'}, function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$save({type: 'Payment'}, function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
$location.path('/Payment/' + u.VoucherID);
|
||||
}, function (data, status) {
|
||||
@@ -93,7 +93,7 @@ var PaymentCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'le
|
||||
};
|
||||
|
||||
$scope.post = function () {
|
||||
$scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
}, function (data, status) {
|
||||
$scope.toasts.push({Type: 'Danger', Message: data.data});
|
||||
|
||||
@@ -84,7 +84,7 @@ var PurchaseReturnCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'vouche
|
||||
if (angular.isDate($scope.voucher.Date)) {
|
||||
$scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
|
||||
}
|
||||
$scope.voucher.$save({type: 'Purchase Return'}, function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$save({type: 'Purchase Return'}, function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
$location.path('/Return/' + u.VoucherID);
|
||||
}, function (data, status) {
|
||||
@@ -102,7 +102,7 @@ var PurchaseReturnCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'vouche
|
||||
};
|
||||
|
||||
$scope.post = function () {
|
||||
$scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
}, function (data, status) {
|
||||
$scope.toasts.push({Type: 'Danger', Message: data.data});
|
||||
|
||||
@@ -89,7 +89,7 @@ var PurchaseCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'A
|
||||
if (angular.isDate($scope.voucher.Date)) {
|
||||
$scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
|
||||
}
|
||||
$scope.voucher.$save({type: 'Purchase'}, function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$save({type: 'Purchase'}, function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
$location.path('/Purchase/' + u.VoucherID);
|
||||
}, function (data, status) {
|
||||
@@ -107,7 +107,7 @@ var PurchaseCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'A
|
||||
};
|
||||
|
||||
$scope.post = function () {
|
||||
$scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
}, function (data, status) {
|
||||
$scope.toasts.push({Type: 'Danger', Message: data.data});
|
||||
|
||||
@@ -75,7 +75,7 @@ var ReceiptCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', '$modal'
|
||||
if (angular.isDate($scope.voucher.Date)) {
|
||||
$scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
|
||||
}
|
||||
$scope.voucher.$save({type: 'Receipt'}, function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$save({type: 'Receipt'}, function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
$location.path('/Receipt/' + u.VoucherID);
|
||||
}, function (data, status) {
|
||||
@@ -93,7 +93,7 @@ var ReceiptCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', '$modal'
|
||||
};
|
||||
|
||||
$scope.post = function () {
|
||||
$scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
return $scope.voucher.$post(function (u, putResponseHeaders) {
|
||||
$scope.toasts.push({Type: 'Success', Message: ''});
|
||||
}, function (data, status) {
|
||||
$scope.toasts.push({Type: 'Danger', Message: data.data});
|
||||
|
||||
Reference in new issue
Block a user