From c672abcf2a4ea0e3e81eb7a0428ace01a9abd5ff Mon Sep 17 00:00:00 2001 From: paolo possanzini Date: Thu, 6 Jun 2019 11:52:54 +0200 Subject: [PATCH] rimozione Factory.Get(MessageService) --- Step/wwwroot/package.json | 2 +- Step/wwwroot/src/App.ts | 30 +++++++------ Step/wwwroot/src/_base/baseRestService.ts | 1 - Step/wwwroot/src/_base/index.js | 10 ++--- Step/wwwroot/src/_base/messageService.ts | 5 +-- Step/wwwroot/src/app.business-logic.ts | 45 ++++++++++--------- .../machine/components/contact-info-dialog.ts | 8 ++-- .../app_modules/machine/components/login.ts | 8 ++-- .../machine/components/m155-dialog.ts | 4 +- .../machine/components/machine-info-dialog.ts | 8 ++-- .../machine/components/user-info-dialog.ts | 6 +-- .../machine/components/user-info.ts | 4 +- .../maintenance/components/maintenance.ts | 4 +- .../production/components/production.ts | 34 +++++++------- .../src/app_modules/scada/components/scada.ts | 4 +- .../tooling/components/info-equipment.ts | 4 +- .../tooling/components/load-depot.ts | 10 ++--- .../components/self-adaptive-path-dialog.ts | 10 ++--- .../tooling/components/tooling-depot.ts | 4 +- .../under-the-hood/components/plc-softkeys.ts | 12 ++--- .../components/under-the-hood.ts | 2 +- .../src/components/modals/ModalHelper.ts | 18 ++++---- Step/wwwroot/src/modules/app-footer.ts | 4 +- Step/wwwroot/src/modules/app-header.ts | 6 +-- .../modal-add-element-queue.ts | 4 +- .../base-components/modal-add-offset-tool.vue | 4 +- .../base-components/modal-container.ts | 10 ++--- .../base-components/modal-create-user.ts | 8 ++-- .../modules/base-components/modal-edit-job.ts | 6 +-- .../modules/base-components/modal-iframe.vue | 8 ++-- .../modules/base-components/modal-image.vue | 8 ++-- .../modal-job-add-parameter.ts | 4 +- .../base-components/modal-load-program.ts | 8 ++-- .../base-components/modal-missing-tools.ts | 4 +- .../base-components/modal-nc-container.ts | 14 +++--- .../base-components/modal-password-user.ts | 8 ++-- .../modal-report-select-column.ts | 6 +-- .../base-components/modal-role-user.ts | 8 ++-- .../wwwroot/src/modules/create-maintenance.ts | 8 ++-- Step/wwwroot/src/services/hub.ts | 18 ++++---- .../src/services/localizationService.ts | 2 +- Step/wwwroot/src/services/loginService.ts | 3 -- Step/wwwroot/src/services/machineService.ts | 2 +- .../src/services/maintenanceService.ts | 2 +- Step/wwwroot/src/services/usersService.ts | 2 - Step/wwwroot/src/store/localization.store.ts | 4 +- Step/wwwroot/src/store/machineStatus.store.ts | 6 +-- Step/wwwroot/src/store/scada.ts | 2 +- Step/wwwroot/webpack.config.js | 12 ++--- 49 files changed, 202 insertions(+), 202 deletions(-) diff --git a/Step/wwwroot/package.json b/Step/wwwroot/package.json index 0220aa1e..9afd7f2f 100644 --- a/Step/wwwroot/package.json +++ b/Step/wwwroot/package.json @@ -6,7 +6,7 @@ "private": true, "scripts": { "build": "webpack", - "buildprod": "webpack --progress --config webpack.config.js --env production", + "buildprod": "webpack --watch --progress --config webpack.config.js --env production", "dev": "webpack --watch" }, "dependencies": { diff --git a/Step/wwwroot/src/App.ts b/Step/wwwroot/src/App.ts index 0a239622..6f247e40 100644 --- a/Step/wwwroot/src/App.ts +++ b/Step/wwwroot/src/App.ts @@ -1,11 +1,11 @@ import Vue from "vue"; import { Hub } from "./services/hub"; -import { Header, Footer } from "./app.modules"; +import { Header, Footer, LocalizationService } from "./app.modules"; import { Login } from "src/app_modules/machine"; import { alarmList } from "src/app_modules/alarms"; import { LoginService } from "src/services/loginService"; import { DataService } from "src/services/dataService"; -import { Factory, MessageService } from "./_base"; +import { Factory, messageService } from "./_base"; import { ModalContainer, ModalNcContainer } from "./modules/base-components"; import { ModalHelper } from "src/components/modals" import { appModelActions } from "src/store"; @@ -15,9 +15,13 @@ import * as iziToast from "izitoast"; import moment from "moment"; import Component from "vue-class-component"; import { Watch } from "vue-property-decorator"; +import { UsersService } from "./services/usersService"; declare var cmsClient; + + + @Component({ name: "app", components: { @@ -48,7 +52,7 @@ export default class app extends Vue { moment.locale((window.navigator as any).userLanguage || window.navigator.language); } mounted() { - let ms = Factory.Get(MessageService); + let ms = messageService; // if cms is connected if (typeof cmsClient != "undefined") @@ -125,7 +129,7 @@ export default class app extends Vue { window.addEventListener("keyup", function (event) { // If down arrow was pressed... if (event.keyCode == 27) { - Factory.Get(MessageService).publishToChannel("esc_pressed"); + messageService.publishToChannel("esc_pressed"); } }); } @@ -146,24 +150,24 @@ export default class app extends Vue { this.applyViewPosition(-window.innerHeight + 84); //Hide the HMI if is showed (in production) - Factory.Get(MessageService).publishToChannel("HMI-production-hide"); - Factory.Get(MessageService).publishToChannel("PROD-production-hide"); + messageService.publishToChannel("HMI-production-hide"); + messageService.publishToChannel("PROD-production-hide"); //Show the HMI with delay (For the animation) - Factory.Get(MessageService).publishToChannel("HMI-show", 500); + messageService.publishToChannel("HMI-show", 500); } else { //Setup the Position of the View this.applyViewPosition(0); //Hide the HMI - Factory.Get(MessageService).publishToChannel("HMI-hide"); + messageService.publishToChannel("HMI-hide"); //Launche the show in delay if we are in production if (this.showHMIinProduction && this.$route.path.includes("production")) - Factory.Get(MessageService).publishToChannel( + messageService.publishToChannel( "HMI-production-show", 700 ); if (this.showPRODinProduction && this.$route.path.includes("production")) - Factory.Get(MessageService).publishToChannel( + messageService.publishToChannel( "PROD-production-show", 700 ); @@ -199,10 +203,10 @@ export default class app extends Vue { this.hub.Hello(); } onstartdrag() { - Factory.Get(MessageService).publishToChannel("HMI-start-drag"); + messageService.publishToChannel("HMI-start-drag"); } onstopdrag() { - Factory.Get(MessageService).publishToChannel("HMI-stop-drag", 600); + messageService.publishToChannel("HMI-stop-drag", 600); } toggleMainView(direction) { if (!direction || direction == "down" || direction == "none") @@ -212,7 +216,7 @@ export default class app extends Vue { } } sendMessage(name) { - Factory.Get(MessageService).publishToChannel(name); + messageService.publishToChannel(name); } movepanel(e) { if (e && e.touches && e.touches[0]) { diff --git a/Step/wwwroot/src/_base/baseRestService.ts b/Step/wwwroot/src/_base/baseRestService.ts index d8144b6c..de27ec3d 100644 --- a/Step/wwwroot/src/_base/baseRestService.ts +++ b/Step/wwwroot/src/_base/baseRestService.ts @@ -1,7 +1,6 @@ import Axios, { AxiosInstance, AxiosPromise, AxiosResponse, AxiosBasicCredentials, AxiosRequestConfig } from "axios"; import Factory from "./factoryService"; import * as iziToast from "izitoast"; -import { MessageService } from "./messageService"; // import { localizeString } from "../filters/localizeFilter"; import { store, AppModel } from "src/store"; diff --git a/Step/wwwroot/src/_base/index.js b/Step/wwwroot/src/_base/index.js index b2b875e1..3bb74af6 100644 --- a/Step/wwwroot/src/_base/index.js +++ b/Step/wwwroot/src/_base/index.js @@ -1,19 +1,19 @@ import Factory from "./factoryService"; -import { MessageService } from "./messageService"; +import { messageService } from "./messageService"; import { UUID,Utilities } from "./utils"; export function awaiter(promise) { - Factory.Get(MessageService).publishToChannel("show-loading"); + messageService.publishToChannel("show-loading"); return promise.then(data => { - Factory.Get(MessageService).publishToChannel("hide-loading"); + messageService.publishToChannel("hide-loading"); return data }) .catch(err => { - Factory.Get(MessageService).publishToChannel("hide-loading"); + messageService.publishToChannel("hide-loading"); return Promise.reject(err); }); } -export { Factory, MessageService, UUID, Utilities }; \ No newline at end of file +export { Factory, UUID, Utilities, messageService }; \ No newline at end of file diff --git a/Step/wwwroot/src/_base/messageService.ts b/Step/wwwroot/src/_base/messageService.ts index 045efff9..98fd3061 100644 --- a/Step/wwwroot/src/_base/messageService.ts +++ b/Step/wwwroot/src/_base/messageService.ts @@ -4,7 +4,7 @@ import Vue from "vue"; // Message Service Definition // -------------------------------------------------- -export class MessageService { +class MessageService { private _events: Vue = new Vue({}); @@ -28,5 +28,4 @@ export class MessageService { } } -Factory.Register(MessageService); - +export const messageService = new MessageService(); \ No newline at end of file diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts index 04aaffc6..5850852c 100644 --- a/Step/wwwroot/src/app.business-logic.ts +++ b/Step/wwwroot/src/app.business-logic.ts @@ -1,7 +1,7 @@ -import { MessageService, Factory } from "./_base"; +import { Factory, messageService } from "./_base"; import { machineService } from "src/services/machineService"; -import { LoginService } from "src/services/loginService"; +import { loginService } from "src/services/loginService"; import { store, AppModel, MachineStatusModel, machineStatusActions, localizationModelActions, machineInfoActions } from "src/store"; @@ -13,12 +13,16 @@ import { DataService } from "./services/dataService"; import { ToolingService } from "./services/toolingService"; import { DepotService } from "./services/depotService"; import { MaintenanceService } from "./services/maintenanceService"; -import { localizationService } from "./services/localizationService"; +import { localizationService, LocalizationService } from "./services/localizationService"; import { DEBUG_CONFIGURATION, USE_RUNTIME_CONFIGURATION } from "./config"; import { ModalHelper } from "./components/modals"; import Vue from "vue"; import { scadaService } from "./services/scadaService"; import { Hub } from "./services"; +import { UsersService } from "./services/usersService"; + +Factory.Register(UsersService); +Factory.Register(LocalizationService); declare let cmsClient: any; let HMIvisible = false; @@ -39,7 +43,6 @@ let HMIScreenshotInterval; let HMIprodTimeout; let RerenderInterval; -const messageService = Factory.Get(MessageService); messageService.subscribeToChannel("show-user-info", () => { ModalHelper.ShowModal(UserInfoDialog); }); messageService.subscribeToChannel("show-machine-info", () => { ModalHelper.ShowModal(MachineInfoDialog); }); @@ -59,7 +62,7 @@ messageService.subscribeToChannel("show-nochange-page", () => { //Loading machine configuration async function loadMachineConfig() { - await Factory.Get(LoginService).getUserInfo(); + await loginService.getUserInfo(); try{ await scadaService.ListScada(); }catch(err){ @@ -155,7 +158,7 @@ if (typeof cmsClient != "undefined") { cmsClient.setNcWindowState(0); //Events handler - Factory.Get(MessageService).subscribeToChannel("HMI-show", args => { + messageService.subscribeToChannel("HMI-show", args => { clearTimeout(HMIshowTimeout); if (args[0] > 0) HMIshowTimeout = setTimeout(ShowHmi, args[0]); @@ -163,7 +166,7 @@ if (typeof cmsClient != "undefined") { ShowHmi() }); - Factory.Get(MessageService).subscribeToChannel("HMI-hide", args => { + messageService.subscribeToChannel("HMI-hide", args => { clearTimeout(HMIshowTimeout); if (args[0] > 0) HMIshowTimeout = setTimeout(HideHmi, args[0]); @@ -171,7 +174,7 @@ if (typeof cmsClient != "undefined") { HideHmi() }); - Factory.Get(MessageService).subscribeToChannel("HMI-production-show", args => { + messageService.subscribeToChannel("HMI-production-show", args => { clearTimeout(HMIprodTimeout); if (args[0] > 0) HMIprodTimeout = setTimeout(ShowHmiProduction, args[0]); @@ -179,7 +182,7 @@ if (typeof cmsClient != "undefined") { ShowHmiProduction() }); - Factory.Get(MessageService).subscribeToChannel("HMI-production-hide", args => { + messageService.subscribeToChannel("HMI-production-hide", args => { clearTimeout(HMIprodTimeout); if (args[0] > 0) HMIprodTimeout = setTimeout(HideHmiProduction, args[0]); @@ -189,7 +192,7 @@ if (typeof cmsClient != "undefined") { }); - Factory.Get(MessageService).subscribeToChannel("PROD-production-show", args => { + messageService.subscribeToChannel("PROD-production-show", args => { clearTimeout(PRODprodTimeout); if (args[0] > 0) PRODprodTimeout = setTimeout(ShowProdProduction, args[0]); @@ -197,7 +200,7 @@ if (typeof cmsClient != "undefined") { ShowProdProduction() }); - Factory.Get(MessageService).subscribeToChannel("PROD-production-hide", args => { + messageService.subscribeToChannel("PROD-production-hide", args => { clearTimeout(PRODprodTimeout); if (args[0] > 0) PRODprodTimeout = setTimeout(HideProdProduction, args[0]); @@ -206,7 +209,7 @@ if (typeof cmsClient != "undefined") { }); - Factory.Get(MessageService).subscribeToChannel("HMI-show-alarms", args => { + messageService.subscribeToChannel("HMI-show-alarms", args => { clearTimeout(HMIAlarmsTimeout); if (args[0] > 0) HMIAlarmsTimeout = setTimeout(showAlarms, args[0]); @@ -214,7 +217,7 @@ if (typeof cmsClient != "undefined") { showAlarms() }); - Factory.Get(MessageService).subscribeToChannel("HMI-hide-alarms", args => { + messageService.subscribeToChannel("HMI-hide-alarms", args => { clearTimeout(HMIAlarmsTimeout); if (args[0] > 0) HMIAlarmsTimeout = setTimeout(hideAlarms, args[0]); @@ -222,7 +225,7 @@ if (typeof cmsClient != "undefined") { hideAlarms() }); - Factory.Get(MessageService).subscribeToChannel("HMI-show-modal", args => { + messageService.subscribeToChannel("HMI-show-modal", args => { clearTimeout(HMIModalsTimeout); if (args[0] > 0) HMIModalsTimeout = setTimeout(showModal, args[0]); @@ -230,7 +233,7 @@ if (typeof cmsClient != "undefined") { showModal() }); - Factory.Get(MessageService).subscribeToChannel("HMI-show-modal-nc", args => { + messageService.subscribeToChannel("HMI-show-modal-nc", args => { clearTimeout(HMIModalsNcTimeout); if (args[0] > 0) HMIModalsNcTimeout = setTimeout(showNcModal, args[0]); @@ -238,7 +241,7 @@ if (typeof cmsClient != "undefined") { showNcModal() }); - Factory.Get(MessageService).subscribeToChannel("HMI-hide-modal-nc", args => { + messageService.subscribeToChannel("HMI-hide-modal-nc", args => { clearTimeout(HMIModalsNcTimeout); if (args[0] > 0) HMIModalsNcTimeout = setTimeout(hideNcModal, args[0]); @@ -246,7 +249,7 @@ if (typeof cmsClient != "undefined") { hideNcModal() }); - Factory.Get(MessageService).subscribeToChannel("HMI-hide-modal", args => { + messageService.subscribeToChannel("HMI-hide-modal", args => { clearTimeout(HMIModalsTimeout); if (args[0] > 0) HMIModalsTimeout = setTimeout(hideModal, args[0]); @@ -254,7 +257,7 @@ if (typeof cmsClient != "undefined") { hideModal() }); - Factory.Get(MessageService).subscribeToChannel("HMI-start-drag", args => { + messageService.subscribeToChannel("HMI-start-drag", args => { clearTimeout(HMIDraggingTimeout); if (args[0] > 0) HMIDraggingTimeout = setTimeout(startDrag, args[0]); @@ -262,7 +265,7 @@ if (typeof cmsClient != "undefined") { startDrag() }); - Factory.Get(MessageService).subscribeToChannel("HMI-stop-drag", args => { + messageService.subscribeToChannel("HMI-stop-drag", args => { clearTimeout(HMIDraggingTimeout); if (args[0] > 0) HMIDraggingTimeout = setTimeout(stopDrag, args[0]); @@ -365,10 +368,10 @@ function ElaborateHMIStatus() { // Enable/Disable Scrollers -Factory.Get(MessageService).subscribeToChannel("disable-scroll", (args) => { +messageService.subscribeToChannel("disable-scroll", (args) => { disableScroll(args[0]); }); -Factory.Get(MessageService).subscribeToChannel("enable-scroll", (args) => { +messageService.subscribeToChannel("enable-scroll", (args) => { enableScroll(args[0]); }); // Scroll manipulation diff --git a/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts index 189c1ee8..40aad79d 100644 --- a/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import { Modal, ModalHelper } from "src/components/modals"; import { machineService, ContactConfigurationModel } from "src/services/machineService"; -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import Component from "vue-class-component"; @Component({ components: { modal: Modal } }) @@ -14,17 +14,17 @@ export default class ContactInfoDialog extends Vue { async beforeMount() { this.contactInfo = await awaiter(new machineService().getContactConfiguration()); - Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => { + messageService.subscribeToChannel("esc_pressed", args => { this.close(); }); } beforeDestroy() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); } close() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); } } diff --git a/Step/wwwroot/src/app_modules/machine/components/login.ts b/Step/wwwroot/src/app_modules/machine/components/login.ts index d789a560..d573afa2 100644 --- a/Step/wwwroot/src/app_modules/machine/components/login.ts +++ b/Step/wwwroot/src/app_modules/machine/components/login.ts @@ -2,7 +2,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Modal, ModalHelper } from "src/components/modals" -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import { LoginService } from "src/app.modules"; import { DataService } from 'src/services/dataService'; import iziToast, { IziToastSettings } from "izitoast"; @@ -20,8 +20,8 @@ export default class Login extends Vue { this.logginIn = true; if (await awaiter(service.doLogin(this.user)).then(() => { - Factory.Get(MessageService).publishToChannel("update-maintenance"); - Factory.Get(MessageService).publishToChannel("update-softkeys-favorite"); + messageService.publishToChannel("update-maintenance"); + messageService.publishToChannel("update-softkeys-favorite"); ModalHelper.HideModal(); }).catch(() => { this.logginIn = false; @@ -31,7 +31,7 @@ export default class Login extends Vue { } mounted(){ - Factory.Get(MessageService).subscribeToChannel("force-ui-update", args => { + messageService.subscribeToChannel("force-ui-update", args => { this.$forceUpdate(); }); document.body.addEventListener('keydown', function(e) { diff --git a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts index 6d3a03dd..353080a5 100644 --- a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts @@ -3,7 +3,7 @@ import { Modal, ModalHelper } from "src/components/modals"; import Component from "vue-class-component"; import Vue from "vue"; import { Hub } from "src/services"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import { Watch } from "vue-property-decorator"; @Component({ components: { modal: Modal } }) @@ -19,7 +19,7 @@ export default class M155Dialog extends Vue{ mounted(){ this.data = ModalHelper.M155ModalData.data; this.value = 0; - Factory.Get(MessageService).subscribeToChannel("show-modal-nc", args => { + messageService.subscribeToChannel("show-modal-nc", args => { this.data = ModalHelper.M155ModalData.data; }); } diff --git a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts index 81fc1a24..99720c69 100644 --- a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import { Modal, ModalHelper } from "src/components/modals"; import { machineService } from "src/services/machineService"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import moment from "moment"; import Component from "vue-class-component"; @@ -12,16 +12,16 @@ export default class MachineInfoDialog extends Vue { beforeMount() { new machineService().getMachineCNInfo(); - Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => { + messageService.subscribeToChannel("esc_pressed", args => { this.close(); }); } beforeDestroy() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); } close() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); } diff --git a/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts index edded262..efd17516 100644 --- a/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts @@ -5,7 +5,7 @@ import { Watch } from "vue-property-decorator"; import { Modal, ModalHelper } from "src/components/modals" import { AppModel, localizationModelActions } from "src/store"; -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import { LoginService } from "src/app.modules"; import { getColorFromName,isDarkColor } from "src/_base/utils"; import { LocalizationService, localizationService } from "src/services/localizationService"; @@ -44,13 +44,13 @@ export default class UserInfo extends Vue { this.currentLanguage = (this.$store.state as AppModel).localization.currentLanguage; this.reloadLanguages(); - Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => { + messageService.subscribeToChannel("esc_pressed", args => { this.close(); }); } beforeDestroy() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); } async reloadLanguages() { diff --git a/Step/wwwroot/src/app_modules/machine/components/user-info.ts b/Step/wwwroot/src/app_modules/machine/components/user-info.ts index 806de425..93a797b7 100644 --- a/Step/wwwroot/src/app_modules/machine/components/user-info.ts +++ b/Step/wwwroot/src/app_modules/machine/components/user-info.ts @@ -1,6 +1,6 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import moment from "moment"; import { AppModel } from "src/store"; import { getColorFromName,isDarkColor } from "src/_base/utils"; @@ -58,6 +58,6 @@ export default class UserInfo extends Vue { } public sendMessage(name:string) { - Factory.Get(MessageService).publishToChannel(name); + messageService.publishToChannel(name); } } diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts index 6f144879..f6c1c649 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts @@ -5,7 +5,7 @@ import { ModalHelper } from "src/components/modals"; import maintenanceCard from "./maintenance-card.vue"; import { MaintenanceService } from "src/services/maintenanceService"; import { alarmsModelActions, store, AppModel } from "src/store"; -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import moment from "moment"; import { MaintenanceGetters, MaintenanceActions, maintenanceActions } from "src/store/maintenance.store"; import { Watch } from "vue-property-decorator"; @@ -68,7 +68,7 @@ export default class Maintenance extends Vue { async mounted() { this.isSCMVisualStyle; this.onloading = true; - Factory.Get(MessageService).subscribeToChannel("update-maintenance", args => { + messageService.subscribeToChannel("update-maintenance", args => { awaiter(new MaintenanceService().GetMaintenances()); }); ModalHelper.HideModal("modal-internal"); diff --git a/Step/wwwroot/src/app_modules/production/components/production.ts b/Step/wwwroot/src/app_modules/production/components/production.ts index 3bfb6399..1bd1fb9b 100644 --- a/Step/wwwroot/src/app_modules/production/components/production.ts +++ b/Step/wwwroot/src/app_modules/production/components/production.ts @@ -6,7 +6,7 @@ import processSelectionMaintenance from "src/modules/base-components/cards/proce import cardProductionCms from "./card-production-cms.vue"; import cardScadaProduction from "src/app_modules/scada/components/card-scada-production.vue"; import { Hub } from "src/services/hub"; -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import { appModelActions, alarmsModelActions, store } from "src/store"; import { DataService } from 'src/services/dataService'; import Component from "vue-class-component"; @@ -90,29 +90,29 @@ export default class Production extends Vue { @Watch("activeProd") activeCncChanged() { if (this.activeCnc) { - Factory.Get(MessageService).publishToChannel("HMI-production-show"); - Factory.Get(MessageService).publishToChannel("PROD-production-hide"); - Factory.Get(MessageService).publishToChannel("HMI-production-show-state"); - Factory.Get(MessageService).publishToChannel("PROD-production-hide-state"); + messageService.publishToChannel("HMI-production-show"); + messageService.publishToChannel("PROD-production-hide"); + messageService.publishToChannel("HMI-production-show-state"); + messageService.publishToChannel("PROD-production-hide-state"); } else if (this.activeProd) { - Factory.Get(MessageService).publishToChannel("PROD-production-show"); - Factory.Get(MessageService).publishToChannel("HMI-production-hide"); - Factory.Get(MessageService).publishToChannel("HMI-production-hide-state"); - Factory.Get(MessageService).publishToChannel("PROD-production-show-state"); + messageService.publishToChannel("PROD-production-show"); + messageService.publishToChannel("HMI-production-hide"); + messageService.publishToChannel("HMI-production-hide-state"); + messageService.publishToChannel("PROD-production-show-state"); } else { - Factory.Get(MessageService).publishToChannel("HMI-production-hide"); - Factory.Get(MessageService).publishToChannel("PROD-production-hide"); - Factory.Get(MessageService).publishToChannel("HMI-production-hide-state"); - Factory.Get(MessageService).publishToChannel("PROD-production-hide-state"); + messageService.publishToChannel("HMI-production-hide"); + messageService.publishToChannel("PROD-production-hide"); + messageService.publishToChannel("HMI-production-hide-state"); + messageService.publishToChannel("PROD-production-hide-state"); } } beforeDestroy() { - Factory.Get(MessageService).publishToChannel("HMI-production-hide"); - Factory.Get(MessageService).publishToChannel("PROD-production-hide"); - Factory.Get(MessageService).publishToChannel("HMI-production-hide-state"); + messageService.publishToChannel("HMI-production-hide"); + messageService.publishToChannel("PROD-production-hide"); + messageService.publishToChannel("HMI-production-hide-state"); } closeAlarmsRibbon() { @@ -189,7 +189,7 @@ export default class Production extends Vue { this.userSubkeysMenuOpened = arg2; } editPreferredSoftkey() { - Factory.Get(MessageService).publishToChannel("enable-selected-softkeys-prefered", true); + messageService.publishToChannel("enable-selected-softkeys-prefered", true); this.toggleMainView() } toggleMainView() { diff --git a/Step/wwwroot/src/app_modules/scada/components/scada.ts b/Step/wwwroot/src/app_modules/scada/components/scada.ts index 8d177c2f..b50d9020 100644 --- a/Step/wwwroot/src/app_modules/scada/components/scada.ts +++ b/Step/wwwroot/src/app_modules/scada/components/scada.ts @@ -3,7 +3,7 @@ import Component from "vue-class-component"; import { store, AppModel } from "src/store"; import { scadaService } from "src/services/scadaService"; import { Watch, Prop } from "vue-property-decorator"; -import { awaiter, Factory, MessageService } from "src/_base"; +import { awaiter, Factory, messageService } from "src/_base"; declare let $: any; @@ -107,7 +107,7 @@ export default class Scada extends Vue { if(!this.currentScadaId && this.scadas.length>0) this.selectTab(this.scadas[0].id); - Factory.Get(MessageService).subscribeToChannel("close-scada",this.unload); + messageService.subscribeToChannel("close-scada",this.unload); } async unload() { diff --git a/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts index 537a8dd8..dbc1dafc 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts @@ -5,7 +5,7 @@ import { Watch, Prop } from "vue-property-decorator"; import { store, AppModel } from "src/store"; import { DepotService, ToolingService } from 'src/services'; -import { Factory, MessageService } from 'src/_base'; +import { Factory, messageService } from 'src/_base'; import { Modal, ModalHelper } from "src/components/modals"; @Component({ @@ -90,7 +90,7 @@ export default class InfoEquipment extends Vue { } } close() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); } selectTab(elem) { diff --git a/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts index 2cd4be56..0944461f 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts @@ -1,7 +1,7 @@ import { ModalHelper, Modal } from "src/components/modals" import { DepotService } from 'src/services/depotService'; -import { Factory, MessageService } from 'src/_base'; +import { Factory, messageService } from 'src/_base'; import { inputBox } from "src/modules/base-components/cards"; import { store, AppModel } from "src/store"; import { ToolingGetters,toolingActions } from "src/store/tooling.store"; @@ -48,7 +48,7 @@ export default { }, methods: { close() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); }, isSiemens: function () { @@ -63,7 +63,7 @@ export default { if(this.isSiemens()){ new DepotService().AddToolToDepot(this.magazineId, this.positionId, { toolId: this.toolSelected.id }).then(response => { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); toolingActions.updateBusyStatusPositions(store,this.magInfo.type,(this.$store.state as AppModel).depot.depot); ModalHelper.HideModal(); }); @@ -71,7 +71,7 @@ export default { else{ if (this.action == "LOAD") { new DepotService().AddToolToDepotNc(this.magazineId, this.positionId, { shankId: this.toolSelected.id }).then(response => { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); toolingActions.updateBusyStatusPositions(store,this.magInfo.type,(this.$store.state as AppModel).depot.depotNc); ModalHelper.HideModal(); }) @@ -82,7 +82,7 @@ export default { act = 1; new DepotService().StartAssistedToolingProcedure(this.toolSelected.id, this.magazineId, this.positionId, act).then(response => { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); toolingActions.updateBusyStatusPositions(store, this.magInfo.type, (this.$store.state as AppModel).depot.depotNc); ModalHelper.HideModal(); }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts b/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts index 9fc22367..4d46f23c 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts @@ -1,6 +1,6 @@ import Vue from "vue"; import { Modal, ModalHelper } from "src/components/modals"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import moment from "moment"; import Component from "vue-class-component"; import { ToolingService } from "src/services/toolingService"; @@ -27,7 +27,7 @@ export default class SelfAdaptivePathDialog extends Vue { })); - Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => { + messageService.subscribeToChannel("esc_pressed", args => { this.close(); }); @@ -53,11 +53,11 @@ export default class SelfAdaptivePathDialog extends Vue { } beforeDestroy() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); } close() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); } @@ -66,7 +66,7 @@ export default class SelfAdaptivePathDialog extends Vue { let stepModel:any = {step: this.stepValue}; awaiter(new ToolingService().SetSelfAdaptivePathStep(stepModel).then(response => { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); })); diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts index a558fcad..3d066a6f 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts @@ -10,7 +10,7 @@ import { depotBL } from "src/business-logic/depot-bl"; import { ToolingService } from "src/services/toolingService"; import { ToolingGetters,toolingActions } from "src/store/tooling.store"; import LoadDepot from "./load-depot.vue"; -import { MessageService, Factory, awaiter } from "src/_base"; +import { messageService, Factory, awaiter } from "src/_base"; import { Container, Draggable } from "vue-smooth-dnd"; @@ -336,7 +336,7 @@ export default class depot extends Vue { this.setAssistedTooling() - Factory.Get(MessageService).subscribeToChannel("force-ui-update", args => { + messageService.subscribeToChannel("force-ui-update", args => { this.setAssistedTooling() }); } diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts index b4ccfd35..1876d723 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts @@ -3,7 +3,7 @@ import Componet from "vue-class-component"; import { AppModel, machineInfoActions, store, appModelActions } from "src/store"; import { SoftKeysConfigurationModel } from "src/store/machineInfo.store" import { Hub } from "src/services/hub"; -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import { DataService } from "src/services/dataService"; import onOffSoftKey from "./soft-key2.vue"; @@ -44,7 +44,7 @@ export default class softKeys extends Vue { } async mounted() { - Factory.Get(MessageService).subscribeToChannel("enable-selected-softkeys-prefered", args => { + messageService.subscribeToChannel("enable-selected-softkeys-prefered", args => { if (args[0] > 0) this.enableSelected = args[0]; else @@ -52,7 +52,7 @@ export default class softKeys extends Vue { this.startedFromProduction = true; appModelActions.FavSoftkeyStart(this.$store); }); - Factory.Get(MessageService).subscribeToChannel("update-softkeys-favorite", args => { + messageService.subscribeToChannel("update-softkeys-favorite", args => { awaiter(new DataService().GetUserSoftkeyFavorite()); }); @@ -113,20 +113,20 @@ export default class softKeys extends Vue { if (this.selectedMenuItem == value.id) { this.selectedMenuItem = null; this.selectedSoftKey = null; - Factory.Get(MessageService).publishToChannel("enable-scroll", this.$refs.scrollable); + messageService.publishToChannel("enable-scroll", this.$refs.scrollable); } else { this.selectedMenuItem = value.id; this.selectedSoftKey = value; this.$nextTick(() => { if (this.$refs.backdrop) (this.$refs.backdrop as any).focus(); }); - Factory.Get(MessageService).publishToChannel("disable-scroll", this.$refs.scrollable); + messageService.publishToChannel("disable-scroll", this.$refs.scrollable); } } public closeBackdrop() { this.selectedMenuItem = null; this.selectedSoftKey = null; - Factory.Get(MessageService).publishToChannel("enable-scroll", this.$refs.scrollable); + messageService.publishToChannel("enable-scroll", this.$refs.scrollable); } public setSoftKeyPosition(sk: any) { diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts index 7d849b87..70f3690f 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts @@ -9,7 +9,7 @@ import autoMenu from "./auto-menu.vue"; import hmiMenu from "./nc-hmi-menu.vue"; import processSelection from "./process-selection.vue"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import { alarmsModelActions, store } from "src/store"; export default { diff --git a/Step/wwwroot/src/components/modals/ModalHelper.ts b/Step/wwwroot/src/components/modals/ModalHelper.ts index 29240644..d90ae96a 100644 --- a/Step/wwwroot/src/components/modals/ModalHelper.ts +++ b/Step/wwwroot/src/components/modals/ModalHelper.ts @@ -1,5 +1,5 @@ -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import ConfirmModal from "./modal-confirm.vue"; import { Deferred } from "src/services/Deferred"; import { M155Questions } from "src/app_modules/machine"; @@ -72,7 +72,7 @@ export class ModalHelper { }; public static ShowNcModal(view) { - Factory.Get(MessageService).publishToChannel("show-modal-nc", view); + messageService.publishToChannel("show-modal-nc", view); } public static ShowNextM155Modal() { @@ -84,10 +84,10 @@ export class ModalHelper { } } if(ModalHelper.M155ModalData.data){ - Factory.Get(MessageService).publishToChannel("show-modal-nc", M155Questions); + messageService.publishToChannel("show-modal-nc", M155Questions); } else{ - Factory.Get(MessageService).publishToChannel("hide-modal-nc", M155Questions); + messageService.publishToChannel("hide-modal-nc", M155Questions); } } @@ -101,13 +101,13 @@ export class ModalHelper { let find = processStore.state.m155messages.find(X => X.process== proc) if(find){ ModalHelper.M155ModalData.data = find; - Factory.Get(MessageService).publishToChannel("show-modal-nc", M155Questions); + messageService.publishToChannel("show-modal-nc", M155Questions); } } } public static HideNcModal(view) { - Factory.Get(MessageService).publishToChannel("hide-modal-nc", view); + messageService.publishToChannel("hide-modal-nc", view); } public static ShowMaintenancePassword(view, maintenance, onConfirm: Function){ @@ -120,17 +120,17 @@ export class ModalHelper { public static ShowModal(view, modalname: string = "modal", showHeader: boolean = false) { if (modalname == null) modalname = "modal"; - Factory.Get(MessageService).publishToChannel("show-" + modalname, view, null, null, showHeader); + messageService.publishToChannel("show-" + modalname, view, null, null, showHeader); } public static ShowModalAsync(view, model = null, modalname: string = "modal"): Promise { let deferred = new Deferred(); - Factory.Get(MessageService).publishToChannel("show-" + modalname, view, deferred, model); + messageService.publishToChannel("show-" + modalname, view, deferred, model); return deferred.promise; } public static HideModal(modalname: string = "modal") { - Factory.Get(MessageService).publishToChannel("hide-" + modalname); + messageService.publishToChannel("hide-" + modalname); } public static AskConfirm(title: string, body: string, onConfirm: Function, onCancel: Function, modalcontainer: string = "modal-internal") { diff --git a/Step/wwwroot/src/modules/app-footer.ts b/Step/wwwroot/src/modules/app-footer.ts index 3dab507b..a7d19f87 100644 --- a/Step/wwwroot/src/modules/app-footer.ts +++ b/Step/wwwroot/src/modules/app-footer.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { appModelActions, store, machineStatusActions } from "src/store"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; declare let cmsClient: any; @@ -14,7 +14,7 @@ export default class AppFooter extends Vue { get state() { return this.$store.state; } mounted(){ - Factory.Get(MessageService).subscribeToChannel("force-ui-update", args => { + messageService.subscribeToChannel("force-ui-update", args => { this.$forceUpdate(); }); } diff --git a/Step/wwwroot/src/modules/app-header.ts b/Step/wwwroot/src/modules/app-header.ts index 7ec1b9c3..d9f34603 100644 --- a/Step/wwwroot/src/modules/app-header.ts +++ b/Step/wwwroot/src/modules/app-header.ts @@ -2,7 +2,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { ProcessInfo } from "./base-components"; import { AppModel, buttonStatus } from "src/store"; -import { Factory, MessageService } from "src/_base"; +import { Factory, messageService } from "src/_base"; import { Hub } from "src/services/hub"; import { Watch } from "vue-property-decorator"; import AppRibbon from "src/components/app-ribbon.vue"; @@ -20,7 +20,7 @@ export default class AppHeader extends Vue { public get powerOnStatus() { return this.$store.getters.powerOnAlarms; }; mounted() { - Factory.Get(MessageService).subscribeToChannel("force-ui-update", args => { + messageService.subscribeToChannel("force-ui-update", args => { this.$forceUpdate(); }); $('.process-container').mousewheel(function (e, delta) { @@ -86,7 +86,7 @@ export default class AppHeader extends Vue { } public sendMessage(name: string) { - Factory.Get(MessageService).publishToChannel(name); + messageService.publishToChannel(name); } public manageClick(btn: buttonStatus) { diff --git a/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts b/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts index a240fcbb..6660bcb6 100644 --- a/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts +++ b/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { Factory, MessageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "src/_base"; import moment from "moment"; import cardFolderPath from "./cards/card-folder-path.vue"; import cardElementQueue from "src/app_modules/production/components/card-element-queue.vue"; @@ -205,7 +205,7 @@ export default class ModalAddElementQueue extends Vue { this.selectedFile.IsJob = isJob; } close() { - Factory.Get(MessageService).deleteChannel("esc_pressed"); + messageService.deleteChannel("esc_pressed"); ModalHelper.HideModal(); } reload() { diff --git a/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue b/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue index 551dc5a2..8ca6dc4e 100644 --- a/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue +++ b/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue @@ -19,7 +19,7 @@