Dispenser Jid - Test examples. Create DispenserAnalyser utility project. Seal test.

3 files changed, 43 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs b/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs
index 6d1deded2..ec5b07630 100644
--- a/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs
+++ b/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs
@@ -240,22 +240,39 @@ namespace Tango.CSV
         /// <param name="c">The c.</param>
         /// <param name="staticMember">if set to <c>true</c> [static member].</param>
         /// <returns></returns>
-        private static Action<T, string> FindSetter(string c, bool staticMember)
+        private static Action<T, string> FindSetter(string c, bool staticMember, int? index = null)
         {
             var flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.IgnoreCase | (staticMember ? BindingFlags.Static : BindingFlags.Instance);
             Action<T, string> action = null;
+
             PropertyInfo pi = typeof(T).GetProperty(c, flags);
             if (pi != null)
             {
                 var pFunc = StringToObject(pi.PropertyType);
                 action = EmitSetValueAction(pi, pFunc);
             }
-            FieldInfo fi = typeof(T).GetField(c, flags);
-            if (fi != null)
+
+            if (action == null)
+            {
+                FieldInfo fi = typeof(T).GetField(c, flags);
+                if (fi != null)
+                {
+                    var fFunc = StringToObject(fi.FieldType);
+                    action = EmitSetValueAction(fi, fFunc);
+                }
+            }
+
+            if (action == null && index != null)
             {
-                var fFunc = StringToObject(fi.FieldType);
-                action = EmitSetValueAction(fi, fFunc);
+                var propByIndex = typeof(T).GetProperties(flags).SingleOrDefault(x => x.GetCustomAttribute<CsvOrderAttribute>() != null && x.GetCustomAttribute<CsvOrderAttribute>().Index == index);
+
+                if (propByIndex != null)
+                {
+                    var pFunc = StringToObject(propByIndex.PropertyType);
+                    action = EmitSetValueAction(propByIndex, pFunc);
+                }
             }
+
             return action;
         }
 
@@ -292,7 +309,7 @@ namespace Tango.CSV
                 Action<T, string> action = null;
                 if (columnName.IndexOf(' ') >= 0)
                     columnName = columnName.Replace(" ", "");
-                action = FindSetter(columnName, false) ?? FindSetter(columnName, true);
+                action = FindSetter(columnName, false, i) ?? FindSetter(columnName, true, i);
 
                 list.Add(action);
             }
diff --git a/Software/Visual_Studio/Tango.CSV/CsvOrderAttribute.cs b/Software/Visual_Studio/Tango.CSV/CsvOrderAttribute.cs
new file mode 100644
index 000000000..cf04334cb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CSV/CsvOrderAttribute.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CSV
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+    public class CsvOrderAttribute : Attribute
+    {
+        public int Index { get; set; }
+
+        public CsvOrderAttribute(int index)
+        {
+            Index = index;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj
index eee9649e6..c3e455ff1 100644
--- a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj
+++ b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj
@@ -85,6 +85,7 @@
     <Compile Include="CsvFileLinqExtensions.cs" />
     <Compile Include="CsvFileReader.cs" />
     <Compile Include="CsvIgnoreAttribute.cs" />
+    <Compile Include="CsvOrderAttribute.cs" />
     <Compile Include="CsvSource.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>