Index: TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb =================================================================== diff -u -r2121 -r2417 --- TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 2121) +++ TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 2417) @@ -1,7 +1,5 @@ -Imports System.Text +Public Class FormVoorraad -Public Class FormVoorraad - Private Sub FormVoorraadAanmaken_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load 'controls van form uitzetten Me.ControlBox = False @@ -56,10 +54,10 @@ lblFoutmeldingToevoegen.Text = "" Try If RadioButtonLinksRechts.Checked Then ' als linksrechts is aangeduid een voorraad item tovoegen met links en eentje met rechts - Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Links, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, CheckBoxHoogteVerstelling.Checked, CheckBoxOpslaanArdis.Checked) - Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Rechts, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, CheckBoxHoogteVerstelling.Checked, CheckBoxOpslaanArdis.Checked) + Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Links, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, True, CheckBoxOpslaanArdis.Checked) + Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Rechts, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, True, CheckBoxOpslaanArdis.Checked) Else - Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, If(radioLinks.Checked, LinksOfRechts.Links, LinksOfRechts.Rechts), ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, CheckBoxHoogteVerstelling.Checked, CheckBoxOpslaanArdis.Checked) + Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, If(radioLinks.Checked, LinksOfRechts.Links, LinksOfRechts.Rechts), ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, True, CheckBoxOpslaanArdis.Checked) End If refreshVoorraadItemsGrid() Catch ex As Exception @@ -125,21 +123,21 @@ Private Sub updateWisEnVerwerkButtonStatus() 'button enabled maken als reworks aantal hoog genoeg is If Domeincontroller.getInstance.geefZijkantVoorraadItems.Count > 0 Then - btnVerwerk.Enabled = true - btnWisAlle.Enabled = true - else - btnVerwerk.Enabled = false - btnWisAlle.Enabled = false + btnVerwerk.Enabled = True + btnWisAlle.Enabled = True + Else + btnVerwerk.Enabled = False + btnWisAlle.Enabled = False End If End Sub ''' ''' Knop enabled maken als velden geldig zijn ''' - Private sub updateToevoegenButtonStatus + Private Sub updateToevoegenButtonStatus() 'button enabled maken als etiket veld ingevuld is - btnToevoegen.Enabled = not String.IsNullOrEmpty(TextBoxLabelTekst.Text) - End sub + btnToevoegen.Enabled = Not String.IsNullOrEmpty(TextBoxLabelTekst.Text) + End Sub Private Sub DataGridViewVoorraadItems_CellClick(sender As Object, e As System.Windows.Forms.DataGridViewCellEventArgs) Handles DataGridViewVoorraadItems.CellClick Dim rowIndex = e.RowIndex @@ -191,7 +189,7 @@ Private Sub FormVoorraadAanmaken_VisibleChanged(sender As Object, e As System.EventArgs) Handles Me.VisibleChanged laadData() End Sub - + Private Sub TextBoxLabelTekst_TextChanged(sender As Object, e As EventArgs) Handles TextBoxLabelTekst.TextChanged updateToevoegenButtonStatus() End Sub Index: TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb =================================================================== diff -u -r2121 -r2417 --- TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb (.../FormVoorraad.Designer.vb) (revision 2121) +++ TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb (.../FormVoorraad.Designer.vb) (revision 2417) @@ -34,7 +34,7 @@ Me.btnToevoegen = New System.Windows.Forms.Button() Me.lblFoutmeldingToevoegen = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() - Me.CheckBoxHoogteVerstelling = New System.Windows.Forms.CheckBox() + Me.CheckBoxOpslaanArdis = New System.Windows.Forms.CheckBox() Me.CheckBoxSifonlade = New System.Windows.Forms.CheckBox() Me.btnWisAlle = New System.Windows.Forms.Button() Me.CheckBoxUnicolor = New System.Windows.Forms.CheckBox() @@ -55,7 +55,6 @@ Me.ComboBoxKantenband = New System.Windows.Forms.ComboBox() Me.TextBoxLabelTekst = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() - Me.CheckBoxOpslaanArdis = New System.Windows.Forms.CheckBox() Me.Panel1.SuspendLayout() CType(Me.DataGridViewVoorraadItems, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -139,7 +138,6 @@ ' Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top Me.Panel1.Controls.Add(Me.CheckBoxOpslaanArdis) - Me.Panel1.Controls.Add(Me.CheckBoxHoogteVerstelling) Me.Panel1.Controls.Add(Me.CheckBoxSifonlade) Me.Panel1.Controls.Add(Me.btnWisAlle) Me.Panel1.Controls.Add(Me.CheckBoxUnicolor) @@ -171,16 +169,18 @@ Me.Panel1.Size = New System.Drawing.Size(1767, 950) Me.Panel1.TabIndex = 60 ' - 'CheckBoxHoogteVerstelling + 'CheckBoxOpslaanArdis ' - Me.CheckBoxHoogteVerstelling.AutoSize = True - Me.CheckBoxHoogteVerstelling.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!) - Me.CheckBoxHoogteVerstelling.Location = New System.Drawing.Point(1124, 306) - Me.CheckBoxHoogteVerstelling.Name = "CheckBoxHoogteVerstelling" - Me.CheckBoxHoogteVerstelling.Size = New System.Drawing.Size(309, 43) - Me.CheckBoxHoogteVerstelling.TabIndex = 85 - Me.CheckBoxHoogteVerstelling.Text = "Hoogte verstelling" - Me.CheckBoxHoogteVerstelling.UseVisualStyleBackColor = True + Me.CheckBoxOpslaanArdis.AutoSize = True + Me.CheckBoxOpslaanArdis.Checked = True + Me.CheckBoxOpslaanArdis.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBoxOpslaanArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!) + Me.CheckBoxOpslaanArdis.Location = New System.Drawing.Point(1124, 387) + Me.CheckBoxOpslaanArdis.Name = "CheckBoxOpslaanArdis" + Me.CheckBoxOpslaanArdis.Size = New System.Drawing.Size(250, 43) + Me.CheckBoxOpslaanArdis.TabIndex = 86 + Me.CheckBoxOpslaanArdis.Text = "Opslaan Ardis" + Me.CheckBoxOpslaanArdis.UseVisualStyleBackColor = True ' 'CheckBoxSifonlade ' @@ -446,19 +446,6 @@ Me.Label2.TabIndex = 60 Me.Label2.Text = "Label tekst:" ' - 'CheckBoxOpslaanArdis - ' - Me.CheckBoxOpslaanArdis.AutoSize = True - Me.CheckBoxOpslaanArdis.Checked = True - Me.CheckBoxOpslaanArdis.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBoxOpslaanArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!) - Me.CheckBoxOpslaanArdis.Location = New System.Drawing.Point(1124, 387) - Me.CheckBoxOpslaanArdis.Name = "CheckBoxOpslaanArdis" - Me.CheckBoxOpslaanArdis.Size = New System.Drawing.Size(250, 43) - Me.CheckBoxOpslaanArdis.TabIndex = 86 - Me.CheckBoxOpslaanArdis.Text = "Opslaan Ardis" - Me.CheckBoxOpslaanArdis.UseVisualStyleBackColor = True - ' 'FormVoorraad ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -503,6 +490,5 @@ Friend WithEvents CheckBoxUnicolor As System.Windows.Forms.CheckBox Friend WithEvents btnWisAlle As System.Windows.Forms.Button Friend WithEvents CheckBoxSifonlade As CheckBox - Friend WithEvents CheckBoxHoogteVerstelling As CheckBox Friend WithEvents CheckBoxOpslaanArdis As CheckBox End Class