diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts index d5ac2572..8f304237 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -75,7 +75,7 @@ export default class Dashboard extends Vue { } get endEstimation() { - return moment(this.panel.inizioProd).add(this.panel.stimaDurata, 'minutes'); + return moment().add(this.panel.stimaDurata, 'minutes'); } get remainingTime() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts index d3bfa34d..c67dfd2d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -55,8 +55,8 @@ export default class Processo extends Vue { if (!confirm) Hub.Current.sendUserSoftKey(id); else { - ModalHelper.AskConfirm( this.$options.filters.localize("", ""), - this.$options.filters.localize("softkey_confirm", "Cancel"), + ModalHelper.AskConfirm( this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), + this.$options.filters.localize("softkey_confirm", "Confirm?"), () => { Hub.Current.sendUserSoftKey(id); }, null, "modal"); diff --git a/Thermo.Active/wwwroot/src/modules/app-footer.ts b/Thermo.Active/wwwroot/src/modules/app-footer.ts index 314b9dd0..c83cb114 100644 --- a/Thermo.Active/wwwroot/src/modules/app-footer.ts +++ b/Thermo.Active/wwwroot/src/modules/app-footer.ts @@ -75,7 +75,12 @@ export default class AppFooter extends Vue { } async runManual() { - await prodService.Manual(); + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), + this.$options.filters.localize("modal_confirm_mode_manual", "Confermi di voler passare alla modalità manuale?"), + () => { + prodService.Manual(); + }, null, "modal"); + } async runAuto() { diff --git a/Thermo.Active/wwwroot/src/modules/app-footer.vue b/Thermo.Active/wwwroot/src/modules/app-footer.vue index c2d3120c..2e977d6c 100644 --- a/Thermo.Active/wwwroot/src/modules/app-footer.vue +++ b/Thermo.Active/wwwroot/src/modules/app-footer.vue @@ -97,11 +97,13 @@