Index: ActiviteitenOpvolging/ActiviteitenOpvolging/screens/employee/details/EmployeeDetailUserControl.vb
===================================================================
diff -u -r1724 -r1725
--- ActiviteitenOpvolging/ActiviteitenOpvolging/screens/employee/details/EmployeeDetailUserControl.vb (.../EmployeeDetailUserControl.vb) (revision 1724)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/screens/employee/details/EmployeeDetailUserControl.vb (.../EmployeeDetailUserControl.vb) (revision 1725)
@@ -59,6 +59,7 @@
Private Sub LoadEmployee()
'Fetch the employee.
Dim employee = _parentUserControl.FetchEmployee()
+
'Show all information on screen.
NameLabel.Text = $"{employee.FirstName} {employee.LastName}"
@@ -81,8 +82,11 @@
Case ActivityStateEnum.Defaulted
StatusLabel.Text = "Beschikbaar"
End Select
+ ' BatchLabel.Text = activity.bat
+ ActivityNameLabel.Text = activity.Label
End If
- 'Todo activity status
+
+
'todo enable status of buttons.
End Sub
Index: ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb
===================================================================
diff -u -r1711 -r1725
--- ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb (.../CacheMapper.vb) (revision 1711)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb (.../CacheMapper.vb) (revision 1725)
@@ -106,12 +106,12 @@
'''
'''
'''
- Private Function ExtractActivities(dr As OdbcDataReader, numberOfActivities As Integer) As List(Of IActivity)
+ Private Function ExtractActivities(dr As OdbcDataReader, numberOfActivities As Integer, workItem As IWorkItem) As List(Of IActivity)
'Declare result list.
Dim activities As New List(Of IActivity)
'Loop for every activity.
- For i As Integer = 1 To numberOfActivities
+ For i = 1 To numberOfActivities
'Initialise activity and fill with values.
Dim activity As New Activity
With activity
@@ -126,6 +126,8 @@
'Subtract time when date was specified. Time is gotten from config.
.StartBeforeTimestamp = If(.StartTimeStamp = DateTime.MinValue, DateTime.MinValue, .StartTimeStamp.Subtract(ConfigsLoader.StartBeforeTimeThreshold))
.StartAlmostTimeStamp = If(.StartTimeStamp = DateTime.MinValue, DateTime.MinValue, .StartTimeStamp.Subtract(ConfigsLoader.StartAlmostTimeThreshold))
+ 'Set parent work item.
+ .WorkItem = workItem
End With
'Add to collection of activities.
activities.Add(activity)
@@ -187,7 +189,7 @@
.ProductGroup = ExtractItemFromDataReader(dr, "Productgroep", String.Empty)
.Remark = ExtractItemFromDataReader(dr, "Opmerking", String.Empty)
.EndTimeStamp = ExtractItemFromDataReader(dr, "EindTijdstip", DateTime.MinValue)
- .Activities = ExtractActivities(dr, activityAmount)
+ .Activities = ExtractActivities(dr, activityAmount, workItem)
End With
'Add to the result list.
Index: ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/IActivity.vb
===================================================================
diff -u -r1688 -r1725
--- ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/IActivity.vb (.../IActivity.vb) (revision 1688)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/IActivity.vb (.../IActivity.vb) (revision 1725)
@@ -8,4 +8,6 @@
Property StartBeforeTimestamp As DateTime
Property StartAlmostTimeStamp As DateTime
Property StartTimeStamp As DateTime
+
+ Property WorkItem As IWorkItem
End interface
Index: ActiviteitenOpvolging/ActiviteitenOpvolging/ActiviteitenOpvolgingForm.Designer.vb
===================================================================
diff -u -r1716 -r1725
--- ActiviteitenOpvolging/ActiviteitenOpvolging/ActiviteitenOpvolgingForm.Designer.vb (.../ActiviteitenOpvolgingForm.Designer.vb) (revision 1716)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/ActiviteitenOpvolgingForm.Designer.vb (.../ActiviteitenOpvolgingForm.Designer.vb) (revision 1725)
@@ -64,7 +64,7 @@
'
Me.RefreshTimeLabel.AutoSize = true
Me.RefreshTimeLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.RefreshTimeLabel.Location = New System.Drawing.Point(1082, 18)
+ Me.RefreshTimeLabel.Location = New System.Drawing.Point(1203, 16)
Me.RefreshTimeLabel.Name = "RefreshTimeLabel"
Me.RefreshTimeLabel.Size = New System.Drawing.Size(0, 16)
Me.RefreshTimeLabel.TabIndex = 4
@@ -74,7 +74,7 @@
Me.RefreshFailedLabel.AutoSize = true
Me.RefreshFailedLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.RefreshFailedLabel.ForeColor = System.Drawing.Color.Maroon
- Me.RefreshFailedLabel.Location = New System.Drawing.Point(848, 18)
+ Me.RefreshFailedLabel.Location = New System.Drawing.Point(969, 16)
Me.RefreshFailedLabel.Name = "RefreshFailedLabel"
Me.RefreshFailedLabel.Size = New System.Drawing.Size(228, 16)
Me.RefreshFailedLabel.TabIndex = 5
Index: ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/implementations/Activity.vb
===================================================================
diff -u -r1688 -r1725
--- ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/implementations/Activity.vb (.../Activity.vb) (revision 1688)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/domain/classes/implementations/Activity.vb (.../Activity.vb) (revision 1725)
@@ -9,4 +9,6 @@
Public Property StartBeforeTimestamp As DateTime Implements IActivity.StartBeforeTimestamp
Public Property StartAlmostTimeStamp As DateTime Implements IActivity.StartAlmostTimeStamp
Public Property StartTimeStamp As DateTime Implements IActivity.StartTimeStamp
+
+ Public Property WorkItem As IWorkItem Implements IActivity.WorkItem
End Class