Index: TAOR-rework-bugfixing/TAOR rework/Domeincontroller.vb
===================================================================
diff -u -r1596 -r1599
--- TAOR-rework-bugfixing/TAOR rework/Domeincontroller.vb	(.../Domeincontroller.vb)	(revision 1596)
+++ TAOR-rework-bugfixing/TAOR rework/Domeincontroller.vb	(.../Domeincontroller.vb)	(revision 1599)
@@ -1,4 +1,6 @@
-Imports TA_OR_rework.SpecialLadenRepository
+Imports TA_OR_rework.Rework
+Imports TA_OR_rework.SpecialLadenRepository
+Imports TA_OR_rework.Stalen
 
 Public Class Domeincontroller
     Private Shared instance As Domeincontroller
@@ -66,7 +68,7 @@
     End Function
 
     Public Sub addRework(ByVal barcode As String, ByVal reden() As String, ByVal onderdeel As String, ByVal voorVoorraad As String, ByVal etiketTekst As String)
-        reworkRep.addRework(New Rework(barcode, reden, onderdeel, voorVoorraad, etiketTekst))
+        reworkRep.addRework(New Rework.Rework(barcode, reden, onderdeel, voorVoorraad, etiketTekst))
     End Sub
 
     Public Sub verwijderRework(ByVal barcode As String)
@@ -84,7 +86,7 @@
     Public Function geefReworks() As List(Of String())
         Dim reworks As List(Of String()) = New List(Of String())
 
-        For Each reworkClass As Rework In reworkRep.getReworks
+        For Each reworkClass As Rework.Rework In reworkRep.getReworks
             Dim rework(3) As String
             rework(0) = reworkClass.barcode
             rework(1) = reworkClass.onderdeel
@@ -97,7 +99,7 @@
 
     Public Function bestaatRework(ByVal barcode As String)
         Dim gevonden As Boolean = False
-        For Each rework As Rework In reworkRep.getReworks
+        For Each rework As Rework.Rework In reworkRep.getReworks
             If rework.barcode.Equals(barcode) Then
                 gevonden = True
             End If
@@ -123,7 +125,7 @@
 
     Public Sub verwerkReworks()
         'de reworks die niet in een van de trays zitten (dus geen zijkant zijn) verwerken
-        For Each rework As Rework In reworkRep.getReworks
+        For Each rework As Rework.Rework In reworkRep.getReworks
             Dim onderdeel As String = rework.onderdeel.ToLower.Trim
             Select Case onderdeel
                 Case "front"
@@ -134,7 +136,7 @@
                     hoofdAansturingRework.verwerkBodem(rework)
                 Case Else
                     If Not onderdeel.Contains("zijkant") Then
-                        MsgBox("Tussen de geselecteerde reworks zit een onderdeel waar nog geen productieproces voor is gedefinieerd, gelieve dit aan te passen in de Domeincontroller en HoofdAansturing, het onderdeel in kwestie is: " & onderdeel.ToUpper)
+                        MsgBox($"Tussen de geselecteerde reworks zit een onderdeel waar nog geen productieproces voor is gedefinieerd, gelieve dit aan te passen in de Domeincontroller en HoofdAansturing, het onderdeel in kwestie is: {onderdeel.ToUpper}")
                     End If
             End Select
         Next
@@ -169,9 +171,9 @@
         reworkRep.updateAllReworks()
 
         Try
-            Dim reworks As List(Of Rework) = reworkRep.getReworks()
-            Dim zijkanten As New List(Of Rework)
-            For Each rework As Rework In reworks
+            Dim reworks As List(Of Rework.Rework) = reworkRep.getReworks()
+            Dim zijkanten As New List(Of Rework.Rework)
+            For Each rework As Rework.Rework In reworks
                 If rework.onderdeel.ToUpper.Contains("ZIJKANT") Then
                     zijkanten.Add(rework)
                 End If
@@ -190,16 +192,16 @@
         End Try
     End Sub
 
-    Private Sub handelZijkantReworkAf(ByVal reworkZijkanten As List(Of Rework))
-        Dim zelfdeBatchEnDossier As New List(Of List(Of Rework))
+    Private Sub handelZijkantReworkAf(ByVal reworkZijkanten As List(Of Rework.Rework))
+        Dim zelfdeBatchEnDossier As New List(Of List(Of Rework.Rework))
 
         Dim batch As String = ""
         Dim dossierCode As String = ""
         Do While reworkZijkanten.Count >= 1
             batch = reworkZijkanten(0).batch
             dossierCode = reworkZijkanten(0).dossierCode
 
-            Dim eenBatchEnDossier As New List(Of Rework)
+            Dim eenBatchEnDossier As New List(Of Rework.Rework)
             eenBatchEnDossier.Add(reworkZijkanten(0))
             reworkZijkanten.RemoveAt(0)
 
@@ -216,18 +218,18 @@
             zelfdeBatchEnDossier.Add(eenBatchEnDossier)
         Loop
 
-        Dim paren As New List(Of Rework())
-        Dim enkelen As New List(Of Rework)
+        Dim paren As New List(Of Rework.Rework())
+        Dim enkelen As New List(Of Rework.Rework)
 
 
         Do While zelfdeBatchEnDossier.Count > 0
-            Dim gesplitsteReworksBatchEnDossier As List(Of Rework) = zelfdeBatchEnDossier(0)
+            Dim gesplitsteReworksBatchEnDossier As List(Of Rework.Rework) = zelfdeBatchEnDossier(0)
             zelfdeBatchEnDossier.RemoveAt(0)
 
             Do While gesplitsteReworksBatchEnDossier.Count > 0
                 Dim isGevonden As Boolean = False
                 Dim type As String = gesplitsteReworksBatchEnDossier(0).barcode.Substring(5, 1)
-                For Each mogelijkZelfdeType As Rework In gesplitsteReworksBatchEnDossier
+                For Each mogelijkZelfdeType As Rework.Rework In gesplitsteReworksBatchEnDossier
                     If Not gesplitsteReworksBatchEnDossier(0).Equals(mogelijkZelfdeType) Then
                         Dim anderType As String = mogelijkZelfdeType.barcode.Substring(5, 1)
                         'kijken of de types paren vormen, in de twee richtingen
@@ -243,7 +245,7 @@
                             (type.Equals("D") And anderType.Equals("D")) Or
                             (type.Equals("E") And anderType.Equals("E")) Or
                             (type.Equals("F") And anderType.Equals("F")) Then
-                            Dim paar(1) As Rework
+                            Dim paar(1) As Rework.Rework
                             paar(0) = gesplitsteReworksBatchEnDossier(0)
                             paar(1) = mogelijkZelfdeType
                             paren.Add(paar)
@@ -270,7 +272,7 @@
     End Sub
 
     Dim traynummer As Integer = 0
-    Private Sub verdeelParenEnEnkeleOverTrays(ByVal paren As List(Of Rework()), ByVal enkel As List(Of Rework))
+    Private Sub verdeelParenEnEnkeleOverTrays(ByVal paren As List(Of Rework.Rework()), ByVal enkel As List(Of Rework.Rework))
 
         Do While paren.Count > 0 Or enkel.Count > 0
             Dim reworkTray As ReworkTray = New ReworkTray(reworkTrayslotRep.slots)