diff --git a/Thermo.Active.Config/Config/recipeConfig.xml b/Thermo.Active.Config/Config/recipeConfig.xml index 6624568a..bc6ceda6 100644 --- a/Thermo.Active.Config/Config/recipeConfig.xml +++ b/Thermo.Active.Config/Config/recipeConfig.xml @@ -1091,6 +1091,23 @@ enum 1 0 + + + + 1 + imbutitura-a-tempo.json + + + + 2 + imbutitura-mantenuta.json + + + + 3 + imbutitura-negativa.json + + 99 @@ -2191,6 +2208,23 @@ integer 1 0 + + + + 1 + estrazione-normale.json + + + + 2 + estrazione-senza-cornice.json + + + + 3 + estrazione-assistita.json + + 199 diff --git a/Thermo.Active.Config/Config/recipeConfigValidator.xsd b/Thermo.Active.Config/Config/recipeConfigValidator.xsd index bd6fb2fa..c02d219d 100644 --- a/Thermo.Active.Config/Config/recipeConfigValidator.xsd +++ b/Thermo.Active.Config/Config/recipeConfigValidator.xsd @@ -24,6 +24,7 @@ + @@ -54,14 +55,4 @@ - - - \ No newline at end of file diff --git a/Thermo.Active.Model/ConfigModels/RecipeConfigModel.cs b/Thermo.Active.Model/ConfigModels/RecipeConfigModel.cs index 44c29119..31f25568 100644 --- a/Thermo.Active.Model/ConfigModels/RecipeConfigModel.cs +++ b/Thermo.Active.Model/ConfigModels/RecipeConfigModel.cs @@ -14,6 +14,37 @@ namespace Thermo.Active.Model.ConfigModels public string Format { get; set; } public int ScaleFactor { get; set; } public int NumDec { get; set; } - public Dictionary EnumVal { get; set; } + public Dictionary EnumVal { get; set; } + public string Anim { get; set; } + } + + public class EnumDetail + { + public string text { get; set; } = ""; + public string anim { get; set; } = ""; + + public EnumDetail(string text, string anim) + { + this.text = text; + this.anim = anim; + } + + public override bool Equals(object obj) + { + if (!(obj is EnumDetail item)) + return false; + + if (text != item.text) + return false; + if (anim != item.anim) + return false; + + return true; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } } } diff --git a/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeConfigModel .cs b/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeConfigModel .cs index 8fa139ed..62bbe254 100644 --- a/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeConfigModel .cs +++ b/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeConfigModel .cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Thermo.Active.Model.ConfigModels; namespace Thermo.Active.Model.DTOModels.ThRecipe { @@ -14,6 +15,6 @@ namespace Thermo.Active.Model.DTOModels.ThRecipe public string Label; public int ScaleFactor; public int NumDec; - public Dictionary EnumVal { get; set; } + public Dictionary EnumVal { get; set; } } } \ No newline at end of file diff --git a/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeParam.cs b/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeParam.cs index 4d4549c9..c6bfed81 100644 --- a/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeParam.cs +++ b/Thermo.Active.Model/DTOModels/ThRecipe/DTORecipeParam.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Thermo.Active.Model.ConfigModels; namespace Thermo.Active.Model.DTOModels.ThRecipe { @@ -14,7 +15,7 @@ namespace Thermo.Active.Model.DTOModels.ThRecipe public double ValueAct { get; set; } public int ScaleFactor { get; set; } public int NumDec { get; set; } - public Dictionary EnumVal { get; set; } + public Dictionary EnumVal { get; set; } public override bool Equals(object obj) {