From 00dcc638fc45e65be6aac58240358dde85d90305 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 12 Jun 2020 09:37:22 +0200 Subject: [PATCH] fix footer --- .../setup/ciclo/components/show-ciclo-info.ts | 6 ++++ .../ciclo/components/show-ciclo-info.vue | 2 +- .../setup/components/step-footer.ts | 2 +- .../components/show-controstampo-info.ts | 10 +++++-- .../components/show-controstampo-info.vue | 2 +- .../components/show-estrazione-info.ts | 6 ++++ .../components/show-estrazione-info.vue | 2 +- .../formato/components/show-formato-info.ts | 10 ++++--- .../formato/components/show-formato-info.vue | 2 +- .../setup/imbutitura/show-imbutitura-info.ts | 6 ++++ .../setup/imbutitura/show-imbutitura-info.vue | 28 ++++++------------- .../setup/opzioni/show-opzioni-info.ts | 6 ++++ .../setup/opzioni/show-opzioni-info.vue | 2 +- .../components/show-pirometro-info.ts | 6 ++++ .../components/show-pirometro-info.vue | 2 +- .../components/show-quote-velocita-info.ts | 6 ++++ .../components/show-quote-velocita-info.vue | 2 +- .../components/show-raffreddamento-info.ts | 6 ++++ .../components/show-raffreddamento-info.vue | 2 +- .../riscaldi/components/show-riscaldi-info.ts | 6 ++++ .../components/show-riscaldi-info.vue | 2 +- .../setup/vuoto/show-vuoto-info.ts | 6 ++++ .../setup/vuoto/show-vuoto-info.vue | 2 +- 23 files changed, 87 insertions(+), 37 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts index c5d5dae5..a192ef8a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts @@ -30,6 +30,12 @@ export default class ShowCicloInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue index 5caa9962..2a6bc2ba 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue @@ -17,7 +17,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.ts index 7b2dbc5b..132eccb9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/step-footer.ts @@ -11,6 +11,6 @@ export default class StepFooter extends Vue { current: number; public showModalAtStep(step: number) { - messageService.publishToChannel('show-setup-modal', step); + this.$emit('click', step - this.current) } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts index 023d96f7..83dde323 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts @@ -19,17 +19,23 @@ export default class ShowControstampoInfo extends Vue { @Prop() deferred: Deferred; - annulla(name: string) { + annulla() { ModalHelper.HideModal(); this.deferred.resolve(-1); }; - conferma(name: string) { + conferma() { recipeActions.setCurrent(store, this.recipe); ModalHelper.HideModal(); this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue index 1de1ceed..49f35957 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue @@ -19,7 +19,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts index 73de9f51..bf0d4867 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts @@ -35,6 +35,12 @@ export default class ShowEstrazioneInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue index 864ca21a..920e9850 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue @@ -22,7 +22,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts index 4f79891e..7555eda2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts @@ -55,14 +55,16 @@ export default class ShowFormatoInfo extends Vue { conferma() { recipeActions.setCurrent(store, this.recipe); - - - - ModalHelper.HideModal(); this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue index b14d4dea..1da05c3a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue @@ -62,7 +62,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts index c00cce64..e1945126 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts @@ -36,6 +36,12 @@ export default class ShowImbutituraInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue index 66744715..b0afde36 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue @@ -13,48 +13,36 @@ - +
- +
- +
- +
- +
- +
- +
@@ -70,7 +58,7 @@ - +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts index f1ef11cf..42a22c90 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts @@ -37,6 +37,12 @@ export default class ShowOpzioniInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue index 18c8656f..fb769c5a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue @@ -24,7 +24,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts index 792a8da9..2b61d821 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts @@ -30,6 +30,12 @@ export default class ShowPirometroInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue index 4c4f40f4..6ac4a022 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue @@ -24,7 +24,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts index 816a022d..23dd9099 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts @@ -39,6 +39,12 @@ export default class ShowQuoteVelocitaInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue index 646b4839..6251d923 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue @@ -19,7 +19,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts index 2529c43f..966a5305 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts @@ -35,6 +35,12 @@ export default class Raffreddamento extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue index 9fc2fa07..3a793441 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue @@ -17,7 +17,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts index fb276190..fcc6fb28 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts @@ -30,6 +30,12 @@ export default class ShowRiscaldamentoSuperioreInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue index 58cfcc84..568141ce 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue @@ -25,7 +25,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts index 359b6529..2fe3e675 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts @@ -29,6 +29,12 @@ export default class ShowVuotoInfo extends Vue { this.deferred.resolve(1); }; + goTo(step) { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(step); + } + async beforeMount() { // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); messageService.subscribeToChannel("esc_pressed", args => { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue index 959bc7fe..dc3f4ba1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.vue @@ -18,7 +18,7 @@ - +