Index: TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb =================================================================== diff -u -r1899 -r1904 --- TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb (.../FormFronten.Designer.vb) (revision 1899) +++ TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb (.../FormFronten.Designer.vb) (revision 1904) @@ -24,6 +24,7 @@ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormFronten)) Me.Panel1 = New System.Windows.Forms.Panel() + Me.NumericUpDownBreedte = New System.Windows.Forms.NumericUpDown() Me.btnProduceer = New System.Windows.Forms.Button() Me.TextBoxLetterBarcode = New System.Windows.Forms.TextBox() Me.Label7 = New System.Windows.Forms.Label() @@ -40,15 +41,19 @@ Me.Label1 = New System.Windows.Forms.Label() Me.lblVerwerking = New System.Windows.Forms.Label() Me.btnTerug = New System.Windows.Forms.Button() - Me.NumericUpDownBreedte = New System.Windows.Forms.NumericUpDown() + Me.NumericUpDownBoringen = New System.Windows.Forms.NumericUpDown() + Me.Label8 = New System.Windows.Forms.Label() Me.Panel1.SuspendLayout - CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).BeginInit CType(Me.NumericUpDownBreedte,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.NumericUpDownBoringen,System.ComponentModel.ISupportInitialize).BeginInit Me.SuspendLayout ' 'Panel1 ' Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top + Me.Panel1.Controls.Add(Me.NumericUpDownBoringen) + Me.Panel1.Controls.Add(Me.Label8) Me.Panel1.Controls.Add(Me.NumericUpDownBreedte) Me.Panel1.Controls.Add(Me.btnProduceer) Me.Panel1.Controls.Add(Me.TextBoxLetterBarcode) @@ -71,6 +76,19 @@ Me.Panel1.Size = New System.Drawing.Size(1200, 665) Me.Panel1.TabIndex = 61 ' + 'NumericUpDownBreedte + ' + Me.NumericUpDownBreedte.DecimalPlaces = 1 + Me.NumericUpDownBreedte.Font = New System.Drawing.Font("Microsoft Sans Serif", 39.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.NumericUpDownBreedte.ForeColor = System.Drawing.SystemColors.ControlText + Me.NumericUpDownBreedte.Location = New System.Drawing.Point(245, 253) + Me.NumericUpDownBreedte.Maximum = New Decimal(New Integer() {1800, 0, 0, 0}) + Me.NumericUpDownBreedte.Minimum = New Decimal(New Integer() {250, 0, 0, 0}) + Me.NumericUpDownBreedte.Name = "NumericUpDownBreedte" + Me.NumericUpDownBreedte.Size = New System.Drawing.Size(344, 67) + Me.NumericUpDownBreedte.TabIndex = 114 + Me.NumericUpDownBreedte.Value = New Decimal(New Integer() {250, 0, 0, 0}) + ' 'btnProduceer ' Me.btnProduceer.Enabled = false @@ -250,19 +268,26 @@ Me.btnTerug.Text = "Terug" Me.btnTerug.UseVisualStyleBackColor = true ' - 'NumericUpDownBreedte + 'NumericUpDownBoringen ' - Me.NumericUpDownBreedte.DecimalPlaces = 1 - Me.NumericUpDownBreedte.Font = New System.Drawing.Font("Microsoft Sans Serif", 39.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.NumericUpDownBreedte.ForeColor = System.Drawing.SystemColors.ControlText - Me.NumericUpDownBreedte.Location = New System.Drawing.Point(245, 253) - Me.NumericUpDownBreedte.Maximum = New Decimal(New Integer() {1800, 0, 0, 0}) - Me.NumericUpDownBreedte.Minimum = New Decimal(New Integer() {250, 0, 0, 0}) - Me.NumericUpDownBreedte.Name = "NumericUpDownBreedte" - Me.NumericUpDownBreedte.Size = New System.Drawing.Size(344, 67) - Me.NumericUpDownBreedte.TabIndex = 114 - Me.NumericUpDownBreedte.Value = New Decimal(New Integer() {250, 0, 0, 0}) + Me.NumericUpDownBoringen.Font = New System.Drawing.Font("Microsoft Sans Serif", 39.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.NumericUpDownBoringen.ForeColor = System.Drawing.SystemColors.ControlText + Me.NumericUpDownBoringen.Location = New System.Drawing.Point(792, 406) + Me.NumericUpDownBoringen.Maximum = New Decimal(New Integer() {9, 0, 0, 0}) + Me.NumericUpDownBoringen.Name = "NumericUpDownBoringen" + Me.NumericUpDownBoringen.Size = New System.Drawing.Size(344, 67) + Me.NumericUpDownBoringen.TabIndex = 116 ' + 'Label8 + ' + Me.Label8.AutoSize = true + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label8.Location = New System.Drawing.Point(601, 431) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(148, 31) + Me.Label8.TabIndex = 115 + Me.Label8.Text = "# boring en" + ' 'FormFronten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) @@ -275,8 +300,9 @@ Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.Panel1.ResumeLayout(false) Me.Panel1.PerformLayout - CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).EndInit CType(Me.NumericUpDownBreedte,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.NumericUpDownBoringen,System.ComponentModel.ISupportInitialize).EndInit Me.ResumeLayout(false) End Sub @@ -299,4 +325,6 @@ Friend WithEvents Label7 As Label Friend WithEvents btnProduceer As Button Friend WithEvents NumericUpDownBreedte As NumericUpDown + Friend WithEvents NumericUpDownBoringen As NumericUpDown + Friend WithEvents Label8 As Label End Class Index: TAOR rework/TAOR rework/Voorraad/fronten/IFrontVoorraadItem.vb =================================================================== diff -u -r1901 -r1904 --- TAOR rework/TAOR rework/Voorraad/fronten/IFrontVoorraadItem.vb (.../IFrontVoorraadItem.vb) (revision 1901) +++ TAOR rework/TAOR rework/Voorraad/fronten/IFrontVoorraadItem.vb (.../IFrontVoorraadItem.vb) (revision 1904) @@ -5,4 +5,5 @@ ReadOnly Property Materiaal As String ReadOnly Property Kantenband As String ReadOnly Property LetterBarcode As String + ReadOnly Property Boringen As Integer End Interface \ No newline at end of file Index: TAOR rework/TAOR rework/Voorraad/fronten/FrontVoorraadItem.vb =================================================================== diff -u -r1903 -r1904 --- TAOR rework/TAOR rework/Voorraad/fronten/FrontVoorraadItem.vb (.../FrontVoorraadItem.vb) (revision 1903) +++ TAOR rework/TAOR rework/Voorraad/fronten/FrontVoorraadItem.vb (.../FrontVoorraadItem.vb) (revision 1904) @@ -1,13 +1,14 @@ Public Class FrontVoorraadItem Implements IFrontVoorraadItem - Public Sub New(label As String, breedte As Double, hoogte As String, materiaal As String, kantenband As String,letterBarcode As String) + Public Sub New(label As String, breedte As Double, hoogte As String, materiaal As String, kantenband As String,letterBarcode As String,boringen As Integer) Me.Label = label Me.Breedte = breedte Me.Hoogte = hoogte Me.Materiaal = materiaal Me.Kantenband = kantenband Me.LetterBarcode = letterBarcode + Me.Boringen = boringen End Sub #Region "properties" @@ -62,6 +63,8 @@ _letterBarcode = Value End Set End Property + Public Property Boringen As Integer Implements IFrontVoorraadItem.Boringen + #End Region Public Sub GenereerZijkantArdisData() Index: TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb =================================================================== diff -u -r1902 -r1904 --- TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb (.../FormFronten.vb) (revision 1902) +++ TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb (.../FormFronten.vb) (revision 1904) @@ -46,7 +46,7 @@ Private Sub BtnProduceer_Click(sender As Object, e As EventArgs) Handles btnProduceer.Click Try btnProduceer.Enabled = False - Domeincontroller.getInstance().produceerFrontenVoorraad(NumericUpDownAantal.Value, TextBoxLabelTekst.Text, NumericUpDownBreedte.Value, ComboBoxHoogte.SelectedValue, ComboBoxMateriaal.SelectedValue, ComboBoxKantenband.SelectedValue, TextBoxLetterBarcode.Text) + Domeincontroller.getInstance().produceerFrontenVoorraad(NumericUpDownAantal.Value, TextBoxLabelTekst.Text, NumericUpDownBreedte.Value, ComboBoxHoogte.SelectedValue, ComboBoxMateriaal.SelectedValue, ComboBoxKantenband.SelectedValue, TextBoxLetterBarcode.Text, NumericUpDownBoringen.Value) Catch ex As Exception MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error) Finally Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb =================================================================== diff -u -r1901 -r1904 --- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1901) +++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1904) @@ -900,10 +900,10 @@ ''' ''' Maak de verschillende voorraad items aan. ''' - Public Sub produceerFrontenVoorraad(aantal As Integer, label As String, breedte As Double, hoogte As String, materiaal As String, kantenband As String, letterBarcode As String) + Public Sub produceerFrontenVoorraad(aantal As Integer, label As String, breedte As Double, hoogte As String, materiaal As String, kantenband As String, letterBarcode As String, boringen As Integer) Try For i = 1 To aantal - frontVoorraadRepository.voegVoorraadItemToe(New FrontVoorraadItem(label, breedte, hoogte, materiaal, kantenband, letterBarcode)) + frontVoorraadRepository.voegVoorraadItemToe(New FrontVoorraadItem(label, breedte, hoogte, materiaal, kantenband, letterBarcode,boringen)) Next genereerFrontenVoorraadDatas() slaFrontenVoorraadOp() @@ -913,16 +913,24 @@ End Sub Private Sub genereerFrontenVoorraadDatas() - For Each item As FrontVoorraadItem In frontVoorraadRepository.voorraadItems - item.GenereerZijkantArdisData() - item.GenereerKantenbandData() - Next + Try + For Each item As FrontVoorraadItem In frontVoorraadRepository.voorraadItems + item.GenereerZijkantArdisData() + item.GenereerKantenbandData() + Next + Catch ex As Exception + throw new Exception("Kon fronten voorraad datas niet genereren.",ex) + End Try End Sub Private Sub slaFrontenVoorraadOp() - For Each item As FrontVoorraadItem In frontVoorraadRepository.voorraadItems - HoofdAansturingFrontVoorraad.OpslaanVoorraadItem(item) - Next + Try + For Each item As FrontVoorraadItem In frontVoorraadRepository.voorraadItems + HoofdAansturingFrontVoorraad.OpslaanVoorraadItem(item) + Next + Catch ex As Exception + throw new Exception("Kon fronten voorraad datas niet opslaan in de databanken.",ex) + End Try End Sub #End Region