diff --git a/Step/wwwroot/src/@types/tooling.d.ts b/Step/wwwroot/src/@types/tooling.d.ts index 2f9f7b7a..7a08428a 100644 --- a/Step/wwwroot/src/@types/tooling.d.ts +++ b/Step/wwwroot/src/@types/tooling.d.ts @@ -12,6 +12,8 @@ declare module server { maxMultitools: number maxToolsPerMultitools: number multitoolOptionActive: boolean + familyOptionActive: boolean + magPositionOptionActive: boolean } export interface EdgesConfiguration { diff --git a/Step/wwwroot/src/components/tooling.ts b/Step/wwwroot/src/components/tooling.ts index ab6245f0..ed88c161 100644 --- a/Step/wwwroot/src/components/tooling.ts +++ b/Step/wwwroot/src/components/tooling.ts @@ -13,6 +13,12 @@ export default class Tooling extends Vue { public get multitoolOptionActive(): boolean{ return (this.$store.state as AppModel).tooling.multitoolOptionActive; } + public get familyOptionActive(): boolean{ + return (this.$store.state as AppModel).tooling.familyOptionActive; + } + public get magPositionOptionActive(): boolean{ + return (this.$store.state as AppModel).tooling.magPositionOptionActive; + } // public get magazines(): server.MagazineModel[] { // return (this.$store.state as AppModel).tooling.magazines; // } diff --git a/Step/wwwroot/src/components/tooling.vue b/Step/wwwroot/src/components/tooling.vue index 9223bd9b..f2e6e711 100644 --- a/Step/wwwroot/src/components/tooling.vue +++ b/Step/wwwroot/src/components/tooling.vue @@ -15,8 +15,8 @@
- - + +
diff --git a/Step/wwwroot/src/services/toolingService.ts b/Step/wwwroot/src/services/toolingService.ts index 2e5e26a5..267ecabf 100644 --- a/Step/wwwroot/src/services/toolingService.ts +++ b/Step/wwwroot/src/services/toolingService.ts @@ -47,6 +47,8 @@ export class ToolingService extends baseRestService { toolingActions.setMaxMultitools(store, result.maxMultitools); toolingActions.setToolsPerMultitools(store, result.maxToolsPerMultitools); toolingActions.setMultitoolOptionActive(store, result.multitoolOptionActive); + toolingActions.setFamilyOptionActive(store, result.familyOptionActive); + toolingActions.setMagPositionOptionActive(store, result.magPositionOptionActive); toolingActions.updateToolsConfigurations(store, result.toolsConfiguration); toolingActions.updateMagazinePosConfigurations( store, diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts index d29c5339..3c0561c4 100644 --- a/Step/wwwroot/src/store/tooling.store.ts +++ b/Step/wwwroot/src/store/tooling.store.ts @@ -21,6 +21,8 @@ export interface ToolingStoreModel { maxMultitools: number maxToolsPerMultitools: number multitoolOptionActive: boolean + familyOptionActive: boolean + magPositionOptionActive: boolean } export interface ToolingGetters{ @@ -72,6 +74,8 @@ export interface ToolingActions { setMaxMultitools(context, number); setToolsPerMultitools(context, number); setMultitoolOptionActive(context, multitoolOptionActive: boolean); + setFamilyOptionActive(context, familyOptionActive: boolean); + setMagPositionOptionActive(context, magPositionOptionActive: boolean); } export const toolingStore = { @@ -108,7 +112,9 @@ export const toolingStore = { maxEdgesPerTools: 0, maxMultitools: 0, maxToolsPerMultitools: 0, - multitoolOptionActive: false + multitoolOptionActive: false, + familyOptionActive: false, + magPositionOptionActive: false } as ToolingStoreModel, getters:{ toolIsInWarning : (state) => (id) : boolean =>{ @@ -268,12 +274,24 @@ export const toolingStore = { }, SetMultitoolOptionActive(store, multitoolOptionActive){ store.multitoolOptionActive = multitoolOptionActive; + }, + SetFamilyOptionActive(store, familyOptionActive){ + store.familyOptionActive = familyOptionActive; + }, + SetMagPositionOptionActive(store, magPositionOptionActive){ + store.magPositionOptionActive = magPositionOptionActive; } }, actions: { setMultitoolOptionActive(context, multitoolOptionActive: boolean){ context.commit("SetMultitoolOptionActive", multitoolOptionActive); }, + setFamilyOptionActive(context, familyOptionActive: boolean){ + context.commit("SetFamilyOptionActive", familyOptionActive); + }, + setMagPositionOptionActive(context, magPositionOptionActive: boolean){ + context.commit("SetMagPositionOptionActive", magPositionOptionActive); + }, setToolsPerMultitools(context, maxToolsPerMultitools: number){ context.commit("SetToolsPerMultitools", maxToolsPerMultitools); },