thread lock

Step.Tasks/ThreadsHandler.cs

@@ -38,8 +38,8 @@ namespace Step.Core
 
     public static void StartWorkers()
     {
-
-      RunningThreadStatus.Clear();
+      lock (RunningThreadStatus)
+        RunningThreadStatus.Clear();
 
       // For each function run in the list a thread
       ThreadFunctionsList.ForEach(threadFunction =>
@@ -53,8 +53,8 @@ namespace Step.Core
         lock (RunningThreadsList)
           RunningThreadsList.Add(t);
 
-        
-        RunningThreadStatus.Add(threadFunction.Method.Name, "---");
+        lock (RunningThreadStatus)
+          RunningThreadStatus.Add(threadFunction.Method.Name, "---");
       });
 
       MessageServices.Current.Publish(MVVM_NC_THREADS, null, RunningThreadStatus);
@@ -74,8 +74,11 @@ namespace Step.Core
       lock (RunningThreadsList)
         RunningThreadsList.Clear();
 
-      RunningThreadStatus.Clear();
-      RunningThreadStatus.Add("TryNcConnection", "---");
+      lock (RunningThreadStatus)
+      {
+        RunningThreadStatus.Clear();
+        RunningThreadStatus.Add("TryNcConnection", "---");
+      }
       MessageServices.Current.Publish(MVVM_NC_THREADS, null, RunningThreadStatus);
     }
   }

Step/wwwroot/assets/styles/base/buttons.less

@@ -31,6 +31,12 @@ button.btn[disabled] {
     }
 }
 
+.btn-demo{
+  color: #fff;
+  font-size: 22px;
+  font-weight: bold;
+}
+
 
 button.btn {
     height: @button-height;

Step/wwwroot/assets/styles/style.css

@@ -272,6 +272,11 @@ button.btn[disabled] {
 button.btn[disabled]:hover {
   box-shadow: none !important;
 }
+.btn-demo {
+  color: #fff;
+  font-size: 22px;
+  font-weight: bold;
+}
 button.btn {
   height: 48px;
   box-sizing: border-box;

Step/wwwroot/dist/0.build.js

@@ -20,7 +20,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n    value: true\n});\nvar Hub = /** @class */function () {\n    function Hub() {\n        this._hub = $.connection.ncHub;\n        // Registro le callback;\n        this._hub.client.alarms = function (r) {\n            console.log(r);\n        };\n        this._hub.client.powerOn = function (r) {\n            console.log(r);\n        };\n        $.connection.hub.start();\n    }\n    Hub.prototype.Hello = function () {\n        this._hub.server.hello();\n    };\n    return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL3NlcnZpY2VzL2h1Yi50cz9jOGIwIl0sInNvdXJjZXNDb250ZW50IjpbIlxyXG5pbXBvcnQgQWxhcm1zTW9kZWxBY3Rpb25zSW50ZXJmYWNlIGZyb20gXCIuLi9zdG9yZS9hbGFybXMuc3RvcmVcIlxyXG5kZWNsYXJlIGxldCAkOiBhbnk7XHJcblxyXG5leHBvcnQgY2xhc3MgSHViIHtcclxuXHJcbiAgcHJpdmF0ZSBfaHViOiBhbnk7XHJcblxyXG4gIGNvbnN0cnVjdG9yKCkge1xyXG5cclxuICAgIHRoaXMuX2h1YiA9ICQuY29ubmVjdGlvbi5uY0h1YjtcclxuXHJcbiAgICAvLyBSZWdpc3RybyBsZSBjYWxsYmFjaztcclxuXHJcbiAgICB0aGlzLl9odWIuY2xpZW50LmFsYXJtcyA9IChyKSA9PiB7IGNvbnNvbGUubG9nKHIpO307XHJcbiAgICB0aGlzLl9odWIuY2xpZW50LnBvd2VyT24gPSAocikgPT4geyBjb25zb2xlLmxvZyhyKTt9O1xyXG5cclxuICAgICQuY29ubmVjdGlvbi5odWIuc3RhcnQoKTtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBIZWxsbyAoKXtcclxuICAgIHRoaXMuX2h1Yi5zZXJ2ZXIuaGVsbG8oKTtcclxuICB9XHJcbn1cclxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL3NlcnZpY2VzL2h1Yi50cyJdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFJQTtBQUlBO0FBRUE7QUFFQTtBQUVBO0FBQUE7QUFBQTtBQUNBO0FBQUE7QUFBQTtBQUVBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQW5CQTtBIiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///587\n");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n    value: true\n});\nvar Hub = /** @class */function () {\n    function Hub() {\n        this._hub = $.connection.ncHub;\n        // Registro le callback;\n        this._hub.client.alarms = function (r) {\n            console.log(r);\n        };\n        this._hub.client.powerOn = function (r) {\n            console.log(r);\n        };\n        $.connection.hub.start();\n    }\n    Hub.prototype.manageAlarmsCallbacks = function (alarms) {};\n    Hub.prototype.managePowerCallbacks = function () {};\n    Hub.prototype.Hello = function () {\n        this._hub.server.hello();\n    };\n    return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL3NlcnZpY2VzL2h1Yi50cz9jOGIwIl0sInNvdXJjZXNDb250ZW50IjpbIlxuaW1wb3J0IEFsYXJtc01vZGVsQWN0aW9uc0ludGVyZmFjZSBmcm9tIFwiLi4vc3RvcmUvYWxhcm1zLnN0b3JlXCJcbmltcG9ydCB7IHNpZ25hbHIgfSBmcm9tIFwic3JjL0B0eXBlcy9zaWduYWxyLmFsYXJtc1wiO1xuZGVjbGFyZSBsZXQgJDogYW55O1xuXG5leHBvcnQgY2xhc3MgSHViIHtcblxuICBwcml2YXRlIF9odWI6IGFueTtcblxuICBjb25zdHJ1Y3RvcigpIHtcblxuICAgIHRoaXMuX2h1YiA9ICQuY29ubmVjdGlvbi5uY0h1YjtcblxuICAgIC8vIFJlZ2lzdHJvIGxlIGNhbGxiYWNrO1xuICAgIHRoaXMuX2h1Yi5jbGllbnQuYWxhcm1zID0gKHIpID0+IHsgY29uc29sZS5sb2cocik7fTtcbiAgICB0aGlzLl9odWIuY2xpZW50LnBvd2VyT24gPSAocikgPT4geyBjb25zb2xlLmxvZyhyKTt9O1xuXG4gICAgJC5jb25uZWN0aW9uLmh1Yi5zdGFydCgpO1xuICB9XG5cbiAgcHJpdmF0ZSBtYW5hZ2VBbGFybXNDYWxsYmFja3MoYWxhcm1zOiBzaWduYWxyLmFsYXJtTWVzc2FnZSl7XG5cbiAgfVxuXG4gIHByaXZhdGUgbWFuYWdlUG93ZXJDYWxsYmFja3MoKXtcblxuICB9XG5cblxuICBwdWJsaWMgSGVsbG8gKCl7XG4gICAgdGhpcy5faHViLnNlcnZlci5oZWxsbygpO1xuICB9XG59XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvc2VydmljZXMvaHViLnRzIl0sIm1hcHBpbmdzIjoiOzs7OztBQUtBO0FBSUE7QUFFQTtBQUVBO0FBQ0E7QUFBQTtBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBRUE7QUFDQTtBQUVBO0FBSUE7QUFLQTtBQUNBO0FBQ0E7QUFDQTtBQTNCQTtBIiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///587\n");
 
 /***/ }),
 

Step/wwwroot/src/@types/signalr.alarms.d.ts

@@ -0,0 +1,20 @@
+import { processModelActions } from "src/store";
+
+declare module signalr {
+  interface genericAlarm {
+    alarmMessage: string,
+    dateTime: Date
+  }
+
+  interface processAlarm{
+    alarmMessage: string,
+    process: number,
+    dateTime: Date
+  }
+
+  interface alarmMessage{
+    NcAlarms: Array<genericAlarm>,
+    PlcAlarms: Array<genericAlarm>,
+    ProcessAlarms: Array<processAlarm>,
+  }
+}

Step/wwwroot/src/modules/app-footer.vue

@@ -15,6 +15,7 @@
         <img src="assets/icons/png/siemens-logo.png" v-if="isSiemens">
         <img src="assets/icons/png/fanuc-logo.png" v-if="isFanuc">
         <img src="assets/icons/png/osai-logo.png" v-if="isOsai">
+        <span v-if="isDemo" class="btn-demo">DEMO</span>
       </button>
     </div>
   </footer>

Step/wwwroot/src/services/hub.ts

@@ -1,5 +1,6 @@
 
 import AlarmsModelActionsInterface from "../store/alarms.store"
+import { signalr } from "src/@types/signalr.alarms";
 declare let $: any;
 
 export class Hub {
@@ -11,13 +12,21 @@ export class Hub {
     this._hub = $.connection.ncHub;
 
     // Registro le callback;
-
     this._hub.client.alarms = (r) => { console.log(r);};
     this._hub.client.powerOn = (r) => { console.log(r);};
 
     $.connection.hub.start();
   }
 
+  private manageAlarmsCallbacks(alarms: signalr.alarmMessage){
+
+  }
+
+  private managePowerCallbacks(){
+
+  }
+
+
   public Hello (){
     this._hub.server.hello();
   }