Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb =================================================================== diff -u -r1870 -r1871 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1870) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1871) @@ -46,14 +46,17 @@ End Sub Private Sub BtnRework_Click(sender As Object, e As EventArgs) Handles btnRework.Click - Try - 'Barcodes ophalen van de geselecteerde rij(en) - For Each rij As DataGridViewRow In DataGridViewUitgeworpen.SelectedRows - dim barcodeLeft As String = rij.Cells.Item("printbarcodeleftcol").Value.ToString() - dim barcodeRight As String = rij.Cells.Item("printbarcoderightcol").Value.ToString() - 'TODO Barcodes toevoegen als rework + FormController.getInstance().laadFormReworkRedenen(Me,"zijkant",AddressOf verwerkMetReworkReden) + End Sub - Next + private Sub verwerkMetReworkReden(reden As String()) + Try + 'Barcodes ophalen van de geselecteerde rij(en) + For Each rij As DataGridViewRow In DataGridViewUitgeworpen.SelectedRows + dim barcodeLeft As String = rij.Cells.Item("printbarcodeleftcol").Value.ToString() + dim barcodeRight As String = rij.Cells.Item("printbarcoderightcol").Value.ToString() + 'TODO Barcodes toevoegen als rework + Next catch ex As ArgumentException MessageBox.Show($"Kon barcode links of rechts niet opvragen: {ex.Message}", "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error) Catch ex As Exception Index: TAOR rework/TAOR rework/formulieren/FormReworkRedenen.vb =================================================================== diff -u -r1513 -r1871 --- TAOR rework/TAOR rework/formulieren/FormReworkRedenen.vb (.../FormReworkRedenen.vb) (revision 1513) +++ TAOR rework/TAOR rework/formulieren/FormReworkRedenen.vb (.../FormReworkRedenen.vb) (revision 1871) @@ -2,10 +2,14 @@ Private _onderdeel As String + Delegate sub RedenCallback(reden as String()) + Private _callback As RedenCallback + Private tussenRuimteButtons As Integer - Public Sub laadData(onderdeel As String) + Public Sub laadData(onderdeel As String, callback As RedenCallback) _onderdeel = onderdeel + _callback = callback End Sub Private Sub FormReworkRedenen_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load @@ -34,7 +38,7 @@ reden(0) = button.Name.Substring(button.Name.IndexOf("-") + 1) reden(1) = button.Text.Trim 'formgrid tonen - toonFormGrid(reden) + voltooi(reden) End If End Sub @@ -104,8 +108,11 @@ End Try End Sub - Private Sub toonFormGrid(ByVal reden() As String) - FormController.getInstance.laadFormGrid(Me, reden) + Private Sub voltooi(ByVal reden() As String) + If Not _callback Is Nothing Then + _callback(reden) + End If + FormController.getInstance.laadVorige(Me) End Sub 'configuratie sizes voor andere resoluties @@ -123,7 +130,7 @@ End Sub Private Sub btnAnnuleer_Click(sender As System.Object, e As System.EventArgs) Handles btnAnnuleer.Click - FormController.getInstance.laadFormGrid(Me) + FormController.getInstance.laadVorige(Me) End Sub End Class \ No newline at end of file Index: TAOR rework/TAOR rework/formulieren/FormController.vb =================================================================== diff -u -r1869 -r1871 --- TAOR rework/TAOR rework/formulieren/FormController.vb (.../FormController.vb) (revision 1869) +++ TAOR rework/TAOR rework/formulieren/FormController.vb (.../FormController.vb) (revision 1871) @@ -144,11 +144,11 @@ End Sub 'LADEN VAN FORMREWORKREDENEN - Public Sub laadFormReworkRedenen(sender As Form, onderdeel As String) + Public Sub laadFormReworkRedenen(sender As Form, onderdeel As String, callback As FormReworkRedenen.RedenCallback) registreerVorigeForm(sender) _formReworkRedenen = New FormReworkRedenen() - _formReworkRedenen.laadData(onderdeel) + _formReworkRedenen.laadData(onderdeel, callback) _formReworkRedenen.Show() _sender.Hide() Index: TAOR rework/TAOR rework/formulieren/FormGrid.vb =================================================================== diff -u -r1869 -r1871 --- TAOR rework/TAOR rework/formulieren/FormGrid.vb (.../FormGrid.vb) (revision 1869) +++ TAOR rework/TAOR rework/formulieren/FormGrid.vb (.../FormGrid.vb) (revision 1871) @@ -238,7 +238,7 @@ Dim reden() As String = {"Code", "Special zijkant"} voegReworkRedenToe(reden) Else - FormController.getInstance.laadFormReworkRedenen(Me, _onderdeel) + FormController.getInstance.laadFormReworkRedenen(Me, _onderdeel, AddressOf voegReworkRedenToe) End If End If Case "print"