added websocket notifications; added delete button on edit page

app/app.js

@@ -12,6 +12,7 @@ angular.module('app', [
     'pascalprecht.translate',
     'angular-busy',
     'luticate2Utils',
+    'SignalR',
     // 'luticateAuth',
     'appSdk'
 ])
@@ -132,7 +133,10 @@ angular.module('app', [
                 toolbarTitle: "pkguid.add.defaultToolbarTitle",
                 reloadOnSearch: false,
                 templateUrl:'views/pkguidedit.html',
-                controller:'PkGuidEditController'
+                controller:'PkGuidEditController',
+                params: {
+                    pkguid: null
+                }
             });
 
             $stateProvider.state('pkguid_edit', {
@@ -150,41 +154,85 @@ angular.module('app', [
 
             $urlRouterProvider.otherwise('/');
     }])
-    .run(['$rootScope', '$transitions', 'AppUtilsBusiness', 'ssSideNav', '$translate', 'luRequest', '$mdDialog',
-        function ($rootScope, $transitions, AppUtilsBusiness, ssSideNav, $translate, luRequest, $mdDialog) {
-
-        var apiVersion = null;
+    .run(['$rootScope', '$transitions', 'AppUtilsBusiness', 'ssSideNav', '$translate', 'luRequest', '$mdDialog', 'luNotificationsBusiness', '$mdToast', '$state',
+        function ($rootScope, $transitions, AppUtilsBusiness, ssSideNav, $translate, luRequest, $mdDialog, luNotificationsBusiness, $mdToast, $state) {
 
-        function apiVersionChanged(oldVersion, newVersion) {
+        AppUtilsBusiness.addApiVersionChangedCallback(function(oldVersion, newVersion) {
             $mdDialog.show(
                 $mdDialog.alert()
                     .title(AppUtilsBusiness.tr('common.updateDetected.title'))
-                    .textContent(AppUtilsBusiness.tr('common.updateDetected.text', {oldVersion: oldVersion, newVersion: newVersion}))
+                    .textContent(AppUtilsBusiness.tr('common.updateDetected.text',
+                        {oldVersion: oldVersion, newVersion: newVersion}))
                     .ok(AppUtilsBusiness.tr('common.ok')));
-        }
-
-        luRequest.addHook('resolve', function(url, method, dataGet, dataPost, luBusyGroups, data)
-        {
-            if (apiVersion == null) {
-                apiVersion = data.version;
-            }
-            else if (data.version != null && data.version != apiVersion) {
-                apiVersionChanged(apiVersion, data.version);
-                apiVersion = data.version;
-            }
         });
 
-        luRequest.addHook('reject', function(url, method, dataGet, dataPost, luBusyGroups, error)
+        luNotificationsBusiness.init();
+
+        luNotificationsBusiness.addEventCrudCallback('pkguid', function(eventName, entityType, oldEntity, newEntity)
         {
-            if (apiVersion == null) {
-                apiVersion = error.data.version;
+            var text = null;
+            if (eventName == luNotificationsBusiness.EVENT_CREATE) {
+                text = AppUtilsBusiness.tr('pkguid.notifications.create', {text: newEntity.someText});
+            }
+            else if (eventName == luNotificationsBusiness.EVENT_UPDATE) {
+                text = AppUtilsBusiness.tr('pkguid.notifications.update', {text: newEntity.someText});
             }
-            else if (error.data.version != null && error.data.version != apiVersion) {
-                apiVersionChanged(apiVersion, error.data.version);
-                apiVersion = error.data.version;
+            else if (eventName == luNotificationsBusiness.EVENT_DELETE) {
+                text = AppUtilsBusiness.tr('pkguid.notifications.delete', {text: oldEntity.someText});
             }
+            var toast = $mdToast.simple()
+                .textContent(text)
+                .action(eventName == luNotificationsBusiness.EVENT_DELETE ? AppUtilsBusiness.tr('common.undo') : AppUtilsBusiness.tr('common.view'))
+                .highlightAction(true)
+                .highlightClass('md-accent')
+                .position('bottom right');
+
+            $mdToast.show(toast).then(function(response) {
+                if (response == 'ok') {
+                    if (eventName == luNotificationsBusiness.EVENT_DELETE) {
+                        oldEntity.id = null;
+                        $state.go('pkguid_add', {pkguid: oldEntity});
+                    }
+                    else {
+                        $state.go('pkguid_edit', {id: newEntity.id, pkguid: newEntity});
+                    }
+                }
+            });
         });
 
+        // luNotificationsBusiness.addEventDeleteCallback('pkguid', function(eventName, entityType, oldEntity)
+        // {
+        //     var toast = $mdToast.simple()
+        //         .textContent("PkGuid \'" + oldEntity.someText + "\' was deleted")
+        //         .action("Undo")
+        //         .highlightAction(true)
+        //         .highlightClass('md-accent')
+        //         .position('bottom right');
+        //
+        //     $mdToast.show(toast).then(function(response) {
+        //         if (response == 'ok') {
+        //             oldEntity.id = null;
+        //             $state.go('pkguid_add', {pkguid: oldEntity});
+        //         }
+        //     });
+        // });
+        //
+        // luNotificationsBusiness.addEventCreateCallback('pkguid', function(eventName, entityType, oldEntity, newEntity)
+        // {
+        //     var toast = $mdToast.simple()
+        //         .textContent("PkGuid \'" + newEntity.someText + "\' was added")
+        //         .action("View")
+        //         .highlightAction(true)
+        //         .highlightClass('md-accent')
+        //         .position('bottom right');
+        //
+        //     $mdToast.show(toast).then(function(response) {
+        //         if (response == 'ok') {
+        //             $state.go('pkguid_edit', {id: newEntity.id, pkguid: newEntity});
+        //         }
+        //     });
+        // });
+
         $translate('common.appName').then(function() {
             for (var i = 0; i < ssSideNav.sections.length; ++i) {
                 var a = ssSideNav.sections[i];

app/controllers/pkguid.controller.js

@@ -37,9 +37,7 @@ angular.module('app')
                     pkGuidBusiness.deleteDbo(pkguid.id, 'pkguid.table').then(function(data)
                     {
                         $scope.getPkGuids();
-                    }, function(error)
-                    {
-                    });
+                    }, function(error) {});
                 }, function () {});
             };
 
@@ -82,5 +80,7 @@ angular.module('app')
                 });
             };
 
+
+
             $scope.getPkGuids();
     }]);

app/controllers/pkguidedit.controller.js

@@ -35,6 +35,20 @@ angular.module('app')
                 }
             };
 
+            $scope.askRemoveOne = function (pkguid) {
+                var confirm = $mdDialog.confirm()
+                    .title(AppUtilsBusiness.tr('common.confirmDelete'))
+                    .textContent(AppUtilsBusiness.tr('pkguid.deleteOne', {text: pkguid.someText}))
+                    .ok(AppUtilsBusiness.tr('common.delete'))
+                    .cancel(AppUtilsBusiness.tr('common.cancel'));
+                $mdDialog.show(confirm).then(function() {
+                    pkGuidBusiness.deleteDbo(pkguid.id, 'pkguid.edit').then(function(data)
+                    {
+                        $state.go('pkguid');
+                    }, function(error) {});
+                }, function () {});
+            };
+
 
             if ($state.params != null) {
                 if ($state.params.pkguid != null) {

app/index.html

@@ -46,6 +46,9 @@
     <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/signalr/jquery.signalR.min.js"></script>
+    <script src="/signalr/hubs"></script>
+    <script src="../bower_components/angular-signalr-hub/signalr-hub.min.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

@@ -14,6 +14,9 @@
     "menu": "Menu",
     "cancel": "Cancel",
     "ok": "OK",
+    "undo": "Undo",
+    "view": "View",
+    "save": "Save",
     "confirmDelete": "Confirm deletion",
     "pagination": {
       "of": "of",
@@ -50,6 +53,11 @@
     "add": {
       "defaultTitle": "New PkGuid",
       "defaultToolbarTitle": "PkGuids ~ New"
+    },
+    "notifications": {
+      "create": "PkGuid '{text}' was added",
+      "update": "PkGuid '{text}' was updated",
+      "delete": "PkGuid '{text}' was deleted"
     }
   }
 }

app/views/pkguidedit.html

@@ -15,8 +15,11 @@
             <div flex>
                 <md-progress-linear ng-disabled="!running" md-mode="indeterminate"></md-progress-linear>
             </div>
-            <div>
-                <md-button type="submit" ng-click="!editForm.$invalid && submit()">{{ 'common.submit' | translate }}</md-button>
+            <div layout="row" layout-align="space-between center">
+                <md-button class="md-raised md-primary" type="submit" ng-click="!editForm.$invalid && submit()">{{ 'common.save' | translate }}</md-button>
+                <md-button class="md-warn md-icon-button" ng-show="pkguid.id != null" ng-click="askRemoveOne(pkguid)" title="{{ 'common.delete' | translate }}">
+                    <md-icon class="material-icons">delete</md-icon>
+                </md-button>
             </div>
             <div ng-repeat="error in busy.errors('pkguid.edit')" class="isa_error">
                 <i class="fa fa-times-circle"></i>

bower.json

@@ -20,7 +20,9 @@
     "angular-translate-loader-static-files": "^2.13.1",
     "angular-translate-interpolation-messageformat": "^2.13.1",
     "angular-busy2": "^5.2.0",
-    "luticate2-utils": "https://git.rthoni.com/luticate2/front-utils.git#develop"
+    "luticate2-utils": "https://git.rthoni.com/luticate2/front-utils.git#develop",
+    "angular-signalr-hub": "^1.6.2",
+    "signalr": "^2.2.1"
   },
   "resolutions": {
     "angular": "1.6.x",

sdk/Business/apputils.business.js

@@ -6,7 +6,8 @@
     'use strict';
 
     angular.module('appSdk')
-        .factory('AppUtilsBusiness', ['$rootScope', '$translate', 'luBusyBusiness', function($rootScope, $translate, luBusyBusiness) {
+        .factory('AppUtilsBusiness', ['$rootScope', '$translate', 'luBusyBusiness', 'luRequest',
+            function($rootScope, $translate, luBusyBusiness, luRequest) {
 
             var AppUtilsBusiness = {};
 
@@ -54,6 +55,32 @@
                 return $translate.instant(id, data);
             };
 
+            AppUtilsBusiness.addApiVersionChangedCallback = function(callback)
+            {
+                var apiVersion = null;
+                luRequest.addHook('resolve', function(url, method, dataGet, dataPost, luBusyGroups, data)
+                {
+                    if (apiVersion == null) {
+                        apiVersion = data.version;
+                    }
+                    else if (data.version != null && data.version != apiVersion) {
+                        callback(apiVersion, data.version);
+                        apiVersion = data.version;
+                    }
+                });
+
+                luRequest.addHook('reject', function(url, method, dataGet, dataPost, luBusyGroups, error)
+                {
+                    if (apiVersion == null) {
+                        apiVersion = error.data.version;
+                    }
+                    else if (error.data.version != null && error.data.version != apiVersion) {
+                        callback(apiVersion, error.data.version);
+                        apiVersion = error.data.version;
+                    }
+                });
+            };
+
             return AppUtilsBusiness;
         }]);
 })();