From 1b3c7f2d5ba58f670e53ffdda1ee602f2f52df2f Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Thu, 10 May 2018 14:36:10 +0200 Subject: [PATCH] fix --- Step/wwwroot/src/components/tooling-magpos.ts | 5 +- .../wwwroot/src/components/tooling-magpos.vue | 112 +---------- Step/wwwroot/src/components/tooling-shanks.ts | 43 ++--- .../wwwroot/src/components/tooling-shanks.vue | 176 +----------------- Step/wwwroot/src/services/toolingService.ts | 8 +- Step/wwwroot/src/store/tooling.store.ts | 24 +-- 6 files changed, 35 insertions(+), 333 deletions(-) diff --git a/Step/wwwroot/src/components/tooling-magpos.ts b/Step/wwwroot/src/components/tooling-magpos.ts index 88974b2d..4cc66da9 100644 --- a/Step/wwwroot/src/components/tooling-magpos.ts +++ b/Step/wwwroot/src/components/tooling-magpos.ts @@ -27,10 +27,9 @@ export default class toolingMagPos extends Vue { public cancel = function (path:string) { this.$router.push({ path: path}); } + async modify(model) { - async modify(item){ - await new ToolingService().UpdateMagPos(item).then(response => { - this.selectedTool = response; + new ToolingService().UpdateMagPos(model).then(response => { this.magposConfiguration = (this.$store.state as AppModel).tooling.magazinePosConfiguration; }); } diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue index 82fd18cf..fe4ccd03 100644 --- a/Step/wwwroot/src/components/tooling-magpos.vue +++ b/Step/wwwroot/src/components/tooling-magpos.vue @@ -21,7 +21,7 @@
@@ -36,121 +36,13 @@ - - - -
diff --git a/Step/wwwroot/src/components/tooling-shanks.ts b/Step/wwwroot/src/components/tooling-shanks.ts index 30934d5b..235f1f99 100644 --- a/Step/wwwroot/src/components/tooling-shanks.ts +++ b/Step/wwwroot/src/components/tooling-shanks.ts @@ -49,15 +49,6 @@ export default class toolingShanks extends Vue { }); } - public classSelectedTool(item){ - if(item && this.selectedTool && this.selectedTool.id == item.id){ - return true; - } - else{ - return false; - } - } - public addShank(){ this.selectedTool = {}; this.shankConfiguration = []; @@ -97,27 +88,27 @@ export default class toolingShanks extends Vue { this.$router.push({ path: path}); } - async save(item){ - await new ToolingService().SetShank(item).then(response => { + async save(item) { + debugger + new ToolingService().SetShank(item).then(response => { this.selectedTool = response; - let htmlelement = this.$refs.shankList as any; htmlelement.scrollTop = htmlelement.scrollHeight; - }); - this.classSelectedTool(item); - this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration; - await new ToolingService().GetShanks(); - } - async deleteShank(id){ - await new ToolingService().DeleteShank(id).then(response => { - this.selectedTool = null; - }); - await new ToolingService().GetShanks(); - } - async modify(item){ - await new ToolingService().UpdateShank(item).then(response => { - this.selectedTool = response; + this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration; }); } + + async modify(model) { + + new ToolingService().UpdateShank(model).then(response => { + this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration; + }); + } + + async deleteShank(model) { + new ToolingService().DeleteShank(model).then(response => { + this.selectedTool = null; + }); + } } diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue index 81dbada3..3375b9e2 100644 --- a/Step/wwwroot/src/components/tooling-shanks.vue +++ b/Step/wwwroot/src/components/tooling-shanks.vue @@ -22,7 +22,7 @@
@@ -41,7 +41,7 @@
- +
{{'tooling_shanks_boxright_header_modify' | localize("Modifica di Codolo")}} {{selectedTool.id}}
@@ -53,63 +53,7 @@ :title="s.name | localize(s.name)" :type="s.type"> - -
-
@@ -127,126 +71,10 @@
- - - - - -
diff --git a/Step/wwwroot/src/services/toolingService.ts b/Step/wwwroot/src/services/toolingService.ts index d0d4acf6..5ce8dac0 100644 --- a/Step/wwwroot/src/services/toolingService.ts +++ b/Step/wwwroot/src/services/toolingService.ts @@ -113,7 +113,7 @@ export class ToolingService extends baseRestService { } async SetShank(model: any) { var response = await this.Post("/api/tool_table/shank", model); - toolingActions.updateShank(store, model); + toolingActions.updateShank(store, response); return response; } async SetSiemensTool(model: any) { @@ -128,9 +128,9 @@ export class ToolingService extends baseRestService { return result; } - async DeleteShank(id: any) { - var result = await this.Delete("/api/tool_table/shank/" + id); - toolingActions.deleteShank(store, id); + async DeleteShank(model: any) { + var result = await this.Delete("/api/tool_table/shank/" + model.id); + toolingActions.deleteShank(store, model); return result; } async UpdateShank(model: server.Shanks){ diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts index aee8ac24..f82c6d29 100644 --- a/Step/wwwroot/src/store/tooling.store.ts +++ b/Step/wwwroot/src/store/tooling.store.ts @@ -45,7 +45,7 @@ export interface ToolingActions { updateEdgeAdditionalParamsConfiguration(context, model: Map>); deleteFamily(context, familyName: string); - deleteShank(context, id: number); + deleteShank(context, model: server.Shanks); } export const toolingStore = { @@ -60,7 +60,7 @@ export const toolingStore = { shanks: [], _toolsConfiguration: new Map(), magazinesPositions: [], - _magazinesPositions: new Map, server.MagazinesPositions>(), + _magazinesPositions: new Map(), magazinePosConfiguration: [], _magazinePosConfiguration: new Map(), familyConfiguration: [], @@ -101,7 +101,7 @@ export const toolingStore = { store.shanks = Array.from(store._shanks.values()); }, UpdateMagazinePosition(store, model: server.MagazinesPositions) { - store._magazinesPositions.set([model.id, model.magazineId], model); + store._magazinesPositions.set(model.id + "-" + model.magazineId, model); store.magazinesPositions = Array.from(store._magazinesPositions.values()); }, UpdateToolsConfiguration(store, model: server.ToolsConfiguration) { @@ -139,25 +139,17 @@ export const toolingStore = { store._families.delete(model.uid); store.families = Array.from(store._families.values()); }, - DeleteShank(store, model: number) { - - store._shanks.forEach((v, k, m) => { - - if (v.id == model) { - store._shanks.delete(k); - var idx = store.shanks.indexOf(v); - store.shanks.splice(idx, 1); - return; - } - }); + DeleteShank(store, model: server.Shanks) { + store._shanks.delete(model.id); + store.shanks = Array.from(store._shanks.values()); }, }, actions: { deleteFamily(context, familyname: string) { context.commit("DeleteFamily", familyname); }, - deleteShank(context, id: number) { - context.commit("DeleteShank", id); + deleteShank(context, model: server.Shanks) { + context.commit("DeleteShank", model); }, modifyFamily(context, { oldName, model }) { context.commit("ModifyFamily", { oldName, model });