After Virus

4 files changed, 80 insertions, 47 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs
index 005ca8a53..de16be5d0 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/ColorProcessParametersBuilder.cs
@@ -16,25 +16,21 @@ namespace Tango.BL.Builders
 
         }
         
-        //protected override IQueryable<ColorProcessParameter> OnSetQuery(IQueryable<ColorProcessParameter> query)
-        //{
-        //    return query.
-        //        Include(x => x.ColorProcessData).
-        //        Include(x => x.ColorProcessFactor);
-        //}
         public virtual ColorProcessParametersBuilder WithColorProcessData()
         {
-            return AddQueryStep(1, (query) =>
+            return AddStep(12, () =>
             {
-                return query.Include(x => x.ColorProcessData);
+                Context.ColorProcessData.Where(x => x.ColorProcessParametersGuid == Entity.Guid).OrderBy(x => x.Color).ToList();
+
             });
         }
 
         public virtual ColorProcessParametersBuilder WithColorProcessFactor()
         {
-            return AddQueryStep(2, (query) =>
+            return AddStep(2, () =>
             {
-                return query.Include(x => x.ColorProcessFactor);
+                Context.ColorProcessFactors.Where(x => x.ColorProcessParametersGuid == Entity.Guid).OrderBy(x => x.Color).ToList();
+               
             });
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
new file mode 100644
index 000000000..574439852
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using System.Data.Entity;
+using Tango.BL.Enumerations;
+
+namespace Tango.BL.Builders
+{
+    public class RMLExtensionTestResultsCollectionBuilder : EntityCollectionBuilderBase<RmlExtensionTestResult, RMLExtensionTestResultsCollectionBuilder>
+    {
+        public RMLExtensionTestResultsCollectionBuilder(ObservablesContext context) : base(context)
+        {
+        }
+        
+        public virtual RMLExtensionTestResultsCollectionBuilder WithRubbingAndTensileResults()
+        {
+            return AddStep(2, () =>
+            {
+                foreach (var result in Entities.ToList())
+                {
+                    Context.RubbingResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).OrderBy(x => x.Color).ToList();
+                    Context.TensileResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).OrderByDescending(i => i.ColorPercent.HasValue).ThenBy(x => x.ColorPercent).ThenByDescending(x => x.Color).ToList();
+                }
+            });
+        }
+        public virtual RMLExtensionTestResultsCollectionBuilder ForRMLExtension(String rmlExtensionGUID)
+        {
+            return AddQueryStep(0, (query) =>
+            {
+                if (rmlExtensionGUID != null)
+                {
+                    return query.Where(x => x.RmlsExtensionsGuid == rmlExtensionGUID);
+                }
+                else
+                {
+                    return query;
+                }
+            });
+        }
+        public virtual RMLExtensionTestResultsCollectionBuilder ForMachine(String machineGUID)
+        {
+            return AddQueryStep(1, (query) =>
+            {
+                if (machineGUID != null )
+                {
+                    return query.Where(x => x.MachineGuid == machineGUID);
+                }
+                else
+                {
+                    return query;
+                }
+            });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs
index 370c4273c..e1b91f216 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtentionsCollectionBuilder.cs
@@ -14,29 +14,14 @@ namespace Tango.BL.Builders
         public RMLExtentionsCollectionBuilder(ObservablesContext context) : base(context)
         {
         }
-        public virtual RMLExtentionsCollectionBuilder WithUser()
-        {
-            //return AddStep(0, () =>
-            //{
-            //    foreach (var rmlExtentions in Entities.ToList())
-            //    {
-            //        new UserBuilder(Context).Set(rmlExtentions.UserGuid).Build();
-            //    }
-            //});
-           
-            return AddQueryStep(0, (query) =>
-            {
-                return query.Include(x => x.User).Include(x => x.User.Contact);
-            });
-        }
-
+       
         public virtual RMLExtentionsCollectionBuilder WithUsers()
         {
             return AddStep(2, () =>
             {
                 foreach (var rmlExtention in Entities)
                 {
-                    new UsersCollectionBuilder(Context).Set(x => x.Guid == rmlExtention.UserGuid).WithAddress().WithContacts().Build();
+                    new UsersCollectionBuilder(Context).Set(x => x.Guid == rmlExtention.UsersGuid).WithAddress().WithContacts().Build();
                 }
             });
         }
@@ -46,19 +31,16 @@ namespace Tango.BL.Builders
             return AddStep(1, () =>
             {
                 Context.YarnApplications.ToList();
-                Context.YarnBrand.ToList();
-                Context.YarnColor.ToList();
-                Context.YarnEndUse.ToList();
-                Context.YarnGeometry.ToList();
-                Context.YarnFamily.ToList();
-                Context.YarnGlossLevel.ToList();
-                Context.YarnGroup.ToList();
-                Context.YarnIndustrysector.ToList();
-                Context.YarnManufacturer.ToList();
-                Context.YarnMaterials.ToList();
-                Context.YarnSubFamily.ToList();
-                Context.YarnTexturing.ToList();
-                Context.YarnType.ToList();
+                Context.YarnBrands.ToList();
+                Context.YarnWhiteShades.ToList();
+                Context.YarnFamilies.ToList();
+                Context.YarnGlossLevels.ToList();
+                Context.YarnGroups.ToList();
+                Context.YarnIndustrysectors.ToList();
+                Context.YarnManufacturers.ToList();
+                Context.YarnSubFamilies.ToList();
+                Context.YarnTexturings.ToList();
+                Context.YarnTypes.ToList();
             });
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs
index 00c251a4e..d8c0d3ddc 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlExtensionsBuilder.cs
@@ -18,17 +18,14 @@ namespace Tango.BL.Builders
         protected override IQueryable<RmlsExtension> OnSetQuery(IQueryable<RmlsExtension> query)
         {
             return query.
-                Include(x => x.Rml).
-                Include(x => x.YarnApplications).
+                Include(x => x.Rmls).
+                Include(x => x.YarnApplication).
                 Include(x => x.YarnBrand).
-                Include(x => x.YarnColor).
-                Include(x => x.YarnEndUse).
+                Include(x => x.YarnWhiteShade).
                 Include(x => x.YarnFamily).
-                Include(x => x.YarnGeometry).
                 Include(x => x.YarnGlossLevel).
                 Include(x => x.YarnGroup).
                 Include(x => x.YarnManufacturer).
-                Include(x => x.YarnMaterial).
                 Include(x => x.YarnSubFamily).
                 Include(x => x.YarnTexturing).
                 Include(x => x.YarnType);
@@ -37,7 +34,7 @@ namespace Tango.BL.Builders
         {
             return AddStep(0, () =>
             {
-                new UserBuilder(Context).Set(Entity.UserGuid).WithRolesAndPermissions().Build();
+                new UserBuilder(Context).Set(Entity.UsersGuid).WithRolesAndPermissions().Build();
             });
         }
     }