Feature: Added timeout / loading button for vouchers and a few other forms.

brewman/static/partial/attendance.html

@@ -50,7 +50,7 @@
     </table>
     <div class="form-group">
         <div class="col-md-offset-2 col-md-10">
-            <button ng-click="save()" ng-disabled="isClean() || frmForm.$invalid" class="btn btn-primary">Save</button>
+            <button tan-click="save()" ng-disabled="isClean() || frmForm.$invalid" class="btn btn-primary">Save</button>
         </div>
     </div>
 </form>

brewman/static/partial/employee-functions.html

@@ -58,7 +58,7 @@
                        onchange="angular.element(this).scope().setFile(this)"/>
 
                 <div class="input-group-btn">
-                    <button class="btn btn-success" ng-click="uploadFingerprints()">Upload <i
+                    <button class="btn btn-success" tan-click="uploadFingerprints()">Upload <i
                             class="glyphicon glyphicon-cloud-upload"></i></button>
                 </div>
             </div>

brewman/static/partial/issue.html

@@ -103,14 +103,14 @@
     </div>
     <div class="form-group">
         <div class="col-md-offset-2 col-md-10">
-            <button class="btn btn-primary" ng-click="save()"
+            <button class="btn btn-primary" tan-click="save()"
                     ng-disabled="preventAlteration(voucher)">{{voucher.VoucherID | save_button}}
             </button>
-            <button class="btn btn-danger" ng-click="resetVoucher(voucher.VoucherID)" ng-hide="!voucher.VoucherID">
+            <button class="btn btn-danger" ng-click="resetVoucher()" ng-hide="!voucher.VoucherID">
                 New Entry
             </button>
             <button class="btn btn-danger" ng-hide="!voucher.VoucherID" ng-disabled="preventAlteration(voucher)"
-                    ng-click="confirm()">Delete
+                    tan-click="confirm()">Delete
             </button>
         </div>
     </div>

brewman/static/partial/journal.html

@@ -81,10 +81,10 @@
     </div>
     <div class="form-group">
         <div class="col-md-offset-2 col-md-10">
-            <button class="btn btn-primary" ng-click="save()" ng-disabled="preventAlteration(voucher)">
+            <button class="btn btn-primary" tan-click="save()" ng-disabled="preventAlteration(voucher)">
                 {{voucher.VoucherID | save_button}}
             </button>
-            <button class="btn btn-inverse" ng-click="post()" ng-hide="!voucher.VoucherID"
+            <button class="btn btn-inverse" tan-click="post()" ng-hide="!voucher.VoucherID"
                     ng-disabled="voucher.Posted || !perms['Post Vouchers']">{{voucher.Posted | posted}}
             </button>
             <button class="btn btn-danger" ng-hide="!voucher.VoucherID" ng-disabled="preventAlteration(voucher)"

brewman/static/partial/payment.html

@@ -81,10 +81,10 @@
     </div>
     <div class="form-group">
         <div class="col-md-offset-2 col-md-10">
-            <button class="btn btn-primary" ng-click="save()" ng-disabled="preventAlteration(voucher)">
+            <button class="btn btn-primary" tan-click="save()" ng-disabled="preventAlteration(voucher)">
                 {{voucher.VoucherID | save_button}}
             </button>
-            <button class="btn btn-inverse" ng-click="post()" ng-hide="!voucher.VoucherID"
+            <button class="btn btn-inverse" tan-click="post()" ng-hide="!voucher.VoucherID"
                     ng-disabled="voucher.Posted || !perms['Post Vouchers']">{{voucher.Posted | posted}}
             </button>
             <button class="btn btn-danger" ng-hide="!voucher.VoucherID" ng-disabled="preventAlteration(voucher)"

brewman/static/partial/purchase-return.html

@@ -86,10 +86,10 @@
         </div>
     </div>
     <div class="form-actions">
-        <button class="btn btn-primary" ng-click="save()"
+        <button class="btn btn-primary" tan-click="save()"
                 ng-disabled="preventAlteration(voucher)">{{voucher.VoucherID | save_button}}
         </button>
-        <button class="btn btn-inverse" ng-click="post()" ng-hide="!voucher.VoucherID"
+        <button class="btn btn-inverse" tan-click="post()" ng-hide="!voucher.VoucherID"
                 ng-disabled="voucher.Posted || !perms['Post Vouchers']">{{voucher.Posted | posted}}
         </button>
         <button class="btn btn-danger" ng-hide="!voucher.VoucherID" ng-disabled="preventAlteration(voucher)"

brewman/static/partial/purchase.html

@@ -92,10 +92,10 @@
         </div>
     </div>
     <div class="form-actions">
-        <button class="btn btn-primary" ng-click="save()"
+        <button class="btn btn-primary" tan-click="save()"
                 ng-disabled="preventAlteration(voucher)">{{voucher.VoucherID | save_button}}
         </button>
-        <button class="btn btn-inverse" ng-click="post()" ng-hide="!voucher.VoucherID"
+        <button class="btn btn-inverse" tan-click="post()" ng-hide="!voucher.VoucherID"
                 ng-disabled="voucher.Posted || !perms['Post Vouchers']">{{voucher.Posted | posted}}
         </button>
         <button class="btn btn-danger" ng-hide="!voucher.VoucherID" ng-disabled="preventAlteration(voucher)"

brewman/static/partial/receipt.html

@@ -81,10 +81,10 @@
     </div>
     <div class="form-group">
         <div class="col-md-offset-2 col-md-10">
-            <button class="btn btn-primary" ng-click="save()" ng-disabled="preventAlteration(voucher)">
+            <button class="btn btn-primary" tan-click="save()" ng-disabled="preventAlteration(voucher)">
                 {{voucher.VoucherID | save_button}}
             </button>
-            <button class="btn btn-inverse" ng-click="post()" ng-hide="!voucher.VoucherID"
+            <button class="btn btn-inverse" tan-click="post()" ng-hide="!voucher.VoucherID"
                     ng-disabled="voucher.Posted || !perms['Post Vouchers']">{{voucher.Posted | posted}}
             </button>
             <button class="btn btn-danger" ng-hide="!voucher.VoucherID" ng-disabled="preventAlteration(voucher)"

brewman/static/scripts/attendance.js

@@ -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});

brewman/static/scripts/employee-functions.js

@@ -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

brewman/static/scripts/issue.js

@@ -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) {

brewman/static/scripts/journal.js

@@ -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});

brewman/static/scripts/payment.js

@@ -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});

brewman/static/scripts/purchase-return.js

@@ -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});

brewman/static/scripts/purchase.js

@@ -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});

brewman/static/scripts/receipt.js

@@ -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});