Added Working hours to Frontend

2019-04-02 08:58:35 +02:00
parent 13169c7a54
commit 45dff79e19
3 changed files with 10 additions and 7 deletions
@@ -14,6 +14,7 @@ namespace Step.Model.DTOModels
        public bool IsActive;
        public bool IsSelected;
        public bool AbrasiveIsActive;
+        public uint WorkedTime;

        public override bool Equals(object obj)
        {
@@ -42,8 +43,12 @@ namespace Step.Model.DTOModels
                return false;

            if (AbrasiveIsActive != item.AbrasiveIsActive)
+                return false;
+
+            if (WorkedTime != item.WorkedTime)
                return false;

+
            return true;
        }

@@ -66,7 +71,6 @@ namespace Step.Model.DTOModels
        public ushort MountedTool;
        public bool Configured;
        public ROTATION Rotation;
-        public uint WorkedTime;
        public DTOToolInSpindleModel ToolData;

        public override bool Equals(object obj)
@@ -93,9 +97,6 @@ namespace Step.Model.DTOModels
            if (Rotation != item.Rotation)
                return false;

-            if (WorkedTime != item.WorkedTime)
-                return false;
-
            // Call Parent equals
            return base.Equals(item);
        }