Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.Designer.vb =================================================================== diff -u -r1596 -r1620 --- TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.Designer.vb (.../FormSelectID.Designer.vb) (revision 1596) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.Designer.vb (.../FormSelectID.Designer.vb) (revision 1620) @@ -39,91 +39,91 @@ Me.btnSpecialMenu = New System.Windows.Forms.Button() Me.btnPrintLabel = New System.Windows.Forms.Button() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() + Me.ConfigToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OptiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HuidigeLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VorigeLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogMapToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HelpToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.ConfigToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.FlowLayoutPanel1.SuspendLayout() - Me.FlowLayoutPanel2.SuspendLayout() - Me.Panel3.SuspendLayout() - Me.MenuStrip1.SuspendLayout() - Me.SuspendLayout() + Me.FlowLayoutPanel1.SuspendLayout + Me.FlowLayoutPanel2.SuspendLayout + Me.Panel3.SuspendLayout + Me.MenuStrip1.SuspendLayout + Me.SuspendLayout ' 'btnZoekOp ' Me.btnZoekOp.Anchor = System.Windows.Forms.AnchorStyles.None - Me.btnZoekOp.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnZoekOp.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnZoekOp.Location = New System.Drawing.Point(639, 3) Me.btnZoekOp.Margin = New System.Windows.Forms.Padding(3, 3, 50, 3) Me.btnZoekOp.Name = "btnZoekOp" Me.btnZoekOp.Size = New System.Drawing.Size(256, 68) Me.btnZoekOp.TabIndex = 1 Me.btnZoekOp.Text = "Zoek op" - Me.btnZoekOp.UseVisualStyleBackColor = True + Me.btnZoekOp.UseVisualStyleBackColor = true ' 'radioBarcode ' - Me.radioBarcode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.radioBarcode.AutoSize = True - Me.radioBarcode.Checked = True - Me.radioBarcode.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.radioBarcode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.radioBarcode.AutoSize = true + Me.radioBarcode.Checked = true + Me.radioBarcode.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.radioBarcode.Location = New System.Drawing.Point(3, 3) Me.radioBarcode.Name = "radioBarcode" Me.radioBarcode.Size = New System.Drawing.Size(217, 43) Me.radioBarcode.TabIndex = 2 - Me.radioBarcode.TabStop = True + Me.radioBarcode.TabStop = true Me.radioBarcode.Text = "Via barcode" - Me.radioBarcode.UseVisualStyleBackColor = True + Me.radioBarcode.UseVisualStyleBackColor = true ' 'radioBatch ' - Me.radioBatch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.radioBatch.AutoSize = True - Me.radioBatch.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.radioBatch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.radioBatch.AutoSize = true + Me.radioBatch.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.radioBatch.Location = New System.Drawing.Point(226, 3) Me.radioBatch.Name = "radioBatch" Me.radioBatch.Size = New System.Drawing.Size(177, 43) Me.radioBatch.TabIndex = 2 - Me.radioBatch.TabStop = True + Me.radioBatch.TabStop = true Me.radioBatch.Text = "Via batch" - Me.radioBatch.UseVisualStyleBackColor = True + Me.radioBatch.UseVisualStyleBackColor = true ' 'radioToelevering ' - Me.radioToelevering.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.radioToelevering.AutoSize = True - Me.radioToelevering.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.radioToelevering.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.radioToelevering.AutoSize = true + Me.radioToelevering.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.radioToelevering.Location = New System.Drawing.Point(409, 3) Me.radioToelevering.Name = "radioToelevering" Me.radioToelevering.Size = New System.Drawing.Size(261, 43) Me.radioToelevering.TabIndex = 2 - Me.radioToelevering.TabStop = True + Me.radioToelevering.TabStop = true Me.radioToelevering.Text = "Via toelevering" - Me.radioToelevering.UseVisualStyleBackColor = True + Me.radioToelevering.UseVisualStyleBackColor = true ' 'radioKlantnaam ' - Me.radioKlantnaam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.radioKlantnaam.AutoSize = True - Me.radioKlantnaam.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.radioKlantnaam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.radioKlantnaam.AutoSize = true + Me.radioKlantnaam.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.radioKlantnaam.Location = New System.Drawing.Point(676, 3) Me.radioKlantnaam.Name = "radioKlantnaam" Me.radioKlantnaam.Size = New System.Drawing.Size(251, 43) Me.radioKlantnaam.TabIndex = 2 - Me.radioKlantnaam.TabStop = True + Me.radioKlantnaam.TabStop = true Me.radioKlantnaam.Text = "Via klantnaam" - Me.radioKlantnaam.UseVisualStyleBackColor = True + Me.radioKlantnaam.UseVisualStyleBackColor = true ' 'textBoxInput ' - Me.textBoxInput.Font = New System.Drawing.Font("Microsoft Sans Serif", 40.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.textBoxInput.Font = New System.Drawing.Font("Microsoft Sans Serif", 40!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.textBoxInput.ForeColor = System.Drawing.Color.Maroon Me.textBoxInput.Location = New System.Drawing.Point(6, 3) Me.textBoxInput.Margin = New System.Windows.Forms.Padding(0, 3, 50, 3) @@ -133,34 +133,34 @@ ' 'btnTerug ' - Me.btnTerug.Enabled = False - Me.FlowLayoutPanel2.SetFlowBreak(Me.btnTerug, True) - 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.Enabled = false + Me.FlowLayoutPanel2.SetFlowBreak(Me.btnTerug, true) + 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(948, 3) Me.btnTerug.Name = "btnTerug" Me.btnTerug.Size = New System.Drawing.Size(228, 68) Me.btnTerug.TabIndex = 9 Me.btnTerug.Text = "Terug" - Me.btnTerug.UseVisualStyleBackColor = True + Me.btnTerug.UseVisualStyleBackColor = true ' 'radioDossiercode ' - Me.radioDossiercode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.radioDossiercode.AutoSize = True - Me.radioDossiercode.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.radioDossiercode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.radioDossiercode.AutoSize = true + Me.radioDossiercode.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.radioDossiercode.Location = New System.Drawing.Point(933, 3) Me.radioDossiercode.Name = "radioDossiercode" Me.radioDossiercode.Size = New System.Drawing.Size(278, 43) Me.radioDossiercode.TabIndex = 2 - Me.radioDossiercode.TabStop = True + Me.radioDossiercode.TabStop = true Me.radioDossiercode.Text = "Via dossiercode" - Me.radioDossiercode.UseVisualStyleBackColor = True + Me.radioDossiercode.UseVisualStyleBackColor = true ' 'FlowLayoutPanel1 ' - Me.FlowLayoutPanel1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.FlowLayoutPanel1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.FlowLayoutPanel1.Controls.Add(Me.radioBarcode) Me.FlowLayoutPanel1.Controls.Add(Me.radioBatch) Me.FlowLayoutPanel1.Controls.Add(Me.radioToelevering) @@ -175,16 +175,16 @@ ' 'FlowLayoutPanel2 ' - Me.FlowLayoutPanel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.FlowLayoutPanel2.AutoSize = True + Me.FlowLayoutPanel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.FlowLayoutPanel2.AutoSize = true Me.FlowLayoutPanel2.BackColor = System.Drawing.SystemColors.Control Me.FlowLayoutPanel2.Controls.Add(Me.Panel2) Me.FlowLayoutPanel2.Controls.Add(Me.textBoxInput) Me.FlowLayoutPanel2.Controls.Add(Me.btnZoekOp) Me.FlowLayoutPanel2.Controls.Add(Me.btnTerug) Me.FlowLayoutPanel2.Controls.Add(Me.lblFoutmeldingOpzoeken) - Me.FlowLayoutPanel1.SetFlowBreak(Me.FlowLayoutPanel2, True) + Me.FlowLayoutPanel1.SetFlowBreak(Me.FlowLayoutPanel2, true) Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 89) Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(3, 40, 3, 3) Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2" @@ -193,17 +193,17 @@ ' 'Panel2 ' - Me.Panel2.AutoSize = True + Me.Panel2.AutoSize = true Me.Panel2.Location = New System.Drawing.Point(3, 3) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(0, 0) Me.Panel2.TabIndex = 0 ' 'lblFoutmeldingOpzoeken ' - Me.lblFoutmeldingOpzoeken.AutoSize = True - Me.FlowLayoutPanel2.SetFlowBreak(Me.lblFoutmeldingOpzoeken, True) - Me.lblFoutmeldingOpzoeken.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblFoutmeldingOpzoeken.AutoSize = true + Me.FlowLayoutPanel2.SetFlowBreak(Me.lblFoutmeldingOpzoeken, true) + Me.lblFoutmeldingOpzoeken.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.lblFoutmeldingOpzoeken.ForeColor = System.Drawing.Color.Red Me.lblFoutmeldingOpzoeken.Location = New System.Drawing.Point(3, 79) Me.lblFoutmeldingOpzoeken.Margin = New System.Windows.Forms.Padding(3, 5, 3, 15) @@ -213,7 +213,7 @@ ' 'Panel3 ' - Me.Panel3.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Panel3.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.Panel3.Controls.Add(Me.btnSpecialMenu) Me.Panel3.Controls.Add(Me.btnPrintLabel) @@ -224,30 +224,30 @@ ' 'btnSpecialMenu ' - Me.btnSpecialMenu.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSpecialMenu.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnSpecialMenu.Location = New System.Drawing.Point(18, 22) Me.btnSpecialMenu.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnSpecialMenu.Name = "btnSpecialMenu" Me.btnSpecialMenu.Size = New System.Drawing.Size(260, 68) Me.btnSpecialMenu.TabIndex = 13 Me.btnSpecialMenu.Text = "Special menu" - Me.btnSpecialMenu.UseVisualStyleBackColor = True + Me.btnSpecialMenu.UseVisualStyleBackColor = true ' 'btnPrintLabel ' - Me.btnPrintLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnPrintLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.btnPrintLabel.Location = New System.Drawing.Point(299, 22) Me.btnPrintLabel.Margin = New System.Windows.Forms.Padding(3, 3, 150, 3) Me.btnPrintLabel.Name = "btnPrintLabel" Me.btnPrintLabel.Size = New System.Drawing.Size(260, 68) Me.btnPrintLabel.TabIndex = 14 Me.btnPrintLabel.Text = "Print Label" - Me.btnPrintLabel.UseVisualStyleBackColor = True + Me.btnPrintLabel.UseVisualStyleBackColor = true ' 'MenuStrip1 ' Me.MenuStrip1.BackColor = System.Drawing.Color.Silver - Me.MenuStrip1.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.MenuStrip1.Font = New System.Drawing.Font("Segoe UI", 15!) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ConfigToolStripMenuItem, Me.OptiesToolStripMenuItem, Me.LogsToolStripMenuItem, Me.HelpToolStripMenuItem1}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" @@ -256,17 +256,24 @@ Me.MenuStrip1.TabIndex = 11 Me.MenuStrip1.Text = "MenuStrip1" ' + 'ConfigToolStripMenuItem + ' + Me.ConfigToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 25!) + Me.ConfigToolStripMenuItem.Name = "ConfigToolStripMenuItem" + Me.ConfigToolStripMenuItem.Size = New System.Drawing.Size(131, 50) + Me.ConfigToolStripMenuItem.Text = "Config" + ' 'OptiesToolStripMenuItem ' - Me.OptiesToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 25.0!) + Me.OptiesToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 25!) Me.OptiesToolStripMenuItem.Name = "OptiesToolStripMenuItem" Me.OptiesToolStripMenuItem.Size = New System.Drawing.Size(229, 50) Me.OptiesToolStripMenuItem.Text = "Print backlog" ' 'LogsToolStripMenuItem ' Me.LogsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HuidigeLogToolStripMenuItem, Me.VorigeLogToolStripMenuItem, Me.LogMapToolStripMenuItem}) - Me.LogsToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 25.0!) + Me.LogsToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 25!) Me.LogsToolStripMenuItem.Name = "LogsToolStripMenuItem" Me.LogsToolStripMenuItem.Size = New System.Drawing.Size(102, 50) Me.LogsToolStripMenuItem.Text = "Logs" @@ -291,41 +298,34 @@ ' 'HelpToolStripMenuItem1 ' - Me.HelpToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 25.0!) + Me.HelpToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 25!) Me.HelpToolStripMenuItem1.Name = "HelpToolStripMenuItem1" Me.HelpToolStripMenuItem1.Size = New System.Drawing.Size(102, 50) Me.HelpToolStripMenuItem1.Text = "Help" ' - 'ConfigToolStripMenuItem - ' - Me.ConfigToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 25.0!) - Me.ConfigToolStripMenuItem.Name = "ConfigToolStripMenuItem" - Me.ConfigToolStripMenuItem.Size = New System.Drawing.Size(131, 50) - Me.ConfigToolStripMenuItem.Text = "Config" - ' 'FormSelectID ' - 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.MenuStrip1) Me.Controls.Add(Me.FlowLayoutPanel1) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) Me.MainMenuStrip = Me.MenuStrip1 Me.Name = "FormSelectID" Me.Text = "TA'OR rework - Hoofdscherm." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized - Me.FlowLayoutPanel1.ResumeLayout(False) - Me.FlowLayoutPanel1.PerformLayout() - Me.FlowLayoutPanel2.ResumeLayout(False) - Me.FlowLayoutPanel2.PerformLayout() - Me.Panel3.ResumeLayout(False) - Me.MenuStrip1.ResumeLayout(False) - Me.MenuStrip1.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() + Me.FlowLayoutPanel1.ResumeLayout(false) + Me.FlowLayoutPanel1.PerformLayout + Me.FlowLayoutPanel2.ResumeLayout(false) + Me.FlowLayoutPanel2.PerformLayout + Me.Panel3.ResumeLayout(false) + Me.MenuStrip1.ResumeLayout(false) + Me.MenuStrip1.PerformLayout + Me.ResumeLayout(false) + Me.PerformLayout - End Sub +End Sub Friend WithEvents btnZoekOp As System.Windows.Forms.Button Friend WithEvents radioBarcode As System.Windows.Forms.RadioButton Friend WithEvents radioBatch As System.Windows.Forms.RadioButton Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.vb =================================================================== diff -u -r1610 -r1620 --- TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.vb (.../FormSelectID.vb) (revision 1610) +++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.vb (.../FormSelectID.vb) (revision 1620) @@ -36,7 +36,6 @@ 'als het form wordt geactiveerd en er is al een instantie van form grid aanwezig, betekent dit dat formgrid dit form heeft getoond Private Sub FormSelectID_VisibleChanged(sender As Object, e As System.EventArgs) Handles Me.VisibleChanged Try - laadLogToolstripMenuStatussen() If FormController.getInstance.formSelectIDKanTerug Then btnTerug.Enabled = True End If @@ -88,7 +87,6 @@ ElseIf radioDossiercode.Checked Then verwerkKeuze(Kolommen.dossierCode, input) End If - laadLogToolstripMenuStatussen() Catch ex As InvalidCastException lblFoutmeldingOpzoeken.Text = "Gelieve de juiste waarden in te voeren" 'de tekst in de textbox selecteren en de textbox focussen @@ -198,28 +196,28 @@ Process.Start(pad) End Sub - Private Sub laadLogToolstripMenuStatussen() - HuidigeLogToolStripMenuItem.Enabled = Not LogBestandTextMapper.currentLogPath.Equals("") - VorigeLogToolStripMenuItem.Enabled = Not LogBestandTextMapper.geefPathLaatsteLogFile.Equals("") + Private Sub LogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LogsToolStripMenuItem.Click + HuidigeLogToolStripMenuItem.Enabled = Not LogBestandTextMapper.CurrentLogPath.Equals(String.Empty) + VorigeLogToolStripMenuItem.Enabled = Not LogBestandTextMapper.GeefPathLaatsteLogFile.Equals(String.Empty) End Sub Private Sub HuidigeLogToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles HuidigeLogToolStripMenuItem.Click - Dim pad As String = ControlChars.Quote & LogBestandTextMapper.currentLogPath & ControlChars.Quote + Dim pad As String = ControlChars.Quote & LogBestandTextMapper.CurrentLogPath & ControlChars.Quote 'log openen met de default reader Process.Start(pad) End Sub Private Sub VorigeLogToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles VorigeLogToolStripMenuItem.Click - Dim pad As String = ControlChars.Quote & LogBestandTextMapper.geefPathLaatsteLogFile & ControlChars.Quote + Dim pad As String = ControlChars.Quote & LogBestandTextMapper.GeefPathLaatsteLogFile & ControlChars.Quote If Not pad.Equals("") Then 'log openen met de default reader Process.Start(pad) End If End Sub Private Sub LogMapToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles LogMapToolStripMenuItem.Click - Dim pad As String = ControlChars.Quote & LogBestandTextMapper.getPathLogFolder & ControlChars.Quote + Dim pad As String = ControlChars.Quote & LogBestandTextMapper.GetPathLogFolder & ControlChars.Quote If Not pad.Equals("") Then 'log openen met de default reader Process.Start(pad) Index: TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj =================================================================== diff -u -r1619 -r1620 --- TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1619) +++ TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1620) @@ -29,7 +29,7 @@ TAOR rework Robin De Bock false - 0 + 1 5.1.3.%2a false true Index: TAOR-rework-bugfixing/TAOR rework/LogBestandTextMapper.vb =================================================================== diff -u -r1596 -r1620 --- TAOR-rework-bugfixing/TAOR rework/LogBestandTextMapper.vb (.../LogBestandTextMapper.vb) (revision 1596) +++ TAOR-rework-bugfixing/TAOR rework/LogBestandTextMapper.vb (.../LogBestandTextMapper.vb) (revision 1620) @@ -1,112 +1,92 @@ Imports System.IO Module LogBestandTextMapper - Const aantalLogs As Integer = 5 - Dim busy As Boolean + Const AantalLogs As Integer = 5 + Dim _busy As Boolean Private _currentLogPath As String = "" - Public ReadOnly Property currentLogPath() As String + Public ReadOnly Property CurrentLogPath() As String Get Return _currentLogPath End Get End Property - - Sub writeToFile(databank As String, logMessage As String, Optional voltooid As Boolean = False) - If Not busy Then - startNewLog() + ''' + ''' Wegschrijven van entry in het logbestand. + ''' + ''' De naam van de databank + ''' Het bericht + ''' Ofdat het stuk code is voltooid + Public Sub WriteToFile(databank As String, logMessage As String, Optional voltooid As Boolean = False) + 'Controleren of er nog geen log bestand was gemaakt. + If Not _busy Then + 'Geen log bestand was reeds aanwezig, aanmaken. + StartNewLog() + 'Bijhouden dat nieuw log bestand is aangemaakt. + _busy = True End If - Try - Dim file As System.IO.StreamWriter - file = My.Computer.FileSystem.OpenTextFileWriter(_currentLogPath, True) - - Dim logText As String = String.Format("{0,-15}{1}{2}", databank, logMessage, If(voltooid, " VOLTOOID!", "")) - file.WriteLine(logText) - - file.Close() + Try + 'Stream writer initialiseren met pad naar het log bestand. Tekst wordt niet overschreven, maar toegevoegd. + Dim streamWriter = My.Computer.FileSystem.OpenTextFileWriter(_currentLogPath, True) + 'De tekst die wordt weggeschreven opbouwen: datum databank naam status bericht. + Dim logText = String.Format("{0,-23}{1,-10}{3,-13}{2}", Now.ToString("yyyy-MM-dd HH:mm:ss"), databank, logMessage, If(voltooid, "VOLTOOID!", "")) + 'Wegschrijven. + streamWriter.WriteLine(logText) + 'De stream writer sluiten. + streamWriter.Close() Catch ex As Exception - Throw New Exception("Log bestand kon niet worden gevuld " & vbNewLine & ex.Message) + Throw New Exception($"Log bestand kon niet worden gevuld.{vbNewLine}{ex.Message}") End Try End Sub - Private Sub startNewLog() + Private Sub StartNewLog() Try - Dim regDate As Date = Now.ToString("yyyy-MM-dd HH:mm:ss") - - Dim file As System.IO.StreamWriter - - _currentLogPath = maakNieuweLogFile() - busy = True - - file = My.Computer.FileSystem.OpenTextFileWriter(_currentLogPath, False) - - file.WriteLine(regDate) - - file.Close() + 'Hoofding opbouwen. + Dim hoofding = String.Format("{0,-23}{1,-10}{3,-13}{2}", "Datum", "Databank", "Bericht", "Status") + 'Nieuw log bestand aanmaken en pad er naartoe opslaan. + _currentLogPath = MaakNieuweLogFile() + 'Streamwriter initialiseren. + Dim streamWriter = My.Computer.FileSystem.OpenTextFileWriter(_currentLogPath, False) + 'Hoofding wegschrijven. + streamWriter.WriteLine(hoofding) + 'Stream sluiten. + streamWriter.Close() Catch ex As Exception - Throw New Exception("Log bestand kon niet worden aangemaakt." & vbNewLine & ex.Message) + Throw New Exception($"Log bestand kon niet worden aangemaakt.{vbNewLine}{ex.Message}") End Try End Sub - Public Function getPathLogFolder() As String - 'opvragen van het path naar het bureaublad - Dim logFolderPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) - Dim logfolder As String = "TAOR REWORK LOGS" - logFolderPath = Path.Combine(logFolderPath, logfolder) - 'als de folder nog niet bestaat, aanmaken - If (Not System.IO.Directory.Exists(logFolderPath)) Then - System.IO.Directory.CreateDirectory(logFolderPath) - End If - Return logFolderPath - End Function + Public Function GeefPathLaatsteLogFile() As String + 'Variabelen declareren. + Dim bestandsnaam as String = String.Empty + Dim laatsteWijzigingTijdstip As Date - Private _pathLaatsteLogFile As String - Public Function geefPathLaatsteLogFile() As String - If _pathLaatsteLogFile Is Nothing OrElse Not System.IO.File.Exists(_pathLaatsteLogFile) Then - Dim logFolderPath As String = getPathLogFolder() - 'kijken of er niks is misgelopen, max-1 aantal bestanden moeten er zijn plus 1'tje met een dubbel cijfer - controleerEnFixBestanden(logFolderPath) + 'Log map opvragen. + dim pathLogFolder = GetPathLogFolder() + 'Alle bestanden hierin overlopen. + For each fileName in Directory.EnumerateFiles(pathLogFolder) + 'Pad naar bestand opbouwen. + dim filePath = Path.Combine(pathLogFolder, fileName) + 'Tijdstip laatste wijziging. + dim lastChanged = System.IO.File.GetLastWriteTimeUtc(filePath) + 'Controleren of de datum van dit bestand recenter is. + If bestandsnaam is String.Empty OrElse (lastChanged > laatsteWijzigingTijdstip) Then + 'Zo ja, registreer dit bestand. + bestandsnaam = fileName + laatsteWijzigingTijdstip = lastChanged + End If + Next - Dim volledigPadMogelijkeLogFile As String - For teller As Integer = 1 To aantalLogs - volledigPadMogelijkeLogFile = Path.Combine(logFolderPath, "log" & teller & teller & ".txt") - If System.IO.File.Exists(volledigPadMogelijkeLogFile) Then - 'als er nog geen nieuwe log is aangemaakt kunnen we kijken naar de huidige log met 2 cijfers, anders moeten we die ervoor nemen - If busy Then - 'als de huidige log '11' is, moeten we kijken of 'aantalLogs' bestaat - Dim padNaarVorigeLog As String - If teller = 1 Then - padNaarVorigeLog = Path.Combine(logFolderPath, "log" & aantalLogs & ".txt") - Else - padNaarVorigeLog = Path.Combine(logFolderPath, "log" & teller - 1 & ".txt") - End If - If System.IO.File.Exists(padNaarVorigeLog) Then - _pathLaatsteLogFile = padNaarVorigeLog - Return _pathLaatsteLogFile - Else - _pathLaatsteLogFile = "" - Return _pathLaatsteLogFile - End If - End If - _pathLaatsteLogFile = volledigPadMogelijkeLogFile - Return _pathLaatsteLogFile - End If - Next - _pathLaatsteLogFile = "" - Return _pathLaatsteLogFile - End If - Return _pathLaatsteLogFile + Return bestandsnaam End Function - Private Function maakNieuweLogFile() As String - Dim logFolderPath As String = getPathLogFolder() - 'kijken of er niks is misgelopen, max-1 aantal bestanden moeten er zijn plus 1'tje met een dubbel cijfer - controleerEnFixBestanden(logFolderPath) + Private Function MaakNieuweLogFile() As String + Dim logFolderPath As String = GetPathLogFolder() Dim vorigeLogFileAanwezig As Boolean Dim volledigPadVorigeLogFile As String - For teller As Integer = 1 To aantalLogs + For teller As Integer = 1 To AantalLogs volledigPadVorigeLogFile = Path.Combine(logFolderPath, "log" & teller & teller & ".txt") If System.IO.File.Exists(volledigPadVorigeLogFile) Then vorigeLogFileAanwezig = True @@ -127,38 +107,16 @@ Throw New Exception("Er is iets fout gelopen bij het opvragen van het Path voor de log bestanden") End Function - Private Sub controleerEnFixBestanden(strPath As String) - Dim aantalGevonden As Integer = 0 - For teller As Integer = 1 To aantalLogs - Dim volledigPath As String = Path.Combine(strPath, "log" & teller & teller & ".txt") - If System.IO.File.Exists(volledigPath) Then - aantalGevonden += 1 - End If - Next - If aantalGevonden <> 1 Then - fixbestanden(strPath, aantalGevonden) + Public Function GetPathLogFolder() As String + 'Opvragen van het pad naar het bureaublad + Dim logFolderPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + Dim logfolder As String = "TAOR REWORK LOGS" + logFolderPath = Path.Combine(logFolderPath, logfolder) + 'als de folder nog niet bestaat, aanmaken + If (Not System.IO.Directory.Exists(logFolderPath)) Then + System.IO.Directory.CreateDirectory(logFolderPath) End If - End Sub + Return logFolderPath + End Function - Private Sub fixbestanden(strPath As String, aantalGevonden As Integer) - If aantalGevonden > 1 Then - Dim teller As Integer = 1 - While aantalGevonden > 1 And teller <= aantalLogs - Dim volledigPath As String = Path.Combine(strPath, "log" & teller & teller & ".txt") - If System.IO.File.Exists(volledigPath) Then - My.Computer.FileSystem.RenameFile(volledigPath, "log" & teller & ".txt") - aantalGevonden -= 1 - End If - teller += 1 - End While - Else - 'terug beginnen tellen vanaf 1 - Dim volledigPath As String = Path.Combine(strPath, "log" & 1 & ".txt") - 'als er nog geen enkele log file aanwezig is, moeten we niks doen - If System.IO.File.Exists(volledigPath) Then - My.Computer.FileSystem.DeleteFile(volledigPath) - End If - End If - End Sub - End Module \ No newline at end of file