Index: TAOR-rework-bugfixing/TAOR rework/controllers/Domeincontroller.vb =================================================================== diff -u -r1658 -r1703 --- TAOR-rework-bugfixing/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1658) +++ TAOR-rework-bugfixing/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1703) @@ -971,8 +971,8 @@ Return voorraadRepository.kleuren End Function - Public Sub voegVoorraadItemToe(label As String, linksOfRechts As LinksOfRechts, diepte As String, hoogte As String, kantenband As String, kleurBinnen As String, kleurBuiten As String) - Dim voorraadItem As VoorraadItem = New VoorraadItem(label, linksOfRechts, diepte, hoogte, kantenband, kleurBinnen, kleurBuiten) + Public Sub voegVoorraadItemToe(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 voorraadItem As VoorraadItem = New VoorraadItem(label, linksOfRechts, diepte, hoogte, kantenband, kleurBinnen, kleurBuiten, isSifonlade) voorraadRepository.voegVoorraadItemToe(voorraadItem) End Sub Index: TAOR-rework-bugfixing/TAOR rework/Voorraad/IVoorraadItem.vb =================================================================== diff -u -r1613 -r1703 --- TAOR-rework-bugfixing/TAOR rework/Voorraad/IVoorraadItem.vb (.../IVoorraadItem.vb) (revision 1613) +++ TAOR-rework-bugfixing/TAOR rework/Voorraad/IVoorraadItem.vb (.../IVoorraadItem.vb) (revision 1703) @@ -6,4 +6,5 @@ ReadOnly Property Kantenband As String ReadOnly Property KleurBinnen As String ReadOnly Property KleurBuiten As String + ReadOnly Property IsSifonlade As Boolean End Interface \ No newline at end of file Index: TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisData.vb =================================================================== diff -u -r1657 -r1703 --- TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 1657) +++ TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 1703) @@ -684,7 +684,7 @@ PartExt08 = PartMat.Substring(0, PartMat.IndexOf(".")) End Sub - Public Sub voorraadGenereerBarcodeEnStelEtiketlijnIn(linksOfRechts As LinksOfRechts, hoogteLetter As String, barcodeNummer As String) + Public Sub voorraadGenereerBarcodeEnStelEtiketlijnIn(linksOfRechts As LinksOfRechts, hoogteLetter As String, barcodeNummer As String, isSifonlade As Boolean) 'barcodenummer opvullen met nullen (0076) Do Until barcodeNummer.Length = 4 barcodeNummer = "0" & barcodeNummer @@ -700,8 +700,14 @@ barcode &= "V" 'cijfer (lengte) barcode &= Configs.voorraadGeefCodeStemasB(Configs.voorraadGeefNettoLengte(PartL)) - 'letter voor rechts of links - barcode &= If(linksOfRechts = TA_OR_rework.LinksOfRechts.Links, "L", "R") + 'letter voor rechts of links. Als het over een sifonlade gaat nemen we een andere letter. + If linksOfRechts = LinksOfRechts.Links Then + 'Links + barcode &= If(Not isSifonlade, "L", "E") + Else + 'Rechts + barcode &= If(Not isSifonlade, "R", "F") + End If 'eerste deel barcodeNummer barcode &= barcodeNummer.Substring(0, 2) 'tussenletter (vast) Index: TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb =================================================================== diff -u -r1596 -r1703 --- TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb (.../FormVoorraad.Designer.vb) (revision 1596) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormVoorraad.Designer.vb (.../FormVoorraad.Designer.vb) (revision 1703) @@ -53,94 +53,90 @@ 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.CheckBoxSifonlade = New System.Windows.Forms.CheckBox() + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnTerug.Location = New System.Drawing.Point(1692, 5) - Me.btnTerug.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + 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.Location = New System.Drawing.Point(1269, 4) Me.btnTerug.Name = "btnTerug" - Me.btnTerug.Size = New System.Drawing.Size(304, 84) + 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.0!) + Me.ComboBoxDiepte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) Me.ComboBoxDiepte.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxDiepte.FormattingEnabled = True - Me.ComboBoxDiepte.Location = New System.Drawing.Point(256, 191) - Me.ComboBoxDiepte.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBoxDiepte.FormattingEnabled = true + Me.ComboBoxDiepte.Location = New System.Drawing.Point(192, 155) Me.ComboBoxDiepte.MaxDropDownItems = 15 Me.ComboBoxDiepte.Name = "ComboBoxDiepte" - Me.ComboBoxDiepte.Size = New System.Drawing.Size(457, 66) + Me.ComboBoxDiepte.Size = New System.Drawing.Size(344, 54) Me.ComboBoxDiepte.TabIndex = 63 ' 'ComboBoxHoogte ' Me.ComboBoxHoogte.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxHoogte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) + Me.ComboBoxHoogte.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) Me.ComboBoxHoogte.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxHoogte.FormattingEnabled = True - Me.ComboBoxHoogte.Location = New System.Drawing.Point(256, 278) - Me.ComboBoxHoogte.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBoxHoogte.FormattingEnabled = true + Me.ComboBoxHoogte.Location = New System.Drawing.Point(192, 226) Me.ComboBoxHoogte.MaxDropDownItems = 15 Me.ComboBoxHoogte.Name = "ComboBoxHoogte" - Me.ComboBoxHoogte.Size = New System.Drawing.Size(457, 66) + Me.ComboBoxHoogte.Size = New System.Drawing.Size(344, 54) Me.ComboBoxHoogte.TabIndex = 64 ' 'LblComboBoxDiepte ' - 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, 208) - Me.LblComboBoxDiepte.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(1, 169) Me.LblComboBoxDiepte.Name = "LblComboBoxDiepte" - Me.LblComboBoxDiepte.Size = New System.Drawing.Size(125, 39) + Me.LblComboBoxDiepte.Size = New System.Drawing.Size(101, 31) Me.LblComboBoxDiepte.TabIndex = 53 Me.LblComboBoxDiepte.Text = "Diepte:" ' 'Label1 ' - 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, 295) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(1, 240) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(136, 39) + Me.Label1.Size = New System.Drawing.Size(110, 31) Me.Label1.TabIndex = 52 Me.Label1.Text = "Hoogte:" ' 'btnToevoegen ' - 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(9, 459) - Me.btnToevoegen.Margin = New System.Windows.Forms.Padding(4, 4, 167, 4) + Me.btnToevoegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, 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(1435, 84) + 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.0!) + Me.lblFoutmeldingToevoegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!) Me.lblFoutmeldingToevoegen.ForeColor = System.Drawing.Color.Red - Me.lblFoutmeldingToevoegen.Location = New System.Drawing.Point(13, 546) - Me.lblFoutmeldingToevoegen.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFoutmeldingToevoegen.Location = New System.Drawing.Point(10, 444) Me.lblFoutmeldingToevoegen.Name = "lblFoutmeldingToevoegen" - Me.lblFoutmeldingToevoegen.Size = New System.Drawing.Size(1283, 123) + Me.lblFoutmeldingToevoegen.Size = New System.Drawing.Size(962, 100) Me.lblFoutmeldingToevoegen.TabIndex = 59 ' 'Panel1 ' Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top + Me.Panel1.Controls.Add(Me.CheckBoxSifonlade) Me.Panel1.Controls.Add(Me.btnWisAlle) Me.Panel1.Controls.Add(Me.CheckBoxUnicolor) Me.Panel1.Controls.Add(Me.RadioButtonLinksRechts) @@ -166,150 +162,141 @@ 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(280, 36) - Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel1.Location = New System.Drawing.Point(203, 26) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(2000, 1169) + Me.Panel1.Size = New System.Drawing.Size(1500, 950) Me.Panel1.TabIndex = 60 ' 'btnWisAlle ' - Me.btnWisAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!) - Me.btnWisAlle.Location = New System.Drawing.Point(1304, 604) - Me.btnWisAlle.Margin = New System.Windows.Forms.Padding(4, 4, 167, 4) + Me.btnWisAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!) + 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(317, 65) + 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.0!) - Me.CheckBoxUnicolor.Location = New System.Drawing.Point(985, 377) - Me.CheckBoxUnicolor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.CheckBoxUnicolor.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!) + Me.CheckBoxUnicolor.Location = New System.Drawing.Point(739, 306) Me.CheckBoxUnicolor.Name = "CheckBoxUnicolor" - Me.CheckBoxUnicolor.Size = New System.Drawing.Size(196, 52) + 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.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.RadioButtonLinksRechts.Location = New System.Drawing.Point(256, 108) - Me.RadioButtonLinksRechts.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + 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.Location = New System.Drawing.Point(192, 88) Me.RadioButtonLinksRechts.Name = "RadioButtonLinksRechts" - Me.RadioButtonLinksRechts.Size = New System.Drawing.Size(96, 52) + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAantalVoorraadItems.Location = New System.Drawing.Point(1895, 705) - Me.lblAantalVoorraadItems.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(1421, 573) Me.lblAantalVoorraadItems.Name = "lblAantalVoorraadItems" - Me.lblAantalVoorraadItems.Size = New System.Drawing.Size(27, 29) + Me.lblAantalVoorraadItems.Size = New System.Drawing.Size(23, 25) Me.lblAantalVoorraadItems.TabIndex = 79 Me.lblAantalVoorraadItems.Text = "0" ' '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.0!, 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!, 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(1703, 950) - Me.lblVerwerking.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblVerwerking.Location = New System.Drawing.Point(1277, 772) Me.lblVerwerking.Name = "lblVerwerking" - Me.lblVerwerking.Size = New System.Drawing.Size(256, 29) + Me.lblVerwerking.Size = New System.Drawing.Size(197, 25) Me.lblVerwerking.TabIndex = 80 Me.lblVerwerking.Text = "Er wordt niet verwerkt" ' '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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(1703, 705) - Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(1277, 573) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(168, 29) + Me.Label5.Size = New System.Drawing.Size(130, 25) Me.Label5.TabIndex = 78 Me.Label5.Text = "Aantal items: " ' 'btnVerwerk ' - 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(1709, 754) - Me.btnVerwerk.Margin = New System.Windows.Forms.Padding(4, 4, 167, 4) + 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(216, 158) + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(731, 295) - Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(548, 240) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(208, 39) + Me.Label6.Size = New System.Drawing.Size(166, 31) Me.Label6.TabIndex = 73 Me.Label6.Text = "Kleur buiten:" ' 'ComboBoxKleurBuiten ' Me.ComboBoxKleurBuiten.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxKleurBuiten.Enabled = False - Me.ComboBoxKleurBuiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) + Me.ComboBoxKleurBuiten.Enabled = false + Me.ComboBoxKleurBuiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) Me.ComboBoxKleurBuiten.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxKleurBuiten.FormattingEnabled = True - Me.ComboBoxKleurBuiten.Location = New System.Drawing.Point(985, 278) - Me.ComboBoxKleurBuiten.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBoxKleurBuiten.FormattingEnabled = true + Me.ComboBoxKleurBuiten.Location = New System.Drawing.Point(739, 226) Me.ComboBoxKleurBuiten.MaxDropDownItems = 15 Me.ComboBoxKleurBuiten.Name = "ComboBoxKleurBuiten" - Me.ComboBoxKleurBuiten.Size = New System.Drawing.Size(457, 66) + Me.ComboBoxKleurBuiten.Size = New System.Drawing.Size(344, 54) Me.ComboBoxKleurBuiten.TabIndex = 74 ' '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.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.radioLinks.Location = New System.Drawing.Point(431, 108) - Me.radioLinks.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + 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.Location = New System.Drawing.Point(323, 88) Me.radioLinks.Name = "radioLinks" - Me.radioLinks.Size = New System.Drawing.Size(144, 52) + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, 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 @@ -320,141 +307,144 @@ 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, 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(9, 673) - Me.DataGridViewVoorraadItems.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, 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.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing Me.DataGridViewVoorraadItems.RowTemplate.Height = 50 - Me.DataGridViewVoorraadItems.RowTemplate.ReadOnly = True - Me.DataGridViewVoorraadItems.Size = New System.Drawing.Size(1612, 437) + 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.Name = "verwijderVoorraadItem" - Me.verwijderVoorraadItem.ReadOnly = True - Me.verwijderVoorraadItem.Width = 120 + 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.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.radioRechts.Location = New System.Drawing.Point(659, 108) - Me.radioRechts.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + 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.Location = New System.Drawing.Point(494, 88) Me.radioRechts.Name = "radioRechts" - Me.radioRechts.Size = New System.Drawing.Size(177, 52) + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(731, 208) - Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(548, 169) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(218, 39) + Me.Label4.Size = New System.Drawing.Size(173, 31) Me.Label4.TabIndex = 69 Me.Label4.Text = "Kleur binnen:" ' 'ComboBoxKleurBinnen ' Me.ComboBoxKleurBinnen.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxKleurBinnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) + Me.ComboBoxKleurBinnen.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) Me.ComboBoxKleurBinnen.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxKleurBinnen.FormattingEnabled = True - Me.ComboBoxKleurBinnen.Location = New System.Drawing.Point(985, 191) - Me.ComboBoxKleurBinnen.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBoxKleurBinnen.FormattingEnabled = true + Me.ComboBoxKleurBinnen.Location = New System.Drawing.Point(739, 155) Me.ComboBoxKleurBinnen.MaxDropDownItems = 15 Me.ComboBoxKleurBinnen.Name = "ComboBoxKleurBinnen" - Me.ComboBoxKleurBinnen.Size = New System.Drawing.Size(457, 66) + Me.ComboBoxKleurBinnen.Size = New System.Drawing.Size(344, 54) Me.ComboBoxKleurBinnen.TabIndex = 70 ' 'Label3 ' - 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, 384) - Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(1, 312) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(210, 39) + Me.Label3.Size = New System.Drawing.Size(168, 31) Me.Label3.TabIndex = 67 Me.Label3.Text = "Kantenband:" ' 'ComboBoxKantenband ' Me.ComboBoxKantenband.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBoxKantenband.Enabled = False - Me.ComboBoxKantenband.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!) + Me.ComboBoxKantenband.Enabled = false + Me.ComboBoxKantenband.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!) Me.ComboBoxKantenband.ForeColor = System.Drawing.SystemColors.ControlText - Me.ComboBoxKantenband.FormattingEnabled = True - Me.ComboBoxKantenband.ItemHeight = 58 - Me.ComboBoxKantenband.Location = New System.Drawing.Point(256, 367) - Me.ComboBoxKantenband.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBoxKantenband.FormattingEnabled = true + Me.ComboBoxKantenband.ItemHeight = 46 + Me.ComboBoxKantenband.Location = New System.Drawing.Point(192, 298) Me.ComboBoxKantenband.MaxDropDownItems = 30 Me.ComboBoxKantenband.Name = "ComboBoxKantenband" - Me.ComboBoxKantenband.Size = New System.Drawing.Size(457, 66) + Me.ComboBoxKantenband.Size = New System.Drawing.Size(344, 54) Me.ComboBoxKantenband.TabIndex = 68 ' 'TextBoxLabelTekst ' - 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 40!, 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(256, 5) - Me.TextBoxLabelTekst.Margin = New System.Windows.Forms.Padding(0, 4, 133, 4) + 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(597, 83) + 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(1, 37) - Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + 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.Location = New System.Drawing.Point(1, 30) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(190, 39) + Me.Label2.Size = New System.Drawing.Size(154, 31) Me.Label2.TabIndex = 60 Me.Label2.Text = "Label tekst:" ' + 'CheckBoxSifonlade + ' + Me.CheckBoxSifonlade.AutoSize = true + Me.CheckBoxSifonlade.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!) + 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 + ' 'FormVoorraad ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1924, 1057) + Me.ClientSize = New System.Drawing.Size(1904, 1042) Me.Controls.Add(Me.Panel1) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) Me.Name = "FormVoorraad" Me.Text = "TA'OR rework - Voorraad" 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 @@ -482,4 +472,5 @@ Friend WithEvents RadioButtonLinksRechts As System.Windows.Forms.RadioButton Friend WithEvents CheckBoxUnicolor As System.Windows.Forms.CheckBox Friend WithEvents btnWisAlle As System.Windows.Forms.Button + Friend WithEvents CheckBoxSifonlade As CheckBox End Class Index: TAOR-rework-bugfixing/TAOR rework/Voorraad/VoorraadItem.vb =================================================================== diff -u -r1613 -r1703 --- TAOR-rework-bugfixing/TAOR rework/Voorraad/VoorraadItem.vb (.../VoorraadItem.vb) (revision 1613) +++ TAOR-rework-bugfixing/TAOR rework/Voorraad/VoorraadItem.vb (.../VoorraadItem.vb) (revision 1703) @@ -1,14 +1,15 @@ Public Class VoorraadItem Implements IVoorraadItem - Public Sub New(label As String, linksOfRechts As LinksOfRechts, diepte As String, hoogte As String, kantenband As String, kleurBinnen As String, kleurBuiten As String) + 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) Me.Label = label Me.LinksOfRechts = linksOfRechts Me.Diepte = diepte Me.Hoogte = hoogte Me.Kantenband = kantenband Me.KleurBinnen = kleurBinnen Me.KleurBuiten = kleurBuiten + Me.IsSifonlade = isSifonlade End Sub #Region "properties" @@ -70,6 +71,8 @@ Public Property KleurBuiten As String Implements IVoorraadItem.KleurBuiten + Public Property IsSifonlade As Boolean Implements IVoorraadItem.IsSifonlade + Property IsTweedeVanPaar As Boolean #End Region @@ -80,10 +83,10 @@ Dim ardisDataBuiten As New ArdisData ardisDataBinnen.voorraadStelInitieleWaardenIn(Diepte, Hoogte, Label, KleurBinnen) - ardisDataBinnen.voorraadGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer()) + ardisDataBinnen.voorraadGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer(), IsSifonlade) ardisDataBuiten.voorraadStelInitieleWaardenIn(Diepte, Hoogte, Label, KleurBuiten) - ardisDataBuiten.voorraadGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer()) + ardisDataBuiten.voorraadGenereerBarcodeEnStelEtiketlijnIn(LinksOfRechts, Hoogte, CacheMapper.GeefBarcodeNummer(), IsSifonlade) ardisDataBinnen.updateKommasNaarPunten() ardisDataBuiten.updateKommasNaarPunten() @@ -101,23 +104,23 @@ zijkamerfreesProductieData.voorraadStelInitieleWaardenIn(zijkantA.KamerfreesTrayId, zijkantA.KamerfreesSlotNr, LinksOfRechts, KleurBinnen, Diepte, Hoogte, Label, zijkantA.PartCalc) zijkamerfreesProductieData.voorraadStelProgrammasInZonderPartner(Hoogte) Else - zijkamerfreesProductieData.voorraadStelInitieleWaardenIn(zijkantA.KamerfreesTrayId, zijkantA.KamerfreesSlotNr, LinksOfRechts, KleurBinnen, Diepte, Hoogte, Label, zijkantA.PartCalc, PartnerInSlot.zijkantArdisDatas(0).PartCalc) - zijkamerfreesProductieData.voorraadStelProgrammasInMetPartner(LinksOfRechts, partnerInSlot.linksOfRechts, Hoogte) + zijkamerfreesProductieData.voorraadStelInitieleWaardenIn(zijkantA.KamerfreesTrayId, zijkantA.KamerfreesSlotNr, LinksOfRechts, KleurBinnen, Diepte, Hoogte, Label, zijkantA.PartCalc, PartnerInSlot.ZijkantArdisDatas(0).PartCalc) + zijkamerfreesProductieData.voorraadStelProgrammasInMetPartner(LinksOfRechts, PartnerInSlot.LinksOfRechts, Hoogte) End If _zijkantAutomillingData = zijkamerfreesProductieData End If End Sub Public Sub GenereerZijkantKantenbandDatas() - If _zijkantKantenbandDatas Is Nothing And Not isTweedeVanPaar Then ' de kantenbanddata's wordt door 1 van de twee van het paar afgehandeld + If _zijkantKantenbandDatas Is Nothing And Not IsTweedeVanPaar Then ' de kantenbanddata's wordt door 1 van de twee van het paar afgehandeld Dim zijkantA = ZijkantArdisDatas(0) Dim kantenbandDataA As New KantenbandData kantenbandDataA.voorraadStelInitieleWaardenIn(zijkantA.PartMat, zijkantA.PartCalc, Diepte, Hoogte, Kantenband) Dim kantenbandDataB As KantenbandData If Not PartnerInSlot Is Nothing Then - Dim zijkantB = PartnerInSlot.zijkantArdisDatas(0) + Dim zijkantB = PartnerInSlot.ZijkantArdisDatas(0) kantenbandDataB = New KantenbandData kantenbandDataB.voorraadStelInitieleWaardenIn(zijkantB.PartMat, zijkantB.PartCalc, Diepte, Hoogte, Kantenband) Else Index: TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormVoorraad.vb =================================================================== diff -u -r1596 -r1703 --- TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 1596) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/Specials/FormVoorraad.vb (.../FormVoorraad.vb) (revision 1703) @@ -41,10 +41,10 @@ lblFoutmeldingToevoegen.Text = "" Try If RadioButtonLinksRechts.Checked Then ' als linksrechts is aangeduid een voorraad item tovoegen met links en eentje met rechts - Domeincontroller.getInstance.voegVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.links, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue) - Domeincontroller.getInstance.voegVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.rechts, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue) + Domeincontroller.getInstance.voegVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Links, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked) + Domeincontroller.getInstance.voegVoorraadItemToe(TextBoxLabelTekst.Text, LinksOfRechts.Rechts, ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked) Else - Domeincontroller.getInstance.voegVoorraadItemToe(TextBoxLabelTekst.Text, If(radioLinks.Checked, LinksOfRechts.links, LinksOfRechts.rechts), ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue) + Domeincontroller.getInstance.voegVoorraadItemToe(TextBoxLabelTekst.Text, If(radioLinks.Checked, LinksOfRechts.Links, LinksOfRechts.Rechts), ComboBoxDiepte.SelectedValue, ComboBoxHoogte.SelectedValue, ComboBoxKantenband.SelectedValue, ComboBoxKleurBinnen.SelectedValue, ComboBoxKleurBuiten.SelectedValue, CheckBoxSifonlade.Checked) End If refreshVoorraadItemsGrid() Catch ex As Exception @@ -54,17 +54,18 @@ Private Sub genereerKolommenVoorraadItemsGrid() 'de kolommen toevoegen en benoemen - DataGridViewVoorraadItems.ColumnCount = 8 + DataGridViewVoorraadItems.ColumnCount = 9 DataGridViewVoorraadItems.Columns(1).Name = "Label" DataGridViewVoorraadItems.Columns(2).Name = "Links of rechts" DataGridViewVoorraadItems.Columns(3).Name = "Diepte" DataGridViewVoorraadItems.Columns(4).Name = "Hoogte" DataGridViewVoorraadItems.Columns(5).Name = "Kantenband" DataGridViewVoorraadItems.Columns(6).Name = "Kleur binnen" DataGridViewVoorraadItems.Columns(7).Name = "Kleur buiten" + DataGridViewVoorraadItems.Columns(8).Name = "Special lade" 'verwijder kolom achteraan zetten - DataGridViewVoorraadItems.Columns(0).DisplayIndex = 7 + DataGridViewVoorraadItems.Columns(0).DisplayIndex = 8 End Sub Private Sub refreshVoorraadItemsGrid() @@ -75,9 +76,9 @@ Dim voorraadItems As IEnumerable(Of IVoorraadItem) = Domeincontroller.getInstance.geefVoorraadItems Dim index As Integer = 0 For Each voorraadItem As IVoorraadItem In voorraadItems - Dim linksOfRechts = [Enum].GetName(GetType(LinksOfRechts), voorraadItem.linksOfRechts).ToLower + Dim linksOfRechts = [Enum].GetName(GetType(LinksOfRechts), voorraadItem.LinksOfRechts).ToLower linksOfRechts = linksOfRechts.Substring(0, 1).ToUpper + linksOfRechts.Substring(1) - Dim row As String() = New String() {"verwijder", voorraadItem.label, linksOfRechts, voorraadItem.diepte, voorraadItem.hoogte, voorraadItem.kantenband, voorraadItem.kleurBinnen, voorraadItem.kleurBuiten} + Dim row As String() = New String() {"verwijder", voorraadItem.Label, linksOfRechts, voorraadItem.Diepte, voorraadItem.Hoogte, voorraadItem.Kantenband, voorraadItem.KleurBinnen, voorraadItem.KleurBuiten, voorraadItem.IsSifonlade} DataGridViewVoorraadItems.Rows.Add(row) index += 1