Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/LaseropdrachtController.vb =================================================================== diff -u -r1923 -r1924 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/LaseropdrachtController.vb (.../LaseropdrachtController.vb) (revision 1923) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Domein/LaseropdrachtController.vb (.../LaseropdrachtController.vb) (revision 1924) @@ -29,8 +29,8 @@ Throw New Exception("De input mag niet leeg zijn.") End If Try - '_laserOpdracht = _cacheMapper.GeefInfoMetBarcodeId("B38Z09730VS93651P1") - _laserOpdracht = _cacheMapper.GeefInfoMetBarcodeId(input) + _laserOpdracht = _cacheMapper.GeefInfoMetBarcodeId("ZCV42L90105") + '_laserOpdracht = _cacheMapper.GeefInfoMetBarcodeId(input) NotifyObservers(_laserOpdracht) Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb =================================================================== diff -u -r1922 -r1924 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb (.../FormHoofdscherm.Designer.vb) (revision 1922) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.Designer.vb (.../FormHoofdscherm.Designer.vb) (revision 1924) @@ -24,27 +24,15 @@ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormHoofdscherm)) Me.TextBoxInput = New System.Windows.Forms.TextBox() - Me.TextBoxLogoID = New System.Windows.Forms.TextBox() - Me.LabelOpzoekFeedbackKleur = New System.Windows.Forms.Label() Me.ProgressBarOpzoeken = New System.Windows.Forms.ProgressBar() - Me.Label3 = New System.Windows.Forms.Label() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.InstellingenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SluitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.CheckBoxObserveer = New System.Windows.Forms.CheckBox() - Me.TextBoxProductID = New System.Windows.Forms.TextBox() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.TextBoxKortTekst = New System.Windows.Forms.TextBox() - Me.Label4 = New System.Windows.Forms.Label() - Me.TextBoxReferentie = New System.Windows.Forms.TextBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.TextBoxLadeKleur = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.TextBoxBestandsnaam = New System.Windows.Forms.TextBox() Me.FileSystemWatcher1 = New System.IO.FileSystemWatcher() + Me.FlowLayoutPanelSchermen = New System.Windows.Forms.FlowLayoutPanel() Me.MenuStrip1.SuspendLayout Me.Panel1.SuspendLayout CType(Me.FileSystemWatcher1,System.ComponentModel.ISupportInitialize).BeginInit @@ -61,24 +49,6 @@ Me.TextBoxInput.Size = New System.Drawing.Size(619, 68) Me.TextBoxInput.TabIndex = 0 ' - 'TextBoxLogoID - ' - Me.TextBoxLogoID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxLogoID.Location = New System.Drawing.Point(235, 302) - Me.TextBoxLogoID.Name = "TextBoxLogoID" - Me.TextBoxLogoID.ReadOnly = true - Me.TextBoxLogoID.Size = New System.Drawing.Size(609, 53) - Me.TextBoxLogoID.TabIndex = 12 - ' - 'LabelOpzoekFeedbackKleur - ' - Me.LabelOpzoekFeedbackKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.LabelOpzoekFeedbackKleur.ForeColor = System.Drawing.Color.Black - Me.LabelOpzoekFeedbackKleur.Location = New System.Drawing.Point(24, 89) - Me.LabelOpzoekFeedbackKleur.Name = "LabelOpzoekFeedbackKleur" - Me.LabelOpzoekFeedbackKleur.Size = New System.Drawing.Size(516, 68) - Me.LabelOpzoekFeedbackKleur.TabIndex = 60 - ' 'ProgressBarOpzoeken ' Me.ProgressBarOpzoeken.Location = New System.Drawing.Point(24, 104) @@ -89,16 +59,6 @@ Me.ProgressBarOpzoeken.TabIndex = 61 Me.ProgressBarOpzoeken.Visible = false ' - '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.Location = New System.Drawing.Point(24, 316) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(117, 31) - Me.Label3.TabIndex = 66 - Me.Label3.Text = "Logo ID:" - ' 'MenuStrip1 ' Me.MenuStrip1.BackColor = System.Drawing.Color.Silver @@ -131,21 +91,9 @@ ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.FlowLayoutPanelSchermen) Me.Panel1.Controls.Add(Me.CheckBoxObserveer) Me.Panel1.Controls.Add(Me.TextBoxInput) - Me.Panel1.Controls.Add(Me.TextBoxProductID) - Me.Panel1.Controls.Add(Me.Label6) - Me.Panel1.Controls.Add(Me.Label5) - Me.Panel1.Controls.Add(Me.TextBoxKortTekst) - Me.Panel1.Controls.Add(Me.Label4) - Me.Panel1.Controls.Add(Me.TextBoxLogoID) - Me.Panel1.Controls.Add(Me.Label3) - Me.Panel1.Controls.Add(Me.TextBoxReferentie) - Me.Panel1.Controls.Add(Me.Label2) - Me.Panel1.Controls.Add(Me.TextBoxLadeKleur) - Me.Panel1.Controls.Add(Me.Label1) - Me.Panel1.Controls.Add(Me.TextBoxBestandsnaam) - Me.Panel1.Controls.Add(Me.LabelOpzoekFeedbackKleur) Me.Panel1.Controls.Add(Me.ProgressBarOpzoeken) Me.Panel1.Location = New System.Drawing.Point(138, 93) Me.Panel1.Name = "Panel1" @@ -163,106 +111,18 @@ Me.CheckBoxObserveer.Text = "Observeer" Me.CheckBoxObserveer.UseVisualStyleBackColor = true ' - 'TextBoxProductID - ' - Me.TextBoxProductID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxProductID.Location = New System.Drawing.Point(235, 160) - Me.TextBoxProductID.Name = "TextBoxProductID" - Me.TextBoxProductID.ReadOnly = true - Me.TextBoxProductID.Size = New System.Drawing.Size(609, 53) - Me.TextBoxProductID.TabIndex = 10 - ' - '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.Location = New System.Drawing.Point(24, 533) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(203, 31) - Me.Label6.TabIndex = 69 - Me.Label6.Text = "Bestandsnaam:" - ' - 'Label5 - ' - Me.Label5.AutoSize = true - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label5.Location = New System.Drawing.Point(24, 463) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(148, 31) - Me.Label5.TabIndex = 68 - Me.Label5.Text = "Lade kleur:" - ' - 'TextBoxKortTekst - ' - Me.TextBoxKortTekst.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxKortTekst.Location = New System.Drawing.Point(235, 229) - Me.TextBoxKortTekst.Name = "TextBoxKortTekst" - Me.TextBoxKortTekst.ReadOnly = true - Me.TextBoxKortTekst.Size = New System.Drawing.Size(609, 53) - Me.TextBoxKortTekst.TabIndex = 11 - ' - '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.Location = New System.Drawing.Point(24, 389) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(148, 31) - Me.Label4.TabIndex = 67 - Me.Label4.Text = "Referentie:" - ' - 'TextBoxReferentie - ' - Me.TextBoxReferentie.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxReferentie.Location = New System.Drawing.Point(235, 375) - Me.TextBoxReferentie.Name = "TextBoxReferentie" - Me.TextBoxReferentie.ReadOnly = true - Me.TextBoxReferentie.Size = New System.Drawing.Size(609, 53) - Me.TextBoxReferentie.TabIndex = 13 - ' - '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.Location = New System.Drawing.Point(24, 243) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(138, 31) - Me.Label2.TabIndex = 65 - Me.Label2.Text = "Kort tekst:" - ' - 'TextBoxLadeKleur - ' - Me.TextBoxLadeKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxLadeKleur.Location = New System.Drawing.Point(235, 449) - Me.TextBoxLadeKleur.Name = "TextBoxLadeKleur" - Me.TextBoxLadeKleur.ReadOnly = true - Me.TextBoxLadeKleur.Size = New System.Drawing.Size(609, 53) - Me.TextBoxLadeKleur.TabIndex = 14 - ' - '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.Location = New System.Drawing.Point(24, 174) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(151, 31) - Me.Label1.TabIndex = 64 - Me.Label1.Text = "Product ID:" - ' - 'TextBoxBestandsnaam - ' - Me.TextBoxBestandsnaam.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.TextBoxBestandsnaam.Location = New System.Drawing.Point(235, 519) - Me.TextBoxBestandsnaam.Name = "TextBoxBestandsnaam" - Me.TextBoxBestandsnaam.ReadOnly = true - Me.TextBoxBestandsnaam.Size = New System.Drawing.Size(609, 53) - Me.TextBoxBestandsnaam.TabIndex = 63 - ' 'FileSystemWatcher1 ' Me.FileSystemWatcher1.EnableRaisingEvents = true Me.FileSystemWatcher1.SynchronizingObject = Me ' + 'FlowLayoutPanelSchermen + ' + Me.FlowLayoutPanelSchermen.Location = New System.Drawing.Point(45, 200) + Me.FlowLayoutPanelSchermen.Name = "FlowLayoutPanelSchermen" + Me.FlowLayoutPanelSchermen.Size = New System.Drawing.Size(826, 447) + Me.FlowLayoutPanelSchermen.TabIndex = 72 + ' 'FormHoofdscherm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) @@ -284,25 +144,13 @@ End Sub Friend WithEvents TextBoxInput As System.Windows.Forms.TextBox - Friend WithEvents TextBoxLogoID As System.Windows.Forms.TextBox - Friend WithEvents LabelOpzoekFeedbackKleur As System.Windows.Forms.Label Friend WithEvents ProgressBarOpzoeken As System.Windows.Forms.ProgressBar - Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents MenuStrip1 As System.Windows.Forms.MenuStrip Friend WithEvents TestToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents InstellingenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents SluitToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents CheckBoxObserveer As System.Windows.Forms.CheckBox - Friend WithEvents TextBoxProductID As TextBox - Friend WithEvents Label6 As Label - Friend WithEvents Label5 As Label - Friend WithEvents TextBoxKortTekst As TextBox - Friend WithEvents Label4 As Label - Friend WithEvents TextBoxReferentie As TextBox - Friend WithEvents Label2 As Label - Friend WithEvents TextBoxLadeKleur As TextBox - Friend WithEvents Label1 As Label - Friend WithEvents TextBoxBestandsnaam As TextBox Friend WithEvents FileSystemWatcher1 As IO.FileSystemWatcher + Friend WithEvents FlowLayoutPanelSchermen As FlowLayoutPanel End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.vb (revision 1924) @@ -0,0 +1,3 @@ +Public Class LaserOpdrachtOpzoekSelecteerStatus + +End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.Designer.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.Designer.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.Designer.vb (revision 1924) @@ -0,0 +1,246 @@ + _ +Partial Class LaserOpdrachtDetailsScherm + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + '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() + Me.TextBoxProductID = New System.Windows.Forms.TextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.TextBoxKortTekst = New System.Windows.Forms.TextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.TextBoxLogoID = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.TextBoxReferentie = New System.Windows.Forms.TextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.TextBoxLadeKleur = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.TextBoxBestandsnaam = New System.Windows.Forms.TextBox() + Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() + Me.LabelOpzoekFeedbackKleur = New System.Windows.Forms.Label() + Me.TableLayoutPanel1.SuspendLayout + Me.SuspendLayout + ' + 'TextBoxProductID + ' + Me.TextBoxProductID.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TextBoxProductID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxProductID.Location = New System.Drawing.Point(213, 59) + Me.TextBoxProductID.Name = "TextBoxProductID" + Me.TextBoxProductID.ReadOnly = true + Me.TextBoxProductID.Size = New System.Drawing.Size(653, 53) + Me.TextBoxProductID.TabIndex = 70 + ' + 'Label6 + ' + Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + 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(3, 349) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(204, 31) + Me.Label6.TabIndex = 83 + Me.Label6.Text = "Bestandsnaam:" + ' + 'Label5 + ' + Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.Label5.AutoSize = true + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label5.Location = New System.Drawing.Point(3, 292) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(204, 31) + Me.Label5.TabIndex = 82 + Me.Label5.Text = "Lade kleur:" + ' + 'TextBoxKortTekst + ' + Me.TextBoxKortTekst.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TextBoxKortTekst.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxKortTekst.Location = New System.Drawing.Point(213, 115) + Me.TextBoxKortTekst.Name = "TextBoxKortTekst" + Me.TextBoxKortTekst.ReadOnly = true + Me.TextBoxKortTekst.Size = New System.Drawing.Size(653, 53) + Me.TextBoxKortTekst.TabIndex = 71 + ' + 'Label4 + ' + Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + 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(3, 236) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(204, 31) + Me.Label4.TabIndex = 81 + Me.Label4.Text = "Referentie:" + ' + 'TextBoxLogoID + ' + Me.TextBoxLogoID.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TextBoxLogoID.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxLogoID.Location = New System.Drawing.Point(213, 171) + Me.TextBoxLogoID.Name = "TextBoxLogoID" + Me.TextBoxLogoID.ReadOnly = true + Me.TextBoxLogoID.Size = New System.Drawing.Size(653, 53) + Me.TextBoxLogoID.TabIndex = 72 + ' + 'Label3 + ' + Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + 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(3, 180) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(204, 31) + Me.Label3.TabIndex = 80 + Me.Label3.Text = "Logo ID:" + ' + 'TextBoxReferentie + ' + Me.TextBoxReferentie.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TextBoxReferentie.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxReferentie.Location = New System.Drawing.Point(213, 227) + Me.TextBoxReferentie.Name = "TextBoxReferentie" + Me.TextBoxReferentie.ReadOnly = true + Me.TextBoxReferentie.Size = New System.Drawing.Size(653, 53) + Me.TextBoxReferentie.TabIndex = 73 + ' + 'Label2 + ' + Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Left + 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(3, 124) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(138, 31) + Me.Label2.TabIndex = 79 + Me.Label2.Text = "Kort tekst:" + ' + 'TextBoxLadeKleur + ' + Me.TextBoxLadeKleur.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TextBoxLadeKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxLadeKleur.Location = New System.Drawing.Point(213, 283) + Me.TextBoxLadeKleur.Name = "TextBoxLadeKleur" + Me.TextBoxLadeKleur.ReadOnly = true + Me.TextBoxLadeKleur.Size = New System.Drawing.Size(653, 53) + Me.TextBoxLadeKleur.TabIndex = 74 + ' + 'Label1 + ' + Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Left + 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(3, 68) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(151, 31) + Me.Label1.TabIndex = 78 + Me.Label1.Text = "Product ID:" + ' + 'TextBoxBestandsnaam + ' + Me.TextBoxBestandsnaam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TextBoxBestandsnaam.Font = New System.Drawing.Font("Microsoft Sans Serif", 30!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.TextBoxBestandsnaam.Location = New System.Drawing.Point(213, 339) + Me.TextBoxBestandsnaam.Name = "TextBoxBestandsnaam" + Me.TextBoxBestandsnaam.ReadOnly = true + Me.TextBoxBestandsnaam.Size = New System.Drawing.Size(653, 53) + Me.TextBoxBestandsnaam.TabIndex = 77 + ' + 'TableLayoutPanel1 + ' + Me.TableLayoutPanel1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.ColumnCount = 2 + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210!)) + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100!)) + Me.TableLayoutPanel1.Controls.Add(Me.LabelOpzoekFeedbackKleur, 0, 0) + Me.TableLayoutPanel1.Controls.Add(Me.TextBoxLogoID, 1, 3) + Me.TableLayoutPanel1.Controls.Add(Me.Label6, 0, 6) + Me.TableLayoutPanel1.Controls.Add(Me.TextBoxReferentie, 1, 4) + Me.TableLayoutPanel1.Controls.Add(Me.TextBoxProductID, 1, 1) + Me.TableLayoutPanel1.Controls.Add(Me.TextBoxLadeKleur, 1, 5) + Me.TableLayoutPanel1.Controls.Add(Me.Label5, 0, 5) + Me.TableLayoutPanel1.Controls.Add(Me.TextBoxBestandsnaam, 1, 6) + Me.TableLayoutPanel1.Controls.Add(Me.Label1, 0, 1) + Me.TableLayoutPanel1.Controls.Add(Me.Label4, 0, 4) + Me.TableLayoutPanel1.Controls.Add(Me.TextBoxKortTekst, 1, 2) + Me.TableLayoutPanel1.Controls.Add(Me.Label2, 0, 2) + Me.TableLayoutPanel1.Controls.Add(Me.Label3, 0, 3) + Me.TableLayoutPanel1.Location = New System.Drawing.Point(3, 3) + Me.TableLayoutPanel1.Name = "TableLayoutPanel1" + Me.TableLayoutPanel1.RowCount = 7 + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571!)) + Me.TableLayoutPanel1.Size = New System.Drawing.Size(869, 393) + Me.TableLayoutPanel1.TabIndex = 84 + ' + 'LabelOpzoekFeedbackKleur + ' + Me.LabelOpzoekFeedbackKleur.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.SetColumnSpan(Me.LabelOpzoekFeedbackKleur, 2) + Me.LabelOpzoekFeedbackKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.LabelOpzoekFeedbackKleur.ForeColor = System.Drawing.Color.Black + Me.LabelOpzoekFeedbackKleur.Location = New System.Drawing.Point(3, 0) + Me.LabelOpzoekFeedbackKleur.Name = "LabelOpzoekFeedbackKleur" + Me.LabelOpzoekFeedbackKleur.Size = New System.Drawing.Size(863, 56) + Me.LabelOpzoekFeedbackKleur.TabIndex = 75 + ' + 'LaserOpdrachtDetailsScherm + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.TableLayoutPanel1) + Me.Name = "LaserOpdrachtDetailsScherm" + Me.Size = New System.Drawing.Size(876, 398) + Me.TableLayoutPanel1.ResumeLayout(false) + Me.TableLayoutPanel1.PerformLayout + Me.ResumeLayout(false) + +End Sub + + Friend WithEvents TextBoxProductID As TextBox + Friend WithEvents Label6 As Label + Friend WithEvents Label5 As Label + Friend WithEvents TextBoxKortTekst As TextBox + Friend WithEvents Label4 As Label + Friend WithEvents TextBoxLogoID As TextBox + Friend WithEvents Label3 As Label + Friend WithEvents TextBoxReferentie As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents TextBoxLadeKleur As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents TextBoxBestandsnaam As TextBox + Friend WithEvents TableLayoutPanel1 As TableLayoutPanel + Friend WithEvents LabelOpzoekFeedbackKleur As Label +End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb =================================================================== diff -u -r1922 -r1924 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb (.../FormHoofdscherm.vb) (revision 1922) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/FormHoofdscherm.vb (.../FormHoofdscherm.vb) (revision 1924) @@ -30,6 +30,8 @@ _keyboardSubject.AddObserver(Me) + FlowLayoutPanelSchermen.Controls.Add(New LaserOpdrachtDetailsScherm) + Catch mbcEx As MissingBaseConfigFileException 'Laat de gebruiker een config bestand kiezen FormConfigsWijzigen.ShowDialog() @@ -121,10 +123,8 @@ If status Then ProgressBarOpzoeken.Visible = True - LabelOpzoekFeedbackKleur.Visible = False Else ProgressBarOpzoeken.Visible = False - LabelOpzoekFeedbackKleur.Visible = True End If End Sub @@ -134,18 +134,6 @@ WijzigIsBezigheidsStatusEnControls(False) If Not _observeer Then Return 'Skip als geen visualisatie nodig is - - If laserOpdracht Is Nothing Then - LabelOpzoekFeedbackKleur.BackColor = Color.IndianRed - Else - LabelOpzoekFeedbackKleur.BackColor = Color.ForestGreen - TextBoxProductID.Text = laserOpdracht.ProductId - TextBoxKortTekst.Text = laserOpdracht.KortTekst - TextBoxLogoID.Text = laserOpdracht.LogoId - TextBoxReferentie.Text = laserOpdracht.Referentie - TextBoxLadeKleur.Text = laserOpdracht.LadeKleur - TextBoxBestandsnaam.Text = laserOpdracht.Bestandsnaam - End If Catch ex As Exception ToonError(ex, "Details konden niet getoond worden") End Try Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj.DotSettings =================================================================== diff -u -r1922 -r1924 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj.DotSettings (.../Laser Gravering.vbproj.DotSettings) (revision 1922) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj.DotSettings (.../Laser Gravering.vbproj.DotSettings) (revision 1924) @@ -3,5 +3,6 @@ True True True + True True True \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/Util.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/Util.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/Util.vb (revision 1924) @@ -0,0 +1,12 @@ +Public Class Util + + Public Delegate Sub DisplayErrorDelegateType(ByVal exception As Exception) + Public Shared Sub ToonError(exception As Exception, Optional extraBoodschap As String = "") + If Not extraBoodschap Is Nothing OrElse extraBoodschap.Equals("") Then + MessageBox.Show($"{extraBoodschap}{vbNewLine}{exception.Message}", "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly) + Else + MessageBox.Show(exception.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error) + End If + End Sub + +End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj =================================================================== diff -u -r1922 -r1924 --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1922) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Laser Gravering.vbproj (.../Laser Gravering.vbproj) (revision 1924) @@ -154,6 +154,13 @@ Form + + LaserOpdrachtDetailsScherm.vb + + + UserControl + + @@ -192,6 +199,9 @@ FormHoofdscherm.vb + + LaserOpdrachtDetailsScherm.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.resx =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.resx (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.resx (revision 1924) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.vb (revision 1924) @@ -0,0 +1,54 @@ +Imports Autofac +Imports Laser_Gravering.Util + +Public Class LaserOpdrachtDetailsScherm + Implements IObserver + + Private _controller As ILaseropdrachtController + + Private Sub LaserOpdrachtDetailsScherm_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + ' Kan geen dependecy injection doen via constructor in een WinForm + Using scope = My.MyApplication.Container.BeginLifetimeScope() + _controller = scope.Resolve(Of ILaseropdrachtController)() + End Using + + 'Subscriben + _controller.AddObserver(Me) + Catch ex As Exception + ToonError(ex) + End Try + End Sub + + Public Sub UpdateObserver(sender As ISubject, Optional o As Object = Nothing) Implements IObserver.UpdateObserver + Dim updateGuiDelegate As UpdateGuiDelegate = AddressOf UpdateGui + Invoke(updateGuiDelegate, o) + End Sub + + Private Delegate Sub UpdateGuiDelegate(o as Object) + Private Sub UpdateGui(o As Object) + 'Er is een laseropdracht opgezocht + 'Nothing -> geen resultaten, afbreken + 'Aanwezig -> informatie tonen + + If IsNothing(o) Then + ' Niet aanwezig, afbreken + LabelOpzoekFeedbackKleur.BackColor = Color.IndianRed + Return + End If + + ' Laseropdracht aanwezig, informatie tonen + If Not TypeOf o Is ILaserOpdracht Then + Throw New Exception($"{Me.GetType().Name} ondersteunt enkel {NameOf(ILaserOpdracht)}") + End If + + Dim laserOpdracht As ILaserOpdracht = o + LabelOpzoekFeedbackKleur.BackColor = Color.ForestGreen + TextBoxProductID.Text = laserOpdracht.ProductId + TextBoxKortTekst.Text = laserOpdracht.KortTekst + TextBoxLogoID.Text = laserOpdracht.LogoId + TextBoxReferentie.Text = laserOpdracht.Referentie + TextBoxLadeKleur.Text = laserOpdracht.LadeKleur + TextBoxBestandsnaam.Text = laserOpdracht.Bestandsnaam + End Sub +End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.Designer.vb =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.Designer.vb (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtOpzoekSelecteerStatus.Designer.vb (revision 1924) @@ -0,0 +1,52 @@ + _ +Partial Class LaserOpdrachtOpzoekSelecteerStatus + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + '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() + Me.LabelOpzoekFeedbackKleur = New System.Windows.Forms.Label() + Me.SuspendLayout + ' + 'LabelOpzoekFeedbackKleur + ' + Me.LabelOpzoekFeedbackKleur.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.LabelOpzoekFeedbackKleur.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.LabelOpzoekFeedbackKleur.ForeColor = System.Drawing.Color.Black + Me.LabelOpzoekFeedbackKleur.Location = New System.Drawing.Point(4, 6) + Me.LabelOpzoekFeedbackKleur.Name = "LabelOpzoekFeedbackKleur" + Me.LabelOpzoekFeedbackKleur.Size = New System.Drawing.Size(511, 56) + Me.LabelOpzoekFeedbackKleur.TabIndex = 76 + ' + 'LaserOpdrachtOpzoekSelecteerStatus + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.LabelOpzoekFeedbackKleur) + Me.Name = "LaserOpdrachtOpzoekSelecteerStatus" + Me.Size = New System.Drawing.Size(518, 67) + Me.ResumeLayout(false) + +End Sub + + Friend WithEvents LabelOpzoekFeedbackKleur As Label +End Class Index: Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.resx =================================================================== diff -u --- Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.resx (revision 0) +++ Laser Gravering/nieuw/Laser Gravering_nieuw/Laser Gravering/Formulieren/subschermen/LaserOpdrachtDetailsScherm.resx (revision 1924) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file