From 0c1f30b504edbbfe6a60cedaada704f2d798f7bc Mon Sep 17 00:00:00 2001 From: Paolo Possanzini Date: Thu, 22 Feb 2018 14:56:38 +0100 Subject: [PATCH] fix --- Step/wwwroot/dist/build.js | 2 +- Step/wwwroot/src/services/hub.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Step/wwwroot/dist/build.js b/Step/wwwroot/dist/build.js index 45b66b5d..9ea123ed 100644 --- a/Step/wwwroot/dist/build.js +++ b/Step/wwwroot/dist/build.js @@ -643,7 +643,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__(110);\n\nvar _izitoast2 = _interopRequireDefault(_izitoast);\n\nvar _base = __webpack_require__(14);\n\nvar _runningProcess = __webpack_require__(108);\n\nvar _machineService = __webpack_require__(78);\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.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.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 if (authData) $.connection.hub.qs = { \"Authorization\": authData.access_token };\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 _store.appModelActions.CheckLogoff(_store.store, e.id);\n };\n Hub.functionalityData = function (status) {\n _store.machineStatusActions.setSecurityFunction(_store.store, status);\n };\n Hub.expiredMaintenances = function (status) {\n debugger;\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.checkRemove(_store.store, status.map(function (i) {\n return i.guid;\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\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 console.debug(power);\n // Receiving messages so NC is connected\n Hub.manageNcStatus({ connected: true });\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.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":"79.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\";\n\ndeclare let $: 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.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.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    if (authData)\n      $.connection.hub.qs = { \"Authorization\": authData.access_token };\n\n    $.connection.hub.start();\n\n    this.checkShowAxes();\n  }\n\n  private logout(e) {\n    appModelActions.CheckLogoff(store, e.id);\n  }\n\n  private static functionalityData(status) {\n    machineStatusActions.setSecurityFunction(store, status);\n  }\n\n  private static expiredMaintenances(status) {\n    debugger\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.checkRemove(store, status.map(i => i.guid));\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\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    console.debug(power);\n    // Receiving messages so NC is connected\n    Hub.manageNcStatus({ connected: true });\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\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 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;;;AAIA;AAAA;AAAA;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAkBA;AAuIA;AAtIA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AAGA;AAEA;AACA;AAlCA;AAAA;AAEA;AAEA;AACA;;AAAA;;AAEA;AAAA;AAAA;AAAA;;AAAA;;AA6BA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;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;AACA;AACA;AACA;AAGA;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;AAIA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAtMA;AAuMA;AAzMA;AAAA","sourceRoot":""}\n//# sourceURL=webpack-internal:///79\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__(110);\n\nvar _izitoast2 = _interopRequireDefault(_izitoast);\n\nvar _base = __webpack_require__(14);\n\nvar _runningProcess = __webpack_require__(108);\n\nvar _machineService = __webpack_require__(78);\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.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.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 if (authData) $.connection.hub.qs = { \"Authorization\": authData.access_token };\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 _store.appModelActions.CheckLogoff(_store.store, e.id);\n };\n Hub.functionalityData = function (status) {\n _store.machineStatusActions.setSecurityFunction(_store.store, status);\n };\n Hub.expiredMaintenances = function (status) {\n debugger;\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.checkRemove(_store.store, status.map(function (i) {\n return i.guid;\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\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.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":"79.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\";\n\ndeclare let $: 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.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.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    if (authData)\n      $.connection.hub.qs = { \"Authorization\": authData.access_token };\n\n    $.connection.hub.start();\n\n    this.checkShowAxes();\n  }\n\n  private logout(e) {\n    appModelActions.CheckLogoff(store, e.id);\n  }\n\n  private static functionalityData(status) {\n    machineStatusActions.setSecurityFunction(store, status);\n  }\n\n  private static expiredMaintenances(status) {\n    debugger\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.checkRemove(store, status.map(i => i.guid));\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\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\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 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;;;AAIA;AAAA;AAAA;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAkBA;AAqIA;AApIA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AAGA;AAEA;AACA;AAlCA;AAAA;AAEA;AAEA;AACA;;AAAA;;AAEA;AAAA;AAAA;AAAA;;AAAA;;AA6BA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;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;AAIA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AApMA;AAqMA;AAvMA;AAAA","sourceRoot":""}\n//# sourceURL=webpack-internal:///79\n"); /***/ }), /* 80 */ diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index dc6c366b..febfc91d 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -156,9 +156,7 @@ export class Hub { } private managePowerCallbacks(power: signalr_alarms.powerMessage) { - console.debug(power); - // Receiving messages so NC is connected - Hub.manageNcStatus({ connected: true }); + machineStatusActions.setResetAxes(store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });