merge

14 files changed, 48 insertions, 393 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Builders/ActionLogsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/ActionLogsCollectionBuilder.cs
deleted file mode 100644
index 3c2d97620..000000000
--- a/Software/Visual_Studio/Tango.BL/Builders/ActionLogsCollectionBuilder.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-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 ActionLogsCollectionBuilder : EntityCollectionBuilderBase<ActionLog, ActionLogsCollectionBuilder>
-    {
-        public ActionLogsCollectionBuilder(ObservablesContext context) : base(context)
-        {
-
-        }
-
-        public virtual ActionLogsCollectionBuilder WithUsers()
-        {
-            return AddQueryStep(1, (query) =>
-            {
-                return query.Include(x => x.User).Include(x => x.User.Contact);
-            });
-        }
-
-        public virtual ActionLogsCollectionBuilder WithActionType(IEnumerable<ActionLogType> types)
-        {
-            return AddQueryStep(2, (query) =>
-            {
-                if (types != null && types.Count() > 0)
-                {
-                    int[] actionTypes = types.Select(x => (int)x).ToArray();
-                    return query.Where(x => actionTypes.Contains(x.Type));
-                }
-                else
-                {
-                    return query;
-                }
-            });
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/CatalogsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/CatalogsCollectionBuilder.cs
deleted file mode 100644
index fb690eb99..000000000
--- a/Software/Visual_Studio/Tango.BL/Builders/CatalogsCollectionBuilder.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using System.Data.Entity;
-
-namespace Tango.BL.Builders
-{
-    public class CatalogsCollectionBuilder : EntityCollectionBuilderBase<ColorCatalog, CatalogsCollectionBuilder>
-    {
-        public CatalogsCollectionBuilder(ObservablesContext context) : base(context)
-        {
-        }
-
-        public virtual CatalogsCollectionBuilder ForSite(String siteGuid)
-        {
-            return AddQueryStep(1, (query) =>
-            {
-                if (siteGuid != null)
-                {
-                    var siteCatalogsGuids = Context.SitesCatalogs.Where(x => x.SiteGuid == siteGuid).ToList().Select(x => x.ColorCatalogGuid).Where(x => x != null).Distinct().ToArray();
-
-                    if (siteCatalogsGuids.Length > 0)
-                    {
-                        return query.Where(x => siteCatalogsGuids.Contains(x.Guid));
-                    }
-                    else
-                    {
-                        return query;
-                    }
-                }
-                else
-                {
-                    return query;
-                }
-            });
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/CatalogBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
index ffe6924dd..5ddc84bc5 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/CatalogBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
@@ -8,14 +8,14 @@ using System.Data.Entity;
 
 namespace Tango.BL.Builders
 {
-    public class CatalogBuilder : EntityBuilderBase<ColorCatalog, CatalogBuilder>
+    public class ColorCatalogBuilder : EntityBuilderBase<ColorCatalog, ColorCatalogBuilder>
     {
-        public CatalogBuilder(ObservablesContext context) : base(context)
+        public ColorCatalogBuilder(ObservablesContext context) : base(context)
         {
 
         }
 
-        public virtual CatalogBuilder WithGroups()
+        public virtual ColorCatalogBuilder WithGroups()
         {
             return AddQueryStep(1, (query) =>
             {
@@ -23,7 +23,7 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual CatalogBuilder WithItems()
+        public virtual ColorCatalogBuilder WithItems()
         {
             return AddQueryStep(2, (query) =>
             {
@@ -31,7 +31,7 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual CatalogBuilder WithRecipes(Rml rml = null)
+        public virtual ColorCatalogBuilder WithRecipes(Rml rml = null)
         {
             return AddQueryStep(3, (query) =>
             {
diff --git a/Software/Visual_Studio/Tango.BL/Builders/EntityCollectionBuilderBase.cs b/Software/Visual_Studio/Tango.BL/Builders/EntityCollectionBuilderBase.cs
index d4d65c16d..a0cd24511 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/EntityCollectionBuilderBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/EntityCollectionBuilderBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -14,7 +13,6 @@ namespace Tango.BL.Builders
         private List<KeyValuePair<int, Action>> _steps;
         private List<KeyValuePair<int, Func<IQueryable<T>, IQueryable<T>>>> _querySteps;
         private bool _entity_set;
-        private Func<IQueryable<T>, IQueryable<T>> _appendQuery;
 
         protected IEnumerable<T> Entities { get; set; }
 
@@ -40,11 +38,6 @@ namespace Tango.BL.Builders
                     query = queryStep.Value(query);
                 }
 
-                if (_appendQuery != null)
-                {
-                    query = _appendQuery(query);
-                }
-
                 Entities = query.ToList();
             });
 
@@ -65,11 +58,6 @@ namespace Tango.BL.Builders
                     query = queryStep.Value(query);
                 }
 
-                if (_appendQuery != null)
-                {
-                    query = _appendQuery(query);
-                }
-
                 Entities = query.ToList();
             });
 
@@ -83,12 +71,6 @@ namespace Tango.BL.Builders
             return query;
         }
 
-        public TBuilder Query(Func<IQueryable<T>, IQueryable<T>> query)
-        {
-            _appendQuery = query;
-            return this as TBuilder;
-        }
-
         protected void CommitSteps()
         {
             foreach (var step in _steps.ToList().DistinctBy(x => x.Key).OrderBy(x => x.Key))
@@ -122,18 +104,6 @@ namespace Tango.BL.Builders
             return Entities.ToSynchronizedObservableCollection();
         }
 
-        public List<T> BuildList()
-        {
-            if (!_entity_set)
-            {
-                throw new InvalidOperationException("Could not build entity. Entity was not set.");
-            }
-
-            CommitSteps();
-
-            return Entities.ToList();
-        }
-
         public Task<SynchronizedObservableCollection<T>> BuildAsync()
         {
             return Task.Factory.StartNew<SynchronizedObservableCollection<T>>(() =>
@@ -141,13 +111,5 @@ namespace Tango.BL.Builders
                 return Build();
             });
         }
-
-        public Task<List<T>> BuildListAsync()
-        {
-            return Task.Factory.StartNew<List<T>>(() =>
-            {
-                return BuildList();
-            });
-        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs
index c74a5af3d..e64ad3fd5 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/JobBuilder.cs
@@ -64,7 +64,6 @@ namespace Tango.BL.Builders
                     WithActiveParametersGroup().
                     WithCCT().
                     WithCAT(Entity.MachineGuid).
-                    WithSpools().
                     WithLiquidFactors().Build();
             });
         }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/JobRunsBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/JobRunsBuilder.cs
new file mode 100644
index 000000000..0a02c6a23
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Builders/JobRunsBuilder.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using System.Data.Entity;
+
+namespace Tango.BL.Builders
+{
+    public class JobRunsBuilder : EntityBuilderBase<JobRun, JobRunsBuilder>
+    {
+        public JobRunsBuilder(ObservablesContext context) : base(context)
+        {
+
+        }
+
+        protected override IQueryable<JobRun> OnSetQuery(IQueryable<JobRun> query)
+        {
+            return query.Include(x => x.Job);
+        }
+
+        public virtual JobRunsBuilder WithJobEvents()
+        {
+            return AddStep(2, () =>
+            {
+                Context.MachinesEvents.Where(x => x.MachineGuid == Entity.Job.MachineGuid && x.DateTime >= Entity.StartDate && x.DateTime <= Entity.EndDate).OrderBy(x => x.DateTime).ToList();
+            });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/JobRunsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/JobRunsCollectionBuilder.cs
deleted file mode 100644
index a1990c9ea..000000000
--- a/Software/Visual_Studio/Tango.BL/Builders/JobRunsCollectionBuilder.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-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 JobRunsCollectionBuilder : EntityCollectionBuilderBase<JobRun, JobRunsCollectionBuilder>
-    {
-        public JobRunsCollectionBuilder(ObservablesContext context) : base(context)
-        {
-
-        }
-
-        public virtual JobRunsCollectionBuilder WithMachines(List<Machine> machines)
-        {
-            return AddQueryStep(1, (query) =>
-            {
-                if (machines != null && machines.Count > 0)
-                {
-                    var machineIDs = new HashSet<string>(machines.Select(p => p.Guid));
-                    return query.Where(x => machineIDs.Contains(x.MachineGuid));
-                }
-                return query;
-            });
-        }
-
-        public virtual JobRunsCollectionBuilder WithJobSource(IEnumerable<JobSource> source)
-        {
-            return AddQueryStep(2, (query) =>
-            {
-                if(source.Count() > 0)
-                {
-                    int[] jobRunSourceArr = source.Select(x => (int)x).ToArray();
-                    return query.Where(x => jobRunSourceArr.Contains(x.JobSource));
-                }
-                return query;
-
-            });
-        }
-
-        public virtual JobRunsCollectionBuilder WithJobStatus(IEnumerable<JobRunStatus> status)
-        {
-            return AddQueryStep(3, (query) =>
-            {
-                if(status.Count() > 0)
-                {
-                    int[] jobRunStatusArr = status.Select(x => (int)x).ToArray();
-
-                    return query.Where(x => jobRunStatusArr.Contains(x.Status));
-                }
-                return query;
-
-            });
-        }
-
-        public virtual JobRunsCollectionBuilder WithGradient(IEnumerable<bool> isGradient)
-        {
-            return AddQueryStep(4, (query) =>
-            {
-                if(isGradient.Count() > 0)
-                {
-                    bool[] isGradientArr = isGradient.Select(x => (bool)x).ToArray();
-                    return query.Where(x => isGradientArr.Contains(x.IsGradient));
-                }
-                return query;
-            });
-        }
-
-        public virtual JobRunsCollectionBuilder WithRmls(List<String> rmlGuids)
-        {
-            return AddQueryStep(5, (query) =>
-            {
-                if (rmlGuids != null && rmlGuids.Count > 0)
-                {
-                    return query.Where(x => rmlGuids.Contains(x.RmlGuid));
-                }
-                return query;
-            });
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/MachineBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/MachineBuilder.cs
index fd9d14baa..e3bf4f98c 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/MachineBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/MachineBuilder.cs
@@ -15,10 +15,18 @@ namespace Tango.BL.Builders
 
         }
 
-        public virtual MachineBuilder WithVersion()
+        public virtual MachineBuilder WithSettings()
         {
             return AddQueryStep(1, (query) =>
             {
+                return query.Include(x => x.DefaultColorSpace).Include(x => x.DefaultRml).Include(x => x.DefaultSpoolType);
+            });
+        }
+
+        public virtual MachineBuilder WithVersion()
+        {
+            return AddQueryStep(2, (query) =>
+            {
                 return query.Include(x => x.MachineVersion);
             });
         }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/OrganizationBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/OrganizationBuilder.cs
index 3b4dbb28a..7eae8cff2 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/OrganizationBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/OrganizationBuilder.cs
@@ -20,7 +20,7 @@ namespace Tango.BL.Builders
             return query.Include(x => x.Address).Include(x => x.Contact);
         }
 
-        public virtual OrganizationBuilder WithUsers(bool deleted = false)
+        public virtual OrganizationBuilder WithUsers()
         {
             return AddStep(1, () =>
             {
@@ -28,7 +28,7 @@ namespace Tango.BL.Builders
                 Context.Permissions.Load();
                 Context.RolesPermissions.Load();
 
-                Context.Users.Where(x => x.OrganizationGuid == Entity.Guid && (deleted || !x.Deleted))
+                Context.Users.Where(x => x.OrganizationGuid == Entity.Guid && !x.Deleted)
                .Include(x => x.Address)
                .Include(x => x.Contact)
                .Include(x => x.UsersRoles).ToSynchronizedObservableCollection();
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
index c16e0c13b..ec777e599 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
@@ -35,14 +35,6 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual RmlBuilder WithSpools()
-        {
-            return AddQueryStep(2, (query) =>
-            {
-                return query.Include(x => x.RmlsSpools).Include(x => x.RmlsSpools.Select(y => y.SpoolType));
-            });
-        }
-
         public virtual RmlBuilder WithAllParametersGroup()
         {
             return AddStep(1, () =>
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
index 630f43495..055f02474 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
 using System.Data.Entity;
-using Tango.BL.Enumerations;
 
 namespace Tango.BL.Builders
 {
@@ -15,54 +14,14 @@ namespace Tango.BL.Builders
         {
         }
 
-        public virtual RmlsCollectionBuilder ForSite(String siteGuid)
-        {
-            return AddQueryStep(1, (query) =>
-            {
-                if (siteGuid != null)
-                {
-                    var siteRmlsGuids = Context.SitesRmls.Where(x => x.SiteGuid == siteGuid).ToList().Select(x => x.RmlGuid).Where(x => x != null).Distinct().ToArray();
-
-                    if (siteRmlsGuids.Length > 0)
-                    {
-                        return query.Where(x => siteRmlsGuids.Contains(x.Guid));
-                    }
-                    else
-                    {
-                        return query;
-                    }
-                }
-                else
-                {
-                    return query;
-                }
-            });
-        }
-
-        public virtual RmlsCollectionBuilder ForHeadType(HeadTypes headType)
-        {
-            return AddQueryStep(2, (query) =>
-            {
-                return query.Where(x => x.HeadType == (int)headType);
-            });
-        }
-
         public virtual RmlsCollectionBuilder WithCCT()
         {
-            return AddQueryStep(3, (query) =>
+            return AddQueryStep(1, (query) =>
             {
                 return query.Include(x => x.Cct);
             });
         }
 
-        public virtual RmlsCollectionBuilder WithSpools()
-        {
-            return AddQueryStep(4, (query) =>
-            {
-                return query.Include(x => x.RmlsSpools);
-            });
-        }
-
         public virtual RmlsCollectionBuilder WithAllParametersGroup()
         {
             return AddStep(1, () =>
diff --git a/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs
deleted file mode 100644
index 938598fc6..000000000
--- a/Software/Visual_Studio/Tango.BL/Builders/SiteBuilder.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Data.Entity;
-using Tango.BL.Entities;
-
-namespace Tango.BL.Builders
-{
-    public class SiteBuilder : EntityBuilderBase<Site, SiteBuilder>
-    {
-        public SiteBuilder(ObservablesContext context) : base(context)
-        {
-
-        }
-
-        public virtual SiteBuilder WithSiteCatalogs()
-        {
-            return AddQueryStep(1, (query) =>
-            {
-                return query.Include(x => x.SitesCatalogs);
-            });
-        }
-
-        public virtual SiteBuilder WithCatalogs()
-        {
-            return AddQueryStep(2, (query) =>
-            {
-                return query.Include(x => x.SitesCatalogs.Select(y => y.ColorCatalog));
-            });
-        }
-
-        public virtual SiteBuilder WithSiteRmls()
-        {
-            return AddQueryStep(3, (query) =>
-            {
-                return query.Include(x => x.SitesRmls);
-            });
-        }
-
-        public virtual SiteBuilder WithRmls()
-        {
-            return AddQueryStep(4, (query) =>
-            {
-                return query.Include(x => x.SitesRmls.Select(y => y.Rml));
-            });
-        }
-
-        public virtual SiteBuilder WithOrganization()
-        {
-            return AddQueryStep(5, (query) =>
-            {
-                return query.Include(x => x.Organization);
-            });
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/SitesCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/SitesCollectionBuilder.cs
deleted file mode 100644
index 0c80b5a37..000000000
--- a/Software/Visual_Studio/Tango.BL/Builders/SitesCollectionBuilder.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using System.Data.Entity;
-
-namespace Tango.BL.Builders
-{
-    public class SitesCollectionBuilder : EntityCollectionBuilderBase<Site, SitesCollectionBuilder>
-    {
-        public SitesCollectionBuilder(ObservablesContext context) : base(context)
-        {
-
-        }
-
-        public virtual SitesCollectionBuilder WithSiteCatalogs()
-        {
-            return AddQueryStep(1, (query) =>
-            {
-                return query.Include(x => x.SitesCatalogs);
-            });
-        }
-
-        public virtual SitesCollectionBuilder WithSiteRmls()
-        {
-            return AddQueryStep(2, (query) =>
-            {
-                return query.Include(x => x.SitesRmls);
-            });
-        }
-
-        public virtual SitesCollectionBuilder WithOrganization()
-        {
-            return AddQueryStep(3, (query) =>
-            {
-                return query.Include(x => x.Organization);
-            });
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/TangoUpdatesCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/TangoUpdatesCollectionBuilder.cs
deleted file mode 100644
index 5bc510474..000000000
--- a/Software/Visual_Studio/Tango.BL/Builders/TangoUpdatesCollectionBuilder.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using System.Data.Entity;
-
-namespace Tango.BL.Builders
-{
-    public class TangoUpdatesCollectionBuilder : EntityCollectionBuilderBase<TangoUpdate, TangoUpdatesCollectionBuilder>
-    {
-        public TangoUpdatesCollectionBuilder(ObservablesContext context) : base(context)
-        {
-
-        }
-
-        //public virtual TangoUpdatesCollectionBuilder ForMachine(String machineGuid)
-        //{
-        //    return AddQueryStep(1, (query) =>
-        //    {
-        //        return query.Where(x => x.MachineGuid == machineGuid);
-        //    });
-        //}
-    }
-}