From 623e1717d65ae452bb608b1e8e7005c01aa42d8c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 27 Apr 2022 10:48:33 +0200 Subject: [PATCH] clean up --- MultiTool.Form/frmImportMain.vb | 9 ++------- MultiTool.Form/frmRowEditor.vb | 13 ------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index f297430..dad24e0 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -741,17 +741,12 @@ Public Class frmImportMain Return True End If - WebService.RaiseWebServiceProgress("Bericht erzeugen") - ' Generate the report - - ' TODO: Call GetReportFilePath in GenerateReport to better control - ' when filename is generated and use it as placeholder + WebService.RaiseWebServiceProgress("Bericht erzeugen") Dim oReportResult = ReportGenerator.GenerateReport(pDocument, CurrentTemplate) - WebService.RaiseWebServiceProgress("Bericht exportieren") - ' Export it to pdf + WebService.RaiseWebServiceProgress("Bericht exportieren") oReportResult.Report.ExportToPdf(oReportResult.FileName) ' Mark Document as Imported, will be moved on Form Close or File Reload diff --git a/MultiTool.Form/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb index 2ecc5a3..1afbdeb 100644 --- a/MultiTool.Form/frmRowEditor.vb +++ b/MultiTool.Form/frmRowEditor.vb @@ -310,20 +310,7 @@ Public Class frmRowEditor If oField.Value.HasError Then e.Appearance.BackColor = Color.LightCoral End If - - ' TODO: Remove this workaround if the conditions for errors are good now - 'If e.DisplayText = String.Empty And ( - ' oField.Value.Error = FieldError.AccountNotFound Or - ' oField.Value.Error = FieldError.ArticleNotFound) Then - ' e.Appearance.BackColor = Color.LightCoral - 'End If End If - - - - 'If oField.Value.HasError Then - ' e.Appearance.BackColor = Color.LightCoral - 'End If End Sub Private Sub frmRowEditor_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown