diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.BL')
243 files changed, 1150 insertions, 13402 deletions
diff --git a/Software/Visual_Studio/Tango.BL/ActionLogs/ActionLogIgnoreAttribute.cs b/Software/Visual_Studio/Tango.BL/ActionLogs/ActionLogIgnoreAttribute.cs deleted file mode 100644 index 1a1001942..000000000 --- a/Software/Visual_Studio/Tango.BL/ActionLogs/ActionLogIgnoreAttribute.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.ActionLogs -{ - [AttributeUsage(AttributeTargets.Property)] - public class ActionLogIgnoreAttribute : Attribute - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/ActionLogs/DefaultActionLogComparer.cs b/Software/Visual_Studio/Tango.BL/ActionLogs/DefaultActionLogComparer.cs deleted file mode 100644 index d93b130c4..000000000 --- a/Software/Visual_Studio/Tango.BL/ActionLogs/DefaultActionLogComparer.cs +++ /dev/null @@ -1,254 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.ValueObjects; - -namespace Tango.BL.ActionLogs -{ - /// <summary> - /// Represents the default implementation of <see cref="IActionLogComparer"/>. - /// </summary> - public class DefaultActionLogComparer : IActionLogComparer - { - /// <summary> - /// Compares the specified object before and after changes and returns the difference tree. - /// </summary> - /// <param name="before">The object before the change.</param> - /// <param name="after">The object after the change.</param> - /// <returns></returns> - public Task<ActionLogDifference> Compare(IActionLogComparable before, IActionLogComparable after) - { - return Task.Factory.StartNew<ActionLogDifference>(() => - { - ActionLogDifference diff = new ActionLogDifference(); - diff.Name = GetComponentName(before, after); - - Compare(diff, before, after, null); - RemoveNoDifferences(diff); - - return diff; - }); - } - - #region Helpers - - private void Compare(ActionLogDifference diff, Object before, Object after, HashSet<Object> scannedObjects) - { - if (scannedObjects == null) - { - scannedObjects = new HashSet<object>(); - } - - if (before == null && after == null) return; - - if (before != null) - { - if (scannedObjects.Contains(before)) return; - scannedObjects.Add(before); - } - - if (after != null) - { - if (scannedObjects.Contains(after)) return; - scannedObjects.Add(after); - } - - foreach (var prop in GetProperties(before, after).OrderByDescending(x => x.PropertyType.IsValueTypeOrString())) - { - if (prop.PropertyType == typeof(byte[]) || GetShouldIgnore(prop, before, after)) continue; - - if (prop.PropertyType.IsValueTypeOrString()) - { - object beforeValue = null; - object afterValue = null; - - if (before != null) - { - beforeValue = prop.GetValue(before); - } - - if (after != null) - { - afterValue = prop.GetValue(after); - } - - if (afterValue == null && beforeValue != null) AddValueDiff(diff, prop.Name, beforeValue, afterValue); - if (afterValue != null && beforeValue == null) AddValueDiff(diff, prop.Name, beforeValue, afterValue); - - if (afterValue != null && beforeValue != null) - { - if (!afterValue.Equals(beforeValue)) - { - AddValueDiff(diff, prop.Name, beforeValue, afterValue); - } - } - } - else if (!prop.PropertyType.IsGenericType) - { - object beforePropInstance = null; - object afterPropInstance = null; - - if (before != null) - { - beforePropInstance = prop.GetValue(before); - } - - if (after != null) - { - afterPropInstance = prop.GetValue(after); - } - - Compare(AddChildDiff(diff, prop.Name), beforePropInstance, afterPropInstance, scannedObjects); - } - else - { - IList beforeCollection = null; - IList afterCollection = null; - ActionLogDifference listDiff = new ActionLogDifference() - { - Name = prop.Name - }; - - if (before != null) - { - beforeCollection = prop.GetValue(before) as IList; - } - - if (after != null) - { - afterCollection = prop.GetValue(after) as IList; - } - - int listCount = 0; - - if (beforeCollection != null && afterCollection == null) - { - for (int i = 0; i < beforeCollection.Count; i++) - { - listCount++; - Compare(AddChildDiff(listDiff, GetActionLogName(beforeCollection[i], prop.Name)), beforeCollection[i], null, scannedObjects); - } - } - else if (beforeCollection == null && afterCollection != null) - { - for (int i = 0; i < afterCollection.Count; i++) - { - listCount++; - Compare(AddChildDiff(listDiff, GetActionLogName(afterCollection[i], prop.Name)), null, afterCollection[i], scannedObjects); - } - } - - if (beforeCollection != null && afterCollection != null) - { - for (int i = 0; i < Math.Max(beforeCollection.Count, afterCollection.Count); i++) - { - var beforeItem = i < beforeCollection.Count ? beforeCollection[i] : null; - var afterItem = i < afterCollection.Count ? afterCollection[i] : null; - - listCount++; - Compare(AddChildDiff(listDiff, GetActionLogName(beforeItem, prop.Name)), beforeItem, afterItem, scannedObjects); - } - } - - if (listCount > 0) - { - diff.Children.Add(listDiff); - } - } - } - } - - private void AddValueDiff(ActionLogDifference diff, String property, object before, object after) - { - diff.Children.Add(new ActionLogDifferenceValue() - { - Name = property, - Before = before, - After = after - }); - } - - private ActionLogDifference AddChildDiff(ActionLogDifference diff, String property) - { - ActionLogDifference childDiff = new ActionLogDifference(); - childDiff.Name = property; - diff.Children.Add(childDiff); - return childDiff; - } - - private void RemoveNoDifferences(ActionLogDifference diff) - { - foreach (var child in diff.Children.ToList()) - { - if (!child.HasDifference) - { - diff.Children.Remove(child); - } - else - { - RemoveNoDifferences(child); - } - } - } - - private String GetComponentName(Object before, Object after) - { - var afterCast = after as IActionLogComparable; - var beforeCast = before as IActionLogComparable; - - var name = afterCast != null ? afterCast.GetActionLogName() : beforeCast.GetActionLogName(); - - return name; - } - - private String GetActionLogName(Object obj, String defaultName) - { - var objCast = obj as IActionLogComparable; - if (objCast != null) - { - return objCast.GetActionLogName(); - } - else - { - return defaultName; - } - } - - private PropertyInfo GetProperty(String name, Object before, Object after) - { - return after != null ? after.GetType().GetProperty(name) : before.GetType().GetProperty(name); - } - - private List<PropertyInfo> GetProperties(BindingFlags flags, Object before, Object after) - { - return after != null ? after.GetType().GetProperties(flags).ToList() : before.GetType().GetProperties(flags).ToList(); - } - - private List<PropertyInfo> GetProperties(Object before, Object after) - { - return after != null ? after.GetType().GetProperties().ToList() : before.GetType().GetProperties().ToList(); - } - - private bool GetShouldIgnore(PropertyInfo prop, Object before, Object after) - { - if (prop.GetCustomAttribute<ActionLogIgnoreAttribute>() != null) - { - return true; - } - - var beforeCast = before as IActionLogComparable; - var afterCast = after as IActionLogComparable; - - if (beforeCast != null) return beforeCast.ShouldActionLogIgnore(prop.Name); - if (afterCast != null) return afterCast.ShouldActionLogIgnore(prop.Name); - - return false; - } - - #endregion - } -} diff --git a/Software/Visual_Studio/Tango.BL/ActionLogs/DefaultActionLogManager.cs b/Software/Visual_Studio/Tango.BL/ActionLogs/DefaultActionLogManager.cs deleted file mode 100644 index 0f5d6bd51..000000000 --- a/Software/Visual_Studio/Tango.BL/ActionLogs/DefaultActionLogManager.cs +++ /dev/null @@ -1,242 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.BL.Enumerations; -using Tango.BL.ValueObjects; -using Tango.Core; -using Tango.Core.ExtensionMethods; - -namespace Tango.BL.ActionLogs -{ - /// <summary> - /// Represents the default <see cref="IActionLogManager"/> implementation. - /// </summary> - /// <seealso cref="Tango.Core.ExtendedObject" /> - /// <seealso cref="Tango.BL.ActionLogs.IActionLogManager" /> - public class DefaultActionLogManager : ExtendedObject, IActionLogManager - { - /// <summary> - /// Gets or sets the action log comparer used to compare related objects. - /// </summary> - public IActionLogComparer ActionLogComparer { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether to perform the logging operations asynchronously. - /// </summary> - public bool IsAsync { get; set; } - - /// <summary> - /// Initializes a new instance of the <see cref="DefaultActionLogManager"/> class. - /// </summary> - public DefaultActionLogManager() - { - IsAsync = true; - ActionLogComparer = new DefaultActionLogComparer(); - } - - /// <summary> - /// Inserts a new action log (main entry point). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectGuid">The related object unique identifier.</param> - /// <param name="diffference">The diffference node tree.</param> - /// <param name="message">The message.</param> - public void InsertLog(ActionLogType type, string userGuid, string relatedObjectName, string relatedObjectGuid, ActionLogDifference difference, string message = null) - { - Task task = new Task(() => - { - using (ObservablesContext db = ObservablesContext.CreateDefault()) - { - try - { - ActionLog log = new ActionLog(); - log.ActionType = type; - log.LastUpdated = DateTime.UtcNow; - log.UserGuid = userGuid; - log.RelatedObjectName = relatedObjectName; - log.RelatedObjectGuid = relatedObjectGuid; - log.Message = message; - log.DifferenceObject = difference; - - db.ActionLogs.Add(log); - - db.SaveChanges(); - - LogManager.Log($"Action log '{type}' inserted."); - - if (difference != null && difference.Children.Count > 0) - { - Debug.WriteLine($"Action log differences:\n{difference.ToJsonString()}"); - } - } - catch (Exception ex) - { - LogManager.Log(ex, $"Error inserting action log '{type}'."); - } - } - }); - - if (IsAsync) - { - task.Start(); - } - else - { - task.RunSynchronously(); - } - } - - /// <summary> - /// Inserts a new action log (comparison entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectBefore">The related object before the change.</param> - /// <param name="relatedObjectAfter">The related object after the change.</param> - /// <param name="message">The message.</param> - public void InsertLog(ActionLogType type, string userGuid, string relatedObjectName, IActionLogComparable relatedObjectBefore, IActionLogComparable relatedObjectAfter, string message = null) - { - Task task = new Task(() => - { - ActionLogDifference diff = new ActionLogDifference(); - - bool insertWhenNoDifference = false; - - if (ActionLogComparer != null) - { - try - { - diff = ActionLogComparer.Compare(relatedObjectBefore, relatedObjectAfter).Result; - } - catch (Exception ex) - { - insertWhenNoDifference = true; - LogManager.Log(ex, $"Error while comparing for action log '{type}'."); - } - - if (diff.Children.Count > 0 || insertWhenNoDifference) - { - InsertLog(type, userGuid, relatedObjectName, GetRelatedObjectGuid(relatedObjectBefore, relatedObjectAfter), diff, message); - } - else - { - LogManager.Log($"Action log '{type}' was about to be inserted but skipped due to no differences."); - } - } - else - { - Debug.WriteLine("No comparer defined for action log."); - InsertLog(type, userGuid, relatedObjectName, GetRelatedObjectGuid(relatedObjectBefore, relatedObjectAfter), diff, message); - } - }); - - if (IsAsync) - { - task.Start(); - } - else - { - task.RunSynchronously(); - } - } - - /// <summary> - /// Inserts a new action log (comparison entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="user">The user.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectBefore">The related object before the change.</param> - /// <param name="relatedObjectAfter">The related object after the change.</param> - /// <param name="message">The message.</param> - public void InsertLog(ActionLogType type, User user, string relatedObjectName, IActionLogComparable relatedObjectBefore, IActionLogComparable relatedObjectAfter, string message = null) - { - InsertLog(type, user.Guid, relatedObjectName, relatedObjectBefore, relatedObjectAfter, message); - } - - /// <summary> - /// Inserts a new action log (deletion/creation entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="user">The user.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObject">The related object.</param> - /// <param name="message">The message.</param> - /// <param name="serializeRelatedObject">if set to <c>true</c> will create a one way difference tree (use when the related object was deleted and needs to be monitored).</param> - public void InsertLog(ActionLogType type, User user, string relatedObjectName, IActionLogComparable relatedObject, string message = null, bool serializeRelatedObject = false) - { - if (serializeRelatedObject) - { - InsertLog(type, user.Guid, relatedObjectName, relatedObject, null, message); - } - else - { - InsertLog(type, user.Guid, relatedObjectName, relatedObject?.Guid, message); - } - } - - /// <summary> - /// Inserts a new action log (creation entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectGuid">The related object unique identifier.</param> - /// <param name="message">The message.</param> - public void InsertLog(ActionLogType type, string userGuid, string relatedObjectName, string relatedObjectGuid, string message = null) - { - InsertLog(type, userGuid, relatedObjectName, relatedObjectGuid, null, message); - } - - /// <summary> - /// Inserts a new action log (nutral entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="message">The message.</param> - public void InsertLog(ActionLogType type, string userGuid, string message = null) - { - InsertLog(type, userGuid, null, null, message); - } - - /// <summary> - /// Inserts a new action log (nutral entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="user">The user.</param> - /// <param name="message">The message.</param> - public void InsertLog(ActionLogType type, User user, string message = null) - { - InsertLog(type, user.Guid, message); - } - - /// <summary> - /// Gets the related object unique identifier. - /// </summary> - /// <param name="before">The before.</param> - /// <param name="after">The after.</param> - /// <returns></returns> - private String GetRelatedObjectGuid(IActionLogComparable before, IActionLogComparable after) - { - if (before != null) - { - return before.Guid; - } - - if (after != null) - { - return after.Guid; - } - - return null; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogComparable.cs b/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogComparable.cs deleted file mode 100644 index 255f5a407..000000000 --- a/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogComparable.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.ValueObjects; - -namespace Tango.BL.ActionLogs -{ - /// <summary> - /// Represents a type which is supported for ActionLog difference comparison. - /// </summary> - public interface IActionLogComparable - { - /// <summary> - /// Gets the unique identifier of the object. - /// </summary> - String Guid { get; } - - /// <summary> - /// Returns true if the specified property should be ignored during ActionLog comparison. - /// </summary> - /// <param name="propName">Name of the property.</param> - /// <returns></returns> - bool ShouldActionLogIgnore(String propName); - - /// <summary> - /// Returns an optional custom name for this instance in the comparison tree. - /// </summary> - /// <returns></returns> - String GetActionLogName(); - } -} diff --git a/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogComparer.cs b/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogComparer.cs deleted file mode 100644 index 94db259b0..000000000 --- a/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogComparer.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.ValueObjects; - -namespace Tango.BL.ActionLogs -{ - /// <summary> - /// Represents an <see cref="IActionLogComparable"/> comparer. - /// </summary> - public interface IActionLogComparer - { - /// <summary> - /// Compares the specified object before and after changes and returns the difference tree. - /// </summary> - /// <param name="before">The object before the change.</param> - /// <param name="after">The object after the change.</param> - /// <returns></returns> - Task<ActionLogDifference> Compare(IActionLogComparable before, IActionLogComparable after); - } -} diff --git a/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogManager.cs b/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogManager.cs deleted file mode 100644 index 5edb409e6..000000000 --- a/Software/Visual_Studio/Tango.BL/ActionLogs/IActionLogManager.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.BL.Enumerations; -using Tango.BL.ValueObjects; - -namespace Tango.BL.ActionLogs -{ - /// <summary> - /// Represents an ActionLog manager which is responsible for inserting and comparing new action logs to a data store. - /// </summary> - public interface IActionLogManager - { - /// <summary> - /// Gets or sets the action log comparer used to compare related objects. - /// </summary> - IActionLogComparer ActionLogComparer { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether to perform the logging operations asynchronously. - /// </summary> - bool IsAsync { get; set; } - - /// <summary> - /// Inserts a new action log (main entry point). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectGuid">The related object unique identifier.</param> - /// <param name="diffference">The diffference node tree.</param> - /// <param name="message">The message.</param> - void InsertLog(ActionLogType type, String userGuid, String relatedObjectName, String relatedObjectGuid, ActionLogDifference diffference, String message = null); - - /// <summary> - /// Inserts a new action log (comparison entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectBefore">The related object before the change.</param> - /// <param name="relatedObjectAfter">The related object after the change.</param> - /// <param name="message">The message.</param> - void InsertLog(ActionLogType type, String userGuid, String relatedObjectName, IActionLogComparable relatedObjectBefore, IActionLogComparable relatedObjectAfter, String message = null); - - /// <summary> - /// Inserts a new action log (comparison entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="user">The user.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectBefore">The related object before the change.</param> - /// <param name="relatedObjectAfter">The related object after the change.</param> - /// <param name="message">The message.</param> - void InsertLog(ActionLogType type, User user, String relatedObjectName, IActionLogComparable relatedObjectBefore, IActionLogComparable relatedObjectAfter, String message = null); - - /// <summary> - /// Inserts a new action log (deletion/creation entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="user">The user.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObject">The related object.</param> - /// <param name="message">The message.</param> - /// <param name="serializeRelatedObject">if set to <c>true</c> will create a one way difference tree (use when the related object was deleted and needs to be monitored).</param> - void InsertLog(ActionLogType type, User user, String relatedObjectName, IActionLogComparable relatedObject, String message = null, bool serializeRelatedObject = false); - - /// <summary> - /// Inserts a new action log (creation entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="relatedObjectName">Name of the related object.</param> - /// <param name="relatedObjectGuid">The related object unique identifier.</param> - /// <param name="message">The message.</param> - void InsertLog(ActionLogType type, String userGuid, String relatedObjectName, String relatedObjectGuid, String message = null); - - /// <summary> - /// Inserts a new action log (neutral entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="userGuid">The user unique identifier.</param> - /// <param name="message">The message.</param> - void InsertLog(ActionLogType type, String userGuid, String message = null); - - /// <summary> - /// Inserts a new action log (neutral entry). - /// </summary> - /// <param name="type">The type.</param> - /// <param name="user">The user.</param> - /// <param name="message">The message.</param> - void InsertLog(ActionLogType type, User user, String message = null); - } -} 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); - // }); - //} - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTO.cs deleted file mode 100644 index a847c6f24..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class ActionLogDTO : ActionLogDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTOBase.cs deleted file mode 100644 index 24cf4e94f..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTOBase.cs +++ /dev/null @@ -1,73 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class ActionLogDTOBase : ObservableEntityDTO<ActionLogDTO, ActionLog> - { - - /// <summary> - /// type - /// </summary> - public Int32 Type - { - get; set; - } - - /// <summary> - /// user guid - /// </summary> - public String UserGuid - { - get; set; - } - - /// <summary> - /// related object name - /// </summary> - public String RelatedObjectName - { - get; set; - } - - /// <summary> - /// related object guid - /// </summary> - public String RelatedObjectGuid - { - get; set; - } - - /// <summary> - /// message - /// </summary> - public String Message - { - get; set; - } - - /// <summary> - /// difference - /// </summary> - public String Difference - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs index fd1d707b5..447509ba7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs @@ -9,14 +9,6 @@ namespace Tango.BL.DTO { public class BrushStopDTO : BrushStopDTOBase { - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(Corrected); - } - protected override string OnGetActionLogName() - { - return $"BrushStop '{StopIndex}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs index e561871d7..41fa3ed57 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs @@ -285,13 +285,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is transparent - /// </summary> - public Boolean IsTransparent - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs index ab141e930..43d24848b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs @@ -4,26 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class CatDTO : CatDTOBase { - [ObservableDTOProperty(MapsTo = nameof(Cat.LiquidType) + "." + nameof(Cat.LiquidType.Name))] - public String LiquidTypeName { get; set; } - [ObservableDTOProperty(MapsTo = nameof(Cat.Rml) + "." + nameof(Cat.Rml.Name))] - public String RmlName { get; set; } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(CatDTO.Data); - } - - protected override string OnGetActionLogName() - { - return $"'{RmlName}' => '{LiquidTypeName}' Calibration"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs index 20d534950..31de24ec0 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs @@ -53,13 +53,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// data - /// </summary> - public Byte[] Data - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs index 65cf781f8..96fc02a9e 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs @@ -9,9 +9,6 @@ namespace Tango.BL.DTO { public class CctDTO : CctDTOBase { - protected override string OnGetActionLogName() - { - return $"CCT '{FileName}'"; - } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs index 5bfc59bb5..1205a857e 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs @@ -45,13 +45,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// data - /// </summary> - public Byte[] Data - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs index 7daa98aca..012e7aede 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class ColorCatalogDTO : ColorCatalogDTOBase { - public List<ColorCatalogsGroupDTO> ColorCatalogsGroups { get; set; } - public ColorCatalogDTO() - { - ColorCatalogsGroups = new List<ColorCatalogsGroupDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"'{Name}' Catalog"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs index bd829e18f..2643b1d29 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs @@ -53,21 +53,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// logo - /// </summary> - public Byte[] Logo - { - get; set; - } - - /// <summary> - /// image - /// </summary> - public Byte[] Image - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs index 50c5e051e..8115923e5 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class ColorCatalogsGroupDTO : ColorCatalogsGroupDTOBase { - public List<ColorCatalogsItemDTO> ColorCatalogsItems { get; set; } - public ColorCatalogsGroupDTO() - { - ColorCatalogsItems = new List<ColorCatalogsItemDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Color Group '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs index 5e0fd3115..46b33b715 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs @@ -9,11 +9,6 @@ namespace Tango.BL.DTO { public class ColorCatalogsItemDTO : ColorCatalogsItemDTOBase { - public List<ColorCatalogsItemsRecipeDTO> ColorCatalogsItemsRecipes { get; set; } - protected override string OnGetActionLogName() - { - return $"Color Item '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs index 06979a3bb..07c7695e1 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs @@ -4,18 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class ColorCatalogsItemsRecipeDTO : ColorCatalogsItemsRecipeDTOBase { - [ObservableDTOProperty(MapsTo = nameof(ColorCatalogsItemsRecipe.Rml) + "." + nameof(ColorCatalogsItemsRecipe.Rml.Name))] - public String RmlName { get; set; } - protected override string OnGetActionLogName() - { - return $"Color Recipe for RML '{(RmlName != null ? RmlName : RmlGuid)}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs index 3a3fb4d14..ddb367fc5 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs @@ -45,13 +45,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// thumbnail - /// </summary> - public Byte[] Thumbnail - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs index 75049fa88..605a905db 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { @@ -12,29 +11,9 @@ namespace Tango.BL.DTO { public List<IdsPackDTO> IdsPacks { get; set; } - [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationDisplayPanelVersion) + "." + nameof(Configuration.ApplicationDisplayPanelVersion.Name))] - public String ApplicationDisplayPanelVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationFirmwareVersion) + "." + nameof(Configuration.ApplicationFirmwareVersion.Name))] - public String ApplicationFirmwareVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationOsVersion) + "." + nameof(Configuration.ApplicationOsVersion.Name))] - public String ApplicationOsVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.EmbeddedFirmwareVersion) + "." + nameof(Configuration.EmbeddedFirmwareVersion.Name))] - public String EmbeddedFirmwareVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.HardwareVersion) + "." + nameof(Configuration.HardwareVersion.Name))] - public String HardwareVersionName { get; set; } - public ConfigurationDTO() { IdsPacks = new List<IdsPackDTO>(); } - - protected override string OnGetActionLogName() - { - return "Configuration"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs deleted file mode 100644 index 3262970a1..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs +++ /dev/null @@ -1,38 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.DataStore; - -namespace Tango.BL.DTO -{ - public class DataStoreItemDTO : DataStoreItemDTOBase - { - protected override string OnGetActionLogName() - { - return $"'{CollectionName}' => '{Key}'"; - } - - public DataType Type { get; set; } - - public String Val { get; set; } - - protected override void OnFromObservableCompleted(DataStoreItem observable) - { - base.OnFromObservableCompleted(observable); - Type = (DataType)observable.DataType; - Val = DataStoreHelper.FormatDataStoreValue(Type, DataStoreHelper.CreateObject(Type, observable.Value)); - } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return - propName == nameof(Value) || - propName == nameof(DataType) || - propName == nameof(IsSynchronized); - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTOBase.cs deleted file mode 100644 index 9951338ec..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTOBase.cs +++ /dev/null @@ -1,81 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class DataStoreItemDTOBase : ObservableEntityDTO<DataStoreItemDTO, DataStoreItem> - { - - /// <summary> - /// machine guid - /// </summary> - public String MachineGuid - { - get; set; - } - - /// <summary> - /// collection name - /// </summary> - public String CollectionName - { - get; set; - } - - /// <summary> - /// key - /// </summary> - public String Key - { - get; set; - } - - /// <summary> - /// data type - /// </summary> - public Int32 DataType - { - get; set; - } - - /// <summary> - /// value - /// </summary> - public Byte[] Value - { - get; set; - } - - /// <summary> - /// is deleted - /// </summary> - public Boolean IsDeleted - { - get; set; - } - - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs index af9c9c7f2..890c87f7b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs @@ -4,13 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; namespace Tango.BL.DTO { public class DispenserDTO : DispenserDTOBase { - [ActionLogIgnore] - public DispenserTypeDTO DispenserType { get; set; } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs index 6146f01dd..16e19d78a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs @@ -77,13 +77,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// calibration data - /// </summary> - public Byte[] CalibrationData - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs index da6c8eabd..7b8e30dff 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class EventTypeDTOBase : ObservableEntityDTO<EventTypeDTO, EventType> { @@ -117,13 +122,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// persistent - /// </summary> - public Boolean Persistent - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTO.cs deleted file mode 100644 index d905492cc..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class FseVersionDTO : FseVersionDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTOBase.cs deleted file mode 100644 index 8a0a55488..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTOBase.cs +++ /dev/null @@ -1,65 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class FseVersionDTOBase : ObservableEntityDTO<FseVersionDTO, FseVersion> - { - - /// <summary> - /// version - /// </summary> - public String Version - { - get; set; - } - - /// <summary> - /// blob name - /// </summary> - public String BlobName - { - get; set; - } - - /// <summary> - /// installer blob name - /// </summary> - public String InstallerBlobName - { - get; set; - } - - /// <summary> - /// comments - /// </summary> - public String Comments - { - get; set; - } - - /// <summary> - /// user guid - /// </summary> - public String UserGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTO.cs deleted file mode 100644 index c296b01a1..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class GlobalDataStoreItemDTO : GlobalDataStoreItemDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTOBase.cs deleted file mode 100644 index c518aa185..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTOBase.cs +++ /dev/null @@ -1,57 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class GlobalDataStoreItemDTOBase : ObservableEntityDTO<GlobalDataStoreItemDTO, GlobalDataStoreItem> - { - - /// <summary> - /// collection name - /// </summary> - public String CollectionName - { - get; set; - } - - /// <summary> - /// key - /// </summary> - public String Key - { - get; set; - } - - /// <summary> - /// data type - /// </summary> - public Int32 DataType - { - get; set; - } - - /// <summary> - /// value - /// </summary> - public Byte[] Value - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs index 041f58553..be8a50ca1 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareBlowerDTO : HardwareBlowerDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareBlower.HardwareBlowerType) + "." + nameof(HardwareBlower.HardwareBlowerType.Description))] - public String HardwareBlowerTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareBlowerTypeDTO HardwareBlowerType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Blower '{HardwareBlowerTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs index 4420c2d2c..9fb6b0bdd 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class HardwareBlowerDTOBase : ObservableEntityDTO<HardwareBlowerDTO, HardwareBlower> { diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs index a39b0f64b..968070be0 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareBreakSensorDTO : HardwareBreakSensorDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareBreakSensor.HardwareBreakSensorType) + "." + nameof(HardwareBreakSensor.HardwareBreakSensorType.Description))] - public String HardwareBreakSensorTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareBreakSensorTypeDTO HardwareBreakSensorType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Break Sensor '{HardwareBreakSensorTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs index 187f7081e..1963ae9d7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareDancerDTO : HardwareDancerDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareDancer.HardwareDancerType) + "." + nameof(HardwareDancer.HardwareDancerType.Description))] - public String HardwareDancerTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareDancerTypeDTO HardwareDancerType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Dancer '{HardwareDancerTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs index eb84f168b..41d53bf2a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareMotorDTO : HardwareMotorDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareMotor.HardwareMotorType) + "." + nameof(HardwareMotor.HardwareMotorType.Description))] - public String HardwareMotorTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareMotorTypeDTO HardwareMotorType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Motor '{HardwareMotorTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs index d7d8bf001..4c3125bf7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class HardwareMotorDTOBase : ObservableEntityDTO<HardwareMotorDTO, HardwareMotor> { @@ -309,13 +314,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// p01 config word - /// </summary> - public Int32 P01ConfigWord - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs index 6248ae55c..bd6e344a7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwarePidControlDTO : HardwarePidControlDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwarePidControl.HardwarePidControlType) + "." + nameof(HardwarePidControl.HardwarePidControlType.Description))] - public String HardwarePidControlTypeDescription { get; set; } - [ActionLogIgnore] - public HardwarePidControlTypeDTO HardwarePidControlType { get; set; } - - protected override string OnGetActionLogName() - { - return $"PID Control '{HardwarePidControlTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs index 0d0c67d31..14eae14ae 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareSpeedSensorDTO : HardwareSpeedSensorDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareSpeedSensor.HardwareSpeedSensorType) + "." + nameof(HardwareSpeedSensor.HardwareSpeedSensorType.Description))] - public String HardwareSpeedSensorTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareSpeedSensorTypeDTO HardwareSpeedSensorType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Speed Sensor '{HardwareSpeedSensorTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs index 36681162b..55065b301 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs @@ -9,28 +9,6 @@ namespace Tango.BL.DTO { public class HardwareVersionDTO : HardwareVersionDTOBase { - public List<HardwareBlowerDTO> HardwareBlowers { get; set; } - public List<HardwareBreakSensorDTO> HardwareBreakSensors { get; set; } - public List<HardwareDancerDTO> HardwareDancers { get; set; } - public List<HardwareMotorDTO> HardwareMotors { get; set; } - public List<HardwarePidControlDTO> HardwarePidControls { get; set; } - public List<HardwareSpeedSensorDTO> HardwareSpeedSensors { get; set; } - public List<HardwareWinderDTO> HardwareWinders { get; set; } - public HardwareVersionDTO() - { - HardwareBlowers = new List<HardwareBlowerDTO>(); - HardwareBreakSensors = new List<HardwareBreakSensorDTO>(); - HardwareDancers = new List<HardwareDancerDTO>(); - HardwareMotors = new List<HardwareMotorDTO>(); - HardwarePidControls = new List<HardwarePidControlDTO>(); - HardwareSpeedSensors = new List<HardwareSpeedSensorDTO>(); - HardwareWinders = new List<HardwareWinderDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Hardware Version '{Name} v{Version}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs index 328813083..a65d81791 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareWinderDTO : HardwareWinderDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareWinder.HardwareWinderType) + "." + nameof(HardwareWinder.HardwareWinderType.Description))] - public String HardwareWinderTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareWinderTypeDTO HardwareWinderType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Winder '{HardwareWinderTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs index 59b66cc50..3ca1e798b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs @@ -4,46 +4,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class IdsPackDTO : IdsPackDTOBase { - [ObservableDTOProperty(MapsTo = nameof(IdsPack.CartridgeType) + "." + nameof(IdsPack.CartridgeType.Name))] - public String CartridgeTypeName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.IdsPackFormula) + "." + nameof(IdsPack.IdsPackFormula.Name))] - public String IdsPackFormulaName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.LiquidType) + "." + nameof(IdsPack.LiquidType.Name))] - public String LiquidTypeName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.MidTankType) + "." + nameof(IdsPack.MidTankType.Name))] - public String MidTankTypeName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.Dispenser) + "." + nameof(IdsPack.Dispenser.SerialNumber))] - public String DispenserSerialNumber { get; set; } - - [ActionLogIgnore] public CartridgeTypeDTO CartridgeType { get; set; } - - [ActionLogIgnore] - public DispenserDTO Dispenser { get; set; } - - [ActionLogIgnore] public IdsPackFormulaDTO IdsPackFormula { get; set; } - - [ActionLogIgnore] public LiquidTypeDTO LiquidType { get; set; } - - [ActionLogIgnore] public MidTankTypeDTO MidTankType { get; set; } - - protected override string OnGetActionLogName() - { - return $"IDS Pack '{PackIndex}'"; - } + public DispenserDTO Dispenser { get; set; } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs index 85b51cdc3..137d7b4b3 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs @@ -9,33 +9,6 @@ namespace Tango.BL.DTO { public class JobDTO : JobDTOBase { - public List<SegmentDTO> Segments { get; set; } - public JobDTO() - { - Segments = new List<SegmentDTO>(); - } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(JobDTO.LastRun) || - propName == nameof(JobDTO.Status) || - propName == nameof(JobDTO.IsSynchronized) || - propName == nameof(JobDTO.EstimatedDurationMili) || - propName == nameof(JobDTO.EditingState) || - propName == nameof(JobDTO.FineTuningApproveDate) || - propName == nameof(JobDTO.FineTuningStatus) || - propName == nameof(JobDTO.JobIndex) || - propName == nameof(JobDTO.LastRun) || - propName == nameof(JobDTO.SampleDyeApproveDate) || - propName == nameof(JobDTO.SampleDyeStatus) || - propName == nameof(JobDTO.Source) || - propName == nameof(JobDTO.Status); - } - - protected override string OnGetActionLogName() - { - return $"'{Name}' Job"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs index ddf76bff0..f2842c4fd 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class JobDTOBase : ObservableEntityDTO<JobDTO, Job> { @@ -142,14 +147,6 @@ namespace Tango.BL.DTO } /// <summary> - /// embroidery file data - /// </summary> - public Byte[] EmbroideryFileData - { - get; set; - } - - /// <summary> /// embroidery file name /// </summary> public String EmbroideryFileName @@ -158,14 +155,6 @@ namespace Tango.BL.DTO } /// <summary> - /// embroidery jpeg - /// </summary> - public Byte[] EmbroideryJpeg - { - get; set; - } - - /// <summary> /// status /// </summary> public Int32 Status @@ -285,21 +274,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - - /// <summary> - /// source - /// </summary> - public Int32 Source - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs index 789aacbb2..112694e1a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs @@ -18,18 +18,15 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class JobRunDTOBase : ObservableEntityDTO<JobRunDTO, JobRun> { /// <summary> - /// machine guid - /// </summary> - public String MachineGuid - { - get; set; - } - - /// <summary> /// job guid /// </summary> public String JobGuid @@ -38,54 +35,6 @@ namespace Tango.BL.DTO } /// <summary> - /// rml guid - /// </summary> - public String RmlGuid - { - get; set; - } - - /// <summary> - /// user guid - /// </summary> - public String UserGuid - { - get; set; - } - - /// <summary> - /// job name - /// </summary> - public String JobName - { - get; set; - } - - /// <summary> - /// job designation - /// </summary> - public Int32 JobDesignation - { - get; set; - } - - /// <summary> - /// job source - /// </summary> - public Int32 JobSource - { - get; set; - } - - /// <summary> - /// job string - /// </summary> - public String JobString - { - get; set; - } - - /// <summary> /// start date /// </summary> public DateTime StartDate @@ -94,30 +43,6 @@ namespace Tango.BL.DTO } /// <summary> - /// uploading start date - /// </summary> - public Nullable<DateTime> UploadingStartDate - { - get; set; - } - - /// <summary> - /// heating start date - /// </summary> - public Nullable<DateTime> HeatingStartDate - { - get; set; - } - - /// <summary> - /// actual start date - /// </summary> - public Nullable<DateTime> ActualStartDate - { - get; set; - } - - /// <summary> /// end date /// </summary> public DateTime EndDate @@ -134,94 +59,6 @@ namespace Tango.BL.DTO } /// <summary> - /// job length - /// </summary> - public Double JobLength - { - get; set; - } - - /// <summary> - /// is gradient - /// </summary> - public Boolean IsGradient - { - get; set; - } - - /// <summary> - /// gradient resolution cm - /// </summary> - public Int32 GradientResolutionCm - { - get; set; - } - - /// <summary> - /// liquid quantity string - /// </summary> - public String LiquidQuantityString - { - get; set; - } - - /// <summary> - /// cyan quantity - /// </summary> - public Int32 CyanQuantity - { - get; set; - } - - /// <summary> - /// magenta quantity - /// </summary> - public Int32 MagentaQuantity - { - get; set; - } - - /// <summary> - /// yellow quantity - /// </summary> - public Int32 YellowQuantity - { - get; set; - } - - /// <summary> - /// black quantity - /// </summary> - public Int32 BlackQuantity - { - get; set; - } - - /// <summary> - /// transparent quantity - /// </summary> - public Int32 TransparentQuantity - { - get; set; - } - - /// <summary> - /// lubricant quantity - /// </summary> - public Int32 LubricantQuantity - { - get; set; - } - - /// <summary> - /// cleaner quantity - /// </summary> - public Int32 CleanerQuantity - { - get; set; - } - - /// <summary> /// end position /// </summary> public Double EndPosition @@ -237,21 +74,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is head cleaning - /// </summary> - public Boolean IsHeadCleaning - { - get; set; - } - - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs index e00510433..cec4185fc 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs @@ -9,9 +9,6 @@ namespace Tango.BL.DTO { public class LiquidTypeDTO : LiquidTypeDTOBase { - protected override string OnGetActionLogName() - { - return $"Liquid Type '{Name}'"; - } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs index f58c60b57..6b24599d9 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs @@ -69,13 +69,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// short name - /// </summary> - public String ShortName - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs index e7d940ca4..787a00391 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs @@ -4,18 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class LiquidTypesRmlDTO : LiquidTypesRmlDTOBase { - [ObservableDTOProperty(MapsTo = nameof(LiquidTypesRml.LiquidType) + "." + nameof(LiquidTypesRml.LiquidType.Name))] - public String LiquidTypeName { get; set; } - protected override string OnGetActionLogName() - { - return LiquidTypeName != null ? $"Liquid Factor '{LiquidTypeName}'" : $"Liquid Factor '{Guid}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs index 1133f7cc8..badbaf0bc 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs @@ -45,13 +45,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// default cat data - /// </summary> - public Byte[] DefaultCatData - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs index c6758aeff..41eca6693 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs @@ -9,26 +9,6 @@ namespace Tango.BL.DTO { public class MachineDTO : MachineDTOBase { - public ConfigurationDTO Configuration { get; set; } - //public List<CatDTO> Cats { get; set; } - - public List<SpoolDTO> Spools { get; set; } - - public MachineDTO() - { - //Cats = new List<CatDTO>(); - Spools = new List<SpoolDTO>(); - } - - //protected override bool OnShouldActionLogIgnore(string propName) - //{ - // return propName == nameof(MachineDTO.Cats); - //} - - protected override string OnGetActionLogName() - { - return $"Machine '{SerialNumber}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs index f88f164cd..e3adf4e0f 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs @@ -54,14 +54,6 @@ namespace Tango.BL.DTO } /// <summary> - /// site guid - /// </summary> - public String SiteGuid - { - get; set; - } - - /// <summary> /// machine version guid /// </summary> public String MachineVersionGuid @@ -261,21 +253,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// head type - /// </summary> - public Int32 HeadType - { - get; set; - } - - /// <summary> - /// activation key - /// </summary> - public String ActivationKey - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs index e990f2a31..8a044f7e8 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs @@ -69,13 +69,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs index 66a4625dc..0378ac70a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs @@ -9,13 +9,6 @@ namespace Tango.BL.DTO { public class OrganizationDTO : OrganizationDTOBase { - public AddressDTO Address { get; set; } - public ContactDTO Contact { get; set; } - - protected override string OnGetActionLogName() - { - return $"'{Name}' Organization"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs index 84da600a8..9959b2254 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs @@ -9,9 +9,6 @@ namespace Tango.BL.DTO { public class ProcessParametersTableDTO : ProcessParametersTableDTOBase { - protected override string OnGetActionLogName() - { - return $"Process Table '{Name}'"; - } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index f0699bc72..e8892c64a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -197,93 +197,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// head zone7 temp - /// </summary> - public Double HeadZone7Temp - { - get; set; - } - - /// <summary> - /// head zone8 temp - /// </summary> - public Double HeadZone8Temp - { - get; set; - } - - /// <summary> - /// head zone9 temp - /// </summary> - public Double HeadZone9Temp - { - get; set; - } - - /// <summary> - /// head zone10 temp - /// </summary> - public Double HeadZone10Temp - { - get; set; - } - - /// <summary> - /// head zone11 temp - /// </summary> - public Double HeadZone11Temp - { - get; set; - } - - /// <summary> - /// head zone12 temp - /// </summary> - public Double HeadZone12Temp - { - get; set; - } - - /// <summary> - /// r blower flow - /// </summary> - public Double RBlowerFlow - { - get; set; - } - - /// <summary> - /// r blower temp - /// </summary> - public Double RBlowerTemp - { - get; set; - } - - /// <summary> - /// l blower flow - /// </summary> - public Double LBlowerFlow - { - get; set; - } - - /// <summary> - /// l blower temp - /// </summary> - public Double LBlowerTemp - { - get; set; - } - - /// <summary> - /// pressure build up - /// </summary> - public Double PressureBuildUp - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs index 2091e5e57..8419055c7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class ProcessParametersTablesGroupDTO : ProcessParametersTablesGroupDTOBase { - public List<ProcessParametersTableDTO> ProcessParametersTables { get; set; } - public ProcessParametersTablesGroupDTO() - { - ProcessParametersTables = new List<ProcessParametersTableDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Process Group '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs deleted file mode 100644 index e6253c85c..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class PublishedProcedureProjectDTO : PublishedProcedureProjectDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs deleted file mode 100644 index 80cabdd19..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs +++ /dev/null @@ -1,73 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class PublishedProcedureProjectDTOBase : ObservableEntityDTO<PublishedProcedureProjectDTO, PublishedProcedureProject> - { - - /// <summary> - /// name - /// </summary> - public String Name - { - get; set; - } - - /// <summary> - /// description - /// </summary> - public String Description - { - get; set; - } - - /// <summary> - /// publish date - /// </summary> - public DateTime PublishDate - { - get; set; - } - - /// <summary> - /// sorting index - /// </summary> - public Int32 SortingIndex - { - get; set; - } - - /// <summary> - /// is visible - /// </summary> - public Boolean IsVisible - { - get; set; - } - - /// <summary> - /// visibility - /// </summary> - public Int32 Visibility - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs deleted file mode 100644 index 4df16c304..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class PublishedProcedureProjectsVersionDTO : PublishedProcedureProjectsVersionDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs deleted file mode 100644 index 53d833d14..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs +++ /dev/null @@ -1,57 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class PublishedProcedureProjectsVersionDTOBase : ObservableEntityDTO<PublishedProcedureProjectsVersionDTO, PublishedProcedureProjectsVersion> - { - - /// <summary> - /// published procedure project guid - /// </summary> - public String PublishedProcedureProjectGuid - { - get; set; - } - - /// <summary> - /// version - /// </summary> - public Int32 Version - { - get; set; - } - - /// <summary> - /// author - /// </summary> - public String Author - { - get; set; - } - - /// <summary> - /// project json string - /// </summary> - public String ProjectJsonString - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs index 928d2142d..ef4950fda 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs @@ -4,31 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class RmlDTO : RmlDTOBase { - public List<ProcessParametersTablesGroupDTO> ProcessParametersTablesGroups { get; set; } - public List<LiquidTypesRmlDTO> LiquidTypesRmls { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Rml.Cct) + "." + nameof(Rml.Cct.FileName))] - public String CctFileName { get; set; } - - public List<RmlsSpoolDTO> RmlsSpools { get; set; } - - public RmlDTO() - { - ProcessParametersTablesGroups = new List<ProcessParametersTablesGroupDTO>(); - LiquidTypesRmls = new List<LiquidTypesRmlDTO>(); - RmlsSpools = new List<RmlsSpoolDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"RML '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 6bb8e951d..8ed757b8d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -30,14 +30,6 @@ namespace Tango.BL.DTO } /// <summary> - /// display name - /// </summary> - public String DisplayName - { - get; set; - } - - /// <summary> /// manufacturer /// </summary> public String Manufacturer @@ -214,14 +206,6 @@ namespace Tango.BL.DTO } /// <summary> - /// thumbnail - /// </summary> - public Byte[] Thumbnail - { - get; set; - } - - /// <summary> /// cct guid /// </summary> public String CctGuid @@ -237,141 +221,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// use color lib gradients - /// </summary> - public Boolean UseColorLibGradients - { - get; set; - } - - /// <summary> - /// head type - /// </summary> - public Int32 HeadType - { - get; set; - } - - /// <summary> - /// qualification level - /// </summary> - public Int32 QualificationLevel - { - get; set; - } - - /// <summary> - /// qualification date - /// </summary> - public Nullable<DateTime> QualificationDate - { - get; set; - } - - /// <summary> - /// spools calibrations string - /// </summary> - public String SpoolsCalibrationsString - { - get; set; - } - - /// <summary> - /// feeder p - /// </summary> - public Int32 FeederP - { - get; set; - } - - /// <summary> - /// feeder i - /// </summary> - public Int32 FeederI - { - get; set; - } - - /// <summary> - /// feeder d - /// </summary> - public Int32 FeederD - { - get; set; - } - - /// <summary> - /// puller p - /// </summary> - public Int32 PullerP - { - get; set; - } - - /// <summary> - /// puller i - /// </summary> - public Int32 PullerI - { - get; set; - } - - /// <summary> - /// puller d - /// </summary> - public Int32 PullerD - { - get; set; - } - - /// <summary> - /// winder p - /// </summary> - public Int32 WinderP - { - get; set; - } - - /// <summary> - /// winder i - /// </summary> - public Int32 WinderI - { - get; set; - } - - /// <summary> - /// winder d - /// </summary> - public Int32 WinderD - { - get; set; - } - - /// <summary> - /// bypass rockers - /// </summary> - public Boolean BypassRockers - { - get; set; - } - - /// <summary> - /// cleaner flow - /// </summary> - public Int32 CleanerFlow - { - get; set; - } - - /// <summary> - /// arc head cleaning motor speed - /// </summary> - public Double ArcHeadCleaningMotorSpeed - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs deleted file mode 100644 index 9f2ff491e..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class RmlsSpoolDTO : RmlsSpoolDTOBase - { - [ObservableDTOProperty(MapsTo = nameof(RmlsSpool.SpoolType) + "." + nameof(RmlsSpool.SpoolType.Name))] - public String SpoolTypeName { get; set; } - - protected override string OnGetActionLogName() - { - return $"'{(SpoolTypeName != null ? SpoolTypeName : SpoolTypeGuid)}' Calibration"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs deleted file mode 100644 index 1598a321f..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs +++ /dev/null @@ -1,73 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class RmlsSpoolDTOBase : ObservableEntityDTO<RmlsSpoolDTO, RmlsSpool> - { - - /// <summary> - /// spool type guid - /// </summary> - public String SpoolTypeGuid - { - get; set; - } - - /// <summary> - /// rml guid - /// </summary> - public String RmlGuid - { - get; set; - } - - /// <summary> - /// rotations per passage - /// </summary> - public Nullable<Double> RotationsPerPassage - { - get; set; - } - - /// <summary> - /// length - /// </summary> - public Nullable<Double> Length - { - get; set; - } - - /// <summary> - /// backing rate - /// </summary> - public Nullable<Int32> BackingRate - { - get; set; - } - - /// <summary> - /// bottom backing rate - /// </summary> - public Nullable<Int32> BottomBackingRate - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs index 08fb0b119..064697f6f 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs @@ -9,11 +9,6 @@ namespace Tango.BL.DTO { public class RoleDTO : RoleDTOBase { - public List<RolesPermissionDTO> RolesPermissions { get; set; } - public RoleDTO() - { - RolesPermissions = new List<RolesPermissionDTO>(); - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs index c76e648b2..785808578 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs @@ -9,6 +9,6 @@ namespace Tango.BL.DTO { public class RolesPermissionDTO : RolesPermissionDTOBase { - public PermissionDTO Permission { get; set; } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs index 00d74ec30..1db99be23 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class SegmentDTO : SegmentDTOBase { - public List<BrushStopDTO> BrushStops { get; set; } - public SegmentDTO() - { - BrushStops = new List<BrushStopDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Segment '{SegmentIndex}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs deleted file mode 100644 index 4d09bda9c..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs +++ /dev/null @@ -1,31 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class SiteDTO : SiteDTOBase - { - public List<SitesRmlDTO> SitesRmls { get; set; } - - public List<SitesCatalogDTO> SitesCatalogs { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Site.Organization) + "." + nameof(Site.Organization.Name))] - public String OrganizationName { get; set; } - - public SiteDTO() - { - SitesRmls = new List<SitesRmlDTO>(); - SitesCatalogs = new List<SitesCatalogDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Site '{Name}'"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs deleted file mode 100644 index 47d7acc95..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs +++ /dev/null @@ -1,49 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class SiteDTOBase : ObservableEntityDTO<SiteDTO, Site> - { - - /// <summary> - /// organization guid - /// </summary> - public String OrganizationGuid - { - get; set; - } - - /// <summary> - /// name - /// </summary> - public String Name - { - get; set; - } - - /// <summary> - /// description - /// </summary> - public String Description - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs deleted file mode 100644 index 3c22989d8..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class SitesCatalogDTO : SitesCatalogDTOBase - { - [ObservableDTOProperty(MapsTo = nameof(SitesCatalog.ColorCatalog) + "." + nameof(SitesCatalog.ColorCatalog.Name))] - public String CatalogName { get; set; } - - protected override string OnGetActionLogName() - { - return $"Catalog '{(CatalogName != null ? CatalogName : ColorCatalogGuid)}'"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs deleted file mode 100644 index 8cff3d047..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs +++ /dev/null @@ -1,41 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class SitesCatalogDTOBase : ObservableEntityDTO<SitesCatalogDTO, SitesCatalog> - { - - /// <summary> - /// site guid - /// </summary> - public String SiteGuid - { - get; set; - } - - /// <summary> - /// color catalog guid - /// </summary> - public String ColorCatalogGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs deleted file mode 100644 index fa67f0b3c..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class SitesRmlDTO : SitesRmlDTOBase - { - [ObservableDTOProperty(MapsTo = nameof(SitesRml.Rml) + "." + nameof(SitesRml.Rml.Name))] - public String RmlName { get; set; } - - protected override string OnGetActionLogName() - { - return $"RML '{(RmlName != null ? RmlName : RmlGuid)}'"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs deleted file mode 100644 index 1373fedd6..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs +++ /dev/null @@ -1,41 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class SitesRmlDTOBase : ObservableEntityDTO<SitesRmlDTO, SitesRml> - { - - /// <summary> - /// site guid - /// </summary> - public String SiteGuid - { - get; set; - } - - /// <summary> - /// rml guid - /// </summary> - public String RmlGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs index d6d79b1be..bf25d1e71 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs @@ -4,18 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class SpoolDTO : SpoolDTOBase { - [ObservableDTOProperty(MapsTo = nameof(Spool.SpoolType) + "." + nameof(Spool.SpoolType.Name))] - public String SpoolTypeName { get; set; } - protected override string OnGetActionLogName() - { - return $"'{(SpoolTypeName != null ? SpoolTypeName : SpoolTypeGuid)}' Calibration"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs index c25b254da..346fc4e6d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs @@ -40,7 +40,7 @@ namespace Tango.BL.DTO /// <summary> /// start offset pulses /// </summary> - public Nullable<Int32> StartOffsetPulses + public Int32 StartOffsetPulses { get; set; } @@ -48,7 +48,7 @@ namespace Tango.BL.DTO /// <summary> /// backing rate /// </summary> - public Nullable<Int32> BackingRate + public Int32 BackingRate { get; set; } @@ -56,7 +56,7 @@ namespace Tango.BL.DTO /// <summary> /// segment offset pulses /// </summary> - public Nullable<Int32> SegmentOffsetPulses + public Int32 SegmentOffsetPulses { get; set; } @@ -64,15 +64,7 @@ namespace Tango.BL.DTO /// <summary> /// bottom backing rate /// </summary> - public Nullable<Int32> BottomBackingRate - { - get; set; - } - - /// <summary> - /// limit switch start point offset - /// </summary> - public Nullable<Int32> LimitSwitchStartPointOffset + public Int32 BottomBackingRate { get; set; } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs index 5b02cb536..6edd26e22 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs @@ -69,45 +69,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// start offset pulses - /// </summary> - public Int32 StartOffsetPulses - { - get; set; - } - - /// <summary> - /// backing rate - /// </summary> - public Int32 BackingRate - { - get; set; - } - - /// <summary> - /// segment offset pulses - /// </summary> - public Int32 SegmentOffsetPulses - { - get; set; - } - - /// <summary> - /// bottom backing rate - /// </summary> - public Int32 BottomBackingRate - { - get; set; - } - - /// <summary> - /// limit switch start point offset - /// </summary> - public Int32 LimitSwitchStartPointOffset - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTO.cs deleted file mode 100644 index 97b53746f..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class TangoUpdateDTO : TangoUpdateDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTOBase.cs deleted file mode 100644 index 8e87df812..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTOBase.cs +++ /dev/null @@ -1,97 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class TangoUpdateDTOBase : ObservableEntityDTO<TangoUpdateDTO, TangoUpdate> - { - - /// <summary> - /// application version - /// </summary> - public String ApplicationVersion - { - get; set; - } - - /// <summary> - /// firmware version - /// </summary> - public String FirmwareVersion - { - get; set; - } - - /// <summary> - /// machine guid - /// </summary> - public String MachineGuid - { - get; set; - } - - /// <summary> - /// status - /// </summary> - public Int32 Status - { - get; set; - } - - /// <summary> - /// failed reason - /// </summary> - public String FailedReason - { - get; set; - } - - /// <summary> - /// failed log - /// </summary> - public String FailedLog - { - get; set; - } - - /// <summary> - /// start date - /// </summary> - public DateTime StartDate - { - get; set; - } - - /// <summary> - /// end date - /// </summary> - public Nullable<DateTime> EndDate - { - get; set; - } - - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs index eea184e2e..3b77ba537 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs @@ -77,13 +77,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// disabled - /// </summary> - public Boolean Disabled - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs index a7b07fb0c..2e28dfce7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class TechValveDTOBase : ObservableEntityDTO<TechValveDTO, TechValve> { diff --git a/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs index 4211297dc..f7e94e2ca 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs @@ -9,25 +9,6 @@ namespace Tango.BL.DTO { public class UserDTO : UserDTOBase { - public AddressDTO Address { get; set; } - public ContactDTO Contact { get; set; } - - public List<UsersRoleDTO> UsersRoles { get; set; } - - public UserDTO() - { - UsersRoles = new List<UsersRoleDTO>(); - } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(UserDTO.LastLogin); - } - - protected override string OnGetActionLogName() - { - return $"User '{Email}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs index 33b5991e3..30f4eca26 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs @@ -77,13 +77,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// password change required - /// </summary> - public Boolean PasswordChangeRequired - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs index 0fc31a2e2..71540b3c8 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs @@ -4,20 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class UsersRoleDTO : UsersRoleDTOBase { - [ObservableDTOProperty(MapsTo = nameof(UsersRole.Role) + "." + nameof(UsersRole.Role.Name))] - public String RoleName { get; set; } - public RoleDTO Role { get; set; } - - protected override string OnGetActionLogName() - { - return $"'{RoleName}' Role"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs index 879f31619..cceabb571 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs @@ -29,11 +29,6 @@ namespace Tango.BL.Dispensing } } - public virtual double CalculateNanoliterPerCentimeter(double volume, double maxNanoliterPerCentimeter) - { - return (volume / 100d) * maxNanoliterPerCentimeter; - } - /// <summary> /// Calculates the required nanoliter per second. /// </summary> @@ -58,17 +53,7 @@ namespace Tango.BL.Dispensing /// <returns></returns> public virtual double CalculatePulsePerSecond(LiquidVolume liquidVolume) { - return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep / (double)liquidVolume.DispenserStepDivision; - } - - /// <summary> - /// Calculates the required full pulses per second. - /// </summary> - /// <param name="liquidVolume">The liquid volume.</param> - /// <returns></returns> - public double CalculatePulsePerSecondFull(LiquidVolume liquidVolume) - { - return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep; + return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep * 8d; } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs index 3dd38fb10..a41eb1040 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcService.cs @@ -45,17 +45,6 @@ namespace Tango.BL.Dispensing } /// <summary> - /// Calculates the full pulse per second. - /// </summary> - /// <param name="liquidVolume">The liquid volume.</param> - /// <returns></returns> - public static double CalculatePulsePerSecondFull(LiquidVolume liquidVolume) - { - IDispensingCalc formula = DispensingCalcResolver.Resolve(liquidVolume); - return formula.CalculatePulsePerSecondFull(liquidVolume); - } - - /// <summary> /// Coerces the volume. /// </summary> /// <param name="liquidVolume">The liquid volume.</param> diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs index 7ec715a88..7c5928bf6 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/IDispensingCalc.cs @@ -29,13 +29,6 @@ namespace Tango.BL.Dispensing double CalculatePulsePerSecond(LiquidVolume liquidVolume); /// <summary> - /// Calculates the required full pulses per second. - /// </summary> - /// <param name="liquidVolume">The liquid volume.</param> - /// <returns></returns> - double CalculatePulsePerSecondFull(LiquidVolume liquidVolume); - - /// <summary> /// Coerces the specified liquid volume. /// </summary> /// <param name="liquidVolume">The liquid volume.</param> diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs index ee36fd9ef..15e9b69d9 100644 --- a/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs +++ b/Software/Visual_Studio/Tango.BL/Dispensing/TransparentLiquidDispensingCalc.cs @@ -25,15 +25,10 @@ namespace Tango.BL.Dispensing if (liquidVolume.Configuration != null && liquidVolume.RML != null && liquidVolume.ProcessParametersTable != null) { double nlPcmSum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.NanoliterPerCentimeter); - - nlPcmSum = Math.Max(0, liquidVolume.ProcessParametersTable.MinInkUptake - nlPcmSum); - - if (nlPcmSum < liquidVolume.ProcessParametersTable.MinInkUptake * 0.02d) - { - nlPcmSum = 0; - } - - return nlPcmSum; + double minInkUptake = liquidVolume.ProcessParametersTable.MinInkUptake; + double virtual_volume = Math.Max(0, minInkUptake - nlPcmSum); + return virtual_volume; + //(liquidVolume.Volume / 100d) * (Math.Min(liquidVolume.LiquidMaxNanoliterPerCentimeter, liquidVolume.ProcessParametersTable.MinInkUptake)); } else { @@ -50,6 +45,9 @@ namespace Tango.BL.Dispensing { if (liquidVolume.ProcessParametersTable != null) { + double nlPcmSum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.NanoliterPerCentimeter); + double minInkUptake = liquidVolume.ProcessParametersTable.MinInkUptake; + double volume = ((liquidVolume.LiquidMaxNanoliterPerCentimeter - nlPcmSum) / liquidVolume.LiquidMaxNanoliterPerCentimeter) * 100d; return Math.Max(100d - liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.Volume), 0); } else diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionLog.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionLog.cs deleted file mode 100644 index fa34caac8..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionLog.cs +++ /dev/null @@ -1,76 +0,0 @@ -using LiteDB; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Enumerations; -using Tango.BL.ValueObjects; - -namespace Tango.BL.Entities -{ - public class ActionLog : ActionLogBase - { - private ActionLogDifference _differenceObject; - private static JsonSerializerSettings _settings; - - static ActionLog() - { - _settings = new JsonSerializerSettings() - { - TypeNameHandling = TypeNameHandling.All, - }; - } - - [NotMapped] - [JsonIgnore] - [BsonIgnore] - public ActionLogType ActionType - { - get { return (ActionLogType)Type; } - set { Type = value.ToInt32(); RaisePropertyChanged(nameof(ActionType)); } - } - - [NotMapped] - [JsonIgnore] - [BsonIgnore] - public ActionLogDifference DifferenceObject - { - get - { - if (_differenceObject == null ) - { - if (Difference != null) - { - try - { - _differenceObject = JsonConvert.DeserializeObject<ActionLogDifference>(Difference, _settings); - } - catch - { - _differenceObject = new ActionLogDifference(); - } - } - else - { - _differenceObject = new ActionLogDifference(); - } - - } - - return _differenceObject; - } - set - { - _differenceObject = value; - - if (_differenceObject != null) - { - Difference = JsonConvert.SerializeObject(_differenceObject, _settings); - } - } - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs deleted file mode 100644 index 060d81f8b..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs +++ /dev/null @@ -1,283 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("ACTION_LOGS")] - public abstract class ActionLogBase : ObservableEntity<ActionLog> - { - - public event EventHandler<Int32> TypeChanged; - - public event EventHandler<String> RelatedObjectNameChanged; - - public event EventHandler<String> MessageChanged; - - public event EventHandler<String> DifferenceChanged; - - public event EventHandler<User> UserChanged; - - protected Int32 _type; - - /// <summary> - /// Gets or sets the actionlogbase type. - /// </summary> - - [Column("TYPE")] - - public Int32 Type - { - get - { - return _type; - } - - set - { - if (_type != value) - { - _type = value; - - OnTypeChanged(value); - - } - } - } - - protected String _userguid; - - /// <summary> - /// Gets or sets the actionlogbase user guid. - /// </summary> - - [Column("USER_GUID")] - [ForeignKey("User")] - - public String UserGuid - { - get - { - return _userguid; - } - - set - { - if (_userguid != value) - { - _userguid = value; - - } - } - } - - protected String _relatedobjectname; - - /// <summary> - /// Gets or sets the actionlogbase related object name. - /// </summary> - - [Column("RELATED_OBJECT_NAME")] - - public String RelatedObjectName - { - get - { - return _relatedobjectname; - } - - set - { - if (_relatedobjectname != value) - { - _relatedobjectname = value; - - OnRelatedObjectNameChanged(value); - - } - } - } - - protected String _relatedobjectguid; - - /// <summary> - /// Gets or sets the actionlogbase related object guid. - /// </summary> - - [Column("RELATED_OBJECT_GUID")] - - public String RelatedObjectGuid - { - get - { - return _relatedobjectguid; - } - - set - { - if (_relatedobjectguid != value) - { - _relatedobjectguid = value; - - } - } - } - - protected String _message; - - /// <summary> - /// Gets or sets the actionlogbase message. - /// </summary> - - [Column("MESSAGE")] - - public String Message - { - get - { - return _message; - } - - set - { - if (_message != value) - { - _message = value; - - OnMessageChanged(value); - - } - } - } - - protected String _difference; - - /// <summary> - /// Gets or sets the actionlogbase difference. - /// </summary> - - [Column("DIFFERENCE")] - - public String Difference - { - get - { - return _difference; - } - - set - { - if (_difference != value) - { - _difference = value; - - OnDifferenceChanged(value); - - } - } - } - - protected User _user; - - /// <summary> - /// Gets or sets the actionlogbase user. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual User User - { - get - { - return _user; - } - - set - { - if (_user != value) - { - _user = value; - - if (User != null) - { - UserGuid = User.Guid; - } - - OnUserChanged(value); - - } - } - } - - /// <summary> - /// Called when the Type has changed. - /// </summary> - protected virtual void OnTypeChanged(Int32 type) - { - TypeChanged?.Invoke(this, type); - RaisePropertyChanged(nameof(Type)); - } - - /// <summary> - /// Called when the RelatedObjectName has changed. - /// </summary> - protected virtual void OnRelatedObjectNameChanged(String relatedobjectname) - { - RelatedObjectNameChanged?.Invoke(this, relatedobjectname); - RaisePropertyChanged(nameof(RelatedObjectName)); - } - - /// <summary> - /// Called when the Message has changed. - /// </summary> - protected virtual void OnMessageChanged(String message) - { - MessageChanged?.Invoke(this, message); - RaisePropertyChanged(nameof(Message)); - } - - /// <summary> - /// Called when the Difference has changed. - /// </summary> - protected virtual void OnDifferenceChanged(String difference) - { - DifferenceChanged?.Invoke(this, difference); - RaisePropertyChanged(nameof(Difference)); - } - - /// <summary> - /// Called when the User has changed. - /// </summary> - protected virtual void OnUserChanged(User user) - { - UserChanged?.Invoke(this, user); - RaisePropertyChanged(nameof(User)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="ActionLogBase" /> class. - /// </summary> - public ActionLogBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs b/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs index 7e1229b98..f88efdb71 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs index 82a5ea94b..1671069b3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs index a816c7ad3..c54fe23d6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs index 20b58dbf2..0e06e48db 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs index 4ad21d4cd..d23e9b1f2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs @@ -28,7 +28,7 @@ namespace Tango.BL.Entities private bool _ignorePropChanged; private ActionTimer _syncTimer; private static List<String> _colorPropertyNames; - public const double MAX_INK_UPTAKE = 400; + public const double MAX_TOTAL_LIQUID_VOLUME = 200; #region Enums @@ -79,7 +79,6 @@ namespace Tango.BL.Entities _colorPropertyNames.Add(nameof(Color)); _colorPropertyNames.Add(nameof(ColorCatalogsItem)); - _colorPropertyNames.Add(nameof(IsTransparent)); } /// <summary> @@ -104,7 +103,7 @@ namespace Tango.BL.Entities #region Properties /// <summary> - /// Gets or sets a value indicating whether the total value of liquid volumes has exceeded the maximum range of <see cref="MAX_INK_UPTAKE"/>. + /// Gets or sets a value indicating whether the total value of liquid volumes has exceeded the maximum range of <see cref="MAX_TOTAL_LIQUID_VOLUME"/>. /// </summary> [NotMapped] [JsonIgnore] @@ -112,7 +111,7 @@ namespace Tango.BL.Entities { get { - return LiquidVolumes != null ? LiquidVolumes.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()).Sum(x => x.NanoliterPerCentimeter) > GetTotalMaximumLiquidNlPerCMLimit() : false; + return LiquidVolumes != null ? LiquidVolumes.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()).Sum(x => x.Volume) > MAX_TOTAL_LIQUID_VOLUME : false; } } @@ -284,7 +283,7 @@ namespace Tango.BL.Entities [JsonIgnore] public bool IsOutOfGamut { - get { return _isOutOfGamut && !IsTransparent; } + get { return _isOutOfGamut; } set { if (_isOutOfGamut != value) @@ -348,62 +347,6 @@ namespace Tango.BL.Entities get { return (ColorSpaces)ColorSpace.Code; } } - [NotMapped] - [JsonIgnore] - public bool IsWhite - { - get - { - try - { - if (ColorSpace != null) - { - if (BrushColorSpace == ColorSpaces.RGB) - { - if (Red == 255 && Green == 255 && Blue == 255) - { - return true; - } - } - else if (BrushColorSpace == ColorSpaces.LAB) - { - if (L == 100 && A == 0 && B == 0) - { - return true; - } - } - } - } - catch { } - - return false; - } - } - - [NotMapped] - [JsonIgnore] - public String LiquidVolumesOrderedPigmentedString - { - get - { - if (LiquidVolumes != null) - { - try - { - return String.Join(", ", LiquidVolumesOrderedPigmented.Select(x => x.Volume.ToString("0.0"))); - } - catch - { - return String.Empty; - } - } - else - { - return String.Empty; - } - } - } - #endregion #region Public Methods @@ -678,17 +621,6 @@ namespace Tango.BL.Entities PerformColorSynchronization(propName); } - protected override void OnIsTransparentChanged(bool istransparent) - { - base.OnIsTransparentChanged(istransparent); - RaisePropertyChanged(nameof(IsOutOfGamut)); - OutOfGamutChecked = false; - if (Segment != null) - { - Segment.RaiseHasOutOfGamutBrushStop(); - } - } - #endregion #region Properties Changed @@ -777,30 +709,5 @@ namespace Tango.BL.Entities } #endregion - - #region Private Methods - - private double GetTotalMaximumLiquidNlPerCMLimit() - { - try - { - var tables = Segment.Job.Rml.GetActiveProcessGroup().ProcessParametersTables.OrderBy(x => x.TableIndex).ToList(); - - if (tables.Count > 0) - { - return tables.Max(x => x.MaxInkUptake); - } - else - { - return MAX_INK_UPTAKE; - } - } - catch - { - return MAX_INK_UPTAKE; - } - } - - #endregion } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index 89114f2c3..e02d3f613 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -85,8 +84,6 @@ namespace Tango.BL.Entities public event EventHandler<Boolean> CorrectedChanged; - public event EventHandler<Boolean> IsTransparentChanged; - public event EventHandler<ColorCatalog> ColorCatalogChanged; public event EventHandler<ColorCatalogsItem> ColorCatalogsItemChanged; @@ -982,33 +979,6 @@ namespace Tango.BL.Entities } } - protected Boolean _istransparent; - - /// <summary> - /// Gets or sets the brushstopbase is transparent. - /// </summary> - - [Column("IS_TRANSPARENT")] - - public Boolean IsTransparent - { - get - { - return _istransparent; - } - - set - { - if (_istransparent != value) - { - _istransparent = value; - - OnIsTransparentChanged(value); - - } - } - } - protected ColorCatalog _colorcatalog; /// <summary> @@ -1399,15 +1369,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the IsTransparent has changed. - /// </summary> - protected virtual void OnIsTransparentChanged(Boolean istransparent) - { - IsTransparentChanged?.Invoke(this, istransparent); - RaisePropertyChanged(nameof(IsTransparent)); - } - - /// <summary> /// Called when the ColorCatalog has changed. /// </summary> protected virtual void OnColorCatalogChanged(ColorCatalog colorcatalog) diff --git a/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs index e0684e304..6281c7606 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs index 0c73be9ab..17bfd3f87 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs index 158615777..92f4f17b9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs index df1056469..da3c15c5c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -45,8 +44,6 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; - public event EventHandler<SynchronizedObservableCollection<SitesCatalog>> SitesCatalogsChanged; - protected String _company; /// <summary> @@ -284,31 +281,6 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<SitesCatalog> _sitescatalogs; - - /// <summary> - /// Gets or sets the colorcatalogbase sites catalogs. - /// </summary> - - public virtual SynchronizedObservableCollection<SitesCatalog> SitesCatalogs - { - get - { - return _sitescatalogs; - } - - set - { - if (_sitescatalogs != value) - { - _sitescatalogs = value; - - OnSitesCatalogsChanged(value); - - } - } - } - /// <summary> /// Called when the Company has changed. /// </summary> @@ -391,15 +363,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the SitesCatalogs has changed. - /// </summary> - protected virtual void OnSitesCatalogsChanged(SynchronizedObservableCollection<SitesCatalog> sitescatalogs) - { - SitesCatalogsChanged?.Invoke(this, sitescatalogs); - RaisePropertyChanged(nameof(SitesCatalogs)); - } - - /// <summary> /// Initializes a new instance of the <see cref="ColorCatalogBase" /> class. /// </summary> public ColorCatalogBase() : base() @@ -411,8 +374,6 @@ namespace Tango.BL.Entities Jobs = new SynchronizedObservableCollection<Job>(); - SitesCatalogs = new SynchronizedObservableCollection<SitesCatalog>(); - } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs index bc20a0c2e..3e0491ec5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs index 30d77a051..fe026fc32 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs index 19b3aed14..a0a324b9f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs index b21332829..9098a2eab 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -39,6 +38,8 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + protected Int32 _code; /// <summary> @@ -197,6 +198,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection<Machine> _machines; + + /// <summary> + /// Gets or sets the colorspacebase machines. + /// </summary> + + public virtual SynchronizedObservableCollection<Machine> Machines + { + get + { + return _machines; + } + + set + { + if (_machines != value) + { + _machines = value; + + OnMachinesChanged(value); + + } + } + } + /// <summary> /// Called when the Code has changed. /// </summary> @@ -252,6 +278,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the Machines has changed. + /// </summary> + protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines) + { + MachinesChanged?.Invoke(this, machines); + RaisePropertyChanged(nameof(Machines)); + } + + /// <summary> /// Initializes a new instance of the <see cref="ColorSpaceBase" /> class. /// </summary> public ColorSpaceBase() : base() @@ -261,6 +296,8 @@ namespace Tango.BL.Entities Jobs = new SynchronizedObservableCollection<Job>(); + Machines = new SynchronizedObservableCollection<Machine>(); + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs index d7a90bcfd..6b19ebb7f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs index 6fd8c9f4c..610fcc27b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs index 68e6b2df1..1d3dd576c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/DataStoreItem.cs b/Software/Visual_Studio/Tango.BL/Entities/DataStoreItem.cs deleted file mode 100644 index ce9f3c9e8..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/DataStoreItem.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class DataStoreItem : DataStoreItemBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/DataStoreItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DataStoreItemBase.cs deleted file mode 100644 index 6d393f6a2..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/DataStoreItemBase.cs +++ /dev/null @@ -1,334 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("DATA_STORE_ITEMS")] - public abstract class DataStoreItemBase : ObservableEntity<DataStoreItem> - { - - public event EventHandler<String> CollectionNameChanged; - - public event EventHandler<String> KeyChanged; - - public event EventHandler<Int32> DataTypeChanged; - - public event EventHandler<Byte[]> ValueChanged; - - public event EventHandler<Boolean> IsDeletedChanged; - - public event EventHandler<Boolean> IsSynchronizedChanged; - - public event EventHandler<Machine> MachineChanged; - - protected String _machineguid; - - /// <summary> - /// Gets or sets the datastoreitembase machine guid. - /// </summary> - - [Column("MACHINE_GUID")] - [ForeignKey("Machine")] - - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - if (_machineguid != value) - { - _machineguid = value; - - } - } - } - - protected String _collectionname; - - /// <summary> - /// Gets or sets the datastoreitembase collection name. - /// </summary> - - [Column("COLLECTION_NAME")] - - public String CollectionName - { - get - { - return _collectionname; - } - - set - { - if (_collectionname != value) - { - _collectionname = value; - - OnCollectionNameChanged(value); - - } - } - } - - protected String _key; - - /// <summary> - /// Gets or sets the datastoreitembase key. - /// </summary> - - [Column("KEY")] - - public String Key - { - get - { - return _key; - } - - set - { - if (_key != value) - { - _key = value; - - OnKeyChanged(value); - - } - } - } - - protected Int32 _datatype; - - /// <summary> - /// Gets or sets the datastoreitembase data type. - /// </summary> - - [Column("DATA_TYPE")] - - public Int32 DataType - { - get - { - return _datatype; - } - - set - { - if (_datatype != value) - { - _datatype = value; - - OnDataTypeChanged(value); - - } - } - } - - protected Byte[] _value; - - /// <summary> - /// Gets or sets the datastoreitembase value. - /// </summary> - - [Column("VALUE")] - - public Byte[] Value - { - get - { - return _value; - } - - set - { - if (_value != value) - { - _value = value; - - OnValueChanged(value); - - } - } - } - - protected Boolean _isdeleted; - - /// <summary> - /// Gets or sets the datastoreitembase is deleted. - /// </summary> - - [Column("IS_DELETED")] - - public Boolean IsDeleted - { - get - { - return _isdeleted; - } - - set - { - if (_isdeleted != value) - { - _isdeleted = value; - - OnIsDeletedChanged(value); - - } - } - } - - protected Boolean _issynchronized; - - /// <summary> - /// Gets or sets the datastoreitembase is synchronized. - /// </summary> - - [Column("IS_SYNCHRONIZED")] - - public Boolean IsSynchronized - { - get - { - return _issynchronized; - } - - set - { - if (_issynchronized != value) - { - _issynchronized = value; - - OnIsSynchronizedChanged(value); - - } - } - } - - protected Machine _machine; - - /// <summary> - /// Gets or sets the datastoreitembase machine. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - if (_machine != value) - { - _machine = value; - - if (Machine != null) - { - MachineGuid = Machine.Guid; - } - - OnMachineChanged(value); - - } - } - } - - /// <summary> - /// Called when the CollectionName has changed. - /// </summary> - protected virtual void OnCollectionNameChanged(String collectionname) - { - CollectionNameChanged?.Invoke(this, collectionname); - RaisePropertyChanged(nameof(CollectionName)); - } - - /// <summary> - /// Called when the Key has changed. - /// </summary> - protected virtual void OnKeyChanged(String key) - { - KeyChanged?.Invoke(this, key); - RaisePropertyChanged(nameof(Key)); - } - - /// <summary> - /// Called when the DataType has changed. - /// </summary> - protected virtual void OnDataTypeChanged(Int32 datatype) - { - DataTypeChanged?.Invoke(this, datatype); - RaisePropertyChanged(nameof(DataType)); - } - - /// <summary> - /// Called when the Value has changed. - /// </summary> - protected virtual void OnValueChanged(Byte[] value) - { - ValueChanged?.Invoke(this, value); - RaisePropertyChanged(nameof(Value)); - } - - /// <summary> - /// Called when the IsDeleted has changed. - /// </summary> - protected virtual void OnIsDeletedChanged(Boolean isdeleted) - { - IsDeletedChanged?.Invoke(this, isdeleted); - RaisePropertyChanged(nameof(IsDeleted)); - } - - /// <summary> - /// Called when the IsSynchronized has changed. - /// </summary> - protected virtual void OnIsSynchronizedChanged(Boolean issynchronized) - { - IsSynchronizedChanged?.Invoke(this, issynchronized); - RaisePropertyChanged(nameof(IsSynchronized)); - } - - /// <summary> - /// Called when the Machine has changed. - /// </summary> - protected virtual void OnMachineChanged(Machine machine) - { - MachineChanged?.Invoke(this, machine); - RaisePropertyChanged(nameof(Machine)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="DataStoreItemBase" /> class. - /// </summary> - public DataStoreItemBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs index 8343fdb65..a908da29c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs index 829ea0cba..04f4dc261 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs index 25c7df99f..148d53c6c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs index 8cbf615e8..f0100fe06 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs @@ -19,10 +19,14 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("EVENT_TYPES")] public abstract class EventTypeBase : ObservableEntity<EventType> { @@ -51,8 +55,6 @@ namespace Tango.BL.Entities public event EventHandler<String> GuidanceChanged; - public event EventHandler<Boolean> PersistentChanged; - public event EventHandler<SynchronizedObservableCollection<MachinesEvent>> MachinesEventsChanged; protected Int32 _code; @@ -400,33 +402,6 @@ namespace Tango.BL.Entities } } - protected Boolean _persistent; - - /// <summary> - /// Gets or sets the eventtypebase persistent. - /// </summary> - - [Column("PERSISTENT")] - - public Boolean Persistent - { - get - { - return _persistent; - } - - set - { - if (_persistent != value) - { - _persistent = value; - - OnPersistentChanged(value); - - } - } - } - protected SynchronizedObservableCollection<MachinesEvent> _machinesevents; /// <summary> @@ -561,15 +536,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the Persistent has changed. - /// </summary> - protected virtual void OnPersistentChanged(Boolean persistent) - { - PersistentChanged?.Invoke(this, persistent); - RaisePropertyChanged(nameof(Persistent)); - } - - /// <summary> /// Called when the MachinesEvents has changed. /// </summary> protected virtual void OnMachinesEventsChanged(SynchronizedObservableCollection<MachinesEvent> machinesevents) diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs index cfb335f62..cdc9bb76c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs index dfb34224b..d04050c4a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/FseVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/FseVersion.cs deleted file mode 100644 index 2ce48470d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/FseVersion.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class FseVersion : FseVersionBase - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/FseVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FseVersionBase.cs deleted file mode 100644 index 4baaf0557..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/FseVersionBase.cs +++ /dev/null @@ -1,258 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("FSE_VERSIONS")] - public abstract class FseVersionBase : ObservableEntity<FseVersion> - { - - public event EventHandler<String> VersionChanged; - - public event EventHandler<String> BlobNameChanged; - - public event EventHandler<String> InstallerBlobNameChanged; - - public event EventHandler<String> CommentsChanged; - - public event EventHandler<User> UserChanged; - - protected String _version; - - /// <summary> - /// Gets or sets the fseversionbase version. - /// </summary> - - [Column("VERSION")] - - public String Version - { - get - { - return _version; - } - - set - { - if (_version != value) - { - _version = value; - - OnVersionChanged(value); - - } - } - } - - protected String _blobname; - - /// <summary> - /// Gets or sets the fseversionbase blob name. - /// </summary> - - [Column("BLOB_NAME")] - - public String BlobName - { - get - { - return _blobname; - } - - set - { - if (_blobname != value) - { - _blobname = value; - - OnBlobNameChanged(value); - - } - } - } - - protected String _installerblobname; - - /// <summary> - /// Gets or sets the fseversionbase installer blob name. - /// </summary> - - [Column("INSTALLER_BLOB_NAME")] - - public String InstallerBlobName - { - get - { - return _installerblobname; - } - - set - { - if (_installerblobname != value) - { - _installerblobname = value; - - OnInstallerBlobNameChanged(value); - - } - } - } - - protected String _comments; - - /// <summary> - /// Gets or sets the fseversionbase comments. - /// </summary> - - [Column("COMMENTS")] - - public String Comments - { - get - { - return _comments; - } - - set - { - if (_comments != value) - { - _comments = value; - - OnCommentsChanged(value); - - } - } - } - - protected String _userguid; - - /// <summary> - /// Gets or sets the fseversionbase user guid. - /// </summary> - - [Column("USER_GUID")] - [ForeignKey("User")] - - public String UserGuid - { - get - { - return _userguid; - } - - set - { - if (_userguid != value) - { - _userguid = value; - - } - } - } - - protected User _user; - - /// <summary> - /// Gets or sets the fseversionbase user. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual User User - { - get - { - return _user; - } - - set - { - if (_user != value) - { - _user = value; - - if (User != null) - { - UserGuid = User.Guid; - } - - OnUserChanged(value); - - } - } - } - - /// <summary> - /// Called when the Version has changed. - /// </summary> - protected virtual void OnVersionChanged(String version) - { - VersionChanged?.Invoke(this, version); - RaisePropertyChanged(nameof(Version)); - } - - /// <summary> - /// Called when the BlobName has changed. - /// </summary> - protected virtual void OnBlobNameChanged(String blobname) - { - BlobNameChanged?.Invoke(this, blobname); - RaisePropertyChanged(nameof(BlobName)); - } - - /// <summary> - /// Called when the InstallerBlobName has changed. - /// </summary> - protected virtual void OnInstallerBlobNameChanged(String installerblobname) - { - InstallerBlobNameChanged?.Invoke(this, installerblobname); - RaisePropertyChanged(nameof(InstallerBlobName)); - } - - /// <summary> - /// Called when the Comments has changed. - /// </summary> - protected virtual void OnCommentsChanged(String comments) - { - CommentsChanged?.Invoke(this, comments); - RaisePropertyChanged(nameof(Comments)); - } - - /// <summary> - /// Called when the User has changed. - /// </summary> - protected virtual void OnUserChanged(User user) - { - UserChanged?.Invoke(this, user); - RaisePropertyChanged(nameof(User)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="FseVersionBase" /> class. - /// </summary> - public FseVersionBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/GlobalDataStoreItem.cs b/Software/Visual_Studio/Tango.BL/Entities/GlobalDataStoreItem.cs deleted file mode 100644 index e99552477..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/GlobalDataStoreItem.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class GlobalDataStoreItem : GlobalDataStoreItemBase - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/GlobalDataStoreItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/GlobalDataStoreItemBase.cs deleted file mode 100644 index 22acb12cb..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/GlobalDataStoreItemBase.cs +++ /dev/null @@ -1,189 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("GLOBAL_DATA_STORE_ITEMS")] - public abstract class GlobalDataStoreItemBase : ObservableEntity<GlobalDataStoreItem> - { - - public event EventHandler<String> CollectionNameChanged; - - public event EventHandler<String> KeyChanged; - - public event EventHandler<Int32> DataTypeChanged; - - public event EventHandler<Byte[]> ValueChanged; - - protected String _collectionname; - - /// <summary> - /// Gets or sets the globaldatastoreitembase collection name. - /// </summary> - - [Column("COLLECTION_NAME")] - - public String CollectionName - { - get - { - return _collectionname; - } - - set - { - if (_collectionname != value) - { - _collectionname = value; - - OnCollectionNameChanged(value); - - } - } - } - - protected String _key; - - /// <summary> - /// Gets or sets the globaldatastoreitembase key. - /// </summary> - - [Column("KEY")] - - public String Key - { - get - { - return _key; - } - - set - { - if (_key != value) - { - _key = value; - - OnKeyChanged(value); - - } - } - } - - protected Int32 _datatype; - - /// <summary> - /// Gets or sets the globaldatastoreitembase data type. - /// </summary> - - [Column("DATA_TYPE")] - - public Int32 DataType - { - get - { - return _datatype; - } - - set - { - if (_datatype != value) - { - _datatype = value; - - OnDataTypeChanged(value); - - } - } - } - - protected Byte[] _value; - - /// <summary> - /// Gets or sets the globaldatastoreitembase value. - /// </summary> - - [Column("VALUE")] - - public Byte[] Value - { - get - { - return _value; - } - - set - { - if (_value != value) - { - _value = value; - - OnValueChanged(value); - - } - } - } - - /// <summary> - /// Called when the CollectionName has changed. - /// </summary> - protected virtual void OnCollectionNameChanged(String collectionname) - { - CollectionNameChanged?.Invoke(this, collectionname); - RaisePropertyChanged(nameof(CollectionName)); - } - - /// <summary> - /// Called when the Key has changed. - /// </summary> - protected virtual void OnKeyChanged(String key) - { - KeyChanged?.Invoke(this, key); - RaisePropertyChanged(nameof(Key)); - } - - /// <summary> - /// Called when the DataType has changed. - /// </summary> - protected virtual void OnDataTypeChanged(Int32 datatype) - { - DataTypeChanged?.Invoke(this, datatype); - RaisePropertyChanged(nameof(DataType)); - } - - /// <summary> - /// Called when the Value has changed. - /// </summary> - protected virtual void OnValueChanged(Byte[] value) - { - ValueChanged?.Invoke(this, value); - RaisePropertyChanged(nameof(Value)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="GlobalDataStoreItemBase" /> class. - /// </summary> - public GlobalDataStoreItemBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs index 5cc6c4931..de376da41 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs @@ -19,10 +19,14 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("HARDWARE_BLOWERS")] public abstract class HardwareBlowerBase : ObservableEntity<HardwareBlower> { @@ -127,11 +131,6 @@ namespace Tango.BL.Entities [Column("VOLTAGE")] [Description("Voltage Description")] - - [Range(-10000,1000000)] - - [StringFormat("0.0")] - public Double Voltage { get diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs index 99dadd1f5..dc614bd0c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs index 1ca65ab51..9cbaac688 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs index 77a53c9a0..5d69f19b5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs index 65d60714a..a3fa5c1aa 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs index 7bff7c035..3cd885790 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs index 58118869c..e08a2b5b0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs @@ -19,10 +19,14 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("HARDWARE_MOTORS")] public abstract class HardwareMotorBase : ObservableEntity<HardwareMotor> { @@ -95,8 +99,6 @@ namespace Tango.BL.Entities public event EventHandler<Boolean> ActiveChanged; - public event EventHandler<Int32> P01ConfigWordChanged; - public event EventHandler<HardwareMotorType> HardwareMotorTypeChanged; public event EventHandler<HardwareVersion> HardwareVersionChanged; @@ -1071,33 +1073,6 @@ namespace Tango.BL.Entities } } - protected Int32 _p01configword; - - /// <summary> - /// Gets or sets the hardwaremotorbase p01 config word. - /// </summary> - - [Column("P01_CONFIG_WORD")] - - public Int32 P01ConfigWord - { - get - { - return _p01configword; - } - - set - { - if (_p01configword != value) - { - _p01configword = value; - - OnP01ConfigWordChanged(value); - - } - } - } - protected HardwareMotorType _hardwaremotortype; /// <summary> @@ -1469,15 +1444,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the P01ConfigWord has changed. - /// </summary> - protected virtual void OnP01ConfigWordChanged(Int32 p01configword) - { - P01ConfigWordChanged?.Invoke(this, p01configword); - RaisePropertyChanged(nameof(P01ConfigWord)); - } - - /// <summary> /// Called when the HardwareMotorType has changed. /// </summary> protected virtual void OnHardwareMotorTypeChanged(HardwareMotorType hardwaremotortype) diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs index 59ceeada9..a63a148da 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs index ccd56bca3..e12e40f32 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs index d148ea177..dbb8d2a1d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs index 5661225cb..3b7bb1e72 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs index 384462516..74ff9761d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs index bc65c33ce..ed8596192 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs @@ -1,7 +1,5 @@ -using Newtonsoft.Json; using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -95,13 +93,6 @@ namespace Tango.BL.Entities }); } - [NotMapped] - [JsonIgnore] - public String FullName - { - get { return $"{Name} v{Version}"; } - } - /// <summary> /// Initializes a new instance of the <see cref="HardwareVersion" /> class. /// </summary> @@ -109,16 +100,5 @@ namespace Tango.BL.Entities { } - - /// <summary> - /// Returns a <see cref="System.String" /> that represents this instance. - /// </summary> - /// <returns> - /// A <see cref="System.String" /> that represents this instance. - /// </returns> - public override string ToString() - { - return FullName; - } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs index 3d7d555dc..c3bc80696 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs index 8bcc5bb14..4c2808581 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs index 340748f97..8c8055c1e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs index 650d93098..b3e62f1fe 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs index 62d88bc77..0108dc3f5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 5cd756f27..52101c1b5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -10,10 +10,8 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; using System.Windows.Media.Imaging; -using Tango.BL.ActionLogs; using Tango.BL.Builders; using Tango.BL.Enumerations; -using Tango.BL.ValueObjects; using Tango.Core; using Tango.Core.ExtensionMethods; using Tango.Logging; @@ -80,7 +78,7 @@ namespace Tango.BL.Entities get { _lastLength = GetLength(); - var l = _lastLength * Math.Max(NumberOfUnits, 1); + var l = _lastLength * NumberOfUnits; if (EnableInterSegment && NumberOfUnits > 1) { @@ -103,17 +101,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Gets or sets the origin of the job. - /// </summary> - [NotMapped] - [JsonIgnore] - public JobSource JobSource - { - get { return (JobSource)Source; } - set { Source = value.ToInt32(); RaisePropertyChangedAuto(); } - } - - /// <summary> /// Gets or sets the job <see cref="Type"/> property as <see cref="JobType"/> enum instead of int. /// </summary> [NotMapped] @@ -348,7 +335,6 @@ namespace Tango.BL.Entities cloned.Name = Name + " - Copy"; cloned.CreationDate = DateTime.UtcNow; - cloned.IsSynchronized = false; cloned.LastRun = null; cloned.ColorSpace = ColorSpace; cloned.Customer = Customer; @@ -389,42 +375,34 @@ namespace Tango.BL.Entities public BitmapSource CreateSegmentsPie(double width, double height) { - try - { - Bitmap bmp = new Bitmap((int)width, (int)height); + Bitmap bmp = new Bitmap((int)width, (int)height); - using (Graphics g = Graphics.FromImage(bmp)) - { - g.Clear(Color.Transparent); - g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality; - g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.High; - g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; + using (Graphics g = Graphics.FromImage(bmp)) + { + g.Clear(Color.Transparent); + g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality; + g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.High; + g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; - int fromAngle = -90; - double totalLength = Segments.Sum(x => x.Length); //Excluding inter segment. + int fromAngle = -90; + double totalLength = Segments.Sum(x => x.Length); //Excluding inter segment. - foreach (var segment in OrderedSegments) - { - int toAngle = (int)((segment.Length / totalLength) * 360d); - Rectangle rect = new Rectangle(0, 0, bmp.Width - 2, bmp.Height - 2); - g.FillPie(segment.CreateGdiBrush(bmp.Width - 2, bmp.Height - 2), rect, fromAngle, toAngle); + foreach (var segment in OrderedSegments) + { + int toAngle = (int)((segment.Length / totalLength) * 360d); + Rectangle rect = new Rectangle(0, 0, bmp.Width - 2, bmp.Height - 2); + g.FillPie(segment.CreateGdiBrush(bmp.Width - 2, bmp.Height - 2), rect, fromAngle, toAngle); - Pen pen = new Pen(Color.Gainsboro); - g.DrawEllipse(pen, rect); - pen.Dispose(); - fromAngle += toAngle; - } + Pen pen = new Pen(Color.Gainsboro); + g.DrawEllipse(pen, rect); + pen.Dispose(); + fromAngle += toAngle; } - - var source = bmp.ToBitmapSource(); - bmp.Dispose(); - return source; - } - catch (Exception ex) - { - LogManager.Log(ex, $"Error occurred while trying to create job pie image for job '{Name}'."); - return null; } + + var source = bmp.ToBitmapSource(); + bmp.Dispose(); + return source; } /// <summary> @@ -432,13 +410,13 @@ namespace Tango.BL.Entities /// </summary> public Segment AddSolidSegment() { - return AddSolidSegment(null); + return AddSolidSegment(System.Windows.Media.Colors.Black); } /// <summary> /// Adds a new solid segment. /// </summary> - public Segment AddSolidSegment(System.Windows.Media.Color? color) + public Segment AddSolidSegment(System.Windows.Media.Color color) { return AddSolidSegment(color, 10); } @@ -448,13 +426,13 @@ namespace Tango.BL.Entities /// </summary> public Segment AddSolidSegment(double length) { - return AddSolidSegment(null, length); + return AddSolidSegment(System.Windows.Media.Colors.White, length); } /// <summary> /// Adds a new solid segment. /// </summary> - public Segment AddSolidSegment(System.Windows.Media.Color? color, double length) + public Segment AddSolidSegment(System.Windows.Media.Color color, double length) { Segment segment = new Segment(); segment.Name = "Standard Segment"; @@ -473,12 +451,7 @@ namespace Tango.BL.Entities segment.Job = this; var stop = segment.AddBrushStop(); - - if (color != null) - { - stop.Color = color.Value; - } - + stop.Color = color; Segments.Add(segment); return segment; @@ -498,9 +471,9 @@ namespace Tango.BL.Entities public Segment AddGradientSegment(double length) { var segment = AddSolidSegment(length); - //segment.BrushStops.Last().Color = System.Windows.Media.Colors.White; + segment.BrushStops.Last().Color = System.Windows.Media.Colors.White; segment.AddBrushStop(); - //segment.BrushStops.Last().Color = System.Windows.Media.Colors.White; + segment.BrushStops.Last().Color = System.Windows.Media.Colors.White; return segment; } @@ -655,7 +628,7 @@ namespace Tango.BL.Entities foreach (var stop in segment.BrushStops.OrderBy(x => x.StopIndex)) { JobFileBrushStop st = new JobFileBrushStop(); - stop.MapPropertiesTo(st, MappingFlags.NoReferenceTypes | MappingFlags.NoNullStrings); + stop.MapPrimitivesWithStringsNoNullsTo(st); st.ColorCatalogItemGuid = stop.ColorCatalogsItemGuid.ToStringOrEmpty(); foreach (var idsPack in machine.Configuration.NoneEmptyIdsPacks) @@ -782,7 +755,7 @@ namespace Tango.BL.Entities BrushStop st = new BrushStop(); st.StopIndex = j + 1; st.SegmentGuid = s.Guid; - stop.MapPropertiesTo(st, MappingFlags.NoReferenceTypes | MappingFlags.NoNullStrings); + stop.MapPrimitivesWithStringsNoNullsTo(st); foreach (var volume in stop.LiquidVolumes) { @@ -847,11 +820,6 @@ namespace Tango.BL.Entities { InsertError(nameof(Name), "Job name is required"); } - - if (Name != null && Name.Length > 100) - { - InsertError(nameof(Name), "The job name exceeds the maximum allowed characters."); - } } #endregion diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs index a535a78bd..c5354f2c7 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs @@ -19,10 +19,14 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("JOBS")] public abstract class JobBase : ObservableEntity<Job> { @@ -77,16 +81,14 @@ namespace Tango.BL.Entities public event EventHandler<Double> LengthPercentageFactorChanged; - public event EventHandler<Boolean> IsSynchronizedChanged; - - public event EventHandler<Int32> SourceChanged; - public event EventHandler<ColorCatalog> ColorCatalogChanged; public event EventHandler<ColorSpace> ColorSpaceChanged; public event EventHandler<Customer> CustomerChanged; + public event EventHandler<SynchronizedObservableCollection<JobRun>> JobRunsChanged; + public event EventHandler<Machine> MachineChanged; public event EventHandler<Rml> RmlChanged; @@ -993,61 +995,6 @@ namespace Tango.BL.Entities } } - protected Boolean _issynchronized; - - /// <summary> - /// Gets or sets the jobbase is synchronized. - /// </summary> - - [Column("IS_SYNCHRONIZED")] - - public Boolean IsSynchronized - { - get - { - return _issynchronized; - } - - set - { - if (_issynchronized != value) - { - _issynchronized = value; - - OnIsSynchronizedChanged(value); - - } - } - } - - protected Int32 _source; - - /// <summary> - /// 0 = Remote - /// 1 = Local - /// </summary> - - [Column("SOURCE")] - - public Int32 Source - { - get - { - return _source; - } - - set - { - if (_source != value) - { - _source = value; - - OnSourceChanged(value); - - } - } - } - protected ColorCatalog _colorcatalog; /// <summary> @@ -1144,6 +1091,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection<JobRun> _jobruns; + + /// <summary> + /// Gets or sets the jobbase job runs. + /// </summary> + + public virtual SynchronizedObservableCollection<JobRun> JobRuns + { + get + { + return _jobruns; + } + + set + { + if (_jobruns != value) + { + _jobruns = value; + + OnJobRunsChanged(value); + + } + } + } + protected Machine _machine; /// <summary> @@ -1555,24 +1527,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the IsSynchronized has changed. - /// </summary> - protected virtual void OnIsSynchronizedChanged(Boolean issynchronized) - { - IsSynchronizedChanged?.Invoke(this, issynchronized); - RaisePropertyChanged(nameof(IsSynchronized)); - } - - /// <summary> - /// Called when the Source has changed. - /// </summary> - protected virtual void OnSourceChanged(Int32 source) - { - SourceChanged?.Invoke(this, source); - RaisePropertyChanged(nameof(Source)); - } - - /// <summary> /// Called when the ColorCatalog has changed. /// </summary> protected virtual void OnColorCatalogChanged(ColorCatalog colorcatalog) @@ -1600,6 +1554,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the JobRuns has changed. + /// </summary> + protected virtual void OnJobRunsChanged(SynchronizedObservableCollection<JobRun> jobruns) + { + JobRunsChanged?.Invoke(this, jobruns); + RaisePropertyChanged(nameof(JobRuns)); + } + + /// <summary> /// Called when the Machine has changed. /// </summary> protected virtual void OnMachineChanged(Machine machine) @@ -1659,6 +1622,8 @@ namespace Tango.BL.Entities public JobBase() : base() { + JobRuns = new SynchronizedObservableCollection<JobRun>(); + Segments = new SynchronizedObservableCollection<Segment>(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs index 468af8043..30f28f9f4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs @@ -6,15 +6,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.BL.Enumerations; -using Tango.BL.ValueObjects; -using Tango.PMR.Exports; namespace Tango.BL.Entities { public partial class JobRun : JobRunBase { - private List<JobRunLiquidQuantity> _liquidQuantities; - [NotMapped] [JsonIgnore] public JobRunStatus JobRunStatus @@ -23,113 +19,6 @@ namespace Tango.BL.Entities set { Status = (int)value; } } - /// <summary> - /// Gets or sets the job designation. - /// </summary> - [NotMapped] - [JsonIgnore] - public JobDesignations Designation - { - get { return (JobDesignations)JobDesignation; } - set { JobDesignation = value.ToInt32(); RaisePropertyChangedAuto(); } - } - - /// <summary> - /// Gets or sets the job designation. - /// </summary> - [NotMapped] - [JsonIgnore] - public JobSource Source - { - get { return (JobSource)JobSource; } - set { JobSource = value.ToInt32(); RaisePropertyChangedAuto(); } - } - - [NotMapped] - [JsonIgnore] - public List<JobRunLiquidQuantity> LiquidQuantities - { - get - { - if (_liquidQuantities == null) - { - if (LiquidQuantityString != null) - { - try - { - _liquidQuantities = JsonConvert.DeserializeObject<List<JobRunLiquidQuantity>>(LiquidQuantityString); - } - catch - { - _liquidQuantities = new List<JobRunLiquidQuantity>(); - } - } - else - { - _liquidQuantities = new List<JobRunLiquidQuantity>(); - } - } - - return _liquidQuantities; - } - set - { - _liquidQuantities = value; - - if (_liquidQuantities != null) - { - LiquidQuantityString = JsonConvert.SerializeObject(_liquidQuantities); - } - } - } - - - private List<JobRunLiquidQuantity> _liquidQuantitiesFast; - [NotMapped] - [JsonIgnore] - public List<JobRunLiquidQuantity> LiquidQuantitiesFast - { - get - { - if (_liquidQuantitiesFast == null) - { - _liquidQuantitiesFast = new List<JobRunLiquidQuantity>(); - - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Cyan, Quantity = CyanQuantity }); - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Magenta, Quantity = MagentaQuantity }); - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Yellow, Quantity = YellowQuantity }); - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Black, Quantity = BlackQuantity }); - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.TransparentInk, Quantity = TransparentQuantity }); - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Lubricant, Quantity = LubricantQuantity }); - _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Cleaner, Quantity = CleanerQuantity }); - } - - return _liquidQuantitiesFast; - } - } - - private JobFile _jobFile; - [NotMapped] - [JsonIgnore] - public JobFile JobFile - { - get - { - if (_jobFile == null && JobString != null) - { - _jobFile = JobFile.Parser.ParseJson(JobString); - } - - return _jobFile; - } - set { _jobFile = value; } - } - - public Task<Job> CreateAssociatedJob() - { - return Job.FromJobFile(JobFile, MachineGuid, UserGuid); - } - protected override void RaisePropertyChanged(string propName) { base.RaisePropertyChanged(propName); diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs index 58f429448..4d53a6d66 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs @@ -19,88 +19,29 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("JOB_RUNS")] public abstract class JobRunBase : ObservableEntity<JobRun> { - public event EventHandler<String> JobNameChanged; - - public event EventHandler<Int32> JobDesignationChanged; - - public event EventHandler<Int32> JobSourceChanged; - - public event EventHandler<String> JobStringChanged; - public event EventHandler<DateTime> StartDateChanged; - public event EventHandler<Nullable<DateTime>> UploadingStartDateChanged; - - public event EventHandler<Nullable<DateTime>> HeatingStartDateChanged; - - public event EventHandler<Nullable<DateTime>> ActualStartDateChanged; - public event EventHandler<DateTime> EndDateChanged; public event EventHandler<Int32> StatusChanged; - public event EventHandler<Double> JobLengthChanged; - - public event EventHandler<Boolean> IsGradientChanged; - - public event EventHandler<Int32> GradientResolutionCmChanged; - - public event EventHandler<String> LiquidQuantityStringChanged; - - public event EventHandler<Int32> CyanQuantityChanged; - - public event EventHandler<Int32> MagentaQuantityChanged; - - public event EventHandler<Int32> YellowQuantityChanged; - - public event EventHandler<Int32> BlackQuantityChanged; - - public event EventHandler<Int32> TransparentQuantityChanged; - - public event EventHandler<Int32> LubricantQuantityChanged; - - public event EventHandler<Int32> CleanerQuantityChanged; - public event EventHandler<Double> EndPositionChanged; public event EventHandler<String> FailedMessageChanged; - public event EventHandler<Boolean> IsHeadCleaningChanged; - - public event EventHandler<Boolean> IsSynchronizedChanged; - - protected String _machineguid; - - /// <summary> - /// Gets or sets the jobrunbase machine guid. - /// </summary> - - [Column("MACHINE_GUID")] - - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - if (_machineguid != value) - { - _machineguid = value; - - } - } - } + public event EventHandler<Job> JobChanged; protected String _jobguid; @@ -109,6 +50,7 @@ namespace Tango.BL.Entities /// </summary> [Column("JOB_GUID")] + [ForeignKey("Job")] public String JobGuid { @@ -127,164 +69,6 @@ namespace Tango.BL.Entities } } - protected String _rmlguid; - - /// <summary> - /// Gets or sets the jobrunbase rml guid. - /// </summary> - - [Column("RML_GUID")] - - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - if (_rmlguid != value) - { - _rmlguid = value; - - } - } - } - - protected String _userguid; - - /// <summary> - /// Gets or sets the jobrunbase user guid. - /// </summary> - - [Column("USER_GUID")] - - public String UserGuid - { - get - { - return _userguid; - } - - set - { - if (_userguid != value) - { - _userguid = value; - - } - } - } - - protected String _jobname; - - /// <summary> - /// Gets or sets the jobrunbase job name. - /// </summary> - - [Column("JOB_NAME")] - - public String JobName - { - get - { - return _jobname; - } - - set - { - if (_jobname != value) - { - _jobname = value; - - OnJobNameChanged(value); - - } - } - } - - protected Int32 _jobdesignation; - - /// <summary> - /// Gets or sets the jobrunbase job designation. - /// </summary> - - [Column("JOB_DESIGNATION")] - - public Int32 JobDesignation - { - get - { - return _jobdesignation; - } - - set - { - if (_jobdesignation != value) - { - _jobdesignation = value; - - OnJobDesignationChanged(value); - - } - } - } - - protected Int32 _jobsource; - - /// <summary> - /// Gets or sets the jobrunbase job source. - /// </summary> - - [Column("JOB_SOURCE")] - - public Int32 JobSource - { - get - { - return _jobsource; - } - - set - { - if (_jobsource != value) - { - _jobsource = value; - - OnJobSourceChanged(value); - - } - } - } - - protected String _jobstring; - - /// <summary> - /// Gets or sets the jobrunbase job string. - /// </summary> - - [Column("JOB_STRING")] - - public String JobString - { - get - { - return _jobstring; - } - - set - { - if (_jobstring != value) - { - _jobstring = value; - - OnJobStringChanged(value); - - } - } - } - protected DateTime _startdate; /// <summary> @@ -312,87 +96,6 @@ namespace Tango.BL.Entities } } - protected Nullable<DateTime> _uploadingstartdate; - - /// <summary> - /// Gets or sets the jobrunbase uploading start date. - /// </summary> - - [Column("UPLOADING_START_DATE")] - - public Nullable<DateTime> UploadingStartDate - { - get - { - return _uploadingstartdate; - } - - set - { - if (_uploadingstartdate != value) - { - _uploadingstartdate = value; - - OnUploadingStartDateChanged(value); - - } - } - } - - protected Nullable<DateTime> _heatingstartdate; - - /// <summary> - /// Gets or sets the jobrunbase heating start date. - /// </summary> - - [Column("HEATING_START_DATE")] - - public Nullable<DateTime> HeatingStartDate - { - get - { - return _heatingstartdate; - } - - set - { - if (_heatingstartdate != value) - { - _heatingstartdate = value; - - OnHeatingStartDateChanged(value); - - } - } - } - - protected Nullable<DateTime> _actualstartdate; - - /// <summary> - /// Gets or sets the jobrunbase actual start date. - /// </summary> - - [Column("ACTUAL_START_DATE")] - - public Nullable<DateTime> ActualStartDate - { - get - { - return _actualstartdate; - } - - set - { - if (_actualstartdate != value) - { - _actualstartdate = value; - - OnActualStartDateChanged(value); - - } - } - } - protected DateTime _enddate; /// <summary> @@ -449,303 +152,6 @@ namespace Tango.BL.Entities } } - protected Double _joblength; - - /// <summary> - /// Gets or sets the jobrunbase job length. - /// </summary> - - [Column("JOB_LENGTH")] - - public Double JobLength - { - get - { - return _joblength; - } - - set - { - if (_joblength != value) - { - _joblength = value; - - OnJobLengthChanged(value); - - } - } - } - - protected Boolean _isgradient; - - /// <summary> - /// Gets or sets the jobrunbase is gradient. - /// </summary> - - [Column("IS_GRADIENT")] - - public Boolean IsGradient - { - get - { - return _isgradient; - } - - set - { - if (_isgradient != value) - { - _isgradient = value; - - OnIsGradientChanged(value); - - } - } - } - - protected Int32 _gradientresolutioncm; - - /// <summary> - /// Gets or sets the jobrunbase gradient resolution cm. - /// </summary> - - [Column("GRADIENT_RESOLUTION_CM")] - - public Int32 GradientResolutionCm - { - get - { - return _gradientresolutioncm; - } - - set - { - if (_gradientresolutioncm != value) - { - _gradientresolutioncm = value; - - OnGradientResolutionCmChanged(value); - - } - } - } - - protected String _liquidquantitystring; - - /// <summary> - /// Gets or sets the jobrunbase liquid quantity string. - /// </summary> - - [Column("LIQUID_QUANTITY_STRING")] - - public String LiquidQuantityString - { - get - { - return _liquidquantitystring; - } - - set - { - if (_liquidquantitystring != value) - { - _liquidquantitystring = value; - - OnLiquidQuantityStringChanged(value); - - } - } - } - - protected Int32 _cyanquantity; - - /// <summary> - /// Gets or sets the jobrunbase cyan quantity. - /// </summary> - - [Column("CYAN_QUANTITY")] - - public Int32 CyanQuantity - { - get - { - return _cyanquantity; - } - - set - { - if (_cyanquantity != value) - { - _cyanquantity = value; - - OnCyanQuantityChanged(value); - - } - } - } - - protected Int32 _magentaquantity; - - /// <summary> - /// Gets or sets the jobrunbase magenta quantity. - /// </summary> - - [Column("MAGENTA_QUANTITY")] - - public Int32 MagentaQuantity - { - get - { - return _magentaquantity; - } - - set - { - if (_magentaquantity != value) - { - _magentaquantity = value; - - OnMagentaQuantityChanged(value); - - } - } - } - - protected Int32 _yellowquantity; - - /// <summary> - /// Gets or sets the jobrunbase yellow quantity. - /// </summary> - - [Column("YELLOW_QUANTITY")] - - public Int32 YellowQuantity - { - get - { - return _yellowquantity; - } - - set - { - if (_yellowquantity != value) - { - _yellowquantity = value; - - OnYellowQuantityChanged(value); - - } - } - } - - protected Int32 _blackquantity; - - /// <summary> - /// Gets or sets the jobrunbase black quantity. - /// </summary> - - [Column("BLACK_QUANTITY")] - - public Int32 BlackQuantity - { - get - { - return _blackquantity; - } - - set - { - if (_blackquantity != value) - { - _blackquantity = value; - - OnBlackQuantityChanged(value); - - } - } - } - - protected Int32 _transparentquantity; - - /// <summary> - /// Gets or sets the jobrunbase transparent quantity. - /// </summary> - - [Column("TRANSPARENT_QUANTITY")] - - public Int32 TransparentQuantity - { - get - { - return _transparentquantity; - } - - set - { - if (_transparentquantity != value) - { - _transparentquantity = value; - - OnTransparentQuantityChanged(value); - - } - } - } - - protected Int32 _lubricantquantity; - - /// <summary> - /// Gets or sets the jobrunbase lubricant quantity. - /// </summary> - - [Column("LUBRICANT_QUANTITY")] - - public Int32 LubricantQuantity - { - get - { - return _lubricantquantity; - } - - set - { - if (_lubricantquantity != value) - { - _lubricantquantity = value; - - OnLubricantQuantityChanged(value); - - } - } - } - - protected Int32 _cleanerquantity; - - /// <summary> - /// Gets or sets the jobrunbase cleaner quantity. - /// </summary> - - [Column("CLEANER_QUANTITY")] - - public Int32 CleanerQuantity - { - get - { - return _cleanerquantity; - } - - set - { - if (_cleanerquantity != value) - { - _cleanerquantity = value; - - OnCleanerQuantityChanged(value); - - } - } - } - protected Double _endposition; /// <summary> @@ -800,97 +206,39 @@ namespace Tango.BL.Entities } } - protected Boolean _isheadcleaning; + protected Job _job; /// <summary> - /// Gets or sets the jobrunbase is head cleaning. + /// Gets or sets the jobrunbase job. /// </summary> - [Column("IS_HEAD_CLEANING")] - - public Boolean IsHeadCleaning + [XmlIgnore] + [JsonIgnore] + public virtual Job Job { get { - return _isheadcleaning; + return _job; } set { - if (_isheadcleaning != value) + if (_job != value) { - _isheadcleaning = value; - - OnIsHeadCleaningChanged(value); - - } - } - } - - protected Boolean _issynchronized; - - /// <summary> - /// Gets or sets the jobrunbase is synchronized. - /// </summary> - - [Column("IS_SYNCHRONIZED")] - - public Boolean IsSynchronized - { - get - { - return _issynchronized; - } + _job = value; - set - { - if (_issynchronized != value) - { - _issynchronized = value; + if (Job != null) + { + JobGuid = Job.Guid; + } - OnIsSynchronizedChanged(value); + OnJobChanged(value); } } } /// <summary> - /// Called when the JobName has changed. - /// </summary> - protected virtual void OnJobNameChanged(String jobname) - { - JobNameChanged?.Invoke(this, jobname); - RaisePropertyChanged(nameof(JobName)); - } - - /// <summary> - /// Called when the JobDesignation has changed. - /// </summary> - protected virtual void OnJobDesignationChanged(Int32 jobdesignation) - { - JobDesignationChanged?.Invoke(this, jobdesignation); - RaisePropertyChanged(nameof(JobDesignation)); - } - - /// <summary> - /// Called when the JobSource has changed. - /// </summary> - protected virtual void OnJobSourceChanged(Int32 jobsource) - { - JobSourceChanged?.Invoke(this, jobsource); - RaisePropertyChanged(nameof(JobSource)); - } - - /// <summary> - /// Called when the JobString has changed. - /// </summary> - protected virtual void OnJobStringChanged(String jobstring) - { - JobStringChanged?.Invoke(this, jobstring); - RaisePropertyChanged(nameof(JobString)); - } - - /// <summary> /// Called when the StartDate has changed. /// </summary> protected virtual void OnStartDateChanged(DateTime startdate) @@ -900,33 +248,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the UploadingStartDate has changed. - /// </summary> - protected virtual void OnUploadingStartDateChanged(Nullable<DateTime> uploadingstartdate) - { - UploadingStartDateChanged?.Invoke(this, uploadingstartdate); - RaisePropertyChanged(nameof(UploadingStartDate)); - } - - /// <summary> - /// Called when the HeatingStartDate has changed. - /// </summary> - protected virtual void OnHeatingStartDateChanged(Nullable<DateTime> heatingstartdate) - { - HeatingStartDateChanged?.Invoke(this, heatingstartdate); - RaisePropertyChanged(nameof(HeatingStartDate)); - } - - /// <summary> - /// Called when the ActualStartDate has changed. - /// </summary> - protected virtual void OnActualStartDateChanged(Nullable<DateTime> actualstartdate) - { - ActualStartDateChanged?.Invoke(this, actualstartdate); - RaisePropertyChanged(nameof(ActualStartDate)); - } - - /// <summary> /// Called when the EndDate has changed. /// </summary> protected virtual void OnEndDateChanged(DateTime enddate) @@ -945,105 +266,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the JobLength has changed. - /// </summary> - protected virtual void OnJobLengthChanged(Double joblength) - { - JobLengthChanged?.Invoke(this, joblength); - RaisePropertyChanged(nameof(JobLength)); - } - - /// <summary> - /// Called when the IsGradient has changed. - /// </summary> - protected virtual void OnIsGradientChanged(Boolean isgradient) - { - IsGradientChanged?.Invoke(this, isgradient); - RaisePropertyChanged(nameof(IsGradient)); - } - - /// <summary> - /// Called when the GradientResolutionCm has changed. - /// </summary> - protected virtual void OnGradientResolutionCmChanged(Int32 gradientresolutioncm) - { - GradientResolutionCmChanged?.Invoke(this, gradientresolutioncm); - RaisePropertyChanged(nameof(GradientResolutionCm)); - } - - /// <summary> - /// Called when the LiquidQuantityString has changed. - /// </summary> - protected virtual void OnLiquidQuantityStringChanged(String liquidquantitystring) - { - LiquidQuantityStringChanged?.Invoke(this, liquidquantitystring); - RaisePropertyChanged(nameof(LiquidQuantityString)); - } - - /// <summary> - /// Called when the CyanQuantity has changed. - /// </summary> - protected virtual void OnCyanQuantityChanged(Int32 cyanquantity) - { - CyanQuantityChanged?.Invoke(this, cyanquantity); - RaisePropertyChanged(nameof(CyanQuantity)); - } - - /// <summary> - /// Called when the MagentaQuantity has changed. - /// </summary> - protected virtual void OnMagentaQuantityChanged(Int32 magentaquantity) - { - MagentaQuantityChanged?.Invoke(this, magentaquantity); - RaisePropertyChanged(nameof(MagentaQuantity)); - } - - /// <summary> - /// Called when the YellowQuantity has changed. - /// </summary> - protected virtual void OnYellowQuantityChanged(Int32 yellowquantity) - { - YellowQuantityChanged?.Invoke(this, yellowquantity); - RaisePropertyChanged(nameof(YellowQuantity)); - } - - /// <summary> - /// Called when the BlackQuantity has changed. - /// </summary> - protected virtual void OnBlackQuantityChanged(Int32 blackquantity) - { - BlackQuantityChanged?.Invoke(this, blackquantity); - RaisePropertyChanged(nameof(BlackQuantity)); - } - - /// <summary> - /// Called when the TransparentQuantity has changed. - /// </summary> - protected virtual void OnTransparentQuantityChanged(Int32 transparentquantity) - { - TransparentQuantityChanged?.Invoke(this, transparentquantity); - RaisePropertyChanged(nameof(TransparentQuantity)); - } - - /// <summary> - /// Called when the LubricantQuantity has changed. - /// </summary> - protected virtual void OnLubricantQuantityChanged(Int32 lubricantquantity) - { - LubricantQuantityChanged?.Invoke(this, lubricantquantity); - RaisePropertyChanged(nameof(LubricantQuantity)); - } - - /// <summary> - /// Called when the CleanerQuantity has changed. - /// </summary> - protected virtual void OnCleanerQuantityChanged(Int32 cleanerquantity) - { - CleanerQuantityChanged?.Invoke(this, cleanerquantity); - RaisePropertyChanged(nameof(CleanerQuantity)); - } - - /// <summary> /// Called when the EndPosition has changed. /// </summary> protected virtual void OnEndPositionChanged(Double endposition) @@ -1062,21 +284,12 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the IsHeadCleaning has changed. - /// </summary> - protected virtual void OnIsHeadCleaningChanged(Boolean isheadcleaning) - { - IsHeadCleaningChanged?.Invoke(this, isheadcleaning); - RaisePropertyChanged(nameof(IsHeadCleaning)); - } - - /// <summary> - /// Called when the IsSynchronized has changed. + /// Called when the Job has changed. /// </summary> - protected virtual void OnIsSynchronizedChanged(Boolean issynchronized) + protected virtual void OnJobChanged(Job job) { - IsSynchronizedChanged?.Invoke(this, issynchronized); - RaisePropertyChanged(nameof(IsSynchronized)); + JobChanged?.Invoke(this, job); + RaisePropertyChanged(nameof(Job)); } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs index 8f3ca38e8..ccd78a60b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs index ce09d72ac..60fdc6707 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Media; -using Tango.BL.Enumerations; namespace Tango.BL.Entities { @@ -25,13 +24,6 @@ namespace Tango.BL.Entities get { return Core.Helpers.ColorHelper.IntegerToColor(Color); } } - [NotMapped] - [JsonIgnore] - public LiquidTypes Type - { - get { return (LiquidTypes)Code; } - } - /// <summary> /// Initializes a new instance of the <see cref="LiquidType" /> class. /// </summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs index 75260e58c..7683eadbc 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -39,8 +38,6 @@ namespace Tango.BL.Entities public event EventHandler<Boolean> HasPigmentChanged; - public event EventHandler<String> ShortNameChanged; - public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged; @@ -209,33 +206,6 @@ namespace Tango.BL.Entities } } - protected String _shortname; - - /// <summary> - /// Gets or sets the liquidtypebase short name. - /// </summary> - - [Column("SHORT_NAME")] - - public String ShortName - { - get - { - return _shortname; - } - - set - { - if (_shortname != value) - { - _shortname = value; - - OnShortNameChanged(value); - - } - } - } - protected SynchronizedObservableCollection<Cat> _cats; /// <summary> @@ -366,15 +336,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the ShortName has changed. - /// </summary> - protected virtual void OnShortNameChanged(String shortname) - { - ShortNameChanged?.Invoke(this, shortname); - RaisePropertyChanged(nameof(ShortName)); - } - - /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs index ef9e80cb9..5aad28034 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs index 2070c68b3..a7ba29c2a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs @@ -73,23 +73,6 @@ namespace Tango.BL.Entities } } - /// <summary> - /// Gets or sets the installed head on this machine. - /// </summary> - [NotMapped] - [JsonIgnore] - public HeadTypes MachineHeadType - { - get - { - return (HeadTypes)HeadType; - } - set - { - HeadType = value.ToInt32(); - } - } - #endregion protected override void RaisePropertyChanged(string propName) diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs index cbfd43789..4f989aeb2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -71,15 +70,11 @@ namespace Tango.BL.Entities public event EventHandler<String> DeviceNameChanged; - public event EventHandler<Int32> HeadTypeChanged; - - public event EventHandler<String> ActivationKeyChanged; - public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; - public event EventHandler<Configuration> ConfigurationChanged; + public event EventHandler<ColorSpace> DefaultColorSpaceChanged; - public event EventHandler<SynchronizedObservableCollection<DataStoreItem>> DataStoreItemsChanged; + public event EventHandler<Configuration> ConfigurationChanged; public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; @@ -89,6 +84,10 @@ namespace Tango.BL.Entities public event EventHandler<Organization> OrganizationChanged; + public event EventHandler<Rml> DefaultRmlChanged; + + public event EventHandler<SpoolType> DefaultSpoolTypeChanged; + public event EventHandler<SynchronizedObservableCollection<Spool>> SpoolsChanged; protected String _serialnumber; @@ -198,31 +197,6 @@ namespace Tango.BL.Entities } } - protected String _siteguid; - - /// <summary> - /// Gets or sets the machinebase site guid. - /// </summary> - - [Column("SITE_GUID")] - - public String SiteGuid - { - get - { - return _siteguid; - } - - set - { - if (_siteguid != value) - { - _siteguid = value; - - } - } - } - protected String _machineversionguid; /// <summary> @@ -282,6 +256,7 @@ namespace Tango.BL.Entities /// </summary> [Column("DEFAULT_RML_GUID")] + [ForeignKey("DefaultRml")] public String DefaultRmlGuid { @@ -386,6 +361,7 @@ namespace Tango.BL.Entities /// </summary> [Column("DEFAULT_COLOR_SPACE_GUID")] + [ForeignKey("DefaultColorSpace")] public String DefaultColorSpaceGuid { @@ -438,6 +414,7 @@ namespace Tango.BL.Entities /// </summary> [Column("DEFAULT_SPOOL_TYPE_GUID")] + [ForeignKey("DefaultSpoolType")] public String DefaultSpoolTypeGuid { @@ -888,80 +865,58 @@ namespace Tango.BL.Entities } } - protected Int32 _headtype; + protected SynchronizedObservableCollection<Cat> _cats; /// <summary> - /// Gets or sets the machinebase head type. + /// Gets or sets the machinebase cats. /// </summary> - [Column("HEAD_TYPE")] - - public Int32 HeadType + public virtual SynchronizedObservableCollection<Cat> Cats { get { - return _headtype; + return _cats; } set { - if (_headtype != value) + if (_cats != value) { - _headtype = value; + _cats = value; - OnHeadTypeChanged(value); + OnCatsChanged(value); } } } - protected String _activationkey; + protected ColorSpace _defaultcolorspace; /// <summary> - /// Gets or sets the machinebase activation key. + /// Gets or sets the machinebase color spaces. /// </summary> - [Column("ACTIVATION_KEY")] - - public String ActivationKey + [XmlIgnore] + [JsonIgnore] + public virtual ColorSpace DefaultColorSpace { get { - return _activationkey; + return _defaultcolorspace; } set { - if (_activationkey != value) + if (_defaultcolorspace != value) { - _activationkey = value; + _defaultcolorspace = value; - OnActivationKeyChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<Cat> _cats; - - /// <summary> - /// Gets or sets the machinebase cats. - /// </summary> - - public virtual SynchronizedObservableCollection<Cat> Cats - { - get - { - return _cats; - } - - set - { - if (_cats != value) - { - _cats = value; + if (DefaultColorSpace != null) + { + DefaultColorSpaceGuid = DefaultColorSpace.Guid; + } - OnCatsChanged(value); + OnDefaultColorSpaceChanged(value); } } @@ -999,31 +954,6 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<DataStoreItem> _datastoreitems; - - /// <summary> - /// Gets or sets the machinebase data store items. - /// </summary> - - public virtual SynchronizedObservableCollection<DataStoreItem> DataStoreItems - { - get - { - return _datastoreitems; - } - - set - { - if (_datastoreitems != value) - { - _datastoreitems = value; - - OnDataStoreItemsChanged(value); - - } - } - } - protected SynchronizedObservableCollection<Job> _jobs; /// <summary> @@ -1138,6 +1068,70 @@ namespace Tango.BL.Entities } } + protected Rml _defaultrml; + + /// <summary> + /// Gets or sets the machinebase rml. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual Rml DefaultRml + { + get + { + return _defaultrml; + } + + set + { + if (_defaultrml != value) + { + _defaultrml = value; + + if (DefaultRml != null) + { + DefaultRmlGuid = DefaultRml.Guid; + } + + OnDefaultRmlChanged(value); + + } + } + } + + protected SpoolType _defaultspooltype; + + /// <summary> + /// Gets or sets the machinebase spool types. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual SpoolType DefaultSpoolType + { + get + { + return _defaultspooltype; + } + + set + { + if (_defaultspooltype != value) + { + _defaultspooltype = value; + + if (DefaultSpoolType != null) + { + DefaultSpoolTypeGuid = DefaultSpoolType.Guid; + } + + OnDefaultSpoolTypeChanged(value); + + } + } + } + protected SynchronizedObservableCollection<Spool> _spools; /// <summary> @@ -1362,24 +1356,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the HeadType has changed. - /// </summary> - protected virtual void OnHeadTypeChanged(Int32 headtype) - { - HeadTypeChanged?.Invoke(this, headtype); - RaisePropertyChanged(nameof(HeadType)); - } - - /// <summary> - /// Called when the ActivationKey has changed. - /// </summary> - protected virtual void OnActivationKeyChanged(String activationkey) - { - ActivationKeyChanged?.Invoke(this, activationkey); - RaisePropertyChanged(nameof(ActivationKey)); - } - - /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) @@ -1389,21 +1365,21 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the Configuration has changed. + /// Called when the DefaultColorSpace has changed. /// </summary> - protected virtual void OnConfigurationChanged(Configuration configuration) + protected virtual void OnDefaultColorSpaceChanged(ColorSpace defaultcolorspace) { - ConfigurationChanged?.Invoke(this, configuration); - RaisePropertyChanged(nameof(Configuration)); + DefaultColorSpaceChanged?.Invoke(this, defaultcolorspace); + RaisePropertyChanged(nameof(DefaultColorSpace)); } /// <summary> - /// Called when the DataStoreItems has changed. + /// Called when the Configuration has changed. /// </summary> - protected virtual void OnDataStoreItemsChanged(SynchronizedObservableCollection<DataStoreItem> datastoreitems) + protected virtual void OnConfigurationChanged(Configuration configuration) { - DataStoreItemsChanged?.Invoke(this, datastoreitems); - RaisePropertyChanged(nameof(DataStoreItems)); + ConfigurationChanged?.Invoke(this, configuration); + RaisePropertyChanged(nameof(Configuration)); } /// <summary> @@ -1443,6 +1419,24 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the DefaultRml has changed. + /// </summary> + protected virtual void OnDefaultRmlChanged(Rml defaultrml) + { + DefaultRmlChanged?.Invoke(this, defaultrml); + RaisePropertyChanged(nameof(DefaultRml)); + } + + /// <summary> + /// Called when the DefaultSpoolType has changed. + /// </summary> + protected virtual void OnDefaultSpoolTypeChanged(SpoolType defaultspooltype) + { + DefaultSpoolTypeChanged?.Invoke(this, defaultspooltype); + RaisePropertyChanged(nameof(DefaultSpoolType)); + } + + /// <summary> /// Called when the Spools has changed. /// </summary> protected virtual void OnSpoolsChanged(SynchronizedObservableCollection<Spool> spools) @@ -1459,8 +1453,6 @@ namespace Tango.BL.Entities Cats = new SynchronizedObservableCollection<Cat>(); - DataStoreItems = new SynchronizedObservableCollection<DataStoreItem>(); - Jobs = new SynchronizedObservableCollection<Job>(); MachinesEvents = new SynchronizedObservableCollection<MachinesEvent>(); diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs index 65630a630..83bf72451 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs index 7b90623d8..a94ed85a0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs @@ -27,40 +27,22 @@ namespace Tango.BL.Entities .Ignore(() => machine.MachinesEvents) .Ignore(() => machine.Configuration.Machines) .Ignore(() => machine.Jobs) - .Ignore(() => machine.SerialNumber) - .Ignore(() => machine.DefaultRmlGuid) - .Ignore(() => machine.DefaultColorSpaceGuid) - .Ignore(() => machine.DefaultSpoolTypeGuid) - .Ignore(() => machine.LoadedRmlGuid) - .Ignore(() => machine.DeviceId) - .Ignore(() => machine.DeviceName) - .Ignore(() => machine.IsDeviceRegistered) - .Ignore(() => machine.SiteGuid), + .Ignore(() => machine.SerialNumber), EntitySerializationFlags.IgnoreGuids | EntitySerializationFlags.IgnoreReferenceTypes); } - public async Task<Machine> CreatePrototypeMachine(ObservablesContext context) + public Machine CreatePrototypeMachine(ObservablesContext context) { Machine m = new Machine(); - String protoTypeData = (await context.MachineVersions.SingleOrDefaultAsync(x => x.Guid == Guid)).PrototypeMachineData; - - Machine machine = Machine.FromJson(protoTypeData, new EntitySerializationStrategy() + Machine machine = Machine.FromJson(PrototypeMachineData, new EntitySerializationStrategy() .Include(() => m.Configuration) .Ignore(() => m.Name) .Ignore(() => m.MachinesEvents) .Ignore(() => m.Configuration.Machines) .Ignore(() => m.Jobs) - .Ignore(() => m.SerialNumber) - .Ignore(() => m.DefaultRmlGuid) - .Ignore(() => m.DefaultColorSpaceGuid) - .Ignore(() => m.DefaultSpoolTypeGuid) - .Ignore(() => m.LoadedRmlGuid) - .Ignore(() => m.DeviceId) - .Ignore(() => m.DeviceName) - .Ignore(() => m.IsDeviceRegistered) - .Ignore(() => m.SiteGuid), + .Ignore(() => m.SerialNumber), EntitySerializationFlags.IgnoreGuids | EntitySerializationFlags.IgnoreReferenceTypes); @@ -69,7 +51,6 @@ namespace Tango.BL.Entities machine.ConfigurationGuid = null; machine.ConfigurationGuid = machine.Configuration.Guid; - foreach (var cat in machine.Cats) { cat.MachineGuid = machine.Guid; @@ -89,10 +70,6 @@ namespace Tango.BL.Entities spool.MachineGuid = machine.Guid; } - machine.DefaultColorSpaceGuid = null; - machine.DefaultRmlGuid = null; - machine.DefaultSpoolTypeGuid = null; - return machine; } diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs index 440eaf723..30602025e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs index 4572fe5ae..2738e0f08 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs @@ -90,15 +90,6 @@ namespace Tango.BL.Entities get { return EventType.Actions; } } - [NotMapped] - public DateTime ResolvedDateTime { get; set; } - - [NotMapped] - public TimeSpan Duration - { - get { return ResolvedDateTime - DateTime; } - } - private User _eventUser; [NotMapped] [JsonIgnore] diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs index 161e25d77..5091267e8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -33,8 +32,6 @@ namespace Tango.BL.Entities public event EventHandler<String> DescriptionChanged; - public event EventHandler<Boolean> IsSynchronizedChanged; - public event EventHandler<EventType> EventTypeChanged; public event EventHandler<Machine> MachineChanged; @@ -200,33 +197,6 @@ namespace Tango.BL.Entities } } - protected Boolean _issynchronized; - - /// <summary> - /// Gets or sets the machineseventbase is synchronized. - /// </summary> - - [Column("IS_SYNCHRONIZED")] - - public Boolean IsSynchronized - { - get - { - return _issynchronized; - } - - set - { - if (_issynchronized != value) - { - _issynchronized = value; - - OnIsSynchronizedChanged(value); - - } - } - } - protected EventType _eventtype; /// <summary> @@ -351,15 +321,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the IsSynchronized has changed. - /// </summary> - protected virtual void OnIsSynchronizedChanged(Boolean issynchronized) - { - IsSynchronizedChanged?.Invoke(this, issynchronized); - RaisePropertyChanged(nameof(IsSynchronized)); - } - - /// <summary> /// Called when the EventType has changed. /// </summary> protected virtual void OnEventTypeChanged(EventType eventtype) diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs index ec7501ba4..12405642a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs index 860337fae..2d0529506 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs index 7a099ebeb..91fd93bd4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs index 34c40f2a0..2467bcd8c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs index 7580c6fd1..738c77efb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Organization.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Organization.cs @@ -15,10 +15,5 @@ namespace Tango.BL.Entities { } - - public override string ToString() - { - return Name; - } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs index 7fb8699af..b19cb6fc1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -37,8 +36,6 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; - public event EventHandler<SynchronizedObservableCollection<Site>> SitesChanged; - public event EventHandler<SynchronizedObservableCollection<User>> UsersChanged; protected String _name; @@ -234,31 +231,6 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<Site> _sites; - - /// <summary> - /// Gets or sets the organizationbase sites. - /// </summary> - - public virtual SynchronizedObservableCollection<Site> Sites - { - get - { - return _sites; - } - - set - { - if (_sites != value) - { - _sites = value; - - OnSitesChanged(value); - - } - } - } - protected SynchronizedObservableCollection<User> _users; /// <summary> @@ -330,15 +302,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the Sites has changed. - /// </summary> - protected virtual void OnSitesChanged(SynchronizedObservableCollection<Site> sites) - { - SitesChanged?.Invoke(this, sites); - RaisePropertyChanged(nameof(Sites)); - } - - /// <summary> /// Called when the Users has changed. /// </summary> protected virtual void OnUsersChanged(SynchronizedObservableCollection<User> users) @@ -357,8 +320,6 @@ namespace Tango.BL.Entities Machines = new SynchronizedObservableCollection<Machine>(); - Sites = new SynchronizedObservableCollection<Site>(); - Users = new SynchronizedObservableCollection<User>(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs index d86097af1..7f6ba7499 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs index 0a78dbc93..2cef9ba4c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTable.cs @@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.Core.ExtensionMethods; namespace Tango.BL.Entities { @@ -14,7 +13,6 @@ namespace Tango.BL.Entities public event EventHandler DyeingSpeedMinInkUptakeChanged; public const double DRYER_METERS_PER_CYCLE = 0.76; - public const double DRYER_TO_SPOOL_LENGTH_METERS = 0.9; protected override void RaisePropertyChanged(string propName) { @@ -35,7 +33,7 @@ namespace Tango.BL.Entities [JsonIgnore] public double DryerBufferLengthMeters { - get { return (DryerBufferLength * DRYER_METERS_PER_CYCLE) + DRYER_TO_SPOOL_LENGTH_METERS; } + get { return DryerBufferLength * DRYER_METERS_PER_CYCLE; } } /// <summary> @@ -45,34 +43,5 @@ namespace Tango.BL.Entities { } - - public double GetAverageTemperature() - { - List<double> heaters = new List<double>(); - - heaters.Add(HeadZone1Temp); - heaters.Add(HeadZone2Temp); - heaters.Add(HeadZone3Temp); - heaters.Add(HeadZone4Temp); - heaters.Add(HeadZone5Temp); - heaters.Add(HeadZone6Temp); - heaters.Add(HeadZone7Temp); - heaters.Add(HeadZone8Temp); - heaters.Add(HeadZone9Temp); - heaters.Add(HeadZone10Temp); - heaters.Add(HeadZone11Temp); - heaters.Add(HeadZone12Temp); - heaters.Add(LBlowerTemp); - heaters.Add(RBlowerTemp); - - return heaters.Average(); - } - - public PMR.Printing.ProcessParameters ToProcessParametersPMR() - { - PMR.Printing.ProcessParameters p = new PMR.Printing.ProcessParameters(); - this.MapPrimitivesTo(p); - return p; - } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 498bafc85..2757b0625 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -69,28 +68,6 @@ namespace Tango.BL.Entities public event EventHandler<Int32> TableIndexChanged; - public event EventHandler<Double> HeadZone7TempChanged; - - public event EventHandler<Double> HeadZone8TempChanged; - - public event EventHandler<Double> HeadZone9TempChanged; - - public event EventHandler<Double> HeadZone10TempChanged; - - public event EventHandler<Double> HeadZone11TempChanged; - - public event EventHandler<Double> HeadZone12TempChanged; - - public event EventHandler<Double> RBlowerFlowChanged; - - public event EventHandler<Double> RBlowerTempChanged; - - public event EventHandler<Double> LBlowerFlowChanged; - - public event EventHandler<Double> LBlowerTempChanged; - - public event EventHandler<Double> PressureBuildUpChanged; - public event EventHandler<ProcessParametersTablesGroup> ProcessParametersTablesGroupChanged; protected String _name; @@ -101,10 +78,6 @@ namespace Tango.BL.Entities [Column("NAME")] - [StringFormat("0.0")] - - [PropertyIndex(1)] - public String Name { get @@ -132,10 +105,6 @@ namespace Tango.BL.Entities [Column("DYEING_SPEED")] - [StringFormat("0.0")] - - [PropertyIndex(2)] - public Double DyeingSpeed { get @@ -163,10 +132,6 @@ namespace Tango.BL.Entities [Column("MIN_INK_UPTAKE")] - [StringFormat("0.0")] - - [PropertyIndex(3)] - public Double MinInkUptake { get @@ -194,10 +159,6 @@ namespace Tango.BL.Entities [Column("MAX_INK_UPTAKE")] - [StringFormat("0.0")] - - [PropertyIndex(4)] - public Double MaxInkUptake { get @@ -225,10 +186,6 @@ namespace Tango.BL.Entities [Column("FEEDER_TENSION")] - [StringFormat("0.000")] - - [PropertyIndex(5)] - public Double FeederTension { get @@ -256,10 +213,6 @@ namespace Tango.BL.Entities [Column("PULLER_TENSION")] - [StringFormat("0.0")] - - [PropertyIndex(6)] - public Double PullerTension { get @@ -287,10 +240,6 @@ namespace Tango.BL.Entities [Column("WINDER_TENSION")] - [StringFormat("0.0")] - - [PropertyIndex(7)] - public Double WinderTension { get @@ -318,10 +267,6 @@ namespace Tango.BL.Entities [Column("MIXER_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(8)] - public Double MixerTemp { get @@ -349,10 +294,6 @@ namespace Tango.BL.Entities [Column("HEAD_ZONE1_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(9)] - public Double HeadZone1Temp { get @@ -380,10 +321,6 @@ namespace Tango.BL.Entities [Column("HEAD_ZONE2_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(10)] - public Double HeadZone2Temp { get @@ -411,10 +348,6 @@ namespace Tango.BL.Entities [Column("HEAD_ZONE3_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(11)] - public Double HeadZone3Temp { get @@ -442,10 +375,6 @@ namespace Tango.BL.Entities [Column("HEAD_ZONE4_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(12)] - public Double HeadZone4Temp { get @@ -473,10 +402,6 @@ namespace Tango.BL.Entities [Column("HEAD_ZONE5_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(13)] - public Double HeadZone5Temp { get @@ -504,10 +429,6 @@ namespace Tango.BL.Entities [Column("HEAD_ZONE6_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(14)] - public Double HeadZone6Temp { get @@ -535,10 +456,6 @@ namespace Tango.BL.Entities [Column("DRYER_AIR_FLOW")] - [StringFormat("0.0")] - - [PropertyIndex(26)] - public Double DryerAirFlow { get @@ -566,10 +483,6 @@ namespace Tango.BL.Entities [Column("DRYER_ZONE1_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(23)] - public Double DryerZone1Temp { get @@ -597,10 +510,6 @@ namespace Tango.BL.Entities [Column("DRYER_ZONE2_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(24)] - public Double DryerZone2Temp { get @@ -628,10 +537,6 @@ namespace Tango.BL.Entities [Column("DRYER_ZONE3_TEMP")] - [StringFormat("0.0")] - - [PropertyIndex(25)] - public Double DryerZone3Temp { get @@ -659,10 +564,6 @@ namespace Tango.BL.Entities [Column("DRYER_BUFFER_LENGTH")] - [StringFormat("0.0")] - - [PropertyIndex(28)] - public Double DryerBufferLength { get @@ -690,10 +591,6 @@ namespace Tango.BL.Entities [Column("HEAD_AIR_FLOW")] - [StringFormat("0.0")] - - [PropertyIndex(27)] - public Double HeadAirFlow { get @@ -766,347 +663,6 @@ namespace Tango.BL.Entities } } - protected Double _headzone7temp; - - /// <summary> - /// Gets or sets the processparameterstablebase head zone7 temp. - /// </summary> - - [Column("HEAD_ZONE7_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(15)] - - public Double HeadZone7Temp - { - get - { - return _headzone7temp; - } - - set - { - if (_headzone7temp != value) - { - _headzone7temp = value; - - OnHeadZone7TempChanged(value); - - } - } - } - - protected Double _headzone8temp; - - /// <summary> - /// Gets or sets the processparameterstablebase head zone8 temp. - /// </summary> - - [Column("HEAD_ZONE8_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(16)] - - public Double HeadZone8Temp - { - get - { - return _headzone8temp; - } - - set - { - if (_headzone8temp != value) - { - _headzone8temp = value; - - OnHeadZone8TempChanged(value); - - } - } - } - - protected Double _headzone9temp; - - /// <summary> - /// Gets or sets the processparameterstablebase head zone9 temp. - /// </summary> - - [Column("HEAD_ZONE9_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(17)] - - public Double HeadZone9Temp - { - get - { - return _headzone9temp; - } - - set - { - if (_headzone9temp != value) - { - _headzone9temp = value; - - OnHeadZone9TempChanged(value); - - } - } - } - - protected Double _headzone10temp; - - /// <summary> - /// Gets or sets the processparameterstablebase head zone10 temp. - /// </summary> - - [Column("HEAD_ZONE10_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(18)] - - public Double HeadZone10Temp - { - get - { - return _headzone10temp; - } - - set - { - if (_headzone10temp != value) - { - _headzone10temp = value; - - OnHeadZone10TempChanged(value); - - } - } - } - - protected Double _headzone11temp; - - /// <summary> - /// Gets or sets the processparameterstablebase head zone11 temp. - /// </summary> - - [Column("HEAD_ZONE11_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(19)] - - public Double HeadZone11Temp - { - get - { - return _headzone11temp; - } - - set - { - if (_headzone11temp != value) - { - _headzone11temp = value; - - OnHeadZone11TempChanged(value); - - } - } - } - - protected Double _headzone12temp; - - /// <summary> - /// Gets or sets the processparameterstablebase head zone12 temp. - /// </summary> - - [Column("HEAD_ZONE12_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(20)] - - public Double HeadZone12Temp - { - get - { - return _headzone12temp; - } - - set - { - if (_headzone12temp != value) - { - _headzone12temp = value; - - OnHeadZone12TempChanged(value); - - } - } - } - - protected Double _rblowerflow; - - /// <summary> - /// Gets or sets the processparameterstablebase r blower flow. - /// </summary> - - [Column("R_BLOWER_FLOW")] - - [StringFormat("0.0")] - - [PropertyIndex(22)] - - public Double RBlowerFlow - { - get - { - return _rblowerflow; - } - - set - { - if (_rblowerflow != value) - { - _rblowerflow = value; - - OnRBlowerFlowChanged(value); - - } - } - } - - protected Double _rblowertemp; - - /// <summary> - /// Gets or sets the processparameterstablebase r blower temp. - /// </summary> - - [Column("R_BLOWER_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(22)] - - public Double RBlowerTemp - { - get - { - return _rblowertemp; - } - - set - { - if (_rblowertemp != value) - { - _rblowertemp = value; - - OnRBlowerTempChanged(value); - - } - } - } - - protected Double _lblowerflow; - - /// <summary> - /// Gets or sets the processparameterstablebase l blower flow. - /// </summary> - - [Column("L_BLOWER_FLOW")] - - [StringFormat("0.0")] - - [PropertyIndex(22)] - - public Double LBlowerFlow - { - get - { - return _lblowerflow; - } - - set - { - if (_lblowerflow != value) - { - _lblowerflow = value; - - OnLBlowerFlowChanged(value); - - } - } - } - - protected Double _lblowertemp; - - /// <summary> - /// Gets or sets the processparameterstablebase l blower temp. - /// </summary> - - [Column("L_BLOWER_TEMP")] - - [StringFormat("0.0")] - - [PropertyIndex(22)] - - public Double LBlowerTemp - { - get - { - return _lblowertemp; - } - - set - { - if (_lblowertemp != value) - { - _lblowertemp = value; - - OnLBlowerTempChanged(value); - - } - } - } - - protected Double _pressurebuildup; - - /// <summary> - /// Gets or sets the processparameterstablebase pressure build up. - /// </summary> - - [Column("PRESSURE_BUILD_UP")] - - [StringFormat("0.0")] - - [PropertyIndex(29)] - - public Double PressureBuildUp - { - get - { - return _pressurebuildup; - } - - set - { - if (_pressurebuildup != value) - { - _pressurebuildup = value; - - OnPressureBuildUpChanged(value); - - } - } - } - protected ProcessParametersTablesGroup _processparameterstablesgroup; /// <summary> @@ -1329,105 +885,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the HeadZone7Temp has changed. - /// </summary> - protected virtual void OnHeadZone7TempChanged(Double headzone7temp) - { - HeadZone7TempChanged?.Invoke(this, headzone7temp); - RaisePropertyChanged(nameof(HeadZone7Temp)); - } - - /// <summary> - /// Called when the HeadZone8Temp has changed. - /// </summary> - protected virtual void OnHeadZone8TempChanged(Double headzone8temp) - { - HeadZone8TempChanged?.Invoke(this, headzone8temp); - RaisePropertyChanged(nameof(HeadZone8Temp)); - } - - /// <summary> - /// Called when the HeadZone9Temp has changed. - /// </summary> - protected virtual void OnHeadZone9TempChanged(Double headzone9temp) - { - HeadZone9TempChanged?.Invoke(this, headzone9temp); - RaisePropertyChanged(nameof(HeadZone9Temp)); - } - - /// <summary> - /// Called when the HeadZone10Temp has changed. - /// </summary> - protected virtual void OnHeadZone10TempChanged(Double headzone10temp) - { - HeadZone10TempChanged?.Invoke(this, headzone10temp); - RaisePropertyChanged(nameof(HeadZone10Temp)); - } - - /// <summary> - /// Called when the HeadZone11Temp has changed. - /// </summary> - protected virtual void OnHeadZone11TempChanged(Double headzone11temp) - { - HeadZone11TempChanged?.Invoke(this, headzone11temp); - RaisePropertyChanged(nameof(HeadZone11Temp)); - } - - /// <summary> - /// Called when the HeadZone12Temp has changed. - /// </summary> - protected virtual void OnHeadZone12TempChanged(Double headzone12temp) - { - HeadZone12TempChanged?.Invoke(this, headzone12temp); - RaisePropertyChanged(nameof(HeadZone12Temp)); - } - - /// <summary> - /// Called when the RBlowerFlow has changed. - /// </summary> - protected virtual void OnRBlowerFlowChanged(Double rblowerflow) - { - RBlowerFlowChanged?.Invoke(this, rblowerflow); - RaisePropertyChanged(nameof(RBlowerFlow)); - } - - /// <summary> - /// Called when the RBlowerTemp has changed. - /// </summary> - protected virtual void OnRBlowerTempChanged(Double rblowertemp) - { - RBlowerTempChanged?.Invoke(this, rblowertemp); - RaisePropertyChanged(nameof(RBlowerTemp)); - } - - /// <summary> - /// Called when the LBlowerFlow has changed. - /// </summary> - protected virtual void OnLBlowerFlowChanged(Double lblowerflow) - { - LBlowerFlowChanged?.Invoke(this, lblowerflow); - RaisePropertyChanged(nameof(LBlowerFlow)); - } - - /// <summary> - /// Called when the LBlowerTemp has changed. - /// </summary> - protected virtual void OnLBlowerTempChanged(Double lblowertemp) - { - LBlowerTempChanged?.Invoke(this, lblowertemp); - RaisePropertyChanged(nameof(LBlowerTemp)); - } - - /// <summary> - /// Called when the PressureBuildUp has changed. - /// </summary> - protected virtual void OnPressureBuildUpChanged(Double pressurebuildup) - { - PressureBuildUpChanged?.Invoke(this, pressurebuildup); - RaisePropertyChanged(nameof(PressureBuildUp)); - } - - /// <summary> /// Called when the ProcessParametersTablesGroup has changed. /// </summary> protected virtual void OnProcessParametersTablesGroupChanged(ProcessParametersTablesGroup processparameterstablesgroup) diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs index 005dd5b40..79e252b44 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProject.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProject.cs deleted file mode 100644 index 6812d5cd5..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProject.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Enumerations; - -namespace Tango.BL.Entities -{ - public class PublishedProcedureProject : PublishedProcedureProjectBase - { - [NotMapped] - [JsonIgnore] - public PublishedProcedureProjectsVersion CurrentVersion - { - get - { - return PublishedProcedureProjectsVersions.OrderBy(x => x.Version).LastOrDefault(); - } - } - - [NotMapped] - [JsonIgnore] - public PublishedProcedureProjectVisibilities ProjectVisibility - { - get { return (PublishedProcedureProjectVisibilities)Visibility; } - set { Visibility = value.ToInt32(); } - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectBase.cs deleted file mode 100644 index b8792444d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectBase.cs +++ /dev/null @@ -1,305 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("PUBLISHED_PROCEDURE_PROJECTS")] - public abstract class PublishedProcedureProjectBase : ObservableEntity<PublishedProcedureProject> - { - - public event EventHandler<String> NameChanged; - - public event EventHandler<String> DescriptionChanged; - - public event EventHandler<DateTime> PublishDateChanged; - - public event EventHandler<Int32> SortingIndexChanged; - - public event EventHandler<Boolean> IsVisibleChanged; - - public event EventHandler<Int32> VisibilityChanged; - - public event EventHandler<SynchronizedObservableCollection<PublishedProcedureProjectsVersion>> PublishedProcedureProjectsVersionsChanged; - - protected String _name; - - /// <summary> - /// Gets or sets the publishedprocedureprojectbase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// <summary> - /// Gets or sets the publishedprocedureprojectbase description. - /// </summary> - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected DateTime _publishdate; - - /// <summary> - /// Gets or sets the publishedprocedureprojectbase publish date. - /// </summary> - - [Column("PUBLISH_DATE")] - - public DateTime PublishDate - { - get - { - return _publishdate; - } - - set - { - if (_publishdate != value) - { - _publishdate = value; - - OnPublishDateChanged(value); - - } - } - } - - protected Int32 _sortingindex; - - /// <summary> - /// Gets or sets the publishedprocedureprojectbase sorting index. - /// </summary> - - [Column("SORTING_INDEX")] - - public Int32 SortingIndex - { - get - { - return _sortingindex; - } - - set - { - if (_sortingindex != value) - { - _sortingindex = value; - - OnSortingIndexChanged(value); - - } - } - } - - protected Boolean _isvisible; - - /// <summary> - /// Gets or sets the publishedprocedureprojectbase is visible. - /// </summary> - - [Column("IS_VISIBLE")] - - public Boolean IsVisible - { - get - { - return _isvisible; - } - - set - { - if (_isvisible != value) - { - _isvisible = value; - - OnIsVisibleChanged(value); - - } - } - } - - protected Int32 _visibility; - - /// <summary> - /// 0 - Public - /// 1 - Internal - /// </summary> - - [Column("VISIBILITY")] - - public Int32 Visibility - { - get - { - return _visibility; - } - - set - { - if (_visibility != value) - { - _visibility = value; - - OnVisibilityChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<PublishedProcedureProjectsVersion> _publishedprocedureprojectsversions; - - /// <summary> - /// Gets or sets the publishedprocedureprojectbase published procedure projects versions. - /// </summary> - - public virtual SynchronizedObservableCollection<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions - { - get - { - return _publishedprocedureprojectsversions; - } - - set - { - if (_publishedprocedureprojectsversions != value) - { - _publishedprocedureprojectsversions = value; - - OnPublishedProcedureProjectsVersionsChanged(value); - - } - } - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the Description has changed. - /// </summary> - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// <summary> - /// Called when the PublishDate has changed. - /// </summary> - protected virtual void OnPublishDateChanged(DateTime publishdate) - { - PublishDateChanged?.Invoke(this, publishdate); - RaisePropertyChanged(nameof(PublishDate)); - } - - /// <summary> - /// Called when the SortingIndex has changed. - /// </summary> - protected virtual void OnSortingIndexChanged(Int32 sortingindex) - { - SortingIndexChanged?.Invoke(this, sortingindex); - RaisePropertyChanged(nameof(SortingIndex)); - } - - /// <summary> - /// Called when the IsVisible has changed. - /// </summary> - protected virtual void OnIsVisibleChanged(Boolean isvisible) - { - IsVisibleChanged?.Invoke(this, isvisible); - RaisePropertyChanged(nameof(IsVisible)); - } - - /// <summary> - /// Called when the Visibility has changed. - /// </summary> - protected virtual void OnVisibilityChanged(Int32 visibility) - { - VisibilityChanged?.Invoke(this, visibility); - RaisePropertyChanged(nameof(Visibility)); - } - - /// <summary> - /// Called when the PublishedProcedureProjectsVersions has changed. - /// </summary> - protected virtual void OnPublishedProcedureProjectsVersionsChanged(SynchronizedObservableCollection<PublishedProcedureProjectsVersion> publishedprocedureprojectsversions) - { - PublishedProcedureProjectsVersionsChanged?.Invoke(this, publishedprocedureprojectsversions); - RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="PublishedProcedureProjectBase" /> class. - /// </summary> - public PublishedProcedureProjectBase() : base() - { - - PublishedProcedureProjectsVersions = new SynchronizedObservableCollection<PublishedProcedureProjectsVersion>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersion.cs deleted file mode 100644 index d9774f2bc..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersion.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class PublishedProcedureProjectsVersion : PublishedProcedureProjectsVersionBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersionBase.cs deleted file mode 100644 index 730ea9758..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/PublishedProcedureProjectsVersionBase.cs +++ /dev/null @@ -1,220 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("PUBLISHED_PROCEDURE_PROJECTS_VERSIONS")] - public abstract class PublishedProcedureProjectsVersionBase : ObservableEntity<PublishedProcedureProjectsVersion> - { - - public event EventHandler<Int32> VersionChanged; - - public event EventHandler<String> AuthorChanged; - - public event EventHandler<String> ProjectJsonStringChanged; - - public event EventHandler<PublishedProcedureProject> PublishedProcedureProjectChanged; - - protected String _publishedprocedureprojectguid; - - /// <summary> - /// Gets or sets the publishedprocedureprojectsversionbase published procedure project guid. - /// </summary> - - [Column("PUBLISHED_PROCEDURE_PROJECT_GUID")] - [ForeignKey("PublishedProcedureProject")] - - public String PublishedProcedureProjectGuid - { - get - { - return _publishedprocedureprojectguid; - } - - set - { - if (_publishedprocedureprojectguid != value) - { - _publishedprocedureprojectguid = value; - - } - } - } - - protected Int32 _version; - - /// <summary> - /// Gets or sets the publishedprocedureprojectsversionbase version. - /// </summary> - - [Column("VERSION")] - - public Int32 Version - { - get - { - return _version; - } - - set - { - if (_version != value) - { - _version = value; - - OnVersionChanged(value); - - } - } - } - - protected String _author; - - /// <summary> - /// Gets or sets the publishedprocedureprojectsversionbase author. - /// </summary> - - [Column("AUTHOR")] - - public String Author - { - get - { - return _author; - } - - set - { - if (_author != value) - { - _author = value; - - OnAuthorChanged(value); - - } - } - } - - protected String _projectjsonstring; - - /// <summary> - /// Gets or sets the publishedprocedureprojectsversionbase project json string. - /// </summary> - - [Column("PROJECT_JSON_STRING")] - - public String ProjectJsonString - { - get - { - return _projectjsonstring; - } - - set - { - if (_projectjsonstring != value) - { - _projectjsonstring = value; - - OnProjectJsonStringChanged(value); - - } - } - } - - protected PublishedProcedureProject _publishedprocedureproject; - - /// <summary> - /// Gets or sets the publishedprocedureprojectsversionbase published procedure projects. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual PublishedProcedureProject PublishedProcedureProject - { - get - { - return _publishedprocedureproject; - } - - set - { - if (_publishedprocedureproject != value) - { - _publishedprocedureproject = value; - - if (PublishedProcedureProject != null) - { - PublishedProcedureProjectGuid = PublishedProcedureProject.Guid; - } - - OnPublishedProcedureProjectChanged(value); - - } - } - } - - /// <summary> - /// Called when the Version has changed. - /// </summary> - protected virtual void OnVersionChanged(Int32 version) - { - VersionChanged?.Invoke(this, version); - RaisePropertyChanged(nameof(Version)); - } - - /// <summary> - /// Called when the Author has changed. - /// </summary> - protected virtual void OnAuthorChanged(String author) - { - AuthorChanged?.Invoke(this, author); - RaisePropertyChanged(nameof(Author)); - } - - /// <summary> - /// Called when the ProjectJsonString has changed. - /// </summary> - protected virtual void OnProjectJsonStringChanged(String projectjsonstring) - { - ProjectJsonStringChanged?.Invoke(this, projectjsonstring); - RaisePropertyChanged(nameof(ProjectJsonString)); - } - - /// <summary> - /// Called when the PublishedProcedureProject has changed. - /// </summary> - protected virtual void OnPublishedProcedureProjectChanged(PublishedProcedureProject publishedprocedureproject) - { - PublishedProcedureProjectChanged?.Invoke(this, publishedprocedureproject); - RaisePropertyChanged(nameof(PublishedProcedureProject)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="PublishedProcedureProjectsVersionBase" /> class. - /// </summary> - public PublishedProcedureProjectsVersionBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs index 679226fd2..b9224a6d6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs @@ -1,14 +1,11 @@ using ColorMine.ColorSpaces; -using Newtonsoft.Json; using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Media; using Tango.BL.Builders; -using Tango.BL.Enumerations; using Tango.BL.Serialization; namespace Tango.BL.Entities @@ -48,8 +45,6 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Color)); } - [NotMapped] - [JsonIgnore] public Color Color { get @@ -60,40 +55,6 @@ namespace Tango.BL.Entities } } - /// <summary> - /// Gets or sets the thread head type. - /// </summary> - [NotMapped] - [JsonIgnore] - public HeadTypes RmlHeadType - { - get - { - return (HeadTypes)HeadType; - } - set - { - HeadType = value.ToInt32(); - } - } - - /// <summary> - /// Gets or sets the thread qualification level. - /// </summary> - [NotMapped] - [JsonIgnore] - public RmlQualifications RmlQualificationLevel - { - get - { - return (RmlQualifications)QualificationLevel; - } - set - { - QualificationLevel = value.ToInt32(); - } - } - public ProcessParametersTablesGroup GetActiveProcessGroup() { return ProcessParametersTablesGroups.FirstOrDefault(x => x.Active); @@ -103,13 +64,12 @@ namespace Tango.BL.Entities { return Task.Factory.StartNew<String>(() => { - var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().WithSpools().Build(); + var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().Build(); String result = rml.ToJson(new EntitySerializationStrategy() .Include(() => rml.Cct) .Include(() => rml.LiquidTypesRmls) .Include(() => rml.ProcessParametersTablesGroups) - .Include(() => rml.RmlsSpools) .Include(typeof(ProcessParametersTablesGroup).GetProperty(nameof(ProcessParametersTablesGroup.ProcessParametersTables))), EntitySerializationFlags.IgnoreCollections | EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented); diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 8958884a2..853372bba 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -29,8 +28,6 @@ namespace Tango.BL.Entities public event EventHandler<String> NameChanged; - public event EventHandler<String> DisplayNameChanged; - public event EventHandler<String> ManufacturerChanged; public event EventHandler<Int32> CodeChanged; @@ -67,40 +64,6 @@ namespace Tango.BL.Entities public event EventHandler<Int32> ColorConversionVersionChanged; - public event EventHandler<Boolean> UseColorLibGradientsChanged; - - public event EventHandler<Int32> HeadTypeChanged; - - public event EventHandler<Int32> QualificationLevelChanged; - - public event EventHandler<Nullable<DateTime>> QualificationDateChanged; - - public event EventHandler<String> SpoolsCalibrationsStringChanged; - - public event EventHandler<Int32> FeederPChanged; - - public event EventHandler<Int32> FeederIChanged; - - public event EventHandler<Int32> FeederDChanged; - - public event EventHandler<Int32> PullerPChanged; - - public event EventHandler<Int32> PullerIChanged; - - public event EventHandler<Int32> PullerDChanged; - - public event EventHandler<Int32> WinderPChanged; - - public event EventHandler<Int32> WinderIChanged; - - public event EventHandler<Int32> WinderDChanged; - - public event EventHandler<Boolean> BypassRockersChanged; - - public event EventHandler<Int32> CleanerFlowChanged; - - public event EventHandler<Double> ArcHeadCleaningMotorSpeedChanged; - public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; public event EventHandler<Cct> CctChanged; @@ -117,6 +80,8 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<LiquidTypesRml>> LiquidTypesRmlsChanged; + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; + public event EventHandler<MediaCondition> MediaConditionChanged; public event EventHandler<MediaMaterial> MediaMaterialChanged; @@ -125,10 +90,6 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<ProcessParametersTablesGroup>> ProcessParametersTablesGroupsChanged; - public event EventHandler<SynchronizedObservableCollection<RmlsSpool>> RmlsSpoolsChanged; - - public event EventHandler<SynchronizedObservableCollection<SitesRml>> SitesRmlsChanged; - protected String _name; /// <summary> @@ -156,33 +117,6 @@ namespace Tango.BL.Entities } } - protected String _displayname; - - /// <summary> - /// Gets or sets the rmlbase display name. - /// </summary> - - [Column("DISPLAY_NAME")] - - public String DisplayName - { - get - { - return _displayname; - } - - set - { - if (_displayname != value) - { - _displayname = value; - - OnDisplayNameChanged(value); - - } - } - } - protected String _manufacturer; /// <summary> @@ -851,465 +785,6 @@ namespace Tango.BL.Entities } } - protected Boolean _usecolorlibgradients; - - /// <summary> - /// Gets or sets the rmlbase use color lib gradients. - /// </summary> - - [Column("USE_COLOR_LIB_GRADIENTS")] - - public Boolean UseColorLibGradients - { - get - { - return _usecolorlibgradients; - } - - set - { - if (_usecolorlibgradients != value) - { - _usecolorlibgradients = value; - - OnUseColorLibGradientsChanged(value); - - } - } - } - - protected Int32 _headtype; - - /// <summary> - /// Gets or sets the rmlbase head type. - /// </summary> - - [Column("HEAD_TYPE")] - - public Int32 HeadType - { - get - { - return _headtype; - } - - set - { - if (_headtype != value) - { - _headtype = value; - - OnHeadTypeChanged(value); - - } - } - } - - protected Int32 _qualificationlevel; - - /// <summary> - /// Gets or sets the rmlbase qualification level. - /// </summary> - - [Column("QUALIFICATION_LEVEL")] - - public Int32 QualificationLevel - { - get - { - return _qualificationlevel; - } - - set - { - if (_qualificationlevel != value) - { - _qualificationlevel = value; - - OnQualificationLevelChanged(value); - - } - } - } - - protected Nullable<DateTime> _qualificationdate; - - /// <summary> - /// Gets or sets the rmlbase qualification date. - /// </summary> - - [Column("QUALIFICATION_DATE")] - - public Nullable<DateTime> QualificationDate - { - get - { - return _qualificationdate; - } - - set - { - if (_qualificationdate != value) - { - _qualificationdate = value; - - OnQualificationDateChanged(value); - - } - } - } - - protected String _spoolscalibrationsstring; - - /// <summary> - /// Gets or sets the rmlbase spools calibrations string. - /// </summary> - - [Column("SPOOLS_CALIBRATIONS_STRING")] - - public String SpoolsCalibrationsString - { - get - { - return _spoolscalibrationsstring; - } - - set - { - if (_spoolscalibrationsstring != value) - { - _spoolscalibrationsstring = value; - - OnSpoolsCalibrationsStringChanged(value); - - } - } - } - - protected Int32 _feederp; - - /// <summary> - /// Gets or sets the rmlbase feeder p. - /// </summary> - - [Column("FEEDER_P")] - - public Int32 FeederP - { - get - { - return _feederp; - } - - set - { - if (_feederp != value) - { - _feederp = value; - - OnFeederPChanged(value); - - } - } - } - - protected Int32 _feederi; - - /// <summary> - /// Gets or sets the rmlbase feeder i. - /// </summary> - - [Column("FEEDER_I")] - - public Int32 FeederI - { - get - { - return _feederi; - } - - set - { - if (_feederi != value) - { - _feederi = value; - - OnFeederIChanged(value); - - } - } - } - - protected Int32 _feederd; - - /// <summary> - /// Gets or sets the rmlbase feeder d. - /// </summary> - - [Column("FEEDER_D")] - - public Int32 FeederD - { - get - { - return _feederd; - } - - set - { - if (_feederd != value) - { - _feederd = value; - - OnFeederDChanged(value); - - } - } - } - - protected Int32 _pullerp; - - /// <summary> - /// Gets or sets the rmlbase puller p. - /// </summary> - - [Column("PULLER_P")] - - public Int32 PullerP - { - get - { - return _pullerp; - } - - set - { - if (_pullerp != value) - { - _pullerp = value; - - OnPullerPChanged(value); - - } - } - } - - protected Int32 _pulleri; - - /// <summary> - /// Gets or sets the rmlbase puller i. - /// </summary> - - [Column("PULLER_I")] - - public Int32 PullerI - { - get - { - return _pulleri; - } - - set - { - if (_pulleri != value) - { - _pulleri = value; - - OnPullerIChanged(value); - - } - } - } - - protected Int32 _pullerd; - - /// <summary> - /// Gets or sets the rmlbase puller d. - /// </summary> - - [Column("PULLER_D")] - - public Int32 PullerD - { - get - { - return _pullerd; - } - - set - { - if (_pullerd != value) - { - _pullerd = value; - - OnPullerDChanged(value); - - } - } - } - - protected Int32 _winderp; - - /// <summary> - /// Gets or sets the rmlbase winder p. - /// </summary> - - [Column("WINDER_P")] - - public Int32 WinderP - { - get - { - return _winderp; - } - - set - { - if (_winderp != value) - { - _winderp = value; - - OnWinderPChanged(value); - - } - } - } - - protected Int32 _winderi; - - /// <summary> - /// Gets or sets the rmlbase winder i. - /// </summary> - - [Column("WINDER_I")] - - public Int32 WinderI - { - get - { - return _winderi; - } - - set - { - if (_winderi != value) - { - _winderi = value; - - OnWinderIChanged(value); - - } - } - } - - protected Int32 _winderd; - - /// <summary> - /// Gets or sets the rmlbase winder d. - /// </summary> - - [Column("WINDER_D")] - - public Int32 WinderD - { - get - { - return _winderd; - } - - set - { - if (_winderd != value) - { - _winderd = value; - - OnWinderDChanged(value); - - } - } - } - - protected Boolean _bypassrockers; - - /// <summary> - /// Gets or sets the rmlbase bypass rockers. - /// </summary> - - [Column("BYPASS_ROCKERS")] - - public Boolean BypassRockers - { - get - { - return _bypassrockers; - } - - set - { - if (_bypassrockers != value) - { - _bypassrockers = value; - - OnBypassRockersChanged(value); - - } - } - } - - protected Int32 _cleanerflow; - - /// <summary> - /// Gets or sets the rmlbase cleaner flow. - /// </summary> - - [Column("CLEANER_FLOW")] - - public Int32 CleanerFlow - { - get - { - return _cleanerflow; - } - - set - { - if (_cleanerflow != value) - { - _cleanerflow = value; - - OnCleanerFlowChanged(value); - - } - } - } - - protected Double _archeadcleaningmotorspeed; - - /// <summary> - /// Gets or sets the rmlbase arc head cleaning motor speed. - /// </summary> - - [Column("ARC_HEAD_CLEANING_MOTOR_SPEED")] - - public Double ArcHeadCleaningMotorSpeed - { - get - { - return _archeadcleaningmotorspeed; - } - - set - { - if (_archeadcleaningmotorspeed != value) - { - _archeadcleaningmotorspeed = value; - - OnArcHeadCleaningMotorSpeedChanged(value); - - } - } - } - protected SynchronizedObservableCollection<Cat> _cats; /// <summary> @@ -1538,6 +1013,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection<Machine> _machines; + + /// <summary> + /// Gets or sets the rmlbase machines. + /// </summary> + + public virtual SynchronizedObservableCollection<Machine> Machines + { + get + { + return _machines; + } + + set + { + if (_machines != value) + { + _machines = value; + + OnMachinesChanged(value); + + } + } + } + protected MediaCondition _mediacondition; /// <summary> @@ -1659,56 +1159,6 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<RmlsSpool> _rmlsspools; - - /// <summary> - /// Gets or sets the rmlbase rmls spools. - /// </summary> - - public virtual SynchronizedObservableCollection<RmlsSpool> RmlsSpools - { - get - { - return _rmlsspools; - } - - set - { - if (_rmlsspools != value) - { - _rmlsspools = value; - - OnRmlsSpoolsChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<SitesRml> _sitesrmls; - - /// <summary> - /// Gets or sets the rmlbase sites rmls. - /// </summary> - - public virtual SynchronizedObservableCollection<SitesRml> SitesRmls - { - get - { - return _sitesrmls; - } - - set - { - if (_sitesrmls != value) - { - _sitesrmls = value; - - OnSitesRmlsChanged(value); - - } - } - } - /// <summary> /// Called when the Name has changed. /// </summary> @@ -1719,15 +1169,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the DisplayName has changed. - /// </summary> - protected virtual void OnDisplayNameChanged(String displayname) - { - DisplayNameChanged?.Invoke(this, displayname); - RaisePropertyChanged(nameof(DisplayName)); - } - - /// <summary> /// Called when the Manufacturer has changed. /// </summary> protected virtual void OnManufacturerChanged(String manufacturer) @@ -1890,159 +1331,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the UseColorLibGradients has changed. - /// </summary> - protected virtual void OnUseColorLibGradientsChanged(Boolean usecolorlibgradients) - { - UseColorLibGradientsChanged?.Invoke(this, usecolorlibgradients); - RaisePropertyChanged(nameof(UseColorLibGradients)); - } - - /// <summary> - /// Called when the HeadType has changed. - /// </summary> - protected virtual void OnHeadTypeChanged(Int32 headtype) - { - HeadTypeChanged?.Invoke(this, headtype); - RaisePropertyChanged(nameof(HeadType)); - } - - /// <summary> - /// Called when the QualificationLevel has changed. - /// </summary> - protected virtual void OnQualificationLevelChanged(Int32 qualificationlevel) - { - QualificationLevelChanged?.Invoke(this, qualificationlevel); - RaisePropertyChanged(nameof(QualificationLevel)); - } - - /// <summary> - /// Called when the QualificationDate has changed. - /// </summary> - protected virtual void OnQualificationDateChanged(Nullable<DateTime> qualificationdate) - { - QualificationDateChanged?.Invoke(this, qualificationdate); - RaisePropertyChanged(nameof(QualificationDate)); - } - - /// <summary> - /// Called when the SpoolsCalibrationsString has changed. - /// </summary> - protected virtual void OnSpoolsCalibrationsStringChanged(String spoolscalibrationsstring) - { - SpoolsCalibrationsStringChanged?.Invoke(this, spoolscalibrationsstring); - RaisePropertyChanged(nameof(SpoolsCalibrationsString)); - } - - /// <summary> - /// Called when the FeederP has changed. - /// </summary> - protected virtual void OnFeederPChanged(Int32 feederp) - { - FeederPChanged?.Invoke(this, feederp); - RaisePropertyChanged(nameof(FeederP)); - } - - /// <summary> - /// Called when the FeederI has changed. - /// </summary> - protected virtual void OnFeederIChanged(Int32 feederi) - { - FeederIChanged?.Invoke(this, feederi); - RaisePropertyChanged(nameof(FeederI)); - } - - /// <summary> - /// Called when the FeederD has changed. - /// </summary> - protected virtual void OnFeederDChanged(Int32 feederd) - { - FeederDChanged?.Invoke(this, feederd); - RaisePropertyChanged(nameof(FeederD)); - } - - /// <summary> - /// Called when the PullerP has changed. - /// </summary> - protected virtual void OnPullerPChanged(Int32 pullerp) - { - PullerPChanged?.Invoke(this, pullerp); - RaisePropertyChanged(nameof(PullerP)); - } - - /// <summary> - /// Called when the PullerI has changed. - /// </summary> - protected virtual void OnPullerIChanged(Int32 pulleri) - { - PullerIChanged?.Invoke(this, pulleri); - RaisePropertyChanged(nameof(PullerI)); - } - - /// <summary> - /// Called when the PullerD has changed. - /// </summary> - protected virtual void OnPullerDChanged(Int32 pullerd) - { - PullerDChanged?.Invoke(this, pullerd); - RaisePropertyChanged(nameof(PullerD)); - } - - /// <summary> - /// Called when the WinderP has changed. - /// </summary> - protected virtual void OnWinderPChanged(Int32 winderp) - { - WinderPChanged?.Invoke(this, winderp); - RaisePropertyChanged(nameof(WinderP)); - } - - /// <summary> - /// Called when the WinderI has changed. - /// </summary> - protected virtual void OnWinderIChanged(Int32 winderi) - { - WinderIChanged?.Invoke(this, winderi); - RaisePropertyChanged(nameof(WinderI)); - } - - /// <summary> - /// Called when the WinderD has changed. - /// </summary> - protected virtual void OnWinderDChanged(Int32 winderd) - { - WinderDChanged?.Invoke(this, winderd); - RaisePropertyChanged(nameof(WinderD)); - } - - /// <summary> - /// Called when the BypassRockers has changed. - /// </summary> - protected virtual void OnBypassRockersChanged(Boolean bypassrockers) - { - BypassRockersChanged?.Invoke(this, bypassrockers); - RaisePropertyChanged(nameof(BypassRockers)); - } - - /// <summary> - /// Called when the CleanerFlow has changed. - /// </summary> - protected virtual void OnCleanerFlowChanged(Int32 cleanerflow) - { - CleanerFlowChanged?.Invoke(this, cleanerflow); - RaisePropertyChanged(nameof(CleanerFlow)); - } - - /// <summary> - /// Called when the ArcHeadCleaningMotorSpeed has changed. - /// </summary> - protected virtual void OnArcHeadCleaningMotorSpeedChanged(Double archeadcleaningmotorspeed) - { - ArcHeadCleaningMotorSpeedChanged?.Invoke(this, archeadcleaningmotorspeed); - RaisePropertyChanged(nameof(ArcHeadCleaningMotorSpeed)); - } - - /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) @@ -2115,6 +1403,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the Machines has changed. + /// </summary> + protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines) + { + MachinesChanged?.Invoke(this, machines); + RaisePropertyChanged(nameof(Machines)); + } + + /// <summary> /// Called when the MediaCondition has changed. /// </summary> protected virtual void OnMediaConditionChanged(MediaCondition mediacondition) @@ -2151,24 +1448,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the RmlsSpools has changed. - /// </summary> - protected virtual void OnRmlsSpoolsChanged(SynchronizedObservableCollection<RmlsSpool> rmlsspools) - { - RmlsSpoolsChanged?.Invoke(this, rmlsspools); - RaisePropertyChanged(nameof(RmlsSpools)); - } - - /// <summary> - /// Called when the SitesRmls has changed. - /// </summary> - protected virtual void OnSitesRmlsChanged(SynchronizedObservableCollection<SitesRml> sitesrmls) - { - SitesRmlsChanged?.Invoke(this, sitesrmls); - RaisePropertyChanged(nameof(SitesRmls)); - } - - /// <summary> /// Initializes a new instance of the <see cref="RmlBase" /> class. /// </summary> public RmlBase() : base() @@ -2182,11 +1461,9 @@ namespace Tango.BL.Entities LiquidTypesRmls = new SynchronizedObservableCollection<LiquidTypesRml>(); - ProcessParametersTablesGroups = new SynchronizedObservableCollection<ProcessParametersTablesGroup>(); - - RmlsSpools = new SynchronizedObservableCollection<RmlsSpool>(); + Machines = new SynchronizedObservableCollection<Machine>(); - SitesRmls = new SynchronizedObservableCollection<SitesRml>(); + ProcessParametersTablesGroups = new SynchronizedObservableCollection<ProcessParametersTablesGroup>(); } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpool.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpool.cs deleted file mode 100644 index 633180541..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpool.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class RmlsSpool : RmlsSpoolBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs deleted file mode 100644 index fee4ef6b4..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs +++ /dev/null @@ -1,327 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("RMLS_SPOOLS")] - public abstract class RmlsSpoolBase : ObservableEntity<RmlsSpool> - { - - public event EventHandler<Nullable<Double>> RotationsPerPassageChanged; - - public event EventHandler<Nullable<Double>> LengthChanged; - - public event EventHandler<Nullable<Int32>> BackingRateChanged; - - public event EventHandler<Nullable<Int32>> BottomBackingRateChanged; - - public event EventHandler<Rml> RmlChanged; - - public event EventHandler<SpoolType> SpoolTypeChanged; - - protected String _spooltypeguid; - - /// <summary> - /// Gets or sets the rmlsspoolbase spool type guid. - /// </summary> - - [Column("SPOOL_TYPE_GUID")] - [ForeignKey("SpoolType")] - - public String SpoolTypeGuid - { - get - { - return _spooltypeguid; - } - - set - { - if (_spooltypeguid != value) - { - _spooltypeguid = value; - - } - } - } - - protected String _rmlguid; - - /// <summary> - /// Gets or sets the rmlsspoolbase rml guid. - /// </summary> - - [Column("RML_GUID")] - [ForeignKey("Rml")] - - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - if (_rmlguid != value) - { - _rmlguid = value; - - } - } - } - - protected Nullable<Double> _rotationsperpassage; - - /// <summary> - /// Gets or sets the rmlsspoolbase rotations per passage. - /// </summary> - - [Column("ROTATIONS_PER_PASSAGE")] - - public Nullable<Double> RotationsPerPassage - { - get - { - return _rotationsperpassage; - } - - set - { - if (_rotationsperpassage != value) - { - _rotationsperpassage = value; - - OnRotationsPerPassageChanged(value); - - } - } - } - - protected Nullable<Double> _length; - - /// <summary> - /// Gets or sets the rmlsspoolbase length. - /// </summary> - - [Column("LENGTH")] - - public Nullable<Double> Length - { - get - { - return _length; - } - - set - { - if (_length != value) - { - _length = value; - - OnLengthChanged(value); - - } - } - } - - protected Nullable<Int32> _backingrate; - - /// <summary> - /// Gets or sets the rmlsspoolbase backing rate. - /// </summary> - - [Column("BACKING_RATE")] - - public Nullable<Int32> BackingRate - { - get - { - return _backingrate; - } - - set - { - if (_backingrate != value) - { - _backingrate = value; - - OnBackingRateChanged(value); - - } - } - } - - protected Nullable<Int32> _bottombackingrate; - - /// <summary> - /// Gets or sets the rmlsspoolbase bottom backing rate. - /// </summary> - - [Column("BOTTOM_BACKING_RATE")] - - public Nullable<Int32> BottomBackingRate - { - get - { - return _bottombackingrate; - } - - set - { - if (_bottombackingrate != value) - { - _bottombackingrate = value; - - OnBottomBackingRateChanged(value); - - } - } - } - - protected Rml _rml; - - /// <summary> - /// Gets or sets the rmlsspoolbase rml. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - if (_rml != value) - { - _rml = value; - - if (Rml != null) - { - RmlGuid = Rml.Guid; - } - - OnRmlChanged(value); - - } - } - } - - protected SpoolType _spooltype; - - /// <summary> - /// Gets or sets the rmlsspoolbase spool types. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual SpoolType SpoolType - { - get - { - return _spooltype; - } - - set - { - if (_spooltype != value) - { - _spooltype = value; - - if (SpoolType != null) - { - SpoolTypeGuid = SpoolType.Guid; - } - - OnSpoolTypeChanged(value); - - } - } - } - - /// <summary> - /// Called when the RotationsPerPassage has changed. - /// </summary> - protected virtual void OnRotationsPerPassageChanged(Nullable<Double> rotationsperpassage) - { - RotationsPerPassageChanged?.Invoke(this, rotationsperpassage); - RaisePropertyChanged(nameof(RotationsPerPassage)); - } - - /// <summary> - /// Called when the Length has changed. - /// </summary> - protected virtual void OnLengthChanged(Nullable<Double> length) - { - LengthChanged?.Invoke(this, length); - RaisePropertyChanged(nameof(Length)); - } - - /// <summary> - /// Called when the BackingRate has changed. - /// </summary> - protected virtual void OnBackingRateChanged(Nullable<Int32> backingrate) - { - BackingRateChanged?.Invoke(this, backingrate); - RaisePropertyChanged(nameof(BackingRate)); - } - - /// <summary> - /// Called when the BottomBackingRate has changed. - /// </summary> - protected virtual void OnBottomBackingRateChanged(Nullable<Int32> bottombackingrate) - { - BottomBackingRateChanged?.Invoke(this, bottombackingrate); - RaisePropertyChanged(nameof(BottomBackingRate)); - } - - /// <summary> - /// Called when the Rml has changed. - /// </summary> - protected virtual void OnRmlChanged(Rml rml) - { - RmlChanged?.Invoke(this, rml); - RaisePropertyChanged(nameof(Rml)); - } - - /// <summary> - /// Called when the SpoolType has changed. - /// </summary> - protected virtual void OnSpoolTypeChanged(SpoolType spooltype) - { - SpoolTypeChanged?.Invoke(this, spooltype); - RaisePropertyChanged(nameof(SpoolType)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="RmlsSpoolBase" /> class. - /// </summary> - public RmlsSpoolBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Role.cs b/Software/Visual_Studio/Tango.BL/Entities/Role.cs index 3e5ee6076..1108d6de3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Role.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Role.cs @@ -1,11 +1,8 @@ -using Newtonsoft.Json; using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Enumerations; namespace Tango.BL.Entities { @@ -18,18 +15,5 @@ namespace Tango.BL.Entities { } - - [JsonIgnore] - [NotMapped] - public Roles RoleEnum - { - get { return (Roles)Code; } - set { Code = (int)value; } - } - - public override string ToString() - { - return Name; - } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs index ed8d67233..cca6b7600 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs index 6fa2adf77..bdaaaac3c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs index bcdfcccc4..56d863299 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs @@ -228,7 +228,7 @@ namespace Tango.BL.Entities foreach (var stop in BrushStops.ToList().OrderBy(x => x.StopIndex).ToList()) { - stops.Add(new GradientStop(stop.IsTransparent ? Colors.Transparent : stop.Color, stop.OffsetPercent / 100d)); + stops.Add(new GradientStop(stop.Color, stop.OffsetPercent / 100d)); } LinearGradientBrush brush = new LinearGradientBrush(); @@ -244,7 +244,7 @@ namespace Tango.BL.Entities { for (int i = 0; i < BrushStops.Count; i++) { - _brush.GradientStops[i].Color = BrushStops[i].IsTransparent ? Colors.Transparent : BrushStops[i].Color; + _brush.GradientStops[i].Color = BrushStops[i].Color; _brush.GradientStops[i].Offset = BrushStops[i].OffsetPercent / 100d; } @@ -298,16 +298,6 @@ namespace Tango.BL.Entities stop.Segment = this; stop.Color = Colors.White; - if (stop.ColorSpace != null) - { - if (stop.BrushColorSpace == Enumerations.ColorSpaces.LAB) - { - stop.L = 100; - stop.A = 0; - stop.B = 0; - } - } - BrushStops.Add(stop); return stop; diff --git a/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs index f98239bf3..40f86a34c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/Site.cs b/Software/Visual_Studio/Tango.BL/Entities/Site.cs deleted file mode 100644 index 6e95aa39d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/Site.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class Site : SiteBase - { - public override void Delete(ObservablesContext context) - { - base.Delete(context); - - var site_rmls = context.SitesRmls.Where(x => x.SiteGuid == Guid).ToList(); - var site_catalogs = context.SitesCatalogs.Where(x => x.SiteGuid == Guid).ToList(); - context.SitesRmls.RemoveRange(site_rmls); - context.SitesCatalogs.RemoveRange(site_catalogs); - context.Machines.Where(x => x.SiteGuid == Guid).ToList().ForEach(x => x.SiteGuid = null); - context.Sites.Remove(this); - } - - protected override void OnValidating(ObservablesContext context) - { - base.OnValidating(context); - - if (String.IsNullOrWhiteSpace(Name)) - { - InsertError(nameof(Name), "Site name is required"); - } - - if (Name != null && Name.Length > 100) - { - InsertError(nameof(Name), "The site name exceeds the maximum allowed characters."); - } - - if (Description != null && Description.Length > 200) - { - InsertError(nameof(Description), "The site description exceeds the maximum allowed characters."); - } - - if (OrganizationGuid == null) - { - InsertError(nameof(OrganizationGuid), "Site organization is required."); - } - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs deleted file mode 100644 index 071dd7ea9..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs +++ /dev/null @@ -1,259 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("SITES")] - public abstract class SiteBase : ObservableEntity<Site> - { - - public event EventHandler<String> NameChanged; - - public event EventHandler<String> DescriptionChanged; - - public event EventHandler<Organization> OrganizationChanged; - - public event EventHandler<SynchronizedObservableCollection<SitesCatalog>> SitesCatalogsChanged; - - public event EventHandler<SynchronizedObservableCollection<SitesRml>> SitesRmlsChanged; - - protected String _organizationguid; - - /// <summary> - /// Gets or sets the sitebase organization guid. - /// </summary> - - [Column("ORGANIZATION_GUID")] - [ForeignKey("Organization")] - - public String OrganizationGuid - { - get - { - return _organizationguid; - } - - set - { - if (_organizationguid != value) - { - _organizationguid = value; - - } - } - } - - protected String _name; - - /// <summary> - /// Gets or sets the sitebase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// <summary> - /// Gets or sets the sitebase description. - /// </summary> - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected Organization _organization; - - /// <summary> - /// Gets or sets the sitebase organization. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual Organization Organization - { - get - { - return _organization; - } - - set - { - if (_organization != value) - { - _organization = value; - - if (Organization != null) - { - OrganizationGuid = Organization.Guid; - } - - OnOrganizationChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<SitesCatalog> _sitescatalogs; - - /// <summary> - /// Gets or sets the sitebase sites catalogs. - /// </summary> - - public virtual SynchronizedObservableCollection<SitesCatalog> SitesCatalogs - { - get - { - return _sitescatalogs; - } - - set - { - if (_sitescatalogs != value) - { - _sitescatalogs = value; - - OnSitesCatalogsChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<SitesRml> _sitesrmls; - - /// <summary> - /// Gets or sets the sitebase sites rmls. - /// </summary> - - public virtual SynchronizedObservableCollection<SitesRml> SitesRmls - { - get - { - return _sitesrmls; - } - - set - { - if (_sitesrmls != value) - { - _sitesrmls = value; - - OnSitesRmlsChanged(value); - - } - } - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the Description has changed. - /// </summary> - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// <summary> - /// Called when the Organization has changed. - /// </summary> - protected virtual void OnOrganizationChanged(Organization organization) - { - OrganizationChanged?.Invoke(this, organization); - RaisePropertyChanged(nameof(Organization)); - } - - /// <summary> - /// Called when the SitesCatalogs has changed. - /// </summary> - protected virtual void OnSitesCatalogsChanged(SynchronizedObservableCollection<SitesCatalog> sitescatalogs) - { - SitesCatalogsChanged?.Invoke(this, sitescatalogs); - RaisePropertyChanged(nameof(SitesCatalogs)); - } - - /// <summary> - /// Called when the SitesRmls has changed. - /// </summary> - protected virtual void OnSitesRmlsChanged(SynchronizedObservableCollection<SitesRml> sitesrmls) - { - SitesRmlsChanged?.Invoke(this, sitesrmls); - RaisePropertyChanged(nameof(SitesRmls)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="SiteBase" /> class. - /// </summary> - public SiteBase() : base() - { - - SitesCatalogs = new SynchronizedObservableCollection<SitesCatalog>(); - - SitesRmls = new SynchronizedObservableCollection<SitesRml>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalog.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalog.cs deleted file mode 100644 index 886d06719..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalog.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class SitesCatalog : SitesCatalogBase - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs deleted file mode 100644 index 4f4665203..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs +++ /dev/null @@ -1,175 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("SITES_CATALOGS")] - public abstract class SitesCatalogBase : ObservableEntity<SitesCatalog> - { - - public event EventHandler<ColorCatalog> ColorCatalogChanged; - - public event EventHandler<Site> SiteChanged; - - protected String _siteguid; - - /// <summary> - /// Gets or sets the sitescatalogbase site guid. - /// </summary> - - [Column("SITE_GUID")] - [ForeignKey("Site")] - - public String SiteGuid - { - get - { - return _siteguid; - } - - set - { - if (_siteguid != value) - { - _siteguid = value; - - } - } - } - - protected String _colorcatalogguid; - - /// <summary> - /// Gets or sets the sitescatalogbase color catalog guid. - /// </summary> - - [Column("COLOR_CATALOG_GUID")] - [ForeignKey("ColorCatalog")] - - public String ColorCatalogGuid - { - get - { - return _colorcatalogguid; - } - - set - { - if (_colorcatalogguid != value) - { - _colorcatalogguid = value; - - } - } - } - - protected ColorCatalog _colorcatalog; - - /// <summary> - /// Gets or sets the sitescatalogbase color catalogs. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual ColorCatalog ColorCatalog - { - get - { - return _colorcatalog; - } - - set - { - if (_colorcatalog != value) - { - _colorcatalog = value; - - if (ColorCatalog != null) - { - ColorCatalogGuid = ColorCatalog.Guid; - } - - OnColorCatalogChanged(value); - - } - } - } - - protected Site _site; - - /// <summary> - /// Gets or sets the sitescatalogbase site. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual Site Site - { - get - { - return _site; - } - - set - { - if (_site != value) - { - _site = value; - - if (Site != null) - { - SiteGuid = Site.Guid; - } - - OnSiteChanged(value); - - } - } - } - - /// <summary> - /// Called when the ColorCatalog has changed. - /// </summary> - protected virtual void OnColorCatalogChanged(ColorCatalog colorcatalog) - { - ColorCatalogChanged?.Invoke(this, colorcatalog); - RaisePropertyChanged(nameof(ColorCatalog)); - } - - /// <summary> - /// Called when the Site has changed. - /// </summary> - protected virtual void OnSiteChanged(Site site) - { - SiteChanged?.Invoke(this, site); - RaisePropertyChanged(nameof(Site)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="SitesCatalogBase" /> class. - /// </summary> - public SitesCatalogBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs deleted file mode 100644 index 1d6dafe8b..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class SitesRml : SitesRmlBase - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs deleted file mode 100644 index d9111def7..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs +++ /dev/null @@ -1,175 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("SITES_RMLS")] - public abstract class SitesRmlBase : ObservableEntity<SitesRml> - { - - public event EventHandler<Rml> RmlChanged; - - public event EventHandler<Site> SiteChanged; - - protected String _siteguid; - - /// <summary> - /// Gets or sets the sitesrmlbase site guid. - /// </summary> - - [Column("SITE_GUID")] - [ForeignKey("Site")] - - public String SiteGuid - { - get - { - return _siteguid; - } - - set - { - if (_siteguid != value) - { - _siteguid = value; - - } - } - } - - protected String _rmlguid; - - /// <summary> - /// Gets or sets the sitesrmlbase rml guid. - /// </summary> - - [Column("RML_GUID")] - [ForeignKey("Rml")] - - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - if (_rmlguid != value) - { - _rmlguid = value; - - } - } - } - - protected Rml _rml; - - /// <summary> - /// Gets or sets the sitesrmlbase rml. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - if (_rml != value) - { - _rml = value; - - if (Rml != null) - { - RmlGuid = Rml.Guid; - } - - OnRmlChanged(value); - - } - } - } - - protected Site _site; - - /// <summary> - /// Gets or sets the sitesrmlbase site. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual Site Site - { - get - { - return _site; - } - - set - { - if (_site != value) - { - _site = value; - - if (Site != null) - { - SiteGuid = Site.Guid; - } - - OnSiteChanged(value); - - } - } - } - - /// <summary> - /// Called when the Rml has changed. - /// </summary> - protected virtual void OnRmlChanged(Rml rml) - { - RmlChanged?.Invoke(this, rml); - RaisePropertyChanged(nameof(Rml)); - } - - /// <summary> - /// Called when the Site has changed. - /// </summary> - protected virtual void OnSiteChanged(Site site) - { - SiteChanged?.Invoke(this, site); - RaisePropertyChanged(nameof(Site)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="SitesRmlBase" /> class. - /// </summary> - public SitesRmlBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs index b1ac62815..5794da91b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -27,15 +26,13 @@ namespace Tango.BL.Entities public abstract class SpoolBase : ObservableEntity<Spool> { - public event EventHandler<Nullable<Int32>> StartOffsetPulsesChanged; + public event EventHandler<Int32> StartOffsetPulsesChanged; - public event EventHandler<Nullable<Int32>> BackingRateChanged; + public event EventHandler<Int32> BackingRateChanged; - public event EventHandler<Nullable<Int32>> SegmentOffsetPulsesChanged; + public event EventHandler<Int32> SegmentOffsetPulsesChanged; - public event EventHandler<Nullable<Int32>> BottomBackingRateChanged; - - public event EventHandler<Nullable<Int32>> LimitSwitchStartPointOffsetChanged; + public event EventHandler<Int32> BottomBackingRateChanged; public event EventHandler<Machine> MachineChanged; @@ -93,7 +90,7 @@ namespace Tango.BL.Entities } } - protected Nullable<Int32> _startoffsetpulses; + protected Int32 _startoffsetpulses; /// <summary> /// Gets or sets the spoolbase start offset pulses. @@ -101,7 +98,7 @@ namespace Tango.BL.Entities [Column("START_OFFSET_PULSES")] - public Nullable<Int32> StartOffsetPulses + public Int32 StartOffsetPulses { get { @@ -120,7 +117,7 @@ namespace Tango.BL.Entities } } - protected Nullable<Int32> _backingrate; + protected Int32 _backingrate; /// <summary> /// Gets or sets the spoolbase backing rate. @@ -128,7 +125,7 @@ namespace Tango.BL.Entities [Column("BACKING_RATE")] - public Nullable<Int32> BackingRate + public Int32 BackingRate { get { @@ -147,7 +144,7 @@ namespace Tango.BL.Entities } } - protected Nullable<Int32> _segmentoffsetpulses; + protected Int32 _segmentoffsetpulses; /// <summary> /// Gets or sets the spoolbase segment offset pulses. @@ -155,7 +152,7 @@ namespace Tango.BL.Entities [Column("SEGMENT_OFFSET_PULSES")] - public Nullable<Int32> SegmentOffsetPulses + public Int32 SegmentOffsetPulses { get { @@ -174,7 +171,7 @@ namespace Tango.BL.Entities } } - protected Nullable<Int32> _bottombackingrate; + protected Int32 _bottombackingrate; /// <summary> /// Gets or sets the spoolbase bottom backing rate. @@ -182,7 +179,7 @@ namespace Tango.BL.Entities [Column("BOTTOM_BACKING_RATE")] - public Nullable<Int32> BottomBackingRate + public Int32 BottomBackingRate { get { @@ -201,33 +198,6 @@ namespace Tango.BL.Entities } } - protected Nullable<Int32> _limitswitchstartpointoffset; - - /// <summary> - /// Gets or sets the spoolbase limit switch start point offset. - /// </summary> - - [Column("LIMIT_SWITCH_START_POINT_OFFSET")] - - public Nullable<Int32> LimitSwitchStartPointOffset - { - get - { - return _limitswitchstartpointoffset; - } - - set - { - if (_limitswitchstartpointoffset != value) - { - _limitswitchstartpointoffset = value; - - OnLimitSwitchStartPointOffsetChanged(value); - - } - } - } - protected Machine _machine; /// <summary> @@ -295,7 +265,7 @@ namespace Tango.BL.Entities /// <summary> /// Called when the StartOffsetPulses has changed. /// </summary> - protected virtual void OnStartOffsetPulsesChanged(Nullable<Int32> startoffsetpulses) + protected virtual void OnStartOffsetPulsesChanged(Int32 startoffsetpulses) { StartOffsetPulsesChanged?.Invoke(this, startoffsetpulses); RaisePropertyChanged(nameof(StartOffsetPulses)); @@ -304,7 +274,7 @@ namespace Tango.BL.Entities /// <summary> /// Called when the BackingRate has changed. /// </summary> - protected virtual void OnBackingRateChanged(Nullable<Int32> backingrate) + protected virtual void OnBackingRateChanged(Int32 backingrate) { BackingRateChanged?.Invoke(this, backingrate); RaisePropertyChanged(nameof(BackingRate)); @@ -313,7 +283,7 @@ namespace Tango.BL.Entities /// <summary> /// Called when the SegmentOffsetPulses has changed. /// </summary> - protected virtual void OnSegmentOffsetPulsesChanged(Nullable<Int32> segmentoffsetpulses) + protected virtual void OnSegmentOffsetPulsesChanged(Int32 segmentoffsetpulses) { SegmentOffsetPulsesChanged?.Invoke(this, segmentoffsetpulses); RaisePropertyChanged(nameof(SegmentOffsetPulses)); @@ -322,22 +292,13 @@ namespace Tango.BL.Entities /// <summary> /// Called when the BottomBackingRate has changed. /// </summary> - protected virtual void OnBottomBackingRateChanged(Nullable<Int32> bottombackingrate) + protected virtual void OnBottomBackingRateChanged(Int32 bottombackingrate) { BottomBackingRateChanged?.Invoke(this, bottombackingrate); RaisePropertyChanged(nameof(BottomBackingRate)); } /// <summary> - /// Called when the LimitSwitchStartPointOffset has changed. - /// </summary> - protected virtual void OnLimitSwitchStartPointOffsetChanged(Nullable<Int32> limitswitchstartpointoffset) - { - LimitSwitchStartPointOffsetChanged?.Invoke(this, limitswitchstartpointoffset); - RaisePropertyChanged(nameof(LimitSwitchStartPointOffset)); - } - - /// <summary> /// Called when the Machine has changed. /// </summary> protected virtual void OnMachineChanged(Machine machine) diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs index a3e59bbc7..55edff2e0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -39,19 +38,9 @@ namespace Tango.BL.Entities public event EventHandler<Double> RotationsPerPassageChanged; - public event EventHandler<Int32> StartOffsetPulsesChanged; - - public event EventHandler<Int32> BackingRateChanged; - - public event EventHandler<Int32> SegmentOffsetPulsesChanged; - - public event EventHandler<Int32> BottomBackingRateChanged; - - public event EventHandler<Int32> LimitSwitchStartPointOffsetChanged; - public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; - public event EventHandler<SynchronizedObservableCollection<RmlsSpool>> RmlsSpoolsChanged; + public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; public event EventHandler<SynchronizedObservableCollection<Spool>> SpoolsChanged; @@ -217,141 +206,6 @@ namespace Tango.BL.Entities } } - protected Int32 _startoffsetpulses; - - /// <summary> - /// Gets or sets the spooltypebase start offset pulses. - /// </summary> - - [Column("START_OFFSET_PULSES")] - - public Int32 StartOffsetPulses - { - get - { - return _startoffsetpulses; - } - - set - { - if (_startoffsetpulses != value) - { - _startoffsetpulses = value; - - OnStartOffsetPulsesChanged(value); - - } - } - } - - protected Int32 _backingrate; - - /// <summary> - /// Gets or sets the spooltypebase backing rate. - /// </summary> - - [Column("BACKING_RATE")] - - public Int32 BackingRate - { - get - { - return _backingrate; - } - - set - { - if (_backingrate != value) - { - _backingrate = value; - - OnBackingRateChanged(value); - - } - } - } - - protected Int32 _segmentoffsetpulses; - - /// <summary> - /// Gets or sets the spooltypebase segment offset pulses. - /// </summary> - - [Column("SEGMENT_OFFSET_PULSES")] - - public Int32 SegmentOffsetPulses - { - get - { - return _segmentoffsetpulses; - } - - set - { - if (_segmentoffsetpulses != value) - { - _segmentoffsetpulses = value; - - OnSegmentOffsetPulsesChanged(value); - - } - } - } - - protected Int32 _bottombackingrate; - - /// <summary> - /// Gets or sets the spooltypebase bottom backing rate. - /// </summary> - - [Column("BOTTOM_BACKING_RATE")] - - public Int32 BottomBackingRate - { - get - { - return _bottombackingrate; - } - - set - { - if (_bottombackingrate != value) - { - _bottombackingrate = value; - - OnBottomBackingRateChanged(value); - - } - } - } - - protected Int32 _limitswitchstartpointoffset; - - /// <summary> - /// Gets or sets the spooltypebase limit switch start point offset. - /// </summary> - - [Column("LIMIT_SWITCH_START_POINT_OFFSET")] - - public Int32 LimitSwitchStartPointOffset - { - get - { - return _limitswitchstartpointoffset; - } - - set - { - if (_limitswitchstartpointoffset != value) - { - _limitswitchstartpointoffset = value; - - OnLimitSwitchStartPointOffsetChanged(value); - - } - } - } - protected SynchronizedObservableCollection<Job> _jobs; /// <summary> @@ -377,26 +231,26 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<RmlsSpool> _rmlsspools; + protected SynchronizedObservableCollection<Machine> _machines; /// <summary> - /// Gets or sets the spooltypebase rmls spools. + /// Gets or sets the spooltypebase machines. /// </summary> - public virtual SynchronizedObservableCollection<RmlsSpool> RmlsSpools + public virtual SynchronizedObservableCollection<Machine> Machines { get { - return _rmlsspools; + return _machines; } set { - if (_rmlsspools != value) + if (_machines != value) { - _rmlsspools = value; + _machines = value; - OnRmlsSpoolsChanged(value); + OnMachinesChanged(value); } } @@ -482,51 +336,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the StartOffsetPulses has changed. - /// </summary> - protected virtual void OnStartOffsetPulsesChanged(Int32 startoffsetpulses) - { - StartOffsetPulsesChanged?.Invoke(this, startoffsetpulses); - RaisePropertyChanged(nameof(StartOffsetPulses)); - } - - /// <summary> - /// Called when the BackingRate has changed. - /// </summary> - protected virtual void OnBackingRateChanged(Int32 backingrate) - { - BackingRateChanged?.Invoke(this, backingrate); - RaisePropertyChanged(nameof(BackingRate)); - } - - /// <summary> - /// Called when the SegmentOffsetPulses has changed. - /// </summary> - protected virtual void OnSegmentOffsetPulsesChanged(Int32 segmentoffsetpulses) - { - SegmentOffsetPulsesChanged?.Invoke(this, segmentoffsetpulses); - RaisePropertyChanged(nameof(SegmentOffsetPulses)); - } - - /// <summary> - /// Called when the BottomBackingRate has changed. - /// </summary> - protected virtual void OnBottomBackingRateChanged(Int32 bottombackingrate) - { - BottomBackingRateChanged?.Invoke(this, bottombackingrate); - RaisePropertyChanged(nameof(BottomBackingRate)); - } - - /// <summary> - /// Called when the LimitSwitchStartPointOffset has changed. - /// </summary> - protected virtual void OnLimitSwitchStartPointOffsetChanged(Int32 limitswitchstartpointoffset) - { - LimitSwitchStartPointOffsetChanged?.Invoke(this, limitswitchstartpointoffset); - RaisePropertyChanged(nameof(LimitSwitchStartPointOffset)); - } - - /// <summary> /// Called when the Jobs has changed. /// </summary> protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs) @@ -536,12 +345,12 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the RmlsSpools has changed. + /// Called when the Machines has changed. /// </summary> - protected virtual void OnRmlsSpoolsChanged(SynchronizedObservableCollection<RmlsSpool> rmlsspools) + protected virtual void OnMachinesChanged(SynchronizedObservableCollection<Machine> machines) { - RmlsSpoolsChanged?.Invoke(this, rmlsspools); - RaisePropertyChanged(nameof(RmlsSpools)); + MachinesChanged?.Invoke(this, machines); + RaisePropertyChanged(nameof(Machines)); } /// <summary> @@ -561,7 +370,7 @@ namespace Tango.BL.Entities Jobs = new SynchronizedObservableCollection<Job>(); - RmlsSpools = new SynchronizedObservableCollection<RmlsSpool>(); + Machines = new SynchronizedObservableCollection<Machine>(); Spools = new SynchronizedObservableCollection<Spool>(); diff --git a/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs index ea816c4f3..91b1ca9ac 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs index 5480d47f1..2e99df9b0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -27,19 +26,17 @@ namespace Tango.BL.Entities public abstract class SysdiagramBase : ObservableEntity<Sysdiagram> { - public event EventHandler<Nullable<Int32>> VersionChanged; + public event EventHandler<SynchronizedObservableCollection<Int32>> VersionChanged; public event EventHandler<Byte[]> DefinitionChanged; - protected Nullable<Int32> _version; + protected SynchronizedObservableCollection<Int32> _version; /// <summary> /// Gets or sets the sysdiagrambase version. /// </summary> - [Column("version")] - - public Nullable<Int32> Version + public virtual SynchronizedObservableCollection<Int32> Version { get { @@ -88,7 +85,7 @@ namespace Tango.BL.Entities /// <summary> /// Called when the Version has changed. /// </summary> - protected virtual void OnVersionChanged(Nullable<Int32> version) + protected virtual void OnVersionChanged(SynchronizedObservableCollection<Int32> version) { VersionChanged?.Invoke(this, version); RaisePropertyChanged(nameof(Version)); @@ -108,6 +105,9 @@ namespace Tango.BL.Entities /// </summary> public SysdiagramBase() : base() { + + Version = new SynchronizedObservableCollection<Int32>(); + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdate.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoUpdate.cs deleted file mode 100644 index d5b10ee45..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdate.cs +++ /dev/null @@ -1,161 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Enumerations; - -namespace Tango.BL.Entities -{ - public class TangoUpdate : TangoUpdateBase - { - [NotMapped] - [JsonIgnore] - public TangoUpdateStatuses UpdateStatus - { - get - { - return (TangoUpdateStatuses)Status; - } - set - { - Status = (int)value; - RaisePropertyChangedAuto(); - } - } - - [NotMapped] - [JsonIgnore] - public bool IsSetup - { - get - { - return - UpdateStatus == TangoUpdateStatuses.SetupStarted || - UpdateStatus == TangoUpdateStatuses.SetupCompleted || - UpdateStatus == TangoUpdateStatuses.SetupFailed; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsUpdate - { - get - { - return - UpdateStatus == TangoUpdateStatuses.UpdateStarted || - UpdateStatus == TangoUpdateStatuses.UpdateCompleted || - UpdateStatus == TangoUpdateStatuses.UpdateFailed; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsDataBase - { - get - { - return - UpdateStatus == TangoUpdateStatuses.DatabaseStarted || - UpdateStatus == TangoUpdateStatuses.DatabaseCompleted || - UpdateStatus == TangoUpdateStatuses.DatabaseFailed; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsSynchronization - { - get - { - return - UpdateStatus == TangoUpdateStatuses.SynchronizationStarted || - UpdateStatus == TangoUpdateStatuses.SynchronizationCompleted || - UpdateStatus == TangoUpdateStatuses.SynchronizationFailed; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsOfflineUpdate - { - get - { - return - UpdateStatus == TangoUpdateStatuses.OfflineUpdateStarted || - UpdateStatus == TangoUpdateStatuses.OfflineUpdateCompleted || - UpdateStatus == TangoUpdateStatuses.OfflineUpdateFailed; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsOfflineFirmwareUpgrade - { - get - { - return - UpdateStatus == TangoUpdateStatuses.OfflineFirmwareUpgradeStarted || - UpdateStatus == TangoUpdateStatuses.OfflineFirmwareUpgradeCompleted || - UpdateStatus == TangoUpdateStatuses.OfflineFirmwareUpgradeFailed; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsStarted - { - get - { - return - UpdateStatus == TangoUpdateStatuses.SetupStarted || - UpdateStatus == TangoUpdateStatuses.UpdateStarted || - UpdateStatus == TangoUpdateStatuses.DatabaseStarted || - UpdateStatus == TangoUpdateStatuses.SynchronizationStarted || - UpdateStatus == TangoUpdateStatuses.OfflineUpdateStarted || - UpdateStatus == TangoUpdateStatuses.OfflineFirmwareUpgradeStarted; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsCompleted - { - get - { - return - UpdateStatus == TangoUpdateStatuses.SetupCompleted || - UpdateStatus == TangoUpdateStatuses.UpdateCompleted || - UpdateStatus == TangoUpdateStatuses.DatabaseCompleted || - UpdateStatus == TangoUpdateStatuses.SynchronizationCompleted || - UpdateStatus == TangoUpdateStatuses.OfflineUpdateCompleted || - UpdateStatus == TangoUpdateStatuses.OfflineFirmwareUpgradeCompleted; - } - } - - [NotMapped] - [JsonIgnore] - public bool IsFailed - { - get - { - return - UpdateStatus == TangoUpdateStatuses.SetupFailed || - UpdateStatus == TangoUpdateStatuses.UpdateFailed || - UpdateStatus == TangoUpdateStatuses.DatabaseFailed || - UpdateStatus == TangoUpdateStatuses.SynchronizationFailed || - UpdateStatus == TangoUpdateStatuses.OfflineUpdateFailed || - UpdateStatus == TangoUpdateStatuses.OfflineFirmwareUpgradeFailed; - } - } - - protected override void OnStatusChanged(int status) - { - base.OnStatusChanged(status); - RaisePropertyChanged(nameof(UpdateStatus)); - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs deleted file mode 100644 index 677886b47..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs +++ /dev/null @@ -1,366 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; -using Tango.Core.CustomAttributes; - -namespace Tango.BL.Entities -{ - [Table("TANGO_UPDATES")] - public abstract class TangoUpdateBase : ObservableEntity<TangoUpdate> - { - - public event EventHandler<String> ApplicationVersionChanged; - - public event EventHandler<String> FirmwareVersionChanged; - - public event EventHandler<Int32> StatusChanged; - - public event EventHandler<String> FailedReasonChanged; - - public event EventHandler<String> FailedLogChanged; - - public event EventHandler<DateTime> StartDateChanged; - - public event EventHandler<Nullable<DateTime>> EndDateChanged; - - public event EventHandler<Boolean> IsSynchronizedChanged; - - protected String _applicationversion; - - /// <summary> - /// Gets or sets the tangoupdatebase application version. - /// </summary> - - [Column("APPLICATION_VERSION")] - - public String ApplicationVersion - { - get - { - return _applicationversion; - } - - set - { - if (_applicationversion != value) - { - _applicationversion = value; - - OnApplicationVersionChanged(value); - - } - } - } - - protected String _firmwareversion; - - /// <summary> - /// Gets or sets the tangoupdatebase firmware version. - /// </summary> - - [Column("FIRMWARE_VERSION")] - - public String FirmwareVersion - { - get - { - return _firmwareversion; - } - - set - { - if (_firmwareversion != value) - { - _firmwareversion = value; - - OnFirmwareVersionChanged(value); - - } - } - } - - protected String _machineguid; - - /// <summary> - /// Gets or sets the tangoupdatebase machine guid. - /// </summary> - - [Column("MACHINE_GUID")] - - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - if (_machineguid != value) - { - _machineguid = value; - - } - } - } - - protected Int32 _status; - - /// <summary> - /// Gets or sets the tangoupdatebase status. - /// </summary> - - [Column("STATUS")] - - public Int32 Status - { - get - { - return _status; - } - - set - { - if (_status != value) - { - _status = value; - - OnStatusChanged(value); - - } - } - } - - protected String _failedreason; - - /// <summary> - /// Gets or sets the tangoupdatebase failed reason. - /// </summary> - - [Column("FAILED_REASON")] - - public String FailedReason - { - get - { - return _failedreason; - } - - set - { - if (_failedreason != value) - { - _failedreason = value; - - OnFailedReasonChanged(value); - - } - } - } - - protected String _failedlog; - - /// <summary> - /// Gets or sets the tangoupdatebase failed log. - /// </summary> - - [Column("FAILED_LOG")] - - public String FailedLog - { - get - { - return _failedlog; - } - - set - { - if (_failedlog != value) - { - _failedlog = value; - - OnFailedLogChanged(value); - - } - } - } - - protected DateTime _startdate; - - /// <summary> - /// Gets or sets the tangoupdatebase start date. - /// </summary> - - [Column("START_DATE")] - - public DateTime StartDate - { - get - { - return _startdate; - } - - set - { - if (_startdate != value) - { - _startdate = value; - - OnStartDateChanged(value); - - } - } - } - - protected Nullable<DateTime> _enddate; - - /// <summary> - /// Gets or sets the tangoupdatebase end date. - /// </summary> - - [Column("END_DATE")] - - public Nullable<DateTime> EndDate - { - get - { - return _enddate; - } - - set - { - if (_enddate != value) - { - _enddate = value; - - OnEndDateChanged(value); - - } - } - } - - protected Boolean _issynchronized; - - /// <summary> - /// Gets or sets the tangoupdatebase is synchronized. - /// </summary> - - [Column("IS_SYNCHRONIZED")] - - public Boolean IsSynchronized - { - get - { - return _issynchronized; - } - - set - { - if (_issynchronized != value) - { - _issynchronized = value; - - OnIsSynchronizedChanged(value); - - } - } - } - - /// <summary> - /// Called when the ApplicationVersion has changed. - /// </summary> - protected virtual void OnApplicationVersionChanged(String applicationversion) - { - ApplicationVersionChanged?.Invoke(this, applicationversion); - RaisePropertyChanged(nameof(ApplicationVersion)); - } - - /// <summary> - /// Called when the FirmwareVersion has changed. - /// </summary> - protected virtual void OnFirmwareVersionChanged(String firmwareversion) - { - FirmwareVersionChanged?.Invoke(this, firmwareversion); - RaisePropertyChanged(nameof(FirmwareVersion)); - } - - /// <summary> - /// Called when the Status has changed. - /// </summary> - protected virtual void OnStatusChanged(Int32 status) - { - StatusChanged?.Invoke(this, status); - RaisePropertyChanged(nameof(Status)); - } - - /// <summary> - /// Called when the FailedReason has changed. - /// </summary> - protected virtual void OnFailedReasonChanged(String failedreason) - { - FailedReasonChanged?.Invoke(this, failedreason); - RaisePropertyChanged(nameof(FailedReason)); - } - - /// <summary> - /// Called when the FailedLog has changed. - /// </summary> - protected virtual void OnFailedLogChanged(String failedlog) - { - FailedLogChanged?.Invoke(this, failedlog); - RaisePropertyChanged(nameof(FailedLog)); - } - - /// <summary> - /// Called when the StartDate has changed. - /// </summary> - protected virtual void OnStartDateChanged(DateTime startdate) - { - StartDateChanged?.Invoke(this, startdate); - RaisePropertyChanged(nameof(StartDate)); - } - - /// <summary> - /// Called when the EndDate has changed. - /// </summary> - protected virtual void OnEndDateChanged(Nullable<DateTime> enddate) - { - EndDateChanged?.Invoke(this, enddate); - RaisePropertyChanged(nameof(EndDate)); - } - - /// <summary> - /// Called when the IsSynchronized has changed. - /// </summary> - protected virtual void OnIsSynchronizedChanged(Boolean issynchronized) - { - IsSynchronizedChanged?.Invoke(this, issynchronized); - RaisePropertyChanged(nameof(IsSynchronized)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="TangoUpdateBase" /> class. - /// </summary> - public TangoUpdateBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs index 2fece7fdb..ddf7561af 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -37,8 +36,6 @@ namespace Tango.BL.Entities public event EventHandler<String> CommentsChanged; - public event EventHandler<Boolean> DisabledChanged; - public event EventHandler<MachineVersion> MachineVersionChanged; public event EventHandler<User> UserChanged; @@ -230,33 +227,6 @@ namespace Tango.BL.Entities } } - protected Boolean _disabled; - - /// <summary> - /// Gets or sets the tangoversionbase disabled. - /// </summary> - - [Column("DISABLED")] - - public Boolean Disabled - { - get - { - return _disabled; - } - - set - { - if (_disabled != value) - { - _disabled = value; - - OnDisabledChanged(value); - - } - } - } - protected MachineVersion _machineversion; /// <summary> @@ -367,15 +337,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the Disabled has changed. - /// </summary> - protected virtual void OnDisabledChanged(Boolean disabled) - { - DisabledChanged?.Invoke(this, disabled); - RaisePropertyChanged(nameof(Disabled)); - } - - /// <summary> /// Called when the MachineVersion has changed. /// </summary> protected virtual void OnMachineVersionChanged(MachineVersion machineversion) diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs index b060ded50..72fe76f3c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs index ba6309950..ccb3e7c03 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs index 5dc7d2a5a..2fc68c69c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs index e027e81b1..0b140690f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs index f9f9c7140..d7ff856b6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs index e22bd450e..5275c924b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs @@ -19,10 +19,14 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { + + /// <summary> + /// + /// </summary> + [Table("TECH_VALVES")] public abstract class TechValveBase : ObservableEntity<TechValve> { diff --git a/Software/Visual_Studio/Tango.BL/Entities/User.cs b/Software/Visual_Studio/Tango.BL/Entities/User.cs index dc27b5625..7c6780972 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/User.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/User.cs @@ -16,6 +16,8 @@ namespace Tango.BL.Entities { private static IHashGenerator _hashGenerator; + private bool _passwordGatewayModified = false; + /// <summary> /// Determines whether the user has the specified permission. /// </summary> @@ -38,7 +40,7 @@ namespace Tango.BL.Entities } /// <summary> - /// Gets the aggregated user roles. + /// Gets the aggregated user roles as enumerations. /// </summary> [NotMapped] public List<Role> Roles @@ -47,29 +49,49 @@ namespace Tango.BL.Entities } /// <summary> - /// Gets the aggregated FSE user roles. + /// Gets the aggregated user permissions as enumerations. /// </summary> [NotMapped] - public List<Role> FSERoles + public List<Permission> Permissions { - get { return UsersRoles.Select(x => x.Role).Where(x => x.Name.StartsWith("FSE")).ToList(); } + get + { + return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).Select(x => x.Permission).ToList(); + } } + + private String _passwordGateway; /// <summary> - /// Gets the aggregated user permissions as enumerations. + /// Gets or sets the password gate way. /// </summary> [NotMapped] - public List<Permission> Permissions + [JsonIgnore] + [XmlIgnore] + public String PasswordGateWay { get { - return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).Select(x => x.Permission).ToList(); + return _passwordGateway; + } + set + { + _passwordGateway = value; + Password = GetHashGenerator().Encrypt(_passwordGateway); + RaisePropertyChangedAuto(); + + _passwordGatewayModified = true; } } protected override void RaisePropertyChanged(string propName) { base.RaisePropertyChanged(propName); + + if (propName == nameof(Password)) + { + RaisePropertyChanged(nameof(PasswordGateWay)); + } } public override bool Validate(ObservablesContext context) @@ -92,6 +114,14 @@ namespace Tango.BL.Entities { InsertError(nameof(Email), "The specified email address is invalid."); } + + if (_passwordGatewayModified) + { + if (!PasswordGateWay.IsBetweenLength(4, 30)) + { + InsertError(nameof(PasswordGateWay), "A user password must be at least 4 characters long and maximum 30."); + } + } } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs index eb6eae4f7..5445b2980 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -35,16 +34,10 @@ namespace Tango.BL.Entities public event EventHandler<Nullable<DateTime>> LastLoginChanged; - public event EventHandler<Boolean> PasswordChangeRequiredChanged; - - public event EventHandler<SynchronizedObservableCollection<ActionLog>> ActionLogsChanged; - public event EventHandler<Address> AddressChanged; public event EventHandler<Contact> ContactChanged; - public event EventHandler<SynchronizedObservableCollection<FseVersion>> FseVersionsChanged; - public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; public event EventHandler<SynchronizedObservableCollection<MachineStudioVersion>> MachineStudioVersionsChanged; @@ -243,58 +236,6 @@ namespace Tango.BL.Entities } } - protected Boolean _passwordchangerequired; - - /// <summary> - /// Gets or sets the userbase password change required. - /// </summary> - - [Column("PASSWORD_CHANGE_REQUIRED")] - - public Boolean PasswordChangeRequired - { - get - { - return _passwordchangerequired; - } - - set - { - if (_passwordchangerequired != value) - { - _passwordchangerequired = value; - - OnPasswordChangeRequiredChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<ActionLog> _actionlogs; - - /// <summary> - /// Gets or sets the userbase action logs. - /// </summary> - - public virtual SynchronizedObservableCollection<ActionLog> ActionLogs - { - get - { - return _actionlogs; - } - - set - { - if (_actionlogs != value) - { - _actionlogs = value; - - OnActionLogsChanged(value); - - } - } - } - protected Address _address; /// <summary> @@ -359,31 +300,6 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection<FseVersion> _fseversions; - - /// <summary> - /// Gets or sets the userbase fse versions. - /// </summary> - - public virtual SynchronizedObservableCollection<FseVersion> FseVersions - { - get - { - return _fseversions; - } - - set - { - if (_fseversions != value) - { - _fseversions = value; - - OnFseVersionsChanged(value); - - } - } - } - protected SynchronizedObservableCollection<Job> _jobs; /// <summary> @@ -578,24 +494,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the PasswordChangeRequired has changed. - /// </summary> - protected virtual void OnPasswordChangeRequiredChanged(Boolean passwordchangerequired) - { - PasswordChangeRequiredChanged?.Invoke(this, passwordchangerequired); - RaisePropertyChanged(nameof(PasswordChangeRequired)); - } - - /// <summary> - /// Called when the ActionLogs has changed. - /// </summary> - protected virtual void OnActionLogsChanged(SynchronizedObservableCollection<ActionLog> actionlogs) - { - ActionLogsChanged?.Invoke(this, actionlogs); - RaisePropertyChanged(nameof(ActionLogs)); - } - - /// <summary> /// Called when the Address has changed. /// </summary> protected virtual void OnAddressChanged(Address address) @@ -614,15 +512,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the FseVersions has changed. - /// </summary> - protected virtual void OnFseVersionsChanged(SynchronizedObservableCollection<FseVersion> fseversions) - { - FseVersionsChanged?.Invoke(this, fseversions); - RaisePropertyChanged(nameof(FseVersions)); - } - - /// <summary> /// Called when the Jobs has changed. /// </summary> protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs) @@ -682,10 +571,6 @@ namespace Tango.BL.Entities public UserBase() : base() { - ActionLogs = new SynchronizedObservableCollection<ActionLog>(); - - FseVersions = new SynchronizedObservableCollection<FseVersion>(); - Jobs = new SynchronizedObservableCollection<Job>(); MachineStudioVersions = new SynchronizedObservableCollection<MachineStudioVersion>(); diff --git a/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs index 877f66c72..2927d05f1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs b/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs index e64f989aa..ce4c22313 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs @@ -19,7 +19,6 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; -using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs deleted file mode 100644 index 868bf7915..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Enumerations -{ - public enum ActionLogType - { - //Organizations and Users - [Description("Organization Created")] - OrganizationCreated = 1, - [Description("Organization Deleted")] - OrganizationDeleted = 2, - [Description("Organization Saved")] - OrganizationSaved = 3, - [Description("User Created")] - UserCreated = 4, - [Description("User Deleted")] - UserDeleted = 5, - [Description("User Saved")] - UserSaved = 6, - [Description("User Restored")] - UserRestored = 7, - [Description("User Login")] - UserLogin = 8, - [Description("User Logout")] - UserLogout = 9, - - //Hardware Version - [Description("Hardware Version Created")] - HardwareVersionCreated = 100, - [Description("Hardware Version Deleted")] - HardwareVersionDeleted = 101, - [Description("Hardware Version Saved")] - HardwareVersionSaved = 102, - [Description("Hardware Version Imported")] - HardwareVersionImported = 103, - - //RML - [Description("RML Created")] - RmlCreated = 200, - [Description("RML Deleted")] - RmlDeleted = 201, - [Description("RML Saved")] - RmlSaved = 202, - [Description("RML Imported")] - RmlImported = 203, - [Description("RML Active Process Parameters Changed")] - RmlActiveProcessParametersChanged = 204, - - //Jobs - [Description("Job Created")] - JobCreated = 300, - [Description("Job Deleted")] - JobDeleted = 301, - [Description("Job Saved")] - JobSaved = 302, - [Description("Job Imported")] - JobImported = 303, - - //Machines - [Description("Machine Created")] - MachineCreated = 400, - [Description("Machine Deleted")] - MachineDeleted = 401, - [Description("Machine Saved")] - MachineSaved = 402, - - //Catalogs - [Description("Catalog Created")] - CatalogCreated = 500, - [Description("Catalog Deleted")] - CatalogDeleted = 501, - [Description("Catalog Saved")] - CatalogSaved = 502, - - //Sites - [Description("Site Created")] - SiteCreated = 600, - [Description("Site Deleted")] - SiteDeleted = 601, - [Description("Site Saved")] - SiteSaved = 602, - - //Dispensers - [Description("Dispenser Created")] - DispenserCreated = 700, - [Description("Dispenser Deleted")] - DispenserDeleted = 701, - [Description("Dispenser Saved")] - DispenserSaved = 702, - - //Firmware - [Description("Firmware Upgraded")] - FirmwareUpgraded = 800, - - //Job Runs - [Description("Machine Counters Reset")] - MachineCountersReset = 900, - - //Data Store - [Description("Data Store Item Created")] - DataStoreItemCreated = 1000, - [Description("Data Store Item Modified")] - DataStoreItemModified = 1001, - [Description("Data Store Item Deleted")] - DataStoreItemDeleted = 1002, - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs index 9206e81ac..48301ece0 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs @@ -30,7 +30,7 @@ namespace Tango.BL.Enumerations [Description("Critical")] Critical = 3, - [Description("Success")] - Success = 4, + [Description("Safety")] + Safety = 4, } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs index 5ff1766d9..e6fc435d1 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs @@ -41,8 +41,6 @@ namespace Tango.BL.Enumerations [Description("Application")] Application = 10, [Description("Transport")] - Transport = 11, - [Description("Jobs")] - Jobs = 12 + Transport = 11 } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs index 92096878e..927e55e29 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs @@ -26,21 +26,21 @@ namespace Tango.BL.Enumerations REQUEST_SENT = 1000, /// <summary> - /// (Response has been received.) + /// (Response received ) /// </summary> - [Description("Response has been received.")] + [Description("Response received ")] RESPONSE_RECEIVED = 1001, /// <summary> - /// (Request to machine has failed.) + /// (Request to machine has failed) /// </summary> - [Description("Request to machine has failed.")] + [Description("Request to machine has failed")] REQUEST_FAILED = 1002, /// <summary> - /// (Application has encountered an error.) + /// (Application has encountered an error) /// </summary> - [Description("Application has encountered an error.")] + [Description("Application has encountered an error")] APPLICATION_EXCEPTION = 1003, /// <summary> @@ -50,63 +50,63 @@ namespace Tango.BL.Enumerations APPLICATION_INFORMATION = 1004, /// <summary> - /// (Application started.) + /// (Application started) /// </summary> - [Description("Application started.")] + [Description("Application started")] APPLICATION_STARTED = 1005, /// <summary> - /// (Application terminated.) + /// (Application terminated) /// </summary> - [Description("Application terminated.")] + [Description("Application terminated")] APPLICATION_TERMINATED = 1006, /// <summary> - /// (Diagnostics recording started.) + /// (Diagnostics recording started) /// </summary> - [Description("Diagnostics recording started.")] + [Description("Diagnostics recording started")] RECORDING_STARTED = 1007, /// <summary> - /// (Diagnostics recording stopped.) + /// (Diagnostics recording stopped) /// </summary> - [Description("Diagnostics recording stopped.")] + [Description("Diagnostics recording stopped")] RECORDING_STOPPED = 1008, /// <summary> - /// (Job status message has been received from embedded device.) + /// (Job status message has been received from embedded device) /// </summary> - [Description("Job status message has been received from embedded device.")] + [Description("Job status message has been received from embedded device")] JOB_STATUS = 1009, /// <summary> - /// (A job has been started.) + /// (A job has been started) /// </summary> - [Description("A job has been started.")] + [Description("A job has been started")] JOB_STARTED = 1010, /// <summary> - /// (A job has been aborted.) + /// (A job has been aborted) /// </summary> - [Description("A job has been aborted.")] + [Description("A job has been aborted")] JOB_ABORTED = 1011, /// <summary> - /// (A job has failed.) + /// (A job has failed) /// </summary> - [Description("A job has failed.")] + [Description("A job has failed")] JOB_FAILED = 1012, /// <summary> - /// (Job completed successfully.) + /// (Job completed successfully) /// </summary> - [Description("Job completed successfully.")] + [Description("Job completed successfully")] JOB_COMPLETED = 1013, /// <summary> - /// (Could not complete power-up. Cannot execute job ) + /// (Could not complete power-up ) /// </summary> - [Description("Could not complete power-up. Cannot execute job ")] + [Description("Could not complete power-up ")] POWER_UP_BIT_FAILURE = 2000, /// <summary> @@ -116,75 +116,75 @@ namespace Tango.BL.Enumerations EMERGENCY_PUSH_BUTTON_PRESSED = 2001, /// <summary> - /// (Cover is open. Cannot execute job ) + /// (Front cover 1 is open ) /// </summary> - [Description("Cover is open. Cannot execute job ")] + [Description("Front cover 1 is open ")] FRONT_COVER_1_OPEN = 2002, /// <summary> - /// (Cover is open. Cannot execute job ) + /// (Front cover 2 is open ) /// </summary> - [Description("Cover is open. Cannot execute job ")] + [Description("Front cover 2 is open ")] FRONT_COVER_2_OPEN = 2003, /// <summary> - /// (Cover is open. Cannot execute job ) + /// (Front cover 3 is open ) /// </summary> - [Description("Cover is open. Cannot execute job ")] + [Description("Front cover 3 is open ")] FRONT_COVER_3_OPEN = 2004, /// <summary> - /// (Cover is open. Cannot execute job ) + /// (Front cover 4 is open ) /// </summary> - [Description("Cover is open. Cannot execute job ")] + [Description("Front cover 4 is open ")] FRONT_COVER_4_OPEN = 2005, /// <summary> - /// (IFS door is open. Cannot start new job ) + /// (Cartridges cover is open ) /// </summary> - [Description("IFS door is open. Cannot start new job ")] + [Description("Cartridges cover is open ")] CARTRIDGES_COVER_OPEN = 2006, /// <summary> - /// (Cover is open. Cannot execute job ) + /// (Rear cover is open ) /// </summary> - [Description("Cover is open. Cannot execute job ")] - ARCH_COVER_OPEN = 2007, + [Description("Rear cover is open ")] + REAR_COVER_OPEN = 2007, /// <summary> - /// (The machine temperature is too high. Cannot execute job) + /// (The machine temperature is too high) /// </summary> - [Description("The machine temperature is too high. Cannot execute job")] + [Description("The machine temperature is too high")] MACHINE_INTERNAL_OVERTEMPERATURE = 2008, /// <summary> - /// (Internal fans RPM is too low. Cannot execute job) + /// (Internal fans RPM is too low) /// </summary> - [Description("Internal fans RPM is too low. Cannot execute job")] + [Description("Internal fans RPM is too low")] MACHINE_FANS_RPM_TOO_LOW = 2009, /// <summary> - /// (Internal fans stopped. Cannot execute job) + /// (Internal fans stopped) /// </summary> - [Description("Internal fans stopped. Cannot execute job")] + [Description("Internal fans stopped")] MACHINE_FANS_STOPPED = 2010, /// <summary> - /// (Electrical cabinet fans RPM is too low. Cannot execute job) + /// (Electrical cabinet fans RPM is too low) /// </summary> - [Description("Electrical cabinet fans RPM is too low. Cannot execute job")] + [Description("Electrical cabinet fans RPM is too low")] ELECTRICAL_CABINET_FANS_RPM_TOO_LOW = 2011, /// <summary> - /// (Electrical cabinet fans stopped. Cannot execute job) + /// (Electrical cabinet fans stopped) /// </summary> - [Description("Electrical cabinet fans stopped. Cannot execute job")] + [Description("Electrical cabinet fans stopped")] ELECTRICAL_CABINET_FANS_STOPPED = 2012, /// <summary> - /// (Configuration file does not exist. Cannot execute job) + /// (Configuration file does not exist) /// </summary> - [Description("Configuration file does not exist. Cannot execute job")] + [Description("Configuration file does not exist")] MACHINE_STATE_NO_CFG_FILE = 2013, /// <summary> @@ -194,249 +194,201 @@ namespace Tango.BL.Enumerations MACHINE_STATE_HW_CONFIG_FAILED = 2014, /// <summary> - /// (Blower has failed) + /// () /// </summary> - [Description("Blower has failed")] + [Description("")] MACHINE_STATE_INITIAL_BLOWER_FAILED = 2015, /// <summary> - /// (unspecified error) + /// (Unknown error occurred) /// </summary> - [Description("unspecified error")] + [Description("Unknown error occurred")] UNSPECIFIED = 2016, /// <summary> - /// (The machine temperature is too high. Cannot execute job) + /// (Thread break) /// </summary> - [Description("The machine temperature is too high. Cannot execute job")] - MACHINE_INTERNAL_OVERTEMPERATURE_2 = 2017, - - /// <summary> - /// (The electrical cabinet temperature is too high. Cannot execute job) - /// </summary> - [Description("The electrical cabinet temperature is too high. Cannot execute job")] - ELECTRICAL_CABINET_OVERTEMPERATURE = 2018, - - /// <summary> - /// (Software error has occurred ) - /// </summary> - [Description("Software error has occurred ")] - FPGA_WATCHDOG_ACTIVATED = 2019, - - /// <summary> - /// (Software error has occurred ) - /// </summary> - [Description("Software error has occurred ")] - UNINTENDED_RESET = 2020, - - /// <summary> - /// (Temperature measurement error has occurred. Cannot execute job.) - /// </summary> - [Description("Temperature measurement error has occurred. Cannot execute job.")] - TEMPERATURE_MEASUREMENT_ERROR = 2021, - - /// <summary> - /// (Cannot read the cartridge. Cannot perform ink filling ) - /// </summary> - [Description("Cannot read the cartridge. Cannot perform ink filling ")] - RFID_READER_MALFUNCTION_INK_SLOT = 2022, - - /// <summary> - /// (Cannot read the cartridge. Cannot replace waste cartridge ) - /// </summary> - [Description("Cannot read the cartridge. Cannot replace waste cartridge ")] - RFID_READER_MALFUNCTION_WASTE_SLOT_1 = 2023, - - /// <summary> - /// (Cannot read the cartridge. Cannot replace waste cartridge ) - /// </summary> - [Description("Cannot read the cartridge. Cannot replace waste cartridge ")] - RFID_READER_MALFUNCTION_WASTE_SLOT_2 = 2024, - - /// <summary> - /// (Thread break. Cannot execute job) - /// </summary> - [Description("Thread break. Cannot execute job")] + [Description("Thread break")] THREAD_BREAK = 3000, /// <summary> - /// (Thread tension control failure in feeder dancer. Cannot execute job) + /// (Thread tension control faiure in feeder dancer) /// </summary> - [Description("Thread tension control failure in feeder dancer. Cannot execute job")] + [Description("Thread tension control faiure in feeder dancer")] THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER = 3001, /// <summary> - /// (No cone in the winder. Cannot execute job) + /// (No cone in the winder) /// </summary> - [Description("No cone in the winder. Cannot execute job")] + [Description("No cone in the winder")] WINDER_CONE_DOES_NOT_EXIST = 3002, /// <summary> - /// (The feeder motor current is too high. Cannot execute job) + /// (The feeder motor current is too high) /// </summary> - [Description("The feeder motor current is too high. Cannot execute job")] + [Description("The feeder motor current is too high")] FEEDER_MOTOR_OVERCURRENT = 3003, /// <summary> - /// (The current in the right loader motor is too high. Cannot execute job) + /// (The current in the right loader motor is too high) /// </summary> - [Description("The current in the right loader motor is too high. Cannot execute job")] + [Description("The current in the right loader motor is too high")] RIGHT_LOADER_MOTOR_OVERCURRENT = 3004, /// <summary> - /// (The puller motor current is too high. Cannot execute job ) + /// (The puller motor current is too high ) /// </summary> - [Description("The puller motor current is too high. Cannot execute job ")] + [Description("The puller motor current is too high ")] PULLER_MOTOR_OVERCURRENT = 3005, /// <summary> - /// (The left loader motor current is too high. Cannot execute job) + /// (The left loader motor current is too high) /// </summary> - [Description("The left loader motor current is too high. Cannot execute job")] + [Description("The left loader motor current is too high")] LEFT_LOADER_MOTOR_OVERCURRENT = 3006, /// <summary> - /// (The winder motor current is too high. Cannot execute job) + /// (The winder motor current is too high) /// </summary> - [Description("The winder motor current is too high. Cannot execute job")] + [Description("The winder motor current is too high")] WINDER_MOTOR_OVERCURRENT = 3007, /// <summary> - /// (The screw motor current is too high. Cannot execute job) + /// (The screw motor current is too high) /// </summary> - [Description("The screw motor current is too high. Cannot execute job")] + [Description("The screw motor current is too high")] SCREW_MOTOR_OVERCURRENT = 3008, /// <summary> - /// (The loading arm motor current is too high. Cannot execute job) + /// (The loading arm motor current is too high) /// </summary> - [Description("The loading arm motor current is too high. Cannot execute job")] + [Description("The loading arm motor current is too high")] LOADING_ARM_MOTOR_OVERCURRENT = 3009, /// <summary> - /// (The feeder motor temperature is too high. Cannot execute job) + /// (The feeder motor temperature is too high) /// </summary> - [Description("The feeder motor temperature is too high. Cannot execute job")] + [Description("The feeder motor temperature is too high")] FEEDER_MOTOR_OVERTEMPERATURE = 3010, /// <summary> - /// (The right loader motor temperature is too high. Cannot execute job) + /// (The right loader motor temperature is too high) /// </summary> - [Description("The right loader motor temperature is too high. Cannot execute job")] + [Description("The right loader motor temperature is too high")] RIGHT_LOADER_MOTOR_OVERTEMPERATURE = 3011, /// <summary> - /// (The puller motor temperature is too high. Cannot execute job) + /// (The puller motor temperature is too high) /// </summary> - [Description("The puller motor temperature is too high. Cannot execute job")] + [Description("The puller motor temperature is too high")] PULLER_MOTOR_OVERTEMPERATURE = 3012, /// <summary> - /// (The left loader motor temperature is too high. Cannot execute job) + /// (The left loader motor temperature is too high) /// </summary> - [Description("The left loader motor temperature is too high. Cannot execute job")] + [Description("The left loader motor temperature is too high")] LEFT_LOADER_MOTOR_OVERTEMPERATURE = 3013, /// <summary> - /// (The winder motor temperature is too high. Cannot execute job) + /// (The winder motor temperature is too high) /// </summary> - [Description("The winder motor temperature is too high. Cannot execute job")] + [Description("The winder motor temperature is too high")] WINDER_MOTOR_OVERTEMPERATURE = 3014, /// <summary> - /// (The screw motor temperature is too high. Cannot execute job) + /// (The screw motor temperature is too high) /// </summary> - [Description("The screw motor temperature is too high. Cannot execute job")] + [Description("The screw motor temperature is too high")] SCREW_MOTOR_OVERTEMPERATURE = 3015, /// <summary> - /// (The loading arm motor temperature is too high. Cannot execute job) + /// (The loading arm motor temperature is too high) /// </summary> - [Description("The loading arm motor temperature is too high. Cannot execute job")] + [Description("The loading arm motor temperature is too high")] LOADING_ARM_MOTOR_OVERTEMPERATURE = 3016, /// <summary> - /// (Feeder motor stalled. Cannot execute job) + /// (Feeder motor stalled) /// </summary> - [Description("Feeder motor stalled. Cannot execute job")] + [Description("Feeder motor stalled")] FEEDER_MOTOR_STALL = 3017, /// <summary> - /// (Right loader motor stalled. Cannot execute job) + /// (Right loader motor stalled) /// </summary> - [Description("Right loader motor stalled. Cannot execute job")] + [Description("Right loader motor stalled")] RIGHT_LOADER_MOTOR_STALL = 3018, /// <summary> - /// (Puller motor stalled. Cannot execute job) + /// (Puller motor stalled) /// </summary> - [Description("Puller motor stalled. Cannot execute job")] + [Description("Puller motor stalled")] PULLER_MOTOR_STALL = 3019, /// <summary> - /// (Left loader motor stalled. Cannot execute job) + /// (Left loader motor stalled) /// </summary> - [Description("Left loader motor stalled. Cannot execute job")] + [Description("Left loader motor stalled")] LEFT_LOADER_MOTOR_STALL = 3020, /// <summary> - /// (Winder motor stalled. Cannot execute job) + /// (Winder motor stalled) /// </summary> - [Description("Winder motor stalled. Cannot execute job")] + [Description("Winder motor stalled")] WINDER_MOTOR_STALL = 3021, /// <summary> - /// (Screw motor stalled. Cannot execute job) + /// (Screw motor stalled) /// </summary> - [Description("Screw motor stalled. Cannot execute job")] + [Description("Screw motor stalled")] SCREW_MOTOR_STALL = 3022, /// <summary> - /// (Loading arm motor stalled. Cannot execute job) + /// (Loading arm motor stalled) /// </summary> - [Description("Loading arm motor stalled. Cannot execute job")] + [Description("Loading arm motor stalled")] LOADING_ARM_MOTOR_STALL = 3023, /// <summary> - /// (The feeder motor voltage is too low. Cannot execute job) + /// (The feeder motor voltage is too low) /// </summary> - [Description("The feeder motor voltage is too low. Cannot execute job")] + [Description("The feeder motor voltage is too low")] FEEDER_MOTOR_UNDERVOLTAGE = 3024, /// <summary> - /// (The right loader motor voltage is too low. Cannot execute job) + /// (The right loader motor voltage is too low) /// </summary> - [Description("The right loader motor voltage is too low. Cannot execute job")] + [Description("The right loader motor voltage is too low")] RIGHT_LOADER_MOTOR_UNDERVOLTAGE = 3025, /// <summary> - /// (The puller motor voltage is too low. Cannot execute job) + /// (The puller motor voltage is too low) /// </summary> - [Description("The puller motor voltage is too low. Cannot execute job")] + [Description("The puller motor voltage is too low")] PULLER_MOTOR_UNDERVOLTAGE = 3026, /// <summary> - /// (The left loader motor voltage is too low. Cannot execute job) + /// (The left loader motor voltage is too low) /// </summary> - [Description("The left loader motor voltage is too low. Cannot execute job")] + [Description("The left loader motor voltage is too low")] LEFT_LOADER_MOTOR_UNDERVOLTAGE = 3027, /// <summary> - /// (The winder motor voltage is too low. Cannot execute job) + /// (The winder motor voltage is too low) /// </summary> - [Description("The winder motor voltage is too low. Cannot execute job")] + [Description("The winder motor voltage is too low")] WINDER_MOTOR_UNDERVOLTAGE = 3028, /// <summary> - /// (The screw motor voltage is too low. Cannot execute job) + /// (The screw motor voltage is too low) /// </summary> - [Description("The screw motor voltage is too low. Cannot execute job")] + [Description("The screw motor voltage is too low")] SCREW_MOTOR_UNDERVOLTAGE = 3029, /// <summary> - /// (The loading arm motor voltage is too low. Cannot execute job) + /// (The loading arm motor voltage is too low) /// </summary> - [Description("The loading arm motor voltage is too low. Cannot execute job")] + [Description("The loading arm motor voltage is too low")] LOADING_ARM_MOTOR_UNDERVOLTAGE = 3030, /// <summary> @@ -464,1425 +416,1077 @@ namespace Tango.BL.Enumerations RTFU_DOWN_TIMEOUT = 3034, /// <summary> - /// (Screw travel failure. Cannot execute job) + /// (Screw travel failure) /// </summary> - [Description("Screw travel failure. Cannot execute job")] + [Description("Screw travel failure")] SCREW_MOTOR_LIMIT_TIMEOUT = 3035, /// <summary> - /// (The winder dancer motor current is too high. Cannot execute job) + /// (The winder dancer motor current is too high) /// </summary> - [Description("The winder dancer motor current is too high. Cannot execute job")] + [Description("The winder dancer motor current is too high")] WINDER_DANCER_MOTOR_OVERCURRENT = 3036, /// <summary> - /// (The puller dancer motor current is too high. Cannot execute job) + /// (The puller dancer motor current is too high) /// </summary> - [Description("The puller dancer motor current is too high. Cannot execute job")] + [Description("The puller dancer motor current is too high")] PULLER_DANCER_MOTOR_OVERCURRENT = 3037, /// <summary> - /// (The feeder dancer motor current is too high. Cannot execute job) + /// (The feeder dancer motor current is too high) /// </summary> - [Description("The feeder dancer motor current is too high. Cannot execute job")] + [Description("The feeder dancer motor current is too high")] FEEDER_DANCER_MOTOR_OVERCURRENT = 3038, /// <summary> - /// (The winder dancer motor temperature is too high. Cannot execute job) + /// (The winder dancer motor temperature is too high) /// </summary> - [Description("The winder dancer motor temperature is too high. Cannot execute job")] + [Description("The winder dancer motor temperature is too high")] WINDER_DANCER_MOTOR_OVERTEMPERATURE = 3039, /// <summary> - /// (The puller dancer motor temperature is too high. Cannot execute job) + /// (The puller dancer motor temperature is too high) /// </summary> - [Description("The puller dancer motor temperature is too high. Cannot execute job")] + [Description("The puller dancer motor temperature is too high")] PULLER_DANCER_MOTOR_OVERTEMPERATURE = 3040, /// <summary> - /// (The feeder dancer motor temperature is too high. Cannot execute job) + /// (The feeder dancer motor temperature is too high) /// </summary> - [Description("The feeder dancer motor temperature is too high. Cannot execute job")] + [Description("The feeder dancer motor temperature is too high")] FEEDER_DANCER_MOTOR_OVERTEMPERATURE = 3041, /// <summary> - /// (Winder dancer motor stalled. Cannot execute job) + /// (Winder dancer motor stalled) /// </summary> - [Description("Winder dancer motor stalled. Cannot execute job")] + [Description("Winder dancer motor stalled")] WINDER_DANCER_MOTOR_STALL = 3042, /// <summary> - /// (Puller dancer motor stalled. Cannot execute job) + /// (Puller dancer motor stalled) /// </summary> - [Description("Puller dancer motor stalled. Cannot execute job")] + [Description("Puller dancer motor stalled")] PULLER_DANCER_MOTOR_STALL = 3043, /// <summary> - /// (Feeder dancer motor stalled. Cannot execute job) + /// (Feeder dancer motor stalled) /// </summary> - [Description("Feeder dancer motor stalled. Cannot execute job")] + [Description("Feeder dancer motor stalled")] FEEDER_DANCER_MOTOR_STALL = 3044, /// <summary> - /// (The winder dancer motor voltage is too low. Cannot execute job) + /// (The winder dancer motor voltage is too low) /// </summary> - [Description("The winder dancer motor voltage is too low. Cannot execute job")] + [Description("The winder dancer motor voltage is too low")] WINDER_DANCER_MOTOR_UNDERVOLTAGE = 3045, /// <summary> - /// (The puller dancer motor voltage is too low. Cannot execute job) + /// (The puller dancer motor voltage is too low) /// </summary> - [Description("The puller dancer motor voltage is too low. Cannot execute job")] + [Description("The puller dancer motor voltage is too low")] PULLER_DANCER_MOTOR_UNDERVOLTAGE = 3046, /// <summary> - /// (The feeder dancer motor voltage is too low. Cannot execute job) + /// (The feeder dancer motor voltage is too low) /// </summary> - [Description("The feeder dancer motor voltage is too low. Cannot execute job")] + [Description("The feeder dancer motor voltage is too low")] FEEDER_DANCER_MOTOR_UNDERVOLTAGE = 3047, /// <summary> - /// (Thread tension control failure in puller dancer. Cannot execute job) + /// (Thread tension control failure in puller dancer) /// </summary> - [Description("Thread tension control failure in puller dancer. Cannot execute job")] + [Description("Thread tension control failure in puller dancer")] THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER = 3048, /// <summary> - /// (Thread tension control failure in winder dancer. Cannot execute job) + /// (Thread tension control failure in winder dancer) /// </summary> - [Description("Thread tension control failure in winder dancer. Cannot execute job")] + [Description("Thread tension control failure in winder dancer")] THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER = 3049, /// <summary> - /// (No thread in machine. Cannot execute job) + /// () /// </summary> - [Description("No thread in machine. Cannot execute job")] + [Description("")] MACHINE_STATE_NO_THREAD_DETECTED = 3050, /// <summary> - /// (Thread loading error. Cannot execute job) + /// (The dryer motor current is too high) /// </summary> - [Description("Thread loading error. Cannot execute job")] - THREAD_LOADING_ERROR = 3051, - - /// <summary> - /// (The dryer motor current is too high. Cannot execute job) - /// </summary> - [Description("The dryer motor current is too high. Cannot execute job")] + [Description("The dryer motor current is too high")] DRYER_MOTOR_OVERCURRENT = 4000, /// <summary> - /// (The dryer motor temperature is too high. Cannot execute jobs) + /// (The dryer motor temperature is too high) /// </summary> - [Description("The dryer motor temperature is too high. Cannot execute jobs")] + [Description("The dryer motor temperature is too high")] DRYER_MOTOR_OVERTEMPERATURE = 4001, /// <summary> - /// (Dryer motor stalled. Cannot execute job) + /// (Dryer motor stalled) /// </summary> - [Description("Dryer motor stalled. Cannot execute job")] + [Description("Dryer motor stalled")] DRYER_MOTOR_STALL = 4002, /// <summary> - /// (The dryer motor voltage is too low. Cannot execute job) + /// (The dryer motor voltage is too low) /// </summary> - [Description("The dryer motor voltage is too low. Cannot execute job")] + [Description("The dryer motor voltage is too low")] DRYER_MOTOR_UNDERVOLTAGE = 4003, /// <summary> - /// (The dryer door is open. Cannot execute job) + /// (The dryer door is open) /// </summary> - [Description("The dryer door is open. Cannot execute job")] + [Description("The dryer door is open")] DRYER_DOOR_OPEN = 4004, /// <summary> - /// (The temperature in dryer zone is too high. Cannot execute job) + /// (The temperature in dryer zone 1 is too high) /// </summary> - [Description("The temperature in dryer zone is too high. Cannot execute job")] + [Description("The temperature in dryer zone 1 is too high")] DRYER_ZONE_1_OVERTEMPERATURE = 4005, /// <summary> - /// (The temperature in dryer zone is too high. Cannot execute job) + /// (The temperature in dryer zone 2 is too high) /// </summary> - [Description("The temperature in dryer zone is too high. Cannot execute job")] + [Description("The temperature in dryer zone 2 is too high")] DRYER_ZONE_2_OVERTEMPERATURE = 4006, /// <summary> - /// (The temperature in dryer zone is too low. Cannot execute job) + /// (The temperature in dryer zone 1 is too low) /// </summary> - [Description("The temperature in dryer zone is too low. Cannot execute job")] + [Description("The temperature in dryer zone 1 is too low")] DRYER_ZONE_1_UNDERTEMPERATURE_A = 4007, /// <summary> - /// (The temperature in dryer zone is too low. Cannot execute job) + /// (The temperature in dryer zone 1 is too low) /// </summary> - [Description("The temperature in dryer zone is too low. Cannot execute job")] + [Description("The temperature in dryer zone 1 is too low")] DRYER_ZONE_1_UNDERTEMPERATURE_B = 4008, /// <summary> - /// (The temperature in dryer zone is too low. Cannot execute job) + /// (The temperature in dryer zone 2 is too low) /// </summary> - [Description("The temperature in dryer zone is too low. Cannot execute job")] + [Description("The temperature in dryer zone 2 is too low")] DRYER_ZONE_2_UNDERTEMPERATURE_B = 4009, /// <summary> - /// (Thermal cut-off. Cannot execute job) + /// (Thermal cut-off) /// </summary> - [Description("Thermal cut-off. Cannot execute job")] + [Description("Thermal cut-off")] DRYER_THERMAL_CUTOFF = 4010, /// <summary> - /// (Dryer zone current is out of range. Cannot execute job) + /// (Dryer zone current is out of range) /// </summary> - [Description("Dryer zone current is out of range. Cannot execute job")] + [Description("Dryer zone current is out of range")] DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE = 4011, /// <summary> - /// (Dryer zone current is out of range. Cannot execute job) + /// (Dryer zone current is out of range) /// </summary> - [Description("Dryer zone current is out of range. Cannot execute job")] + [Description("Dryer zone current is out of range")] DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE = 4012, /// <summary> - /// (Dryer zone current loop break. Cannot execute job) + /// (Dryer zone current loop break) /// </summary> - [Description("Dryer zone current loop break. Cannot execute job")] + [Description("Dryer zone current loop break")] DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK = 4013, /// <summary> - /// (Dryer zone current loop break. Cannot execute job) + /// (Dryer zone current loop break) /// </summary> - [Description("Dryer zone current loop break. Cannot execute job")] + [Description("Dryer zone current loop break")] DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK = 4014, /// <summary> - /// (Dryer fan RPM is too low. Cannot execute job) + /// (Dryer fan RPM is too low) /// </summary> - [Description("Dryer fan RPM is too low. Cannot execute job")] + [Description("Dryer fan RPM is too low")] DRYER_FAN_RPM_TOO_LOW = 4015, /// <summary> - /// (Dryer fan stopped. Cannot execute job) + /// (Dryer fan stopped) /// </summary> - [Description("Dryer fan stopped. Cannot execute job")] + [Description("Dryer fan stopped")] DRYER_FAN_STOPPED = 4016, /// <summary> - /// (The current in dryer lid motor is too high. Cannot execute job) + /// (The current in dryer lid motor is too high) /// </summary> - [Description("The current in dryer lid motor is too high. Cannot execute job")] + [Description("The current in dryer lid motor is too high")] DRYER_LID_MOTOR_OVERCURRENT = 4017, /// <summary> - /// (The temperature in the dryer lid motor is too high. Cannot execute job) + /// (The temperature in the dryer lid motor is too high) /// </summary> - [Description("The temperature in the dryer lid motor is too high. Cannot execute job")] + [Description("The temperature in the dryer lid motor is too high")] DRYER_LID_MOTOR_OVERTEMPERATURE = 4018, /// <summary> - /// (Dryer lid motor stalled. Cannot execute job) + /// (Dryer lid motor stalled) /// </summary> - [Description("Dryer lid motor stalled. Cannot execute job")] + [Description("Dryer lid motor stalled")] DRYER_LID_MOTOR_STALL = 4019, /// <summary> - /// (The dryer lid motor voltage is too low. Cannot execute job) + /// (The dryer lid motor voltage is too low) /// </summary> - [Description("The dryer lid motor voltage is too low. Cannot execute job")] + [Description("The dryer lid motor voltage is too low")] DRYER_LID_MOTOR_UNDERVOLTAGE = 4020, /// <summary> - /// (The temperature in dryer zone is too low. Cannot execute job) + /// (The temperature in dryer zone 2 is too low) /// </summary> - [Description("The temperature in dryer zone is too low. Cannot execute job")] + [Description("The temperature in dryer zone 2 is too low")] DRYER_ZONE_2_UNDERTEMPERATURE_A = 4021, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) + /// (The temperature in dyeing head zone is too high) /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] + [Description("The temperature in dyeing head zone is too high")] DYEING_HEAD_ZONE_1_OVERTEMPERATURE = 5000, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) + /// (The temperature in dyeing head zone is too high) /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] + [Description("The temperature in dyeing head zone is too high")] DYEING_HEAD_ZONE_2_OVERTEMPERATURE = 5001, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) + /// (The temperature in dyeing head zone is too high) /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] + [Description("The temperature in dyeing head zone is too high")] DYEING_HEAD_ZONE_3_OVERTEMPERATURE = 5002, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) + /// (The temperature in dyeing head zone is too high) /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] + [Description("The temperature in dyeing head zone is too high")] DYEING_HEAD_ZONE_4_OVERTEMPERATURE = 5003, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) + /// (The temperature in dyeing head zone is too high) /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] + [Description("The temperature in dyeing head zone is too high")] DYEING_HEAD_ZONE_5_OVERTEMPERATURE = 5004, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) + /// (The temperature in dyeing head zone is too high) /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] + [Description("The temperature in dyeing head zone is too high")] DYEING_HEAD_ZONE_6_OVERTEMPERATURE = 5005, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A = 5006, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A = 5007, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A = 5008, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A = 5009, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A = 5010, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A = 5011, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B = 5012, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B = 5013, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B = 5014, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B = 5015, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B = 5016, /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in dyeing head zone is too low) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] + [Description("The temperature in dyeing head zone is too low")] DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B = 5017, /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) + /// (Dyeing head zone current is out of range) /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] + [Description("Dyeing head zone current is out of range")] DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE = 5018, /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) + /// (Dyeing head zone current is out of range) /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] + [Description("Dyeing head zone current is out of range")] DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE = 5019, /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) + /// (Dyeing head zone current is out of range) /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] + [Description("Dyeing head zone current is out of range")] DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE = 5020, /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) + /// (Dyeing head zone current is out of range) /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] + [Description("Dyeing head zone current is out of range")] DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE = 5021, /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) + /// (Dyeing head zone current is out of range) /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_5_CURRENT_OUT_OF_RANGE = 5022, + [Description("Dyeing head zone current is out of range")] + DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE = 5022, /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) + /// (Dyeing head zone current loop break) /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] + [Description("Dyeing head zone current loop break")] DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK = 5023, /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) + /// (Dyeing head zone current loop break) /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] + [Description("Dyeing head zone current loop break")] DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK = 5024, /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) + /// (Dyeing head zone current loop break) /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] + [Description("Dyeing head zone current loop break")] DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK = 5025, /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) + /// (Dyeing head zone current loop break) /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] + [Description("Dyeing head zone current loop break")] DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK = 5026, /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) + /// (Dyeing head zone current loop break) /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_5_CURRENT_LOOP_BREAK = 5027, + [Description("Dyeing head zone current loop break")] + DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK = 5027, /// <summary> - /// (Thermal cut-off. Cannot execute job) + /// (Thermal cut-off) /// </summary> - [Description("Thermal cut-off. Cannot execute job")] + [Description("Thermal cut-off")] DYEING_HEAD_THERMAL_CUTOFF = 5028, /// <summary> - /// (Could not open the dyeing head cover. Cannot execute job) + /// (Could not open the dyeing head cover) /// </summary> - [Description("Could not open the dyeing head cover. Cannot execute job")] + [Description("Could not open the dyeing head cover")] DYEING_HEAD_COVER_OPEN_TIMEOUT = 5029, /// <summary> - /// (Could not close the dyeing head cover. Cannot execute job ) + /// (Could not close the dyeing head cover ) /// </summary> - [Description("Could not close the dyeing head cover. Cannot execute job ")] + [Description("Could not close the dyeing head cover ")] DYEING_HEAD_COVER_CLOSE_TIMEOUT = 5030, /// <summary> - /// (The current in the dyeing head cover motor is too high. Cannot execute job) + /// (The current in the dyeing head cover motor is too high) /// </summary> - [Description("The current in the dyeing head cover motor is too high. Cannot execute job")] + [Description("The current in the dyeing head cover motor is too high")] DYEING_HEAD_COVER_MOTOR_OVERCURRENT = 5031, /// <summary> - /// (The temperature in the dyeing head cover motor is too high. Cannot execute job) + /// (The temperature in the dyeing head cover motor is too high) /// </summary> - [Description("The temperature in the dyeing head cover motor is too high. Cannot execute job")] + [Description("The temperature in the dyeing head cover motor is too high")] DYEING_HEAD_COVER_MOTOR_OVERTEMPERATURE = 5032, /// <summary> - /// (Dyeing head cover motor stalled. Cannot execute job) + /// (Dyeing head cover motor stalled) /// </summary> - [Description("Dyeing head cover motor stalled. Cannot execute job")] + [Description("Dyeing head cover motor stalled")] DYEING_HEAD_COVER_MOTOR_STALL = 5033, /// <summary> - /// (The voltage in the dyeing head cover motor is too low. Cannot execute job) + /// (The voltage in the dyeing head cover motor is too low) /// </summary> - [Description("The voltage in the dyeing head cover motor is too low. Cannot execute job")] + [Description("The voltage in the dyeing head cover motor is too low")] DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE = 5034, /// <summary> - /// (The current in the dyeing head cleaning mechanism motor is too high. Cannot execute job) + /// (The current in the dyeing head cleaning mechanism motor is too high) /// </summary> - [Description("The current in the dyeing head cleaning mechanism motor is too high. Cannot execute job")] + [Description("The current in the dyeing head cleaning mechanism motor is too high")] DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT = 5035, /// <summary> - /// (The temperature in the dyeing head cleaning mechanism motor is too high. Cannot execute job) + /// (The temperature in the dyeing head cleaning mechanism motor is too high) /// </summary> - [Description("The temperature in the dyeing head cleaning mechanism motor is too high. Cannot execute job")] + [Description("The temperature in the dyeing head cleaning mechanism motor is too high")] DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERTEMPERATURE = 5036, /// <summary> - /// (Dyeing head cleaning mechanism motor stalled. Cannot execute job) + /// (Dyeing head cleaning mechanism motor stalled) /// </summary> - [Description("Dyeing head cleaning mechanism motor stalled. Cannot execute job")] + [Description("Dyeing head cleaning mechanism motor stalled")] DYEING_HEAD_CLEANING_MECHANISM_MOTOR_STALL = 5037, /// <summary> - /// (The voltage in dyeing head cleaning mechanism motor is too low. Cannot execute job) + /// (The voltage in dyeing head cleaning mechanism motor is too low) /// </summary> - [Description("The voltage in dyeing head cleaning mechanism motor is too low. Cannot execute job")] + [Description("The voltage in dyeing head cleaning mechanism motor is too low")] DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE = 5038, /// <summary> - /// (The current in the dyeing head cleaning head motor is too high. Cannot execute job) + /// (The current in the dyeing head cleaning head motor is too high) /// </summary> - [Description("The current in the dyeing head cleaning head motor is too high. Cannot execute job")] + [Description("The current in the dyeing head cleaning head motor is too high")] DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT = 5039, /// <summary> - /// (The temperature in the dyeing head cleaning head motor is too high. Cannot execute job) + /// (The temperature in the dyeing head cleaning head motor is too high) /// </summary> - [Description("The temperature in the dyeing head cleaning head motor is too high. Cannot execute job")] + [Description("The temperature in the dyeing head cleaning head motor is too high")] DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE = 5040, /// <summary> - /// (Dyeing head cleaning mechanism motor stalled. Cannot execute job) + /// (Dyeing head cleaning mechanism motor stalled) /// </summary> - [Description("Dyeing head cleaning mechanism motor stalled. Cannot execute job")] + [Description("Dyeing head cleaning mechanism motor stalled")] DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL = 5041, /// <summary> - /// (The voltage in dyeing head cleaning head motor is too low. Cannot execute job) + /// (The voltage in dyeing head cleaning head motor is too low) /// </summary> - [Description("The voltage in dyeing head cleaning head motor is too low. Cannot execute job")] + [Description("The voltage in dyeing head cleaning head motor is too low")] DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE = 5042, /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] - DYEING_HEAD_ZONE_7_OVERTEMPERATURE = 5043, - - /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] - DYEING_HEAD_ZONE_8_OVERTEMPERATURE = 5044, - - /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] - DYEING_HEAD_ZONE_9_OVERTEMPERATURE = 5045, - - /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] - DYEING_HEAD_ZONE_10_OVERTEMPERATURE = 5046, - - /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] - DYEING_HEAD_ZONE_11_OVERTEMPERATURE = 5047, - - /// <summary> - /// (The temperature in dyeing head zone is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too high. Cannot execute job")] - DYEING_HEAD_ZONE_12_OVERTEMPERATURE = 5048, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_A = 5049, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_A = 5050, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_A = 5051, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_A = 5052, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_A = 5053, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_A = 5054, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_B = 5055, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_B = 5056, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_B = 5057, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_B = 5058, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) + /// (The temperature in the mixer is too high) /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_B = 5059, - - /// <summary> - /// (The temperature in dyeing head zone is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head zone is too low. Cannot execute job")] - DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_B = 5060, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_6_CURRENT_OUT_OF_RANGE = 5061, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_7_CURRENT_OUT_OF_RANGE = 5062, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_8_CURRENT_OUT_OF_RANGE = 5063, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_9_CURRENT_OUT_OF_RANGE = 5064, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_10_CURRENT_OUT_OF_RANGE = 5065, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_11_CURRENT_OUT_OF_RANGE = 5066, - - /// <summary> - /// (Dyeing head zone current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current is out of range. Cannot execute job")] - DYEING_HEAD_ZONE_12_CURRENT_OUT_OF_RANGE = 5067, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_6_CURRENT_LOOP_BREAK = 5068, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_7_CURRENT_LOOP_BREAK = 5069, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_8_CURRENT_LOOP_BREAK = 5070, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_9_CURRENT_LOOP_BREAK = 5071, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_10_CURRENT_LOOP_BREAK = 5072, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_11_CURRENT_LOOP_BREAK = 5073, - - /// <summary> - /// (Dyeing head zone current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head zone current loop break. Cannot execute job")] - DYEING_HEAD_ZONE_12_CURRENT_LOOP_BREAK = 5074, - - /// <summary> - /// (The temperature in dyeing head blower is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head blower is too high. Cannot execute job")] - DYEING_HEAD_BLOWER_1_OVERTEMPERATURE = 5075, - - /// <summary> - /// (The temperature in dyeing head blower is too high. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head blower is too high. Cannot execute job")] - DYEING_HEAD_BLOWER_2_OVERTEMPERATURE = 5076, - - /// <summary> - /// (The temperature in dyeing head blower is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head blower is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_A = 5077, - - /// <summary> - /// (The temperature in dyeing head blower is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head blower is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_A = 5078, - - /// <summary> - /// (The temperature in dyeing head blower is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head blower is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_B = 5079, - - /// <summary> - /// (The temperature in dyeing head blower is too low. Cannot execute job) - /// </summary> - [Description("The temperature in dyeing head blower is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_B = 5080, - - /// <summary> - /// (Dyeing head blower current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head blower current is out of range. Cannot execute job")] - DYEING_HEAD_BLOWER_1_CURRENT_OUT_OF_RANGE = 5081, - - /// <summary> - /// (Dyeing head blower current is out of range. Cannot execute job) - /// </summary> - [Description("Dyeing head blower current is out of range. Cannot execute job")] - DYEING_HEAD_BLOWER_2_CURRENT_OUT_OF_RANGE = 5082, - - /// <summary> - /// (Dyeing head blower current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head blower current loop break. Cannot execute job")] - DYEING_HEAD_BLOWER_1_CURRENT_LOOP_BREAK = 5083, - - /// <summary> - /// (Dyeing head blower current loop break. Cannot execute job) - /// </summary> - [Description("Dyeing head blower current loop break. Cannot execute job")] - DYEING_HEAD_BLOWER_2_CURRENT_LOOP_BREAK = 5084, - - /// <summary> - /// (Dyeing head blower fan has stopped. Cannot execute job) - /// </summary> - [Description("Dyeing head blower fan has stopped. Cannot execute job")] - DYEING_HEAD_BLOWER_1_FAN_STOPPED = 5085, - - /// <summary> - /// (Dyeing head blower fan has stopped. Cannot execute job) - /// </summary> - [Description("Dyeing head blower fan has stopped. Cannot execute job")] - DYEING_HEAD_BLOWER_2_FAN_STOPPED = 5086, - - /// <summary> - /// (Dyeing head blower fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Dyeing head blower fan RPM is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_1_FAN_RPM_TOO_LOW = 5087, - - /// <summary> - /// (Dyeing head blower fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Dyeing head blower fan RPM is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_2_FAN_RPM_TOO_LOW = 5088, - - /// <summary> - /// (Dyeing head actuator did not reach position. Cannot execute job) - /// </summary> - [Description("Dyeing head actuator did not reach position. Cannot execute job")] - DYEING_HEAD_RIGHT_ACTUATOR_UP_TIMEOUT = 5089, - - /// <summary> - /// (Dyeing head actuator did not reach position. Cannot execute job) - /// </summary> - [Description("Dyeing head actuator did not reach position. Cannot execute job")] - DYEING_HEAD_LEFT_ACTUATOR_UP_TIMEOUT = 5090, - - /// <summary> - /// (Dyeing head actuator did not reach position. Cannot execute job) - /// </summary> - [Description("Dyeing head actuator did not reach position. Cannot execute job")] - DYEING_HEAD_RIGHT_ACTUATOR_DOWN_TIMEOUT = 5091, - - /// <summary> - /// (Dyeing head actuator did not reach position. Cannot execute job) - /// </summary> - [Description("Dyeing head actuator did not reach position. Cannot execute job")] - DYEING_HEAD_LEFT_ACTUATOR_DOWN_TIMEOUT = 5092, - - /// <summary> - /// (Dyeing head blower flow is too high. Cannot execute job) - /// </summary> - [Description("Dyeing head blower flow is too high. Cannot execute job")] - DYEING_HEAD_BLOWER_1_FLOW_TOO_HIGH = 5093, - - /// <summary> - /// (Dyeing head blower flow is too high. Cannot execute job) - /// </summary> - [Description("Dyeing head blower flow is too high. Cannot execute job")] - DYEING_HEAD_BLOWER_2_FLOW_TOO_HIGH = 5094, - - /// <summary> - /// (Dyeing head blower flow is too low. Cannot execute job) - /// </summary> - [Description("Dyeing head blower flow is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_1_FLOW_TOO_LOW = 5095, - - /// <summary> - /// (Dyeing head blower flow is too low. Cannot execute job) - /// </summary> - [Description("Dyeing head blower flow is too low. Cannot execute job")] - DYEING_HEAD_BLOWER_2_FLOW_TOO_LOW = 5096, - - /// <summary> - /// (Dyeing head arc lid is open. Cannot execute job.) - /// </summary> - [Description("Dyeing head arc lid is open. Cannot execute job.")] - DYEING_HEAD_ARC_LID_IS_OPEN = 5097, - - /// <summary> - /// (Dyeing head tunnel lid is open. Cannot execute job) - /// </summary> - [Description("Dyeing head tunnel lid is open. Cannot execute job")] - DYEING_HEAD_TUNNEL_LID_IS_OPEN = 5098, - - /// <summary> - /// (Dyeing head cover is open. Cannot execute job) - /// </summary> - [Description("Dyeing head cover is open. Cannot execute job")] - DYEING_HEAD_COVER_IS_OPEN = 5099, - - /// <summary> - /// (The temperature in the mixer is too high. Cannot execute job) - /// </summary> - [Description("The temperature in the mixer is too high. Cannot execute job")] + [Description("The temperature in the mixer is too high")] MIXER_OVERTEMPERATURE = 6000, /// <summary> - /// (The temperature in the mixer is too low. Cannot execute job) + /// (The temperature in the mixer is too low) /// </summary> - [Description("The temperature in the mixer is too low. Cannot execute job")] + [Description("The temperature in the mixer is too low")] MIXER_UNDERTEMPERATURE_A = 6001, /// <summary> - /// (The temperature in the mixer is too low. Cannot execute job) + /// (The temperature in the mixer is too low) /// </summary> - [Description("The temperature in the mixer is too low. Cannot execute job")] + [Description("The temperature in the mixer is too low")] MIXER_UNDERTEMPERATURE_B = 6002, /// <summary> - /// (Thermal cutoff. Cannot execute job) + /// (Thermal cutoff) /// </summary> - [Description("Thermal cutoff. Cannot execute job")] + [Description("Thermal cutoff")] MIXER_THERMAL_CUTOFF = 6003, /// <summary> - /// (Mixer current is out of range. Cannot execute job) + /// (Mixer current is out of range) /// </summary> - [Description("Mixer current is out of range. Cannot execute job")] + [Description("Mixer current is out of range")] MIXER_CURRENT_OUT_OF_RANGE = 6004, /// <summary> - /// (Mixer current loop break. Cannot execute job) + /// (Mixer current loop break) /// </summary> - [Description("Mixer current loop break. Cannot execute job")] + [Description("Mixer current loop break")] MIXER_CURRENT_LOOP_BREAK = 6005, /// <summary> - /// (Overpressure in black dispenser . Cannot execute job) + /// (Overpressure in dispenser 1 ) /// </summary> - [Description("Overpressure in black dispenser . Cannot execute job")] + [Description("Overpressure in dispenser 1 ")] DISPENSER_1_OVERPRESSURE = 7000, /// <summary> - /// (Overpressure in cyan dispenser. Cannot execute job ) + /// (Overpressure in dispenser 2) /// </summary> - [Description("Overpressure in cyan dispenser. Cannot execute job ")] + [Description("Overpressure in dispenser 2")] DISPENSER_2_OVERPRESSURE = 7001, /// <summary> - /// (Overpressure in magenta dispenser. Cannot execute job ) + /// (Overpressure in dispenser 3) /// </summary> - [Description("Overpressure in magenta dispenser. Cannot execute job ")] + [Description("Overpressure in dispenser 3")] DISPENSER_3_OVERPRESSURE = 7002, /// <summary> - /// (Overpressure in yellow dispenser. Cannot execute job ) + /// (Overpressure in dispenser 4) /// </summary> - [Description("Overpressure in yellow dispenser. Cannot execute job ")] + [Description("Overpressure in dispenser 4")] DISPENSER_4_OVERPRESSURE = 7003, /// <summary> - /// (Overpressure in transparent ink dispenser. Cannot execute job ) + /// (Overpressure in dispenser 5) /// </summary> - [Description("Overpressure in transparent ink dispenser. Cannot execute job ")] + [Description("Overpressure in dispenser 5")] DISPENSER_5_OVERPRESSURE = 7004, /// <summary> - /// (Overpressure in spot color 1 dispenser. Cannot execute job ) + /// (Overpressure in dispenser 6) /// </summary> - [Description("Overpressure in spot color 1 dispenser. Cannot execute job ")] + [Description("Overpressure in dispenser 6")] DISPENSER_6_OVERPRESSURE = 7005, /// <summary> - /// (Overpressure in cleaner dispenser. Cannot execute job ) + /// (Overpressure in dispenser 7) /// </summary> - [Description("Overpressure in cleaner dispenser. Cannot execute job ")] + [Description("Overpressure in dispenser 7")] DISPENSER_7_OVERPRESSURE = 7006, /// <summary> - /// (Overpressure in lubricant dispenser. Cannot execute job) + /// (Overpressure in dispenser 8) /// </summary> - [Description("Overpressure in lubricant dispenser. Cannot execute job")] + [Description("Overpressure in dispenser 8")] DISPENSER_8_OVERPRESSURE = 7007, /// <summary> - /// (The pressure in black dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 1 is too low) /// </summary> - [Description("The pressure in black dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 1 is too low")] DISPENSER_1_UNDERPRESSURE = 7008, /// <summary> - /// (The pressure in cyan dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 2 is too low) /// </summary> - [Description("The pressure in cyan dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 2 is too low")] DISPENSER_2_UNDERPRESSURE = 7009, /// <summary> - /// (The pressure in magenta dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 3 is too low) /// </summary> - [Description("The pressure in magenta dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 3 is too low")] DISPENSER_3_UNDERPRESSURE = 7010, /// <summary> - /// (The pressure in yellow dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 4 is too low) /// </summary> - [Description("The pressure in yellow dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 4 is too low")] DISPENSER_4_UNDERPRESSURE = 7011, /// <summary> - /// (The pressure in transparent ink dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 5 is too low) /// </summary> - [Description("The pressure in transparent ink dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 5 is too low")] DISPENSER_5_UNDERPRESSURE = 7012, /// <summary> - /// (The pressure in spot color 1 dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 6 is too low) /// </summary> - [Description("The pressure in spot color 1 dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 6 is too low")] DISPENSER_6_UNDERPRESSURE = 7013, /// <summary> - /// (The pressure in cleaner dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 7 is too low) /// </summary> - [Description("The pressure in cleaner dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 7 is too low")] DISPENSER_7_UNDERPRESSURE = 7014, /// <summary> - /// (The pressure in lubricant dispenser is too low. Cannot execute job) + /// (The pressure in dispenser 8 is too low) /// </summary> - [Description("The pressure in lubricant dispenser is too low. Cannot execute job")] + [Description("The pressure in dispenser 8 is too low")] DISPENSER_8_UNDERPRESSURE = 7015, /// <summary> - /// (Black dispenser is empty) + /// (Dispenser 1 is empty) /// </summary> - [Description("Black dispenser is empty")] + [Description("Dispenser 1 is empty")] DISPENSER_1_EMPTY = 7016, /// <summary> - /// (Cyan dispenser is empty) + /// (Dispenser 2 is empty) /// </summary> - [Description("Cyan dispenser is empty")] + [Description("Dispenser 2 is empty")] DISPENSER_2_EMPTY = 7017, /// <summary> - /// (Magenta dispenser is empty) + /// (Dispenser 3 is empty) /// </summary> - [Description("Magenta dispenser is empty")] + [Description("Dispenser 3 is empty")] DISPENSER_3_EMPTY = 7018, /// <summary> - /// (Yellow dispenser is empty) + /// (Dispenser 4 is empty) /// </summary> - [Description("Yellow dispenser is empty")] + [Description("Dispenser 4 is empty")] DISPENSER_4_EMPTY = 7019, /// <summary> - /// (Transparent ink dispenser is empty) + /// (Dispenser 5 is empty) /// </summary> - [Description("Transparent ink dispenser is empty")] + [Description("Dispenser 5 is empty")] DISPENSER_5_EMPTY = 7020, /// <summary> - /// (Spot color 1 dispenser is empty) + /// (Dispenser 6 is empty) /// </summary> - [Description("Spot color 1 dispenser is empty")] + [Description("Dispenser 6 is empty")] DISPENSER_6_EMPTY = 7021, /// <summary> - /// (Cleaner dispenser is empty) + /// (Dispenser 7 is empty) /// </summary> - [Description("Cleaner dispenser is empty")] + [Description("Dispenser 7 is empty")] DISPENSER_7_EMPTY = 7022, /// <summary> - /// (Lubricant dispenser is empty) + /// (Dispenser 8 is empty) /// </summary> - [Description("Lubricant dispenser is empty")] + [Description("Dispenser 8 is empty")] DISPENSER_8_EMPTY = 7023, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_1_REFILL_FAILURE = 7024, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_2_REFILL_FAILURE = 7025, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_3_REFILL_FAILURE = 7026, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_4_REFILL_FAILURE = 7027, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_5_REFILL_FAILURE = 7028, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_6_REFILL_FAILURE = 7029, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_7_REFILL_FAILURE = 7030, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Dispenser problem) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Dispenser problem")] DISPENSER_8_REFILL_FAILURE = 7031, /// <summary> - /// (Black dispenser motor current is too high. Cannot execute job) + /// (Dispenser 1 motor current is too high) /// </summary> - [Description("Black dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 1 motor current is too high")] DISPENSER_1_MOTOR_OVERCURRENT = 7032, /// <summary> - /// (Cyan dispenser motor current is too high. Cannot execute job) + /// (Dispenser 2 motor current is too high) /// </summary> - [Description("Cyan dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 2 motor current is too high")] DISPENSER_2_MOTOR_OVERCURRENT = 7033, /// <summary> - /// (Magenta dispenser motor current is too high. Cannot execute job) + /// (Dispenser 3 motor current is too high) /// </summary> - [Description("Magenta dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 3 motor current is too high")] DISPENSER_3_MOTOR_OVERCURRENT = 7034, /// <summary> - /// (Yellow dispenser motor current is too high. Cannot execute job) + /// (Dispenser 4 motor current is too high) /// </summary> - [Description("Yellow dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 4 motor current is too high")] DISPENSER_4_MOTOR_OVERCURRENT = 7035, /// <summary> - /// (Transparent ink dispenser motor current is too high. Cannot execute job) + /// (Dispenser 5 motor current is too high) /// </summary> - [Description("Transparent ink dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 5 motor current is too high")] DISPENSER_5_MOTOR_OVERCURRENT = 7036, /// <summary> - /// (Spot color 1 dispenser motor current is too high. Cannot execute job) + /// (Dispenser 6 motor current is too high) /// </summary> - [Description("Spot color 1 dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 6 motor current is too high")] DISPENSER_6_MOTOR_OVERCURRENT = 7037, /// <summary> - /// (Cleaner dispenser motor current is too high. Cannot execute job) + /// (Dispenser 7 motor current is too high) /// </summary> - [Description("Cleaner dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 7 motor current is too high")] DISPENSER_7_MOTOR_OVERCURRENT = 7038, /// <summary> - /// (Lubricant dispenser motor current is too high. Cannot execute job) + /// (Dispenser 8 motor current is too high) /// </summary> - [Description("Lubricant dispenser motor current is too high. Cannot execute job")] + [Description("Dispenser 8 motor current is too high")] DISPENSER_8_MOTOR_OVERCURRENT = 7039, /// <summary> - /// (Black dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 1 motor temperature is too high) /// </summary> - [Description("Black dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 1 motor temperature is too high")] DISPENSER_1_MOTOR_OVERTEMPERATURE = 7040, /// <summary> - /// (Cyan dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 2 motor temperature is too high) /// </summary> - [Description("Cyan dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 2 motor temperature is too high")] DISPENSER_2_MOTOR_OVERTEMPERATURE = 7041, /// <summary> - /// (Magenta dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 3 motor temperature is too high) /// </summary> - [Description("Magenta dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 3 motor temperature is too high")] DISPENSER_3_MOTOR_OVERTEMPERATURE = 7042, /// <summary> - /// (Yellow dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 4 motor temperature is too high) /// </summary> - [Description("Yellow dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 4 motor temperature is too high")] DISPENSER_4_MOTOR_OVERTEMPERATURE = 7043, /// <summary> - /// (Transparent ink dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 5 motor temperature is too high) /// </summary> - [Description("Transparent ink dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 5 motor temperature is too high")] DISPENSER_5_MOTOR_OVERTEMPERATURE = 7044, /// <summary> - /// (Spot color 1 dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 6 motor temperature is too high) /// </summary> - [Description("Spot color 1 dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 6 motor temperature is too high")] DISPENSER_6_MOTOR_OVERTEMPERATURE = 7045, /// <summary> - /// (Cleaner dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 7 motor temperature is too high) /// </summary> - [Description("Cleaner dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 7 motor temperature is too high")] DISPENSER_7_MOTOR_OVERTEMPERATURE = 7046, /// <summary> - /// (Lubricant dispenser motor temperature is too high. Cannot execute job) + /// (Dispenser 8 motor temperature is too high) /// </summary> - [Description("Lubricant dispenser motor temperature is too high. Cannot execute job")] + [Description("Dispenser 8 motor temperature is too high")] DISPENSER_8_MOTOR_OVERTEMPERATURE = 7047, /// <summary> - /// (Black dispenser motor stalled. Cannot execute job) + /// (Dispenser 1 motor stalled) /// </summary> - [Description("Black dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 1 motor stalled")] DISPENSER_1_MOTOR_STALL = 7048, /// <summary> - /// (Cyan dispenser motor stalled. Cannot execute job) + /// (Dispenser 2 motor stalled) /// </summary> - [Description("Cyan dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 2 motor stalled")] DISPENSER_2_MOTOR_STALL = 7049, /// <summary> - /// (Magenta dispenser motor stalled. Cannot execute job) + /// (Dispenser 3 motor stalled) /// </summary> - [Description("Magenta dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 3 motor stalled")] DISPENSER_3_MOTOR_STALL = 7050, /// <summary> - /// (Yellow dispenser 4 motor stalled. Cannot execute job) + /// (Dispenser 4 motor stalled) /// </summary> - [Description("Yellow dispenser 4 motor stalled. Cannot execute job")] + [Description("Dispenser 4 motor stalled")] DISPENSER_4_MOTOR_STALL = 7051, /// <summary> - /// (Transparent ink dispenser motor stalled. Cannot execute job) + /// (Dispenser 5 motor stalled) /// </summary> - [Description("Transparent ink dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 5 motor stalled")] DISPENSER_5_MOTOR_STALL = 7052, /// <summary> - /// (Spot color 1 dispenser motor stalled. Cannot execute job) + /// (Dispenser 6 motor stalled) /// </summary> - [Description("Spot color 1 dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 6 motor stalled")] DISPENSER_6_MOTOR_STALL = 7053, /// <summary> - /// (Cleaner dispenser motor stalled. Cannot execute job) + /// (Dispenser 7 motor stalled) /// </summary> - [Description("Cleaner dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 7 motor stalled")] DISPENSER_7_MOTOR_STALL = 7054, /// <summary> - /// (Lubricant dispenser motor stalled. Cannot execute job) + /// (Dispenser 8 motor stalled) /// </summary> - [Description("Lubricant dispenser motor stalled. Cannot execute job")] + [Description("Dispenser 8 motor stalled")] DISPENSER_8_MOTOR_STALL = 7055, /// <summary> - /// (Black dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 1 motor voltage is too low) /// </summary> - [Description("Black dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 1 motor voltage is too low")] DISPENSER_1_MOTOR_UNDERVOLTAGE = 7056, /// <summary> - /// (Cyan dispenser motor voltage is too low Cannot execute job) + /// (Dispenser 2 motor voltage is too low) /// </summary> - [Description("Cyan dispenser motor voltage is too low Cannot execute job")] + [Description("Dispenser 2 motor voltage is too low")] DISPENSER_2_MOTOR_UNDERVOLTAGE = 7057, /// <summary> - /// (Magenta dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 3 motor voltage is too low) /// </summary> - [Description("Magenta dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 3 motor voltage is too low")] DISPENSER_3_MOTOR_UNDERVOLTAGE = 7058, /// <summary> - /// (Yellow dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 4 motor voltage is too low) /// </summary> - [Description("Yellow dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 4 motor voltage is too low")] DISPENSER_4_MOTOR_UNDERVOLTAGE = 7059, /// <summary> - /// (Transparent ink dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 5 motor voltage is too low) /// </summary> - [Description("Transparent ink dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 5 motor voltage is too low")] DISPENSER_5_MOTOR_UNDERVOLTAGE = 7060, /// <summary> - /// (Spot color 1 dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 6 motor voltage is too low) /// </summary> - [Description("Spot color 1 dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 6 motor voltage is too low")] DISPENSER_6_MOTOR_UNDERVOLTAGE = 7061, /// <summary> - /// (Cleaner dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 7 motor voltage is too low) /// </summary> - [Description("Cleaner dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 7 motor voltage is too low")] DISPENSER_7_MOTOR_UNDERVOLTAGE = 7062, /// <summary> - /// (Lubricant dispenser motor voltage is too low. Cannot execute job) + /// (Dispenser 8 motor voltage is too low) /// </summary> - [Description("Lubricant dispenser motor voltage is too low. Cannot execute job")] + [Description("Dispenser 8 motor voltage is too low")] DISPENSER_8_MOTOR_UNDERVOLTAGE = 7063, /// <summary> - /// (Black dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 1 is at the upper limit) /// </summary> - [Description("Black dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 1 is at the upper limit")] DISPENSER_1_UPPER_HARD_LIMIT = 7064, /// <summary> - /// (Cyan dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 2 is at the upper limit) /// </summary> - [Description("Cyan dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 2 is at the upper limit")] DISPENSER_2_UPPER_HARD_LIMIT = 7065, /// <summary> - /// (Magenta dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 3 is at the upper limit) /// </summary> - [Description("Magenta dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 3 is at the upper limit")] DISPENSER_3_UPPER_HARD_LIMIT = 7066, /// <summary> - /// (Yellow dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 4 is at the upper limit) /// </summary> - [Description("Yellow dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 4 is at the upper limit")] DISPENSER_4_UPPER_HARD_LIMIT = 7067, /// <summary> - /// (Transparent ink dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 5 is at the upper limit) /// </summary> - [Description("Transparent ink dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 5 is at the upper limit")] DISPENSER_5_UPPER_HARD_LIMIT = 7068, /// <summary> - /// (Spot color 1 dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 6 is at the upper limit) /// </summary> - [Description("Spot color 1 dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 6 is at the upper limit")] DISPENSER_6_UPPER_HARD_LIMIT = 7069, /// <summary> - /// (Cleaner dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 7 is at the upper limit) /// </summary> - [Description("Cleaner dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 7 is at the upper limit")] DISPENSER_7_UPPER_HARD_LIMIT = 7070, /// <summary> - /// (Lubricant dispenser is at the upper limit. Cannot execute job) + /// (Dispenser 8 is at the upper limit) /// </summary> - [Description("Lubricant dispenser is at the upper limit. Cannot execute job")] + [Description("Dispenser 8 is at the upper limit")] DISPENSER_8_UPPER_HARD_LIMIT = 7071, /// <summary> - /// (Black dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 1 is at the lower limit) /// </summary> - [Description("Black dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 1 is at the lower limit")] DISPENSER_1_LOWER_HARD_LIMIT = 7072, /// <summary> - /// (Cyan dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 2 is at the lower limit) /// </summary> - [Description("Cyan dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 2 is at the lower limit")] DISPENSER_2_LOWER_HARD_LIMIT = 7073, /// <summary> - /// (Magenta dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 3 is at the lower limit) /// </summary> - [Description("Magenta dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 3 is at the lower limit")] DISPENSER_3_LOWER_HARD_LIMIT = 7074, /// <summary> - /// (Yellow dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 4 is at the lower limit) /// </summary> - [Description("Yellow dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 4 is at the lower limit")] DISPENSER_4_LOWER_HARD_LIMIT = 7075, /// <summary> - /// (Transparent ink dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 5 is at the lower limit) /// </summary> - [Description("Transparent ink dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 5 is at the lower limit")] DISPENSER_5_LOWER_HARD_LIMIT = 7076, /// <summary> - /// (Spot color 1 dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 6 is at the lower limit) /// </summary> - [Description("Spot color 1 dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 6 is at the lower limit")] DISPENSER_6_LOWER_HARD_LIMIT = 7077, /// <summary> - /// (Cleaner dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 7 is at the lower limit) /// </summary> - [Description("Cleaner dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 7 is at the lower limit")] DISPENSER_7_LOWER_HARD_LIMIT = 7078, /// <summary> - /// (Lubricant dispenser is at the lower limit. Cannot execute job) + /// (Dispenser 8 is at the lower limit) /// </summary> - [Description("Lubricant dispenser is at the lower limit. Cannot execute job")] + [Description("Dispenser 8 is at the lower limit")] DISPENSER_8_LOWER_HARD_LIMIT = 7079, /// <summary> - /// (Pressure in black dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 1 is too high) /// </summary> - [Description("Pressure in black dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 1 is too high")] DISPENSER_1_HIGH_PRESSURE = 7080, /// <summary> - /// (Pressure in cyan dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 2 is too high) /// </summary> - [Description("Pressure in cyan dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 2 is too high")] DISPENSER_2_HIGH_PRESSURE = 7081, /// <summary> - /// (Pressure in magenta dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 3 is too high) /// </summary> - [Description("Pressure in magenta dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 3 is too high")] DISPENSER_3_HIGH_PRESSURE = 7082, /// <summary> - /// (Pressure in yellow dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 4 is too high) /// </summary> - [Description("Pressure in yellow dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 4 is too high")] DISPENSER_4_HIGH_PRESSURE = 7083, /// <summary> - /// (Pressure in transparent ink dispenser is too high. Cannot execue job) + /// (Pressure in dispenser 5 is too high) /// </summary> - [Description("Pressure in transparent ink dispenser is too high. Cannot execue job")] + [Description("Pressure in dispenser 5 is too high")] DISPENSER_5_HIGH_PRESSURE = 7084, /// <summary> - /// (Pressure in spot color 1 dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 6 is too high) /// </summary> - [Description("Pressure in spot color 1 dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 6 is too high")] DISPENSER_6_HIGH_PRESSURE = 7085, /// <summary> - /// (Pressure in cleaner dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 7 is too high) /// </summary> - [Description("Pressure in cleaner dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 7 is too high")] DISPENSER_7_HIGH_PRESSURE = 7086, /// <summary> - /// (Pressure in lubricant dispenser is too high. Cannot execute job) + /// (Pressure in dispenser 8 is too high) /// </summary> - [Description("Pressure in lubricant dispenser is too high. Cannot execute job")] + [Description("Pressure in dispenser 8 is too high")] DISPENSER_8_HIGH_PRESSURE = 7087, /// <summary> - /// (Black ink level is low) - /// </summary> - [Description("Black ink level is low")] - MID_TANK_1_LOW_LEVEL = 8000, - - /// <summary> /// (Cyan ink level is low) /// </summary> [Description("Cyan ink level is low")] - MID_TANK_2_LOW_LEVEL = 8001, + MID_TANK_1_LOW_LEVEL = 8000, /// <summary> /// (Magenta ink level is low) /// </summary> [Description("Magenta ink level is low")] - MID_TANK_3_LOW_LEVEL = 8002, + MID_TANK_2_LOW_LEVEL = 8001, /// <summary> /// (Yellow ink level is low) /// </summary> [Description("Yellow ink level is low")] + MID_TANK_3_LOW_LEVEL = 8002, + + /// <summary> + /// (Black ink level is low) + /// </summary> + [Description("Black ink level is low")] MID_TANK_4_LOW_LEVEL = 8003, /// <summary> @@ -1892,406 +1496,256 @@ namespace Tango.BL.Enumerations MID_TANK_5_LOW_LEVEL = 8004, /// <summary> - /// (Spot color I level is low) + /// (Transparent cleaning level is low) /// </summary> - [Description("Spot color I level is low")] + [Description("Transparent cleaning level is low")] MID_TANK_6_LOW_LEVEL = 8005, /// <summary> - /// (Cleaner level is low) + /// (Lubricant level is low) /// </summary> - [Description("Cleaner level is low")] + [Description("Lubricant level is low")] MID_TANK_7_LOW_LEVEL = 8006, /// <summary> - /// (Lubricant level is low) + /// (Spot color I level is low) /// </summary> - [Description("Lubricant level is low")] + [Description("Spot color I level is low")] MID_TANK_8_LOW_LEVEL = 8007, /// <summary> - /// (Black ink is empty. Cannnot execute job) + /// (Cyan ink is empty) /// </summary> - [Description("Black ink is empty. Cannnot execute job")] + [Description("Cyan ink is empty")] MID_TANK_1_EMPTY = 8008, /// <summary> - /// (Cyan ink is empty. Cannot execute job) + /// (Magenta ink is empty) /// </summary> - [Description("Cyan ink is empty. Cannot execute job")] + [Description("Magenta ink is empty")] MID_TANK_2_EMPTY = 8009, /// <summary> - /// (Magenta ink is empty. Cannot execute job) + /// (Yellow ink is empty) /// </summary> - [Description("Magenta ink is empty. Cannot execute job")] + [Description("Yellow ink is empty")] MID_TANK_3_EMPTY = 8010, /// <summary> - /// (Yellow ink is empty. Cannot execute job) + /// (Black ink is empty) /// </summary> - [Description("Yellow ink is empty. Cannot execute job")] + [Description("Black ink is empty")] MID_TANK_4_EMPTY = 8011, /// <summary> - /// (Transparent ink is empty. Cannot execute job) + /// (Transparent ink is empty) /// </summary> - [Description("Transparent ink is empty. Cannot execute job")] + [Description("Transparent ink is empty")] MID_TANK_5_EMPTY = 8012, /// <summary> - /// (Spot color I is empty. Cannot execute job) + /// (Transparent cleaning is empty) /// </summary> - [Description("Spot color I is empty. Cannot execute job")] + [Description("Transparent cleaning is empty")] MID_TANK_6_EMPTY = 8013, /// <summary> - /// (Cleaner is empty. Cannot execute job) + /// (Lubricant is empty) /// </summary> - [Description("Cleaner is empty. Cannot execute job")] + [Description("Lubricant is empty")] MID_TANK_7_EMPTY = 8014, /// <summary> - /// (Lubricant is empty. Cannot execute job) + /// (Spot color I is empty) /// </summary> - [Description("Lubricant is empty. Cannot execute job")] + [Description("Spot color I is empty")] MID_TANK_8_EMPTY = 8015, /// <summary> - /// (Black ink overflow. Cannot execute job) + /// (Cyan ink overflow) /// </summary> - [Description("Black ink overflow. Cannot execute job")] + [Description("Cyan ink overflow")] MID_TANK_1_OVERFLOW = 8016, /// <summary> - /// (Cyan ink overflow. Cannot execute job) + /// (Magenta ink overflow) /// </summary> - [Description("Cyan ink overflow. Cannot execute job")] + [Description("Magenta ink overflow")] MID_TANK_2_OVERFLOW = 8017, /// <summary> - /// (Magenta ink overflow. Cannot execute job) + /// (Yellow ink overflow) /// </summary> - [Description("Magenta ink overflow. Cannot execute job")] + [Description("Yellow ink overflow")] MID_TANK_3_OVERFLOW = 8018, /// <summary> - /// (Yellow ink overflow. Cannot execute job) + /// (Black ink overflow) /// </summary> - [Description("Yellow ink overflow. Cannot execute job")] + [Description("Black ink overflow")] MID_TANK_4_OVERFLOW = 8019, /// <summary> - /// (Transparent ink overflow. Cannot execute job) + /// (Transparent ink overflow) /// </summary> - [Description("Transparent ink overflow. Cannot execute job")] + [Description("Transparent ink overflow")] MID_TANK_5_OVERFLOW = 8020, /// <summary> - /// (Spot color 1 overflow. Cannot execute job) + /// (Transparent cleaning overflow) /// </summary> - [Description("Spot color 1 overflow. Cannot execute job")] + [Description("Transparent cleaning overflow")] MID_TANK_6_OVERFLOW = 8021, /// <summary> - /// (Cleaner overflow. Cannot execute job) + /// (Lubricant overflow) /// </summary> - [Description("Cleaner overflow. Cannot execute job")] + [Description("Lubricant overflow")] MID_TANK_7_OVERFLOW = 8022, /// <summary> - /// (Lubricant overflow. Cannot execute job) + /// (Spot color I overflow) /// </summary> - [Description("Lubricant overflow. Cannot execute job")] + [Description("Spot color I overflow")] MID_TANK_8_OVERFLOW = 8023, /// <summary> - /// (Failed to fill black ink. Cannot execute job) + /// (Failed to fill cyan ink) /// </summary> - [Description("Failed to fill black ink. Cannot execute job")] + [Description("Failed to fill cyan ink")] MID_TANK_1_FILL_TIMEOUT = 8024, /// <summary> - /// (Failed to fill cyan ink. Cannot execute job) + /// (Failed to fill magenta ink) /// </summary> - [Description("Failed to fill cyan ink. Cannot execute job")] + [Description("Failed to fill magenta ink")] MID_TANK_2_FILL_TIMEOUT = 8025, /// <summary> - /// (Failed to fill magenta ink. Cannot execute job) + /// (Failed to fill yellow ink) /// </summary> - [Description("Failed to fill magenta ink. Cannot execute job")] + [Description("Failed to fill yellow ink")] MID_TANK_3_FILL_TIMEOUT = 8026, /// <summary> - /// (Failed to fill yellow ink. Cannot execute job) + /// (Failed to fill black ink) /// </summary> - [Description("Failed to fill yellow ink. Cannot execute job")] + [Description("Failed to fill black ink")] MID_TANK_4_FILL_TIMEOUT = 8027, /// <summary> - /// (Failed to fill transparent ink. Canot execute job) + /// (Failed to fill transparent ink) /// </summary> - [Description("Failed to fill transparent ink. Canot execute job")] + [Description("Failed to fill transparent ink")] MID_TANK_5_FILL_TIMEOUT = 8028, /// <summary> - /// (Failed to fill spot color 1 ink. Cannot execute job) + /// (Failed to fill transparent cleaning ink) /// </summary> - [Description("Failed to fill spot color 1 ink. Cannot execute job")] + [Description("Failed to fill transparent cleaning ink")] MID_TANK_6_FILL_TIMEOUT = 8029, /// <summary> - /// (Failed to fill cleaner. Cannot execute job) + /// (Failed to fill lubricant) /// </summary> - [Description("Failed to fill cleaner. Cannot execute job")] + [Description("Failed to fill lubricant")] MID_TANK_7_FILL_TIMEOUT = 8030, /// <summary> - /// (Failed to fill lubricant. Cannot execute job) + /// (Failed to fill spot color I) /// </summary> - [Description("Failed to fill lubricant. Cannot execute job")] + [Description("Failed to fill spot color I")] MID_TANK_8_FILL_TIMEOUT = 8031, /// <summary> - /// (Cannot detect air filter. Cannot execute job ) + /// (Cannot detect air filter ) /// </summary> - [Description("Cannot detect air filter. Cannot execute job ")] + [Description("Cannot detect air filter ")] AIR_FILTER_NOT_INSTALLED = 9000, /// <summary> - /// (Air filter clogged. Cannot execute job) + /// (Air filter clogged) /// </summary> - [Description("Air filter clogged. Cannot execute job")] + [Description("Air filter clogged")] AIR_FILTER_CLOGGED = 9001, /// <summary> - /// (Recycled ink emptying failure. Cannot execute job) + /// (Recycled ink emptying failure) /// </summary> - [Description("Recycled ink emptying failure. Cannot execute job")] + [Description("Recycled ink emptying failure")] WASTE_CONTAINER_EMPTYING_TIMEOUT = 9002, /// <summary> - /// (No suction in the recycled ink handling system. Cannot execute job) + /// (No suction in the recycled ink handling system) /// </summary> - [Description("No suction in the recycled ink handling system. Cannot execute job")] + [Description("No suction in the recycled ink handling system")] NO_AIR_PRESSURE = 9003, /// <summary> - /// (Overflow in recycled ink container. Cannot execute job) + /// (Overflow in recycled ink container) /// </summary> - [Description("Overflow in recycled ink container. Cannot execute job")] + [Description("Overflow in recycled ink container")] WASTE_CONTAINER_OVERFLOW = 9004, /// <summary> - /// (Air quality alert. Cannot execute job) + /// (Air quality alert) /// </summary> - [Description("Air quality alert. Cannot execute job")] + [Description("Air quality alert")] VOC_SENSOR_ALARM_TIME = 9005, /// <summary> - /// (Chiller malfunction. Cannot execute job) + /// (Chiller malfunction) /// </summary> - [Description("Chiller malfunction. Cannot execute job")] + [Description("Chiller malfunction")] CHILLER_DRY_CONTACT = 9006, /// <summary> - /// (Insufficient air flow. Cannot execute job) + /// (Insufficient air flow) /// </summary> - [Description("Insufficient air flow. Cannot execute job")] + [Description("Insufficient air flow")] INSUFFICIENT_AIR_FLOW = 9007, /// <summary> - /// (Air quality alert. Cannot execute job) + /// (Air quality alert) /// </summary> - [Description("Air quality alert. Cannot execute job")] + [Description("Air quality alert")] VOC_SENSOR_ALARM_SLOPE = 9008, /// <summary> - /// (Pre-cooler fan has stopped. Cannot execute job) - /// </summary> - [Description("Pre-cooler fan has stopped. Cannot execute job")] - PRE_COOLER_FAN_1_STOPPED = 9009, - - /// <summary> - /// (Pre-cooler fan has stopped. Cannot execute job) - /// </summary> - [Description("Pre-cooler fan has stopped. Cannot execute job")] - PRE_COOLER_FAN_2_STOPPED = 9010, - - /// <summary> - /// (Cooler fan has stopped. Cannot execute job) - /// </summary> - [Description("Cooler fan has stopped. Cannot execute job")] - COOLER_FAN_1_STOPPED = 9011, - - /// <summary> - /// (Cooler fan has stopped. Cannot execute job) - /// </summary> - [Description("Cooler fan has stopped. Cannot execute job")] - COOLER_FAN_2_STOPPED = 9012, - - /// <summary> - /// (Cooler fan has stopped. Cannot execute job) - /// </summary> - [Description("Cooler fan has stopped. Cannot execute job")] - COOLER_FAN_3_STOPPED = 9013, - - /// <summary> - /// (Cooler fan has stopped. Cannot execute job) - /// </summary> - [Description("Cooler fan has stopped. Cannot execute job")] - COOLER_FAN_4_STOPPED = 9014, - - /// <summary> - /// (Pre-cooler fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Pre-cooler fan RPM is too low. Cannot execute job")] - PRE_COOLER_FAN_1_RPM_TOO_LOW = 9015, - - /// <summary> - /// (Pre-cooler fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Pre-cooler fan RPM is too low. Cannot execute job")] - PRE_COOLER_FAN_2_RPM_TOO_LOW = 9016, - - /// <summary> - /// (Cooler fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Cooler fan RPM is too low. Cannot execute job")] - COOLER_FAN_1_RPM_TOO_LOW = 9017, - - /// <summary> - /// (Cooler fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Cooler fan RPM is too low. Cannot execute job")] - COOLER_FAN_2_RPM_TOO_LOW = 9018, - - /// <summary> - /// (Cooler fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Cooler fan RPM is too low. Cannot execute job")] - COOLER_FAN_3_RPM_TOO_LOW = 9019, - - /// <summary> - /// (Cooler fan RPM is too low. Cannot execute job) - /// </summary> - [Description("Cooler fan RPM is too low. Cannot execute job")] - COOLER_FAN_4_RPM_TOO_LOW = 9020, - - /// <summary> - /// (Cooler temperature is too high. Cannot execute job) - /// </summary> - [Description("Cooler temperature is too high. Cannot execute job")] - COOLER_TEMPERATURE_TOO_HIGH = 9021, - - /// <summary> - /// (Cooler temperature is too low. Cannot execute job) + /// (Cannot detect ink cartridge) /// </summary> - [Description("Cooler temperature is too low. Cannot execute job")] - COOLER_TEMPERATURE_TOO_LOW = 9022, - - /// <summary> - /// (Cannot detect ink cartridge. Cannot execute job) - /// </summary> - [Description("Cannot detect ink cartridge. Cannot execute job")] + [Description("Cannot detect ink cartridge")] INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10000, /// <summary> - /// (Cannot identify ink cartridge. Cannot execute job ) + /// (Cannot identify ink cartridge ) /// </summary> - [Description("Cannot identify ink cartridge. Cannot execute job ")] + [Description("Cannot identify ink cartridge ")] INK_CARTRIDGE_RFID_TIMEOUT = 10001, /// <summary> - /// (No waste cartridge in system. Cannot execute job. Please insert waste cartridge) + /// (No Re-cartridge available) /// </summary> - [Description("No waste cartridge in system. Cannot execute job. Please insert waste cartridge")] + [Description("No Re-cartridge available")] NO_WASTE_CARTRIDGE_AVAILABLE = 10002, /// <summary> - /// (Both waste cartridges are full. Cannot execute job. Please replace waste cartridges) + /// (All Re-cartridges are full) /// </summary> - [Description("Both waste cartridges are full. Cannot execute job. Please replace waste cartridges")] + [Description("All Re-cartridges are full")] ALL_WASTE_CARTRIDGES_FULL = 10003, /// <summary> - /// (Cannot detect waste cartridge. Cannot execute job ) + /// (Cannot detect Re-cartridge ) /// </summary> - [Description("Cannot detect waste cartridge. Cannot execute job ")] + [Description("Cannot detect Re-cartridge ")] WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10004, /// <summary> - /// (Cannot identify waste cartridge. Cannot execute job ) + /// (Cannot identify Re-cartridge ) /// </summary> - [Description("Cannot identify waste cartridge. Cannot execute job ")] + [Description("Cannot identify Re-cartridge ")] WASTE_CARTRIDGE_RFID_TIMEOUT = 10005, - /// <summary> - /// (Ink cartridge failure. Cannot perform ink filling) - /// </summary> - [Description("Ink cartridge failure. Cannot perform ink filling")] - INK_CARTRIDGE_RFID_TAG_CANNOT_BE_READ = 10006, - - /// <summary> - /// (Waste cartridge failure. Cannot replace waste cartridge) - /// </summary> - [Description("Waste cartridge failure. Cannot replace waste cartridge")] - WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_READ = 10007, - - /// <summary> - /// (Ink cartridge failure. Cannot perform ink filling) - /// </summary> - [Description("Ink cartridge failure. Cannot perform ink filling")] - INK_CARTRIDGE_RFID_TAG_IS_NOT_VALID = 10008, - - /// <summary> - /// (Waste cartridge failure. Cannot replace waste cartridge) - /// </summary> - [Description("Waste cartridge failure. Cannot replace waste cartridge")] - WASTE_CARTRIDGE_RFID_TAG_IS_NOT_VALID = 10009, - - /// <summary> - /// (Ink cartridge failure. Cannot perform ink filling) - /// </summary> - [Description("Ink cartridge failure. Cannot perform ink filling")] - INK_CARTRIDGE_AUTHENTICATION_FAILED = 10010, - - /// <summary> - /// (Waste cartridge failure. Cannot replace waste cartridge) - /// </summary> - [Description("Waste cartridge failure. Cannot replace waste cartridge")] - WASTE_CARTRIDGE_AUTHENTICATION_FAILED = 10011, - - /// <summary> - /// (Ink cartridge failure. Cannot perform ink filling) - /// </summary> - [Description("Ink cartridge failure. Cannot perform ink filling")] - INK_CARTRIDGE_IS_BLOCKED = 10012, - - /// <summary> - /// (Waste cartridge failure. Cannot replace waste cartridge) - /// </summary> - [Description("Waste cartridge failure. Cannot replace waste cartridge")] - WASTE_CARTRIDGE_IS_BLOCKED = 10013, - - /// <summary> - /// (Ink cartridge failure. Cannot perform ink filling) - /// </summary> - [Description("Ink cartridge failure. Cannot perform ink filling")] - INK_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED = 10014, - - /// <summary> - /// (Waste cartridge failure. Cannot replace waste cartridge) - /// </summary> - [Description("Waste cartridge failure. Cannot replace waste cartridge")] - WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED = 10015, - - /// <summary> - /// (Ink in cartridge is expired. Cannot perform ink filling) - /// </summary> - [Description("Ink in cartridge is expired. Cannot perform ink filling")] - INK_IN_CARTRIDGE_IS_EXPIRED = 10016, - } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs index c8787f68a..1f2a3deec 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs @@ -25,35 +25,5 @@ namespace Tango.BL.Enumerations [Description("Default Blower")] DefaultBlower = 0, - /// <summary> - /// (Head Blower 1) - /// </summary> - [Description("Head Blower 1")] - HeadBlower1 = 1, - - /// <summary> - /// (Head Blower 2) - /// </summary> - [Description("Head Blower 2")] - HeadBlower2 = 2, - - /// <summary> - /// (WHS Blower 2) - /// </summary> - [Description("WHS Blower 2")] - WHSBlower2 = 3, - - /// <summary> - /// (WHS Small Fans) - /// </summary> - [Description("WHS Small Fans")] - WHSSmallFans = 4, - - /// <summary> - /// (WHS Large Fans) - /// </summary> - [Description("WHS Large Fans")] - WHSLargeFans = 5, - } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareDancerTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareDancerTypes.cs index 2684f7dc4..385df558b 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareDancerTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareDancerTypes.cs @@ -37,17 +37,5 @@ namespace Tango.BL.Enumerations [Description("Right Dancer")] RightDancer = 2, - /// <summary> - /// (Third Dancer) - /// </summary> - [Description("Third Dancer")] - ThirdDancer = 3, - - /// <summary> - /// (Fourth Dancer) - /// </summary> - [Description("Fourth Dancer")] - FourthDancer = 4, - } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs index 85e302598..6322ba4e1 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs @@ -157,65 +157,5 @@ namespace Tango.BL.Enumerations [Description("Dispenser 8")] Dispenser8 = 22, - /// <summary> - /// (Head Heater Zone 7) - /// </summary> - [Description("Head Heater Zone 7")] - HeadHeaterZ7 = 23, - - /// <summary> - /// (Head Heater Zone 8) - /// </summary> - [Description("Head Heater Zone 8")] - HeadHeaterZ8 = 24, - - /// <summary> - /// (Head Heater Zone 9) - /// </summary> - [Description("Head Heater Zone 9")] - HeadHeaterZ9 = 25, - - /// <summary> - /// (Head Heater Zone 10) - /// </summary> - [Description("Head Heater Zone 10")] - HeadHeaterZ10 = 26, - - /// <summary> - /// (Head Heater Zone 11) - /// </summary> - [Description("Head Heater Zone 11")] - HeadHeaterZ11 = 27, - - /// <summary> - /// (Head Heater Zone 12) - /// </summary> - [Description("Head Heater Zone 12")] - HeadHeaterZ12 = 28, - - /// <summary> - /// (Head Cover Heater 1) - /// </summary> - [Description("Head Cover Heater 1")] - HeadCoverHeater1 = 29, - - /// <summary> - /// (Head Cover Heater 2) - /// </summary> - [Description("Head Cover Heater 2")] - HeadCoverHeater2 = 30, - - /// <summary> - /// (Head Blower 1) - /// </summary> - [Description("Head Blower 1")] - HeadBlower_1 = 31, - - /// <summary> - /// (Head Blower 2) - /// </summary> - [Description("Head Blower 2")] - HeadBlower_2 = 32, - } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs deleted file mode 100644 index c110958f8..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/HeadTypes.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Enumerations -{ - public enum HeadTypes - { - Flat = 0, - Arc = 1, - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/JobSource.cs b/Software/Visual_Studio/Tango.BL/Enumerations/JobSource.cs deleted file mode 100644 index 2327f5b66..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/JobSource.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Enumerations -{ - public enum JobSource - { - /// <summary> - /// The job was originated from an application that is working directly against the main db (Machine Studio etc.) - /// </summary> - Remote = 0, - /// <summary> - /// The job was originated from an application that is working against a private local db (PPC etc.). - /// </summary> - Local = 1, - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs index 0f72ebbd0..e8dc67695 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs @@ -20,12 +20,6 @@ namespace Tango.BL.Enumerations { /// <summary> - /// (Light Cyan) - /// </summary> - [Description("Light Cyan")] - LightCyan = 7, - - /// <summary> /// (Cyan) /// </summary> [Description("Cyan")] @@ -50,18 +44,6 @@ namespace Tango.BL.Enumerations Lubricant = 5, /// <summary> - /// (Light Magenta) - /// </summary> - [Description("Light Magenta")] - LightMagenta = 8, - - /// <summary> - /// (Light Yellow) - /// </summary> - [Description("Light Yellow")] - LightYellow = 9, - - /// <summary> /// (Yellow) /// </summary> [Description("Yellow")] diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs index 58a57cbc9..8b85f5ddf 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs @@ -20,16 +20,10 @@ namespace Tango.BL.Enumerations { /// <summary> - /// (Allows loading the tech board module in Machine Studio) - /// </summary> - [Description("Allows loading the tech board module in Machine Studio")] - RunTechBoardModule = 0, - - /// <summary> - /// (Allows loading the research module in Machine Studio) + /// (Allows loading the Users & Roles module in machine studio) /// </summary> - [Description("Allows loading the research module in Machine Studio")] - RunResearchModule = 1, + [Description("Allows loading the Users & Roles module in machine studio")] + RunUsersAndRolesModule = 10, /// <summary> /// (Allows loading the database module in Machine Studio) @@ -38,22 +32,16 @@ namespace Tango.BL.Enumerations RunDataBaseModule = 2, /// <summary> - /// (Allows loading the synchronization module in machine studio) - /// </summary> - [Description("Allows loading the synchronization module in machine studio")] - RunSynchronizationModule = 3, - - /// <summary> /// (Allows loading the machine designer module in Machine Studio) /// </summary> [Description("Allows loading the machine designer module in Machine Studio")] RunMachineDesignerModule = 4, /// <summary> - /// (Allows loading the data capture module in Machine Studio) + /// (Allows loading the ColorLab module in Machine Studio) /// </summary> - [Description("Allows loading the data capture module in Machine Studio")] - RunDataCaptureModule = 5, + [Description("Allows loading the ColorLab module in Machine Studio")] + RunColorLabModule = 9, /// <summary> /// (Allows the execution of Machine Studio) @@ -74,34 +62,40 @@ namespace Tango.BL.Enumerations RunStubsModule = 8, /// <summary> - /// (Allows loading the ColorLab module in Machine Studio) + /// (Allows running the PPC software.) /// </summary> - [Description("Allows loading the ColorLab module in Machine Studio")] - RunColorLabModule = 9, + [Description("Allows running the PPC software.")] + RunPPC = 15, /// <summary> - /// (Allows loading the Users & Roles module in machine studio) + /// (Allows loading the tech board module in Machine Studio) /// </summary> - [Description("Allows loading the Users & Roles module in machine studio")] - RunUsersAndRolesModule = 10, + [Description("Allows loading the tech board module in Machine Studio")] + RunTechBoardModule = 0, /// <summary> - /// (Allows openning the machine studio developer console) + /// (Allows loading the research module in Machine Studio) /// </summary> - [Description("Allows openning the machine studio developer console")] - RunDeveloperConsole = 11, + [Description("Allows loading the research module in Machine Studio")] + RunResearchModule = 1, /// <summary> - /// (Allows loading the RML module in Machine Studio) + /// (Allows loading the synchronization module in machine studio) /// </summary> - [Description("Allows loading the RML module in Machine Studio")] - RunRMLModule = 14, + [Description("Allows loading the synchronization module in machine studio")] + RunSynchronizationModule = 3, /// <summary> - /// (Allows running the PPC software.) + /// (Allows loading the data capture module in Machine Studio) /// </summary> - [Description("Allows running the PPC software.")] - RunPPC = 15, + [Description("Allows loading the data capture module in Machine Studio")] + RunDataCaptureModule = 5, + + /// <summary> + /// (Allows openning the machine studio developer console) + /// </summary> + [Description("Allows openning the machine studio developer console")] + RunDeveloperConsole = 11, /// <summary> /// (Allows running the statistics module in Machine Studio.) @@ -110,6 +104,12 @@ namespace Tango.BL.Enumerations RunStatisticsModule = 16, /// <summary> + /// (Allows loading the RML module in Machine Studio) + /// </summary> + [Description("Allows loading the RML module in Machine Studio")] + RunRMLModule = 14, + + /// <summary> /// (Allows running the logging module in Machine Studio.) /// </summary> [Description("Allows running the logging module in Machine Studio.")] @@ -128,12 +128,6 @@ namespace Tango.BL.Enumerations RunHardwareVersionsModule = 19, /// <summary> - /// (Allows publishing of new PPC application versions.) - /// </summary> - [Description("Allows publishing of new PPC application versions.")] - PublishPPCVersions = 23, - - /// <summary> /// (Allows running the ColorCapture module in Machine Studio) /// </summary> [Description("Allows running the ColorCapture module in Machine Studio")] @@ -146,202 +140,10 @@ namespace Tango.BL.Enumerations RunCatalogsModule = 25, /// <summary> - /// (Allows running the Tango FSE application) - /// </summary> - [Description("Allows running the Tango FSE application")] - FSE_RunFSE = 1000, - - /// <summary> - /// (Allows connecting to machines from all organizations) - /// </summary> - [Description("Allows connecting to machines from all organizations")] - FSE_ConnectAnyMachine = 1001, - - /// <summary> - /// (Allows the management of the organization users) - /// </summary> - [Description("Allows the management of the organization users")] - FSE_ManageOrganizationUsersAndRoles = 1002, - - /// <summary> - /// (Allows the management of all organizations users) - /// </summary> - [Description("Allows the management of all organizations users")] - FSE_ManageAllOrganizationsUsersAndRoles = 1003, - - /// <summary> - /// (Allows running the procedure designer module) - /// </summary> - [Description("Allows running the procedure designer module")] - FSE_RunProcedureDesigner = 1004, - - /// <summary> - /// (Allows publishing procedure projects) - /// </summary> - [Description("Allows publishing procedure projects")] - FSE_PublishProcedureProjects = 1005, - - /// <summary> - /// (Allows starting remote desktop sessions) - /// </summary> - [Description("Allows starting remote desktop sessions")] - FSE_RemoteDesktopView = 1006, - - /// <summary> - /// (Allows remote desktop session mouse/keyboard control and extra actions) - /// </summary> - [Description("Allows remote desktop session mouse/keyboard control and extra actions")] - FSE_RemoteDesktopControl = 1007, - - /// <summary> - /// (Allows read access to the PPC file system) - /// </summary> - [Description("Allows read access to the PPC file system")] - FSE_PPCFileSystemRead = 1008, - - /// <summary> - /// (Allows write access to the PPC file system) - /// </summary> - [Description("Allows write access to the PPC file system")] - FSE_PPCFileSystemWrite = 1009, - - /// <summary> - /// (Allows read access to the firmware file system) - /// </summary> - [Description("Allows read access to the firmware file system")] - FSE_FirmwareFileSystemRead = 1010, - - /// <summary> - /// (Allows write access to the firmware file system) - /// </summary> - [Description("Allows write access to the firmware file system")] - FSE_FirmwareFileSystemWrite = 1011, - - /// <summary> - /// (Allows generating tup/tfp packages) - /// </summary> - [Description("Allows generating tup/tfp packages")] - FSE_RemoteUpgradeOffline = 1012, - - /// <summary> - /// (Allows performing direct remote upgrade) - /// </summary> - [Description("Allows performing direct remote upgrade")] - FSE_RemoteUpgradeOnline = 1013, - - /// <summary> - /// (Allows executing command prompt commands remotely) - /// </summary> - [Description("Allows executing command prompt commands remotely")] - FSE_ExecuteRemoteConsoleCommands = 1014, - - /// <summary> - /// (Allows editing of the default diagnostics project) - /// </summary> - [Description("Allows editing of the default diagnostics project")] - FSE_EditDiagnosticsProject = 1015, - - /// <summary> - /// (Allows viewing FSE logs) - /// </summary> - [Description("Allows viewing FSE logs")] - FSE_ViewFSELogs = 1016, - - /// <summary> - /// (Allows viewing FSE full exception details) - /// </summary> - [Description("Allows viewing FSE full exception details")] - FSE_ViewFullExceptionDetails = 1017, - - /// <summary> - /// (Allows the modification of bug reports) - /// </summary> - [Description("Allows the modification of bug reports")] - FSE_ModifyBugReport = 1018, - - /// <summary> - /// (Allows viewing published procedure projects with internal visibility) - /// </summary> - [Description("Allows viewing published procedure projects with internal visibility")] - FSE_ViewInternalPublishedProcedures = 1019, - - /// <summary> - /// (Allows running a floating procedure project file.) - /// </summary> - [Description("Allows running a floating procedure project file.")] - FSE_RunProcedureProjectFile = 1020, - - /// <summary> - /// (Allows loading the machine configuration module) - /// </summary> - [Description("Allows loading the machine configuration module")] - FSE_RunConfigurationModule = 1021, - - /// <summary> - /// (Allows editing of machine provisioning settings) - /// </summary> - [Description("Allows editing of machine provisioning settings")] - FSE_ModifyMachineProvisioning = 1022, - - /// <summary> - /// (Allows editing of machine update settings) - /// </summary> - [Description("Allows editing of machine update settings")] - FSE_ModifyMachineUpdate = 1023, - - /// <summary> - /// (Allows editing of machine identity settings) - /// </summary> - [Description("Allows editing of machine identity settings")] - FSE_ModifyMachineIdentity = 1024, - - /// <summary> - /// (Allows editing of machine hardware settings) - /// </summary> - [Description("Allows editing of machine hardware settings")] - FSE_ModifyMachineHardware = 1025, - - /// <summary> - /// (Allows viewing data store items) - /// </summary> - [Description("Allows viewing data store items")] - DataStoreRead = 1026, - - /// <summary> - /// (Allows writing to local data store items) - /// </summary> - [Description("Allows writing to local data store items")] - DataStoreWrite = 1027, - - /// <summary> - /// (Allows creating local data store items and collections) - /// </summary> - [Description("Allows creating local data store items and collections")] - DataStoreCreate = 1028, - - /// <summary> - /// (Allows resetting the machine counters) - /// </summary> - [Description("Allows resetting the machine counters")] - FSE_ResetMachineCounters = 1029, - - /// <summary> - /// (Allows resetting the machine device registration) - /// </summary> - [Description("Allows resetting the machine device registration")] - FSE_ResetMachineDeviceRegistration = 1030, - - /// <summary> - /// (Allows creating and writing global data store items and collections) - /// </summary> - [Description("Allows creating and writing global data store items and collections")] - DataStoreCreateWriteGlobal = 1031, - - /// <summary> - /// (Allows emulating machine events remotely) + /// (Allows publishing of new PPC application versions.) /// </summary> - [Description("Allows emulating machine events remotely")] - FSE_EmulateMachineEvents = 1032, + [Description("Allows publishing of new PPC application versions.")] + PublishPPCVersions = 23, } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/PublishedProcedureProjectVisibilities.cs b/Software/Visual_Studio/Tango.BL/Enumerations/PublishedProcedureProjectVisibilities.cs deleted file mode 100644 index e3f453844..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/PublishedProcedureProjectVisibilities.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Enumerations -{ - public enum PublishedProcedureProjectVisibilities - { - Public = 0, - Internal = 1 - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs b/Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs deleted file mode 100644 index 8864bc0b0..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/RmlQualifications.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Enumerations -{ - public enum RmlQualifications - { - Provisional = 0, - Supported = 1, - Certified = 2, - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs index b51477393..800775d64 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs @@ -103,59 +103,5 @@ namespace Tango.BL.Enumerations [Description("PPC Application Publisher")] PPCPublisher = 13, - /// <summary> - /// (Technician) - /// </summary> - [Description("Technician")] - FSETechnician = 1000, - - /// <summary> - /// (Advanced Technician) - /// </summary> - [Description("Advanced Technician")] - FSEAdvancedTechnician = 1001, - - /// <summary> - /// (Administrator) - /// </summary> - [Description("Administrator")] - FSEAdministrator = 1002, - - /// <summary> - /// (Twine Technician) - /// </summary> - [Description("Twine Technician")] - FSETwineTechnician = 1003, - - /// <summary> - /// (Twine Administrator) - /// </summary> - [Description("Twine Administrator")] - FSETwineAdministrator = 1004, - - /// <summary> - /// (Twine Developer) - /// </summary> - [Description("Twine Developer")] - FSETwineDeveloper = 1005, - - /// <summary> - /// (Twine Data Store Developer) - /// </summary> - [Description("Twine Data Store Developer")] - FSETwineDataStoreDeveloper = 1008, - - /// <summary> - /// (Twine Procedure Designer) - /// </summary> - [Description("Twine Procedure Designer")] - FSETwineProcedureDesigner = 1006, - - /// <summary> - /// (Twine Procedure Publisher) - /// </summary> - [Description("Twine Procedure Publisher")] - FSETwineProcedurePublisher = 1007, - } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TangoUpdateStatuses.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TangoUpdateStatuses.cs deleted file mode 100644 index 9db075623..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TangoUpdateStatuses.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Enumerations -{ - public enum TangoUpdateStatuses - { - [Description("Setup started but did not complete")] - SetupStarted = 0, - [Description("Setup completed successfully")] - SetupCompleted = 1, - [Description("Setup failed")] - SetupFailed = 2, - - [Description("Software update started but did not complete")] - UpdateStarted = 100, - [Description("Software update completed successfully")] - UpdateCompleted = 101, - [Description("Software update failed")] - UpdateFailed = 102, - - [Description("Database update started but did not complete")] - DatabaseStarted = 200, - [Description("Database update completed successfully")] - DatabaseCompleted = 201, - [Description("Database update failed")] - DatabaseFailed = 202, - - [Description("Synchronization started but did not complete")] - SynchronizationStarted = 300, - [Description("Synchronization completed successfully")] - SynchronizationCompleted = 301, - [Description("Synchronization failed")] - SynchronizationFailed = 302, - - [Description("Offline update started but did not complete")] - OfflineUpdateStarted = 400, - [Description("Offline update completed successfully")] - OfflineUpdateCompleted = 401, - [Description("Offline update failed")] - OfflineUpdateFailed = 402, - - [Description("Offline firmware upgrade started but did not complete")] - OfflineFirmwareUpgradeStarted = 500, - [Description("Offline firmware upgrade completed successfully")] - OfflineFirmwareUpgradeCompleted = 501, - [Description("Offline firmware upgrade failed")] - OfflineFirmwareUpgradeFailed = 502, - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs index 9731e5b61..a73fbb244 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechHeaters.cs @@ -79,53 +79,5 @@ namespace Tango.BL.Enumerations [Description("Mixer Heater")] MixerHeater = 9, - /// <summary> - /// (Heater Zone 7) - /// </summary> - [Description("Heater Zone 7")] - HeaterZone7 = 10, - - /// <summary> - /// (Heater Zone 8) - /// </summary> - [Description("Heater Zone 8")] - HeaterZone8 = 11, - - /// <summary> - /// (Heater Zone 9) - /// </summary> - [Description("Heater Zone 9")] - HeaterZone9 = 12, - - /// <summary> - /// (Heater Zone 10) - /// </summary> - [Description("Heater Zone 10")] - HeaterZone10 = 13, - - /// <summary> - /// (Heater Zone 11) - /// </summary> - [Description("Heater Zone 11")] - HeaterZone11 = 14, - - /// <summary> - /// (Heater Zone 12) - /// </summary> - [Description("Heater Zone 12")] - HeaterZone12 = 15, - - /// <summary> - /// (Head Cover Heater 1) - /// </summary> - [Description("Head Cover Heater 1")] - HeadCoverHeater1 = 16, - - /// <summary> - /// (Head Cover Heater 2) - /// </summary> - [Description("Head Cover Heater 2")] - HeadCoverHeater2 = 17, - } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs index 165fe2bd3..a017c18d1 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs @@ -236,102 +236,12 @@ namespace Tango.BL.Enumerations FilterDeltaPressure = 26, /// <summary> - /// (Gas Sensor (VOC Sensor)) - /// </summary> - [Description("Gas Sensor (VOC Sensor)")] - GasSensor = 400, - - /// <summary> /// (Head Air Flow) /// </summary> [Description("Head Air Flow")] HeadAirFlow = 13, /// <summary> - /// (Head Blower 1 Air Flow) - /// </summary> - [Description("Head Blower 1 Air Flow")] - HeadBlower1AirFlow = 403, - - /// <summary> - /// (Head Blower 2 Air Flow) - /// </summary> - [Description("Head Blower 2 Air Flow")] - HeadBlower2AirFlow = 404, - - /// <summary> - /// (Head Blower Voltage 1) - /// </summary> - [Description("Head Blower Voltage 1")] - HeadBlowerVoltage1 = 212, - - /// <summary> - /// (Head Blower Voltage 2) - /// </summary> - [Description("Head Blower Voltage 2")] - HeadBlowerVoltage2 = 213, - - /// <summary> - /// (Head Cover Heater 1 Current) - /// </summary> - [Description("Head Cover Heater 1 Current")] - HeadCoverHeater1Current = 214, - - /// <summary> - /// (Head Cover Heater 1 Temperature) - /// </summary> - [Description("Head Cover Heater 1 Temperature")] - HeadCoverHeater1Temperature = 215, - - /// <summary> - /// (Head Cover Heater 2 Current) - /// </summary> - [Description("Head Cover Heater 2 Current")] - HeadCoverHeater2Current = 216, - - /// <summary> - /// (Head Cover Heater 2 Temperature) - /// </summary> - [Description("Head Cover Heater 2 Temperature")] - HeadCoverHeater2Temperature = 217, - - /// <summary> - /// (Head Zone 10 Heater Current) - /// </summary> - [Description("Head Zone 10 Heater Current")] - HeadZone10HeaterCurrent = 206, - - /// <summary> - /// (Head Zone 10) - /// </summary> - [Description("Head Zone 10")] - HeadZone10Temperature = 207, - - /// <summary> - /// (Head Zone 11 Heater Current) - /// </summary> - [Description("Head Zone 11 Heater Current")] - HeadZone11HeaterCurrent = 208, - - /// <summary> - /// (Head Zone 11) - /// </summary> - [Description("Head Zone 11")] - HeadZone11Temperature = 209, - - /// <summary> - /// (Head Zone 12 Heater Current) - /// </summary> - [Description("Head Zone 12 Heater Current")] - HeadZone12HeaterCurrent = 210, - - /// <summary> - /// (Head Zone 12) - /// </summary> - [Description("Head Zone 12")] - HeadZone12Temperature = 211, - - /// <summary> /// (Head Zone 1 Heater Current) /// </summary> [Description("Head Zone 1 Heater Current")] @@ -383,7 +293,7 @@ namespace Tango.BL.Enumerations /// (Head Zone 5-6 Heater Current) /// </summary> [Description("Head Zone 5-6 Heater Current")] - HeadZone56HeaterCurrent = 82, + HeadZone5_6HeaterCurrent = 82, /// <summary> /// (Head Zone 5) @@ -398,48 +308,6 @@ namespace Tango.BL.Enumerations HeadZone6Temperature = 38, /// <summary> - /// (Head Zone 7 Heater Current) - /// </summary> - [Description("Head Zone 7 Heater Current")] - HeadZone7HeaterCurrent = 200, - - /// <summary> - /// (Head Zone 7) - /// </summary> - [Description("Head Zone 7")] - HeadZone7Temperature = 201, - - /// <summary> - /// (Head Zone 8 Heater Current) - /// </summary> - [Description("Head Zone 8 Heater Current")] - HeadZone8HeaterCurrent = 202, - - /// <summary> - /// (Head Zone 8) - /// </summary> - [Description("Head Zone 8")] - HeadZone8Temperature = 203, - - /// <summary> - /// (Head Zone 9 Heater Current) - /// </summary> - [Description("Head Zone 9 Heater Current")] - HeadZone9HeaterCurrent = 204, - - /// <summary> - /// (Head Zone 9) - /// </summary> - [Description("Head Zone 9")] - HeadZone9Temperature = 205, - - /// <summary> - /// (Incoming Voltage (VAC Sensor)) - /// </summary> - [Description("Incoming Voltage (VAC Sensor)")] - IncomingVoltage = 401, - - /// <summary> /// (Mid Tank 1 Level) /// </summary> [Description("Mid Tank 1 Level")] @@ -506,12 +374,6 @@ namespace Tango.BL.Enumerations MixerTemperature = 9, /// <summary> - /// (Overall Temperature) - /// </summary> - [Description("Overall Temperature")] - OverallTemperature = 102, - - /// <summary> /// (Poller Motor) /// </summary> [Description("Poller Motor")] @@ -530,42 +392,12 @@ namespace Tango.BL.Enumerations ScrewMotor = 7, /// <summary> - /// (Shinko Current Value) - /// </summary> - [Description("Shinko Current Value")] - ShinkoCurrentValue = 501, - - /// <summary> - /// (Shinko Set Value) - /// </summary> - [Description("Shinko Set Value")] - ShinkoSetValue = 500, - - /// <summary> /// (Thread Speed) /// </summary> [Description("Thread Speed")] ThreadSpeed = 8, /// <summary> - /// (Total WHS Flow) - /// </summary> - [Description("Total WHS Flow")] - TotalWHSFlow = 502, - - /// <summary> - /// (Waste Level) - /// </summary> - [Description("Waste Level")] - WasteLevel = 402, - - /// <summary> - /// (WHS Blower 2 Voltage) - /// </summary> - [Description("WHS Blower 2 Voltage")] - WHSBlower2Voltage = 300, - - /// <summary> /// (Winder Motor) /// </summary> [Description("Winder Motor")] diff --git a/Software/Visual_Studio/Tango.BL/IObservableEntity.cs b/Software/Visual_Studio/Tango.BL/IObservableEntity.cs index 6844108d6..244486add 100644 --- a/Software/Visual_Studio/Tango.BL/IObservableEntity.cs +++ b/Software/Visual_Studio/Tango.BL/IObservableEntity.cs @@ -1,5 +1,4 @@ -using LiteDB; -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; @@ -38,7 +37,6 @@ namespace Tango.BL [Key] [Column("GUID")] [ParameterIgnore] - [BsonId] String Guid { get; set; } /// <summary> @@ -92,10 +90,5 @@ namespace Tango.BL /// </summary> /// <param name="context">The context.</param> void Delete(ObservablesContext context); - - /// <summary> - /// Called when before entity is saved by the context. - /// </summary> - void OnBeforeSave(); } } diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs index 793f94212..69499905a 100644 --- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs +++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Tango.Core; using Tango.BL.Dispensing; using Tango.BL.Entities; -using Tango.BL.Enumerations; namespace Tango.BL { @@ -68,16 +67,10 @@ namespace Tango.BL } [JsonIgnore] - public LiquidTypes LiquidType - { - get { return (LiquidTypes)IdsPack.LiquidType.Code; } - } - - [JsonIgnore] public DispenserStepDivisions DispenserStepDivision { get { return (DispenserStepDivisions)BrushStop.GetDispensingDivision(IdsPack.PackIndex); } - set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); RaisePropertyChanged(nameof(PulsePerSecondFull)); } + set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); } } public void Invalidate() @@ -103,7 +96,6 @@ namespace Tango.BL RaisePropertyChanged(nameof(LiquidMaxNanoliterPerCentimeter)); RaisePropertyChanged(nameof(NanoliterPerSecond)); RaisePropertyChanged(nameof(PulsePerSecond)); - RaisePropertyChanged(nameof(PulsePerSecondFull)); RaisePropertyChanged(nameof(NanoliterPerCentimeter)); RaisePropertyChanged(nameof(Volume)); RaisePropertyChanged(nameof(NanoliterPerStep)); @@ -186,15 +178,6 @@ namespace Tango.BL } [JsonIgnore] - public double PulsePerSecondFull - { - get - { - return DispensingCalcService.CalculatePulsePerSecondFull(this); - } - } - - [JsonIgnore] public double NanoliterPerStep { get @@ -210,10 +193,5 @@ namespace Tango.BL cloned.Volume = Volume; return cloned; } - - public override string ToString() - { - return $"{LiquidType}, {Volume}"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/ObservableDTOPropertyAttribute.cs b/Software/Visual_Studio/Tango.BL/ObservableDTOPropertyAttribute.cs deleted file mode 100644 index 48e07c271..000000000 --- a/Software/Visual_Studio/Tango.BL/ObservableDTOPropertyAttribute.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL -{ - [AttributeUsage(AttributeTargets.Property)] - public class ObservableDTOPropertyAttribute : Attribute - { - public String MapsTo { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs index 656b138b4..982b853f9 100644 --- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs +++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs @@ -27,10 +27,6 @@ using Tango.Core.Json; using Newtonsoft.Json.Converters; using Tango.BL.Serialization; using Newtonsoft.Json.Linq; -using Tango.BL.ActionLogs; -using Tango.BL.ValueObjects; -using LiteDB; -using System.Linq.Expressions; namespace Tango.BL { @@ -54,7 +50,7 @@ namespace Tango.BL /// <seealso cref="Tango.Core.ExtendedObject" /> /// <seealso cref="Tango.BL.Entities.IObservableEntity" /> [Serializable] - public abstract class ObservableEntity<T> : ExtendedObject, IObservableEntity, IActionLogComparable where T : class, IObservableEntity + public abstract class ObservableEntity<T> : ExtendedObject, IObservableEntity where T : class, IObservableEntity { #region Events @@ -73,7 +69,6 @@ namespace Tango.BL /// </summary> [Column("ID")] [JsonIgnore] - [BsonIgnore] [ParameterIgnore] [DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] public Int32 ID @@ -113,7 +108,6 @@ namespace Tango.BL /// </summary> [NotMapped] [XmlIgnore] - [BsonIgnore] [JsonIgnore] [ParameterIgnore] public ReadOnlyObservableCollection<ParameterItem> Parameters @@ -135,7 +129,6 @@ namespace Tango.BL /// </summary> [ParameterIgnore] [JsonIgnore] - [BsonIgnore] [NotMapped] public Type ObjectType { @@ -162,15 +155,6 @@ namespace Tango.BL #region Public Methods /// <summary> - /// Marks this entity as modified so all properties are saved. - /// </summary> - /// <param name="context">The context.</param> - public virtual void MarkModified(ObservablesContext context) - { - context.Entry(this).State = EntityState.Modified; - } - - /// <summary> /// Saves the changes on this entity to database. /// </summary> public virtual void Save(ObservablesContext context) @@ -288,7 +272,7 @@ namespace Tango.BL foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.SetMethod != null)) { - if (!prop.PropertyType.IsGenericTypeAndNotNullable()) + if (!prop.PropertyType.IsGenericType) { prop.SetValue(cloned, prop.GetValue(this)); } @@ -352,7 +336,7 @@ namespace Tango.BL /// <param name="context">The context.</param> public virtual void Delete(ObservablesContext context) { - + } #endregion @@ -383,7 +367,7 @@ namespace Tango.BL if (flags.HasFlag(EntitySerializationFlags.IgnoreReferenceTypes)) { - var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.PropertyType.IsPrimitive && !x.PropertyType.IsGenericType && !x.PropertyType.IsNullable() && x.PropertyType != typeof(byte[]) && x.PropertyType != typeof(String) && x.PropertyType != typeof(DateTime)).ToList(); + var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.PropertyType.IsPrimitive && !x.PropertyType.IsGenericType && x.PropertyType != typeof(byte[]) && x.PropertyType != typeof(String) && x.PropertyType != typeof(DateTime)).ToList(); foreach (var prop in props) { @@ -393,7 +377,7 @@ namespace Tango.BL if (flags.HasFlag(EntitySerializationFlags.IgnoreCollections)) { - var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsGenericTypeAndNotNullable()).ToList(); + var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsGenericType).ToList(); foreach (var prop in props) { @@ -521,7 +505,6 @@ namespace Tango.BL [NotMapped] [ParameterIgnore] [XmlIgnore] - [BsonIgnore] [JsonIgnore] public ObservableCollection<String> ValidationErrors { @@ -533,7 +516,6 @@ namespace Tango.BL [NotMapped] [ParameterIgnore] [JsonIgnore] - [BsonIgnore] [XmlIgnore] public bool ValidateOnPropertyChanged { @@ -548,7 +530,6 @@ namespace Tango.BL [NotMapped] [ParameterIgnore] [JsonIgnore] - [BsonIgnore] [XmlIgnore] public bool HasErrors { @@ -639,18 +620,6 @@ namespace Tango.BL #endregion - #region Virtual Methods - - /// <summary> - /// Called when before entity is saved by the context. - /// </summary> - public virtual void OnBeforeSave() - { - - } - - #endregion - #region INotify Property Changed /// <summary> @@ -667,65 +636,6 @@ namespace Tango.BL } } - public void RaisePropertyChanged<F>(Expression<Func<T, F>> expression) - { - MemberExpression member = expression.Body as MemberExpression; - if (member == null) - throw new ArgumentException(string.Format( - "Expression '{0}' refers to a method, not a property.", - expression.ToString())); - - PropertyInfo propInfo = member.Member as PropertyInfo; - if (propInfo == null) - throw new ArgumentException(string.Format( - "Expression '{0}' refers to a field, not a property.", - expression.ToString())); - - RaisePropertyChanged(propInfo.Name); - } - - #endregion - - #region Action Log - - /// <summary> - /// Returns true if the specified property should be ignored during ActionLog comparison. - /// </summary> - /// <param name="propName">Name of the property.</param> - /// <returns></returns> - bool IActionLogComparable.ShouldActionLogIgnore(string propName) - { - return propName == nameof(LastUpdated) || OnShouldActionLogIgnore(propName); - } - - /// <summary> - /// override to specified properties to be ignored when doing ActionLog comparison. - /// </summary> - /// <param name="propName">Name of the property.</param> - /// <returns></returns> - protected virtual bool OnShouldActionLogIgnore(string propName) - { - return false; - } - - /// <summary> - /// Returns an optional custom name for this instance in the comparison tree. - /// </summary> - /// <returns></returns> - string IActionLogComparable.GetActionLogName() - { - return OnGetActionLogName(); - } - - /// <summary> - /// override to specified a custom name for this instance in the ActionLog comparison tree. - /// </summary> - /// <returns></returns> - protected virtual String OnGetActionLogName() - { - return this.GetType().Name; - } - #endregion } } diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs b/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs index 1c3edac82..5950a3cd2 100644 --- a/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs +++ b/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs @@ -1,82 +1,39 @@ -using LiteDB; -using System; +using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.ValueObjects; -using Tango.Core.ExtensionMethods; namespace Tango.BL { - /// <summary> - /// Represents an auto generated observable entity transport object mirror. - /// </summary> - /// <typeparam name="DTO">The type of to.</typeparam> - /// <typeparam name="T"></typeparam> - /// <seealso cref="Tango.BL.IObservableEntityDTO" /> - /// <seealso cref="System.IEquatable{T}" /> - /// <seealso cref="Tango.BL.ActionLogs.IActionLogComparable{DTO}" /> - public abstract class ObservableEntityDTO<DTO, T> : IObservableEntityDTO, IEquatable<T>, IActionLogComparable where T : IObservableEntity where DTO : ObservableEntityDTO<DTO, T> + public abstract class ObservableEntityDTO<DTO, T> : IObservableEntityDTO, IEquatable<T> where T : IObservableEntity where DTO : ObservableEntityDTO<DTO, T> { - /// <summary> - /// Gets or sets the ID of the entity. - /// </summary> public int ID { get; set; } - /// <summary> - /// Gets or sets the unique identifier of the entity. - /// </summary> - [BsonId] public String Guid { get; set; } - /// <summary> - /// Gets or sets the last updated date of the entity. - /// </summary> public DateTime LastUpdated { get; set; } - /// <summary> - /// Creates an instance of type <see cref="DTO"/> for the specified entity of type <see cref="T"/>. - /// </summary> - /// <param name="observable">The observable.</param> - /// <returns></returns> public static DTO FromObservable(T observable) { - return FromObservableInternal<DTO>(observable); - } - - /// <summary> - /// Creates an instance of type <see cref="DTOResult"/> for the specified entity of type <see cref="T"/>. - /// </summary> - /// <param name="observable">The observable.</param> - /// <returns></returns> - public static DTOResult FromObservable<DTOResult>(T observable) where DTOResult : DTO - { - return FromObservableInternal<DTOResult>(observable); - } - - internal static DTOResult FromObservableInternal<DTOResult>(T observable) where DTOResult : DTO - { if (observable == null) return null; - var dto = Activator.CreateInstance<DTOResult>(); + var dto = Activator.CreateInstance<DTO>(); - foreach (var prop in typeof(DTOResult).GetProperties()) + foreach (var prop in typeof(DTO).GetProperties()) { var observableProp = typeof(T).GetProperty(prop.Name); if (observableProp != null) { - if (prop.PropertyType.IsValueTypeOrString() || prop.PropertyType == typeof(byte[])) + if (prop.PropertyType.IsPrimitive || prop.PropertyType.IsValueType || prop.PropertyType == typeof(String)) { prop.SetValue(dto, observableProp.GetValue(observable)); } else if (!prop.PropertyType.IsGenericType) { - prop.SetValue(dto, prop.PropertyType.GetMethod(nameof(FromObservableInternal), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).MakeGenericMethod(prop.PropertyType).Invoke(null, new object[] { observableProp.GetValue(observable) })); + prop.SetValue(dto, prop.PropertyType.GetMethod(nameof(FromObservable), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).Invoke(null, new object[] { observableProp.GetValue(observable) })); } else { @@ -85,36 +42,17 @@ namespace Tango.BL foreach (var item in source) { - collection.Add(prop.PropertyType.GenericTypeArguments[0].GetMethod(nameof(FromObservableInternal), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).MakeGenericMethod(prop.PropertyType.GenericTypeArguments[0]).Invoke(null, new object[] { item })); + collection.Add(prop.PropertyType.GenericTypeArguments[0].GetMethod(nameof(FromObservable), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).Invoke(null, new object[] { item })); } prop.SetValue(dto, collection); } } - else if (prop.GetCustomAttribute<ObservableDTOPropertyAttribute>() != null) - { - var att = prop.GetCustomAttribute<ObservableDTOPropertyAttribute>(); - - try - { - prop.SetValue(dto, observable.GetPropertyValueByPath(att.MapsTo)); - } - catch - { - Debug.WriteLine($"Error mapping '{typeof(DTOResult).Name}.{prop.PropertyType}' to '{typeof(T)}.{att.MapsTo}'."); - } - } } - dto.OnFromObservableCompleted(observable); - return dto; } - /// <summary> - /// Creates an entity of type <see cref="T"/> from this DTO. - /// </summary> - /// <returns></returns> public T ToObservable() { T observable = Activator.CreateInstance<T>(); @@ -122,18 +60,14 @@ namespace Tango.BL return observable; } - /// <summary> - /// Maps this instance to an instance of <see cref="T"/>. - /// </summary> - /// <param name="observable">The observable.</param> - public virtual void MapToObservable(T observable) + public void MapToObservable(T observable) { - foreach (var prop in GetType().GetProperties()) + foreach (var prop in typeof(DTO).GetProperties()) { var observableProp = typeof(T).GetProperty(prop.Name); if (observableProp != null) { - if (prop.PropertyType.IsValueTypeOrString() || prop.PropertyType == typeof(byte[])) + if (prop.PropertyType.IsPrimitive || prop.PropertyType.IsValueType || prop.PropertyType == typeof(String)) { observableProp.SetValue(observable, prop.GetValue(this)); } @@ -194,11 +128,6 @@ namespace Tango.BL } } - /// <summary> - /// Returns true if this instance is equal in terms of values (not references) to the specified entity. - /// </summary> - /// <param name="observable">The observable.</param> - /// <returns></returns> public bool EqualsToObservable(T observable) { if (observable == null) return false; @@ -208,7 +137,7 @@ namespace Tango.BL var observableProp = typeof(T).GetProperty(prop.Name); if (observableProp != null) { - if (prop.PropertyType.IsValueTypeOrString() || prop.PropertyType == typeof(byte[])) + if (prop.PropertyType.IsPrimitive || prop.PropertyType.IsValueType || prop.PropertyType == typeof(String)) { var observableValue = observableProp.GetValue(observable); var dtoValue = prop.GetValue(this); @@ -274,61 +203,9 @@ namespace Tango.BL return true; } - /// <summary> - /// Returns true if this instance is equal in terms of values (not references) to the specified entity. - /// </summary> - /// <param name="observable">The observable.</param> - /// <returns></returns> public bool Equals(T observable) { return EqualsToObservable(observable); } - - /// <summary> - /// Returns true if the specified property should be ignored during ActionLog comparison. - /// </summary> - /// <param name="propName">Name of the property.</param> - /// <returns></returns> - bool IActionLogComparable.ShouldActionLogIgnore(string propName) - { - return propName == nameof(LastUpdated) || OnShouldActionLogIgnore(propName); - } - - /// <summary> - /// override to specified properties to be ignored when doing ActionLog comparison. - /// </summary> - /// <param name="propName">Name of the property.</param> - /// <returns></returns> - protected virtual bool OnShouldActionLogIgnore(string propName) - { - return false; - } - - /// <summary> - /// Returns an optional custom name for this instance in the comparison tree. - /// </summary> - /// <returns></returns> - string IActionLogComparable.GetActionLogName() - { - return OnGetActionLogName(); - } - - /// <summary> - /// override to specified a custom name for this instance in the ActionLog comparison tree. - /// </summary> - /// <returns></returns> - protected virtual String OnGetActionLogName() - { - return this.GetType().Name; - } - - /// <summary> - /// Called when the static method <see cref="FromObservable(T)"/> completes. - /// </summary> - /// <param name="observable">The observable.</param> - protected virtual void OnFromObservableCompleted(T observable) - { - //Just for override - } } } diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index f92c98db3..9a7816eee 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -31,14 +31,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the ActionLogs. - /// </summary> - public DbSet<ActionLog> ActionLogs - { - get; set; - } - - /// <summary> /// Gets or sets the Addresses. /// </summary> public DbSet<Address> Addresses @@ -167,14 +159,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the DataStoreItems. - /// </summary> - public DbSet<DataStoreItem> DataStoreItems - { - get; set; - } - - /// <summary> /// Gets or sets the DispenserTypes. /// </summary> public DbSet<DispenserType> DispenserTypes @@ -223,22 +207,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the FseVersions. - /// </summary> - public DbSet<FseVersion> FseVersions - { - get; set; - } - - /// <summary> - /// Gets or sets the GlobalDataStoreItems. - /// </summary> - public DbSet<GlobalDataStoreItem> GlobalDataStoreItems - { - get; set; - } - - /// <summary> /// Gets or sets the HardwareBlowerTypes. /// </summary> public DbSet<HardwareBlowerType> HardwareBlowerTypes @@ -511,22 +479,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the PublishedProcedureProjects. - /// </summary> - public DbSet<PublishedProcedureProject> PublishedProcedureProjects - { - get; set; - } - - /// <summary> - /// Gets or sets the PublishedProcedureProjectsVersions. - /// </summary> - public DbSet<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions - { - get; set; - } - - /// <summary> /// Gets or sets the Rmls. /// </summary> public DbSet<Rml> Rmls @@ -535,14 +487,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the RmlsSpools. - /// </summary> - public DbSet<RmlsSpool> RmlsSpools - { - get; set; - } - - /// <summary> /// Gets or sets the Roles. /// </summary> public DbSet<Role> Roles @@ -567,30 +511,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the Sites. - /// </summary> - public DbSet<Site> Sites - { - get; set; - } - - /// <summary> - /// Gets or sets the SitesCatalogs. - /// </summary> - public DbSet<SitesCatalog> SitesCatalogs - { - get; set; - } - - /// <summary> - /// Gets or sets the SitesRmls. - /// </summary> - public DbSet<SitesRml> SitesRmls - { - get; set; - } - - /// <summary> /// Gets or sets the SpoolTypes. /// </summary> public DbSet<SpoolType> SpoolTypes @@ -615,14 +535,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the TangoUpdates. - /// </summary> - public DbSet<TangoUpdate> TangoUpdates - { - get; set; - } - - /// <summary> /// Gets or sets the TangoVersions. /// </summary> public DbSet<TangoVersion> TangoVersions diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs index 3d330b797..b7559cdc3 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs @@ -3,9 +3,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data.Entity; -using System.Data.Entity.Core.Objects; using System.Data.Entity.Infrastructure; -using System.Data.SqlClient; using System.Data.SQLite; using System.IO; using System.Linq; @@ -26,7 +24,6 @@ namespace Tango.BL private ObservablesContextAdapter _adapter; private static DataSource _override_datasource; private DataSource _dataSource; - private static List<ObservablesContext> _open_contexts; /// <summary> /// Gets a value indicating whether this instance is disposed. @@ -34,19 +31,11 @@ namespace Tango.BL public bool IsDisposed { get; private set; } /// <summary> - /// Initializes the <see cref="ObservablesContext"/> class. - /// </summary> - static ObservablesContext() - { - _open_contexts = new List<ObservablesContext>(); - } - - /// <summary> /// Initializes a new instance of the <see cref="ObservablesContext"/> class. /// </summary> public ObservablesContext() { - _open_contexts.Add(this); + } /// <summary> @@ -56,7 +45,6 @@ namespace Tango.BL /// <param name="isFile">if set to <c>true</c> will try to connect to an .mdf file.</param> public ObservablesContext(DataSource dataSource) : base(dataSource.ToConnection(), true) { - _open_contexts.Add(this); _dataSource = dataSource; Database.SetInitializer<ObservablesContext>(null); Configuration.LazyLoadingEnabled = false; @@ -115,15 +103,6 @@ namespace Tango.BL } /// <summary> - /// Gets the inner object context. - /// </summary> - /// <returns></returns> - private ObjectContext GetObjectContext() - { - return ((IObjectContextAdapter)this).ObjectContext; - } - - /// <summary> /// Saves all changes made in this context to the underlying database. /// </summary> /// <returns> @@ -131,14 +110,6 @@ namespace Tango.BL /// </returns> public override int SaveChanges() { - foreach (var entity in ChangeTracker.Entries().Where(x => x.State == EntityState.Added || x.State == EntityState.Modified).ToList()) - { - if (entity is IObservableEntity && entity != null) - { - (entity as IObservableEntity).OnBeforeSave(); - } - } - var result = base.SaveChanges(); RaisePendingNotifications(); return result; @@ -158,14 +129,6 @@ namespace Tango.BL /// </remarks> public override Task<int> SaveChangesAsync(CancellationToken cancellationToken) { - foreach (var entity in ChangeTracker.Entries().Where(x => x.State == EntityState.Added || x.State == EntityState.Modified).ToList().Select(x => x.Entity).ToList()) - { - if (entity is IObservableEntity && entity != null) - { - (entity as IObservableEntity).OnBeforeSave(); - } - } - var result = base.SaveChangesAsync(cancellationToken); RaisePendingNotifications(); return result; @@ -205,6 +168,9 @@ namespace Tango.BL { IObservableEntity modified = entityEntry.Entity as IObservableEntity; + //Good chance to update "LAST_UPDATED" field! + modified.LastUpdated = DateTime.UtcNow; + foreach (var toNotify in ObservableEntitiesContainer.RegisteredEntities.ToList().Where(x => x.Guid == modified.Guid).ToList()) { _pending_notifications.Add(new ObservableModifiedEventArgs(this, modified, toNotify)); @@ -297,7 +263,6 @@ namespace Tango.BL /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param> protected override void Dispose(bool disposing) { - _open_contexts.Remove(this); base.Dispose(disposing); IsDisposed = true; } @@ -308,16 +273,6 @@ namespace Tango.BL { _override_datasource.AccessToken = accessToken; _override_datasource.AccessTokenExpiration = expiration; - - foreach (var context in _open_contexts.Where(x => x._dataSource.Type == DataSourceType.AccessToken)) - { - context._dataSource = _override_datasource; - var connection = context.Database.Connection as SqlConnection; - if (connection != null) - { - connection.AccessToken = context._dataSource.AccessToken; - } - } } } } diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index abaf58c6b..90b4f0bc8 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -53,42 +53,6 @@ namespace Tango.BL } - private ObservableCollection<ActionLog> _actionlogs; - /// <summary> - /// Gets or sets the ActionLogs. - /// </summary> - public ObservableCollection<ActionLog> ActionLogs - { - get - { - return _actionlogs; - } - - set - { - _actionlogs = value; RaisePropertyChanged(nameof(ActionLogs)); - } - - } - - private ICollectionView _actionlogsViewSource; - /// <summary> - /// Gets or sets the ActionLogs View Source. - ///</summary> - public ICollectionView ActionLogsViewSource - { - get - { - return _actionlogsViewSource; - } - - set - { - _actionlogsViewSource = value; RaisePropertyChanged(nameof(ActionLogsViewSource)); - } - - } - private ObservableCollection<Address> _addresses; /// <summary> /// Gets or sets the Addresses. @@ -665,42 +629,6 @@ namespace Tango.BL } - private ObservableCollection<DataStoreItem> _datastoreitems; - /// <summary> - /// Gets or sets the DataStoreItems. - /// </summary> - public ObservableCollection<DataStoreItem> DataStoreItems - { - get - { - return _datastoreitems; - } - - set - { - _datastoreitems = value; RaisePropertyChanged(nameof(DataStoreItems)); - } - - } - - private ICollectionView _datastoreitemsViewSource; - /// <summary> - /// Gets or sets the DataStoreItems View Source. - ///</summary> - public ICollectionView DataStoreItemsViewSource - { - get - { - return _datastoreitemsViewSource; - } - - set - { - _datastoreitemsViewSource = value; RaisePropertyChanged(nameof(DataStoreItemsViewSource)); - } - - } - private ObservableCollection<DispenserType> _dispensertypes; /// <summary> /// Gets or sets the DispenserTypes. @@ -917,78 +845,6 @@ namespace Tango.BL } - private ObservableCollection<FseVersion> _fseversions; - /// <summary> - /// Gets or sets the FseVersions. - /// </summary> - public ObservableCollection<FseVersion> FseVersions - { - get - { - return _fseversions; - } - - set - { - _fseversions = value; RaisePropertyChanged(nameof(FseVersions)); - } - - } - - private ICollectionView _fseversionsViewSource; - /// <summary> - /// Gets or sets the FseVersions View Source. - ///</summary> - public ICollectionView FseVersionsViewSource - { - get - { - return _fseversionsViewSource; - } - - set - { - _fseversionsViewSource = value; RaisePropertyChanged(nameof(FseVersionsViewSource)); - } - - } - - private ObservableCollection<GlobalDataStoreItem> _globaldatastoreitems; - /// <summary> - /// Gets or sets the GlobalDataStoreItems. - /// </summary> - public ObservableCollection<GlobalDataStoreItem> GlobalDataStoreItems - { - get - { - return _globaldatastoreitems; - } - - set - { - _globaldatastoreitems = value; RaisePropertyChanged(nameof(GlobalDataStoreItems)); - } - - } - - private ICollectionView _globaldatastoreitemsViewSource; - /// <summary> - /// Gets or sets the GlobalDataStoreItems View Source. - ///</summary> - public ICollectionView GlobalDataStoreItemsViewSource - { - get - { - return _globaldatastoreitemsViewSource; - } - - set - { - _globaldatastoreitemsViewSource = value; RaisePropertyChanged(nameof(GlobalDataStoreItemsViewSource)); - } - - } - private ObservableCollection<HardwareBlowerType> _hardwareblowertypes; /// <summary> /// Gets or sets the HardwareBlowerTypes. @@ -2213,78 +2069,6 @@ namespace Tango.BL } - private ObservableCollection<PublishedProcedureProject> _publishedprocedureprojects; - /// <summary> - /// Gets or sets the PublishedProcedureProjects. - /// </summary> - public ObservableCollection<PublishedProcedureProject> PublishedProcedureProjects - { - get - { - return _publishedprocedureprojects; - } - - set - { - _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); - } - - } - - private ICollectionView _publishedprocedureprojectsViewSource; - /// <summary> - /// Gets or sets the PublishedProcedureProjects View Source. - ///</summary> - public ICollectionView PublishedProcedureProjectsViewSource - { - get - { - return _publishedprocedureprojectsViewSource; - } - - set - { - _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); - } - - } - - private ObservableCollection<PublishedProcedureProjectsVersion> _publishedprocedureprojectsversions; - /// <summary> - /// Gets or sets the PublishedProcedureProjectsVersions. - /// </summary> - public ObservableCollection<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions - { - get - { - return _publishedprocedureprojectsversions; - } - - set - { - _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); - } - - } - - private ICollectionView _publishedprocedureprojectsversionsViewSource; - /// <summary> - /// Gets or sets the PublishedProcedureProjectsVersions View Source. - ///</summary> - public ICollectionView PublishedProcedureProjectsVersionsViewSource - { - get - { - return _publishedprocedureprojectsversionsViewSource; - } - - set - { - _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); - } - - } - private ObservableCollection<Rml> _rmls; /// <summary> /// Gets or sets the Rmls. @@ -2321,42 +2105,6 @@ namespace Tango.BL } - private ObservableCollection<RmlsSpool> _rmlsspools; - /// <summary> - /// Gets or sets the RmlsSpools. - /// </summary> - public ObservableCollection<RmlsSpool> RmlsSpools - { - get - { - return _rmlsspools; - } - - set - { - _rmlsspools = value; RaisePropertyChanged(nameof(RmlsSpools)); - } - - } - - private ICollectionView _rmlsspoolsViewSource; - /// <summary> - /// Gets or sets the RmlsSpools View Source. - ///</summary> - public ICollectionView RmlsSpoolsViewSource - { - get - { - return _rmlsspoolsViewSource; - } - - set - { - _rmlsspoolsViewSource = value; RaisePropertyChanged(nameof(RmlsSpoolsViewSource)); - } - - } - private ObservableCollection<Role> _roles; /// <summary> /// Gets or sets the Roles. @@ -2465,114 +2213,6 @@ namespace Tango.BL } - private ObservableCollection<Site> _sites; - /// <summary> - /// Gets or sets the Sites. - /// </summary> - public ObservableCollection<Site> Sites - { - get - { - return _sites; - } - - set - { - _sites = value; RaisePropertyChanged(nameof(Sites)); - } - - } - - private ICollectionView _sitesViewSource; - /// <summary> - /// Gets or sets the Sites View Source. - ///</summary> - public ICollectionView SitesViewSource - { - get - { - return _sitesViewSource; - } - - set - { - _sitesViewSource = value; RaisePropertyChanged(nameof(SitesViewSource)); - } - - } - - private ObservableCollection<SitesCatalog> _sitescatalogs; - /// <summary> - /// Gets or sets the SitesCatalogs. - /// </summary> - public ObservableCollection<SitesCatalog> SitesCatalogs - { - get - { - return _sitescatalogs; - } - - set - { - _sitescatalogs = value; RaisePropertyChanged(nameof(SitesCatalogs)); - } - - } - - private ICollectionView _sitescatalogsViewSource; - /// <summary> - /// Gets or sets the SitesCatalogs View Source. - ///</summary> - public ICollectionView SitesCatalogsViewSource - { - get - { - return _sitescatalogsViewSource; - } - - set - { - _sitescatalogsViewSource = value; RaisePropertyChanged(nameof(SitesCatalogsViewSource)); - } - - } - - private ObservableCollection<SitesRml> _sitesrmls; - /// <summary> - /// Gets or sets the SitesRmls. - /// </summary> - public ObservableCollection<SitesRml> SitesRmls - { - get - { - return _sitesrmls; - } - - set - { - _sitesrmls = value; RaisePropertyChanged(nameof(SitesRmls)); - } - - } - - private ICollectionView _sitesrmlsViewSource; - /// <summary> - /// Gets or sets the SitesRmls View Source. - ///</summary> - public ICollectionView SitesRmlsViewSource - { - get - { - return _sitesrmlsViewSource; - } - - set - { - _sitesrmlsViewSource = value; RaisePropertyChanged(nameof(SitesRmlsViewSource)); - } - - } - private ObservableCollection<SpoolType> _spooltypes; /// <summary> /// Gets or sets the SpoolTypes. @@ -2681,42 +2321,6 @@ namespace Tango.BL } - private ObservableCollection<TangoUpdate> _tangoupdates; - /// <summary> - /// Gets or sets the TangoUpdates. - /// </summary> - public ObservableCollection<TangoUpdate> TangoUpdates - { - get - { - return _tangoupdates; - } - - set - { - _tangoupdates = value; RaisePropertyChanged(nameof(TangoUpdates)); - } - - } - - private ICollectionView _tangoupdatesViewSource; - /// <summary> - /// Gets or sets the TangoUpdates View Source. - ///</summary> - public ICollectionView TangoUpdatesViewSource - { - get - { - return _tangoupdatesViewSource; - } - - set - { - _tangoupdatesViewSource = value; RaisePropertyChanged(nameof(TangoUpdatesViewSource)); - } - - } - private ObservableCollection<TangoVersion> _tangoversions; /// <summary> /// Gets or sets the TangoVersions. @@ -3085,8 +2689,6 @@ namespace Tango.BL SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - ActionLogsViewSource = CreateCollectionView(ActionLogs); - AddressesViewSource = CreateCollectionView(Addresses); ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); @@ -3119,8 +2721,6 @@ namespace Tango.BL CustomersViewSource = CreateCollectionView(Customers); - DataStoreItemsViewSource = CreateCollectionView(DataStoreItems); - DispenserTypesViewSource = CreateCollectionView(DispenserTypes); DispensersViewSource = CreateCollectionView(Dispensers); @@ -3133,10 +2733,6 @@ namespace Tango.BL FiberSynthsViewSource = CreateCollectionView(FiberSynths); - FseVersionsViewSource = CreateCollectionView(FseVersions); - - GlobalDataStoreItemsViewSource = CreateCollectionView(GlobalDataStoreItems); - HardwareBlowerTypesViewSource = CreateCollectionView(HardwareBlowerTypes); HardwareBlowersViewSource = CreateCollectionView(HardwareBlowers); @@ -3205,34 +2801,20 @@ namespace Tango.BL ProcessParametersTablesGroupsViewSource = CreateCollectionView(ProcessParametersTablesGroups); - PublishedProcedureProjectsViewSource = CreateCollectionView(PublishedProcedureProjects); - - PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlsViewSource = CreateCollectionView(Rmls); - RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools); - RolesViewSource = CreateCollectionView(Roles); RolesPermissionsViewSource = CreateCollectionView(RolesPermissions); SegmentsViewSource = CreateCollectionView(Segments); - SitesViewSource = CreateCollectionView(Sites); - - SitesCatalogsViewSource = CreateCollectionView(SitesCatalogs); - - SitesRmlsViewSource = CreateCollectionView(SitesRmls); - SpoolTypesViewSource = CreateCollectionView(SpoolTypes); SpoolsViewSource = CreateCollectionView(Spools); SysdiagramsViewSource = CreateCollectionView(Sysdiagrams); - TangoUpdatesViewSource = CreateCollectionView(TangoUpdates); - TangoVersionsViewSource = CreateCollectionView(TangoVersions); TechControllersViewSource = CreateCollectionView(TechControllers); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs index 807b95935..1e0d5546d 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs @@ -15,14 +15,8 @@ namespace Tango.BL { public partial class ObservablesStaticCollections : ExtendedObject { - private ObservablesContext db; - private bool _initialized; - public bool IsInitialized - { - get { return _initialized; } - private set { _initialized = value; } - } + private ObservablesContext db; private static ObservablesStaticCollections _instance; /// <summary> @@ -58,79 +52,57 @@ namespace Tango.BL /// <summary> /// Initializes this instance. /// </summary> - public void Initialize(Action<String> progressLog = null) + public void Initialize() { if (!_initialized) { - progressLog?.Invoke("Loading static collections..."); db = ObservablesContext.CreateDefault(); + TaskSequencer sequencer = new TaskSequencer(); + WindingMethods = db.WindingMethods.ToObservableCollection(); - progressLog?.Invoke("Loading color spaces..."); ColorSpaces = db.ColorSpaces.ToObservableCollection(); - - progressLog?.Invoke("Loading spools..."); SpoolTypes = db.SpoolTypes.ToObservableCollection(); - progressLog?.Invoke("Loading events..."); EventTypes = db.EventTypes.ToObservableCollection(); - progressLog?.Invoke("Loading blowers..."); - HardwareBlowerTypes = db.HardwareBlowerTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwareBlowers = db.HardwareBlowers.ToObservableCollection(); + HardwareBlowerTypes = db.HardwareBlowerTypes.ToObservableCollection(); + HardwareBlowers = db.HardwareBlowers.ToObservableCollection(); - progressLog?.Invoke("Loading break sensors..."); - HardwareBreakSensorTypes = db.HardwareBreakSensorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwareBreakSensors = db.HardwareBreakSensors.ToObservableCollection(); + HardwareBreakSensorTypes = db.HardwareBreakSensorTypes.ToObservableCollection(); + HardwareBreakSensors = db.HardwareBreakSensors.ToObservableCollection(); - progressLog?.Invoke("Loading dancers..."); - HardwareDancerTypes = db.HardwareDancerTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwareDancers = db.HardwareDancers.ToObservableCollection(); + HardwareDancerTypes = db.HardwareDancerTypes.ToObservableCollection(); + HardwareDancers = db.HardwareDancers.ToObservableCollection(); - progressLog?.Invoke("Loading motors..."); - HardwareMotorTypes = db.HardwareMotorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwareMotors = db.HardwareMotors.ToObservableCollection(); + HardwareMotorTypes = db.HardwareMotorTypes.ToObservableCollection(); + HardwareMotors = db.HardwareMotors.ToObservableCollection(); - progressLog?.Invoke("Loading pid controls..."); - HardwarePidControlTypes = db.HardwarePidControlTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwarePidControls = db.HardwarePidControls.ToObservableCollection(); + HardwarePidControlTypes = db.HardwarePidControlTypes.ToObservableCollection(); + HardwarePidControls = db.HardwarePidControls.ToObservableCollection(); - progressLog?.Invoke("Loading speed sensors..."); - HardwareSpeedSensorTypes = db.HardwareSpeedSensorTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwareSpeedSensors = db.HardwareSpeedSensors.ToObservableCollection(); + HardwareSpeedSensorTypes = db.HardwareSpeedSensorTypes.ToObservableCollection(); + HardwareSpeedSensors = db.HardwareSpeedSensors.ToObservableCollection(); - progressLog?.Invoke("Loading winders..."); - HardwareWinderTypes = db.HardwareWinderTypes.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - //HardwareWinders = db.HardwareWinders.ToObservableCollection(); + HardwareWinderTypes = db.HardwareWinderTypes.ToObservableCollection(); + HardwareWinders = db.HardwareWinders.ToObservableCollection(); - progressLog?.Invoke("Loading tech controllers..."); - TechControllers = db.TechControllers.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - - progressLog?.Invoke("Loading tech dispensers..."); - TechDispensers = db.TechDispensers.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - - progressLog?.Invoke("Loading tech io's..."); + TechControllers = db.TechControllers.ToObservableCollection(); + TechDispensers = db.TechDispensers.ToObservableCollection(); TechIos = db.TechIos.ToObservableCollection(); + TechMonitors = db.TechMonitors.ToObservableCollection(); + TechValves = db.TechValves.ToObservableCollection(); + TechHeaters = db.TechHeaters.ToObservableCollection(); - progressLog?.Invoke("Loading tech monitors..."); - TechMonitors = db.TechMonitors.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - - progressLog?.Invoke("Loading tech valves..."); - TechValves = db.TechValves.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - - progressLog?.Invoke("Loading tech heaters..."); - TechHeaters = db.TechHeaters.ToList().OrderByAlphaNumeric(x => x.Description).ToObservableCollection(); - - progressLog?.Invoke("Loading machines..."); Machines = db.Machines.Include(x => x.Organization).ToObservableCollection(); - progressLog?.Invoke("Loading users..."); Users = db.Users.Where(x => !x.Deleted).Include(x => x.Contact).ToObservableCollection(); - progressLog?.Invoke("Loading machine versions..."); MachineVersions = db.MachineVersions.ToObservableCollection(); + + //Load later... Task.Factory.StartNew(() => { diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index 80ba4c2ee..ae6aee8ba 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -53,42 +53,6 @@ namespace Tango.BL } - private ObservableCollection<ActionLog> _actionlogs; - /// <summary> - /// Gets or sets the ActionLogs. - /// </summary> - public ObservableCollection<ActionLog> ActionLogs - { - get - { - return _actionlogs; - } - - set - { - _actionlogs = value; RaisePropertyChanged(nameof(ActionLogs)); - } - - } - - private ICollectionView _actionlogsViewSource; - /// <summary> - /// Gets or sets the ActionLogs View Source. - ///</summary> - public ICollectionView ActionLogsViewSource - { - get - { - return _actionlogsViewSource; - } - - set - { - _actionlogsViewSource = value; RaisePropertyChanged(nameof(ActionLogsViewSource)); - } - - } - private ObservableCollection<Address> _addresses; /// <summary> /// Gets or sets the Addresses. @@ -665,42 +629,6 @@ namespace Tango.BL } - private ObservableCollection<DataStoreItem> _datastoreitems; - /// <summary> - /// Gets or sets the DataStoreItems. - /// </summary> - public ObservableCollection<DataStoreItem> DataStoreItems - { - get - { - return _datastoreitems; - } - - set - { - _datastoreitems = value; RaisePropertyChanged(nameof(DataStoreItems)); - } - - } - - private ICollectionView _datastoreitemsViewSource; - /// <summary> - /// Gets or sets the DataStoreItems View Source. - ///</summary> - public ICollectionView DataStoreItemsViewSource - { - get - { - return _datastoreitemsViewSource; - } - - set - { - _datastoreitemsViewSource = value; RaisePropertyChanged(nameof(DataStoreItemsViewSource)); - } - - } - private ObservableCollection<DispenserType> _dispensertypes; /// <summary> /// Gets or sets the DispenserTypes. @@ -917,78 +845,6 @@ namespace Tango.BL } - private ObservableCollection<FseVersion> _fseversions; - /// <summary> - /// Gets or sets the FseVersions. - /// </summary> - public ObservableCollection<FseVersion> FseVersions - { - get - { - return _fseversions; - } - - set - { - _fseversions = value; RaisePropertyChanged(nameof(FseVersions)); - } - - } - - private ICollectionView _fseversionsViewSource; - /// <summary> - /// Gets or sets the FseVersions View Source. - ///</summary> - public ICollectionView FseVersionsViewSource - { - get - { - return _fseversionsViewSource; - } - - set - { - _fseversionsViewSource = value; RaisePropertyChanged(nameof(FseVersionsViewSource)); - } - - } - - private ObservableCollection<GlobalDataStoreItem> _globaldatastoreitems; - /// <summary> - /// Gets or sets the GlobalDataStoreItems. - /// </summary> - public ObservableCollection<GlobalDataStoreItem> GlobalDataStoreItems - { - get - { - return _globaldatastoreitems; - } - - set - { - _globaldatastoreitems = value; RaisePropertyChanged(nameof(GlobalDataStoreItems)); - } - - } - - private ICollectionView _globaldatastoreitemsViewSource; - /// <summary> - /// Gets or sets the GlobalDataStoreItems View Source. - ///</summary> - public ICollectionView GlobalDataStoreItemsViewSource - { - get - { - return _globaldatastoreitemsViewSource; - } - - set - { - _globaldatastoreitemsViewSource = value; RaisePropertyChanged(nameof(GlobalDataStoreItemsViewSource)); - } - - } - private ObservableCollection<HardwareBlowerType> _hardwareblowertypes; /// <summary> /// Gets or sets the HardwareBlowerTypes. @@ -2213,78 +2069,6 @@ namespace Tango.BL } - private ObservableCollection<PublishedProcedureProject> _publishedprocedureprojects; - /// <summary> - /// Gets or sets the PublishedProcedureProjects. - /// </summary> - public ObservableCollection<PublishedProcedureProject> PublishedProcedureProjects - { - get - { - return _publishedprocedureprojects; - } - - set - { - _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); - } - - } - - private ICollectionView _publishedprocedureprojectsViewSource; - /// <summary> - /// Gets or sets the PublishedProcedureProjects View Source. - ///</summary> - public ICollectionView PublishedProcedureProjectsViewSource - { - get - { - return _publishedprocedureprojectsViewSource; - } - - set - { - _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); - } - - } - - private ObservableCollection<PublishedProcedureProjectsVersion> _publishedprocedureprojectsversions; - /// <summary> - /// Gets or sets the PublishedProcedureProjectsVersions. - /// </summary> - public ObservableCollection<PublishedProcedureProjectsVersion> PublishedProcedureProjectsVersions - { - get - { - return _publishedprocedureprojectsversions; - } - - set - { - _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); - } - - } - - private ICollectionView _publishedprocedureprojectsversionsViewSource; - /// <summary> - /// Gets or sets the PublishedProcedureProjectsVersions View Source. - ///</summary> - public ICollectionView PublishedProcedureProjectsVersionsViewSource - { - get - { - return _publishedprocedureprojectsversionsViewSource; - } - - set - { - _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); - } - - } - private ObservableCollection<Rml> _rmls; /// <summary> /// Gets or sets the Rmls. @@ -2321,42 +2105,6 @@ namespace Tango.BL } - private ObservableCollection<RmlsSpool> _rmlsspools; - /// <summary> - /// Gets or sets the RmlsSpools. - /// </summary> - public ObservableCollection<RmlsSpool> RmlsSpools - { - get - { - return _rmlsspools; - } - - set - { - _rmlsspools = value; RaisePropertyChanged(nameof(RmlsSpools)); - } - - } - - private ICollectionView _rmlsspoolsViewSource; - /// <summary> - /// Gets or sets the RmlsSpools View Source. - ///</summary> - public ICollectionView RmlsSpoolsViewSource - { - get - { - return _rmlsspoolsViewSource; - } - - set - { - _rmlsspoolsViewSource = value; RaisePropertyChanged(nameof(RmlsSpoolsViewSource)); - } - - } - private ObservableCollection<Role> _roles; /// <summary> /// Gets or sets the Roles. @@ -2465,114 +2213,6 @@ namespace Tango.BL } - private ObservableCollection<Site> _sites; - /// <summary> - /// Gets or sets the Sites. - /// </summary> - public ObservableCollection<Site> Sites - { - get - { - return _sites; - } - - set - { - _sites = value; RaisePropertyChanged(nameof(Sites)); - } - - } - - private ICollectionView _sitesViewSource; - /// <summary> - /// Gets or sets the Sites View Source. - ///</summary> - public ICollectionView SitesViewSource - { - get - { - return _sitesViewSource; - } - - set - { - _sitesViewSource = value; RaisePropertyChanged(nameof(SitesViewSource)); - } - - } - - private ObservableCollection<SitesCatalog> _sitescatalogs; - /// <summary> - /// Gets or sets the SitesCatalogs. - /// </summary> - public ObservableCollection<SitesCatalog> SitesCatalogs - { - get - { - return _sitescatalogs; - } - - set - { - _sitescatalogs = value; RaisePropertyChanged(nameof(SitesCatalogs)); - } - - } - - private ICollectionView _sitescatalogsViewSource; - /// <summary> - /// Gets or sets the SitesCatalogs View Source. - ///</summary> - public ICollectionView SitesCatalogsViewSource - { - get - { - return _sitescatalogsViewSource; - } - - set - { - _sitescatalogsViewSource = value; RaisePropertyChanged(nameof(SitesCatalogsViewSource)); - } - - } - - private ObservableCollection<SitesRml> _sitesrmls; - /// <summary> - /// Gets or sets the SitesRmls. - /// </summary> - public ObservableCollection<SitesRml> SitesRmls - { - get - { - return _sitesrmls; - } - - set - { - _sitesrmls = value; RaisePropertyChanged(nameof(SitesRmls)); - } - - } - - private ICollectionView _sitesrmlsViewSource; - /// <summary> - /// Gets or sets the SitesRmls View Source. - ///</summary> - public ICollectionView SitesRmlsViewSource - { - get - { - return _sitesrmlsViewSource; - } - - set - { - _sitesrmlsViewSource = value; RaisePropertyChanged(nameof(SitesRmlsViewSource)); - } - - } - private ObservableCollection<SpoolType> _spooltypes; /// <summary> /// Gets or sets the SpoolTypes. @@ -2681,42 +2321,6 @@ namespace Tango.BL } - private ObservableCollection<TangoUpdate> _tangoupdates; - /// <summary> - /// Gets or sets the TangoUpdates. - /// </summary> - public ObservableCollection<TangoUpdate> TangoUpdates - { - get - { - return _tangoupdates; - } - - set - { - _tangoupdates = value; RaisePropertyChanged(nameof(TangoUpdates)); - } - - } - - private ICollectionView _tangoupdatesViewSource; - /// <summary> - /// Gets or sets the TangoUpdates View Source. - ///</summary> - public ICollectionView TangoUpdatesViewSource - { - get - { - return _tangoupdatesViewSource; - } - - set - { - _tangoupdatesViewSource = value; RaisePropertyChanged(nameof(TangoUpdatesViewSource)); - } - - } - private ObservableCollection<TangoVersion> _tangoversions; /// <summary> /// Gets or sets the TangoVersions. @@ -3085,8 +2689,6 @@ namespace Tango.BL SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - ActionLogsViewSource = CreateCollectionView(ActionLogs); - AddressesViewSource = CreateCollectionView(Addresses); ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); @@ -3119,8 +2721,6 @@ namespace Tango.BL CustomersViewSource = CreateCollectionView(Customers); - DataStoreItemsViewSource = CreateCollectionView(DataStoreItems); - DispenserTypesViewSource = CreateCollectionView(DispenserTypes); DispensersViewSource = CreateCollectionView(Dispensers); @@ -3133,10 +2733,6 @@ namespace Tango.BL FiberSynthsViewSource = CreateCollectionView(FiberSynths); - FseVersionsViewSource = CreateCollectionView(FseVersions); - - GlobalDataStoreItemsViewSource = CreateCollectionView(GlobalDataStoreItems); - HardwareBlowerTypesViewSource = CreateCollectionView(HardwareBlowerTypes); HardwareBlowersViewSource = CreateCollectionView(HardwareBlowers); @@ -3205,34 +2801,20 @@ namespace Tango.BL ProcessParametersTablesGroupsViewSource = CreateCollectionView(ProcessParametersTablesGroups); - PublishedProcedureProjectsViewSource = CreateCollectionView(PublishedProcedureProjects); - - PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlsViewSource = CreateCollectionView(Rmls); - RmlsSpoolsViewSource = CreateCollectionView(RmlsSpools); - RolesViewSource = CreateCollectionView(Roles); RolesPermissionsViewSource = CreateCollectionView(RolesPermissions); SegmentsViewSource = CreateCollectionView(Segments); - SitesViewSource = CreateCollectionView(Sites); - - SitesCatalogsViewSource = CreateCollectionView(SitesCatalogs); - - SitesRmlsViewSource = CreateCollectionView(SitesRmls); - SpoolTypesViewSource = CreateCollectionView(SpoolTypes); SpoolsViewSource = CreateCollectionView(Spools); SysdiagramsViewSource = CreateCollectionView(Sysdiagrams); - TangoUpdatesViewSource = CreateCollectionView(TangoUpdates); - TangoVersionsViewSource = CreateCollectionView(TangoVersions); TechControllersViewSource = CreateCollectionView(TechControllers); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index dc817af6e..4d2c7ddd9 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -45,10 +45,6 @@ <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> <HintPath>..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath> </Reference> - <Reference Include="LiteDB, Version=5.0.4.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL"> - <HintPath>..\packages\LiteDB.5.0.4\lib\net45\LiteDB.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> @@ -71,7 +67,6 @@ <Private>True</Private> </Reference> <Reference Include="System.Drawing" /> - <Reference Include="System.Runtime" /> <Reference Include="System.Xml" /> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Core" /> @@ -84,28 +79,12 @@ <Reference Include="WindowsBase" /> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> - <Reference Include="Z.EntityFramework.Extensions, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> - <HintPath>..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll</HintPath> - </Reference> - <Reference Include="Z.EntityFramework.Plus.EF6, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> - <HintPath>..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath> - </Reference> - <Reference Include="Z.Expressions.Eval, Version=4.0.27.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL"> - <HintPath>..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> - <Compile Include="ActionLogs\ActionLogIgnoreAttribute.cs" /> - <Compile Include="ActionLogs\DefaultActionLogComparer.cs" /> - <Compile Include="ActionLogs\DefaultActionLogManager.cs" /> - <Compile Include="ActionLogs\IActionLogComparable.cs" /> - <Compile Include="ActionLogs\IActionLogComparer.cs" /> - <Compile Include="ActionLogs\IActionLogManager.cs" /> - <Compile Include="Builders\ActionLogsCollectionBuilder.cs" /> - <Compile Include="Builders\CatalogBuilder.cs" /> + <Compile Include="Builders\ColorCatalogBuilder.cs" /> <Compile Include="Builders\ConfigurationBuilder.cs" /> <Compile Include="Builders\EntityBuilderBase.cs" /> <Compile Include="Builders\EntityCollectionBuilderBase.cs" /> @@ -113,11 +92,7 @@ <Compile Include="Builders\IEntityBuilder.cs" /> <Compile Include="Builders\IEntityCollectionBuilder.cs" /> <Compile Include="Builders\JobBuilder.cs" /> - <Compile Include="Builders\JobRunsCollectionBuilder.cs" /> - <Compile Include="Builders\CatalogsCollectionBuilder.cs" /> - <Compile Include="Builders\SiteBuilder.cs" /> - <Compile Include="Builders\SitesCollectionBuilder.cs" /> - <Compile Include="Builders\TangoUpdatesCollectionBuilder.cs" /> + <Compile Include="Builders\JobRunsBuilder.cs" /> <Compile Include="Builders\JobsCollectionBuilder.cs" /> <Compile Include="Builders\MachineBuilder.cs" /> <Compile Include="Builders\OrganizationBuilder.cs" /> @@ -138,8 +113,6 @@ <Compile Include="Dispensing\LubricantDispensingCalc.cs" /> <Compile Include="Dispensing\StandardColorDispensingCalc.cs" /> <Compile Include="Dispensing\TransparentLiquidDispensingCalc.cs" /> - <Compile Include="DTO\ActionLogDTO.cs" /> - <Compile Include="DTO\ActionLogDTOBase.cs" /> <Compile Include="DTO\AddressDTO.cs" /> <Compile Include="DTO\AddressDTOBase.cs" /> <Compile Include="DTO\ApplicationDisplayPanelVersionDTO.cs" /> @@ -172,8 +145,6 @@ <Compile Include="DTO\ContactDTOBase.cs" /> <Compile Include="DTO\CustomerDTO.cs" /> <Compile Include="DTO\CustomerDTOBase.cs" /> - <Compile Include="DTO\DataStoreItemDTO.cs" /> - <Compile Include="DTO\DataStoreItemDTOBase.cs" /> <Compile Include="DTO\DispenserDTO.cs" /> <Compile Include="DTO\DispenserDTOBase.cs" /> <Compile Include="DTO\DispenserTypeDTO.cs" /> @@ -186,10 +157,6 @@ <Compile Include="DTO\FiberShapeDTOBase.cs" /> <Compile Include="DTO\FiberSynthDTO.cs" /> <Compile Include="DTO\FiberSynthDTOBase.cs" /> - <Compile Include="DTO\FseVersionDTO.cs" /> - <Compile Include="DTO\FseVersionDTOBase.cs" /> - <Compile Include="DTO\GlobalDataStoreItemDTO.cs" /> - <Compile Include="DTO\GlobalDataStoreItemDTOBase.cs" /> <Compile Include="DTO\HardwareBlowerDTO.cs" /> <Compile Include="DTO\HardwareBlowerDTOBase.cs" /> <Compile Include="DTO\HardwareBlowerTypeDTO.cs" /> @@ -258,34 +225,20 @@ <Compile Include="DTO\ProcessParametersTableDTOBase.cs" /> <Compile Include="DTO\ProcessParametersTablesGroupDTO.cs" /> <Compile Include="DTO\ProcessParametersTablesGroupDTOBase.cs" /> - <Compile Include="DTO\PublishedProcedureProjectDTO.cs" /> - <Compile Include="DTO\PublishedProcedureProjectDTOBase.cs" /> - <Compile Include="DTO\PublishedProcedureProjectsVersionDTO.cs" /> - <Compile Include="DTO\PublishedProcedureProjectsVersionDTOBase.cs" /> <Compile Include="DTO\RmlDTO.cs" /> <Compile Include="DTO\RmlDTOBase.cs" /> - <Compile Include="DTO\RmlsSpoolDTO.cs" /> - <Compile Include="DTO\RmlsSpoolDTOBase.cs" /> <Compile Include="DTO\RoleDTO.cs" /> <Compile Include="DTO\RoleDTOBase.cs" /> <Compile Include="DTO\RolesPermissionDTO.cs" /> <Compile Include="DTO\RolesPermissionDTOBase.cs" /> <Compile Include="DTO\SegmentDTO.cs" /> <Compile Include="DTO\SegmentDTOBase.cs" /> - <Compile Include="DTO\SiteDTO.cs" /> - <Compile Include="DTO\SiteDTOBase.cs" /> - <Compile Include="DTO\SitesCatalogDTO.cs" /> - <Compile Include="DTO\SitesCatalogDTOBase.cs" /> - <Compile Include="DTO\SitesRmlDTO.cs" /> - <Compile Include="DTO\SitesRmlDTOBase.cs" /> <Compile Include="DTO\SpoolDTO.cs" /> <Compile Include="DTO\SpoolDTOBase.cs" /> <Compile Include="DTO\SpoolTypeDTO.cs" /> <Compile Include="DTO\SpoolTypeDTOBase.cs" /> <Compile Include="DTO\SyncConfigurationDTO.cs" /> <Compile Include="DTO\SyncConfigurationDTOBase.cs" /> - <Compile Include="DTO\TangoUpdateDTO.cs" /> - <Compile Include="DTO\TangoUpdateDTOBase.cs" /> <Compile Include="DTO\TangoVersionDTO.cs" /> <Compile Include="DTO\TangoVersionDTOBase.cs" /> <Compile Include="DTO\TechControllerDTO.cs" /> @@ -306,8 +259,6 @@ <Compile Include="DTO\UsersRoleDTOBase.cs" /> <Compile Include="DTO\WindingMethodDTO.cs" /> <Compile Include="DTO\WindingMethodDTOBase.cs" /> - <Compile Include="Entities\ActionLog.cs" /> - <Compile Include="Entities\ActionLogBase.cs" /> <Compile Include="Entities\AddressBase.cs" /> <Compile Include="Entities\ApplicationDisplayPanelVersionBase.cs" /> <Compile Include="Entities\ApplicationFirmwareVersionBase.cs" /> @@ -328,8 +279,6 @@ <Compile Include="Entities\ContactBase.cs" /> <Compile Include="Entities\Customer.cs" /> <Compile Include="Entities\CustomerBase.cs" /> - <Compile Include="Entities\DataStoreItem.cs" /> - <Compile Include="Entities\DataStoreItemBase.cs" /> <Compile Include="Entities\Dispenser.cs" /> <Compile Include="Entities\DispenserBase.cs" /> <Compile Include="Entities\DispenserTypeBase.cs" /> @@ -337,10 +286,6 @@ <Compile Include="Entities\EventTypeBase.cs" /> <Compile Include="Entities\FiberShapeBase.cs" /> <Compile Include="Entities\FiberSynthBase.cs" /> - <Compile Include="Entities\FseVersion.cs" /> - <Compile Include="Entities\FseVersionBase.cs" /> - <Compile Include="Entities\GlobalDataStoreItemBase.cs" /> - <Compile Include="Entities\GlobalDataStoreItem.cs" /> <Compile Include="Entities\HardwareBlower.cs" /> <Compile Include="Entities\HardwareBlowerBase.cs" /> <Compile Include="Entities\HardwareBlowerType.cs" /> @@ -381,30 +326,16 @@ <Compile Include="Entities\PermissionBase.cs" /> <Compile Include="Entities\ProcessParametersTableBase.cs" /> <Compile Include="Entities\ProcessParametersTablesGroupBase.cs" /> - <Compile Include="Entities\PublishedProcedureProject.cs" /> - <Compile Include="Entities\PublishedProcedureProjectBase.cs" /> - <Compile Include="Entities\PublishedProcedureProjectsVersionBase.cs" /> - <Compile Include="Entities\PublishedProcedureProjectsVersion.cs" /> <Compile Include="Entities\RmlBase.cs" /> - <Compile Include="Entities\RmlsSpoolBase.cs" /> - <Compile Include="Entities\RmlsSpool.cs" /> <Compile Include="Entities\RoleBase.cs" /> <Compile Include="Entities\RolesPermissionBase.cs" /> <Compile Include="Entities\SegmentBase.cs" /> - <Compile Include="Entities\Site.cs" /> - <Compile Include="Entities\SiteBase.cs" /> - <Compile Include="Entities\SitesCatalog.cs" /> - <Compile Include="Entities\SitesCatalogBase.cs" /> - <Compile Include="Entities\SitesRml.cs" /> - <Compile Include="Entities\SitesRmlBase.cs" /> <Compile Include="Entities\Spool.cs" /> <Compile Include="Entities\SpoolBase.cs" /> <Compile Include="Entities\SpoolTypeBase.cs" /> <Compile Include="Entities\SyncConfigurationBase.cs" /> <Compile Include="Entities\Sysdiagram.cs" /> <Compile Include="Entities\SysdiagramBase.cs" /> - <Compile Include="Entities\TangoUpdate.cs" /> - <Compile Include="Entities\TangoUpdateBase.cs" /> <Compile Include="Entities\TangoVersion.cs" /> <Compile Include="Entities\TangoVersionBase.cs" /> <Compile Include="Entities\TechController.cs" /> @@ -419,16 +350,9 @@ <Compile Include="Entities\UserBase.cs" /> <Compile Include="Entities\UsersRoleBase.cs" /> <Compile Include="Entities\WindingMethodBase.cs" /> - <Compile Include="Enumerations\ActionLogType.cs" /> <Compile Include="Enumerations\CatalogDesignType.cs" /> <Compile Include="Enumerations\ColorCatalogsItems.cs" /> - <Compile Include="Enumerations\HeadTypes.cs" /> - <Compile Include="Enumerations\JobSource.cs" /> - <Compile Include="Enumerations\PublishedProcedureProjectVisibilities.cs" /> - <Compile Include="Enumerations\TangoUpdateStatuses.cs" /> - <Compile Include="Enumerations\RmlQualifications.cs" /> <Compile Include="IObservableEntityDTO.cs" /> - <Compile Include="ObservableDTOPropertyAttribute.cs" /> <Compile Include="ObservableEntityDTO.cs" /> <Compile Include="Enumerations\DancerTypes.cs" /> <Compile Include="Enumerations\EditingStates.cs" /> @@ -556,10 +480,7 @@ <Compile Include="Serialization\ISerializableEntity.cs" /> <Compile Include="Serialization\SerializableEntityContractResolver.cs" /> <Compile Include="Utils\BrushStopUtils.cs" /> - <Compile Include="ValueObjects\ActionLogDifference.cs" /> - <Compile Include="ValueObjects\ActionLogDifferenceValue.cs" /> <Compile Include="ValueObjects\HardwareConfiguration.cs" /> - <Compile Include="ValueObjects\JobRunLiquidQuantity.cs" /> </ItemGroup> <ItemGroup> <Compile Include="ObservablesStaticCollections.cs" /> @@ -585,22 +506,14 @@ <EmbeddedResource Include="..\Resources\CalibrationDataTemplate.xlsx"> <Link>Calibration\CalibrationDataTemplate.xlsx</Link> </EmbeddedResource> - <None Include="app.config"> - <SubType>Designer</SubType> - </None> - <None Include="packages.config"> - <SubType>Designer</SubType> - </None> + <None Include="app.config" /> + <None Include="packages.config" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> </None> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\DataStore\Tango.DataStore\Tango.DataStore.csproj"> - <Project>{e0364dfa-0721-4637-9d32-9d22aac109d6}</Project> - <Name>Tango.DataStore</Name> - </ProjectReference> <ProjectReference Include="..\SideChains\ColorMine\ColorMine.csproj"> <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project> <Name>ColorMine</Name> @@ -634,7 +547,9 @@ <Name>Tango.Settings</Name> </ProjectReference> </ItemGroup> - <ItemGroup /> + <ItemGroup> + <Folder Include="Attributes\" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> diff --git a/Software/Visual_Studio/Tango.BL/ValueObjects/ActionLogDifference.cs b/Software/Visual_Studio/Tango.BL/ValueObjects/ActionLogDifference.cs deleted file mode 100644 index f21ae8c95..000000000 --- a/Software/Visual_Studio/Tango.BL/ValueObjects/ActionLogDifference.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.ValueObjects -{ - /// <summary> - /// Represents an ActionLog difference node. - /// </summary> - public class ActionLogDifference - { - /// <summary> - /// Gets or sets the name of the node. - /// </summary> - public String Name { get; set; } - - /// <summary> - /// Gets or sets the child nodes. - /// </summary> - public List<ActionLogDifference> Children { get; set; } - - /// <summary> - /// Gets a value indicating whether this node children contains any differences. - /// </summary> - [JsonIgnore] - public virtual bool HasDifference - { - get { return Children.Any(x => x.HasDifference); } - } - - /// <summary> - /// Initializes a new instance of the <see cref="ActionLogDifference"/> class. - /// </summary> - public ActionLogDifference() - { - Children = new List<ActionLogDifference>(); - } - - /// <summary> - /// Returns a <see cref="System.String" /> that represents this instance. - /// </summary> - /// <returns> - /// A <see cref="System.String" /> that represents this instance. - /// </returns> - public override string ToString() - { - return $"{Name} | Children[{Children.Count}]"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/ValueObjects/ActionLogDifferenceValue.cs b/Software/Visual_Studio/Tango.BL/ValueObjects/ActionLogDifferenceValue.cs deleted file mode 100644 index 46b585f75..000000000 --- a/Software/Visual_Studio/Tango.BL/ValueObjects/ActionLogDifferenceValue.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.ValueObjects -{ - /// <summary> - /// Represents an ActionLog difference node value comparison. - /// </summary> - /// <seealso cref="Tango.BL.ValueObjects.ActionLogDifference" /> - public class ActionLogDifferenceValue : ActionLogDifference - { - /// <summary> - /// Gets or sets the node value before the change. - /// </summary> - public Object Before { get; set; } - - /// <summary> - /// Gets or sets the node value after the change. - /// </summary> - public Object After { get; set; } - - /// <summary> - /// Gets a value indicating whether before and after values are different. - /// </summary> - [JsonIgnore] - public override bool HasDifference - { - get { return Before != After; } - } - - /// <summary> - /// Returns a <see cref="System.String" /> that represents this instance. - /// </summary> - /// <returns> - /// A <see cref="System.String" /> that represents this instance. - /// </returns> - public override string ToString() - { - return $"{Name}: Before: {Before} != After: {After}"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/ValueObjects/HardwareConfiguration.cs b/Software/Visual_Studio/Tango.BL/ValueObjects/HardwareConfiguration.cs index 7ad362c12..4b94f24af 100644 --- a/Software/Visual_Studio/Tango.BL/ValueObjects/HardwareConfiguration.cs +++ b/Software/Visual_Studio/Tango.BL/ValueObjects/HardwareConfiguration.cs @@ -10,72 +10,32 @@ using Tango.Core; namespace Tango.BL.ValueObjects { - /// <summary> - /// Represents a machine hardware configuration (overrides) that can be embeeded as a string in the HARDWARE_CONFIGURATION field of a machine configuration. - /// </summary> public class HardwareConfiguration { - /// <summary> - /// Represents a hardware configuration parameter. - /// </summary> public class HardwareConfigurationParameter { - /// <summary> - /// Gets or sets the name of the component. - /// </summary> public String ComponentName { get; set; } - - /// <summary> - /// Gets or sets the name of the parameter. - /// </summary> public String ParameterName { get; set; } - - /// <summary> - /// Gets or sets the value. - /// </summary> public Object Value { get; set; } - /// <summary> - /// Returns a <see cref="System.String" /> that represents this instance. - /// </summary> - /// <returns> - /// A <see cref="System.String" /> that represents this instance. - /// </returns> public override string ToString() { return $"{ParameterName}: {Value}"; } } - /// <summary> - /// Gets or sets the parameters. - /// </summary> public List<HardwareConfigurationParameter> Parameters { get; set; } - /// <summary> - /// Initializes a new instance of the <see cref="HardwareConfiguration"/> class. - /// </summary> public HardwareConfiguration() { Parameters = new List<HardwareConfigurationParameter>(); } - /// <summary> - /// Merge this hardware configuration to the specified hardware version which will result in a new instance of hardware version. - /// </summary> - /// <param name="hw">The hw.</param> - /// <returns></returns> public HardwareVersion Merge(HardwareVersion hw) { return Merge(this, hw); } - /// <summary> - /// Merge the specified hardware configuration to the specified hardware version which will result in a new instance of hardware version. - /// </summary> - /// <param name="config">The configuration.</param> - /// <param name="hw">The hw.</param> - /// <returns></returns> public static HardwareVersion Merge(HardwareConfiguration config, HardwareVersion hw) { var cloned = hw.Clone(); @@ -91,13 +51,6 @@ namespace Tango.BL.ValueObjects return cloned; } - /// <summary> - /// Merges a hardware component collection. - /// </summary> - /// <typeparam name="T"></typeparam> - /// <param name="config">The configuration.</param> - /// <param name="collection">The collection.</param> - /// <param name="funcProp">The function property.</param> private static void MergeCollection<T>(HardwareConfiguration config, SynchronizedObservableCollection<T> collection, Func<T, String> funcProp) { foreach (var component in collection) @@ -117,20 +70,11 @@ namespace Tango.BL.ValueObjects } } - /// <summary> - /// Converts this hardware configuration to a json string. - /// </summary> - /// <returns></returns> public String ToJson() { return JsonConvert.SerializeObject(this); } - /// <summary> - /// Creates an instance of <see cref="HardwareConfiguration"/> from the specified json string. - /// </summary> - /// <param name="json">The json.</param> - /// <returns></returns> public static HardwareConfiguration FromJson(String json) { if (json != null) diff --git a/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs b/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs deleted file mode 100644 index 9950e1c26..000000000 --- a/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Enumerations; - -namespace Tango.BL.ValueObjects -{ - public class JobRunLiquidQuantity - { - public LiquidTypes LiquidType { get; set; } - public int Quantity { get; set; } - - public override string ToString() - { - return $"{LiquidType}: {Quantity}"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/packages.config b/Software/Visual_Studio/Tango.BL/packages.config index 81001d8fe..0811e4b17 100644 --- a/Software/Visual_Studio/Tango.BL/packages.config +++ b/Software/Visual_Studio/Tango.BL/packages.config @@ -3,14 +3,10 @@ <package id="EntityFramework" version="6.2.0" targetFramework="net461" /> <package id="EntityFramework.Cache" version="1.1.3" targetFramework="net461" /> <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" /> - <package id="LiteDB" version="5.0.4" targetFramework="net461" /> <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" /> <package id="SimpleValidator" version="0.6.1.0" targetFramework="net46" /> <package id="System.Data.SQLite" version="1.0.108.0" targetFramework="net46" /> <package id="System.Data.SQLite.Core" version="1.0.108.0" targetFramework="net46" /> <package id="System.Data.SQLite.EF6" version="1.0.108.0" targetFramework="net46" /> <package id="System.Data.SQLite.Linq" version="1.0.108.0" targetFramework="net46" /> - <package id="Z.EntityFramework.Extensions" version="5.1.6" targetFramework="net461" /> - <package id="Z.EntityFramework.Plus.EF6" version="5.1.6" targetFramework="net461" /> - <package id="Z.Expressions.Eval" version="4.0.27" targetFramework="net461" /> </packages>
\ No newline at end of file |