close socket on logout and reconnect on login

app/components/auth/auth_service.js

@@ -76,6 +76,7 @@ angular.module('ulakbus.auth')
                 $rootScope.loggedInUser = false;
                 $log.debug("loggedout");
                 $location.path("/login");
+                WSOps.close();
             });
         };
 

app/components/crud/crud_controller.js

@@ -128,8 +128,11 @@ angular.module('ulakbus.crud', ['schemaForm', 'ui.bootstrap', 'ulakbus.formServi
      *
      * @returns {object}
      */
-    .controller('CRUDController', function ($scope, $routeParams, Generator, CrudUtility) {
+    .controller('CRUDController', function ($scope, $routeParams, $location, Generator, CrudUtility) {
         // get required params by calling CrudUtility.generateParam function
+        if ($location.url().indexOf('?=') > 0) {
+            return $location.url($location.url().replace('?=', ''));
+        }
         CrudUtility.generateParam($scope, $routeParams);
         Generator.get_wf($scope);
     })
@@ -153,6 +156,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ui.bootstrap', 'ulakbus.formServi
      * @returns {object}
      */
     .controller('CRUDListFormController', function ($scope, $rootScope, $location, $sce, $http, $log, $uibModal, $timeout, Generator, $routeParams, CrudUtility) {
+        $scope.wf_step = $routeParams.step;
 
         $scope.paginate = function (reloadData) {
                        $scope.form_params.cmd = $scope.reload_cmd;

app/zetalib/form_service.js

@@ -307,7 +307,6 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                     url: scope.url,
                     wf: scope.wf,
                     nodeModelChange: function (item) {
-                        //debugger;
                     }
 
                 });

app/zetalib/socket.js

@@ -31,15 +31,22 @@ angular.module('ulakbus')
         });
 
         var websocket;
+        var refresh_count = 0;
+        var refresh_websocket = refresh_count < 5 ? 1000 : 5000;
         var generate_ws = function () {
             $log.info('Openning web socket...');
             websocket = new WS(WSUri.url);
             websocket.onopen = function (evt) {
-                wsOps.onOpen(evt)
+                wsOps.onOpen(evt);
+                refresh_count = 0;
             };
             websocket.onclose = function (evt) {
                 wsOps.onClose(evt);
-                generate_ws();
+                if (wsOps.loggedOut === true) {return;}
+                $timeout(function () {
+                    generate_ws();
+                    refresh_count += 1;
+                }, refresh_websocket);
             };
             websocket.onmessage = function (evt) {
                 wsOps.onMessage(evt)
@@ -53,6 +60,7 @@ angular.module('ulakbus')
         wsOps.onOpen = function (evt) {
             $rootScope.websocketIsOpen = true;
             $log.info("CONNECTED", evt);
+            wsOps.loggedOut === false;
         };
         wsOps.onClose = function (event) {
             $rootScope.websocketIsOpen = false;
@@ -85,7 +93,6 @@ angular.module('ulakbus')
             websocket.send(data);
             $log.info('SENT:', data);
         };
-        wsOps.retryCount = 0;
         // reactor with promise
         wsOps.request = function (data) {
             var request = {
@@ -103,6 +110,13 @@ angular.module('ulakbus')
             );
         };
 
+        wsOps.close = function () {
+            wsOps.loggedOut = true;
+            websocket.close();
+            $log.info("CLOSED");
+            delete websocket;
+        }
+
         wsOps.waitForSocketConnection = function (socket, callback) {
             $timeout(
                 function () {

bower.json

@@ -16,6 +16,7 @@
     "angular-cookies": "1.4.7",
     "angular-bootstrap": "0.14.3",
     "angular-i18n": "1.4.7",
+    "angular-markdown-filter": "1.3.2",
     "font-awesome": "4.3.0",
     "angular-schema-form": "0.8.3",
     "angular-loading-bar": "~0.8.0",
@@ -24,7 +25,8 @@
     "angular-chart.js": "~0.5.2",
     "angular-gettext": "2.1.0",
     "intro.js": "1.1.1",
-    "moment": "2.10.6"
+    "moment": "2.10.6",
+    "toastr": "*"
   },
   "resolutions": {
     "angular": "1.4.7"