From 562bd54751efe9e84e1f54f245ae5cc765da12ef Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Thu, 14 Jun 2018 11:18:22 +0200 Subject: [PATCH] modify maintenance --- Step/wwwroot/src/components/maintenance.ts | 21 ++++++---- Step/wwwroot/src/components/maintenance.vue | 5 ++- .../modules/base-components/ModalHelper.ts | 3 ++ .../cards/maintenance-card.vue | 23 ++++++++--- .../src/modules/create-maintenance.vue | 38 +++++++++++++++++-- .../src/services/maintenanceService.ts | 7 +++- Step/wwwroot/src/store/maintenance.store.ts | 15 +++++++- 7 files changed, 91 insertions(+), 21 deletions(-) diff --git a/Step/wwwroot/src/components/maintenance.ts b/Step/wwwroot/src/components/maintenance.ts index 66e0901e..992cb358 100644 --- a/Step/wwwroot/src/components/maintenance.ts +++ b/Step/wwwroot/src/components/maintenance.ts @@ -15,6 +15,9 @@ export default class Maintenance extends Vue { public selectedMaintenance: any = null; + // public static selectedMaintenance: any = null; + // public static currentSelected: any = null; + async mounted(){ @@ -82,17 +85,21 @@ export default class Maintenance extends Vue { } public createMaintenance(){ + this.selectedMaintenance = {}; + ModalHelper.maintenanceModal.currentMaintenance = {}; ModalHelper.ShowModal(CreateMaintenance); } public selectMaintenance(m){ - if(this.selectedMaintenance){ - this.selectedMaintenance = null; - this.enableMaintenance = true; - } - else{ - this.selectedMaintenance = m; - this.enableMaintenance = false; + debugger + this.enableMaintenance = false; + this.selectedMaintenance = m; + } + public modifyMaintenance(maintenance){ + debugger + if(maintenance){ + ModalHelper.maintenanceModal.currentMaintenance =Object.assign({} , maintenance); + ModalHelper.ShowModal(CreateMaintenance); } } } \ No newline at end of file diff --git a/Step/wwwroot/src/components/maintenance.vue b/Step/wwwroot/src/components/maintenance.vue index 9986b065..734700df 100644 --- a/Step/wwwroot/src/components/maintenance.vue +++ b/Step/wwwroot/src/components/maintenance.vue @@ -52,7 +52,10 @@
- +
diff --git a/Step/wwwroot/src/modules/base-components/ModalHelper.ts b/Step/wwwroot/src/modules/base-components/ModalHelper.ts index 38834de8..80829f85 100644 --- a/Step/wwwroot/src/modules/base-components/ModalHelper.ts +++ b/Step/wwwroot/src/modules/base-components/ModalHelper.ts @@ -14,6 +14,9 @@ export class ModalHelper { enableModalShank: false, enableModalTool: false }; + public static maintenanceModal = { + currentMaintenance: null, + }; private static _modalData = { title: "", content: "", diff --git a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue index ae801f6c..d891d514 100644 --- a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue +++ b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue @@ -4,13 +4,13 @@
{{'maintenance_card_label_title' | localize("Effettuare pulizia macchina")}}
- - + +
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.
+
{{selectedMaintenance.description}}
Ultimo intervento effettuato 23 gg fa
In scadenza
-
21/07/2017
+
{{expiration}}
\ No newline at end of file +[] \ No newline at end of file diff --git a/Step/wwwroot/src/services/maintenanceService.ts b/Step/wwwroot/src/services/maintenanceService.ts index ed73e2b4..c07313e0 100644 --- a/Step/wwwroot/src/services/maintenanceService.ts +++ b/Step/wwwroot/src/services/maintenanceService.ts @@ -6,12 +6,15 @@ export class MaintenanceService extends baseRestService { BASE_URL = "api/maintenance_manager/"; async GetMaintenances(){ - let result = await this.Get(this.BASE_URL + "maintenances"); + let result = await this.Get(this.BASE_URL + "maintenances", true); maintenanceActions.updateMaintenances(store, result); } async SetMaintenance(model){ - debugger let result = await this.Post(this.BASE_URL + "maintenance", model, true); maintenanceActions.updateMaintenance(store, result); } + async ModifyMaintenance(model){ + let result = await this.Put(this.BASE_URL + "maintenance/" + model.id, model, true); + maintenanceActions.modifyMaintenance(store, result); + } } diff --git a/Step/wwwroot/src/store/maintenance.store.ts b/Step/wwwroot/src/store/maintenance.store.ts index 5e745d61..d4db9fcf 100644 --- a/Step/wwwroot/src/store/maintenance.store.ts +++ b/Step/wwwroot/src/store/maintenance.store.ts @@ -5,6 +5,7 @@ export interface MaintenanceStoreModel { export interface MaintenanceActions { updateMaintenances(context, model: server.Maintenance[]); updateMaintenance(context, model: server.Maintenance); + modifyMaintenance(context, model: server.Maintenance); } export const maintenanceStore = { @@ -14,10 +15,17 @@ export const maintenanceStore = { } as MaintenanceStoreModel, mutations: { UpdateMaintenance(store, model: server.Maintenance) { - debugger store._maintenances.set(model.id, model); store.maintenances = Array.from(store._maintenances.values()); - }, + }, + ModifyMaintenance(store, model: server.Maintenance){ + for(let key in store.maintenances){ + if(store.maintenances[key].id == model.id){ + Object.assign(store.maintenances[key],model); + } + } + + } }, actions: { updateMaintenance(context, model: server.Maintenance){ @@ -29,6 +37,9 @@ export const maintenanceStore = { const element = model[key]; context.commit("UpdateMaintenance", element); } + }, + modifyMaintenance(context, model: server.Maintenance){ + context.commit("ModifyMaintenance", model); } } as MaintenanceActions }