Index: TAOR rework/TAOR rework/databases/Ardis/ArdisTextMapper.vb =================================================================== diff -u -r1879 -r2032 --- TAOR rework/TAOR rework/databases/Ardis/ArdisTextMapper.vb (.../ArdisTextMapper.vb) (revision 1879) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisTextMapper.vb (.../ArdisTextMapper.vb) (revision 2032) @@ -7,9 +7,10 @@ Public Sub stopArdisTextOpslag() If writer IsNot Nothing Then writer.Close() + Else + writer = Nothing + bestandsNaam = Nothing End If - writer = Nothing - bestandsNaam = Nothing End Sub Private Sub startNieuweArdisDataOpslag(pathNaarMap As String) @@ -42,9 +43,8 @@ bestandsNaam = "ImportFile_" & typeNaam & "_" - If writer Is Nothing Then - startNieuweArdisDataOpslag(Configs.ardisPathTextFile()) - End If + stopArdisTextOpslag() ' Stop vorige opslag (normaal zou dit niet moeten, maar mogelijks door herproberen na een error) + startNieuweArdisDataOpslag(Configs.ardisPathTextFile()) opslaan(ardisdata, trayNummer, slotNummer) @@ -237,7 +237,7 @@ Next Return ardisDatas Catch ex As Exception - throw New Exception($"Kon Ardis data niet ophalen uit tekstbestand. {vbNewLine}{ex.Message}") + Throw New Exception($"Kon Ardis data niet ophalen uit tekstbestand. {vbNewLine}{ex.Message}") End Try End Function Index: TAOR rework/TAOR rework/formulieren/FormSelectID.vb =================================================================== diff -u -r1869 -r2032 --- TAOR rework/TAOR rework/formulieren/FormSelectID.vb (.../FormSelectID.vb) (revision 1869) +++ TAOR rework/TAOR rework/formulieren/FormSelectID.vb (.../FormSelectID.vb) (revision 2032) @@ -224,6 +224,10 @@ End If End Sub + Private Sub ArdisFlushToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ArdisFlushToolStripMenuItem.Click + Domeincontroller.getInstance().FlushArdisWriter() + End Sub + #End Region End Class Index: TAOR rework/TAOR rework/formulieren/FormSelectID.Designer.vb =================================================================== diff -u -r1869 -r2032 --- TAOR rework/TAOR rework/formulieren/FormSelectID.Designer.vb (.../FormSelectID.Designer.vb) (revision 1869) +++ TAOR rework/TAOR rework/formulieren/FormSelectID.Designer.vb (.../FormSelectID.Designer.vb) (revision 2032) @@ -46,6 +46,7 @@ Me.VorigeLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogMapToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HelpToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.ArdisFlushToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlowLayoutPanel1.SuspendLayout Me.FlowLayoutPanel2.SuspendLayout Me.Panel3.SuspendLayout @@ -248,10 +249,11 @@ ' Me.MenuStrip1.BackColor = System.Drawing.Color.Silver 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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ConfigToolStripMenuItem, Me.OptiesToolStripMenuItem, Me.LogsToolStripMenuItem, Me.HelpToolStripMenuItem1, Me.ArdisFlushToolStripMenuItem}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System + Me.MenuStrip1.ShowItemToolTips = true Me.MenuStrip1.Size = New System.Drawing.Size(1904, 54) Me.MenuStrip1.TabIndex = 11 Me.MenuStrip1.Text = "MenuStrip1" @@ -262,13 +264,15 @@ Me.ConfigToolStripMenuItem.Name = "ConfigToolStripMenuItem" Me.ConfigToolStripMenuItem.Size = New System.Drawing.Size(131, 50) Me.ConfigToolStripMenuItem.Text = "Config" + Me.ConfigToolStripMenuItem.ToolTipText = "Apart scherm om de meest voorkomende instellingen te wijzigen" ' 'OptiesToolStripMenuItem ' 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" + Me.OptiesToolStripMenuItem.ToolTipText = "De map waar alle geprinte bestanden terug te vinden zijn" ' 'LogsToolStripMenuItem ' @@ -277,6 +281,7 @@ Me.LogsToolStripMenuItem.Name = "LogsToolStripMenuItem" Me.LogsToolStripMenuItem.Size = New System.Drawing.Size(102, 50) Me.LogsToolStripMenuItem.Text = "Logs" + Me.LogsToolStripMenuItem.ToolTipText = "Log bestanden, enkel bij problemen" ' 'HuidigeLogToolStripMenuItem ' @@ -302,7 +307,16 @@ Me.HelpToolStripMenuItem1.Name = "HelpToolStripMenuItem1" Me.HelpToolStripMenuItem1.Size = New System.Drawing.Size(102, 50) Me.HelpToolStripMenuItem1.Text = "Help" + Me.HelpToolStripMenuItem1.ToolTipText = "Handleiding" ' + 'ArdisFlushToolStripMenuItem + ' + Me.ArdisFlushToolStripMenuItem.AccessibleDescription = "" + Me.ArdisFlushToolStripMenuItem.Name = "ArdisFlushToolStripMenuItem" + Me.ArdisFlushToolStripMenuItem.Size = New System.Drawing.Size(119, 50) + Me.ArdisFlushToolStripMenuItem.Text = "Ardis Flush" + Me.ArdisFlushToolStripMenuItem.ToolTipText = "Forceer schrijven naar Ardis" + ' 'FormSelectID ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) @@ -349,5 +363,5 @@ Friend WithEvents VorigeLogToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents LogMapToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ConfigToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - + Friend WithEvents ArdisFlushToolStripMenuItem As ToolStripMenuItem End Class Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb =================================================================== diff -u -r1905 -r2032 --- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1905) +++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2032) @@ -34,6 +34,16 @@ Return instance End Function + #Region "Extra" + ''' + ''' Ardis writer flushen + ''' + public sub FlushArdisWriter() + ArdisTextMapper.stopArdisTextOpslag() + End sub + +#End Region + #Region "reworks" #Region "reworks toevoegen, rework redenen, wijzigen en verwijderen"