From 4b02a41b59cb4389efcad0e9ccff28dd12459280 Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Fri, 11 Jan 2019 11:50:40 +0100 Subject: [PATCH] Added confirm-box on perform maintenance actions & fix translation Bug --- Step.Utils/languages/IT.xml | 3 +- Step.Utils/languages/en.xml | 3 +- .../alarms/components/alarm-detail.ts | 4 +-- .../alarms/components/alarm-history.ts | 4 +-- .../components/maintenance-card.ts | 28 +++++++++++-------- .../maintenance/components/maintenance.ts | 2 +- .../tooling/components/tooling-equipment.ts | 4 +-- .../tooling/components/tooling-shanks.ts | 4 +-- 8 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index c1515bbe..a5944813 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -430,7 +430,7 @@ Famiglie disponibili: - Richiesta di conferma + Richiesta di conferma Ok Annulla Sei sicuro di voler cancellare l'utensile? @@ -442,6 +442,7 @@ Sei sicuro di voler cancellare il multitool? Sei sicuro di voler scaricare l'utensile dal codolo? Sei sicuro di voler scaricare l'utensile dal multitool? + Sei sicuro di aver eseguito questa manutenzione? Gestore delle manutenzioni diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index 03eac72c..0ce84f32 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -429,7 +429,7 @@ Available Families - Confirm Operation + Confirm Operation Ok Cancel Are you sure to delete this tool? @@ -441,6 +441,7 @@ Are you sure to delete this multitool? Are you sure to unload this tool from his shank? Are you sure to unload this tool from his multitool? + Are you sure you have performed this maintenance? Maintenance manager diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts index b6ce1fb4..065d826f 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts @@ -83,7 +83,7 @@ export default class AlarmDetail extends Vue { let $this = this; if (attach) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_attachment", "Confermi la cancellazione dell'allegato?"), () => { alarmsService.deleteAttachments(attach.attachmentId).then(response => { @@ -169,7 +169,7 @@ export default class AlarmDetail extends Vue { debugger let $this = this; if(note){ - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_note", "Confermi la cancellazione della nota?"), () => { alarmsService.deleteNote(this.alarm.id,note.id).then(response => { diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts index 2d09adfa..0f8391ed 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts @@ -163,7 +163,7 @@ export default class AlarmHistory extends Vue { debugger let $this = this; if(note){ - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_note", "Confermi la cancellazione della nota?"), () => { alarmsService.deleteNote(this.selectedAlarm.alarmId,note.id).then(response => { @@ -178,7 +178,7 @@ export default class AlarmHistory extends Vue { let $this = this; if (attach) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_attachment", "Confermi la cancellazione dell'allegato?"), () => { alarmsService.deleteAttachments(attach.attachmentId).then(response => { diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts index 065f21fd..eed5e501 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts @@ -138,7 +138,7 @@ export default class MaintenanceCard extends Vue { } async onClickDeleteNote(note) { if (note && this.selectedMaintenance.id) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_note", "Confermi la cancellazione della nota?"), () => { new MaintenanceService().DeleteNoteMaintenance(this.selectedMaintenance.id, note).then(response => { @@ -178,17 +178,23 @@ export default class MaintenanceCard extends Vue { return ""; } async onClickRunMaintenance(m) { - await new MaintenanceService().RunMaintenance(m); - //Delete from Expired List - let service = this.$store.state.alarms.serviceAlarms.find(d => d.id == m.id); - if (service) { - service.guid = service.uid; - alarmsModelActions.removeServiceAlarm(this.$store, service); - } + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), + this.$options.filters.localize("modal_confirm_perform_maintenance", "Sei sicuro di aver eseguito questa manutenzione?"), + () => { + + new MaintenanceService().RunMaintenance(m); - //Reload Maintenances - await new MaintenanceService().GetMaintenances(); + //Delete from Expired List + let service = this.$store.state.alarms.serviceAlarms.find(d => d.id == m.id); + if (service) { + service.guid = service.uid; + alarmsModelActions.removeServiceAlarm(this.$store, service); + } + + //Reload Maintenances + new MaintenanceService().GetMaintenances(); + }, null); } existMantainance() { if (this.selectedMaintenance.lastPerformedDate) { @@ -207,7 +213,7 @@ export default class MaintenanceCard extends Vue { } async onClickDeleteAttach(attach) { if (attach) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_attachment", "Confermi la cancellazione dell'allegato?"), () => { new MaintenanceService().DeleteAttachMaintenance(attach).then(response => { diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts index a11d7c60..da5bf3fd 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts @@ -208,7 +208,7 @@ export default class Maintenance extends Vue { async deleteMaintenance(maintenance) { if (maintenance) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_maintenances", "Confermi la cancellazione della manutenzione?"), () => { awaiter(new MaintenanceService().DeleteMaintenance(maintenance).then(response => { diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts index bd0f924a..8b09434d 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts @@ -685,7 +685,7 @@ export default class toolingEquipment extends Vue { } async deleteTool(model) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_tool", "Confermi la cancellazione del tool?"), () => { if(this.isSiemens){ @@ -702,7 +702,7 @@ export default class toolingEquipment extends Vue { } async deleteEdgeData(tool, model) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_edge", "Confermi la cancellazione del tagliente?"), () => { if(this.isSiemens){ diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts index 2fad5cec..2785fe46 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts @@ -454,7 +454,7 @@ export default class toolingShanks extends Vue { // }); } public removeToolsToShank(shank) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_tool_inshank", "Confermi la rimozione del tool dal codolo?"), () => { let model = this.selectedEquipment; @@ -490,7 +490,7 @@ export default class toolingShanks extends Vue { } async deleteShank(model) { - ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_delete", "Richiesta di conferma"), + ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), this.$options.filters.localize("modal_confirm_delete_shank", "Confermi la cancellazione del codolo?"), () => { if(this.isSiemens){