diff --git a/Thermo.Active/wwwroot/assets/styles/base/buttons.less b/Thermo.Active/wwwroot/assets/styles/base/buttons.less index be5be3df..aae846df 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/buttons.less +++ b/Thermo.Active/wwwroot/assets/styles/base/buttons.less @@ -378,8 +378,9 @@ fieldset[disabled] .form-group.is-focused .togglebutton label { margin-left: 5px; &.error { - background-color: rgba(255, 0, 0, .7); + background-color: rgba(255, 0, 0, .7) !important; color: #222; + background-image: none !important; } } diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 3b0a5eda..92b4987c 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -6001,8 +6001,9 @@ fieldset[disabled] .form-group.is-focused .togglebutton label { margin-left: 5px; } .togglebutton label .toggle.error { - background-color: rgba(255, 0, 0, 0.7); + background-color: rgba(255, 0, 0, 0.7) !important; color: #222; + background-image: none !important; } .togglebutton label .toggle, .togglebutton label input[type=checkbox][disabled] + .toggle { diff --git a/Thermo.Active/wwwroot/src/@types/signalr.process.d.ts b/Thermo.Active/wwwroot/src/@types/signalr.process.d.ts index acef1238..c525d11f 100644 --- a/Thermo.Active/wwwroot/src/@types/signalr.process.d.ts +++ b/Thermo.Active/wwwroot/src/@types/signalr.process.d.ts @@ -38,6 +38,8 @@ declare module signalr_process { type: string; toDelete: boolean; toDisplay: boolean; + isM156: boolean; + id: number; } } diff --git a/Thermo.Active/wwwroot/src/App.ts b/Thermo.Active/wwwroot/src/App.ts index 400b08c2..7338b188 100644 --- a/Thermo.Active/wwwroot/src/App.ts +++ b/Thermo.Active/wwwroot/src/App.ts @@ -180,6 +180,7 @@ export default class app extends Vue { onmousedown() { KeyboardHelper.hideKeyboard(); + messageService.publishToChannel('hideall'); } @Watch("isMainViewLiftedUp") diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue index a7c89d2a..68e88f23 100644 --- a/Thermo.Active/wwwroot/src/App.vue +++ b/Thermo.Active/wwwroot/src/App.vue @@ -35,7 +35,8 @@ :title="'header_tooltip_btn_close' | localize('Close the application')" >× - + + diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts index 82791cec..e4d86b91 100644 --- a/Thermo.Active/wwwroot/src/app.business-logic.ts +++ b/Thermo.Active/wwwroot/src/app.business-logic.ts @@ -39,7 +39,7 @@ messageService.subscribeToChannel("show-contact-info", () => { ModalHelper.ShowM // messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowNcModal(AxesCalibration); }); // messageService.subscribeToChannel("hide-axes-calibration", () => { ModalHelper.HideNcModal(AxesCalibration); }); -// messageService.subscribeToChannel("show-m155-questions", () => { ModalHelper.ShowNextM155Modal(); }); +messageService.subscribeToChannel("show-m155-questions", () => { ModalHelper.ShowNextM155Modal(); }); // messageService.subscribeToChannel("show-nochange-page", () => { // ModalHelper.ShowMessage( // Vue.filter('localize')("modal_nochangepage_title", "Operazione non possibile"), diff --git a/Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts b/Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts new file mode 100644 index 00000000..0992c9c4 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts @@ -0,0 +1,95 @@ +import { AppModel } from "src/store"; +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 { Watch } from "vue-property-decorator"; + +@Component({ components: { modal: Modal } }) +export default class M155Dialog extends Vue{ + + data = null; + value = 0; + + MULTIPLE_BUTTONS = "MULTIPLE_BUTTONS"; + REAL = "REAL"; + SHOW_VAL = "SHOW_VAL" + MODAL = "MODAL" + + mounted(){ + this.data = ModalHelper.M155ModalData.data; + this.value = -1; + + // Populate translations + if(this.data.isM156) { + this.data.message = this.$options.filters.localize("m156_title_" + this.data.id, "Title"); + + for(const key in this.data.buttons){ + this.data.buttons[key] = this.$options.filters.localize("m156_" + this.data.id + "_button_" + this.data.buttons[key], "Title"); + } + + if(this.data.buttons) + Object.keys(this.data.buttons).forEach(btn => { + btn = this.$options.filters.localize("m156_title_" + this.data.id, "Title"); + }); + } + + messageService.subscribeToChannel("show-modal-nc", args => { + this.data = ModalHelper.M155ModalData.data; + }); + } + + get process(){ + if(this.data) + return this.data.process; + return 0; + } + + @Watch("data") + dataChanged(){ + this.value = -1; + } + + ischecked(k){ + return k == this.value; + } + + check(k){ + return this.value = k; + } + + canSendAnswer(){ + if(this.getType == this.MODAL) + return false + else if(this.getType == this.REAL) + return this.value != null && this.value != undefined; + else + return this.value && this.value != -1; + } + + answerVisible(){ + if(this.getType == this.MODAL) + return false + return true; + } + + get getType(){ + if(this.data) + return this.data.type + + return "" + } + + hide() { + ModalHelper.M155ModalData.data.toDisplay = false; + ModalHelper.HideThisM155Modal(ModalHelper.M155ModalData.data.processId); + } + + answer(){ + if(!this.data.isM156) + Hub.Current.WriteM155Response(this.data.process,this.value); + else + Hub.Current.WriteM156Response(this.data.process,this.value); + } +}; diff --git a/Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue b/Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue new file mode 100644 index 00000000..fd093446 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue @@ -0,0 +1,38 @@ + + + diff --git a/Thermo.Active/wwwroot/src/app_modules/machine/index.ts b/Thermo.Active/wwwroot/src/app_modules/machine/index.ts index 1fde7a77..1cba2f8b 100644 --- a/Thermo.Active/wwwroot/src/app_modules/machine/index.ts +++ b/Thermo.Active/wwwroot/src/app_modules/machine/index.ts @@ -13,5 +13,6 @@ export { ContactInfoDialog, UserInfoDialog, UserInfo, - CmsconnectInfoDialog + CmsconnectInfoDialog, + M155Questions } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts index b8b6ed74..b6dc6ff8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts @@ -2,6 +2,7 @@ import Component from "vue-class-component"; import Vue from "vue"; import { Prop } from "vue-property-decorator"; import lottie from "lottie-web"; +import { messageService } from "@/_base"; @Component({}) export default class Combo extends Vue { @@ -42,7 +43,7 @@ export default class Combo extends Vue { } mounted() { - + messageService.subscribeToChannel('hideall', () => this.hideList()); } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue index a41ebdbf..f1f9533f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue @@ -9,7 +9,7 @@ -
+
- {{unitMeasure}} + {{value.unitMeasure}}
\ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts index ba727822..179b8932 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts @@ -6,6 +6,7 @@ import { store, MachineStatusModel } from "@/store"; import { SoftKeysConfigurationModel, machineInfoStore } from "@/store/machineInfo.store"; import { Hub, machineService } from "@/services"; import { Watch } from "vue-property-decorator"; +import { messageService } from "@/_base"; @Component({ components: { softKey } @@ -60,6 +61,7 @@ export default class Paddle extends Vue { async mounted() { this.loadData(); + messageService.subscribeToChannel('hideall', () => { this.isOpen = false; this.openFull = false; }) } @Watch("isOpen") diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue index d4b60d73..f6ce7417 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue @@ -1,5 +1,9 @@