diff --git a/Step.Config/Config/ncSoftKeyConfig.xml b/Step.Config/Config/ncSoftKeyConfig.xml index 050f9417..7942bc27 100644 --- a/Step.Config/Config/ncSoftKeyConfig.xml +++ b/Step.Config/Config/ncSoftKeyConfig.xml @@ -3,114 +3,141 @@ true Auto + false true Edit + false true Mdi + false true Dnc + false true Ref + false true Jog + false true Jog Inc + false true Restart + false true Teach + false true Restract + false true Wcs Mcs + false true Handle + true true Reset + false true Blk/Blk + false true Blk Del + false true OpStop + false true DryRun + false true PrgTest + false true Manual Handle Interrupt + false true Teach In + false true - Inc Plane + Inc Planefalse true + + false true - + false true Rapid + false true x1 + false true x10 + false true x10 + false true x10 + false \ No newline at end of file diff --git a/Step.Config/Config/ncSoftKeyConfigValidator.xsd b/Step.Config/Config/ncSoftKeyConfigValidator.xsd index 3217250c..7384a502 100644 --- a/Step.Config/Config/ncSoftKeyConfigValidator.xsd +++ b/Step.Config/Config/ncSoftKeyConfigValidator.xsd @@ -8,7 +8,8 @@ - + + diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml index 37fb494c..95a9f468 100644 --- a/Step.Config/Config/serverConfig.xml +++ b/Step.Config/Config/serverConfig.xml @@ -3,7 +3,7 @@ DEMO true - 192.168.157.2 + localhost 8080 Ares 37 OF diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs index aea019a2..53386dc0 100644 --- a/Step.Config/ServerConfigController.cs +++ b/Step.Config/ServerConfigController.cs @@ -221,7 +221,8 @@ namespace Step.Config Id = GetPlcIdFromNcSoftKey(x.Name.ToString()), Name = x.Name.ToString(), VisualizedName = x.Element("visualizedName").Value, - IsActive = Convert.ToBoolean(x.Element("active").Value) + IsActive = Convert.ToBoolean(x.Element("active").Value), + IsReadOnly = Convert.ToBoolean(x.Element("readOnly").Value) }) .ToList(); } diff --git a/Step.Model/ConfigModels/NcSoftKeysModel.cs b/Step.Model/ConfigModels/NcSoftKeysModel.cs index b9c19c02..d6b4065c 100644 --- a/Step.Model/ConfigModels/NcSoftKeysModel.cs +++ b/Step.Model/ConfigModels/NcSoftKeysModel.cs @@ -4,6 +4,7 @@ { public int Id; public bool IsActive; + public bool IsReadOnly; public string Name; public string VisualizedName; } diff --git a/Step/Controllers/WebApi/ConfigurationController.cs b/Step/Controllers/WebApi/ConfigurationController.cs index 33d49873..03bdaec9 100644 --- a/Step/Controllers/WebApi/ConfigurationController.cs +++ b/Step/Controllers/WebApi/ConfigurationController.cs @@ -51,7 +51,7 @@ namespace Step.Controllers.WebApi } [Route("softKeys"), HttpGet] - public IHttpActionResult GetSoftKeysConfig() + public IHttpActionResult GetUserSoftKeysConfig() { Dictionary> output = new Dictionary>(); foreach (var softKey in SoftKeysConfig) diff --git a/Step/Listeners/SignalR/SignalRListener.cs b/Step/Listeners/SignalR/SignalRListener.cs index 5dff0b5a..123047f7 100644 --- a/Step/Listeners/SignalR/SignalRListener.cs +++ b/Step/Listeners/SignalR/SignalRListener.cs @@ -213,7 +213,7 @@ namespace Step.Listeners.SignalR // Send user softKeys context.Clients.Group("ncData").userSoftKeys(LastUserSoftKeysData); // Send heads data - context.Clients.Group("ncData").heads(LastHeadsData); + context.Clients.Group("ncData").headsData(LastHeadsData); // Send axesNames data context.Clients.Group("ncData").axesNames(LastAxesNamesData); diff --git a/Step/wwwroot/dist/1.build.js b/Step/wwwroot/dist/1.build.js index b5204ec2..d2c2b56e 100644 --- a/Step/wwwroot/dist/1.build.js +++ b/Step/wwwroot/dist/1.build.js @@ -18,7 +18,11 @@ eval("// style-loader: Adds some css to the DOM by adding a \\n\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkwLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1lbXB0eS52dWU/OThmZCJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuLnRlc3QtZW1wdHl7XFxuICBkaXNwbGF5OiBmbGV4O1xcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcXG4gIGp1c3RpZnktY29udGVudDogY2VudGVyO1xcbiAgd2lkdGg6IDEwMCU7XFxuICBoZWlnaHQ6IDEwMCU7XFxufVxcblwiLCBcIlwiLCB7XCJ2ZXJzaW9uXCI6MyxcInNvdXJjZXNcIjpbXCJDOi9Xb3JrL1NDTS9DTVMvU3RlcC9TdGVwL3d3d3Jvb3Qvc3JjL2NvbXBvbmVudHMvc3JjL2NvbXBvbmVudHMvdGVzdC1lbXB0eS52dWU/NjExMTQzYjhcIl0sXCJuYW1lc1wiOltdLFwibWFwcGluZ3NcIjpcIjtBQWFBO0VBQ0EsY0FBQTtFQUNBLG9CQUFBO0VBQ0Esd0JBQUE7RUFDQSxZQUFBO0VBQ0EsYUFBQTtDQUNBXCIsXCJmaWxlXCI6XCJ0ZXN0LWVtcHR5LnZ1ZVwiLFwic291cmNlc0NvbnRlbnRcIjpbXCI8dGVtcGxhdGU+XFxuICA8ZGl2IGNsYXNzPVxcXCJ0ZXN0LWVtcHR5XFxcIj5cXG4gICAgPGtleXBhZD48L2tleXBhZD5cXG4gIDwvZGl2PlxcbjwvdGVtcGxhdGU+XFxuPHNjcmlwdD5cXG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFxcXCJzcmMvbW9kdWxlcy9iYXNlLWNvbXBvbmVudHNcXFwiO1xcblxcbmV4cG9ydCBkZWZhdWx0IHtcXG4gIGNvbXBvbmVudHM6IHsga2V5cGFkOiBLZXlwYWQgfVxcbn07XFxuPC9zY3JpcHQ+XFxuPHN0eWxlPlxcbiAgLnRlc3QtZW1wdHl7XFxuICAgIGRpc3BsYXk6IGZsZXg7XFxuICAgIGFsaWduLWl0ZW1zOiBjZW50ZXI7XFxuICAgIGp1c3RpZnktY29udGVudDogY2VudGVyO1xcbiAgICB3aWR0aDogMTAwJTtcXG4gICAgaGVpZ2h0OiAxMDAlO1xcbiAgfVxcbjwvc3R5bGU+XFxuXFxuXCJdLFwic291cmNlUm9vdFwiOlwiXCJ9XSk7XG5cbi8vIGV4cG9ydHNcblxuXG5cbi8vLy8vLy8vLy8vLy8vLy8vL1xuLy8gV0VCUEFDSyBGT09URVJcbi8vIC4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXI/c291cmNlTWFwIS4vbm9kZV9tb2R1bGVzL3Z1ZS1sb2FkZXIvbGliL3N0eWxlLWNvbXBpbGVyP3tcInZ1ZVwiOnRydWUsXCJpZFwiOlwiZGF0YS12LTBhOGVjNzQyXCIsXCJzY29wZWRcIjpmYWxzZSxcImhhc0lubGluZUNvbmZpZ1wiOmZhbHNlfSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zZWxlY3Rvci5qcz90eXBlPXN0eWxlcyZpbmRleD0wJmJ1c3RDYWNoZSEuL3NyYy9jb21wb25lbnRzL3Rlc3QtZW1wdHkudnVlXG4vLyBtb2R1bGUgaWQgPSA1OTBcbi8vIG1vZHVsZSBjaHVua3MgPSAxIl0sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///590\n"); +======= +eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\n.test-empty{\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n width: 100%;\\n height: 100%;\\n}\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Workspace/CMS_STEP/Step/wwwroot/src/components/src/components/test-empty.vue?796c190c\"],\"names\":[],\"mappings\":\";AAaA;EACA,cAAA;EACA,oBAAA;EACA,wBAAA;EACA,YAAA;EACA,aAAA;CACA\",\"file\":\"test-empty.vue\",\"sourcesContent\":[\"\\r\\n\\r\\n\\r\\n\\r\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkwLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1lbXB0eS52dWU/OThmZCJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuLnRlc3QtZW1wdHl7XFxuICBkaXNwbGF5OiBmbGV4O1xcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcXG4gIGp1c3RpZnktY29udGVudDogY2VudGVyO1xcbiAgd2lkdGg6IDEwMCU7XFxuICBoZWlnaHQ6IDEwMCU7XFxufVxcblwiLCBcIlwiLCB7XCJ2ZXJzaW9uXCI6MyxcInNvdXJjZXNcIjpbXCJDOi9Xb3Jrc3BhY2UvQ01TX1NURVAvU3RlcC93d3dyb290L3NyYy9jb21wb25lbnRzL3NyYy9jb21wb25lbnRzL3Rlc3QtZW1wdHkudnVlPzc5NmMxOTBjXCJdLFwibmFtZXNcIjpbXSxcIm1hcHBpbmdzXCI6XCI7QUFhQTtFQUNBLGNBQUE7RUFDQSxvQkFBQTtFQUNBLHdCQUFBO0VBQ0EsWUFBQTtFQUNBLGFBQUE7Q0FDQVwiLFwiZmlsZVwiOlwidGVzdC1lbXB0eS52dWVcIixcInNvdXJjZXNDb250ZW50XCI6W1wiPHRlbXBsYXRlPlxcclxcbiAgPGRpdiBjbGFzcz1cXFwidGVzdC1lbXB0eVxcXCI+XFxyXFxuICAgIDxrZXlwYWQ+PC9rZXlwYWQ+XFxyXFxuICA8L2Rpdj5cXHJcXG48L3RlbXBsYXRlPlxcclxcbjxzY3JpcHQ+XFxyXFxuaW1wb3J0IHsgS2V5cGFkIH0gZnJvbSBcXFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXFxcIjtcXHJcXG5cXHJcXG5leHBvcnQgZGVmYXVsdCB7XFxyXFxuICBjb21wb25lbnRzOiB7IGtleXBhZDogS2V5cGFkIH1cXHJcXG59O1xcclxcbjwvc2NyaXB0PlxcclxcbjxzdHlsZT5cXHJcXG4gIC50ZXN0LWVtcHR5e1xcclxcbiAgICBkaXNwbGF5OiBmbGV4O1xcclxcbiAgICBhbGlnbi1pdGVtczogY2VudGVyO1xcclxcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcXHJcXG4gICAgd2lkdGg6IDEwMCU7XFxyXFxuICAgIGhlaWdodDogMTAwJTtcXHJcXG4gIH1cXHJcXG48L3N0eWxlPlxcclxcblxcclxcblwiXSxcInNvdXJjZVJvb3RcIjpcIlwifV0pO1xuXG4vLyBleHBvcnRzXG5cblxuXG4vLy8vLy8vLy8vLy8vLy8vLy9cbi8vIFdFQlBBQ0sgRk9PVEVSXG4vLyAuL25vZGVfbW9kdWxlcy9jc3MtbG9hZGVyP3NvdXJjZU1hcCEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zdHlsZS1jb21waWxlcj97XCJ2dWVcIjp0cnVlLFwiaWRcIjpcImRhdGEtdi0wYThlYzc0MlwiLFwic2NvcGVkXCI6ZmFsc2UsXCJoYXNJbmxpbmVDb25maWdcIjpmYWxzZX0hLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc2VsZWN0b3IuanM/dHlwZT1zdHlsZXMmaW5kZXg9MCZidXN0Q2FjaGUhLi9zcmMvY29tcG9uZW50cy90ZXN0LWVtcHR5LnZ1ZVxuLy8gbW9kdWxlIGlkID0gNTkwXG4vLyBtb2R1bGUgY2h1bmtzID0gMSJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///590\n"); +>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b /***/ }), @@ -26,7 +30,11 @@ eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\ /***/ (function(module, exports, __webpack_require__) { "use strict"; +<<<<<<< HEAD eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { keypad: _baseComponents.Keypad }\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkxLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtZW1wdHkudnVlP2M2ZjIiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwidGVzdC1lbXB0eVwiPlxuICAgIDxrZXlwYWQ+PC9rZXlwYWQ+XG4gIDwvZGl2PlxuPC90ZW1wbGF0ZT5cbjxzY3JpcHQ+XG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgY29tcG9uZW50czogeyBrZXlwYWQ6IEtleXBhZCB9XG59O1xuPC9zY3JpcHQ+XG48c3R5bGU+XG4gIC50ZXN0LWVtcHR5e1xuICAgIGRpc3BsYXk6IGZsZXg7XG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcbiAgICB3aWR0aDogMTAwJTtcbiAgICBoZWlnaHQ6IDEwMCU7XG4gIH1cbjwvc3R5bGU+XG5cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyB0ZXN0LWVtcHR5LnZ1ZT82MTExNDNiOCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQURBOzs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///591\n"); +======= +eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { keypad: _baseComponents.Keypad }\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkxLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtZW1wdHkudnVlP2FlNGQiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxyXG4gIDxkaXYgY2xhc3M9XCJ0ZXN0LWVtcHR5XCI+XHJcbiAgICA8a2V5cGFkPjwva2V5cGFkPlxyXG4gIDwvZGl2PlxyXG48L3RlbXBsYXRlPlxyXG48c2NyaXB0PlxyXG5pbXBvcnQgeyBLZXlwYWQgfSBmcm9tIFwic3JjL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XHJcblxyXG5leHBvcnQgZGVmYXVsdCB7XHJcbiAgY29tcG9uZW50czogeyBrZXlwYWQ6IEtleXBhZCB9XHJcbn07XHJcbjwvc2NyaXB0PlxyXG48c3R5bGU+XHJcbiAgLnRlc3QtZW1wdHl7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAgYWxpZ24taXRlbXM6IGNlbnRlcjtcclxuICAgIGp1c3RpZnktY29udGVudDogY2VudGVyO1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbiAgICBoZWlnaHQ6IDEwMCU7XHJcbiAgfVxyXG48L3N0eWxlPlxyXG5cclxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHRlc3QtZW1wdHkudnVlPzc5NmMxOTBjIl0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFNQTtBQUNBOztBQUdBO0FBREE7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///591\n"); +>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b /***/ }), diff --git a/Step/wwwroot/dist/2.build.js b/Step/wwwroot/dist/2.build.js index 9eefbe11..29cb039c 100644 --- a/Step/wwwroot/dist/2.build.js +++ b/Step/wwwroot/dist/2.build.js @@ -18,7 +18,11 @@ eval("// style-loader: Adds some css to the DOM by adding a \\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg0LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvSG9tZS52dWU/YTAzYyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuaDFbZGF0YS12LWZlZDM2OTIyXSxcXG5oMltkYXRhLXYtZmVkMzY5MjJdIHtcXG4gIGZvbnQtd2VpZ2h0OiBub3JtYWw7XFxufVxcbnVsW2RhdGEtdi1mZWQzNjkyMl0ge1xcbiAgbGlzdC1zdHlsZS10eXBlOiBub25lO1xcbiAgcGFkZGluZzogMDtcXG59XFxubGlbZGF0YS12LWZlZDM2OTIyXSB7XFxuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XFxuICBtYXJnaW46IDAgMTBweDtcXG59XFxuYVtkYXRhLXYtZmVkMzY5MjJdIHtcXG4gIGNvbG9yOiAjNDJiOTgzO1xcbn1cXG5cIiwgXCJcIiwge1widmVyc2lvblwiOjMsXCJzb3VyY2VzXCI6W1wiQzovV29yay9TQ00vQ01TL1N0ZXAvU3RlcC93d3dyb290L3NyYy9jb21wb25lbnRzL3NyYy9jb21wb25lbnRzL0hvbWUudnVlPzI1YjFkN2U0XCJdLFwibmFtZXNcIjpbXSxcIm1hcHBpbmdzXCI6XCI7QUFzQkE7O0VBRUEsb0JBQUE7Q0FDQTtBQUNBO0VBQ0Esc0JBQUE7RUFDQSxXQUFBO0NBQ0E7QUFDQTtFQUNBLHNCQUFBO0VBQ0EsZUFBQTtDQUNBO0FBQ0E7RUFDQSxlQUFBO0NBQ0FcIixcImZpbGVcIjpcIkhvbWUudnVlXCIsXCJzb3VyY2VzQ29udGVudFwiOltcIjx0ZW1wbGF0ZT5cXG4gIDxkaXYgY2xhc3M9XFxcImhlbGxvXFxcIj5cXG5cXG4gIDwvZGl2PlxcbjwvdGVtcGxhdGU+XFxuXFxuPHNjcmlwdD5cXG5cXG5cXG5leHBvcnQgZGVmYXVsdCB7XFxuICBuYW1lOiBcXFwiSGVsbG9Xb3JsZFxcXCIsXFxuICBjb21wb25lbnRzOiB7ICB9LFxcbiAgZGF0YSgpIHtcXG4gICAgcmV0dXJuIHtcXG4gICAgICBtc2c6IFxcXCJXZWxjb21lIHRvIFlvdXIgVnVlLmpzIEFwcFxcXCJcXG4gICAgfTtcXG4gIH1cXG59O1xcbjwvc2NyaXB0PlxcblxcbjwhLS0gQWRkIFxcXCJzY29wZWRcXFwiIGF0dHJpYnV0ZSB0byBsaW1pdCBDU1MgdG8gdGhpcyBjb21wb25lbnQgb25seSAtLT5cXG48c3R5bGUgc2NvcGVkPlxcbmgxLFxcbmgyIHtcXG4gIGZvbnQtd2VpZ2h0OiBub3JtYWw7XFxufVxcbnVsIHtcXG4gIGxpc3Qtc3R5bGUtdHlwZTogbm9uZTtcXG4gIHBhZGRpbmc6IDA7XFxufVxcbmxpIHtcXG4gIGRpc3BsYXk6IGlubGluZS1ibG9jaztcXG4gIG1hcmdpbjogMCAxMHB4O1xcbn1cXG5hIHtcXG4gIGNvbG9yOiAjNDJiOTgzO1xcbn1cXG48L3N0eWxlPlxcblwiXSxcInNvdXJjZVJvb3RcIjpcIlwifV0pO1xuXG4vLyBleHBvcnRzXG5cblxuXG4vLy8vLy8vLy8vLy8vLy8vLy9cbi8vIFdFQlBBQ0sgRk9PVEVSXG4vLyAuL25vZGVfbW9kdWxlcy9jc3MtbG9hZGVyP3NvdXJjZU1hcCEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zdHlsZS1jb21waWxlcj97XCJ2dWVcIjp0cnVlLFwiaWRcIjpcImRhdGEtdi1mZWQzNjkyMlwiLFwic2NvcGVkXCI6dHJ1ZSxcImhhc0lubGluZUNvbmZpZ1wiOmZhbHNlfSEuL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9zZWxlY3Rvci5qcz90eXBlPXN0eWxlcyZpbmRleD0wJmJ1c3RDYWNoZSEuL3NyYy9jb21wb25lbnRzL0hvbWUudnVlXG4vLyBtb2R1bGUgaWQgPSA1ODRcbi8vIG1vZHVsZSBjaHVua3MgPSAyIl0sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///584\n"); +======= +eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\n// module\nexports.push([module.i, \"\\nh1[data-v-fed36922],\\r\\nh2[data-v-fed36922] {\\r\\n font-weight: normal;\\n}\\nul[data-v-fed36922] {\\r\\n list-style-type: none;\\r\\n padding: 0;\\n}\\nli[data-v-fed36922] {\\r\\n display: inline-block;\\r\\n margin: 0 10px;\\n}\\na[data-v-fed36922] {\\r\\n color: #42b983;\\n}\\r\\n\", \"\", {\"version\":3,\"sources\":[\"C:/Workspace/CMS_STEP/Step/wwwroot/src/components/src/components/Home.vue?7ecdb9dc\"],\"names\":[],\"mappings\":\";AAsBA;;EAEA,oBAAA;CACA;AACA;EACA,sBAAA;EACA,WAAA;CACA;AACA;EACA,sBAAA;EACA,eAAA;CACA;AACA;EACA,eAAA;CACA\",\"file\":\"Home.vue\",\"sourcesContent\":[\"\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\"],\"sourceRoot\":\"\"}]);\n\n// exports\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg0LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvSG9tZS52dWU/YTAzYyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnRzID0gbW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKFwiLi4vLi4vbm9kZV9tb2R1bGVzL2Nzcy1sb2FkZXIvbGliL2Nzcy1iYXNlLmpzXCIpKHRydWUpO1xuLy8gaW1wb3J0c1xuXG5cbi8vIG1vZHVsZVxuZXhwb3J0cy5wdXNoKFttb2R1bGUuaWQsIFwiXFxuaDFbZGF0YS12LWZlZDM2OTIyXSxcXHJcXG5oMltkYXRhLXYtZmVkMzY5MjJdIHtcXHJcXG4gIGZvbnQtd2VpZ2h0OiBub3JtYWw7XFxufVxcbnVsW2RhdGEtdi1mZWQzNjkyMl0ge1xcclxcbiAgbGlzdC1zdHlsZS10eXBlOiBub25lO1xcclxcbiAgcGFkZGluZzogMDtcXG59XFxubGlbZGF0YS12LWZlZDM2OTIyXSB7XFxyXFxuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XFxyXFxuICBtYXJnaW46IDAgMTBweDtcXG59XFxuYVtkYXRhLXYtZmVkMzY5MjJdIHtcXHJcXG4gIGNvbG9yOiAjNDJiOTgzO1xcbn1cXHJcXG5cIiwgXCJcIiwge1widmVyc2lvblwiOjMsXCJzb3VyY2VzXCI6W1wiQzovV29ya3NwYWNlL0NNU19TVEVQL1N0ZXAvd3d3cm9vdC9zcmMvY29tcG9uZW50cy9zcmMvY29tcG9uZW50cy9Ib21lLnZ1ZT83ZWNkYjlkY1wiXSxcIm5hbWVzXCI6W10sXCJtYXBwaW5nc1wiOlwiO0FBc0JBOztFQUVBLG9CQUFBO0NBQ0E7QUFDQTtFQUNBLHNCQUFBO0VBQ0EsV0FBQTtDQUNBO0FBQ0E7RUFDQSxzQkFBQTtFQUNBLGVBQUE7Q0FDQTtBQUNBO0VBQ0EsZUFBQTtDQUNBXCIsXCJmaWxlXCI6XCJIb21lLnZ1ZVwiLFwic291cmNlc0NvbnRlbnRcIjpbXCI8dGVtcGxhdGU+XFxyXFxuICA8ZGl2IGNsYXNzPVxcXCJoZWxsb1xcXCI+XFxyXFxuXFxyXFxuICA8L2Rpdj5cXHJcXG48L3RlbXBsYXRlPlxcclxcblxcclxcbjxzY3JpcHQ+XFxyXFxuXFxyXFxuXFxyXFxuZXhwb3J0IGRlZmF1bHQge1xcclxcbiAgbmFtZTogXFxcIkhlbGxvV29ybGRcXFwiLFxcclxcbiAgY29tcG9uZW50czogeyAgfSxcXHJcXG4gIGRhdGEoKSB7XFxyXFxuICAgIHJldHVybiB7XFxyXFxuICAgICAgbXNnOiBcXFwiV2VsY29tZSB0byBZb3VyIFZ1ZS5qcyBBcHBcXFwiXFxyXFxuICAgIH07XFxyXFxuICB9XFxyXFxufTtcXHJcXG48L3NjcmlwdD5cXHJcXG5cXHJcXG48IS0tIEFkZCBcXFwic2NvcGVkXFxcIiBhdHRyaWJ1dGUgdG8gbGltaXQgQ1NTIHRvIHRoaXMgY29tcG9uZW50IG9ubHkgLS0+XFxyXFxuPHN0eWxlIHNjb3BlZD5cXHJcXG5oMSxcXHJcXG5oMiB7XFxyXFxuICBmb250LXdlaWdodDogbm9ybWFsO1xcclxcbn1cXHJcXG51bCB7XFxyXFxuICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7XFxyXFxuICBwYWRkaW5nOiAwO1xcclxcbn1cXHJcXG5saSB7XFxyXFxuICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7XFxyXFxuICBtYXJnaW46IDAgMTBweDtcXHJcXG59XFxyXFxuYSB7XFxyXFxuICBjb2xvcjogIzQyYjk4MztcXHJcXG59XFxyXFxuPC9zdHlsZT5cXHJcXG5cIl0sXCJzb3VyY2VSb290XCI6XCJcIn1dKTtcblxuLy8gZXhwb3J0c1xuXG5cblxuLy8vLy8vLy8vLy8vLy8vLy8vXG4vLyBXRUJQQUNLIEZPT1RFUlxuLy8gLi9ub2RlX21vZHVsZXMvY3NzLWxvYWRlcj9zb3VyY2VNYXAhLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc3R5bGUtY29tcGlsZXI/e1widnVlXCI6dHJ1ZSxcImlkXCI6XCJkYXRhLXYtZmVkMzY5MjJcIixcInNjb3BlZFwiOnRydWUsXCJoYXNJbmxpbmVDb25maWdcIjpmYWxzZX0hLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvc2VsZWN0b3IuanM/dHlwZT1zdHlsZXMmaW5kZXg9MCZidXN0Q2FjaGUhLi9zcmMvY29tcG9uZW50cy9Ib21lLnZ1ZVxuLy8gbW9kdWxlIGlkID0gNTg0XG4vLyBtb2R1bGUgY2h1bmtzID0gMiJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///584\n"); +>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b /***/ }), @@ -26,7 +30,11 @@ eval("exports = module.exports = __webpack_require__(77)(true);\n// imports\n\n\ /***/ (function(module, exports, __webpack_require__) { "use strict"; +<<<<<<< HEAD eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n//\n//\n//\n//\n//\n//\n\n\nexports.default = {\n name: \"HelloWorld\",\n components: {},\n data: function data() {\n return {\n msg: \"Welcome to Your Vue.js App\"\n };\n }\n};//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg1LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL0hvbWUudnVlP2YwZmMiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxuICA8ZGl2IGNsYXNzPVwiaGVsbG9cIj5cblxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG5cbjxzY3JpcHQ+XG5cblxuZXhwb3J0IGRlZmF1bHQge1xuICBuYW1lOiBcIkhlbGxvV29ybGRcIixcbiAgY29tcG9uZW50czogeyAgfSxcbiAgZGF0YSgpIHtcbiAgICByZXR1cm4ge1xuICAgICAgbXNnOiBcIldlbGNvbWUgdG8gWW91ciBWdWUuanMgQXBwXCJcbiAgICB9O1xuICB9XG59O1xuPC9zY3JpcHQ+XG5cbjwhLS0gQWRkIFwic2NvcGVkXCIgYXR0cmlidXRlIHRvIGxpbWl0IENTUyB0byB0aGlzIGNvbXBvbmVudCBvbmx5IC0tPlxuPHN0eWxlIHNjb3BlZD5cbmgxLFxuaDIge1xuICBmb250LXdlaWdodDogbm9ybWFsO1xufVxudWwge1xuICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7XG4gIHBhZGRpbmc6IDA7XG59XG5saSB7XG4gIGRpc3BsYXk6IGlubGluZS1ibG9jaztcbiAgbWFyZ2luOiAwIDEwcHg7XG59XG5hIHtcbiAgY29sb3I6ICM0MmI5ODM7XG59XG48L3N0eWxlPlxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIEhvbWUudnVlPzI1YjFkN2U0Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBU0E7QUFDQTtBQUNBOztBQUFBO0FBQ0E7QUFDQTs7QUFFQTtBQURBO0FBR0E7QUFQQSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///585\n"); +======= +eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n//\n//\n//\n//\n//\n//\n\n\nexports.default = {\n name: \"HelloWorld\",\n components: {},\n data: function data() {\n return {\n msg: \"Welcome to Your Vue.js App\"\n };\n }\n};//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg1LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL0hvbWUudnVlPzQ0ZTQiXSwic291cmNlc0NvbnRlbnQiOlsiPHRlbXBsYXRlPlxyXG4gIDxkaXYgY2xhc3M9XCJoZWxsb1wiPlxyXG5cclxuICA8L2Rpdj5cclxuPC90ZW1wbGF0ZT5cclxuXHJcbjxzY3JpcHQ+XHJcblxyXG5cclxuZXhwb3J0IGRlZmF1bHQge1xyXG4gIG5hbWU6IFwiSGVsbG9Xb3JsZFwiLFxyXG4gIGNvbXBvbmVudHM6IHsgIH0sXHJcbiAgZGF0YSgpIHtcclxuICAgIHJldHVybiB7XHJcbiAgICAgIG1zZzogXCJXZWxjb21lIHRvIFlvdXIgVnVlLmpzIEFwcFwiXHJcbiAgICB9O1xyXG4gIH1cclxufTtcclxuPC9zY3JpcHQ+XHJcblxyXG48IS0tIEFkZCBcInNjb3BlZFwiIGF0dHJpYnV0ZSB0byBsaW1pdCBDU1MgdG8gdGhpcyBjb21wb25lbnQgb25seSAtLT5cclxuPHN0eWxlIHNjb3BlZD5cclxuaDEsXHJcbmgyIHtcclxuICBmb250LXdlaWdodDogbm9ybWFsO1xyXG59XHJcbnVsIHtcclxuICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7XHJcbiAgcGFkZGluZzogMDtcclxufVxyXG5saSB7XHJcbiAgZGlzcGxheTogaW5saW5lLWJsb2NrO1xyXG4gIG1hcmdpbjogMCAxMHB4O1xyXG59XHJcbmEge1xyXG4gIGNvbG9yOiAjNDJiOTgzO1xyXG59XHJcbjwvc3R5bGU+XHJcblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyBIb21lLnZ1ZT83ZWNkYjlkYyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQVNBO0FBQ0E7QUFDQTs7QUFBQTtBQUNBO0FBQ0E7O0FBRUE7QUFEQTtBQUdBO0FBUEEiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///585\n"); +>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b /***/ }), diff --git a/Step/wwwroot/dist/3.build.js b/Step/wwwroot/dist/3.build.js index c864a178..a98c974b 100644 --- a/Step/wwwroot/dist/3.build.js +++ b/Step/wwwroot/dist/3.build.js @@ -12,7 +12,11 @@ eval("Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true } /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +<<<<<<< HEAD eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(10);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component__ = __webpack_require__(36);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_class_component__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store__ = __webpack_require__(19);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__store__);\nvar __extends = (this && this.__extends) || (function () {\r\n var extendStatics = Object.setPrototypeOf ||\r\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\r\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\r\n return function (d, b) {\r\n extendStatics(d, b);\r\n function __() { this.constructor = d; }\r\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\r\n };\r\n})();\r\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\r\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\r\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\r\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\r\n return c > 3 && r && Object.defineProperty(target, key, r), r;\r\n};\r\n\r\n\r\n\r\nvar TestStatus = /** @class */ (function (_super) {\r\n __extends(TestStatus, _super);\r\n function TestStatus() {\r\n return _super !== null && _super.apply(this, arguments) || this;\r\n }\r\n TestStatus.prototype.addProcess = function () {\r\n // processModelActions.addProcess(this.$store, {});\r\n };\r\n TestStatus.prototype.removeProcess = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"processModelActions\"].removeAllProcess(this.$store);\r\n };\r\n TestStatus.prototype.removeAlarms = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].removeAllAlarms(this.$store);\r\n };\r\n TestStatus.prototype.addService = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].addServiceAlarm(this.$store, { message: \"Lorem Ipsum dolor sit amen ... \", dateTime: new Date() });\r\n };\r\n TestStatus = __decorate([\r\n __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default()({})\r\n ], TestStatus);\r\n return TestStatus;\r\n}(__WEBPACK_IMPORTED_MODULE_0_vue__[\"default\"]));\r\n/* harmony default export */ __webpack_exports__[\"a\"] = (TestStatus);\r\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkzLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1zdGF0dXMudHM/YzBhNiJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVnVlIGZyb20gXCJ2dWVcIjtcbmltcG9ydCBDb21wb25lbnQgZnJvbSBcInZ1ZS1jbGFzcy1jb21wb25lbnRcIjtcblxuaW1wb3J0IHtcbiAgbWFjaGluZVN0YXR1c0FjdGlvbnMsXG4gIE1hY2hpbmVTdGF0dXNNb2RlbCxcbiAgYWxhcm1zTW9kZWxBY3Rpb25zLFxuICBwcm9jZXNzTW9kZWxBY3Rpb25zXG59IGZyb20gXCIuLi9zdG9yZVwiO1xuXG5AQ29tcG9uZW50KHt9KVxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVGVzdFN0YXR1cyBleHRlbmRzIFZ1ZSB7XG5cblxuICBhZGRQcm9jZXNzKCkge1xuICAgIC8vIHByb2Nlc3NNb2RlbEFjdGlvbnMuYWRkUHJvY2Vzcyh0aGlzLiRzdG9yZSwge30pO1xuICB9XG4gIHJlbW92ZVByb2Nlc3MoKSB7XG4gICAgcHJvY2Vzc01vZGVsQWN0aW9ucy5yZW1vdmVBbGxQcm9jZXNzKHRoaXMuJHN0b3JlKTtcbiAgfVxuXG4gIHJlbW92ZUFsYXJtcygpIHtcbiAgICBhbGFybXNNb2RlbEFjdGlvbnMucmVtb3ZlQWxsQWxhcm1zKHRoaXMuJHN0b3JlKTtcbiAgfVxuICBhZGRTZXJ2aWNlKCkge1xuICAgIGFsYXJtc01vZGVsQWN0aW9ucy5hZGRTZXJ2aWNlQWxhcm0odGhpcy4kc3RvcmUsIHsgIG1lc3NhZ2U6IFwiTG9yZW0gSXBzdW0gZG9sb3Igc2l0IGFtZW4gLi4uIFwiLCBkYXRlVGltZTogbmV3IERhdGUoKX0gYXMgYW55KTtcbiAgfVxufVxuXG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvY29tcG9uZW50cy90ZXN0LXN0YXR1cy50cyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFDQTtBQUVBO0FBUUE7QUFBQTtBQUFBOztBQWdCQTtBQWJBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQWZBO0FBREE7QUFDQTtBQWdCQTtBQUFBO0FBaEJBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///593\n"); +======= +eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(10);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component__ = __webpack_require__(36);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_class_component__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store__ = __webpack_require__(19);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__store___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__store__);\nvar __extends = (this && this.__extends) || (function () {\r\n var extendStatics = Object.setPrototypeOf ||\r\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\r\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\r\n return function (d, b) {\r\n extendStatics(d, b);\r\n function __() { this.constructor = d; }\r\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\r\n };\r\n})();\r\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\r\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\r\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\r\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\r\n return c > 3 && r && Object.defineProperty(target, key, r), r;\r\n};\r\n\r\n\r\n\r\nvar TestStatus = /** @class */ (function (_super) {\r\n __extends(TestStatus, _super);\r\n function TestStatus() {\r\n return _super !== null && _super.apply(this, arguments) || this;\r\n }\r\n TestStatus.prototype.addProcess = function () {\r\n // processModelActions.addProcess(this.$store, {});\r\n };\r\n TestStatus.prototype.removeProcess = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"processModelActions\"].removeAllProcess(this.$store);\r\n };\r\n TestStatus.prototype.removeAlarms = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].removeAllAlarms(this.$store);\r\n };\r\n TestStatus.prototype.addService = function () {\r\n __WEBPACK_IMPORTED_MODULE_2__store__[\"alarmsModelActions\"].addServiceAlarm(this.$store, { message: \"Lorem Ipsum dolor sit amen ... \", dateTime: new Date() });\r\n };\r\n TestStatus = __decorate([\r\n __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default()({})\r\n ], TestStatus);\r\n return TestStatus;\r\n}(__WEBPACK_IMPORTED_MODULE_0_vue__[\"default\"]));\r\n/* harmony default export */ __webpack_exports__[\"a\"] = (TestStatus);\r\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTkzLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL2NvbXBvbmVudHMvdGVzdC1zdGF0dXMudHM/YzBhNiJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVnVlIGZyb20gXCJ2dWVcIjtcclxuaW1wb3J0IENvbXBvbmVudCBmcm9tIFwidnVlLWNsYXNzLWNvbXBvbmVudFwiO1xyXG5cclxuaW1wb3J0IHtcclxuICBtYWNoaW5lU3RhdHVzQWN0aW9ucyxcclxuICBNYWNoaW5lU3RhdHVzTW9kZWwsXHJcbiAgYWxhcm1zTW9kZWxBY3Rpb25zLFxyXG4gIHByb2Nlc3NNb2RlbEFjdGlvbnNcclxufSBmcm9tIFwiLi4vc3RvcmVcIjtcclxuXHJcbkBDb21wb25lbnQoe30pXHJcbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFRlc3RTdGF0dXMgZXh0ZW5kcyBWdWUge1xyXG5cclxuXHJcbiAgYWRkUHJvY2VzcygpIHtcclxuICAgIC8vIHByb2Nlc3NNb2RlbEFjdGlvbnMuYWRkUHJvY2Vzcyh0aGlzLiRzdG9yZSwge30pO1xyXG4gIH1cclxuICByZW1vdmVQcm9jZXNzKCkge1xyXG4gICAgcHJvY2Vzc01vZGVsQWN0aW9ucy5yZW1vdmVBbGxQcm9jZXNzKHRoaXMuJHN0b3JlKTtcclxuICB9XHJcblxyXG4gIHJlbW92ZUFsYXJtcygpIHtcclxuICAgIGFsYXJtc01vZGVsQWN0aW9ucy5yZW1vdmVBbGxBbGFybXModGhpcy4kc3RvcmUpO1xyXG4gIH1cclxuICBhZGRTZXJ2aWNlKCkge1xyXG4gICAgYWxhcm1zTW9kZWxBY3Rpb25zLmFkZFNlcnZpY2VBbGFybSh0aGlzLiRzdG9yZSwgeyAgbWVzc2FnZTogXCJMb3JlbSBJcHN1bSBkb2xvciBzaXQgYW1lbiAuLi4gXCIsIGRhdGVUaW1lOiBuZXcgRGF0ZSgpfSBhcyBhbnkpO1xyXG4gIH1cclxufVxyXG5cclxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL2NvbXBvbmVudHMvdGVzdC1zdGF0dXMudHMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQ0E7QUFFQTtBQVFBO0FBQUE7QUFBQTs7QUFnQkE7QUFiQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFmQTtBQURBO0FBQ0E7QUFnQkE7QUFBQTtBQWhCQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///593\n"); +>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b /***/ }), diff --git a/Step/wwwroot/dist/4.build.js b/Step/wwwroot/dist/4.build.js index ad759442..5c8a4cd0 100644 --- a/Step/wwwroot/dist/4.build.js +++ b/Step/wwwroot/dist/4.build.js @@ -12,7 +12,11 @@ eval("Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true } /***/ (function(module, exports, __webpack_require__) { "use strict"; +<<<<<<< HEAD eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { loader: _baseComponents.Loader }\n\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtbG9hZGVyLnZ1ZT8yOGU1Il0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cbiAgPGRpdj5cbiAgICA8bG9hZGVyIHRpdGxlPVwiQXR0ZW5kZXJlIHByZWdvXCIgbWVzc2FnZT1cIkF6emVyYW1lbnRvIGFzc2kgLi4uLlwiIDpwZXJjZW50PVwiNTBcIiA6aXNWaXNpYmxlPVwidHJ1ZVwiPjwvbG9hZGVyPlxuICA8L2Rpdj5cbjwvdGVtcGxhdGU+XG48c2NyaXB0PlxuaW1wb3J0IHsgTG9hZGVyIH0gZnJvbSBcIi4uL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XG5leHBvcnQgZGVmYXVsdCB7XG4gIGNvbXBvbmVudHM6eyBsb2FkZXI6IExvYWRlcn1cblxufVxuPC9zY3JpcHQ+XG5cblxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHRlc3QtbG9hZGVyLnZ1ZT82ZDdhNjYwNiJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBTUE7QUFDQTs7QUFHQTtBQUNBO0FBSEE7Ozs7QSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///587\n"); +======= +eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n\nvar _baseComponents = __webpack_require__(50);\n\nexports.default = {\n components: { loader: _baseComponents.Loader }\n\n}; //\n//\n//\n//\n////# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg3LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL3Rlc3QtbG9hZGVyLnZ1ZT8xY2RhIl0sInNvdXJjZXNDb250ZW50IjpbIjx0ZW1wbGF0ZT5cclxuICA8ZGl2PlxyXG4gICAgPGxvYWRlciB0aXRsZT1cIkF0dGVuZGVyZSBwcmVnb1wiIG1lc3NhZ2U9XCJBenplcmFtZW50byBhc3NpIC4uLi5cIiA6cGVyY2VudD1cIjUwXCIgOmlzVmlzaWJsZT1cInRydWVcIj48L2xvYWRlcj5cclxuICA8L2Rpdj5cclxuPC90ZW1wbGF0ZT5cclxuPHNjcmlwdD5cclxuaW1wb3J0IHsgTG9hZGVyIH0gZnJvbSBcIi4uL21vZHVsZXMvYmFzZS1jb21wb25lbnRzXCI7XHJcbmV4cG9ydCBkZWZhdWx0IHtcclxuICBjb21wb25lbnRzOnsgbG9hZGVyOiBMb2FkZXJ9XHJcblxyXG59XHJcbjwvc2NyaXB0PlxyXG5cclxuXHJcblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyB0ZXN0LWxvYWRlci52dWU/MjQ1ZGQ1MjMiXSwibWFwcGluZ3MiOiI7Ozs7OztBQU1BO0FBQ0E7O0FBR0E7QUFDQTtBQUhBOzs7O0EiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///587\n"); +>>>>>>> 75aae82f85fbcd653f0586ca12d32f08ce441a7b /***/ }), diff --git a/Step/wwwroot/dist/build.js b/Step/wwwroot/dist/build.js index 04e77e65..c611faab 100644 --- a/Step/wwwroot/dist/build.js +++ b/Step/wwwroot/dist/build.js @@ -624,7 +624,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n}); /***/ (function(module, exports, __webpack_require__) { "use strict"; -eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.Hub = undefined;\n\nvar _store = __webpack_require__(19);\n\nvar _izitoast = __webpack_require__(111);\n\nvar _izitoast2 = _interopRequireDefault(_izitoast);\n\nvar _base = __webpack_require__(14);\n\nvar _runningProcess = __webpack_require__(108);\n\nvar _machineService = __webpack_require__(80);\n\nvar _baseComponents = __webpack_require__(50);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction recalcArrayId(prefix, alarms, processid) {\n if (processid === void 0) {\n processid = 0;\n }\n for (var key in alarms) {\n if (alarms.hasOwnProperty(key)) {\n var element = alarms[key];\n element.guid = prefix + \"__\" + (element.id || element.Id).toString();\n element.source = prefix.toUpperCase();\n }\n }\n}\nvar Hub = /** @class */function () {\n function Hub() {\n this._axesVisible = false;\n Hub._current = this;\n this._hub = $.connection.ncHub;\n // Registro le callback;\n this._hub.client.alarms = this.manageAlarmsCallbacks;\n this._hub.client.powerOn = this.managePowerCallbacks;\n this._hub.client.ncNetworkStatus = Hub.manageNcStatus;\n this._hub.client.processesData = Hub.manageProcesses;\n this._hub.client.functionalityData = Hub.functionalityData;\n this._hub.client.expiredMaintenances = Hub.expiredMaintenances;\n this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;\n this._hub.client.ncSoftKeys = Hub.userSoftKeyChanged;\n this._hub.client.heads = Hub.headsDataChanged;\n this._hub.client.logout = this.logout;\n // Token per signalr agganciato in modo esplicito\n var authData = JSON.parse(window.sessionStorage.getItem(\"authorizationData\") || window.localStorage.getItem(\"authorizationData\"));\n $.connection.hub.qs = {};\n if (authData) $.connection.hub.qs.Authorization = authData.access_token;\n if (typeof cmsClient != \"undefined\") $.connection.hub.qs.CmsClientId = cmsClient.getClientID;\n $.connection.hub.start();\n this.checkShowAxes();\n }\n Object.defineProperty(Hub, \"Current\", {\n get: function get() {\n if (!Hub._current) new Hub();\n return Hub._current;\n },\n enumerable: true,\n configurable: true\n });\n Object.defineProperty(Hub.prototype, \"InternalSignalRChannel\", {\n get: function get() {\n return this._hub;\n },\n enumerable: true,\n configurable: true\n });\n Hub.prototype.logout = function (e) {\n if (e) _store.appModelActions.CheckLogoff(_store.store, e.id);\n };\n Hub.ncSoftKeyChanged = function (status) {\n console.log(status);\n };\n Hub.userSoftKeyChanged = function (status) {\n for (var k in status) {\n if (status.hasOwnProperty(k)) {\n _store.machineStatusActions.setSoftKeyStatus(_store.store, status[k]);\n }\n }\n };\n Hub.headsDataChanged = function (status) {\n console.log(\"heads\", status);\n };\n Hub.functionalityData = function (status) {\n _store.machineStatusActions.setSecurityFunction(_store.store, status);\n };\n Hub.expiredMaintenances = function (status) {\n for (var key in status) {\n if (status.hasOwnProperty(key)) {\n var element = status[key];\n _store.alarmsModelActions.addServiceAlarm(_store.store, { guid: \"maint_\" + element.Id, id: element.Id, dateTime: new Date(element.ExpirationDate) });\n }\n }\n _store.alarmsModelActions.checkRemoveServiceAlarm(_store.store, status.map(function (i) {\n return \"maint_\" + i.Id;\n }));\n };\n Hub.manageProcesses = function (status) {\n console.debug(status);\n if (status) {\n _runningProcess.processModelActions.isRunning(_store.store, status.isRunning);\n for (var key in status.processes) {\n if (status.processes.hasOwnProperty(key)) {\n var element = status.processes[key];\n _runningProcess.processModelActions.addProcess(_store.store, element);\n }\n }\n _runningProcess.processModelActions.checkRemove(_store.store, status.processes.map(function (i) {\n return i.Id;\n }));\n }\n };\n Hub.manageNcStatus = function (status) {\n if (Hub._ncConnectionNotificationVisible && status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n var toast = document.querySelector('#ncConnection');\n _izitoast2.default.hide(toast);\n new _machineService.machineService().getMachineCNInfo();\n Hub._ncConnectionNotificationVisible = false;\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (!Hub._ncConnectionNotificationVisible && !status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _izitoast2.default.warning({\n id: \"ncConnection\", timeout: false, toastOnce: true, theme: \"dark\", title: \"nc offline\", close: false, closeOnEscape: false, drag: false\n });\n Hub._ncConnectionNotificationVisible = true;\n _store.alarmsModelActions.removeAllAlarms(_store.store);\n _runningProcess.processModelActions.isRunning(_store.store, false);\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (_store.store.state.machineStatus.ncReady != status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n }\n };\n Hub.prototype.manageAlarmsCallbacks = function (alarms) {\n recalcArrayId(\"cn\", alarms.NcAlarms);\n recalcArrayId(\"plc\", alarms.PlcAlarms);\n recalcArrayId(\"cn\", alarms.ProcessAlarms);\n var tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);\n for (var key in tempList) {\n if (tempList.hasOwnProperty(key)) {\n var element = tempList[key];\n if (element.isWarning) _store.alarmsModelActions.addWarning(_store.store, element);else _store.alarmsModelActions.addAlarm(_store.store, element);\n }\n }\n _store.alarmsModelActions.checkRemove(_store.store, tempList.map(function (i) {\n return i.guid;\n }));\n };\n Hub.prototype.managePowerCallbacks = function (power) {\n _store.machineStatusActions.setResetAxes(_store.store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });\n // Pre-power on\n _store.machineStatusActions.setAirPressureAlarm(_store.store, power.PrePowerOn.AirPressure);\n _store.machineStatusActions.setPowerAlarm(_store.store, power.PrePowerOn.PowerOn);\n _store.machineStatusActions.setEmergencyAlarm(_store.store, power.PrePowerOn.EmergencyButtons);\n _store.machineStatusActions.setProtectionsAlarm(_store.store, power.PrePowerOn.ProtectionStatus);\n _store.machineStatusActions.setSettingsModeAlarm(_store.store, power.PrePowerOn.SettingMode);\n _store.machineStatusActions.setKeyReadyAlarm(_store.store, power.PrePowerOn.StartingKey);\n // Post-power on\n _store.machineStatusActions.setResetAxesAlarm(_store.store, power.PostPowerOn.AxisReset);\n _store.machineStatusActions.setWaterJet1Alarm(_store.store, power.PostPowerOn.WaterjetPump);\n };\n Hub.prototype.checkShowAxes = function () {\n var me = this;\n function check(resettingAxes) {\n window.setTimeout(function () {\n if (resettingAxes && !me._axesVisible) {\n _base.Factory.Get(_base.MessageService).publishToChannel(\"show-axes-calibration\");\n me._axesVisible = true;\n } else if (!resettingAxes && me._axesVisible) {\n _baseComponents.ModalHelper.HideModal();\n me._axesVisible = false;\n }\n }, 500);\n }\n _store.store.watch(function (s) {\n return s.machineStatus.resetAxes;\n }, function (n, o) {\n if (!_store.store.state.currentUser) return;\n check(n);\n });\n _store.store.watch(function (s) {\n return s.currentUser;\n }, function (n, o) {\n if (n && _store.store.state.machineStatus.resetAxes) check(_store.store.state.machineStatus.resetAxes);\n });\n };\n Hub.prototype.sendPowerCommand = function (id) {\n this._hub.server.putPowerOnData(id);\n };\n Hub.prototype.RefreshAlarm = function (id) {\n this._hub.server.refreshAlarm(id);\n };\n Hub.prototype.RefreshAllAlarms = function () {\n this._hub.server.refreshAllAlarms();\n };\n Hub.prototype.RecoveryProcedure = function (id) {\n this._hub.server.recoveryProcedure(id);\n };\n Hub.prototype.sendUserSoftKey = function (id) {\n this._hub.server.userSoftKeyClick(id);\n };\n Hub.prototype.ncSoftKeyClick = function (id) {\n this._hub.server.ncSoftKeyClick(id);\n };\n Hub.prototype.Hello = function () {\n this._hub.server.hello();\n };\n Hub._ncConnectionNotificationVisible = false;\n return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"76.js","sources":["webpack:///./src/services/hub.ts?c8b0"],"sourcesContent":["\nimport { AlarmsModelActionsInterface } from \"../store/alarms.store\"\n\nimport { store, alarmsModelActions, machineStatusActions, machineInfoActions, AppModel, appModelActions } from \"src/store\";\nimport { alarmDetail } from \"src/modules/alarms\";\nimport iziToast, { IziToastSettings } from \"izitoast\";\nimport { Factory, MessageService } from \"src/_base\";\nimport { signalr_alarms } from \"src/@types/signalr.alarms\";\nimport { processModelActions } from \"src/store/runningProcess.store\";\nimport { machineService } from \"src/services/machineService\";\nimport { ModalHelper } from \"../modules/base-components\";\nimport { AuthToken } from \"src/_base/baseRestService\";\nimport { SoftKeyModel } from \"../store/machineStatus.store\";\n\ndeclare let $: any;\ndeclare let cmsClient: any;\n\nfunction recalcArrayId(prefix: string, alarms: Array<signalr_alarms.genericAlarm>, processid: number = 0) {\n  for (const key in alarms) {\n    if (alarms.hasOwnProperty(key)) {\n      const element = alarms[key];\n      element.guid = prefix + \"__\" + (element.id || element.Id).toString();\n      element.source = prefix.toUpperCase();\n    }\n  }\n}\n\nexport class Hub {\n\n  static _ncConnectionNotificationVisible?: boolean = false;\n\n\n  // singleton hub implementation\n\n  private static _current: Hub;\n  static get Current(): Hub {\n\n    if (!Hub._current) new Hub();\n\n    return Hub._current;\n  }\n\n  public get InternalSignalRChannel(): any { return this._hub; }\n  private _hub: any;\n\n  constructor() {\n    Hub._current = this;\n\n    this._hub = $.connection.ncHub;\n\n    // Registro le callback;\n    this._hub.client.alarms = this.manageAlarmsCallbacks;\n    this._hub.client.powerOn = this.managePowerCallbacks;\n    this._hub.client.ncNetworkStatus = Hub.manageNcStatus;\n    this._hub.client.processesData = Hub.manageProcesses;\n    this._hub.client.functionalityData = Hub.functionalityData;\n    this._hub.client.expiredMaintenances = Hub.expiredMaintenances;\n\n    this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;\n    this._hub.client.ncSoftKeys = Hub.userSoftKeyChanged;\n    this._hub.client.heads = Hub.headsDataChanged;\n\n    this._hub.client.logout = this.logout;\n\n    // Token per signalr agganciato in modo esplicito\n    let authData = JSON.parse(window.sessionStorage.getItem(\"authorizationData\") || window.localStorage.getItem(\"authorizationData\")) as AuthToken;\n\n\n    $.connection.hub.qs = {};\n\n    if (authData)\n      $.connection.hub.qs.Authorization = authData.access_token;\n\n    if (typeof cmsClient != \"undefined\")\n      $.connection.hub.qs.CmsClientId = cmsClient.getClientID;\n\n    $.connection.hub.start();\n\n    this.checkShowAxes();\n  }\n\n  private logout(e) {\n    if (e)\n      appModelActions.CheckLogoff(store, e.id);\n  }\n\n  private static ncSoftKeyChanged(status) {\n    console.log(status);\n  }\n\n  private static userSoftKeyChanged(status) {\n    for (const k in status) {\n      if (status.hasOwnProperty(k)) {\n        machineStatusActions.setSoftKeyStatus(store, status[k] as SoftKeyModel);\n      }\n    }\n  }\n\n\n  private static headsDataChanged(status) {\n    console.log(\"heads\", status);\n  }\n\n  private static functionalityData(status) {\n    machineStatusActions.setSecurityFunction(store, status);\n  }\n\n  private static expiredMaintenances(status) {\n\n    for (const key in status) {\n      if (status.hasOwnProperty(key)) {\n        const element = status[key];\n        alarmsModelActions.addServiceAlarm(store, { guid: \"maint_\" + element.Id, id: element.Id, dateTime: new Date(element.ExpirationDate) } as any)\n      }\n    }\n    alarmsModelActions.checkRemoveServiceAlarm(store, status.map(i => \"maint_\" + i.Id));\n  }\n\n  private static manageProcesses(status: signalr_process.DTOProcessDataModel) {\n    console.debug(status);\n    if (status) {\n      processModelActions.isRunning(store, status.isRunning);\n\n      for (const key in status.processes) {\n        if (status.processes.hasOwnProperty(key)) {\n          const element = status.processes[key];\n          processModelActions.addProcess(store, element);\n        }\n      }\n\n      processModelActions.checkRemove(store, status.processes.map(i => i.Id));\n    }\n  }\n\n  private static manageNcStatus(status) {\n\n    if (Hub._ncConnectionNotificationVisible && status.connected) {\n      machineStatusActions.setNcConnectionStatus(store, status.connected);\n      var toast = document.querySelector('#ncConnection') as any;\n      (iziToast as any).hide(toast);\n      new machineService().getMachineCNInfo();\n      Hub._ncConnectionNotificationVisible = false;\n      Factory.Get(MessageService).publishToChannel(\"force-ui-update\", null);\n      return;\n    }\n\n    if (!Hub._ncConnectionNotificationVisible && !status.connected) {\n      machineStatusActions.setNcConnectionStatus(store, status.connected);\n      iziToast.warning({\n        id: \"ncConnection\", timeout: false, toastOnce: true, theme: \"dark\", title: \"nc offline\", close: false, closeOnEscape: false, drag: false\n      } as IziToastSettings);\n      Hub._ncConnectionNotificationVisible = true;\n\n      alarmsModelActions.removeAllAlarms(store);\n      processModelActions.isRunning(store, false);\n      Factory.Get(MessageService).publishToChannel(\"force-ui-update\", null);\n      return;\n    }\n\n    if ((store.state as AppModel).machineStatus.ncReady != status.connected) {\n      machineStatusActions.setNcConnectionStatus(store, status.connected);\n      Factory.Get(MessageService).publishToChannel(\"force-ui-update\", null);\n    }\n  }\n\n  private manageAlarmsCallbacks(alarms: signalr_alarms.alarmMessage) {\n\n    recalcArrayId(\"cn\", alarms.NcAlarms);\n    recalcArrayId(\"plc\", alarms.PlcAlarms);\n    recalcArrayId(\"cn\", alarms.ProcessAlarms);\n\n    let tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);\n\n    for (const key in tempList) {\n      if (tempList.hasOwnProperty(key)) {\n        const element = tempList[key];\n\n        if (element.isWarning)\n          alarmsModelActions.addWarning(store, element);\n        else\n          alarmsModelActions.addAlarm(store, element);\n      }\n    }\n\n    alarmsModelActions.checkRemove(store, tempList.map(i => i.guid));\n  }\n\n  private managePowerCallbacks(power: signalr_alarms.powerMessage) {\n\n\n\n    machineStatusActions.setResetAxes(store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });\n\n    // Pre-power on\n    machineStatusActions.setAirPressureAlarm(store, power.PrePowerOn.AirPressure);\n    machineStatusActions.setPowerAlarm(store, power.PrePowerOn.PowerOn);\n    machineStatusActions.setEmergencyAlarm(store, power.PrePowerOn.EmergencyButtons);\n    machineStatusActions.setProtectionsAlarm(store, power.PrePowerOn.ProtectionStatus);\n    machineStatusActions.setSettingsModeAlarm(store, power.PrePowerOn.SettingMode);\n    machineStatusActions.setKeyReadyAlarm(store, power.PrePowerOn.StartingKey);\n\n    // Post-power on\n    machineStatusActions.setResetAxesAlarm(store, power.PostPowerOn.AxisReset);\n    machineStatusActions.setWaterJet1Alarm(store, power.PostPowerOn.WaterjetPump);\n  }\n\n  _axesVisible: boolean = false;\n  private checkShowAxes() {\n    let me = this;\n\n    function check(resettingAxes) {\n      window.setTimeout(() => {\n        if (resettingAxes && !me._axesVisible) {\n          Factory.Get(MessageService).publishToChannel(\"show-axes-calibration\");\n          me._axesVisible = true;\n        }\n        else if (!resettingAxes && me._axesVisible) {\n          ModalHelper.HideModal();\n          me._axesVisible = false;\n        }\n      }, 500);\n    }\n\n    store.watch(s => (s as AppModel).machineStatus.resetAxes, (n, o) => {\n      if (!(store.state as AppModel).currentUser) return;\n      check(n)\n    });\n\n    store.watch(s => (s as AppModel).currentUser, (n, o) => {\n      if (n && (store.state as AppModel).machineStatus.resetAxes) check((store.state as AppModel).machineStatus.resetAxes);\n    })\n  }\n\n  public sendPowerCommand(id: number) {\n    this._hub.server.putPowerOnData(id);\n  }\n\n  public RefreshAlarm(id: string) {\n    this._hub.server.refreshAlarm(id);\n  }\n\n  public RefreshAllAlarms() {\n    this._hub.server.refreshAllAlarms();\n  }\n\n  public RecoveryProcedure(id: string) {\n    this._hub.server.recoveryProcedure(id);\n  }\n\n  public sendUserSoftKey(id: number) {\n    this._hub.server.userSoftKeyClick(id);\n  }\n\n  public ncSoftKeyClick(id: number) {\n    this._hub.server.ncSoftKeyClick(id);\n  }\n\n  public Hello() {\n    this._hub.server.hello();\n  }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/services/hub.ts"],"mappings":";;;;;;;AAGA;AACA;AACA;AACA;;;AAAA;AACA;AACA;AACA;AAAA;AACA;AAAA;AACA;;;AAMA;AAAA;AAAA;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAkBA;AAiKA;AAhKA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AAGA;AAEA;AAGA;AAGA;AAEA;AACA;AA5CA;AAAA;AAEA;AAEA;AACA;;AAAA;;AAEA;AAAA;AAAA;AAAA;;AAAA;;AAuCA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAAA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AADA;AAGA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AAIA;AACA;AAEA;AAAA;AAAA;AACA;AAEA;AAIA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAtOA;AAuOA;AAzOA;AAAA","sourceRoot":""}\n//# sourceURL=webpack-internal:///76\n"); +eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.Hub = undefined;\n\nvar _store = __webpack_require__(19);\n\nvar _izitoast = __webpack_require__(111);\n\nvar _izitoast2 = _interopRequireDefault(_izitoast);\n\nvar _base = __webpack_require__(14);\n\nvar _runningProcess = __webpack_require__(108);\n\nvar _machineService = __webpack_require__(80);\n\nvar _baseComponents = __webpack_require__(50);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction recalcArrayId(prefix, alarms, processid) {\n if (processid === void 0) {\n processid = 0;\n }\n for (var key in alarms) {\n if (alarms.hasOwnProperty(key)) {\n var element = alarms[key];\n element.guid = prefix + \"__\" + (element.id || element.Id).toString();\n element.source = prefix.toUpperCase();\n }\n }\n}\nvar Hub = /** @class */function () {\n function Hub() {\n this._axesVisible = false;\n Hub._current = this;\n this._hub = $.connection.ncHub;\n // Registro le callback;\n this._hub.client.alarms = this.manageAlarmsCallbacks;\n this._hub.client.powerOn = this.managePowerCallbacks;\n this._hub.client.ncNetworkStatus = Hub.manageNcStatus;\n this._hub.client.processesData = Hub.manageProcesses;\n this._hub.client.functionalityData = Hub.functionalityData;\n this._hub.client.expiredMaintenances = Hub.expiredMaintenances;\n this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;\n this._hub.client.ncSoftKeys = Hub.userSoftKeyChanged;\n this._hub.client.headsData = Hub.headsDataChanged;\n this._hub.client.logout = this.logout;\n // Token per signalr agganciato in modo esplicito\n var authData = JSON.parse(window.sessionStorage.getItem(\"authorizationData\") || window.localStorage.getItem(\"authorizationData\"));\n $.connection.hub.qs = {};\n if (authData) $.connection.hub.qs.Authorization = authData.access_token;\n if (typeof cmsClient != \"undefined\") $.connection.hub.qs.CmsClientId = cmsClient.getClientID;\n $.connection.hub.start();\n this.checkShowAxes();\n }\n Object.defineProperty(Hub, \"Current\", {\n get: function get() {\n if (!Hub._current) new Hub();\n return Hub._current;\n },\n enumerable: true,\n configurable: true\n });\n Object.defineProperty(Hub.prototype, \"InternalSignalRChannel\", {\n get: function get() {\n return this._hub;\n },\n enumerable: true,\n configurable: true\n });\n Hub.prototype.logout = function (e) {\n if (e) _store.appModelActions.CheckLogoff(_store.store, e.id);\n };\n Hub.ncSoftKeyChanged = function (status) {\n console.log(status);\n };\n Hub.userSoftKeyChanged = function (status) {\n for (var k in status) {\n if (status.hasOwnProperty(k)) {\n _store.machineStatusActions.setSoftKeyStatus(_store.store, status[k]);\n }\n }\n };\n Hub.headsDataChanged = function (status) {\n console.log(\"heads\", status);\n };\n Hub.functionalityData = function (status) {\n _store.machineStatusActions.setSecurityFunction(_store.store, status);\n };\n Hub.expiredMaintenances = function (status) {\n for (var key in status) {\n if (status.hasOwnProperty(key)) {\n var element = status[key];\n _store.alarmsModelActions.addServiceAlarm(_store.store, { guid: \"maint_\" + element.Id, id: element.Id, dateTime: new Date(element.ExpirationDate) });\n }\n }\n _store.alarmsModelActions.checkRemoveServiceAlarm(_store.store, status.map(function (i) {\n return \"maint_\" + i.Id;\n }));\n };\n Hub.manageProcesses = function (status) {\n console.debug(status);\n if (status) {\n _runningProcess.processModelActions.isRunning(_store.store, status.isRunning);\n for (var key in status.processes) {\n if (status.processes.hasOwnProperty(key)) {\n var element = status.processes[key];\n _runningProcess.processModelActions.addProcess(_store.store, element);\n }\n }\n _runningProcess.processModelActions.checkRemove(_store.store, status.processes.map(function (i) {\n return i.Id;\n }));\n }\n };\n Hub.manageNcStatus = function (status) {\n if (Hub._ncConnectionNotificationVisible && status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n var toast = document.querySelector('#ncConnection');\n _izitoast2.default.hide(toast);\n new _machineService.machineService().getMachineCNInfo();\n Hub._ncConnectionNotificationVisible = false;\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (!Hub._ncConnectionNotificationVisible && !status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _izitoast2.default.warning({\n id: \"ncConnection\", timeout: false, toastOnce: true, theme: \"dark\", title: \"nc offline\", close: false, closeOnEscape: false, drag: false\n });\n Hub._ncConnectionNotificationVisible = true;\n _store.alarmsModelActions.removeAllAlarms(_store.store);\n _runningProcess.processModelActions.isRunning(_store.store, false);\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (_store.store.state.machineStatus.ncReady != status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n }\n };\n Hub.prototype.manageAlarmsCallbacks = function (alarms) {\n recalcArrayId(\"cn\", alarms.NcAlarms);\n recalcArrayId(\"plc\", alarms.PlcAlarms);\n recalcArrayId(\"cn\", alarms.ProcessAlarms);\n var tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);\n for (var key in tempList) {\n if (tempList.hasOwnProperty(key)) {\n var element = tempList[key];\n if (element.isWarning) _store.alarmsModelActions.addWarning(_store.store, element);else _store.alarmsModelActions.addAlarm(_store.store, element);\n }\n }\n _store.alarmsModelActions.checkRemove(_store.store, tempList.map(function (i) {\n return i.guid;\n }));\n };\n Hub.prototype.managePowerCallbacks = function (power) {\n _store.machineStatusActions.setResetAxes(_store.store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });\n // Pre-power on\n _store.machineStatusActions.setAirPressureAlarm(_store.store, power.PrePowerOn.AirPressure);\n _store.machineStatusActions.setPowerAlarm(_store.store, power.PrePowerOn.PowerOn);\n _store.machineStatusActions.setEmergencyAlarm(_store.store, power.PrePowerOn.EmergencyButtons);\n _store.machineStatusActions.setProtectionsAlarm(_store.store, power.PrePowerOn.ProtectionStatus);\n _store.machineStatusActions.setSettingsModeAlarm(_store.store, power.PrePowerOn.SettingMode);\n _store.machineStatusActions.setKeyReadyAlarm(_store.store, power.PrePowerOn.StartingKey);\n // Post-power on\n _store.machineStatusActions.setResetAxesAlarm(_store.store, power.PostPowerOn.AxisReset);\n _store.machineStatusActions.setWaterJet1Alarm(_store.store, power.PostPowerOn.WaterjetPump);\n };\n Hub.prototype.checkShowAxes = function () {\n var me = this;\n function check(resettingAxes) {\n window.setTimeout(function () {\n if (resettingAxes && !me._axesVisible) {\n _base.Factory.Get(_base.MessageService).publishToChannel(\"show-axes-calibration\");\n me._axesVisible = true;\n } else if (!resettingAxes && me._axesVisible) {\n _baseComponents.ModalHelper.HideModal();\n me._axesVisible = false;\n }\n }, 500);\n }\n _store.store.watch(function (s) {\n return s.machineStatus.resetAxes;\n }, function (n, o) {\n if (!_store.store.state.currentUser) return;\n check(n);\n });\n _store.store.watch(function (s) {\n return s.currentUser;\n }, function (n, o) {\n if (n && _store.store.state.machineStatus.resetAxes) check(_store.store.state.machineStatus.resetAxes);\n });\n };\n Hub.prototype.sendPowerCommand = function (id) {\n this._hub.server.putPowerOnData(id);\n };\n Hub.prototype.RefreshAlarm = function (id) {\n this._hub.server.refreshAlarm(id);\n };\n Hub.prototype.RefreshAllAlarms = function () {\n this._hub.server.refreshAllAlarms();\n };\n Hub.prototype.RecoveryProcedure = function (id) {\n this._hub.server.recoveryProcedure(id);\n };\n Hub.prototype.sendUserSoftKey = function (id) {\n this._hub.server.userSoftKeyClick(id);\n };\n Hub.prototype.ncSoftKeyClick = function (id) {\n this._hub.server.ncSoftKeyClick(id);\n };\n Hub.prototype.Hello = function () {\n this._hub.server.hello();\n };\n Hub._ncConnectionNotificationVisible = false;\n return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"76.js","sources":["webpack:///./src/services/hub.ts?c8b0"],"sourcesContent":["\r\nimport { AlarmsModelActionsInterface } from \"../store/alarms.store\"\r\n\r\nimport { store, alarmsModelActions, machineStatusActions, machineInfoActions, AppModel, appModelActions } from \"src/store\";\r\nimport { alarmDetail } from \"src/modules/alarms\";\r\nimport iziToast, { IziToastSettings } from \"izitoast\";\r\nimport { Factory, MessageService } from \"src/_base\";\r\nimport { signalr_alarms } from \"src/@types/signalr.alarms\";\r\nimport { processModelActions } from \"src/store/runningProcess.store\";\r\nimport { machineService } from \"src/services/machineService\";\r\nimport { ModalHelper } from \"../modules/base-components\";\r\nimport { AuthToken } from \"src/_base/baseRestService\";\r\nimport { SoftKeyModel } from \"../store/machineStatus.store\";\r\n\r\ndeclare let $: any;\r\ndeclare let cmsClient: any;\r\n\r\nfunction recalcArrayId(prefix: string, alarms: Array<signalr_alarms.genericAlarm>, processid: number = 0) {\r\n  for (const key in alarms) {\r\n    if (alarms.hasOwnProperty(key)) {\r\n      const element = alarms[key];\r\n      element.guid = prefix + \"__\" + (element.id || element.Id).toString();\r\n      element.source = prefix.toUpperCase();\r\n    }\r\n  }\r\n}\r\n\r\nexport class Hub {\r\n\r\n  static _ncConnectionNotificationVisible?: boolean = false;\r\n\r\n\r\n  // singleton hub implementation\r\n\r\n  private static _current: Hub;\r\n  static get Current(): Hub {\r\n\r\n    if (!Hub._current) new Hub();\r\n\r\n    return Hub._current;\r\n  }\r\n\r\n  public get InternalSignalRChannel(): any { return this._hub; }\r\n  private _hub: any;\r\n\r\n  constructor() {\r\n    Hub._current = this;\r\n\r\n    this._hub = $.connection.ncHub;\r\n\r\n    // Registro le callback;\r\n    this._hub.client.alarms = this.manageAlarmsCallbacks;\r\n    this._hub.client.powerOn = this.managePowerCallbacks;\r\n    this._hub.client.ncNetworkStatus = Hub.manageNcStatus;\r\n    this._hub.client.processesData = Hub.manageProcesses;\r\n    this._hub.client.functionalityData = Hub.functionalityData;\r\n    this._hub.client.expiredMaintenances = Hub.expiredMaintenances;\r\n\r\n    this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged;\r\n    this._hub.client.ncSoftKeys = Hub.userSoftKeyChanged;\r\n    this._hub.client.headsData = Hub.headsDataChanged;\r\n\r\n    this._hub.client.logout = this.logout;\r\n\r\n    // Token per signalr agganciato in modo esplicito\r\n    let authData = JSON.parse(window.sessionStorage.getItem(\"authorizationData\") || window.localStorage.getItem(\"authorizationData\")) as AuthToken;\r\n\r\n\r\n    $.connection.hub.qs = {};\r\n\r\n    if (authData)\r\n      $.connection.hub.qs.Authorization = authData.access_token;\r\n\r\n    if (typeof cmsClient != \"undefined\")\r\n      $.connection.hub.qs.CmsClientId = cmsClient.getClientID;\r\n\r\n    $.connection.hub.start();\r\n\r\n    this.checkShowAxes();\r\n  }\r\n\r\n  private logout(e) {\r\n    if (e)\r\n      appModelActions.CheckLogoff(store, e.id);\r\n  }\r\n\r\n  private static ncSoftKeyChanged(status) {\r\n    console.log(status);\r\n  }\r\n\r\n  private static userSoftKeyChanged(status) {\r\n    for (const k in status) {\r\n      if (status.hasOwnProperty(k)) {\r\n        machineStatusActions.setSoftKeyStatus(store, status[k] as SoftKeyModel);\r\n      }\r\n    }\r\n  }\r\n\r\n\r\n  private static headsDataChanged(status) {\r\n    console.log(\"heads\", status);\r\n  }\r\n\r\n  private static functionalityData(status) {\r\n    machineStatusActions.setSecurityFunction(store, status);\r\n  }\r\n\r\n  private static expiredMaintenances(status) {\r\n\r\n    for (const key in status) {\r\n      if (status.hasOwnProperty(key)) {\r\n        const element = status[key];\r\n        alarmsModelActions.addServiceAlarm(store, { guid: \"maint_\" + element.Id, id: element.Id, dateTime: new Date(element.ExpirationDate) } as any)\r\n      }\r\n    }\r\n    alarmsModelActions.checkRemoveServiceAlarm(store, status.map(i => \"maint_\" + i.Id));\r\n  }\r\n\r\n  private static manageProcesses(status: signalr_process.DTOProcessDataModel) {\r\n    console.debug(status);\r\n    if (status) {\r\n      processModelActions.isRunning(store, status.isRunning);\r\n\r\n      for (const key in status.processes) {\r\n        if (status.processes.hasOwnProperty(key)) {\r\n          const element = status.processes[key];\r\n          processModelActions.addProcess(store, element);\r\n        }\r\n      }\r\n\r\n      processModelActions.checkRemove(store, status.processes.map(i => i.Id));\r\n    }\r\n  }\r\n\r\n  private static manageNcStatus(status) {\r\n\r\n    if (Hub._ncConnectionNotificationVisible && status.connected) {\r\n      machineStatusActions.setNcConnectionStatus(store, status.connected);\r\n      var toast = document.querySelector('#ncConnection') as any;\r\n      (iziToast as any).hide(toast);\r\n      new machineService().getMachineCNInfo();\r\n      Hub._ncConnectionNotificationVisible = false;\r\n      Factory.Get(MessageService).publishToChannel(\"force-ui-update\", null);\r\n      return;\r\n    }\r\n\r\n    if (!Hub._ncConnectionNotificationVisible && !status.connected) {\r\n      machineStatusActions.setNcConnectionStatus(store, status.connected);\r\n      iziToast.warning({\r\n        id: \"ncConnection\", timeout: false, toastOnce: true, theme: \"dark\", title: \"nc offline\", close: false, closeOnEscape: false, drag: false\r\n      } as IziToastSettings);\r\n      Hub._ncConnectionNotificationVisible = true;\r\n\r\n      alarmsModelActions.removeAllAlarms(store);\r\n      processModelActions.isRunning(store, false);\r\n      Factory.Get(MessageService).publishToChannel(\"force-ui-update\", null);\r\n      return;\r\n    }\r\n\r\n    if ((store.state as AppModel).machineStatus.ncReady != status.connected) {\r\n      machineStatusActions.setNcConnectionStatus(store, status.connected);\r\n      Factory.Get(MessageService).publishToChannel(\"force-ui-update\", null);\r\n    }\r\n  }\r\n\r\n  private manageAlarmsCallbacks(alarms: signalr_alarms.alarmMessage) {\r\n\r\n    recalcArrayId(\"cn\", alarms.NcAlarms);\r\n    recalcArrayId(\"plc\", alarms.PlcAlarms);\r\n    recalcArrayId(\"cn\", alarms.ProcessAlarms);\r\n\r\n    let tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);\r\n\r\n    for (const key in tempList) {\r\n      if (tempList.hasOwnProperty(key)) {\r\n        const element = tempList[key];\r\n\r\n        if (element.isWarning)\r\n          alarmsModelActions.addWarning(store, element);\r\n        else\r\n          alarmsModelActions.addAlarm(store, element);\r\n      }\r\n    }\r\n\r\n    alarmsModelActions.checkRemove(store, tempList.map(i => i.guid));\r\n  }\r\n\r\n  private managePowerCallbacks(power: signalr_alarms.powerMessage) {\r\n\r\n\r\n\r\n    machineStatusActions.setResetAxes(store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });\r\n\r\n    // Pre-power on\r\n    machineStatusActions.setAirPressureAlarm(store, power.PrePowerOn.AirPressure);\r\n    machineStatusActions.setPowerAlarm(store, power.PrePowerOn.PowerOn);\r\n    machineStatusActions.setEmergencyAlarm(store, power.PrePowerOn.EmergencyButtons);\r\n    machineStatusActions.setProtectionsAlarm(store, power.PrePowerOn.ProtectionStatus);\r\n    machineStatusActions.setSettingsModeAlarm(store, power.PrePowerOn.SettingMode);\r\n    machineStatusActions.setKeyReadyAlarm(store, power.PrePowerOn.StartingKey);\r\n\r\n    // Post-power on\r\n    machineStatusActions.setResetAxesAlarm(store, power.PostPowerOn.AxisReset);\r\n    machineStatusActions.setWaterJet1Alarm(store, power.PostPowerOn.WaterjetPump);\r\n  }\r\n\r\n  _axesVisible: boolean = false;\r\n  private checkShowAxes() {\r\n    let me = this;\r\n\r\n    function check(resettingAxes) {\r\n      window.setTimeout(() => {\r\n        if (resettingAxes && !me._axesVisible) {\r\n          Factory.Get(MessageService).publishToChannel(\"show-axes-calibration\");\r\n          me._axesVisible = true;\r\n        }\r\n        else if (!resettingAxes && me._axesVisible) {\r\n          ModalHelper.HideModal();\r\n          me._axesVisible = false;\r\n        }\r\n      }, 500);\r\n    }\r\n\r\n    store.watch(s => (s as AppModel).machineStatus.resetAxes, (n, o) => {\r\n      if (!(store.state as AppModel).currentUser) return;\r\n      check(n)\r\n    });\r\n\r\n    store.watch(s => (s as AppModel).currentUser, (n, o) => {\r\n      if (n && (store.state as AppModel).machineStatus.resetAxes) check((store.state as AppModel).machineStatus.resetAxes);\r\n    })\r\n  }\r\n\r\n  public sendPowerCommand(id: number) {\r\n    this._hub.server.putPowerOnData(id);\r\n  }\r\n\r\n  public RefreshAlarm(id: string) {\r\n    this._hub.server.refreshAlarm(id);\r\n  }\r\n\r\n  public RefreshAllAlarms() {\r\n    this._hub.server.refreshAllAlarms();\r\n  }\r\n\r\n  public RecoveryProcedure(id: string) {\r\n    this._hub.server.recoveryProcedure(id);\r\n  }\r\n\r\n  public sendUserSoftKey(id: number) {\r\n    this._hub.server.userSoftKeyClick(id);\r\n  }\r\n\r\n  public ncSoftKeyClick(id: number) {\r\n    this._hub.server.ncSoftKeyClick(id);\r\n  }\r\n\r\n  public Hello() {\r\n    this._hub.server.hello();\r\n  }\r\n}\r\n\n\n\n// WEBPACK FOOTER //\n// ./src/services/hub.ts"],"mappings":";;;;;;;AAGA;AACA;AACA;AACA;;;AAAA;AACA;AACA;AACA;AAAA;AACA;AAAA;AACA;;;AAMA;AAAA;AAAA;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAkBA;AAiKA;AAhKA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AAGA;AAEA;AAGA;AAGA;AAEA;AACA;AA5CA;AAAA;AAEA;AAEA;AACA;;AAAA;;AAEA;AAAA;AAAA;AAAA;;AAAA;;AAuCA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAAA;AAAA;AACA;AAEA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AADA;AAGA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AAEA;AACA;AACA;AAEA;AAIA;AACA;AAEA;AAAA;AAAA;AACA;AAEA;AAIA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAGA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AACA;AACA;AACA;AAEA;AAAA;AAAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAtOA;AAuOA;AAzOA;AAAA","sourceRoot":""}\n//# sourceURL=webpack-internal:///76\n"); /***/ }), /* 77 */ diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index aa7b7026..dc661b1e 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -58,7 +58,7 @@ export class Hub { this._hub.client.ncSoftKeys = Hub.ncSoftKeyChanged; this._hub.client.ncSoftKeys = Hub.userSoftKeyChanged; - this._hub.client.heads = Hub.headsDataChanged; + this._hub.client.headsData = Hub.headsDataChanged; this._hub.client.logout = this.logout;