Added Working hours to Frontend
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -875,7 +875,8 @@ namespace Step.NC
|
||||
Override = head.Override,
|
||||
IsActive = head.IsActive,
|
||||
IsSelected = head.IsSelected,
|
||||
AbrasiveIsActive = head.AbrasiveIsActive
|
||||
AbrasiveIsActive = head.AbrasiveIsActive,
|
||||
WorkedTime = head.WorkedTime
|
||||
});
|
||||
}
|
||||
break;
|
||||
@@ -894,7 +895,8 @@ namespace Step.NC
|
||||
Override = head.Override,
|
||||
IsActive = head.IsActive,
|
||||
IsSelected = head.IsSelected,
|
||||
AbrasiveIsActive = head.AbrasiveIsActive
|
||||
AbrasiveIsActive = head.AbrasiveIsActive,
|
||||
WorkedTime = head.WorkedTime
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -122,7 +122,7 @@ export default {
|
||||
return true;
|
||||
},
|
||||
getWorkedTime() {
|
||||
return moment.utc(this.workedTime*1000).format('HH:mm:ss');
|
||||
return this.workedTime;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user