Review of recipe config models and xml/xsd valid

Thermo.Active.Config/Config/recipeConfig.xml

@@ -1091,6 +1091,23 @@
         <format>enum</format>
         <scaleFactor>1</scaleFactor>
         <numDec>0</numDec>
+        <enumList>
+            <enumVal>
+                <label>drawing_type_RE_01</label>
+                <value>1</value>
+                <anim>imbutitura-a-tempo.json</anim>
+            </enumVal>
+            <enumVal>
+                <label>drawing_type_RE_02</label>
+                <value>2</value>
+                <anim>imbutitura-mantenuta.json</anim>
+            </enumVal>
+            <enumVal>
+                <label>drawing_type_RE_03</label>
+                <value>3</value>
+                <anim>imbutitura-negativa.json</anim>
+            </enumVal>
+        </enumList>
     </parameter>
     <parameter>
         <id>99</id>
@@ -2191,6 +2208,23 @@
         <format>integer</format>
         <scaleFactor>1</scaleFactor>
         <numDec>0</numDec>
+        <enumList>
+            <enumVal>
+                <label>extraction_main_type_RE_01</label>
+                <value>1</value>
+                <anim>estrazione-normale.json</anim>
+            </enumVal>
+            <enumVal>
+                <label>extraction_main_type_RE_02</label>
+                <value>2</value>
+                <anim>estrazione-senza-cornice.json</anim>
+            </enumVal>
+            <enumVal>
+                <label>extraction_main_type_RE_03</label>
+                <value>3</value>
+                <anim>estrazione-assistita.json</anim>
+            </enumVal>
+        </enumList>
     </parameter>
     <parameter>
         <id>199</id>

Thermo.Active.Config/Config/recipeConfigValidator.xsd

@@ -24,6 +24,7 @@
                                                 <xs:all>
                                                     <xs:element name="label" type="xs:string" />
                                                     <xs:element name="value" type="xs:string" />
+                                                    <xs:element name="anim" type="xs:string" minOccurs="0" />
                                                 </xs:all>
                                             </xs:complexType>
                                         </xs:element>
@@ -54,14 +55,4 @@
         </xs:restriction>
     </xs:simpleType>
 
-
-    <!-- Enum Type -->
-    <!--<xs:complexType name="enumVal">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="label" use="required" type="xs:string" />
-                <xs:attribute name="value" use="required" type="xs:string" />
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>-->
 </xs:schema>

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<string, string> EnumVal { get; set; }
+        public Dictionary<string, EnumDetail> 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();
+        }
     }
 }

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<string, string> EnumVal { get; set; }
+        public Dictionary<string, EnumDetail> EnumVal { get; set; }
     }
 }

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<string, string> EnumVal { get; set; }
+        public Dictionary<string, EnumDetail> EnumVal { get; set; }
 
         public override bool Equals(object obj)
         {