Index: TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb
===================================================================
diff -u -r1897 -r1898
--- TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb (.../FormFronten.Designer.vb) (revision 1897)
+++ TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb (.../FormFronten.Designer.vb) (revision 1898)
@@ -24,7 +24,6 @@
Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormFronten))
Me.Panel1 = New System.Windows.Forms.Panel()
- Me.btnVerwerk = New System.Windows.Forms.Button()
Me.btnTerug = New System.Windows.Forms.Button()
Me.lblVerwerking = New System.Windows.Forms.Label()
Me.Label6 = New System.Windows.Forms.Label()
@@ -41,15 +40,15 @@
Me.ComboBoxMateriaal = New System.Windows.Forms.ComboBox()
Me.TextBoxLetterBarcode = New System.Windows.Forms.TextBox()
Me.Label7 = New System.Windows.Forms.Label()
- Me.Button1 = New System.Windows.Forms.Button()
+ Me.btnProduceer = New System.Windows.Forms.Button()
Me.Panel1.SuspendLayout
CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).BeginInit
Me.SuspendLayout
'
'Panel1
'
Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top
- Me.Panel1.Controls.Add(Me.Button1)
+ Me.Panel1.Controls.Add(Me.btnProduceer)
Me.Panel1.Controls.Add(Me.TextBoxLetterBarcode)
Me.Panel1.Controls.Add(Me.Label7)
Me.Panel1.Controls.Add(Me.Label5)
@@ -65,24 +64,12 @@
Me.Panel1.Controls.Add(Me.Label1)
Me.Panel1.Controls.Add(Me.ComboBoxBreedte)
Me.Panel1.Controls.Add(Me.lblVerwerking)
- Me.Panel1.Controls.Add(Me.btnVerwerk)
Me.Panel1.Controls.Add(Me.btnTerug)
Me.Panel1.Location = New System.Drawing.Point(360, 15)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(1200, 665)
Me.Panel1.TabIndex = 61
'
- 'btnVerwerk
- '
- Me.btnVerwerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.btnVerwerk.Location = New System.Drawing.Point(1282, 613)
- Me.btnVerwerk.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3)
- Me.btnVerwerk.Name = "btnVerwerk"
- Me.btnVerwerk.Size = New System.Drawing.Size(162, 128)
- Me.btnVerwerk.TabIndex = 76
- Me.btnVerwerk.Text = "Verwerk"
- Me.btnVerwerk.UseVisualStyleBackColor = true
- '
'btnTerug
'
Me.btnTerug.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
@@ -262,16 +249,16 @@
Me.Label7.TabIndex = 111
Me.Label7.Text = "Letter barcode:"
'
- 'Button1
+ 'btnProduceer
'
- Me.Button1.Enabled = false
- Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Button1.Location = New System.Drawing.Point(60, 500)
- Me.Button1.Name = "Button1"
- Me.Button1.Size = New System.Drawing.Size(1076, 68)
- Me.Button1.TabIndex = 113
- Me.Button1.Text = "Produceer (aantal)"
- Me.Button1.UseVisualStyleBackColor = true
+ Me.btnProduceer.Enabled = false
+ Me.btnProduceer.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.btnProduceer.Location = New System.Drawing.Point(60, 500)
+ Me.btnProduceer.Name = "btnProduceer"
+ Me.btnProduceer.Size = New System.Drawing.Size(1076, 68)
+ Me.btnProduceer.TabIndex = 113
+ Me.btnProduceer.Text = "Produceer (aantal)"
+ Me.btnProduceer.UseVisualStyleBackColor = true
'
'FormFronten
'
@@ -291,7 +278,6 @@
End Sub
Friend WithEvents Panel1 As Panel
- Friend WithEvents btnVerwerk As Button
Friend WithEvents btnTerug As Button
Friend WithEvents lblVerwerking As Label
Friend WithEvents Label6 As Label
@@ -308,5 +294,5 @@
Friend WithEvents ComboBoxMateriaal As ComboBox
Friend WithEvents TextBoxLetterBarcode As TextBox
Friend WithEvents Label7 As Label
- Friend WithEvents Button1 As Button
+ Friend WithEvents btnProduceer As Button
End Class
Index: TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb
===================================================================
diff -u -r1881 -r1898
--- TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 1881)
+++ TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 1898)
@@ -48,7 +48,7 @@
btnWisAlle.Enabled = False
Catch ex As Exception
MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
- Application.Exit()
+ FormController.getInstance().laadVorige(Me)
End Try
End Sub
Index: TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb
===================================================================
diff -u -r1897 -r1898
--- TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb (.../FormFronten.vb) (revision 1897)
+++ TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb (.../FormFronten.vb) (revision 1898)
@@ -4,12 +4,39 @@
Me.ControlBox = False
'tonen of er wel verwerkt wordt
lblVerwerking.Visible = Not Configs.geefVerwerkStatus
+
+ laadData()
End Sub
Private Sub BtnTerug_Click(sender As Object, e As EventArgs) Handles btnTerug.Click
FormController.getInstance.laadFormSpecialMenu(Me)
End Sub
+ '''
+ ''' Comboboxen etc. invullen met juiste waarden.
+ '''
+ Private Sub laadData()
+ Try
+ TextBoxLabelTekst.Text = "Stock"
+ ComboBoxBreedte.DataSource = new List(Of String)from{"Breedte 1", "Breedte 2"}
+ ComboBoxHoogte.DataSource = Domeincontroller.getInstance.geefVoorraadHoogtes
+ ComboBoxKantenband.DataSource = Configs.kantenbandKleurenLetters
+ ComboBoxMateriaal.DataSource = Domeincontroller.getInstance.geefVoorraadKleuren
+ Catch ex As Exception
+ MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ FormController.getInstance().laadVorige(Me)
+ End Try
+ End Sub
+ Private Sub TextBoxLetterBarcode_TextChanged(sender As Object, e As EventArgs) Handles TextBoxLetterBarcode.TextChanged
+ updateVerwerkButtonStatus()
+ End Sub
+
+ '''
+ ''' De verwerk knop mag enkel enabled worden als geldige waarden zijn ingevuld
+ '''
+ Private Sub updateVerwerkButtonStatus()
+ btnProduceer.Enabled = not String.IsNullOrEmpty(TextBoxLetterBarcode.Text)
+ End Sub
End Class
\ No newline at end of file