diff --git a/Thermo.Active/wwwroot/src/@types/warmers-channel.d.ts b/Thermo.Active/wwwroot/src/@types/warmers-channel.d.ts index 32dc9b5d..3f0384fe 100644 --- a/Thermo.Active/wwwroot/src/@types/warmers-channel.d.ts +++ b/Thermo.Active/wwwroot/src/@types/warmers-channel.d.ts @@ -1,19 +1,15 @@ declare module Warmers { - interface IChannel{ - idChannel: number, - idReflector: number, - setpointRecipe: number, - setpointTermocam: number, - setpointPLC: number, - channelStatus: number, - actualCurrent: number, - actualPerc: number, - maxPower: number - } - - interface IChannels{ - channels:IChannel[] - } + interface IChannel { + idChannel: number, + idReflector: number, + setpointRecipe: number, + setpointTermocam: number, + setpointPLC: number, + channelStatus: number, + actualCurrent: number, + actualPerc: number, + maxPower: number + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/@types/warmers-resistance.d.ts b/Thermo.Active/wwwroot/src/@types/warmers-resistance.d.ts index bebc7b23..92fd5656 100644 --- a/Thermo.Active/wwwroot/src/@types/warmers-resistance.d.ts +++ b/Thermo.Active/wwwroot/src/@types/warmers-resistance.d.ts @@ -1,15 +1,13 @@ declare module Warmers { - interface IResistance{ - id: number, - idChannel: number, - column: number, - row: number, - dimension: number - } + interface IResistance { + id: number, + idChannel: number, + column: number, + row: number, + dimension: number + } + - interface IResistances{ - resistances:IResistance[] - } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/store/warmers.store.ts b/Thermo.Active/wwwroot/src/store/warmers.store.ts index 453c2b29..f464ec52 100644 --- a/Thermo.Active/wwwroot/src/store/warmers.store.ts +++ b/Thermo.Active/wwwroot/src/store/warmers.store.ts @@ -1,54 +1,61 @@ export interface WarmersStoreModel { - channels: Warmers.IChannels; - resistances: Warmers.IResistances; + channels: Warmers.IChannel[]; + resistances: Warmers.IResistance[]; } export interface WarmersActions { - setChannels(context, model: Warmers.IChannels); - setResistances(context, model: Warmers.IResistances); + setChannels(context, model: { [id: number]: Warmers.IChannel }); + setResistances(context, model: { [id: number]: Warmers.IResistance }); } -export interface WarmersGetters{ - getChannels: () => Warmers.IChannels; - getResistances: () => Warmers.IResistances; +export interface WarmersGetters { + getChannels: () => Warmers.IChannel[]; + getResistances: () => Warmers.IResistance[]; } export const warmersStore = { - - state:{ - channels:{}, - resistances:{}, - } as WarmersStoreModel, - getters: { - getChannels: (state) => (): Warmers.IChannels => (state as WarmersStoreModel).channels, - getResistances: (state) => (): Warmers.IResistances => (state as WarmersStoreModel).resistances, + state: { + channels: [], + resistances: [], + } as WarmersStoreModel, + + getters: { + getChannels: (state) => (): Warmers.IChannel[] => (state as WarmersStoreModel).channels, + getResistances: (state) => (): Warmers.IResistance[] => (state as WarmersStoreModel).resistances, + }, + + mutations: { + + SetChannels(state, model: { [id: number]: Warmers.IChannel }) { + for (const key in model) { + if (model.hasOwnProperty(key)) { + const element = model[key]; + state.channels.push(element); + } + } }, - mutations: { - - SetChannels(state, model: Warmers.IChannels){ - state.channels = model; - }, - - SetResistances(state, model: Warmers.IResistances){ - state.resistances = model; - }, - + SetResistances(state, model: { [id: number]: Warmers.IResistance }) { + for (const key in model) { + if (model.hasOwnProperty(key)) { + const element = model[key]; + state.resistances.push(element); + } + } }, - actions: { + }, + actions: { + setChannels(context, model: { [id: number]: Warmers.IChannel }) { + context.commit("SetChannels", model); + }, + setResistances(context, model: { [id: number]: Warmers.IResistance }) { + context.commit("SetResistances", model); + }, - setChannels(context, model: Warmers.IChannels){ - context.commit("SetChannels", model); - }, - - setResistances(context, model: Warmers.IResistances){ - context.commit("SetResistances", model); - }, - - } as WarmersActions + } as WarmersActions }