Index: TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj =================================================================== diff -u -r1778 -r1867 --- TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1778) +++ TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1867) @@ -146,6 +146,12 @@ Form + + FormReworkAutomilling.vb + + + Form + FormStalen.vb @@ -349,6 +355,9 @@ FormSelectID.vb + + FormReworkAutomilling.vb + FormSifonLade.vb Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormSpecialMenu.vb =================================================================== diff -u -r1596 -r1867 --- TAOR-rework-bugfixing/TAOR rework/formulieren/FormSpecialMenu.vb (.../FormSpecialMenu.vb) (revision 1596) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormSpecialMenu.vb (.../FormSpecialMenu.vb) (revision 1867) @@ -10,12 +10,14 @@ btnDiepteVerschil.Visible = False btnHoogteVerschil.Visible = False btnVervangKleuren.Visible = False + btnReworkAutomilling.Visible=true Else btnVoorraad.Visible = True btnSifonEnSpoelbaklade.Visible = True btnDiepteVerschil.Visible = True btnHoogteVerschil.Visible = True btnVervangKleuren.Visible = True + btnReworkAutomilling.Visible = true End If End Sub @@ -62,4 +64,8 @@ FormController.getInstance.laadFormKleurVervangen(Me) End Sub + Private Sub BtnReworkAutomilling_Click(sender As Object, e As EventArgs) Handles btnReworkAutomilling.Click + ' Rework automilling tonen + FormController.getInstance().laadFormReworkAutomilling(Me) + End Sub End Class \ No newline at end of file Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormSpecialMenu.Designer.vb =================================================================== diff -u -r1596 -r1867 --- TAOR-rework-bugfixing/TAOR rework/formulieren/FormSpecialMenu.Designer.vb (.../FormSpecialMenu.Designer.vb) (revision 1596) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormSpecialMenu.Designer.vb (.../FormSpecialMenu.Designer.vb) (revision 1867) @@ -24,6 +24,7 @@ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormSpecialMenu)) Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblVerwerking = New System.Windows.Forms.Label() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() Me.Panel6 = New System.Windows.Forms.Panel() Me.btnStalen = New System.Windows.Forms.Button() @@ -40,17 +41,19 @@ Me.Panel7 = New System.Windows.Forms.Panel() Me.btnVervangKleuren = New System.Windows.Forms.Button() Me.btnTerug = New System.Windows.Forms.Button() - Me.lblVerwerking = New System.Windows.Forms.Label() - Me.Panel1.SuspendLayout() - Me.FlowLayoutPanel1.SuspendLayout() - Me.Panel6.SuspendLayout() - Me.Panel2.SuspendLayout() - Me.Panel5.SuspendLayout() - Me.Panel3.SuspendLayout() - Me.Panel4.SuspendLayout() - Me.Panel8.SuspendLayout() - Me.Panel7.SuspendLayout() - Me.SuspendLayout() + Me.Panel9 = New System.Windows.Forms.Panel() + Me.btnReworkAutomilling = New System.Windows.Forms.Button() + Me.Panel1.SuspendLayout + Me.FlowLayoutPanel1.SuspendLayout + Me.Panel6.SuspendLayout + Me.Panel2.SuspendLayout + Me.Panel5.SuspendLayout + Me.Panel3.SuspendLayout + Me.Panel4.SuspendLayout + Me.Panel8.SuspendLayout + Me.Panel7.SuspendLayout + Me.Panel9.SuspendLayout + Me.SuspendLayout ' 'Panel1 ' @@ -63,6 +66,17 @@ Me.Panel1.Size = New System.Drawing.Size(807, 792) Me.Panel1.TabIndex = 61 ' + 'lblVerwerking + ' + Me.lblVerwerking.AutoSize = true + Me.lblVerwerking.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, 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(275, 34) + Me.lblVerwerking.Name = "lblVerwerking" + Me.lblVerwerking.Size = New System.Drawing.Size(277, 31) + Me.lblVerwerking.TabIndex = 94 + Me.lblVerwerking.Text = "Er wordt niet verwerkt" + ' 'FlowLayoutPanel1 ' Me.FlowLayoutPanel1.Controls.Add(Me.Panel6) @@ -72,200 +86,212 @@ Me.FlowLayoutPanel1.Controls.Add(Me.Panel4) Me.FlowLayoutPanel1.Controls.Add(Me.Panel8) Me.FlowLayoutPanel1.Controls.Add(Me.Panel7) + Me.FlowLayoutPanel1.Controls.Add(Me.Panel9) Me.FlowLayoutPanel1.Location = New System.Drawing.Point(19, 88) Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1" - Me.FlowLayoutPanel1.Size = New System.Drawing.Size(730, 680) + Me.FlowLayoutPanel1.Size = New System.Drawing.Size(731, 680) Me.FlowLayoutPanel1.TabIndex = 21 ' 'Panel6 ' Me.Panel6.Controls.Add(Me.btnStalen) Me.Panel6.Location = New System.Drawing.Point(3, 3) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(378, 90) + Me.Panel6.Size = New System.Drawing.Size(332, 90) Me.Panel6.TabIndex = 19 ' 'btnStalen ' - Me.btnStalen.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnStalen.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnStalen.Location = New System.Drawing.Point(0, 13) Me.btnStalen.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnStalen.Name = "btnStalen" - Me.btnStalen.Size = New System.Drawing.Size(378, 68) + Me.btnStalen.Size = New System.Drawing.Size(332, 68) Me.btnStalen.TabIndex = 12 Me.btnStalen.Text = "Stalen" Me.btnStalen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnStalen.UseVisualStyleBackColor = True + Me.btnStalen.UseVisualStyleBackColor = true ' 'Panel2 ' Me.Panel2.Controls.Add(Me.btnLades) - Me.Panel2.Location = New System.Drawing.Point(3, 99) + Me.Panel2.Location = New System.Drawing.Point(341, 3) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(378, 90) + Me.Panel2.Size = New System.Drawing.Size(332, 90) Me.Panel2.TabIndex = 17 ' 'btnLades ' - Me.btnLades.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnLades.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnLades.Location = New System.Drawing.Point(0, 13) Me.btnLades.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnLades.Name = "btnLades" - Me.btnLades.Size = New System.Drawing.Size(378, 68) + Me.btnLades.Size = New System.Drawing.Size(332, 68) Me.btnLades.TabIndex = 14 Me.btnLades.Text = "Lades" Me.btnLades.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLades.UseVisualStyleBackColor = True + Me.btnLades.UseVisualStyleBackColor = true ' 'Panel5 ' Me.Panel5.Controls.Add(Me.btnVoorraad) - Me.Panel5.Location = New System.Drawing.Point(3, 195) + Me.Panel5.Location = New System.Drawing.Point(3, 99) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(378, 90) + Me.Panel5.Size = New System.Drawing.Size(332, 90) Me.Panel5.TabIndex = 20 ' 'btnVoorraad ' - Me.btnVoorraad.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnVoorraad.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnVoorraad.Location = New System.Drawing.Point(0, 10) Me.btnVoorraad.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnVoorraad.Name = "btnVoorraad" - Me.btnVoorraad.Size = New System.Drawing.Size(378, 68) + Me.btnVoorraad.Size = New System.Drawing.Size(332, 68) Me.btnVoorraad.TabIndex = 13 Me.btnVoorraad.Text = "Voorraad" Me.btnVoorraad.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVoorraad.UseVisualStyleBackColor = True + Me.btnVoorraad.UseVisualStyleBackColor = true ' 'Panel3 ' Me.Panel3.Controls.Add(Me.btnSifonEnSpoelbaklade) - Me.Panel3.Location = New System.Drawing.Point(3, 291) + Me.Panel3.Location = New System.Drawing.Point(341, 99) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(378, 90) + Me.Panel3.Size = New System.Drawing.Size(332, 90) Me.Panel3.TabIndex = 18 ' 'btnSifonEnSpoelbaklade ' - Me.btnSifonEnSpoelbaklade.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSifonEnSpoelbaklade.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnSifonEnSpoelbaklade.Location = New System.Drawing.Point(0, 13) Me.btnSifonEnSpoelbaklade.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnSifonEnSpoelbaklade.Name = "btnSifonEnSpoelbaklade" - Me.btnSifonEnSpoelbaklade.Size = New System.Drawing.Size(378, 68) + Me.btnSifonEnSpoelbaklade.Size = New System.Drawing.Size(332, 68) Me.btnSifonEnSpoelbaklade.TabIndex = 15 Me.btnSifonEnSpoelbaklade.Text = "Sifon-/Spoelbaklade" Me.btnSifonEnSpoelbaklade.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSifonEnSpoelbaklade.UseVisualStyleBackColor = True - Me.btnSifonEnSpoelbaklade.Visible = False + Me.btnSifonEnSpoelbaklade.UseVisualStyleBackColor = true + Me.btnSifonEnSpoelbaklade.Visible = false ' 'Panel4 ' Me.Panel4.Controls.Add(Me.btnDiepteVerschil) - Me.Panel4.Location = New System.Drawing.Point(3, 387) + Me.Panel4.Location = New System.Drawing.Point(3, 195) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(378, 90) + Me.Panel4.Size = New System.Drawing.Size(332, 90) Me.Panel4.TabIndex = 21 ' 'btnDiepteVerschil ' - Me.btnDiepteVerschil.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnDiepteVerschil.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnDiepteVerschil.Location = New System.Drawing.Point(0, 13) Me.btnDiepteVerschil.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnDiepteVerschil.Name = "btnDiepteVerschil" - Me.btnDiepteVerschil.Size = New System.Drawing.Size(378, 68) + Me.btnDiepteVerschil.Size = New System.Drawing.Size(332, 68) Me.btnDiepteVerschil.TabIndex = 16 Me.btnDiepteVerschil.Text = "Diepte verschil" Me.btnDiepteVerschil.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnDiepteVerschil.UseVisualStyleBackColor = True - Me.btnDiepteVerschil.Visible = False + Me.btnDiepteVerschil.UseVisualStyleBackColor = true + Me.btnDiepteVerschil.Visible = false ' 'Panel8 ' Me.Panel8.Controls.Add(Me.btnHoogteVerschil) - Me.Panel8.Location = New System.Drawing.Point(3, 483) + Me.Panel8.Location = New System.Drawing.Point(341, 195) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(378, 90) + Me.Panel8.Size = New System.Drawing.Size(332, 90) Me.Panel8.TabIndex = 23 ' 'btnHoogteVerschil ' - Me.btnHoogteVerschil.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnHoogteVerschil.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnHoogteVerschil.Location = New System.Drawing.Point(0, 13) Me.btnHoogteVerschil.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnHoogteVerschil.Name = "btnHoogteVerschil" - Me.btnHoogteVerschil.Size = New System.Drawing.Size(378, 68) + Me.btnHoogteVerschil.Size = New System.Drawing.Size(332, 68) Me.btnHoogteVerschil.TabIndex = 16 Me.btnHoogteVerschil.Text = "Hoogte verschil" Me.btnHoogteVerschil.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnHoogteVerschil.UseVisualStyleBackColor = True - Me.btnHoogteVerschil.Visible = False + Me.btnHoogteVerschil.UseVisualStyleBackColor = true + Me.btnHoogteVerschil.Visible = false ' 'Panel7 ' Me.Panel7.Controls.Add(Me.btnVervangKleuren) - Me.Panel7.Location = New System.Drawing.Point(3, 579) + Me.Panel7.Location = New System.Drawing.Point(3, 291) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(378, 90) + Me.Panel7.Size = New System.Drawing.Size(332, 90) Me.Panel7.TabIndex = 22 ' 'btnVervangKleuren ' - Me.btnVervangKleuren.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnVervangKleuren.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnVervangKleuren.Location = New System.Drawing.Point(0, 13) Me.btnVervangKleuren.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnVervangKleuren.Name = "btnVervangKleuren" - Me.btnVervangKleuren.Size = New System.Drawing.Size(378, 68) + Me.btnVervangKleuren.Size = New System.Drawing.Size(332, 68) Me.btnVervangKleuren.TabIndex = 16 Me.btnVervangKleuren.Text = "Vervang kleuren" Me.btnVervangKleuren.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVervangKleuren.UseVisualStyleBackColor = True - Me.btnVervangKleuren.Visible = False + Me.btnVervangKleuren.UseVisualStyleBackColor = true + Me.btnVervangKleuren.Visible = false ' '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.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(576, 14) Me.btnTerug.Name = "btnTerug" Me.btnTerug.Size = New System.Drawing.Size(228, 68) Me.btnTerug.TabIndex = 12 Me.btnTerug.Text = "Hoofdscherm" - Me.btnTerug.UseVisualStyleBackColor = True + Me.btnTerug.UseVisualStyleBackColor = true ' - 'lblVerwerking + 'Panel9 ' - Me.lblVerwerking.AutoSize = True - Me.lblVerwerking.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, 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(275, 34) - Me.lblVerwerking.Name = "lblVerwerking" - Me.lblVerwerking.Size = New System.Drawing.Size(277, 31) - Me.lblVerwerking.TabIndex = 94 - Me.lblVerwerking.Text = "Er wordt niet verwerkt" + Me.Panel9.Controls.Add(Me.btnReworkAutomilling) + Me.Panel9.Location = New System.Drawing.Point(341, 291) + Me.Panel9.Name = "Panel9" + Me.Panel9.Size = New System.Drawing.Size(332, 90) + Me.Panel9.TabIndex = 23 ' + 'btnReworkAutomilling + ' + Me.btnReworkAutomilling.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.btnReworkAutomilling.Location = New System.Drawing.Point(0, 13) + Me.btnReworkAutomilling.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) + Me.btnReworkAutomilling.Name = "btnReworkAutomilling" + Me.btnReworkAutomilling.Size = New System.Drawing.Size(332, 68) + Me.btnReworkAutomilling.TabIndex = 16 + Me.btnReworkAutomilling.Text = "Rework automilling" + Me.btnReworkAutomilling.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnReworkAutomilling.UseVisualStyleBackColor = true + Me.btnReworkAutomilling.Visible = false + ' 'FormSpecialMenu ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1904, 1042) 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 = "FormSpecialMenu" Me.Text = "TA'OR rework - Submenu" Me.WindowState = System.Windows.Forms.FormWindowState.Maximized - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() - Me.FlowLayoutPanel1.ResumeLayout(False) - Me.Panel6.ResumeLayout(False) - Me.Panel2.ResumeLayout(False) - Me.Panel5.ResumeLayout(False) - Me.Panel3.ResumeLayout(False) - Me.Panel4.ResumeLayout(False) - Me.Panel8.ResumeLayout(False) - Me.Panel7.ResumeLayout(False) - Me.ResumeLayout(False) + Me.Panel1.ResumeLayout(false) + Me.Panel1.PerformLayout + Me.FlowLayoutPanel1.ResumeLayout(false) + Me.Panel6.ResumeLayout(false) + Me.Panel2.ResumeLayout(false) + Me.Panel5.ResumeLayout(false) + Me.Panel3.ResumeLayout(false) + Me.Panel4.ResumeLayout(false) + Me.Panel8.ResumeLayout(false) + Me.Panel7.ResumeLayout(false) + Me.Panel9.ResumeLayout(false) + Me.ResumeLayout(false) - End Sub +End Sub Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents btnTerug As System.Windows.Forms.Button Friend WithEvents Panel2 As System.Windows.Forms.Panel @@ -284,4 +310,6 @@ Friend WithEvents Panel8 As System.Windows.Forms.Panel Friend WithEvents btnHoogteVerschil As System.Windows.Forms.Button Friend WithEvents lblVerwerking As System.Windows.Forms.Label + Friend WithEvents Panel9 As Panel + Friend WithEvents btnReworkAutomilling As Button End Class Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormController.vb =================================================================== diff -u -r1658 -r1867 --- TAOR-rework-bugfixing/TAOR rework/formulieren/FormController.vb (.../FormController.vb) (revision 1658) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormController.vb (.../FormController.vb) (revision 1867) @@ -20,6 +20,7 @@ Private _formSpecialDiepteVerschil As FormDiepteVerschil Private _formSpecialHoogteVerschil As FormHoogteVerschil Private _formKleurVervangen As FormKleurVervangen + Private _formReworkAutomilling As FormReworkAutomilling Private _sender As Form @@ -249,4 +250,14 @@ _sender.Hide() End Sub + 'LADEN VAN FORMREWORKAUTOMILLING + Public Sub laadFormReworkAutomilling(sender As Form) + registreerVorigeForm(sender) + + _formReworkAutomilling = New FormReworkAutomilling() + + _formReworkAutomilling.Show() + _sender.Hide() + End Sub + End Class