Index: ActiviteitenOpvolging/ActiviteitenOpvolging/enums/ActivityStateEnum.vb =================================================================== diff -u -r1700 -r1728 --- ActiviteitenOpvolging/ActiviteitenOpvolging/enums/ActivityStateEnum.vb (.../ActivityStateEnum.vb) (revision 1700) +++ ActiviteitenOpvolging/ActiviteitenOpvolging/enums/ActivityStateEnum.vb (.../ActivityStateEnum.vb) (revision 1728) @@ -1,6 +1,6 @@ Public Enum ActivityStateEnum Defaulted - Pauzed + Stopped Started Finished Zero @@ -16,8 +16,8 @@ Select Case activityStateValue.ToLower() Case "defaulted" Return ActivityStateEnum.Defaulted - Case "pauzed" - Return ActivityStateEnum.Pauzed + Case "stopped" + Return ActivityStateEnum.Stopped Case "started" Return ActivityStateEnum.Started Case "finished" @@ -42,7 +42,7 @@ Case "S"C Return ActivityStateEnum.Started Case "P"C - Return ActivityStateEnum.Pauzed + Return ActivityStateEnum.Stopped Case "F"C Return ActivityStateEnum.Finished Case Else Index: ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb =================================================================== diff -u -r1725 -r1728 --- ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb (.../CacheMapper.vb) (revision 1725) +++ ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb (.../CacheMapper.vb) (revision 1728) @@ -120,7 +120,7 @@ .Label = ExtractItemFromDataReader(dr, $"Label_{i}", String.Empty) 'If the quentity is 0, the status is automatically zero. .Status = If(.QuantityToProduce = 0, ActivityStateEnum.Zero, ActivityStateEnumMapper.GetActivityStateFromLetter(ExtractItemFromDataReader(Of Char)(dr, $"Status_{i}"))) - .User = ExtractItemFromDataReader(dr, $"Gebruiker_{i}", String.Empty) + .EmployeeInitials = ExtractItemFromDataReader(dr, $"Gebruiker_{i}", String.Empty) .IsReadOnly = ExtractItemFromDataReader(dr, $"ReadOnly_{i}", False) .StartTimeStamp = ExtractItemFromDataReader(dr, $"StartTijdstip_{i}", DateTime.MinValue) 'Subtract time when date was specified. Time is gotten from config. Index: ActiviteitenOpvolging/ActiviteitenOpvolging/screens/employee/details/EmployeeDetailUserControl.vb =================================================================== diff -u -r1726 -r1728 --- ActiviteitenOpvolging/ActiviteitenOpvolging/screens/employee/details/EmployeeDetailUserControl.vb (.../EmployeeDetailUserControl.vb) (revision 1726) +++ ActiviteitenOpvolging/ActiviteitenOpvolging/screens/employee/details/EmployeeDetailUserControl.vb (.../EmployeeDetailUserControl.vb) (revision 1728) @@ -33,7 +33,7 @@ 'Set border colors of the buttons. StartButton.BackColor = ConfigsLoader.ColorsActivities(ActivityStateEnum.Started) - StopButton.BackColor = ConfigsLoader.ColorsActivities(ActivityStateEnum.Pauzed) + StopButton.BackColor = ConfigsLoader.ColorsActivities(ActivityStateEnum.Stopped) FinishButton.BackColor = ConfigsLoader.ColorsActivities(ActivityStateEnum.Finished) 'Fetch and show the employee. @@ -77,7 +77,7 @@ StatusLabel.Text = "Gestart" Case ActivityStateEnum.Finished StatusLabel.Text = "Afgewerkt" - Case ActivityStateEnum.Pauzed + Case ActivityStateEnum.Stopped StatusLabel.Text = "Onderbroken" Case ActivityStateEnum.Defaulted StatusLabel.Text = "Beschikbaar" Index: ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/IActivity.vb =================================================================== diff -u -r1725 -r1728 --- ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/IActivity.vb (.../IActivity.vb) (revision 1725) +++ ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/IActivity.vb (.../IActivity.vb) (revision 1728) @@ -3,7 +3,7 @@ Property QuantityToProduce As Integer Property Label As String Property Status As ActivityStateEnum - Property User As String + Property EmployeeInitials As String Property IsReadOnly As Boolean Property StartBeforeTimestamp As DateTime Property StartAlmostTimeStamp As DateTime