diff --git a/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less b/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less deleted file mode 100644 index a26dfa1a..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less +++ /dev/null @@ -1,10 +0,0 @@ -// out: false, sourceMap: false, main: ../style.less -@import "grid-system.less"; -@import "colors.less"; -@import "fonts.less"; - - -.modal.estrazione-info { - width: 560px; - height: 411px; -} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less deleted file mode 100644 index 98184230..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less +++ /dev/null @@ -1,27 +0,0 @@ -// out: false, sourceMap: false, main: ../style.less -@import "grid-system.less"; -@import "colors.less"; -@import "fonts.less"; - -.modal.estrazione-info { - - section.body { - - section { - - .specific { - justify-content: flex-end; - padding-left: 10px; - - .box { - margin: 0; - background-color: #e5f3ff; - } - - } - - } - - } - -} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index c76a2d6d..67a50e50 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -10,15 +10,12 @@ @import "preriscaldo-dashboard.less"; @import "circlegantt.less"; @import "paddle.less"; -@import "arretramento-riscaldi.less"; @import "arch-interface.less"; @import "avvio-prod.less"; @import "processo.less"; @import "progrprerisc.less"; @import "opzioni.less"; @import "imbutitura.less"; -@import "estrazione.less"; -@import "vuoto.less"; @import "popups.less"; @import "grid-system.less"; @import "input.less"; diff --git a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less deleted file mode 100644 index 3daf69dd..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less +++ /dev/null @@ -1,33 +0,0 @@ - // out: false, sourceMap: false, main: ../style.less - @import "grid-system.less"; - @import "colors.less"; - @import "fonts.less"; - - - .modal.vuoto-info { - - section { - - .specific { - padding-left: 5px; - - .box { - margin-bottom: 5px; - background-color: #e5f3ff; - - &:first-of-type { - background-color: white; - } - - &:last-of-type { - background-color: #b3dbff; - } - - } - - - } - - } - - } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 218ed9d5..a2acaf4c 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -5053,10 +5053,6 @@ body { width: 100%; align-self: center; } -.modal.estrazione-info { - width: 560px; - height: 411px; -} .arch { display: flex; justify-content: flex-end; @@ -5436,27 +5432,6 @@ body { margin-bottom: 5px; background-color: #e5f3ff; } -.modal.estrazione-info section.body section .specific { - justify-content: flex-end; - padding-left: 10px; -} -.modal.estrazione-info section.body section .specific .box { - margin: 0; - background-color: #e5f3ff; -} -.modal.vuoto-info section .specific { - padding-left: 5px; -} -.modal.vuoto-info section .specific .box { - margin-bottom: 5px; - background-color: #e5f3ff; -} -.modal.vuoto-info section .specific .box:first-of-type { - background-color: white; -} -.modal.vuoto-info section .specific .box:last-of-type { - background-color: #b3dbff; -} .popup { width: 288px; height: 218px; diff --git a/Thermo.Active/wwwroot/src/App.ts b/Thermo.Active/wwwroot/src/App.ts index e965ca61..b64beb5e 100644 --- a/Thermo.Active/wwwroot/src/App.ts +++ b/Thermo.Active/wwwroot/src/App.ts @@ -12,7 +12,6 @@ import { store, appModelActions, machineStatusActions } from "@/store"; import { underTheHood } from "@/app_modules/under-the-hood"; import SwitchButton from "@/app_modules_thermo/components/paddle/switch-button.vue"; import Sidebar from "@/app_modules_thermo/components/paddle/sidebar.vue"; -import ToggleButton from "@/components/toggleButton.vue"; import Dashboard from "@/app_modules_thermo/dashboard/dashboard.vue"; import PreDashboard from "@/app_modules_thermo/preriscaldo-dashboard/preriscaldo-dashboard.vue"; @@ -38,7 +37,7 @@ declare var cmsClient; switchButton: SwitchButton, sidebar: Sidebar, dashboard: Dashboard, - predashboard:PreDashboard, + predashboard: PreDashboard, alarmList, underTheHood, } @@ -46,13 +45,13 @@ declare var cmsClient; export default class app extends Vue { $route: any; - $router:any; + $router: any; state = this.$store.state; applyBlur = false; showHeaderOnBlur = false; - applyBlurNc= false; + applyBlurNc = false; applyBlurInternal = false; showHMIinProduction = false; showPRODinProduction = false; @@ -163,11 +162,11 @@ export default class app extends Vue { return this.$store.state.isMainViewLiftedUp; } - get statusDashboard(){ + get statusDashboard() { return this.$store.state.isShowDashboard; } - get statusPreDashboard(){ + get statusPreDashboard() { return this.$store.state.isShowPreDashboard; } @@ -195,11 +194,11 @@ export default class app extends Vue { 700 ); if (this.showPRODinProduction && this.$route.path.includes("production")) - messageService.publishToChannel( - "PROD-production-show", - 700 - ); - + messageService.publishToChannel( + "PROD-production-show", + 700 + ); + } } @@ -247,7 +246,7 @@ export default class app extends Vue { messageService.publishToChannel(name); } - toogleDashboard(){ + toogleDashboard() { this.showDashboard = true; } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts index 6c776934..26203a53 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts @@ -1,19 +1,18 @@ import Vue from "vue"; import Component from "vue-class-component"; -import {paddleActions} from '@/store/paddle.store'; -import ToggleButton from "@/components/toggleButton.vue"; +import { paddleActions } from '@/store/paddle.store'; -@Component({name: 'sidebar',components: { toggleButton:ToggleButton } }) -export default class Sidebar extends Vue{ +@Component({ name: 'sidebar' }) +export default class Sidebar extends Vue { - azione1:boolean=false; - azione2:boolean=false; + azione1: boolean = false; + azione2: boolean = false; - isPanelOpen(){ - return this.$store.state.paddle.isNavOpen; - } + isPanelOpen() { + return this.$store.state.paddle.isNavOpen; + } - closeSidebarPanel() { - paddleActions.Toggle(this.$store); - } + closeSidebarPanel() { + paddleActions.Toggle(this.$store); + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts index 7e9f9167..947c7f66 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts @@ -1,35 +1,34 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import { messageService } from "@/_base/messageService"; import { Modal, ModalHelper } from "@/components/modals"; -import ToggleButton from "@/components/toggleButton.vue"; -import {appModelActions} from "@/store/app.store"; +import { appModelActions } from "@/store/app.store"; @Component({ - components: { - modal: Modal, - ToggleButton - } + components: { + modal: Modal, + + } }) -export default class ProgrammazionePreriscaldo extends Vue{ - - enabling:boolean=true; - risc:boolean=true; - termo:boolean=true; - block:boolean=false; - - active:string=""; - meridian:string="--"; - hours:string="00"; +export default class ProgrammazionePreriscaldo extends Vue { - - public sendMessage(name: string) { - messageService.publishToChannel(name); - } + enabling: boolean = true; + risc: boolean = true; + termo: boolean = true; + block: boolean = false; - showPreDashboard() { - appModelActions.ShowPreDashboard(this.$store); - } + active: string = ""; + meridian: string = "--"; + hours: string = "00"; + + + public sendMessage(name: string) { + messageService.publishToChannel(name); + } + + showPreDashboard() { + appModelActions.ShowPreDashboard(this.$store); + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts index 75ca35d7..27127d22 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts @@ -3,52 +3,50 @@ import { Modal, ModalHelper } from "@/components/modals"; import { Factory, messageService, awaiter } from "@/_base"; import Component from "vue-class-component"; import { Prop } from 'vue-property-decorator'; -import ToggleButton from "@/components/toggleButton.vue"; import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; -import {appModelActions} from "@/store/app.store"; +import { appModelActions } from "@/store/app.store"; -@Component({ - components: { +@Component({ + components: { modal: Modal, - ToggleButton, - tastierino:Tastierino - } + tastierino: Tastierino + } }) export default class AvvioProduzione extends Vue { - enabling:boolean=true; - @Prop({}) - pieces:number; + enabling: boolean = true; + @Prop({}) + pieces: number; - mock_pieces:number=this.pieces; + mock_pieces: number = this.pieces; - annulla(){ - ModalHelper.HideModal(); - }; - - // conferma(){ - // ModalHelper.HideModal(); - // }; + annulla() { + ModalHelper.HideModal(); + }; + + // conferma(){ + // ModalHelper.HideModal(); + // }; + + showDashboard() { + ModalHelper.HideModal(); + appModelActions.ShowDashboard(this.$store); + } + + async beforeMount() { + // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); + messageService.subscribeToChannel("esc_pressed", args => { + this.close(); + }); + } + + beforeDestroy() { + messageService.deleteChannel("esc_pressed"); + } + + close() { + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + } - showDashboard() { - ModalHelper.HideModal(); - appModelActions.ShowDashboard(this.$store); - } - - async beforeMount() { - // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); - messageService.subscribeToChannel("esc_pressed", args => { - this.close(); - }); - } - - beforeDestroy() { - messageService.deleteChannel("esc_pressed"); - } - - close() { - messageService.deleteChannel("esc_pressed"); - ModalHelper.HideModal(); - } - } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts index 905ca82d..ec4b5426 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts @@ -3,12 +3,11 @@ import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import SVGCaricatore from "./SVG-Components/SVGcaricatore.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({ components: { ToggleButton, slider: Slider, svgcaricatore: SVGCaricatore, } }) +@Component({ components: { slider: Slider, svgcaricatore: SVGCaricatore, } }) export default class Caricatore extends Vue { @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts index 9feba3a9..2d078ee5 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts @@ -4,18 +4,16 @@ import { Prop } from 'vue-property-decorator'; import acrilico from "./formatura-acrilico.vue"; import cristallizzazione from "./formatura-cristallizzazione.vue"; import riscaldo from "./formatura-riscaldo.vue"; -import ToggleButton from "@/components/toggleButton.vue"; @Component({ name: "cicloformatura", components: { - acrilico, cristallizzazione, riscaldo, - ToggleButton + acrilico, cristallizzazione, riscaldo } }) export default class CicloFormatura extends Vue { @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts index 83e343c2..671713fa 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts @@ -2,12 +2,11 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({ components: { slider: Slider, ToggleButton } }) +@Component({ components: { slider: Slider } }) export default class MascheraAcrilico extends Vue { @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts index 0e0095ee..e2ddc971 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts @@ -2,12 +2,11 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({ components: { slider: Slider, ToggleButton } }) +@Component({ components: { slider: Slider } }) export default class MascheraCristallizzazione extends Vue { @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts index 9d497c90..832f5b2a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts @@ -2,12 +2,11 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({ components: { slider: Slider, ToggleButton } }) +@Component({ components: { slider: Slider } }) export default class MascheraRiscaldo extends Vue { @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts index 0fe5cdec..08d136b8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts @@ -1,14 +1,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import Scheda from "@/app_modules_thermo/components/scheda.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({name:"ariacontrostampo", components: { scheda:Scheda,slider:Slider,ToggleButton}}) +@Component({ name: "ariacontrostampo", components: { scheda: Scheda, slider: Slider } }) export default class AriaControstampo extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts index 63ed19d0..9290a066 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts @@ -1,19 +1,17 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; @Component({ - name:"ciclocontrostampo", - components: { - slider:Slider, - ToggleButton + name: "ciclocontrostampo", + components: { + slider: Slider } }) export default class CicloControstampo extends Vue { @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts index e741de8a..99cfaaa4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts @@ -1,14 +1,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import Scheda from "@/app_modules_thermo/components/scheda.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({name:"estrazionecontrostampo", components: { scheda:Scheda,slider:Slider,ToggleButton}}) +@Component({ name: "estrazionecontrostampo", components: { scheda: Scheda, slider: Slider } }) export default class EstrazioneControstampo extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts index a1d3a315..a79b96f1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts @@ -1,14 +1,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import Scheda from "@/app_modules_thermo/components/scheda.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({name:"vuotocontrostampo", components: { scheda:Scheda,slider:Slider,ToggleButton}}) +@Component({ name: "vuotocontrostampo", components: { scheda: Scheda, slider: Slider } }) export default class VuotoControstampo extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue index 539eae44..bc453c4d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue @@ -1,41 +1,39 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue index 743b91fb..d83a5f14 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue @@ -1,34 +1,34 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue index 2150a8d6..bc37f683 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue @@ -1,32 +1,27 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts index d23ca79a..7c5d895d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts @@ -1,14 +1,12 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -// import Recipe from "@/@types/recipe-current"; -@Component({name:"pirometro", components: { slider:Slider, ToggleButton}}) -export default class Pirometro extends Vue{ - - @Prop() - recipe:Recipe.IRecipe; +@Component({ name: "pirometro", components: { slider: Slider } }) +export default class Pirometro extends Vue { + + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-inferiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-inferiore.ts index d685573b..11166e99 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-inferiore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-inferiore.ts @@ -2,15 +2,12 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; import SVGTermoregolazioneInferiore from './SVG_Components/SVG-termo-inferiore.vue'; -import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; @Component({ name: 'termoinferiore', components: { slider: Slider, - ToggleButton, svgtermoinferiore: SVGTermoregolazioneInferiore, } }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts index c532de89..45d63165 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts @@ -2,15 +2,12 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; import SVGTermoregolazioneSuperiore from './SVG_Components/SVG-termo-superiore.vue'; -import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; @Component({ name: 'termosuperiore', components: { slider: Slider, - ToggleButton, svgtermosuperiore: SVGTermoregolazioneSuperiore, } }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/pirometro.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/pirometro.ts index 8df8e004..5980a793 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/pirometro.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/pirometro.ts @@ -1,18 +1,17 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; - -@Component({name:"pirometro", -components: { - slider:Slider,ToggleButton -} +@Component({ + name: "pirometro", + components: { + slider: Slider + } }) -export default class Pirometro extends Vue{ +export default class Pirometro extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/telescopi.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/telescopi.ts index cbf93d02..8a9c17bc 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/telescopi.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/telescopi.ts @@ -1,17 +1,17 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({name:"telescopi", -components: { - slider:Slider,ToggleButton -} +@Component({ + name: "telescopi", + components: { + slider: Slider + } }) -export default class Telescopi extends Vue{ +export default class Telescopi extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts index 2a6dee63..0c65d26f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts @@ -1,12 +1,10 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; -import toggleButton from "@/components/toggleButton.vue"; import warmers from "./warmers.vue"; @Component({ name: "riscaldiinf", components: { - toggleButton, warmers } }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts index 9ad26a4d..51db7f62 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts @@ -1,12 +1,11 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; -import toggleButton from "@/components/toggleButton.vue"; import warmers from "./warmers.vue"; @Component({ name: "riscaldisup", components: { - toggleButton, + warmers } }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts index ca81dcb8..21ca67e2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts @@ -2,12 +2,11 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue" -import toggleButton from "@/components/toggleButton.vue"; -@Component({ name: "sostdecomp", components: { slider: Slider, toggleButton } }) +@Component({ name: "sostdecomp", components: { slider: Slider } }) export default class SostDecomp extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts index 35735b82..9a4b6641 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts @@ -1,14 +1,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import Scheda from "@/app_modules_thermo/components/scheda.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({name:'prevuoto', components: { slider:Slider, scheda:Scheda,ToggleButton}}) -export default class Prevuoto extends Vue{ +@Component({ name: 'prevuoto', components: { slider: Slider } }) +export default class Prevuoto extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue index 90ddef74..d5829d7b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue @@ -1,47 +1,53 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts index ef15e7ea..f43f143a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.ts @@ -1,14 +1,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import Scheda from "@/app_modules_thermo/components/scheda.vue"; -import ToggleButton from "@/components/toggleButton.vue"; -@Component({name:'vuotoausiliario', components: { slider:Slider, scheda:Scheda,ToggleButton}}) -export default class VuotoAusiliario extends Vue{ +@Component({ name: 'vuotoausiliario', components: { slider: Slider, scheda: Scheda } }) +export default class VuotoAusiliario extends Vue { - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue index b4a7f28d..87bd192e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue @@ -1,57 +1,61 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-diretto.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-diretto.vue index e04a8732..584d4657 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-diretto.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-diretto.vue @@ -1,27 +1,26 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue index f1f0c52a..29ad942b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue @@ -1,57 +1,61 @@ diff --git a/Thermo.Active/wwwroot/src/main.ts b/Thermo.Active/wwwroot/src/main.ts index 701a3993..5b46c839 100644 --- a/Thermo.Active/wwwroot/src/main.ts +++ b/Thermo.Active/wwwroot/src/main.ts @@ -25,8 +25,8 @@ import "./_base/gestures"; import "./app.business-logic"; import "./app.modules"; import { messageService } from "src/_base"; -import { recipeService } from "@/services/recipeService"; +import { warmersService } from "./services/warmersService"; warmersService.GetChannels(); warmersService.GetResistances(); @@ -116,11 +116,13 @@ import "./filters/isValidMixin"; // registrazione componenti generali import components from "@/app_modules_thermo/components"; -import { warmersService } from "./services/warmersService"; for (let name in components) { Vue.component(name, components[name]); } +import toggleButton from "@/components/toggleButton.vue"; +Vue.component('toggleButton', toggleButton); + // polyfills !! if (!(String.prototype as any).format) { (String.prototype as any).format = function () {