new lu busy business; added angular busy

app/app.js

@@ -10,6 +10,7 @@ angular.module('app', [
     'md.data.table',
     'sasrio.angular-material-sidenav',
     'pascalprecht.translate',
+    'angular-busy',
     'luticate2Utils',
     // 'luticateAuth',
     'appSdk'

app/controllers/pkguid.controller.js

@@ -1,6 +1,6 @@
 angular.module('app')
-    .controller('PkGuidController', ['$scope', 'pkGuidBusiness', 'AppUtilsBusiness', '$mdDialog',
-        function($scope, pkGuidBusiness, AppUtilsBusiness, $mdDialog) {
+    .controller('PkGuidController', ['$scope', 'pkGuidBusiness', 'AppUtilsBusiness', '$mdDialog', 'luBusyBusiness',
+        function($scope, pkGuidBusiness, AppUtilsBusiness, $mdDialog, luBusyBusiness) {
 
             $scope.selected = [];
 
@@ -11,9 +11,11 @@ angular.module('app')
                 page: 1
             };
 
+            $scope.busy = luBusyBusiness.reset();
+            $scope.appUtils = AppUtilsBusiness;
+
             $scope.isFilterShown = false;
             $scope.pkGuids = null;
-            $scope.error = null;
 
             $scope.showFilter = function(show) {
                 $scope.isFilterShown = show;
@@ -32,13 +34,11 @@ angular.module('app')
                     .ok(AppUtilsBusiness.tr('common.delete'))
                     .cancel(AppUtilsBusiness.tr('common.cancel'));
                 $mdDialog.show(confirm).then(function() {
-                    $scope.error = null;
-                    $scope.promise = pkGuidBusiness.deleteDbo(pkguid.id).then(function(data)
+                    pkGuidBusiness.deleteDbo(pkguid.id, 'pkguid.table').then(function(data)
                     {
                         $scope.getPkGuids();
                     }, function(error)
                     {
-                        $scope.error = error;
                     });
                 }, function () {});
             };
@@ -50,7 +50,6 @@ angular.module('app')
                     .ok(AppUtilsBusiness.tr('common.delete'))
                     .cancel(AppUtilsBusiness.tr('common.cancel'));
                 $mdDialog.show(confirm).then(function() {
-                    $scope.error = null;
                     $scope.removeFirstSelected();
 
                 }, function () {});
@@ -61,30 +60,25 @@ angular.module('app')
                     $scope.getPkGuids();
                 }
                 else {
-                    $scope.promise = pkGuidBusiness.deleteDbo($scope.selected[0].id)
+                    pkGuidBusiness.deleteDbo($scope.selected[0].id, 'pkguid.table')
                         .then(function(data)
                     {
                         $scope.selected = $scope.selected.splice(1);
                         $scope.removeFirstSelected();
-                    }, function(error)
-                    {
-                        $scope.error = error;
-                    });
+                    }, function(error) {});
                 }
             };
 
             $scope.getPkGuids = function()
             {
-                $scope.error = null;
                 $scope.selected = [];
                 var orderBy = AppUtilsBusiness.convertOrderBy($scope.query.order);
-                $scope.promise = pkGuidBusiness.getMultiple(orderBy, $scope.query.filter, $scope.query.page - 1, $scope.query.limit).then(function(data)
+                pkGuidBusiness.getMultiple(orderBy, $scope.query.filter, $scope.query.page - 1, $scope.query.limit, 'pkguid.table').then(function(data)
                 {
                     $scope.pkGuids = data;
                 }, function(error)
                 {
                     $scope.pkGuids = null;
-                    $scope.error = error;
                 });
             };
 

app/controllers/pkguidedit.controller.js

@@ -1,6 +1,6 @@
 angular.module('app')
-    .controller('PkGuidEditController', ['$scope', '$state', '$mdDialog', 'pkGuidBusiness', 'AppUtilsBusiness',
-        function ($scope, $state, $mdDialog, pkGuidBusiness, AppUtilsBusiness) {
+    .controller('PkGuidEditController', ['$scope', '$state', '$mdDialog', 'pkGuidBusiness', 'AppUtilsBusiness', 'luBusyBusiness',
+        function ($scope, $state, $mdDialog, pkGuidBusiness, AppUtilsBusiness, luBusyBusiness) {
 
             $scope.pkguid = null;
             $scope.defaultPkguid = {
@@ -9,9 +9,8 @@ angular.module('app')
                 someInt: 42
             };
 
-            $scope.running = false;
-
-            $scope.error = null;
+            $scope.busy = luBusyBusiness.reset();
+            $scope.appUtils = AppUtilsBusiness;
 
             $scope.setTitle = function()
             {
@@ -22,26 +21,17 @@ angular.module('app')
             };
 
             $scope.submit = function () {
-                $scope.error = null;
-                $scope.running = true;
                 if ($scope.pkguid.id == null) {
-                    pkGuidBusiness.addDbo($scope.pkguid).then(function (data) {
-                        $scope.running = false;
-                        $state.go('pkguid_edit', {pkguid: data, id: data.id});
-                    }, function (error) {
-                        $scope.running = false;
-                        $scope.error = error;
-                    });
+                    pkGuidBusiness.addDbo($scope.pkguid, 'pkguid.edit').then(function (data) {
+                        $scope.pkguid = data;
+                        $state.go('pkguid_edit', {pkguid: $scope.pkguid, id: $scope.pkguid.id});
+                    }, function (error) {});
                 }
                 else {
-                    pkGuidBusiness.editSingleByIdDbo($scope.pkguid.id, $scope.pkguid).then(function (data) {
-                        $scope.running = false;
+                    pkGuidBusiness.editSingleByIdDbo($scope.pkguid.id, $scope.pkguid, 'pkguid.edit').then(function (data) {
                         $scope.pkguid = data;
                         $scope.setTitle();
-                    }, function (error) {
-                        $scope.running = false;
-                        $scope.error = error;
-                    });
+                    }, function (error) {});
                 }
             };
 
@@ -52,15 +42,11 @@ angular.module('app')
                     $scope.setTitle();
                 }
                 else if ($state.params.id != null) {
-                    $scope.running = true;
-                    pkGuidBusiness.getSingleById($state.params.id).then(function(data)
+                    pkGuidBusiness.getSingleById($state.params.id, 'pkguid.edit').then(function(data)
                     {
-                        $scope.running = false;
                         $scope.pkguid = data;
                         $scope.setTitle();
                     }, function (error) {
-                        $scope.running = false;
-                        $scope.error = error;
                         $scope.pkguid = null;
                         $scope.setTitle();
                     });

app/index.html

@@ -10,6 +10,7 @@
     <link rel="stylesheet" href="../bower_components/angular-material/angular-material.min.css"/>
     <link rel="stylesheet" href="../bower_components/angular-material-data-table/dist/md-data-table.min.css"/>
     <link rel="stylesheet" href="../bower_components/angular-material-sidenav/angular-material-sidenav.css"/>
+    <link rel="stylesheet" href="../bower_components/angular-busy2/dist/angular-busy.css"/>
     <!--<link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">-->
     <!-- endbuild -->
 
@@ -44,6 +45,7 @@
     <script src="../bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
     <script src="../bower_components/messageformat/messageformat.js"></script>
     <script src="../bower_components/angular-translate-interpolation-messageformat/angular-translate-interpolation-messageformat.min.js"></script>
+    <script src="../bower_components/angular-busy2/dist/angular-busy.js"></script>
     <!--<script src="../bower_components/luticate-auth/dist/luticate-auth.min.js"></script>-->
     <!--<script src="../bower_components/angular-dialog-service/dist/dialogs.js"></script>-->
     <!--<script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>-->

app/translations/en.json

@@ -19,7 +19,8 @@
       "page": "Page:",
       "rowsPerPage": "Items per page:"
     },
-    "createdBy": "Created with ❤ by"
+    "createdBy": "Created with ❤ by",
+    "busyLoading": "Loading..."
   },
   "home": {
     "name": "Home",

app/views/busy-template.html

@@ -0,0 +1,6 @@
+<div class="custom-template">
+    <div flex>
+        <md-progress-linear md-mode="indeterminate"></md-progress-linear>
+    </div>
+    <div class="custom-message" ng-bind="$message"></div>
+</div>

app/views/pkguid.html

@@ -1,4 +1,4 @@
-<div layout="column" layout-fill layout-align="top">
+<div layout="column" layout-fill layout-align="top" angular-busy="appUtils.cgBusy('pkguid.table')">
 
     <div flex>
         <md-toolbar class="md-table-toolbar md-default" ng-show="!isFilterShown && selected.length == 0">
@@ -44,7 +44,7 @@
 
     <div flex>
         <md-table-container>
-            <table md-table md-row-select multiple ng-model="selected" md-progress="promise">
+            <table md-table md-row-select multiple ng-model="selected" >
                 <thead md-head md-order="query.order" md-on-reorder="getPkGuids">
                 <tr md-row>
                     <th md-column md-order-by="id"><span>{{ 'pkguid.id' | translate }}</span></th>
@@ -76,11 +76,10 @@
         </md-table-container>
     </div>
 
-    <md-table-pagination md-label="{of: '{{ 'common.pagination.of' | translate }}', page: '{{ 'common.pagination.page' | translate }}', rowsPerPage: '{{ 'common.pagination.rowsPerPage' | translate }}'}"
-                         class="col-xs-11" md-limit="query.limit" md-limit-options="[5, 10, 15]"
+    <md-table-pagination md-label="{{appUtils.mdTableLabels()}}" class="col-xs-11" md-limit="query.limit" md-limit-options="[5, 10, 15]"
                          md-page="query.page" md-total="{{pkGuids.count}}" md-on-paginate="getPkGuids" md-page-select></md-table-pagination>
 
-    <div class="isa_error" ng-show="error != null">
+    <div ng-repeat="error in busy.errors('pkguid.table')" class="isa_error">
         <i class="fa fa-times-circle"></i>
         {{ error.data.message }}
     </div>

app/views/pkguidedit.html

@@ -1,4 +1,4 @@
-<div layout="column" ng-cloak class="md-inline-form">
+<div layout="column" ng-cloak class="md-inline-form" angular-busy="appUtils.cgBusy('pkguid.edit')">
     <md-content layout-padding>
         <form name="editForm">
             <div layout-gt-sm="row">
@@ -18,7 +18,7 @@
             <div>
                 <md-button type="submit" ng-click="!editForm.$invalid && submit()">{{ 'common.submit' | translate }}</md-button>
             </div>
-            <div class="isa_error" ng-show="error != null">
+            <div ng-repeat="error in busy.errors('pkguid.edit')" class="isa_error">
                 <i class="fa fa-times-circle"></i>
                 {{ error.data.message }}
             </div>

bower.json

@@ -19,6 +19,7 @@
     "material-design-icons": "^3.0.1",
     "angular-translate": "^2.13.1",
     "angular-translate-loader-static-files": "^2.13.1",
-    "angular-translate-interpolation-messageformat": "^2.13.1"
+    "angular-translate-interpolation-messageformat": "^2.13.1",
+    "angular-busy2": "^5.2.0"
   }
 }

sdk/Business/apputils.business.js

@@ -6,7 +6,7 @@
     'use strict';
 
     angular.module('appSdk')
-        .factory('AppUtilsBusiness', ['$rootScope', '$translate', function($rootScope, $translate) {
+        .factory('AppUtilsBusiness', ['$rootScope', '$translate', 'luBusyBusiness', function($rootScope, $translate, luBusyBusiness) {
 
             var AppUtilsBusiness = {};
 
@@ -31,6 +31,24 @@
                 $rootScope.$emit('toolbar.title', {title: title});
             };
 
+            AppUtilsBusiness.mdTableLabels = function()
+            {
+                return {
+                    of: AppUtilsBusiness.tr('common.pagination.of'),
+                    page: AppUtilsBusiness.tr('common.pagination.page'),
+                    rowsPerPage: AppUtilsBusiness.tr('common.pagination.rowsPerPage')
+                };
+            };
+
+            AppUtilsBusiness.cgBusy = function(luBusyGroup)
+            {
+                return {
+                    promise: luBusyBusiness.promise(luBusyGroup),
+                    message: AppUtilsBusiness.tr('common.busyLoading'),
+                    templateUrl:'views/busy-template.html'
+                };
+            };
+
             AppUtilsBusiness.tr = function(id, data)
             {
                 return $translate.instant(id, data);