AppCustom/MultiTool
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Jonathan Jenne 2022-03-16 12:18:23 +01:00
parent 4c1a3a9220
commit 5c30528a83
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MultiTool.Form/GridLoader.vb
View File

@ -62,7 +62,7 @@ Public Class GridLoader
Return pGrid Return pGrid
End Function End Function
Private Function GetColumnType(pColumn As Templates.Template.Column) Private Function GetColumnType(pColumn As Templates.Template.Column) As DevExpress.Data.UnboundColumnType
Select Case pColumn.DataType Select Case pColumn.DataType
Case ColumnType.Boolean Case ColumnType.Boolean
Return DevExpress.Data.UnboundColumnType.Boolean Return DevExpress.Data.UnboundColumnType.Boolean

9
MultiTool.Form/frmImportMain.vb
View File

@ -321,7 +321,10 @@ Public Class frmImportMain
Dim oReportGenerator = New ReportGenerator(Of OrderReport)(LogConfig, Database, Dim oReportGenerator = New ReportGenerator(Of OrderReport)(LogConfig, Database,
My.TemplateConfiguration, My.TemplateConfiguration,
My.GeneralConfiguration) My.GeneralConfiguration)
Dim oReport As OrderReport = oReportGenerator.GenerateReport(oDocument)
Dim oReport As OrderReport = oReportGenerator.GenerateReport(oDocument, CurrentTemplate)
Dim oPrintTool As New ReportPrintTool(oReport) Dim oPrintTool As New ReportPrintTool(oReport)
oPrintTool.Report.CreateDocument(False) oPrintTool.Report.CreateDocument(False)
oPrintTool.ShowPreview() oPrintTool.ShowPreview()
@ -506,7 +509,7 @@ Public Class frmImportMain
Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
' Generate the report ' Generate the report
Dim oReport = ReportGenerator.GenerateReport(oDocument) Dim oReport = ReportGenerator.GenerateReport(oDocument, CurrentTemplate)
Dim oFilePath = ReportGenerator.GetReportFilePath(oDocument, CurrentTemplate) Dim oFilePath = ReportGenerator.GetReportFilePath(oDocument, CurrentTemplate)
' Export it to pdf ' Export it to pdf
@ -645,7 +648,7 @@ Public Class frmImportMain
WebService.RaiseWebServiceProgress("Bericht erzeugen") WebService.RaiseWebServiceProgress("Bericht erzeugen")
' Generate the report ' Generate the report
Dim oReport = ReportGenerator.GenerateReport(pDocument) Dim oReport = ReportGenerator.GenerateReport(pDocument, CurrentTemplate)
Dim oFilePath = ReportGenerator.GetReportFilePath(pDocument, CurrentTemplate) Dim oFilePath = ReportGenerator.GetReportFilePath(pDocument, CurrentTemplate)
WebService.RaiseWebServiceProgress("Bericht exportieren") WebService.RaiseWebServiceProgress("Bericht exportieren")

2
MultiTool.Shared/Constants.vb
View File

@ -5,6 +5,8 @@
Public Const FUNCTION_GLN = "GLN" Public Const FUNCTION_GLN = "GLN"
Public Const FUNCTION_EAN = "EAN" Public Const FUNCTION_EAN = "EAN"
Public Const FUNCTION_PRICE = "PRICE"
Public Const FUNCTION_SQL = "SQL"
Public Const TEMPLATE_TYPE_DATE = "xs:date" Public Const TEMPLATE_TYPE_DATE = "xs:date"
Public Const TEMPLATE_TYPE_INTEGER = "xs:integer" Public Const TEMPLATE_TYPE_INTEGER = "xs:integer"