Index: TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb =================================================================== diff -u -r1902 -r2120 --- TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 1902) +++ TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 2120) @@ -56,10 +56,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) - Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Rechts, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked) + Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Links, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, CheckBoxHoogteVerstelling.Checked) + Domeincontroller.getInstance.voegZijkantVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Rechts, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked, CheckBoxHoogteVerstelling.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) + 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) End If refreshVoorraadItemsGrid() Catch ex As Exception @@ -80,7 +80,7 @@ DataGridViewVoorraadItems.Columns(8).Name = "Special lade" 'verwijder kolom achteraan zetten - DataGridViewVoorraadItems.Columns(0).DisplayIndex = 8 + DataGridViewVoorraadItems.Columns(0).DisplayIndex = DataGridViewVoorraadItems.ColumnCount - 1 End Sub Private Sub refreshVoorraadItemsGrid() Index: TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb =================================================================== diff -u -r2109 -r2120 --- TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 2109) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 2120) @@ -611,7 +611,7 @@ PartExt08 = PartMat.Substring(0, PartMat.IndexOf(".")) End Sub - Public Sub voorraadZijkantGenereerBarcodeEnStelEtiketlijnIn(linksOfRechts As LinksOfRechts, hoogteLetter As String, barcodeNummer As String, isSifonlade As Boolean) + Public Sub voorraadZijkantGenereerBarcodeEnStelEtiketlijnIn(linksOfRechts As LinksOfRechts, hoogteLetter As String, barcodeNummer As String, isSifonlade As Boolean, heeftHoogteVerstelling As Boolean) 'barcodenummer opvullen met nullen (0076) Do Until barcodeNummer.Length = 4 barcodeNummer = "0" & barcodeNummer @@ -628,12 +628,37 @@ 'cijfer (lengte) barcode &= Configs.voorraadGeefCodeStemasB(Configs.voorraadGeefNettoLengte(PartL)) 'letter voor rechts of links. Als het over een sifonlade gaat nemen we een andere letter. + 'UITBREIDING 11/02/2022: Hoogteverstelling letters X en Y, M en N toegevoegd If linksOfRechts = LinksOfRechts.Links Then 'Links - barcode &= If(Not isSifonlade, "L", "E") + If isSifonlade And Not heeftHoogteVerstelling Then + 'Sifonlade + barcode &= "E" + ElseIf Not isSifonlade And heeftHoogteVerstelling Then + 'Enkel hoogteverstelling + barcode &= "X" + ElseIf isSifonlade And heeftHoogteVerstelling Then + 'Sifonlade met hoogteverstelling + barcode &= "M" + Else + 'Gewone zijkant + barcode &= "L" + End If Else 'Rechts - barcode &= If(Not isSifonlade, "R", "F") + If isSifonlade And Not heeftHoogteVerstelling Then + 'Sifonlade + barcode &= "F" + ElseIf Not isSifonlade And heeftHoogteVerstelling Then + 'Enkel hoogteverstelling + barcode &= "Y" + ElseIf isSifonlade And heeftHoogteVerstelling Then + 'Sifonlade met hoogteverstelling + barcode &= "N" + Else + 'Gewone zijkant + barcode &= "R" + End If End If 'eerste deel barcodeNummer barcode &= barcodeNummer.Substring(0, 2) Index: TAOR rework/TAOR rework/Voorraad/zijkanten/IZijkantVoorraadItem.vb =================================================================== diff -u -r1900 -r2120 --- TAOR rework/TAOR rework/Voorraad/zijkanten/IZijkantVoorraadItem.vb (.../IZijkantVoorraadItem.vb) (revision 1900) +++ TAOR rework/TAOR rework/Voorraad/zijkanten/IZijkantVoorraadItem.vb (.../IZijkantVoorraadItem.vb) (revision 2120) @@ -7,4 +7,5 @@ ReadOnly Property KleurBinnen As String ReadOnly Property KleurBuiten As String ReadOnly Property IsSifonlade As Boolean + ReadOnly Property HeeftHoogteVerstelling As Boolean End Interface \ No newline at end of file Index: TAOR rework/TAOR rework/Voorraad/zijkanten/ZijkantVoorraadItem.vb =================================================================== diff -u -r1909 -r2120 --- TAOR rework/TAOR rework/Voorraad/zijkanten/ZijkantVoorraadItem.vb (.../ZijkantVoorraadItem.vb) (revision 1909) +++ TAOR rework/TAOR rework/Voorraad/zijkanten/ZijkantVoorraadItem.vb (.../ZijkantVoorraadItem.vb) (revision 2120) @@ -1,7 +1,7 @@ Public Class ZijkantVoorraadItem Implements IZijkantVoorraadItem - Public Sub New(label As String, linksOfRechts As LinksOfRechts, diepte As String, hoogte As String, kantenband As String, kleurBinnen As String, kleurBuiten As String, isSifonlade As Boolean) + Public Sub New(label As String, linksOfRechts As LinksOfRechts, diepte As String, hoogte As String, kantenband As String, kleurBinnen As String, kleurBuiten As String, isSifonlade As Boolean, heeftHoogteVerstelling As Boolean) Me.Label = label Me.LinksOfRechts = linksOfRechts Me.Diepte = diepte @@ -10,6 +10,7 @@ Me.KleurBinnen = kleurBinnen Me.KleurBuiten = kleurBuiten Me.IsSifonlade = isSifonlade + Me.HeeftHoogteVerstelling = heeftHoogteVerstelling End Sub #Region "properties" @@ -73,6 +74,7 @@ Public Property IsSifonlade As Boolean Implements IZijkantVoorraadItem.IsSifonlade + Public Property HeeftHoogteVerstelling As Boolean Implements IZijkantVoorraadItem.HeeftHoogteVerstelling Property IsTweedeVanPaar As Boolean #End Region @@ -83,10 +85,10 @@ Dim ardisDataBuiten As New ArdisData ardisDataBinnen.voorraadZijkantStelInitieleWaardenIn(Me, true) - ardisDataBinnen.voorraadZijkantGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer(barcodeLengte.vier), IsSifonlade) + ardisDataBinnen.voorraadZijkantGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer(barcodeLengte.vier), IsSifonlade, HeeftHoogteVerstelling) ardisDataBuiten.voorraadZijkantStelInitieleWaardenIn(Me,false) - ardisDataBuiten.voorraadZijkantGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer(barcodeLengte.vier), IsSifonlade) + ardisDataBuiten.voorraadZijkantGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer(barcodeLengte.vier), IsSifonlade, HeeftHoogteVerstelling) ardisDataBinnen.updateKommasNaarPunten() ardisDataBuiten.updateKommasNaarPunten() Index: TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb =================================================================== diff -u -r1899 -r2120 --- TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb (.../FormVoorraad.Designer.vb) (revision 1899) +++ TAOR rework/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb (.../FormVoorraad.Designer.vb) (revision 2120) @@ -1,9 +1,9 @@ - _ + Partial Class FormVoorraad Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -34,6 +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.CheckBoxSifonlade = New System.Windows.Forms.CheckBox() Me.btnWisAlle = New System.Windows.Forms.Button() Me.CheckBoxUnicolor = New System.Windows.Forms.CheckBox() @@ -54,27 +55,27 @@ Me.ComboBoxKantenband = New System.Windows.Forms.ComboBox() Me.TextBoxLabelTekst = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() - Me.Panel1.SuspendLayout - CType(Me.DataGridViewVoorraadItems,System.ComponentModel.ISupportInitialize).BeginInit - Me.SuspendLayout + Me.Panel1.SuspendLayout() + CType(Me.DataGridViewVoorraadItems, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() ' 'btnTerug ' - Me.btnTerug.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.btnTerug.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.btnTerug.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnTerug.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTerug.Location = New System.Drawing.Point(1269, 4) Me.btnTerug.Name = "btnTerug" Me.btnTerug.Size = New System.Drawing.Size(228, 68) Me.btnTerug.TabIndex = 66 Me.btnTerug.Text = "Terug" - Me.btnTerug.UseVisualStyleBackColor = true + Me.btnTerug.UseVisualStyleBackColor = True ' 'ComboBoxDiepte ' Me.ComboBoxDiepte.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxDiepte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) + Me.ComboBoxDiepte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) Me.ComboBoxDiepte.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxDiepte.FormattingEnabled = true + Me.ComboBoxDiepte.FormattingEnabled = True Me.ComboBoxDiepte.Location = New System.Drawing.Point(192, 155) Me.ComboBoxDiepte.MaxDropDownItems = 15 Me.ComboBoxDiepte.Name = "ComboBoxDiepte" @@ -84,9 +85,9 @@ 'ComboBoxHoogte ' Me.ComboBoxHoogte.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxHoogte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) + Me.ComboBoxHoogte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) Me.ComboBoxHoogte.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxHoogte.FormattingEnabled = true + Me.ComboBoxHoogte.FormattingEnabled = True Me.ComboBoxHoogte.Location = New System.Drawing.Point(192, 226) Me.ComboBoxHoogte.MaxDropDownItems = 15 Me.ComboBoxHoogte.Name = "ComboBoxHoogte" @@ -95,8 +96,8 @@ ' 'LblComboBoxDiepte ' - Me.LblComboBoxDiepte.AutoSize = true - Me.LblComboBoxDiepte.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.LblComboBoxDiepte.AutoSize = True + Me.LblComboBoxDiepte.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LblComboBoxDiepte.Location = New System.Drawing.Point(1, 169) Me.LblComboBoxDiepte.Name = "LblComboBoxDiepte" Me.LblComboBoxDiepte.Size = New System.Drawing.Size(101, 31) @@ -105,8 +106,8 @@ ' 'Label1 ' - Me.Label1.AutoSize = true - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(1, 240) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(110, 31) @@ -115,18 +116,18 @@ ' 'btnToevoegen ' - Me.btnToevoegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.btnToevoegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnToevoegen.Location = New System.Drawing.Point(7, 373) Me.btnToevoegen.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) Me.btnToevoegen.Name = "btnToevoegen" Me.btnToevoegen.Size = New System.Drawing.Size(1076, 68) Me.btnToevoegen.TabIndex = 65 Me.btnToevoegen.Text = "Voeg toe" - Me.btnToevoegen.UseVisualStyleBackColor = true + Me.btnToevoegen.UseVisualStyleBackColor = True ' 'lblFoutmeldingToevoegen ' - Me.lblFoutmeldingToevoegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!) + Me.lblFoutmeldingToevoegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!) Me.lblFoutmeldingToevoegen.ForeColor = System.Drawing.Color.Red Me.lblFoutmeldingToevoegen.Location = New System.Drawing.Point(10, 444) Me.lblFoutmeldingToevoegen.Name = "lblFoutmeldingToevoegen" @@ -136,6 +137,7 @@ 'Panel1 ' Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top + Me.Panel1.Controls.Add(Me.CheckBoxHoogteVerstelling) Me.Panel1.Controls.Add(Me.CheckBoxSifonlade) Me.Panel1.Controls.Add(Me.btnWisAlle) Me.Panel1.Controls.Add(Me.CheckBoxUnicolor) @@ -162,66 +164,77 @@ Me.Panel1.Controls.Add(Me.LblComboBoxDiepte) Me.Panel1.Controls.Add(Me.ComboBoxHoogte) Me.Panel1.Controls.Add(Me.ComboBoxDiepte) - Me.Panel1.Location = New System.Drawing.Point(203, 26) + Me.Panel1.Location = New System.Drawing.Point(103, 12) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1500, 950) Me.Panel1.TabIndex = 60 ' + 'CheckBoxHoogteVerstelling + ' + 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 + ' 'CheckBoxSifonlade ' - Me.CheckBoxSifonlade.AutoSize = true - Me.CheckBoxSifonlade.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!) + Me.CheckBoxSifonlade.AutoSize = True + Me.CheckBoxSifonlade.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!) Me.CheckBoxSifonlade.Location = New System.Drawing.Point(921, 306) Me.CheckBoxSifonlade.Name = "CheckBoxSifonlade" Me.CheckBoxSifonlade.Size = New System.Drawing.Size(179, 43) Me.CheckBoxSifonlade.TabIndex = 84 Me.CheckBoxSifonlade.Text = "Sifonlade" - Me.CheckBoxSifonlade.UseVisualStyleBackColor = true + Me.CheckBoxSifonlade.UseVisualStyleBackColor = True ' 'btnWisAlle ' - Me.btnWisAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!) + Me.btnWisAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!) Me.btnWisAlle.Location = New System.Drawing.Point(978, 491) Me.btnWisAlle.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) Me.btnWisAlle.Name = "btnWisAlle" Me.btnWisAlle.Size = New System.Drawing.Size(238, 53) Me.btnWisAlle.TabIndex = 83 Me.btnWisAlle.Text = "Wis alle" - Me.btnWisAlle.UseVisualStyleBackColor = true + Me.btnWisAlle.UseVisualStyleBackColor = True ' 'CheckBoxUnicolor ' - Me.CheckBoxUnicolor.AutoSize = true - Me.CheckBoxUnicolor.Checked = true + Me.CheckBoxUnicolor.AutoSize = True + Me.CheckBoxUnicolor.Checked = True Me.CheckBoxUnicolor.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBoxUnicolor.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!) + Me.CheckBoxUnicolor.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!) Me.CheckBoxUnicolor.Location = New System.Drawing.Point(739, 306) Me.CheckBoxUnicolor.Name = "CheckBoxUnicolor" Me.CheckBoxUnicolor.Size = New System.Drawing.Size(162, 43) Me.CheckBoxUnicolor.TabIndex = 82 Me.CheckBoxUnicolor.Text = "Unicolor" - Me.CheckBoxUnicolor.UseVisualStyleBackColor = true + Me.CheckBoxUnicolor.UseVisualStyleBackColor = True ' 'RadioButtonLinksRechts ' - Me.RadioButtonLinksRechts.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.RadioButtonLinksRechts.AutoSize = true - Me.RadioButtonLinksRechts.Checked = true - Me.RadioButtonLinksRechts.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.RadioButtonLinksRechts.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.RadioButtonLinksRechts.AutoSize = True + Me.RadioButtonLinksRechts.Checked = True + Me.RadioButtonLinksRechts.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.RadioButtonLinksRechts.Location = New System.Drawing.Point(192, 88) Me.RadioButtonLinksRechts.Name = "RadioButtonLinksRechts" Me.RadioButtonLinksRechts.Size = New System.Drawing.Size(81, 43) Me.RadioButtonLinksRechts.TabIndex = 81 - Me.RadioButtonLinksRechts.TabStop = true + Me.RadioButtonLinksRechts.TabStop = True Me.RadioButtonLinksRechts.Text = "LR" - Me.RadioButtonLinksRechts.UseVisualStyleBackColor = true + Me.RadioButtonLinksRechts.UseVisualStyleBackColor = True ' 'lblAantalVoorraadItems ' - Me.lblAantalVoorraadItems.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.lblAantalVoorraadItems.AutoSize = true - Me.lblAantalVoorraadItems.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.lblAantalVoorraadItems.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblAantalVoorraadItems.AutoSize = True + Me.lblAantalVoorraadItems.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAantalVoorraadItems.Location = New System.Drawing.Point(1421, 573) Me.lblAantalVoorraadItems.Name = "lblAantalVoorraadItems" Me.lblAantalVoorraadItems.Size = New System.Drawing.Size(23, 25) @@ -230,9 +243,9 @@ ' 'lblVerwerking ' - Me.lblVerwerking.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.lblVerwerking.AutoSize = true - Me.lblVerwerking.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.lblVerwerking.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblVerwerking.AutoSize = True + Me.lblVerwerking.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblVerwerking.ForeColor = System.Drawing.Color.DarkRed Me.lblVerwerking.Location = New System.Drawing.Point(1277, 772) Me.lblVerwerking.Name = "lblVerwerking" @@ -242,9 +255,9 @@ ' 'Label5 ' - Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.Label5.AutoSize = true - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.Location = New System.Drawing.Point(1277, 573) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(130, 25) @@ -253,19 +266,19 @@ ' '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.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, 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 + Me.btnVerwerk.UseVisualStyleBackColor = True ' 'Label6 ' - Me.Label6.AutoSize = true - Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label6.Location = New System.Drawing.Point(548, 240) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(166, 31) @@ -275,10 +288,10 @@ 'ComboBoxKleurBuiten ' Me.ComboBoxKleurBuiten.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxKleurBuiten.Enabled = false - Me.ComboBoxKleurBuiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) + Me.ComboBoxKleurBuiten.Enabled = False + Me.ComboBoxKleurBuiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) Me.ComboBoxKleurBuiten.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxKleurBuiten.FormattingEnabled = true + Me.ComboBoxKleurBuiten.FormattingEnabled = True Me.ComboBoxKleurBuiten.Location = New System.Drawing.Point(739, 226) Me.ComboBoxKleurBuiten.MaxDropDownItems = 15 Me.ComboBoxKleurBuiten.Name = "ComboBoxKleurBuiten" @@ -287,27 +300,27 @@ ' 'radioLinks ' - Me.radioLinks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.radioLinks.AutoSize = true - Me.radioLinks.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.radioLinks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.radioLinks.AutoSize = True + Me.radioLinks.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.radioLinks.Location = New System.Drawing.Point(323, 88) Me.radioLinks.Name = "radioLinks" Me.radioLinks.Size = New System.Drawing.Size(120, 43) Me.radioLinks.TabIndex = 72 Me.radioLinks.Text = "Links" - Me.radioLinks.UseVisualStyleBackColor = true + Me.radioLinks.UseVisualStyleBackColor = True ' 'DataGridViewVoorraadItems ' - Me.DataGridViewVoorraadItems.AllowUserToAddRows = false - Me.DataGridViewVoorraadItems.AllowUserToDeleteRows = false - Me.DataGridViewVoorraadItems.AllowUserToResizeRows = false - Me.DataGridViewVoorraadItems.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) + Me.DataGridViewVoorraadItems.AllowUserToAddRows = False + Me.DataGridViewVoorraadItems.AllowUserToDeleteRows = False + Me.DataGridViewVoorraadItems.AllowUserToResizeRows = False + Me.DataGridViewVoorraadItems.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.DataGridViewVoorraadItems.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText @@ -318,53 +331,55 @@ Me.DataGridViewVoorraadItems.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.verwijderVoorraadItem}) DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.DataGridViewVoorraadItems.DefaultCellStyle = DataGridViewCellStyle2 Me.DataGridViewVoorraadItems.Location = New System.Drawing.Point(7, 547) Me.DataGridViewVoorraadItems.Name = "DataGridViewVoorraadItems" - Me.DataGridViewVoorraadItems.ReadOnly = true + Me.DataGridViewVoorraadItems.ReadOnly = True DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.DataGridViewVoorraadItems.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.DataGridViewVoorraadItems.RowHeadersWidth = 51 Me.DataGridViewVoorraadItems.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing Me.DataGridViewVoorraadItems.RowTemplate.Height = 50 - Me.DataGridViewVoorraadItems.RowTemplate.ReadOnly = true + Me.DataGridViewVoorraadItems.RowTemplate.ReadOnly = True Me.DataGridViewVoorraadItems.Size = New System.Drawing.Size(1209, 355) Me.DataGridViewVoorraadItems.TabIndex = 77 ' 'verwijderVoorraadItem ' Me.verwijderVoorraadItem.HeaderText = "verwijder" + Me.verwijderVoorraadItem.MinimumWidth = 6 Me.verwijderVoorraadItem.Name = "verwijderVoorraadItem" - Me.verwijderVoorraadItem.ReadOnly = true + Me.verwijderVoorraadItem.ReadOnly = True Me.verwijderVoorraadItem.Width = 95 ' 'radioRechts ' - Me.radioRechts.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) - Me.radioRechts.AutoSize = true - Me.radioRechts.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.radioRechts.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.radioRechts.AutoSize = True + Me.radioRechts.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.radioRechts.Location = New System.Drawing.Point(494, 88) Me.radioRechts.Name = "radioRechts" Me.radioRechts.Size = New System.Drawing.Size(147, 43) Me.radioRechts.TabIndex = 71 Me.radioRechts.Text = "Rechts" - Me.radioRechts.UseVisualStyleBackColor = true + Me.radioRechts.UseVisualStyleBackColor = True ' 'Label4 ' - Me.Label4.AutoSize = true - Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.Location = New System.Drawing.Point(548, 169) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(173, 31) @@ -374,9 +389,9 @@ 'ComboBoxKleurBinnen ' Me.ComboBoxKleurBinnen.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxKleurBinnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) + Me.ComboBoxKleurBinnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) Me.ComboBoxKleurBinnen.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxKleurBinnen.FormattingEnabled = true + Me.ComboBoxKleurBinnen.FormattingEnabled = True Me.ComboBoxKleurBinnen.Location = New System.Drawing.Point(739, 155) Me.ComboBoxKleurBinnen.MaxDropDownItems = 15 Me.ComboBoxKleurBinnen.Name = "ComboBoxKleurBinnen" @@ -385,8 +400,8 @@ ' 'Label3 ' - Me.Label3.AutoSize = true - Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.Location = New System.Drawing.Point(1, 312) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(168, 31) @@ -396,10 +411,10 @@ 'ComboBoxKantenband ' Me.ComboBoxKantenband.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxKantenband.Enabled = false - Me.ComboBoxKantenband.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) + Me.ComboBoxKantenband.Enabled = False + Me.ComboBoxKantenband.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) Me.ComboBoxKantenband.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxKantenband.FormattingEnabled = true + Me.ComboBoxKantenband.FormattingEnabled = True Me.ComboBoxKantenband.ItemHeight = 46 Me.ComboBoxKantenband.Location = New System.Drawing.Point(192, 298) Me.ComboBoxKantenband.MaxDropDownItems = 30 @@ -409,20 +424,20 @@ ' 'TextBoxLabelTekst ' - Me.TextBoxLabelTekst.Font = New System.Drawing.Font("Microsoft Sans Serif", 40!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxLabelTekst.Font = New System.Drawing.Font("Microsoft Sans Serif", 40.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextBoxLabelTekst.ForeColor = System.Drawing.SystemColors.ControlText Me.TextBoxLabelTekst.Location = New System.Drawing.Point(192, 4) Me.TextBoxLabelTekst.Margin = New System.Windows.Forms.Padding(0, 3, 100, 3) Me.TextBoxLabelTekst.Name = "TextBoxLabelTekst" Me.TextBoxLabelTekst.Size = New System.Drawing.Size(449, 68) Me.TextBoxLabelTekst.TabIndex = 61 - Me.TextBoxLabelTekst.TabStop = false + Me.TextBoxLabelTekst.TabStop = False Me.TextBoxLabelTekst.Text = "Stock" ' 'Label2 ' - Me.Label2.AutoSize = true - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.Location = New System.Drawing.Point(1, 30) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(154, 31) @@ -431,20 +446,20 @@ ' 'FormVoorraad ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1904, 1042) + Me.ClientSize = New System.Drawing.Size(1743, 982) Me.Controls.Add(Me.Panel1) - Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "FormVoorraad" Me.Text = "TA'OR rework - Voorraad zijkanten" Me.WindowState = System.Windows.Forms.FormWindowState.Maximized - Me.Panel1.ResumeLayout(false) - Me.Panel1.PerformLayout - CType(Me.DataGridViewVoorraadItems,System.ComponentModel.ISupportInitialize).EndInit - Me.ResumeLayout(false) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + CType(Me.DataGridViewVoorraadItems, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) -End Sub + End Sub Friend WithEvents btnTerug As System.Windows.Forms.Button Friend WithEvents ComboBoxDiepte As System.Windows.Forms.ComboBox Friend WithEvents ComboBoxHoogte As System.Windows.Forms.ComboBox @@ -473,4 +488,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 End Class Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb =================================================================== diff -u -r2106 -r2120 --- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2106) +++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2120) @@ -819,8 +819,8 @@ #Region "voorraad zijkanten" - Public Sub voegZijkantVoorraadItemToe(label As String, linksOfRechts As LinksOfRechts, diepte As String, hoogte As String, kantenband As String, kleurBinnen As String, kleurBuiten As String, isSifonlade As Boolean) - Dim zijkantVoorraadItem = New ZijkantVoorraadItem(label, linksOfRechts, diepte, hoogte, kantenband, kleurBinnen, kleurBuiten, isSifonlade) + Public Sub voegZijkantVoorraadItemToe(label As String, linksOfRechts As LinksOfRechts, diepte As String, hoogte As String, kantenband As String, kleurBinnen As String, kleurBuiten As String, isSifonlade As Boolean, heeftHoogteVerstelling As Boolean) + Dim zijkantVoorraadItem = New ZijkantVoorraadItem(label, linksOfRechts, diepte, hoogte, kantenband, kleurBinnen, kleurBuiten, isSifonlade, heeftHoogteVerstelling) zijkantVoorraadRepository.voegVoorraadItemToe(zijkantVoorraadItem) End Sub