diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 8446539..732d86c 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -47,10 +47,10 @@ On + + MultiTool.ico + - - ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll - @@ -158,12 +158,6 @@ Form - - frmImportMain_old.vb - - - Form - frmMain.vb @@ -176,6 +170,11 @@ Form + + True + True + frmRowEditorExtra.resx + frmXmlEditor.vb @@ -199,10 +198,6 @@ Settings.settings True - - - - OrderReport.vb @@ -221,13 +216,18 @@ Form + + True + True + frmImportMainExtra.resx + - + frmImportMain.vb - - frmImportMain_old.vb + + frmImportMain.vb frmMain.vb @@ -235,6 +235,11 @@ frmRowEditor.vb + + My.Resources + ResXFileCodeGenerator + frmRowEditorExtra.Designer.vb + frmXmlEditor.vb @@ -254,6 +259,11 @@ frmConfig.vb + + My.Resources + ResXFileCodeGenerator + frmImportMainExtra.Designer.vb + @@ -270,6 +280,7 @@ + diff --git a/MultiTool.Form/MultiTool.ico b/MultiTool.Form/MultiTool.ico new file mode 100644 index 0000000..c68b507 Binary files /dev/null and b/MultiTool.Form/MultiTool.ico differ diff --git a/MultiTool.Form/My Project/licenses.licx b/MultiTool.Form/My Project/licenses.licx index 328d271..a4a5097 100644 --- a/MultiTool.Form/My Project/licenses.licx +++ b/MultiTool.Form/My Project/licenses.licx @@ -1,20 +1,21 @@ -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraReports.UserDesigner.XRDesignDockManager, DevExpress.XtraReports.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraReports.UserDesigner.XRDesignBarManager, DevExpress.XtraReports.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UserDesigner.XRDesignDockManager, DevExpress.XtraReports.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/MultiTool.Form/Positions/Position.vb b/MultiTool.Form/Positions/Position.vb deleted file mode 100644 index fdad65b..0000000 --- a/MultiTool.Form/Positions/Position.vb +++ /dev/null @@ -1,16 +0,0 @@ -Namespace Positions - Public Class Position - Public Property RowNumber As Integer - Public Property EuropeanArticleNumber As String - Public Property ArticleNumber As String - Public Property ArticleNumberVendor As String - Public Property ArticleDescription As String - Public Property EDIPrice As Double - Public Property WinLinePrice As Double - Public Property Price As Double - Public Property Amount As Double - Public Property ReplacementArticleNumber As String - Public Property UseReplacementNumber As Boolean = False - End Class - -End Namespace \ No newline at end of file diff --git a/MultiTool.Form/Positions/PositionColumns.vb b/MultiTool.Form/Positions/PositionColumns.vb deleted file mode 100644 index 9462745..0000000 --- a/MultiTool.Form/Positions/PositionColumns.vb +++ /dev/null @@ -1,76 +0,0 @@ -Imports DevExpress.XtraGrid.Columns - -Namespace Positions - Public Class PositionColumns - Public Shared Property ColumnRowNumber As New GridColumn With { - .FieldName = "RowNumber", - .Caption = "Nr.", - .VisibleIndex = 0, - .MaxWidth = 30 - } - Public Shared Property ColumnArticleNumber As New GridColumn With { - .FieldName = "ArticleNumber", - .Caption = "Artikelnummer", - .VisibleIndex = 1 - } - Public Shared Property ColumnEuropeanArticleNumber As New GridColumn With { - .FieldName = "EuropeanArticleNumber", - .Caption = "EAN", - .VisibleIndex = 2 - } - Public Shared Property ColumnReplacementArticleNumber As New GridColumn With { - .FieldName = "ReplacementArticleNumber", - .Caption = "Ersatzartikel", - .VisibleIndex = 3 - } - Public Shared Property ColumnArticleNumberVendor As New GridColumn With { - .FieldName = "ArticleNumberVendor", - .Caption = "Artikel Lieferant", - .VisibleIndex = 4 - } - Public Shared Property ColumnArticleDescription As New GridColumn With { - .FieldName = "ArticleDescription", - .Caption = "Artikel Beschreibung", - .VisibleIndex = 5 - } - Public Shared Property ColumnAmount As New GridColumn With { - .FieldName = "Amount", - .Caption = "Menge", - .VisibleIndex = 6 - } - Public Shared Property ColumnEDIPrice As New GridColumn With { - .FieldName = "EDIPrice", - .Caption = "Einzelpreis EDI", - .VisibleIndex = 7 - } - Public Shared Property ColumnWinLinePrice As New GridColumn With { - .FieldName = "WinLinePrice", - .Caption = "Einzelpreis WinLine", - .VisibleIndex = 8 - } - Public Shared Property ColumnPrice As New GridColumn With { - .FieldName = "Price", - .Caption = "Einzelpreis", - .VisibleIndex = 9 - } - - ''' - ''' Columns that can be changed in the positions grid - ''' - Public Shared Property WritableColumns As New List(Of GridColumn) From { - ColumnPrice - } - - Public Shared Property AllColumns As New List(Of GridColumn) From { - ColumnRowNumber, - ColumnArticleNumber, - ColumnReplacementArticleNumber, - ColumnArticleNumberVendor, - ColumnEuropeanArticleNumber, - ColumnArticleDescription, - ColumnEDIPrice, - ColumnWinLinePrice, - ColumnPrice - } - End Class -End Namespace diff --git a/MultiTool.Form/Positions/PositionData.vb b/MultiTool.Form/Positions/PositionData.vb deleted file mode 100644 index a55638f..0000000 --- a/MultiTool.Form/Positions/PositionData.vb +++ /dev/null @@ -1,49 +0,0 @@ -Imports DigitalData.Modules.Logging -Imports MultiTool.Form.Positions -Imports MultiTool.Shared.Winline -Imports MultiTool.Shared.Schemas - -Public Class PositionData - Inherits MultiTool.Shared.BaseClass - - Private Winline As Data - - Public Sub New(pLogConfig As LogConfig, pWinline As Data) - MyBase.New(pLogConfig, pLogConfig.GetLogger()) - Winline = pWinline - End Sub - - 'Public Function Load(pMandator As Mandator, pData As Orders.Input.MESOWebService, pDataOriginal As Orders.Input.MESOWebService) As List(Of Position) - ' Dim oPositions = Orders.Helpers.GetOrderPositions(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)(pData) - ' Dim oPositionsOriginal = Orders.Helpers.GetOrderPositions(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)(pDataOriginal) - ' Dim oPositionList As New List(Of Position) - - ' For Each oPosition In oPositions - ' Dim oPositionOriginal = oPositionsOriginal. - ' Where(Function(p) p.Zeilennummer = oPosition.Zeilennummer). - ' SingleOrDefault() - - ' Dim oReplacementNumber As String = Winline.GetReplacementArticleNumber(oPosition.Artikelnummer, pMandator) - - ' ' If ArticleNumber is the same as the replacement Number, this Article does not have a replacement Number - ' If oReplacementNumber = oPosition.Artikelnummer Then - ' oReplacementNumber = Nothing - ' End If - - ' oPositionList.Add(New Position With { - ' .ArticleNumber = oPosition.Artikelnummer, - ' .RowNumber = oPosition.Zeilennummer, - ' .ArticleDescription = oPosition.Bezeichnung, - ' .ArticleNumberVendor = oPosition.Lieferantenartikelnummer, - ' .EDIPrice = oPosition.Einzelpreis, - ' .WinLinePrice = 0, - ' .Price = 0, - ' .Amount = oPosition.Menge_bestellt, - ' .EuropeanArticleNumber = oPositionOriginal.Artikelnummer, - ' .ReplacementArticleNumber = oReplacementNumber - ' }) - ' Next - - ' Return oPositionList - 'End Function -End Class diff --git a/MultiTool.Form/Positions/PositionGrid.vb b/MultiTool.Form/Positions/PositionGrid.vb deleted file mode 100644 index 5f6d1ec..0000000 --- a/MultiTool.Form/Positions/PositionGrid.vb +++ /dev/null @@ -1,44 +0,0 @@ -Imports DevExpress.XtraGrid.Columns -Imports DevExpress.XtraGrid.Views.Grid -Imports MultiTool.Shared.Documents -Imports MultiTool.Form.Positions - -Namespace Positions - Public Class PositionGrid - Public Shared Sub LoadPositionViewAndColumns(pView As GridView, pDocumentType As DocumentType) - Dim oColumns As List(Of GridColumn) - - ' Create columns list depending on DocumentType - Select Case pDocumentType - Case DocumentType.Order - oColumns = PositionColumns.AllColumns - - Case Else - oColumns = New List(Of GridColumn) - End Select - - ' Reset the grid - pView.GridControl.DataSource = Nothing - pView.GridControl.ForceInitialize() - - ' Add and adjust columns - pView.Columns.AddRange(oColumns.ToArray()) - pView.BestFitColumns() - - ' Set columns readonly that need it - Dim oReadOnlyColumns = oColumns. - Except(PositionColumns.WritableColumns). - ToList() - - For Each oColumn As GridColumn In pView.Columns - If oReadOnlyColumns.Contains(oColumn) Then - oColumn.OptionsColumn.ReadOnly = True - oColumn.OptionsColumn.AllowEdit = False - Else - oColumn.Caption &= " *" - End If - Next - End Sub - End Class - -End Namespace \ No newline at end of file diff --git a/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb b/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb new file mode 100644 index 0000000..c8252ad --- /dev/null +++ b/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb @@ -0,0 +1,301 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Class frmImportMainExtra + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Form.frmImportMainExtra", GetType(frmImportMainExtra).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die {0} nicht konfiguriert oder nicht gefunden ähnelt. + ''' + Friend Shared ReadOnly Property _0__nicht_konfiguriert_oder_nicht_gefunden() As String + Get + Return ResourceManager.GetString("{0} nicht konfiguriert oder nicht gefunden", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Aktuelle Datei ähnelt. + ''' + Friend Shared ReadOnly Property Aktuelle_Datei() As String + Get + Return ResourceManager.GetString("Aktuelle Datei", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Ausgabeverzeichnis ähnelt. + ''' + Friend Shared ReadOnly Property Ausgabeverzeichnis() As String + Get + Return ResourceManager.GetString("Ausgabeverzeichnis", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen Mandanten aus, bevor Sie fortfahren! ähnelt. + ''' + Friend Shared ReadOnly Property Bitte_wählen_Sie_einen_Mandanten_aus__bevor_Sie_fortfahren() As String + Get + Return ResourceManager.GetString("Bitte wählen Sie einen Mandanten aus, bevor Sie fortfahren", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Datei erfolgreich in die WinLine übertragen! ähnelt. + ''' + Friend Shared ReadOnly Property Datei_erfolgreich_in_die_WinLine_übertragen() As String + Get + Return ResourceManager.GetString("Datei erfolgreich in die WinLine übertragen", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Die Verbindung zum WinLine Server ist fehlgeschlagen. Bitte prüfen Sie die Konfiguration des Programs und den Zustand des WinLine Servers ähnelt. + ''' + Friend Shared ReadOnly Property Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen() As String + Get + Return ResourceManager.GetString("Die Verbindung zum WinLine Server ist fehlgeschlagen", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Eingangsverzeichnis ähnelt. + ''' + Friend Shared ReadOnly Property Eingangsverzeichnis() As String + Get + Return ResourceManager.GetString("Eingangsverzeichnis", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Es konnte kein passender Mandant anhand der geladenen Daten ermittelt werden. Bitte wählen Sie einen aus der Liste. ähnelt. + ''' + Friend Shared ReadOnly Property Es_konnte_kein_passender_Mandant_ermittelt_werden() As String + Get + Return ResourceManager.GetString("Es konnte kein passender Mandant ermittelt werden", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die In der Funktion '{0}' ist folgender Fehler aufgetreten:{1} ähnelt. + ''' + Friend Shared ReadOnly Property In_der_Funktion___0___ist_folgender_Fehler_aufgetreten__1_() As String + Get + Return ResourceManager.GetString("In der Funktion '{0}' ist folgender Fehler aufgetreten:{1}", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Initialisieren der Anwendungs Daten ähnelt. + ''' + Friend Shared ReadOnly Property Initialisieren_der_Anwendungs_Daten() As String + Get + Return ResourceManager.GetString("Initialisieren der Anwendungs Daten", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Konfigurationsverzeichnis ähnelt. + ''' + Friend Shared ReadOnly Property Konfigurationsverzeichnis() As String + Get + Return ResourceManager.GetString("Konfigurationsverzeichnis", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Lade {0}/Artikel ähnelt. + ''' + Friend Shared ReadOnly Property Lade__0__Artikel() As String + Get + Return ResourceManager.GetString("Lade {0}/Artikel", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Lade {0}/Belegarten ähnelt. + ''' + Friend Shared ReadOnly Property Lade__0__Belegarten() As String + Get + Return ResourceManager.GetString("Lade {0}/Belegarten", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Lade {0}/Konten ähnelt. + ''' + Friend Shared ReadOnly Property Lade__0__Konten() As String + Get + Return ResourceManager.GetString("Lade {0}/Konten", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Lade Oberfläche ähnelt. + ''' + Friend Shared ReadOnly Property Lade_Oberfläche() As String + Get + Return ResourceManager.GetString("Lade Oberfläche", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Lade Vorlagen ähnelt. + ''' + Friend Shared ReadOnly Property Lade_Vorlagen() As String + Get + Return ResourceManager.GetString("Lade Vorlagen", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Laden der Detailzeilen ähnelt. + ''' + Friend Shared ReadOnly Property Laden_der_Detailzeilen() As String + Get + Return ResourceManager.GetString("Laden der Detailzeilen", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Laden der Dokumente ähnelt. + ''' + Friend Shared ReadOnly Property Laden_der_Dokumente() As String + Get + Return ResourceManager.GetString("Laden der Dokumente", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Laden der Winline Daten ähnelt. + ''' + Friend Shared ReadOnly Property Laden_der_Winline_Daten() As String + Get + Return ResourceManager.GetString("Laden der Winline Daten", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Laden des Dokuments ähnelt. + ''' + Friend Shared ReadOnly Property Laden_des_Dokuments() As String + Get + Return ResourceManager.GetString("Laden des Dokuments", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Logverzeichnis ähnelt. + ''' + Friend Shared ReadOnly Property Logverzeichnis() As String + Get + Return ResourceManager.GetString("Logverzeichnis", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Neuladen des Dokuments ähnelt. + ''' + Friend Shared ReadOnly Property Neuladen_des_Dokuments() As String + Get + Return ResourceManager.GetString("Neuladen des Dokuments", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Übertragung zur WinLine ähnelt. + ''' + Friend Shared ReadOnly Property Übertragung_zur_WinLine() As String + Get + Return ResourceManager.GetString("Übertragung zur WinLine", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Vorlagenverzeichnis ähnelt. + ''' + Friend Shared ReadOnly Property Vorlagenverzeichnis() As String + Get + Return ResourceManager.GetString("Vorlagenverzeichnis", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Wollen Sie wirklich die aktuelle Datei mit dem gewählten Mandanten ({0}) neu laden? Alle von Ihnen getätigten Änderungen werden dabei verworfen ähnelt. + ''' + Friend Shared ReadOnly Property Wollen_Sie_wirklich_die_aktuelle_Datei_neu_laden() As String + Get + Return ResourceManager.GetString("Wollen Sie wirklich die aktuelle Datei neu laden", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Zur Zeit werden nur bis zu 4 Tabellen unterstützt! ähnelt. + ''' + Friend Shared ReadOnly Property Zur_Zeit_werden_nur_bis_zu_4_Tabellen_unterstützt_() As String + Get + Return ResourceManager.GetString("Zur Zeit werden nur bis zu 4 Tabellen unterstützt!", resourceCulture) + End Get + End Property + End Class +End Namespace diff --git a/MultiTool.Form/Strings/frmImportMainExtra.resx b/MultiTool.Form/Strings/frmImportMainExtra.resx new file mode 100644 index 0000000..4ccde9a --- /dev/null +++ b/MultiTool.Form/Strings/frmImportMainExtra.resx @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Aktuelle Datei + + + Ausgabeverzeichnis + + + Bitte wählen Sie einen Mandanten aus, bevor Sie fortfahren! + + + Datei erfolgreich in die WinLine übertragen! + + + Die Verbindung zum WinLine Server ist fehlgeschlagen. Bitte prüfen Sie die Konfiguration des Programs und den Zustand des WinLine Servers + + + Eingangsverzeichnis + + + Es konnte kein passender Mandant anhand der geladenen Daten ermittelt werden. Bitte wählen Sie einen aus der Liste. + + + In der Funktion '{0}' ist folgender Fehler aufgetreten:{1} + + + Initialisieren der Anwendungs Daten + + + Konfigurationsverzeichnis + + + Lade Oberfläche + + + Lade Vorlagen + + + Lade {0}/Artikel + + + Lade {0}/Belegarten + + + Lade {0}/Konten + + + Laden der Detailzeilen + + + Laden der Dokumente + + + Laden der Winline Daten + + + Laden des Dokuments + + + Logverzeichnis + + + Neuladen des Dokuments + + + Vorlagenverzeichnis + + + Wollen Sie wirklich die aktuelle Datei mit dem gewählten Mandanten ({0}) neu laden? Alle von Ihnen getätigten Änderungen werden dabei verworfen + + + Zur Zeit werden nur bis zu 4 Tabellen unterstützt! + + + {0} nicht konfiguriert oder nicht gefunden + + + Übertragung zur WinLine + + \ No newline at end of file diff --git a/MultiTool.Form/Strings/frmRowEditorExtra.Designer.vb b/MultiTool.Form/Strings/frmRowEditorExtra.Designer.vb new file mode 100644 index 0000000..45ad633 --- /dev/null +++ b/MultiTool.Form/Strings/frmRowEditorExtra.Designer.vb @@ -0,0 +1,76 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Class frmRowEditorExtra + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Form.frmRowEditorExtra", GetType(frmRowEditorExtra).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Datumswert für '{oField.Key}' enthält einen ungüligen Wert. Bitte benutzen Sie das Format 'YYYY-MM-DD'. ähnelt. + ''' + Friend Shared ReadOnly Property Datumswert_für___0___enthält_einen_ungüligen_Wert() As String + Get + Return ResourceManager.GetString("Datumswert für '{0}' enthält einen ungüligen Wert", resourceCulture) + End Get + End Property + End Class +End Namespace diff --git a/MultiTool.Form/frmImportMain_old.resx b/MultiTool.Form/Strings/frmRowEditorExtra.resx similarity index 76% rename from MultiTool.Form/frmImportMain_old.resx rename to MultiTool.Form/Strings/frmRowEditorExtra.resx index 408cde9..f182d91 100644 --- a/MultiTool.Form/frmImportMain_old.resx +++ b/MultiTool.Form/Strings/frmRowEditorExtra.resx @@ -117,26 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 196, 17 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkNoZWNrQ2lyY2xlZCI+DQogICAgPHBhdGggZD0iTTE2 - LDRDOS40LDQsNCw5LjQsNCwxNmMwLDYuNiw1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyQzI4LDkuNCwy - Mi42LDQsMTYsNHogTTE0LDIybC02LTZsMi0ybDQsNGw4LThsMiwyICAgTDE0LDIyeiIgY2xhc3M9Ikdy - ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L - + + Datumswert für '{oField.Key}' enthält einen ungüligen Wert. Bitte benutzen Sie das Format 'YYYY-MM-DD'. \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index 3e85811..edbe514 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -25,6 +25,15 @@ Partial Class frmImportMain Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmImportMain)) Dim SnapOptions1 As DevExpress.Utils.Controls.SnapOptions = New DevExpress.Utils.Controls.SnapOptions() + Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() + Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() + Me.gridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() + Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.colMandator = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.cmbMandators = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.txtVersion = New DevExpress.XtraBars.BarStaticItem() Me.txtFilesLoaded = New DevExpress.XtraBars.BarStaticItem() @@ -41,6 +50,7 @@ Partial Class frmImportMain Me.btnOpenConfigDirectory = New DevExpress.XtraBars.BarButtonItem() Me.txtCurrentFile = New DevExpress.XtraBars.BarStaticItem() Me.btnConfig = New DevExpress.XtraBars.BarButtonItem() + Me.txtCulture = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -50,40 +60,31 @@ Partial Class frmImportMain Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() + Me.RepositoryItemProgressBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemProgressBar() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() - Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() - Me.gridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() - Me.colMandator = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() - Me.cmbMandators = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() - Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.lookupMandator = New DevExpress.XtraEditors.GridLookUpEdit() Me.GridLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colId = New DevExpress.XtraGrid.Columns.GridColumn() Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() - Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerGrids = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerGrids1 = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerGrids2 = New DevExpress.XtraEditors.SplitContainerControl() Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) - CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl1.SuspendLayout() + Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) + CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerMain.SuspendLayout() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.cmbMandators, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemProgressBar1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanelControl1.SuspendLayout() CType(Me.lookupMandator.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerGrids, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerGrids.SuspendLayout() CType(Me.SplitContainerGrids1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -93,233 +94,42 @@ Partial Class frmImportMain CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'RibbonControl + 'SplitContainerMain ' - Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.BarButtonItem1, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig}) - Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 25 - Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) - Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1}) - Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl.ShowToolbarCustomizeItem = False - Me.RibbonControl.Size = New System.Drawing.Size(1215, 158) - Me.RibbonControl.StatusBar = Me.RibbonStatusBar - Me.RibbonControl.Toolbar.ShowCustomizeItem = False - ' - 'txtVersion - ' - Me.txtVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right - Me.txtVersion.Caption = "Version 1.0.0.0" - Me.txtVersion.Id = 1 - Me.txtVersion.Name = "txtVersion" - Me.txtVersion.Tag = "Version {0}" - ' - 'txtFilesLoaded - ' - Me.txtFilesLoaded.Caption = "0 Dateien geladen" - Me.txtFilesLoaded.Id = 2 - Me.txtFilesLoaded.Name = "txtFilesLoaded" - Me.txtFilesLoaded.Tag = "{0} Dateien geladen" - ' - 'btnLoadFiles - ' - Me.btnLoadFiles.Caption = "Dateien einlesen" - Me.btnLoadFiles.Id = 3 - Me.btnLoadFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.export - Me.btnLoadFiles.Name = "btnLoadFiles" - ' - 'btnTransferFile - ' - Me.btnTransferFile.Caption = "Aktuelle Datei übermitteln" - Me.btnTransferFile.Id = 4 - Me.btnTransferFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send1 - Me.btnTransferFile.Name = "btnTransferFile" - ' - 'btnOpenInputDirectory - ' - Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen" - Me.btnOpenInputDirectory.Id = 6 - Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open22 - Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory" - ' - 'btnOpenOutputDirectory - ' - Me.btnOpenOutputDirectory.Caption = "Ausgangsverzeichnis öffnen" - Me.btnOpenOutputDirectory.Id = 7 - Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.up - Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory" - ' - 'btnOpenSchemaDirectory - ' - Me.btnOpenSchemaDirectory.Caption = "Vorlagenverzeichnis öffnen" - Me.btnOpenSchemaDirectory.Id = 9 - Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open1 - Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory" - ' - 'btnReloadFile - ' - Me.btnReloadFile.Caption = "Aktuelle Datei neu laden" - Me.btnReloadFile.Enabled = False - Me.btnReloadFile.Id = 11 - Me.btnReloadFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.rotatecounterclockwise - Me.btnReloadFile.Name = "btnReloadFile" - ' - 'btnTransferAllFiles - ' - Me.btnTransferAllFiles.Caption = "Ausgewählte Dateien übermitteln" - Me.btnTransferAllFiles.Enabled = False - Me.btnTransferAllFiles.Id = 13 - Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send - Me.btnTransferAllFiles.Name = "btnTransferAllFiles" - ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Belegvorschau für aktuelle Datei anzeigen" - Me.BarButtonItem1.Enabled = False - Me.BarButtonItem1.Id = 14 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'btnShowXml - ' - Me.btnShowXml.Caption = "XML-Datei anzeigen" - Me.btnShowXml.Enabled = False - Me.btnShowXml.Id = 15 - Me.btnShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.togglefieldcodes - Me.btnShowXml.Name = "btnShowXml" - ' - 'btnOpenLogDirectory - ' - Me.btnOpenLogDirectory.Caption = "Logverzeichnis öffnen" - Me.btnOpenLogDirectory.Id = 16 - Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical - Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory" - ' - 'btnOpenConfigDirectory - ' - Me.btnOpenConfigDirectory.Caption = "Konfigurationsverzeichnis öffnen" - Me.btnOpenConfigDirectory.Id = 17 - Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.parameters - Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory" - ' - 'txtCurrentFile - ' - Me.txtCurrentFile.Caption = "Aktuelle Datei: Keine" - Me.txtCurrentFile.Id = 23 - Me.txtCurrentFile.Name = "txtCurrentFile" - Me.txtCurrentFile.Tag = "Aktuelle Datei: {0}" - ' - 'btnConfig - ' - Me.btnConfig.Caption = "Konfiguration" - Me.btnConfig.Id = 24 - Me.btnConfig.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown - Me.btnConfig.Name = "btnConfig" - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "Start" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnLoadFiles) - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnReloadFile) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "Einlesen" - ' - 'RibbonPageGroup4 - ' - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup4.ItemLinks.Add(Me.btnShowXml) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - Me.RibbonPageGroup4.Text = "Auswertung" - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferFile) - Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferAllFiles) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Übermittlung" - ' - 'RibbonPage2 - ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2, Me.RibbonPageGroup6}) - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "Erweitert" - ' - 'RibbonPageGroup5 - ' - Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenInputDirectory) - Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenOutputDirectory) - Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenSchemaDirectory) - Me.RibbonPageGroup5.Name = "RibbonPageGroup5" - Me.RibbonPageGroup5.Text = "Verzeichnisse" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenLogDirectory) - Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenConfigDirectory) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Debugging" - ' - 'RibbonPageGroup6 - ' - Me.RibbonPageGroup6.ItemLinks.Add(Me.btnConfig) - Me.RibbonPageGroup6.Name = "RibbonPageGroup6" - Me.RibbonPageGroup6.Text = "Konfiguration" - ' - 'RepositoryItemComboBox1 - ' - Me.RepositoryItemComboBox1.AutoHeight = False - Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" - ' - 'RibbonStatusBar - ' - Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion) - Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded) - Me.RibbonStatusBar.ItemLinks.Add(Me.txtCurrentFile) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 722) - Me.RibbonStatusBar.Name = "RibbonStatusBar" - Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1215, 24) - ' - 'SplitContainerControl1 - ' - Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Enabled = False - Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158) - Me.SplitContainerControl1.Name = "SplitContainerControl1" - Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControlFiles) - Me.SplitContainerControl1.Panel1.Controls.Add(Me.PanelControl1) - Me.SplitContainerControl1.Panel1.Text = "Panel1" - Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerMain) - Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1215, 564) - Me.SplitContainerControl1.SplitterPosition = 360 - Me.SplitContainerControl1.TabIndex = 2 + resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain") + Me.SplitContainerMain.Name = "SplitContainerMain" + resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") + Me.SplitContainerMain.Panel1.Controls.Add(Me.GridControlFiles) + Me.SplitContainerMain.Panel1.Controls.Add(Me.PanelControl1) + resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") + Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids) + Me.SplitContainerMain.SplitterPosition = 380 ' 'GridControlFiles ' - Me.GridControlFiles.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControlFiles.Location = New System.Drawing.Point(0, 33) + resources.ApplyResources(Me.GridControlFiles, "GridControlFiles") + Me.GridControlFiles.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlFiles.EmbeddedNavigator.AccessibleDescription") + Me.GridControlFiles.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlFiles.EmbeddedNavigator.AccessibleName") + Me.GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean) + Me.GridControlFiles.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles) + Me.GridControlFiles.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image) + Me.GridControlFiles.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout) + Me.GridControlFiles.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode) + Me.GridControlFiles.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.MaximumSize"), System.Drawing.Size) + Me.GridControlFiles.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) + Me.GridControlFiles.EmbeddedNavigator.ToolTip = resources.GetString("GridControlFiles.EmbeddedNavigator.ToolTip") + Me.GridControlFiles.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlFiles.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) + Me.GridControlFiles.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlFiles.EmbeddedNavigator.ToolTipTitle") Me.GridControlFiles.MainView = Me.GridViewFiles Me.GridControlFiles.MenuManager = Me.RibbonControl Me.GridControlFiles.Name = "GridControlFiles" Me.GridControlFiles.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.cmbMandators}) - Me.GridControlFiles.Size = New System.Drawing.Size(360, 531) - Me.GridControlFiles.TabIndex = 0 Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles}) ' 'GridViewFiles ' Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand3}) + resources.ApplyResources(Me.GridViewFiles, "GridViewFiles") Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt}) Me.GridViewFiles.GridControl = Me.GridControlFiles Me.GridViewFiles.Name = "GridViewFiles" @@ -330,19 +140,16 @@ Partial Class frmImportMain ' 'gridBand3 ' - Me.gridBand3.Caption = "gridBand3" + resources.ApplyResources(Me.gridBand3, "gridBand3") Me.gridBand3.Columns.Add(Me.colSelected) - Me.gridBand3.Columns.Add(Me.colMandator) - Me.gridBand3.Columns.Add(Me.colCreatedAt) Me.gridBand3.Columns.Add(Me.colFilename) - Me.gridBand3.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right - Me.gridBand3.Name = "gridBand3" + Me.gridBand3.Columns.Add(Me.colCreatedAt) + Me.gridBand3.Columns.Add(Me.colMandator) Me.gridBand3.VisibleIndex = 0 - Me.gridBand3.Width = 296 ' 'colSelected ' - Me.colSelected.Caption = "Ausgewählt" + resources.ApplyResources(Me.colSelected, "colSelected") Me.colSelected.FieldName = "Selected" Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) @@ -350,78 +157,314 @@ Partial Class frmImportMain Me.colSelected.Name = "colSelected" Me.colSelected.OptionsColumn.FixedWidth = True Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean] - Me.colSelected.Visible = True - Me.colSelected.Width = 27 - ' - 'colMandator - ' - Me.colMandator.Caption = "Mandant" - Me.colMandator.ColumnEdit = Me.cmbMandators - Me.colMandator.FieldName = "MandatorId" - Me.colMandator.Name = "colMandator" - Me.colMandator.Width = 144 - ' - 'cmbMandators - ' - Me.cmbMandators.AutoHeight = False - Me.cmbMandators.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbMandators.Items.AddRange(New Object() {"SIVT"}) - Me.cmbMandators.Name = "cmbMandators" - ' - 'colCreatedAt - ' - Me.colCreatedAt.Caption = "Eingegangen" - Me.colCreatedAt.FieldName = "CreatedAt" - Me.colCreatedAt.Name = "colCreatedAt" - Me.colCreatedAt.OptionsColumn.AllowEdit = False - Me.colCreatedAt.OptionsColumn.ReadOnly = True - Me.colCreatedAt.Visible = True - Me.colCreatedAt.Width = 125 ' 'colFilename ' - Me.colFilename.Caption = "Dateiname" + resources.ApplyResources(Me.colFilename, "colFilename") Me.colFilename.FieldName = "Name" Me.colFilename.Name = "colFilename" Me.colFilename.OptionsColumn.AllowEdit = False Me.colFilename.OptionsColumn.ReadOnly = True - Me.colFilename.RowIndex = 1 - Me.colFilename.Visible = True - Me.colFilename.Width = 296 + ' + 'colCreatedAt + ' + resources.ApplyResources(Me.colCreatedAt, "colCreatedAt") + Me.colCreatedAt.FieldName = "CreatedAt" + Me.colCreatedAt.Name = "colCreatedAt" + Me.colCreatedAt.OptionsColumn.AllowEdit = False + Me.colCreatedAt.OptionsColumn.ReadOnly = True + Me.colCreatedAt.RowIndex = 1 + ' + 'colMandator + ' + resources.ApplyResources(Me.colMandator, "colMandator") + Me.colMandator.ColumnEdit = Me.cmbMandators + Me.colMandator.FieldName = "MandatorId" + Me.colMandator.Name = "colMandator" + Me.colMandator.RowIndex = 2 + ' + 'cmbMandators + ' + resources.ApplyResources(Me.cmbMandators, "cmbMandators") + Me.cmbMandators.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbMandators.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbMandators.Items.AddRange(New Object() {resources.GetString("cmbMandators.Items")}) + Me.cmbMandators.Name = "cmbMandators" + ' + 'RibbonControl + ' + resources.ApplyResources(Me.RibbonControl, "RibbonControl") + Me.RibbonControl.ExpandCollapseItem.Id = 0 + Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer) + Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer) + Me.RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.RibbonControl.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl.ExpandCollapseItem.SearchTags") + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.BarButtonItem1, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture}) + Me.RibbonControl.MaxItemId = 27 + Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) + Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemProgressBar1}) + Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowToolbarCustomizeItem = False + Me.RibbonControl.StatusBar = Me.RibbonStatusBar + Me.RibbonControl.Toolbar.ShowCustomizeItem = False + ' + 'txtVersion + ' + resources.ApplyResources(Me.txtVersion, "txtVersion") + Me.txtVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.txtVersion.Id = 1 + Me.txtVersion.ImageOptions.ImageIndex = CType(resources.GetObject("txtVersion.ImageOptions.ImageIndex"), Integer) + Me.txtVersion.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtVersion.ImageOptions.LargeImageIndex"), Integer) + Me.txtVersion.ImageOptions.SvgImage = CType(resources.GetObject("txtVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtVersion.Name = "txtVersion" + Me.txtVersion.Tag = "Version {0}" + ' + 'txtFilesLoaded + ' + resources.ApplyResources(Me.txtFilesLoaded, "txtFilesLoaded") + Me.txtFilesLoaded.Id = 2 + Me.txtFilesLoaded.ImageOptions.ImageIndex = CType(resources.GetObject("txtFilesLoaded.ImageOptions.ImageIndex"), Integer) + Me.txtFilesLoaded.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtFilesLoaded.ImageOptions.LargeImageIndex"), Integer) + Me.txtFilesLoaded.ImageOptions.SvgImage = CType(resources.GetObject("txtFilesLoaded.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtFilesLoaded.Name = "txtFilesLoaded" + Me.txtFilesLoaded.Tag = "{0} Dateien geladen" + ' + 'btnLoadFiles + ' + resources.ApplyResources(Me.btnLoadFiles, "btnLoadFiles") + Me.btnLoadFiles.Id = 3 + Me.btnLoadFiles.ImageOptions.ImageIndex = CType(resources.GetObject("btnLoadFiles.ImageOptions.ImageIndex"), Integer) + Me.btnLoadFiles.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnLoadFiles.ImageOptions.LargeImageIndex"), Integer) + Me.btnLoadFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.export + Me.btnLoadFiles.Name = "btnLoadFiles" + ' + 'btnTransferFile + ' + resources.ApplyResources(Me.btnTransferFile, "btnTransferFile") + Me.btnTransferFile.Id = 4 + Me.btnTransferFile.ImageOptions.ImageIndex = CType(resources.GetObject("btnTransferFile.ImageOptions.ImageIndex"), Integer) + Me.btnTransferFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnTransferFile.ImageOptions.LargeImageIndex"), Integer) + Me.btnTransferFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send1 + Me.btnTransferFile.Name = "btnTransferFile" + ' + 'btnOpenInputDirectory + ' + resources.ApplyResources(Me.btnOpenInputDirectory, "btnOpenInputDirectory") + Me.btnOpenInputDirectory.Id = 6 + Me.btnOpenInputDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenInputDirectory.ImageOptions.ImageIndex"), Integer) + Me.btnOpenInputDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenInputDirectory.ImageOptions.LargeImageIndex"), Integer) + Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open22 + Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory" + ' + 'btnOpenOutputDirectory + ' + resources.ApplyResources(Me.btnOpenOutputDirectory, "btnOpenOutputDirectory") + Me.btnOpenOutputDirectory.Id = 7 + Me.btnOpenOutputDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenOutputDirectory.ImageOptions.ImageIndex"), Integer) + Me.btnOpenOutputDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenOutputDirectory.ImageOptions.LargeImageIndex"), Integer) + Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.up + Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory" + ' + 'btnOpenSchemaDirectory + ' + resources.ApplyResources(Me.btnOpenSchemaDirectory, "btnOpenSchemaDirectory") + Me.btnOpenSchemaDirectory.Id = 9 + Me.btnOpenSchemaDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenSchemaDirectory.ImageOptions.ImageIndex"), Integer) + Me.btnOpenSchemaDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenSchemaDirectory.ImageOptions.LargeImageIndex"), Integer) + Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open1 + Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory" + ' + 'btnReloadFile + ' + resources.ApplyResources(Me.btnReloadFile, "btnReloadFile") + Me.btnReloadFile.Enabled = False + Me.btnReloadFile.Id = 11 + Me.btnReloadFile.ImageOptions.ImageIndex = CType(resources.GetObject("btnReloadFile.ImageOptions.ImageIndex"), Integer) + Me.btnReloadFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnReloadFile.ImageOptions.LargeImageIndex"), Integer) + Me.btnReloadFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.rotatecounterclockwise + Me.btnReloadFile.Name = "btnReloadFile" + ' + 'btnTransferAllFiles + ' + resources.ApplyResources(Me.btnTransferAllFiles, "btnTransferAllFiles") + Me.btnTransferAllFiles.Enabled = False + Me.btnTransferAllFiles.Id = 13 + Me.btnTransferAllFiles.ImageOptions.ImageIndex = CType(resources.GetObject("btnTransferAllFiles.ImageOptions.ImageIndex"), Integer) + Me.btnTransferAllFiles.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnTransferAllFiles.ImageOptions.LargeImageIndex"), Integer) + Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send + Me.btnTransferAllFiles.Name = "btnTransferAllFiles" + ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Enabled = False + Me.BarButtonItem1.Id = 14 + Me.BarButtonItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.ImageIndex"), Integer) + Me.BarButtonItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImageIndex"), Integer) + Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'btnShowXml + ' + resources.ApplyResources(Me.btnShowXml, "btnShowXml") + Me.btnShowXml.Enabled = False + Me.btnShowXml.Id = 15 + Me.btnShowXml.ImageOptions.ImageIndex = CType(resources.GetObject("btnShowXml.ImageOptions.ImageIndex"), Integer) + Me.btnShowXml.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnShowXml.ImageOptions.LargeImageIndex"), Integer) + Me.btnShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.togglefieldcodes + Me.btnShowXml.Name = "btnShowXml" + ' + 'btnOpenLogDirectory + ' + resources.ApplyResources(Me.btnOpenLogDirectory, "btnOpenLogDirectory") + Me.btnOpenLogDirectory.Id = 16 + Me.btnOpenLogDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.ImageIndex"), Integer) + Me.btnOpenLogDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.LargeImageIndex"), Integer) + Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical + Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory" + ' + 'btnOpenConfigDirectory + ' + resources.ApplyResources(Me.btnOpenConfigDirectory, "btnOpenConfigDirectory") + Me.btnOpenConfigDirectory.Id = 17 + Me.btnOpenConfigDirectory.ImageOptions.ImageIndex = CType(resources.GetObject("btnOpenConfigDirectory.ImageOptions.ImageIndex"), Integer) + Me.btnOpenConfigDirectory.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnOpenConfigDirectory.ImageOptions.LargeImageIndex"), Integer) + Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.parameters + Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory" + ' + 'txtCurrentFile + ' + resources.ApplyResources(Me.txtCurrentFile, "txtCurrentFile") + Me.txtCurrentFile.Id = 23 + Me.txtCurrentFile.ImageOptions.ImageIndex = CType(resources.GetObject("txtCurrentFile.ImageOptions.ImageIndex"), Integer) + Me.txtCurrentFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtCurrentFile.ImageOptions.LargeImageIndex"), Integer) + Me.txtCurrentFile.ImageOptions.SvgImage = CType(resources.GetObject("txtCurrentFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtCurrentFile.Name = "txtCurrentFile" + Me.txtCurrentFile.Tag = "Aktuelle Datei: {0}" + ' + 'btnConfig + ' + resources.ApplyResources(Me.btnConfig, "btnConfig") + Me.btnConfig.Id = 24 + Me.btnConfig.ImageOptions.ImageIndex = CType(resources.GetObject("btnConfig.ImageOptions.ImageIndex"), Integer) + Me.btnConfig.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnConfig.ImageOptions.LargeImageIndex"), Integer) + Me.btnConfig.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown + Me.btnConfig.Name = "btnConfig" + ' + 'txtCulture + ' + resources.ApplyResources(Me.txtCulture, "txtCulture") + Me.txtCulture.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.txtCulture.Id = 26 + Me.txtCulture.ImageOptions.ImageIndex = CType(resources.GetObject("txtCulture.ImageOptions.ImageIndex"), Integer) + Me.txtCulture.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtCulture.ImageOptions.LargeImageIndex"), Integer) + Me.txtCulture.ImageOptions.SvgImage = CType(resources.GetObject("txtCulture.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtCulture.Name = "txtCulture" + Me.txtCulture.Tag = "Culture: {0}" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3}) + Me.RibbonPage1.Name = "RibbonPage1" + resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnLoadFiles) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnReloadFile) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup4.ItemLinks.Add(Me.btnShowXml) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferFile) + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnTransferAllFiles) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2, Me.RibbonPageGroup6}) + Me.RibbonPage2.Name = "RibbonPage2" + resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") + ' + 'RibbonPageGroup5 + ' + Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenInputDirectory) + Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenOutputDirectory) + Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenSchemaDirectory) + Me.RibbonPageGroup5.Name = "RibbonPageGroup5" + resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenLogDirectory) + Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenConfigDirectory) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") + ' + 'RibbonPageGroup6 + ' + Me.RibbonPageGroup6.ItemLinks.Add(Me.btnConfig) + Me.RibbonPageGroup6.Name = "RibbonPageGroup6" + resources.ApplyResources(Me.RibbonPageGroup6, "RibbonPageGroup6") + ' + 'RepositoryItemComboBox1 + ' + resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1") + Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" + ' + 'RepositoryItemProgressBar1 + ' + resources.ApplyResources(Me.RepositoryItemProgressBar1, "RepositoryItemProgressBar1") + Me.RepositoryItemProgressBar1.Name = "RepositoryItemProgressBar1" + Me.RepositoryItemProgressBar1.ShowTitle = True + ' + 'RibbonStatusBar + ' + resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") + Me.RibbonStatusBar.ItemLinks.Add(Me.txtCulture) + Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion) + Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded) + Me.RibbonStatusBar.ItemLinks.Add(Me.txtCurrentFile) + Me.RibbonStatusBar.Name = "RibbonStatusBar" + Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' 'PanelControl1 ' - Me.PanelControl1.AutoSize = True + resources.ApplyResources(Me.PanelControl1, "PanelControl1") Me.PanelControl1.Controls.Add(Me.LabelControl1) Me.PanelControl1.Controls.Add(Me.lookupMandator) - Me.PanelControl1.Dock = System.Windows.Forms.DockStyle.Top - Me.PanelControl1.Location = New System.Drawing.Point(0, 0) Me.PanelControl1.Name = "PanelControl1" - Me.PanelControl1.Size = New System.Drawing.Size(360, 33) - Me.PanelControl1.TabIndex = 2 ' 'LabelControl1 ' - Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) Me.LabelControl1.Appearance.Options.UseFont = True - Me.LabelControl1.Location = New System.Drawing.Point(5, 9) Me.LabelControl1.Name = "LabelControl1" - Me.LabelControl1.Size = New System.Drawing.Size(50, 13) - Me.LabelControl1.TabIndex = 2 - Me.LabelControl1.Text = "Mandant" ' 'lookupMandator ' - Me.lookupMandator.Location = New System.Drawing.Point(75, 6) + resources.ApplyResources(Me.lookupMandator, "lookupMandator") Me.lookupMandator.MenuManager = Me.RibbonControl Me.lookupMandator.Name = "lookupMandator" - Me.lookupMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.lookupMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("lookupMandator.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) Me.lookupMandator.Properties.PopupView = Me.GridLookUpEdit1View - Me.lookupMandator.Size = New System.Drawing.Size(280, 20) - Me.lookupMandator.TabIndex = 1 ' 'GridLookUpEdit1View ' + resources.ApplyResources(Me.GridLookUpEdit1View, "GridLookUpEdit1View") Me.GridLookUpEdit1View.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colId, Me.colName}) Me.GridLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus Me.GridLookUpEdit1View.Name = "GridLookUpEdit1View" @@ -430,99 +473,74 @@ Partial Class frmImportMain ' 'colId ' - Me.colId.Caption = "Id" + resources.ApplyResources(Me.colId, "colId") Me.colId.FieldName = "Id" Me.colId.Name = "colId" - Me.colId.Visible = True - Me.colId.VisibleIndex = 0 ' 'colName ' - Me.colName.Caption = "Name" + resources.ApplyResources(Me.colName, "colName") Me.colName.FieldName = "Name" Me.colName.Name = "colName" - Me.colName.Visible = True - Me.colName.VisibleIndex = 1 - ' - 'SplitContainerMain - ' - Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0) - Me.SplitContainerMain.Name = "SplitContainerMain" - Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerGrids) - Me.SplitContainerMain.Panel1.Text = "Panel1" - Me.SplitContainerMain.Panel2.Text = "Panel2" - Me.SplitContainerMain.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 - Me.SplitContainerMain.Size = New System.Drawing.Size(845, 564) - Me.SplitContainerMain.SplitterPosition = 588 - Me.SplitContainerMain.TabIndex = 1 ' 'SplitContainerGrids ' - Me.SplitContainerGrids.Dock = System.Windows.Forms.DockStyle.Fill + resources.ApplyResources(Me.SplitContainerGrids, "SplitContainerGrids") Me.SplitContainerGrids.Horizontal = False - Me.SplitContainerGrids.Location = New System.Drawing.Point(0, 0) Me.SplitContainerGrids.Name = "SplitContainerGrids" + resources.ApplyResources(Me.SplitContainerGrids.Panel1, "SplitContainerGrids.Panel1") Me.SplitContainerGrids.Panel1.Controls.Add(Me.SplitContainerGrids1) - Me.SplitContainerGrids.Panel1.Text = "Panel1" + resources.ApplyResources(Me.SplitContainerGrids.Panel2, "SplitContainerGrids.Panel2") Me.SplitContainerGrids.Panel2.Controls.Add(Me.SplitContainerGrids2) - Me.SplitContainerGrids.Panel2.Text = "Panel2" - Me.SplitContainerGrids.Size = New System.Drawing.Size(845, 564) Me.SplitContainerGrids.SplitterPosition = 288 - Me.SplitContainerGrids.TabIndex = 0 ' 'SplitContainerGrids1 ' - Me.SplitContainerGrids1.Dock = System.Windows.Forms.DockStyle.Fill + resources.ApplyResources(Me.SplitContainerGrids1, "SplitContainerGrids1") Me.SplitContainerGrids1.Horizontal = False - Me.SplitContainerGrids1.Location = New System.Drawing.Point(0, 0) Me.SplitContainerGrids1.Name = "SplitContainerGrids1" - Me.SplitContainerGrids1.Panel1.Text = "Panel1" - Me.SplitContainerGrids1.Panel2.Text = "Panel2" - Me.SplitContainerGrids1.Size = New System.Drawing.Size(845, 288) + resources.ApplyResources(Me.SplitContainerGrids1.Panel1, "SplitContainerGrids1.Panel1") + resources.ApplyResources(Me.SplitContainerGrids1.Panel2, "SplitContainerGrids1.Panel2") Me.SplitContainerGrids1.SplitterPosition = 118 - Me.SplitContainerGrids1.TabIndex = 0 ' 'SplitContainerGrids2 ' - Me.SplitContainerGrids2.Dock = System.Windows.Forms.DockStyle.Fill + resources.ApplyResources(Me.SplitContainerGrids2, "SplitContainerGrids2") Me.SplitContainerGrids2.Horizontal = False - Me.SplitContainerGrids2.Location = New System.Drawing.Point(0, 0) Me.SplitContainerGrids2.Name = "SplitContainerGrids2" - Me.SplitContainerGrids2.Panel1.Text = "Panel1" - Me.SplitContainerGrids2.Panel2.Text = "Panel2" - Me.SplitContainerGrids2.Size = New System.Drawing.Size(845, 266) + resources.ApplyResources(Me.SplitContainerGrids2.Panel1, "SplitContainerGrids2.Panel1") + resources.ApplyResources(Me.SplitContainerGrids2.Panel2, "SplitContainerGrids2.Panel2") Me.SplitContainerGrids2.SplitterPosition = 126 - Me.SplitContainerGrids2.TabIndex = 0 + ' + 'SplashScreenManager + ' + Me.SplashScreenManager.ClosingDelay = 500 ' 'frmImportMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BehaviorManager.SetBehaviors(Me, New DevExpress.Utils.Behaviors.Behavior() {CType(DevExpress.Utils.Behaviors.Common.SnapWindowBehavior.Create(GetType(DevExpress.Utils.BehaviorSource.SnapWindowBehaviorSourceForForm), SnapOptions1), DevExpress.Utils.Behaviors.Behavior)}) - Me.ClientSize = New System.Drawing.Size(1215, 746) - Me.Controls.Add(Me.SplitContainerControl1) + Me.Controls.Add(Me.SplitContainerMain) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) Me.IconOptions.SvgImage = CType(resources.GetObject("frmImportMain.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmImportMain" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar - Me.Text = "WebService Multitool für WinLine" - CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerMain.ResumeLayout(False) CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.cmbMandators, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemProgressBar1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.PanelControl1.ResumeLayout(False) Me.PanelControl1.PerformLayout() CType(Me.lookupMandator.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerMain.ResumeLayout(False) CType(Me.SplitContainerGrids, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerGrids.ResumeLayout(False) CType(Me.SplitContainerGrids1, System.ComponentModel.ISupportInitialize).EndInit() @@ -539,7 +557,6 @@ Partial Class frmImportMain Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents GridControlFiles As DevExpress.XtraGrid.GridControl Friend WithEvents txtVersion As DevExpress.XtraBars.BarStaticItem Friend WithEvents txtFilesLoaded As DevExpress.XtraBars.BarStaticItem @@ -569,7 +586,6 @@ Partial Class frmImportMain Friend WithEvents colCreatedAt As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn Friend WithEvents colMandator As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn Friend WithEvents colFilename As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn - Friend WithEvents gridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents cmbMandators As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents PanelControl1 As PanelControl Friend WithEvents LabelControl1 As LabelControl @@ -581,4 +597,8 @@ Partial Class frmImportMain Friend WithEvents txtCurrentFile As DevExpress.XtraBars.BarStaticItem Friend WithEvents btnConfig As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents gridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand + Friend WithEvents RepositoryItemProgressBar1 As Repository.RepositoryItemProgressBar + Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager + Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem End Class diff --git a/MultiTool.Form/frmImportMain.en.resx b/MultiTool.Form/frmImportMain.en.resx new file mode 100644 index 0000000..3ccabfc --- /dev/null +++ b/MultiTool.Form/frmImportMain.en.resx @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + + 0, 0 + + + + Center + + + + + + + None + + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHICAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkNoZWNrQ2lyY2xlZCI+DQogICAgPHBhdGggZD0iTTE2 + LDRDOS40LDQsNCw5LjQsNCwxNmMwLDYuNiw1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyQzI4LDkuNCwy + Mi42LDQsMTYsNHogTTE0LDIybC02LTZsMi0ybDQsNGw4LThsMiwyICAgTDE0LDIyeiIgY2xhc3M9Ikdy + ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + -1 + + + -1 + + + + + + + + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + + + + -1 + + + -1 + + + -1 + + + -1 + + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACgDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU3F1YXJpZmll + ZCI+DQogICAgPHJlY3QgeD0iMiIgeT0iMiIgd2lkdGg9IjE4IiBoZWlnaHQ9IjE4IiByeD0iMCIgcnk9 + IjAiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxyZWN0IHg9IjIyIiB5PSIyIiB3aWR0aD0iOCIgaGVpZ2h0 + PSIxOCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHJlY3QgeD0iMiIgeT0iMjIi + IHdpZHRoPSIxOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJl + Y3QgeD0iMjIiIHk9IjIyIiB3aWR0aD0iOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJZ + ZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index b8cbabe..a5caf11 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -117,6 +117,105 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Inherit + + + + 0, 0 + + + SplitContainerGrids.Panel1 + + + BarButtonItem1 + + + + + + $this + + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Fill + + + Vorlagenverzeichnis öffnen + + + Panel1 + + + colName + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 0 + + + RibbonPageGroup5 + + + btnOpenConfigDirectory + + + 0 + + + RibbonPageGroup1 + + + Auswertung + + + SplitContainerGrids2 + + + + 0 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnTransferFile + + + -1 + + + RibbonPageGroup3 + + + btnOpenLogDirectory + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + 825, 266 + + + XML-Datei anzeigen + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + @@ -136,9 +235,523 @@ ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - 17, 17 - + + -1 + + + -1 + + + -1 + + + 27 + + + -1 + + + 280, 20 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + 323 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridLookUpEdit1View + + + 2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 0 + + + + + + WebService Multitool für WinLine + + + RibbonPage2 + + + btnReloadFile + + + colFilename + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + RibbonStatusBar + + + colSelected + + + 825, 288 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + + Combo + + + SIVT + + + LabelControl1 + + + btnOpenSchemaDirectory + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Tahoma, 8.25pt, style=Bold + + + GridControlFiles + + + Mandant + + + 6, 13 + + + Belegvorschau für aktuelle Datei anzeigen + + + Panel2 + + + DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Combo + + + GridViewFiles + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + Top + + + -1 + + + 2 + + + 0 + + + -1 + + + Eingegangen + + + 0, 722 + + + RepositoryItemComboBox1 + + + colCreatedAt + + + SplitContainerMain.Panel2 + + + gridBand3 + + + $this + + + Einlesen + + + Konfiguration + + + -1 + + + Id + + + txtVersion + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + True + + + -1 + + + -1 + + + Ausgangsverzeichnis öffnen + + + 0 + + + colMandator + + + -1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 5, 9 + + + btnShowXml + + + -1 + + + 1215, 24 + + + -1 + + + SplitContainerMain + + + 0 + + + lookupMandator + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 825, 564 + + + gridBand3 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Top, Left + + + Übermittlung + + + Aktuelle Datei neu laden + + + Start + + + btnOpenOutputDirectory + + + + + + SplitContainerMain.Panel1 + + + -1 + + + + + + Fill + + + True + + + 1215, 564 + + + 1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + Ausgewählt + + + -1 + + + -1 + + + Tile + + + DevExpress.Utils.Behaviors.BehaviorManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 1215, 158 + + + Panel1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Aktuelle Datei übermitteln + + + Konfiguration + + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + + + + Dateien einlesen + + + txtFilesLoaded + + + colId + + + 50, 13 + + + + + + btnOpenInputDirectory + + + Combo + + + + + + SplitContainerGrids + + + False + + + True + + + txtCulture + + + Panel1 + + + 296 + + + DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 1 + + + RibbonControl + + + PanelControl1 + + + btnLoadFiles + + + -1 + + + Aktuelle Datei: Keine + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + False + + + Mandant + + + Fill + + + -1 + + + 2 + + + True + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Eingangsverzeichnis öffnen + + + DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplashScreenManager + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + frmImportMain + + + Verzeichnisse + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + 0, 0 + + + 1 + + + SplitContainerGrids1 + + + 380, 531 + + + Culture xx-xx + + + 0, 0 + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Ausgewählte Dateien übermitteln + + + 0 + + + Konfigurationsverzeichnis öffnen + + + -1 + + + Fill + + + True + + + + + + Dateiname + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -160,4 +773,207 @@ ZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 380, 33 + + + 0 + + + + Right + + + + Center + + + -1 + + + -1 + + + btnTransferAllFiles + + + 1 + + + RepositoryItemProgressBar1 + + + RibbonPage1 + + + 2 + + + Logverzeichnis öffnen + + + Name + + + Fill + + + 0, 0 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Erweitert + + + gridBand3 + + + RibbonPageGroup6 + + + PanelControl1 + + + SplitContainerMain.Panel1 + + + Default + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BehaviorManager + + + 0, 33 + + + 125 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel2 + + + 1215, 746 + + + + + + + + + -1 + + + Panel2 + + + 0 Dateien geladen + + + None + + + True + + + SplitContainerGrids.Panel2 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup2 + + + -1 + + + RibbonPageGroup4 + + + cmbMandators + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + -1 + + + 0 + + + Debugging + + + txtCurrentFile + + + -1 + + + Panel1 + + + 75, 6 + + + + + + 0, 0 + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel2 + + + 0 + + + -1 + + + $this + + + btnConfig + + + 144 + + + 0, 158 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Version 1.0.0.0 + + + 0, 0 + + + True + + + 189, 17 + \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 1f094b1..05c73db 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -18,14 +18,13 @@ Imports MultiTool.Shared.Winline Public Class frmImportMain Private LogConfig As LogConfig Private Logger As Logger - Private ConfigManager As ConfigManager(Of MultiTool.Shared.Config) + Private ConfigManager As ConfigManager(Of Config) Private Database As MSSQLServer Private Winline As Data Private FileEx As DigitalData.Modules.Filesystem.File Private WebService As WebService - Private PositionData As PositionData - Private DocumentLoader As Documents.DocumentLoader - Private SchemaLoader As Schemas.SchemaLoader + Private DocumentLoader As DocumentLoader + Private SchemaLoader As SchemaLoader Private Message As Message Private Grids As List(Of GridControl) @@ -71,14 +70,15 @@ Public Class frmImportMain GridBuilder = New GridBuilder(GridViewFiles) GridBuilder.WithDefaults.WithClipboardHandler() + GridViewFiles.OptionsView.ShowAutoFilterRow = False FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) ' If ConnectionString does not exist, show SQL Config Form If ConfigManager.Config.ConnectionString = String.Empty Then Dim oForm As New frmSQLConfig(LogConfig) With { - .FormTitle = "EDI Document Importer" - } + .FormTitle = Application.ProductName + } Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then @@ -92,47 +92,61 @@ Public Class frmImportMain Database = New MSSQLServer(LogConfig, oConnectionString) Winline = New Data(LogConfig, Database, ConfigManager.Config) WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath) - PositionData = New PositionData(LogConfig, Winline) Catch ex As Exception - ShowError(ex, "Initialisieren der Anwendungs Daten") + ShowError(ex, My.Resources.frmImportMainExtra.Initialisieren_der_Anwendungs_Daten) End Try + txtVersion.Caption = String.Format(txtVersion.Tag.ToString, My.Application.Info.Version.ToString) + txtCulture.Caption = String.Format(txtCulture.Tag.ToString, My.Application.UICulture.ToString) + End Sub + + Private Async Sub frmImportMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown + btnLoadFiles.Enabled = False + SplashScreenManager.ShowWaitForm() + ' Load WinLine Data Try Winline.Mandators.Clear() - Winline.LoadMandators() Winline.LoadEconomicYears() - Winline.LoadDocumentKinds(Winline.Mandators) + Await Winline.LoadMandators() ' TODO: Comment in when we finally use the database for additional configuration 'Winline.LoadTemplateConfiguration() For Each oMandator As Mandator In Winline.Mandators - Winline.LoadAccounts(oMandator) + SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Konten, oMandator.Id)) + Await Winline.LoadAccounts(oMandator) + SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Artikel, oMandator.Id)) + Await Winline.LoadArticles(oMandator) + SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Belegarten, oMandator.Id)) + Await Winline.LoadDocumentKinds(oMandator) Next + SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Oberfläche) + lookupMandator.Properties.DataSource = Winline.Mandators lookupMandator.ForceInitialize() lookupMandator.Properties.View.BestFitColumns() - Catch ex As Exception - ShowError(ex, "Laden der WinLine Daten") - End Try - Try DocumentLoader = New DocumentLoader(LogConfig, Winline) SchemaLoader = New SchemaLoader(LogConfig) GridLoader = New GridLoader(LogConfig) + SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Vorlagen) + SchemaLoader.LoadFiles(ConfigManager.Config.SchemaDirectory) CurrentSchemaName = SchemaLoader.SchemaList.First().FullName CurrentSchema = SchemaLoader.GetSchemaFromFile(CurrentSchemaName) Grids = CreateGridsAndColumns(CurrentSchema) Catch ex As Exception - ShowError(ex, "Laden der Vorlagen Daten") + ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten) + Finally + SplashScreenManager.CloseWaitForm() + btnLoadFiles.Enabled = True End Try - txtVersion.Caption = String.Format(txtVersion.Tag.ToString, My.Application.Info.Version.ToString) + End Sub @@ -170,7 +184,7 @@ Public Class frmImportMain End If If oTableCounter > 3 Then - MsgBox("Only 4 Tables are allowed currently!", MsgBoxStyle.Exclamation, Text) + MsgBox(My.Resources.frmImportMainExtra.Zur_Zeit_werden_nur_bis_zu_4_Tabellen_unterstützt_, MsgBoxStyle.Exclamation, Text) End If oTableCounter += 1 @@ -199,53 +213,50 @@ Public Class frmImportMain Where(Function(r) r.Id.ToString = oRow.Item("GUID")). SingleOrDefault() - Dim oAccounts = Winline.Accounts. - Where(Function(a) a.Mandator = CurrentDocument.Mandator.Id). - ToList() - - Dim oForm As New frmRowEditor(oColumns, oDocumentRow, oAccounts) + Dim oForm As New frmRowEditor(oColumns, oDocumentRow, CurrentDocument.Mandator, Winline) If oForm.ShowDialog() = DialogResult.OK Then Dim oModifiedRow = oForm.DocumentRow Dim oIndex = CurrentDocument.Rows.IndexOf(oModifiedRow) - 'Dim oGuid = CurrentDocument.Rows. - ' Where(Function(r) r.Id = oModifiedRow.Id). - ' Select(Function(r) r.Id) CurrentDocument.Rows.Item(oIndex) = oModifiedRow LoadDocument(CurrentDocument) End If Catch ex As Exception - ShowError(ex, "Laden der Detailzeilen") + ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Detailzeilen) End Try End Sub Private Sub btnLoadFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnLoadFiles.ItemClick Try - SplitContainerControl1.Enabled = False + SplitContainerGrids.Enabled = False + If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory, CurrentSchema, lookupMandator.EditValue) Then + GridControlFiles.DataSource = Nothing GridControlFiles.DataSource = DocumentLoader.Files + txtFilesLoaded.Caption = String.Format(txtFilesLoaded.Tag.ToString, DocumentLoader.Files.Count) End If Catch ex As Exceptions.NoMandatorException - MsgBox("Es konnte kein passender Mandant anhand der geladenen Daten ermittelt werden. Bitte wählen Sie einen aus der Liste.", MsgBoxStyle.Information, Text) + MsgBox(My.Resources.frmImportMainExtra.Es_konnte_kein_passender_Mandant_ermittelt_werden, MsgBoxStyle.Information, Text) Catch ex As Exception - ShowError(ex, "Laden der Dokumente") + ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Detailzeilen) Finally - SplitContainerControl1.Enabled = True + SplitContainerGrids.Enabled = True End Try End Sub Private Sub btnReloadFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadFile.ItemClick Dim oCurrentMandator As Mandator = TryCast(lookupMandator.EditValue, Mandator) If oCurrentMandator Is Nothing Then - MsgBox("Bitte wählen Sie einen Mandanten aus, bevor Sie fortfahren!", MsgBoxStyle.Exclamation, Text) + MsgBox(My.Resources.frmImportMainExtra.Bitte_wählen_Sie_einen_Mandanten_aus__bevor_Sie_fortfahren, MsgBoxStyle.Exclamation, Text) Exit Sub End If - Dim oResult As DialogResult = MsgBox($"Wollen Sie wirklich die aktuelle Datei mit dem gewählten Mandanten ({oCurrentMandator.Name}) neu laden? Alle von Ihnen getätigten Änderungen werden dabei verworfen.", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) + Dim oMessage = String.Format(My.Resources.frmImportMainExtra.Wollen_Sie_wirklich_die_aktuelle_Datei_neu_laden, oCurrentMandator) + Dim oResult As DialogResult = MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) Try If oResult = DialogResult.Yes Then @@ -259,10 +270,10 @@ Public Class frmImportMain End If Catch ex As Exceptions.NoMandatorException - MsgBox("Es konnte kein passender Mandant anhand der geladenen Daten ermittelt werden. Bitte wählen Sie einen aus der Liste.", MsgBoxStyle.Information, Text) + MsgBox(My.Resources.frmImportMainExtra.Es_konnte_kein_passender_Mandant_ermittelt_werden, MsgBoxStyle.Information, Text) Catch ex As Exception - ShowError(ex, "Neuladen des Dokuments") + ShowError(ex, My.Resources.frmImportMainExtra.Neuladen_des_Dokuments) End Try End Sub @@ -278,7 +289,7 @@ Public Class frmImportMain lookupMandator.EditValue = oDocument.Mandator LoadDocument(oDocument) Catch ex As Exception - ShowError(ex, "Laden des Dokuments") + ShowError(ex, My.Resources.frmImportMainExtra.Laden_des_Dokuments) End Try End Sub @@ -350,12 +361,12 @@ Public Class frmImportMain Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) Await WebService.TransferDocumentToWinline(oDocument) - MsgBox("Datei erfolgreich in die WinLine übertragen!", MsgBoxStyle.Information, Text) + MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text) Catch ex As HttpRequestException - ShowError(ex, "Übertragung zur WinLine", "Die Verbindung zum WinLine Server ist fehlgeschlagen. Bitte prüfen Sie die Konfiguration des Programs und den Zustand des WinLine Servers") + ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen) Catch ex As Exception - ShowError(ex, "Übertragung zur WinLine") + ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine) Finally SplitContainerGrids.Enabled = True @@ -367,24 +378,24 @@ Public Class frmImportMain End Sub Private Sub btnOpenInputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenInputDirectory.ItemClick - TryOpenDirectory(ConfigManager.Config.InputDirectory, "Eingangsverzeichnis") + TryOpenDirectory(ConfigManager.Config.InputDirectory, My.Resources.frmImportMainExtra.Eingangsverzeichnis) End Sub Private Sub btnOpenOutputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenOutputDirectory.ItemClick Dim oOutputDirectory = Path.Combine(Application.UserAppDataPath, "WebService") - 'Dim oOutputDirectory = IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService") - TryOpenDirectory(oOutputDirectory, "Ausgabeverzeichnis") + TryOpenDirectory(oOutputDirectory, My.Resources.frmImportMainExtra.Ausgabeverzeichnis) End Sub Private Sub btnOpenSchemaDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenSchemaDirectory.ItemClick - TryOpenDirectory(ConfigManager.Config.SchemaDirectory, "Vorlagenverzeichnis") + TryOpenDirectory(ConfigManager.Config.SchemaDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis) End Sub Private Sub TryOpenDirectory(pPath As String, pDisplayName As String) If Directory.Exists(pPath) Then Process.Start(pPath) Else - MsgBox($"{pDisplayName} nicht konfiguriert oder nicht gefunden!", MsgBoxStyle.Exclamation, Text) + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) End If End Sub @@ -392,23 +403,22 @@ Public Class frmImportMain If File.Exists(pPath) Then Process.Start(pPath) Else - MsgBox($"{pDisplayName} nicht konfiguriert oder nicht gefunden!", MsgBoxStyle.Exclamation, Text) + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) End If End Sub - - Private Sub btnOpenLogDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenLogDirectory.ItemClick - TryOpenDirectory(LogConfig.LogDirectory, "Logverzeichnis") + TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis) End Sub Private Sub btnOpenConfigDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenConfigDirectory.ItemClick Dim oUserConfigDirectory = New FileInfo(ConfigManager.UserConfigPath).Directory - TryOpenDirectory(oUserConfigDirectory.FullName, "Konfigurationsverzeichnis") + TryOpenDirectory(oUserConfigDirectory.FullName, My.Resources.frmImportMainExtra.Konfigurationsverzeichnis) End Sub Private Sub ShowError(pException As Exception, pFunction As String, Optional pDetails As String = "") - Dim oMessage = $"In der Funktion '{pFunction}' ist folgender Fehler aufgetreten:{vbNewLine}{vbNewLine}{pException.Message}" + Dim oMessage = String.Format(My.Resources.frmImportMainExtra.In_der_Funktion___0___ist_folgender_Fehler_aufgetreten__1_, pFunction, vbNewLine & vbNewLine & pException.Message) If pDetails <> String.Empty Then oMessage &= $"{vbNewLine}{pDetails}" End If @@ -424,7 +434,7 @@ Public Class frmImportMain Private Sub txtCurrentFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles txtCurrentFile.ItemClick If CurrentDocument IsNot Nothing Then - TryOpenFile(CurrentDocument.FullName, "Aktuelle Datei") + TryOpenFile(CurrentDocument.FullName, My.Resources.frmImportMainExtra.Aktuelle_Datei) End If End Sub @@ -435,4 +445,6 @@ Public Class frmImportMain oForm.ShowDialog() End Sub + + End Class \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain_old.Designer.vb b/MultiTool.Form/frmImportMain_old.Designer.vb deleted file mode 100644 index 2be1136..0000000 --- a/MultiTool.Form/frmImportMain_old.Designer.vb +++ /dev/null @@ -1,1091 +0,0 @@ - -Partial Class frmImportMain_old - Inherits DevExpress.XtraBars.Ribbon.RibbonForm - - 'Form overrides dispose to clean up the component list. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - MyBase.Dispose(disposing) - 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.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmImportMain_old)) - Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) - Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.btnLoadDocuments = New DevExpress.XtraBars.BarButtonItem() - Me.txtFilesLoaded = New DevExpress.XtraBars.BarHeaderItem() - Me.checkShowXml = New DevExpress.XtraBars.BarCheckItem() - Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() - Me.txtVersion = New DevExpress.XtraBars.BarStaticItem() - Me.btnDeletePosition = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() - Me.btnPreviewReport = New DevExpress.XtraBars.BarButtonItem() - Me.btnReportPreview = New DevExpress.XtraBars.BarButtonItem() - Me.btnReloadDocument = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonGroupDataLoading = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonGroupDataTransmission = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonGroupDocument = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonGroupPositions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() - Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colSelected = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colFileName = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colFilePath = New DevExpress.XtraGrid.Columns.GridColumn() - Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() - Me.LayoutControlHead = New DevExpress.XtraLayout.LayoutControl() - Me.txtInfoText = New DevExpress.XtraEditors.MemoEdit() - Me.txtOrderNumber = New DevExpress.XtraEditors.TextEdit() - Me.txtStreetName = New DevExpress.XtraEditors.TextEdit() - Me.txtPlace = New DevExpress.XtraEditors.TextEdit() - Me.txtZIP = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit() - Me.txtRunningNumber = New DevExpress.XtraEditors.TextEdit() - Me.dateOrderDate = New DevExpress.XtraEditors.DateEdit() - Me.cmbMandator = New DevExpress.XtraEditors.SearchLookUpEdit() - Me.SearchLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colId = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() - Me.cmbCustomer = New DevExpress.XtraEditors.SearchLookUpEdit() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.cmbDeliveryAddress = New DevExpress.XtraEditors.SearchLookUpEdit() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.cmbYear = New DevExpress.XtraEditors.ComboBoxEdit() - Me.txtCustomerGLN = New DevExpress.XtraEditors.TextEdit() - Me.txtDeliveryAddressGLN = New DevExpress.XtraEditors.TextEdit() - Me.txtName = New DevExpress.XtraEditors.TextEdit() - Me.cmbDocumentKind = New DevExpress.XtraEditors.ComboBoxEdit() - Me.cmbOrderIssuer = New DevExpress.XtraEditors.SearchLookUpEdit() - Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colContactName = New DevExpress.XtraGrid.Columns.GridColumn() - Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.TabbedControlGroup2 = New DevExpress.XtraLayout.TabbedControlGroup() - Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutItemOrderIssuer = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutItemOrderNumber = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutItemOrderDate = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() - Me.GridControlPositions = New DevExpress.XtraGrid.GridControl() - Me.GridViewPositions = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl() - Me.RichEditXml = New DevExpress.XtraRichEdit.RichEditControl() - Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) - CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl1.SuspendLayout() - CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl2.SuspendLayout() - CType(Me.LayoutControlHead, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControlHead.SuspendLayout() - CType(Me.txtInfoText.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtOrderNumber.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtStreetName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtPlace.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtZIP.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtRunningNumber.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dateOrderDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dateOrderDate.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbMandator.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbCustomer.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbDeliveryAddress.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbOrderIssuer.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutItemOrderIssuer, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutItemOrderNumber, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutItemOrderDate, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControlPositions, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl3.SuspendLayout() - Me.SuspendLayout() - ' - 'RibbonControl - ' - Me.RibbonControl.ApplicationButtonDropDownControl = Me.ApplicationMenu1 - Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnLoadDocuments, Me.txtFilesLoaded, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.checkShowXml, Me.BarButtonItem4, Me.BarButtonItem5, Me.txtVersion, Me.btnDeletePosition, Me.BarButtonItem7, Me.BarButtonItem8, Me.btnPreviewReport, Me.btnReportPreview, Me.btnReloadDocument}) - Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 20 - Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages - Me.RibbonControl.ShowToolbarCustomizeItem = False - Me.RibbonControl.Size = New System.Drawing.Size(1406, 158) - Me.RibbonControl.StatusBar = Me.RibbonStatusBar - Me.RibbonControl.Toolbar.ShowCustomizeItem = False - ' - 'ApplicationMenu1 - ' - Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem8) - Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem3) - Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem1) - Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem2) - Me.ApplicationMenu1.Name = "ApplicationMenu1" - Me.ApplicationMenu1.Ribbon = Me.RibbonControl - ' - 'BarButtonItem8 - ' - Me.BarButtonItem8.Caption = "Logverzeichnis öffnen" - Me.BarButtonItem8.Id = 15 - Me.BarButtonItem8.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.singlepageview - Me.BarButtonItem8.Name = "BarButtonItem8" - ' - 'BarButtonItem3 - ' - Me.BarButtonItem3.Caption = "Konfigurationsverzeichnis öffnen" - Me.BarButtonItem3.Id = 7 - Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.pagesetup - Me.BarButtonItem3.Name = "BarButtonItem3" - ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Eingangsverzeichnis öffnen" - Me.BarButtonItem1.Id = 5 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open2 - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "Ausgangsverzeichnis öffnen" - Me.BarButtonItem2.Id = 6 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'btnLoadDocuments - ' - Me.btnLoadDocuments.Caption = "Dokumente einlesen" - Me.btnLoadDocuments.Id = 1 - Me.btnLoadDocuments.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.import - Me.btnLoadDocuments.Name = "btnLoadDocuments" - ' - 'txtFilesLoaded - ' - Me.txtFilesLoaded.Caption = "Keine Dokumente geladen" - Me.txtFilesLoaded.Id = 3 - Me.txtFilesLoaded.Name = "txtFilesLoaded" - ' - 'checkShowXml - ' - Me.checkShowXml.Caption = "XML Datei anzeigen" - Me.checkShowXml.Id = 9 - Me.checkShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.showallfieldcodes - Me.checkShowXml.Name = "checkShowXml" - ' - 'BarButtonItem4 - ' - Me.BarButtonItem4.Caption = "Aktuelle Zeile übermitteln" - Me.BarButtonItem4.Id = 10 - Me.BarButtonItem4.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_validation - Me.BarButtonItem4.Name = "BarButtonItem4" - ' - 'BarButtonItem5 - ' - Me.BarButtonItem5.Caption = "Markierte Zeilen übermitteln" - Me.BarButtonItem5.Id = 11 - Me.BarButtonItem5.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.itemtypechecked - Me.BarButtonItem5.Name = "BarButtonItem5" - ' - 'txtVersion - ' - Me.txtVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right - Me.txtVersion.Caption = "Version {0}" - Me.txtVersion.Id = 12 - Me.txtVersion.Name = "txtVersion" - ' - 'btnDeletePosition - ' - Me.btnDeletePosition.Caption = "Zeile löschen" - Me.btnDeletePosition.Id = 13 - Me.btnDeletePosition.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.deletetablerows - Me.btnDeletePosition.Name = "btnDeletePosition" - ' - 'BarButtonItem7 - ' - Me.BarButtonItem7.Caption = "Artikel ersetzen" - Me.BarButtonItem7.Id = 14 - Me.BarButtonItem7.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.tableproperties - Me.BarButtonItem7.Name = "BarButtonItem7" - ' - 'btnPreviewReport - ' - Me.btnPreviewReport.Caption = "Belegvorschau für aktuelle Zeile öffnen" - Me.btnPreviewReport.Id = 16 - Me.btnPreviewReport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.preview - Me.btnPreviewReport.Name = "btnPreviewReport" - ' - 'btnReportPreview - ' - Me.btnReportPreview.Caption = "BarButtonItem10" - Me.btnReportPreview.Id = 17 - Me.btnReportPreview.Name = "btnReportPreview" - ' - 'btnReloadDocument - ' - Me.btnReloadDocument.Caption = "Aktuelles Dokument erneut laden" - Me.btnReloadDocument.Enabled = False - Me.btnReloadDocument.Id = 18 - Me.btnReloadDocument.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.paymentrefund - Me.btnReloadDocument.Name = "btnReloadDocument" - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroupDataLoading, Me.RibbonPageGroup2, Me.RibbonGroupDataTransmission, Me.RibbonGroupDocument, Me.RibbonGroupPositions}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "Start" - ' - 'RibbonGroupDataLoading - ' - Me.RibbonGroupDataLoading.ItemLinks.Add(Me.btnLoadDocuments) - Me.RibbonGroupDataLoading.ItemLinks.Add(Me.btnReloadDocument) - Me.RibbonGroupDataLoading.Name = "RibbonGroupDataLoading" - Me.RibbonGroupDataLoading.Text = "Daten laden" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem8) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Konfiguration" - ' - 'RibbonGroupDataTransmission - ' - Me.RibbonGroupDataTransmission.Enabled = False - Me.RibbonGroupDataTransmission.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonGroupDataTransmission.ItemLinks.Add(Me.BarButtonItem5) - Me.RibbonGroupDataTransmission.Name = "RibbonGroupDataTransmission" - Me.RibbonGroupDataTransmission.Text = "Daten übermitteln" - ' - 'RibbonGroupDocument - ' - Me.RibbonGroupDocument.Enabled = False - Me.RibbonGroupDocument.ItemLinks.Add(Me.btnPreviewReport) - Me.RibbonGroupDocument.ItemLinks.Add(Me.checkShowXml) - Me.RibbonGroupDocument.Name = "RibbonGroupDocument" - Me.RibbonGroupDocument.Text = "Beleg" - ' - 'RibbonGroupPositions - ' - Me.RibbonGroupPositions.Enabled = False - Me.RibbonGroupPositions.ItemLinks.Add(Me.btnDeletePosition) - Me.RibbonGroupPositions.ItemLinks.Add(Me.BarButtonItem7) - Me.RibbonGroupPositions.Name = "RibbonGroupPositions" - Me.RibbonGroupPositions.Text = "Belegpositionen" - ' - 'RibbonStatusBar - ' - Me.RibbonStatusBar.ItemLinks.Add(Me.txtFilesLoaded) - Me.RibbonStatusBar.ItemLinks.Add(Me.txtVersion) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 752) - Me.RibbonStatusBar.Name = "RibbonStatusBar" - Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1406, 24) - ' - 'GridControlFiles - ' - Me.GridControlFiles.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControlFiles.Location = New System.Drawing.Point(0, 0) - Me.GridControlFiles.MainView = Me.GridViewFiles - Me.GridControlFiles.MenuManager = Me.RibbonControl - Me.GridControlFiles.Name = "GridControlFiles" - Me.GridControlFiles.Size = New System.Drawing.Size(324, 594) - Me.GridControlFiles.TabIndex = 2 - Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles}) - ' - 'GridViewFiles - ' - Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelected, Me.colFileName, Me.colFilePath}) - Me.GridViewFiles.GridControl = Me.GridControlFiles - Me.GridViewFiles.Name = "GridViewFiles" - ' - 'colSelected - ' - Me.colSelected.FieldName = "Selected" - Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.colSelected.Name = "colSelected" - Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean] - Me.colSelected.Visible = True - Me.colSelected.VisibleIndex = 0 - Me.colSelected.Width = 30 - ' - 'colFileName - ' - Me.colFileName.Caption = "Dateiname" - Me.colFileName.FieldName = "Name" - Me.colFileName.Name = "colFileName" - Me.colFileName.OptionsColumn.AllowEdit = False - Me.colFileName.OptionsColumn.ReadOnly = True - Me.colFileName.Visible = True - Me.colFileName.VisibleIndex = 1 - Me.colFileName.Width = 99 - ' - 'colFilePath - ' - Me.colFilePath.Caption = "Dateipfad" - Me.colFilePath.FieldName = "FullName" - Me.colFilePath.Name = "colFilePath" - Me.colFilePath.OptionsColumn.AllowEdit = False - Me.colFilePath.OptionsColumn.ReadOnly = True - Me.colFilePath.Visible = True - Me.colFilePath.VisibleIndex = 2 - Me.colFilePath.Width = 99 - ' - 'SplitContainerControl1 - ' - Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0) - Me.SplitContainerControl1.Name = "SplitContainerControl1" - Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControlFiles) - Me.SplitContainerControl1.Panel1.Text = "Panel1" - Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) - Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1396, 594) - Me.SplitContainerControl1.SplitterPosition = 324 - Me.SplitContainerControl1.TabIndex = 3 - ' - 'SplitContainerControl2 - ' - Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl2.Horizontal = False - Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0) - Me.SplitContainerControl2.Name = "SplitContainerControl2" - Me.SplitContainerControl2.Panel1.Controls.Add(Me.LayoutControlHead) - Me.SplitContainerControl2.Panel1.Text = "Panel1" - Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControlPositions) - Me.SplitContainerControl2.Panel2.Text = "Panel2" - Me.SplitContainerControl2.Size = New System.Drawing.Size(1062, 594) - Me.SplitContainerControl2.SplitterPosition = 317 - Me.SplitContainerControl2.TabIndex = 0 - ' - 'LayoutControlHead - ' - Me.LayoutControlHead.Controls.Add(Me.txtInfoText) - Me.LayoutControlHead.Controls.Add(Me.txtOrderNumber) - Me.LayoutControlHead.Controls.Add(Me.txtStreetName) - Me.LayoutControlHead.Controls.Add(Me.txtPlace) - Me.LayoutControlHead.Controls.Add(Me.txtZIP) - Me.LayoutControlHead.Controls.Add(Me.TextEdit9) - Me.LayoutControlHead.Controls.Add(Me.txtRunningNumber) - Me.LayoutControlHead.Controls.Add(Me.dateOrderDate) - Me.LayoutControlHead.Controls.Add(Me.cmbMandator) - Me.LayoutControlHead.Controls.Add(Me.cmbCustomer) - Me.LayoutControlHead.Controls.Add(Me.cmbDeliveryAddress) - Me.LayoutControlHead.Controls.Add(Me.cmbYear) - Me.LayoutControlHead.Controls.Add(Me.txtCustomerGLN) - Me.LayoutControlHead.Controls.Add(Me.txtDeliveryAddressGLN) - Me.LayoutControlHead.Controls.Add(Me.txtName) - Me.LayoutControlHead.Controls.Add(Me.cmbDocumentKind) - Me.LayoutControlHead.Controls.Add(Me.cmbOrderIssuer) - Me.LayoutControlHead.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControlHead.Enabled = False - Me.LayoutControlHead.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlHead.Name = "LayoutControlHead" - Me.LayoutControlHead.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 166, 650, 400) - Me.LayoutControlHead.Root = Me.Root - Me.LayoutControlHead.Size = New System.Drawing.Size(1062, 317) - Me.LayoutControlHead.TabIndex = 0 - Me.LayoutControlHead.Text = "LayoutControl1" - ' - 'txtInfoText - ' - Me.txtInfoText.Location = New System.Drawing.Point(123, 200) - Me.txtInfoText.MenuManager = Me.RibbonControl - Me.txtInfoText.Name = "txtInfoText" - Me.txtInfoText.Size = New System.Drawing.Size(912, 90) - Me.txtInfoText.StyleController = Me.LayoutControlHead - Me.txtInfoText.TabIndex = 12 - ' - 'txtOrderNumber - ' - Me.txtOrderNumber.Location = New System.Drawing.Point(631, 170) - Me.txtOrderNumber.MenuManager = Me.RibbonControl - Me.txtOrderNumber.Name = "txtOrderNumber" - Me.txtOrderNumber.Size = New System.Drawing.Size(166, 20) - Me.txtOrderNumber.StyleController = Me.LayoutControlHead - Me.txtOrderNumber.TabIndex = 7 - ' - 'txtStreetName - ' - Me.txtStreetName.Location = New System.Drawing.Point(123, 80) - Me.txtStreetName.MenuManager = Me.RibbonControl - Me.txtStreetName.Name = "txtStreetName" - Me.txtStreetName.Size = New System.Drawing.Size(912, 20) - Me.txtStreetName.StyleController = Me.LayoutControlHead - Me.txtStreetName.TabIndex = 3 - ' - 'txtPlace - ' - Me.txtPlace.Location = New System.Drawing.Point(346, 110) - Me.txtPlace.MenuManager = Me.RibbonControl - Me.txtPlace.Name = "txtPlace" - Me.txtPlace.Size = New System.Drawing.Size(689, 20) - Me.txtPlace.StyleController = Me.LayoutControlHead - Me.txtPlace.TabIndex = 11 - ' - 'txtZIP - ' - Me.txtZIP.Location = New System.Drawing.Point(123, 110) - Me.txtZIP.MenuManager = Me.RibbonControl - Me.txtZIP.Name = "txtZIP" - Me.txtZIP.Size = New System.Drawing.Size(117, 20) - Me.txtZIP.StyleController = Me.LayoutControlHead - Me.txtZIP.TabIndex = 9 - ' - 'TextEdit9 - ' - Me.TextEdit9.Location = New System.Drawing.Point(123, 140) - Me.TextEdit9.MenuManager = Me.RibbonControl - Me.TextEdit9.Name = "TextEdit9" - Me.TextEdit9.Size = New System.Drawing.Size(912, 20) - Me.TextEdit9.StyleController = Me.LayoutControlHead - Me.TextEdit9.TabIndex = 13 - ' - 'txtRunningNumber - ' - Me.txtRunningNumber.Location = New System.Drawing.Point(123, 50) - Me.txtRunningNumber.MenuManager = Me.RibbonControl - Me.txtRunningNumber.Name = "txtRunningNumber" - Me.txtRunningNumber.Properties.ReadOnly = True - Me.txtRunningNumber.Size = New System.Drawing.Size(402, 20) - Me.txtRunningNumber.StyleController = Me.LayoutControlHead - Me.txtRunningNumber.TabIndex = 2 - ' - 'dateOrderDate - ' - Me.dateOrderDate.EditValue = Nothing - Me.dateOrderDate.Location = New System.Drawing.Point(903, 170) - Me.dateOrderDate.MenuManager = Me.RibbonControl - Me.dateOrderDate.Name = "dateOrderDate" - Me.dateOrderDate.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.dateOrderDate.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.dateOrderDate.Size = New System.Drawing.Size(132, 20) - Me.dateOrderDate.StyleController = Me.LayoutControlHead - Me.dateOrderDate.TabIndex = 8 - ' - 'cmbMandator - ' - Me.cmbMandator.Location = New System.Drawing.Point(123, 80) - Me.cmbMandator.MenuManager = Me.RibbonControl - Me.cmbMandator.Name = "cmbMandator" - Me.cmbMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbMandator.Properties.NullText = "" - Me.cmbMandator.Properties.PopupView = Me.SearchLookUpEdit1View - Me.cmbMandator.Size = New System.Drawing.Size(402, 20) - Me.cmbMandator.StyleController = Me.LayoutControlHead - Me.cmbMandator.TabIndex = 4 - ' - 'SearchLookUpEdit1View - ' - Me.SearchLookUpEdit1View.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colId, Me.colName}) - Me.SearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.SearchLookUpEdit1View.Name = "SearchLookUpEdit1View" - Me.SearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = False - Me.SearchLookUpEdit1View.OptionsView.ShowGroupPanel = False - ' - 'colId - ' - Me.colId.Caption = "Kürzel" - Me.colId.FieldName = "Id" - Me.colId.Name = "colId" - Me.colId.Visible = True - Me.colId.VisibleIndex = 0 - ' - 'colName - ' - Me.colName.Caption = "Bezeichnung" - Me.colName.FieldName = "Name" - Me.colName.Name = "colName" - Me.colName.Visible = True - Me.colName.VisibleIndex = 1 - ' - 'cmbCustomer - ' - Me.cmbCustomer.Location = New System.Drawing.Point(123, 110) - Me.cmbCustomer.MenuManager = Me.RibbonControl - Me.cmbCustomer.Name = "cmbCustomer" - Me.cmbCustomer.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbCustomer.Properties.NullText = "" - Me.cmbCustomer.Properties.PopupView = Me.GridView1 - Me.cmbCustomer.Size = New System.Drawing.Size(402, 20) - Me.cmbCustomer.StyleController = Me.LayoutControlHead - Me.cmbCustomer.TabIndex = 10 - ' - 'GridView1 - ' - Me.GridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView1.OptionsView.ShowGroupPanel = False - ' - 'cmbDeliveryAddress - ' - Me.cmbDeliveryAddress.Location = New System.Drawing.Point(123, 140) - Me.cmbDeliveryAddress.MenuManager = Me.RibbonControl - Me.cmbDeliveryAddress.Name = "cmbDeliveryAddress" - Me.cmbDeliveryAddress.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbDeliveryAddress.Properties.NullText = "" - Me.cmbDeliveryAddress.Properties.PopupSizeable = False - Me.cmbDeliveryAddress.Properties.PopupView = Me.GridView2 - Me.cmbDeliveryAddress.Size = New System.Drawing.Size(402, 20) - Me.cmbDeliveryAddress.StyleController = Me.LayoutControlHead - Me.cmbDeliveryAddress.TabIndex = 14 - ' - 'GridView2 - ' - Me.GridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.GridView2.Name = "GridView2" - Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView2.OptionsView.ShowGroupPanel = False - ' - 'cmbYear - ' - Me.cmbYear.Location = New System.Drawing.Point(631, 80) - Me.cmbYear.MenuManager = Me.RibbonControl - Me.cmbYear.Name = "cmbYear" - Me.cmbYear.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbYear.Size = New System.Drawing.Size(404, 20) - Me.cmbYear.StyleController = Me.LayoutControlHead - Me.cmbYear.TabIndex = 15 - ' - 'txtCustomerGLN - ' - Me.txtCustomerGLN.Location = New System.Drawing.Point(631, 110) - Me.txtCustomerGLN.MenuManager = Me.RibbonControl - Me.txtCustomerGLN.Name = "txtCustomerGLN" - Me.txtCustomerGLN.Size = New System.Drawing.Size(404, 20) - Me.txtCustomerGLN.StyleController = Me.LayoutControlHead - Me.txtCustomerGLN.TabIndex = 16 - ' - 'txtDeliveryAddressGLN - ' - Me.txtDeliveryAddressGLN.Location = New System.Drawing.Point(631, 140) - Me.txtDeliveryAddressGLN.MenuManager = Me.RibbonControl - Me.txtDeliveryAddressGLN.Name = "txtDeliveryAddressGLN" - Me.txtDeliveryAddressGLN.Size = New System.Drawing.Size(404, 20) - Me.txtDeliveryAddressGLN.StyleController = Me.LayoutControlHead - Me.txtDeliveryAddressGLN.TabIndex = 17 - ' - 'txtName - ' - Me.txtName.Location = New System.Drawing.Point(123, 50) - Me.txtName.MenuManager = Me.RibbonControl - Me.txtName.Name = "txtName" - Me.txtName.Size = New System.Drawing.Size(912, 20) - Me.txtName.StyleController = Me.LayoutControlHead - Me.txtName.TabIndex = 20 - ' - 'cmbDocumentKind - ' - Me.cmbDocumentKind.Location = New System.Drawing.Point(631, 50) - Me.cmbDocumentKind.MenuManager = Me.RibbonControl - Me.cmbDocumentKind.Name = "cmbDocumentKind" - Me.cmbDocumentKind.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbDocumentKind.Properties.PopupSizeable = True - Me.cmbDocumentKind.Size = New System.Drawing.Size(404, 20) - Me.cmbDocumentKind.StyleController = Me.LayoutControlHead - Me.cmbDocumentKind.TabIndex = 18 - ' - 'cmbOrderIssuer - ' - Me.cmbOrderIssuer.Location = New System.Drawing.Point(123, 170) - Me.cmbOrderIssuer.MenuManager = Me.RibbonControl - Me.cmbOrderIssuer.Name = "cmbOrderIssuer" - Me.cmbOrderIssuer.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbOrderIssuer.Properties.NullText = "" - Me.cmbOrderIssuer.Properties.PopupView = Me.GridView3 - Me.cmbOrderIssuer.Size = New System.Drawing.Size(402, 20) - Me.cmbOrderIssuer.StyleController = Me.LayoutControlHead - Me.cmbOrderIssuer.TabIndex = 6 - ' - 'GridView3 - ' - Me.GridView3.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colContactName}) - Me.GridView3.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.GridView3.Name = "GridView3" - Me.GridView3.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView3.OptionsView.ShowGroupPanel = False - ' - 'colContactName - ' - Me.colContactName.Caption = "Name" - Me.colContactName.FieldName = "Name" - Me.colContactName.Name = "colContactName" - Me.colContactName.Visible = True - Me.colContactName.VisibleIndex = 0 - ' - 'Root - ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.TabbedControlGroup2}) - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(1062, 317) - Me.Root.TextVisible = False - ' - 'TabbedControlGroup2 - ' - Me.TabbedControlGroup2.Location = New System.Drawing.Point(0, 0) - Me.TabbedControlGroup2.Name = "TabbedControlGroup2" - Me.TabbedControlGroup2.SelectedTabPage = Me.LayoutControlGroup2 - Me.TabbedControlGroup2.Size = New System.Drawing.Size(1042, 297) - Me.TabbedControlGroup2.TabPages.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup2, Me.LayoutControlGroup1}) - ' - 'LayoutControlGroup2 - ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutItemOrderIssuer, Me.LayoutItemOrderNumber, Me.LayoutItemOrderDate, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem1, Me.LayoutControlItem4, Me.LayoutControlItemRunningNumber, Me.LayoutControlItem11, Me.LayoutControlItem3}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(1018, 250) - Me.LayoutControlGroup2.Text = "Basisdaten" - ' - 'LayoutControlItem5 - ' - Me.LayoutControlItem5.Control = Me.cmbCustomer - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 60) - Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem5.Size = New System.Drawing.Size(508, 30) - Me.LayoutControlItem5.Text = "Kunde" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem2 - ' - Me.LayoutControlItem2.Control = Me.cmbDeliveryAddress - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 90) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(508, 30) - Me.LayoutControlItem2.Text = "Lieferadresse" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutItemOrderIssuer - ' - Me.LayoutItemOrderIssuer.Control = Me.cmbOrderIssuer - Me.LayoutItemOrderIssuer.Location = New System.Drawing.Point(0, 120) - Me.LayoutItemOrderIssuer.Name = "LayoutItemOrderIssuer" - Me.LayoutItemOrderIssuer.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutItemOrderIssuer.Size = New System.Drawing.Size(508, 30) - Me.LayoutItemOrderIssuer.Text = "Ansprechpartner" - Me.LayoutItemOrderIssuer.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutItemOrderNumber - ' - Me.LayoutItemOrderNumber.Control = Me.txtOrderNumber - Me.LayoutItemOrderNumber.Location = New System.Drawing.Point(508, 120) - Me.LayoutItemOrderNumber.Name = "LayoutItemOrderNumber" - Me.LayoutItemOrderNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutItemOrderNumber.Size = New System.Drawing.Size(272, 30) - Me.LayoutItemOrderNumber.Text = "Bestellnummer" - Me.LayoutItemOrderNumber.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutItemOrderDate - ' - Me.LayoutItemOrderDate.Control = Me.dateOrderDate - Me.LayoutItemOrderDate.Location = New System.Drawing.Point(780, 120) - Me.LayoutItemOrderDate.Name = "LayoutItemOrderDate" - Me.LayoutItemOrderDate.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutItemOrderDate.Size = New System.Drawing.Size(238, 30) - Me.LayoutItemOrderDate.Text = "Bestelldatum" - Me.LayoutItemOrderDate.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem12 - ' - Me.LayoutControlItem12.Control = Me.txtCustomerGLN - Me.LayoutControlItem12.Location = New System.Drawing.Point(508, 60) - Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem12.Size = New System.Drawing.Size(510, 30) - Me.LayoutControlItem12.Text = "Kunde GLN" - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem13 - ' - Me.LayoutControlItem13.Control = Me.txtDeliveryAddressGLN - Me.LayoutControlItem13.Location = New System.Drawing.Point(508, 90) - Me.LayoutControlItem13.Name = "LayoutControlItem13" - Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem13.Size = New System.Drawing.Size(510, 30) - Me.LayoutControlItem13.Text = "Lieferaddresse GLN" - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem1 - ' - Me.LayoutControlItem1.Control = Me.cmbMandator - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 30) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem1.Size = New System.Drawing.Size(508, 30) - Me.LayoutControlItem1.Text = "Mandant" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem4 - ' - Me.LayoutControlItem4.Control = Me.cmbYear - Me.LayoutControlItem4.Location = New System.Drawing.Point(508, 30) - Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem4.Size = New System.Drawing.Size(510, 30) - Me.LayoutControlItem4.Text = "Wirtschaftsjahr" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItemRunningNumber - ' - Me.LayoutControlItemRunningNumber.Control = Me.txtRunningNumber - Me.LayoutControlItemRunningNumber.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItemRunningNumber.Name = "LayoutControlItemRunningNumber" - Me.LayoutControlItemRunningNumber.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItemRunningNumber.Size = New System.Drawing.Size(508, 30) - Me.LayoutControlItemRunningNumber.Text = "Laufnummer" - Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem11 - ' - Me.LayoutControlItem11.Control = Me.cmbDocumentKind - Me.LayoutControlItem11.Location = New System.Drawing.Point(508, 0) - Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem11.Size = New System.Drawing.Size(510, 30) - Me.LayoutControlItem11.Text = "Belegart" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem3 - ' - Me.LayoutControlItem3.Control = Me.txtInfoText - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 150) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(1018, 100) - Me.LayoutControlItem3.Text = "Freitext" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlGroup1 - ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem15}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(1018, 250) - Me.LayoutControlGroup1.Text = "Diverse Adresse" - ' - 'LayoutControlItem10 - ' - Me.LayoutControlItem10.Control = Me.TextEdit9 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 90) - Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem10.Size = New System.Drawing.Size(1018, 160) - Me.LayoutControlItem10.Text = "Kontakt" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem6 - ' - Me.LayoutControlItem6.Control = Me.txtStreetName - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 30) - Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem6.Size = New System.Drawing.Size(1018, 30) - Me.LayoutControlItem6.Text = "Straße" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.txtPlace - Me.LayoutControlItem8.Location = New System.Drawing.Point(223, 60) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(795, 30) - Me.LayoutControlItem8.Text = "Ort" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem9 - ' - Me.LayoutControlItem9.Control = Me.txtZIP - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 60) - Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem9.Size = New System.Drawing.Size(223, 30) - Me.LayoutControlItem9.Text = "PLZ" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem15 - ' - Me.LayoutControlItem15.Control = Me.txtName - Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem15.Size = New System.Drawing.Size(1018, 30) - Me.LayoutControlItem15.Text = "Name" - Me.LayoutControlItem15.TextSize = New System.Drawing.Size(93, 13) - ' - 'GridControlPositions - ' - Me.GridControlPositions.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControlPositions.Enabled = False - Me.GridControlPositions.Location = New System.Drawing.Point(0, 0) - Me.GridControlPositions.MainView = Me.GridViewPositions - Me.GridControlPositions.MenuManager = Me.RibbonControl - Me.GridControlPositions.Name = "GridControlPositions" - Me.GridControlPositions.Size = New System.Drawing.Size(1062, 267) - Me.GridControlPositions.TabIndex = 0 - Me.GridControlPositions.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewPositions}) - ' - 'GridViewPositions - ' - Me.GridViewPositions.GridControl = Me.GridControlPositions - Me.GridViewPositions.Name = "GridViewPositions" - ' - 'SplitContainerControl3 - ' - Me.SplitContainerControl3.Collapsed = True - Me.SplitContainerControl3.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 - Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 158) - Me.SplitContainerControl3.Name = "SplitContainerControl3" - Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1) - Me.SplitContainerControl3.Panel1.Text = "Panel1" - Me.SplitContainerControl3.Panel2.Controls.Add(Me.RichEditXml) - Me.SplitContainerControl3.Panel2.Text = "Panel2" - Me.SplitContainerControl3.Size = New System.Drawing.Size(1406, 594) - Me.SplitContainerControl3.SplitterPosition = 1114 - Me.SplitContainerControl3.TabIndex = 6 - ' - 'RichEditXml - ' - Me.RichEditXml.ActiveViewType = DevExpress.XtraRichEdit.RichEditViewType.Simple - Me.RichEditXml.Dock = System.Windows.Forms.DockStyle.Fill - Me.RichEditXml.LayoutUnit = DevExpress.XtraRichEdit.DocumentLayoutUnit.Pixel - Me.RichEditXml.Location = New System.Drawing.Point(0, 0) - Me.RichEditXml.MenuManager = Me.RibbonControl - Me.RichEditXml.Name = "RichEditXml" - Me.RichEditXml.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - Me.RichEditXml.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - Me.RichEditXml.Size = New System.Drawing.Size(0, 0) - Me.RichEditXml.TabIndex = 0 - ' - 'SplashScreenManager1 - ' - Me.SplashScreenManager1.ClosingDelay = 500 - ' - 'frmImportMain_old - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1406, 776) - Me.Controls.Add(Me.SplitContainerControl3) - Me.Controls.Add(Me.RibbonStatusBar) - Me.Controls.Add(Me.RibbonControl) - Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.tilelabels - Me.Name = "frmImportMain_old" - Me.Ribbon = Me.RibbonControl - Me.StatusBar = Me.RibbonStatusBar - Me.Text = "EDI Dokument Import" - CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl1.ResumeLayout(False) - CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl2.ResumeLayout(False) - CType(Me.LayoutControlHead, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControlHead.ResumeLayout(False) - CType(Me.txtInfoText.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtOrderNumber.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtStreetName.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtPlace.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtZIP.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtRunningNumber.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dateOrderDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dateOrderDate.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbMandator.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbCustomer.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbDeliveryAddress.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtName.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbOrderIssuer.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutItemOrderIssuer, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutItemOrderNumber, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutItemOrderDate, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControlPositions, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl3.ResumeLayout(False) - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonGroupDataLoading As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents GridControlFiles As DevExpress.XtraGrid.GridControl - Friend WithEvents GridViewFiles As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents LayoutControlHead As DevExpress.XtraLayout.LayoutControl - Friend WithEvents txtInfoText As DevExpress.XtraEditors.MemoEdit - Friend WithEvents txtOrderNumber As DevExpress.XtraEditors.TextEdit - Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents GridControlPositions As DevExpress.XtraGrid.GridControl - Friend WithEvents GridViewPositions As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colFilePath As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents txtStreetName As DevExpress.XtraEditors.TextEdit - Friend WithEvents btnLoadDocuments As DevExpress.XtraBars.BarButtonItem - Friend WithEvents txtPlace As DevExpress.XtraEditors.TextEdit - Friend WithEvents txtZIP As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit9 As DevExpress.XtraEditors.TextEdit - Friend WithEvents txtRunningNumber As DevExpress.XtraEditors.TextEdit - Friend WithEvents dateOrderDate As DevExpress.XtraEditors.DateEdit - Friend WithEvents txtFilesLoaded As DevExpress.XtraBars.BarHeaderItem - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents RichEditXml As DevExpress.XtraRichEdit.RichEditControl - Friend WithEvents checkShowXml As DevExpress.XtraBars.BarCheckItem - Friend WithEvents cmbMandator As DevExpress.XtraEditors.SearchLookUpEdit - Friend WithEvents SearchLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents cmbCustomer As DevExpress.XtraEditors.SearchLookUpEdit - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents cmbDeliveryAddress As DevExpress.XtraEditors.SearchLookUpEdit - Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonGroupDataTransmission As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents txtVersion As DevExpress.XtraBars.BarStaticItem - Friend WithEvents btnDeletePosition As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonGroupPositions As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents cmbYear As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents TabbedControlGroup2 As DevExpress.XtraLayout.TabbedControlGroup - Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItemRunningNumber As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutItemOrderIssuer As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutItemOrderNumber As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutItemOrderDate As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents txtCustomerGLN As DevExpress.XtraEditors.TextEdit - Friend WithEvents txtDeliveryAddressGLN As DevExpress.XtraEditors.TextEdit - Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents btnPreviewReport As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonGroupDocument As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents btnReportPreview As DevExpress.XtraBars.BarButtonItem - Friend WithEvents btnReloadDocument As DevExpress.XtraBars.BarButtonItem - Friend WithEvents colId As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents txtName As DevExpress.XtraEditors.TextEdit - Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents cmbDocumentKind As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu - Friend WithEvents cmbOrderIssuer As DevExpress.XtraEditors.SearchLookUpEdit - Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents colContactName As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents SplashScreenManager1 As DevExpress.XtraSplashScreen.SplashScreenManager -End Class diff --git a/MultiTool.Form/frmImportMain_old.vb b/MultiTool.Form/frmImportMain_old.vb deleted file mode 100644 index 104bc90..0000000 --- a/MultiTool.Form/frmImportMain_old.vb +++ /dev/null @@ -1,504 +0,0 @@ -Imports System.IO -Imports DevExpress.XtraGrid.Views.Grid -Imports DevExpress.XtraRichEdit -Imports DevExpress.XtraEditors -Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Database -Imports DigitalData.Modules.Config -Imports DigitalData.Controls.SQLConfig -Imports DigitalData.GUIs.Common -Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.Winline -Imports MultiTool.Form.Positions - -Public Class frmImportMain_old - Public LogConfig As LogConfig - Public Logger As Logger - Public ConfigManager As ConfigManager(Of [Shared].Config) - Public Database As MSSQLServer - Public DocumentLoader As DocumentLoader - Public GridBuilder As GridBuilder - Public PositionData As PositionData - - Public Winline As Data - Public WebService As WebService - - Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Try - txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion) - - LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "EDI Document Importer") - Logger = LogConfig.GetLogger() - Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion) - - ConfigManager = New ConfigManager(Of MultiTool.Shared.Config)(LogConfig, - Application.UserAppDataPath, - Application.CommonAppDataPath, - Application.StartupPath) - - ' If ConnectionString does not exist, show SQL Config Form - If ConfigManager.Config.ConnectionString = String.Empty Then - Dim oForm As New frmSQLConfig(LogConfig) With { - .FormTitle = "EDI Document Importer" - } - Dim oResult = oForm.ShowDialog() - - If oResult = DialogResult.OK Then - ConfigManager.Config.ConnectionString = oForm.ConnectionString - ConfigManager.Save() - End If - End If - - ' Initialize Database - Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) - Database = New MSSQLServer(LogConfig, oConnectionString) - Winline = New Data(LogConfig, Database, ConfigManager.Config) - WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath) - PositionData = New PositionData(LogConfig, Winline) - - ' Load WinLine Data - Winline.Mandators.Clear() - Winline.LoadMandators() - Winline.LoadEconomicYears() - Winline.LoadDocumentKinds(Winline.Mandators) - For Each oMandator In Winline.Mandators - Winline.LoadAccounts(oMandator) - Next - - ' Load data for UI Fields - cmbMandator.Properties.DataSource = Winline.Mandators - - - cmbYear.Properties.Items.AddRange(Winline.Years) - cmbYear.SelectedItem = ConfigManager.Config.GetYear() - - ' Initialize Grids - GridBuilder = New GridBuilder(New List(Of GridView) From {GridViewFiles, GridViewPositions}) - GridBuilder.WithDefaults() - PositionGrid.LoadPositionViewAndColumns(GridViewPositions, DocumentType.Order) - - ' Construct classes related to the xml data - DocumentLoader = New DocumentLoader(LogConfig, Winline) - - - Catch ex As Exception - Logger.Error(ex) - Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden der Anwendung") - MsgBox(oMessage, MsgBoxStyle.Critical, Text) - End Try - End Sub - -#Region "Helpers" - Private Function GetValidationMessage(FieldName As String) As String - Return $"Das Feld '{FieldName}' muss ausgefüllt werden!" - End Function - - Private Function GetErrorMessage(pException As Exception, pErrorText As String) - Return $"{pErrorText}:{vbNewLine}{vbNewLine}{pException.Message}" - End Function - - Private Function GetFocusedDocument() As Document - Dim oRowHandles = GridViewFiles.GetSelectedRows().ToList() - Dim oDocument As Document = GridViewFiles.GetRow(oRowHandles.First()) - Return oDocument - End Function - - Private Function GetFocusedPosition() As Position - Dim oRowHandles = GridViewPositions.GetSelectedRows().ToList() - Dim oPosition As Position = GridViewPositions.GetRow(oRowHandles.First()) - Return oPosition - End Function - - Private Sub TryOpenDirectory(pPath As String, pDisplayName As String) - If Directory.Exists(pPath) Then - Process.Start(pPath) - Else - MsgBox($"{pDisplayName} nicht konfiguriert oder nicht gefunden!", MsgBoxStyle.Exclamation, Text) - End If - End Sub -#End Region - - Private Sub btnLoadDocuments_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnLoadDocuments.ItemClick - Try - If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory, Nothing, Nothing) = True Then - - RibbonGroupDataTransmission.Enabled = True - RibbonGroupDocument.Enabled = True - RibbonGroupPositions.Enabled = True - - LayoutControlHead.Enabled = True - GridControlPositions.Enabled = True - - btnReloadDocument.Enabled = True - - GridControlFiles.DataSource = DocumentLoader.Files - txtFilesLoaded.Caption = $"{DocumentLoader.Files.Count} Dokumente geladen" - End If - Catch ex As Exception - Dim oMessage = ex.Message - - If ex.InnerException IsNot Nothing Then - oMessage &= vbNewLine & vbNewLine & ex.InnerException.Message - End If - - MsgBox(oMessage, MsgBoxStyle.Critical, Text) - End Try - End Sub - - Private Sub GridViewFiles_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridViewFiles.FocusedRowChanged - Dim oDocument As Document = GridViewFiles.GetRow(e.FocusedRowHandle) - - If oDocument Is Nothing Then - Exit Sub - End If - - ShowDocument(oDocument) - End Sub - - Private Sub ShowDocument(pDocument As Document) - ' Load XML File in the sidebar - RichEditXml.LoadDocument(pDocument.FullName, DocumentFormat.PlainText) - - 'If pDocument.Mandator Is Nothing Then - ' Dim oForm As New frmMandatorSelection() With { - ' .Mandators = Winline.Mandators, - ' .SelectedMandator = Nothing - ' } - ' Dim oResult = oForm.ShowDialog() - - ' If oResult <> DialogResult.OK Then - ' Exit Sub - ' End If - - ' pDocument.Mandator = oForm.SelectedMandator - 'End If - - Try - Select Case pDocument.Type - Case DocumentType.Order - MsgBox("TODO") - 'ShowOrderDocument(pDocument) - - End Select - - Catch ex As Xml.XmlException - Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden des Dokuments") - MsgBox(oMessage, MsgBoxStyle.Critical, Text) - Logger.Error(ex) - - Catch ex As Exceptions.NoMandatorException - Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden des Dokuments") - MsgBox(oMessage, MsgBoxStyle.Critical, Text) - Logger.Error(ex) - - Catch ex As Exception - Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden des Dokuments") - MsgBox(oMessage, MsgBoxStyle.Critical, Text) - Logger.Error(ex) - - End Try - End Sub - - 'Private Sub ShowOrderDocument(pDocument As Document) - ' If pDocument.Mandator Is Nothing Then - ' Throw New Exceptions.NoMandatorException("Es konnte kein Mandant gefunden werden") - ' End If - - ' Dim oData As Orders.Input.MESOWebService = DirectCast(pDocument.Data, Orders.Input.MESOWebService) - ' Dim oDataOriginal As Orders.Input.MESOWebService = DirectCast(pDocument.DataOriginal, Orders.Input.MESOWebService) - ' Dim oHead = Orders.Helpers.GetOrderHead(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT025)(oData) - ' Dim oHeadOriginal = Orders.Helpers.GetOrderHead(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT025)(oDataOriginal) - - ' ' --- Head Data -------------------------------------------------------------------------------------- - - ' ' Original, Unreplaced Data - ' txtCustomerGLN.Text = oHeadOriginal.Fakt_Kontonummer - ' txtDeliveryAddressGLN.Text = oHeadOriginal.Lief_Kontonummer - - ' ' Regular Data from EDI - ' txtRunningNumber.Text = oHead.Laufnummer - ' cmbOrderIssuer.Text = oHead.Bestellt_Von - ' txtOrderNumber.Text = oHead.Auftragsreferenz - ' txtInfoText.Text = oHead.Infotext - - ' Try - ' dateOrderDate.EditValue = Date.ParseExact(oHead.Datum_AuftragBestellung, "yyyy-MM-dd", Globalization.CultureInfo.InvariantCulture) - ' Catch ex As Exception - ' dateOrderDate.EditValue = Nothing - ' End Try - - ' ' --- Find Mandator -------------------------------------------------------------------------------------- - - ' Dim oMandator = Winline.Mandators. - ' Where(Function(m) m.Id = pDocument.Mandator). - ' SingleOrDefault() - ' cmbMandator.EditValue = oMandator - - ' ' --- Find DocumentKinds --------------------------------------------------------------------------------- - - ' Dim oMandatorKinds = Winline.DocumentKinds. - ' Where(Function(k) k.Mandator = oMandator.Id). - ' ToList() - ' Dim oSelectedKind = oMandatorKinds. - ' Where(Function(k) k.Id.ToString = oHead.Belegart). - ' SingleOrDefault() - - ' cmbDocumentKind.Properties.Items.Clear() - ' cmbDocumentKind.Properties.Items.AddRange(oMandatorKinds) - - ' If oSelectedKind Is Nothing Then - ' cmbDocumentKind.ErrorText = "Es wurde keine passende Belegart gefunden." - ' cmbDocumentKind.SelectedItem = Nothing - ' Else - ' cmbDocumentKind.SelectedItem = oSelectedKind - ' End If - - ' ' --- Find Accounts -------------------------------------------------------------------------------------- - - ' Dim oMandatorAccounts = Winline.Accounts. - ' Where(Function(a) a.Mandator = oMandator.Id). - ' ToList() - ' cmbCustomer.Properties.DataSource = oMandatorAccounts - ' cmbDeliveryAddress.Properties.DataSource = oMandatorAccounts - - ' ' FAKTURA - - ' If oHead.Fakt_Kontonummer = oHeadOriginal.Fakt_Kontonummer Then - ' cmbCustomer.ErrorText = GetValidationMessage("Faktura Konto") - ' cmbCustomer.EditValue = Nothing - ' Else - ' Dim oMatchingAccounts = oMandatorAccounts. - ' Where(Function(oAccount) oAccount.Id = oHead.Fakt_Kontonummer) - - ' If oMatchingAccounts.Count() > 1 Then - ' cmbCustomer.EditValue = Nothing - ' cmbCustomer.ErrorText = "Für die Kontonummer wurden mehrere Konten gefunden." - ' ElseIf oMatchingAccounts.Count() = 0 Then - ' cmbCustomer.EditValue = Nothing - ' cmbCustomer.ErrorText = "Für die Kontonummer wurde kein Konto gefunden." - ' Else - ' cmbCustomer.EditValue = oMatchingAccounts.SingleOrDefault() - ' End If - ' End If - - ' ' CONTACTS - ' If cmbCustomer.EditValue IsNot Nothing Then - ' Dim oContacts = Winline.GetContacts(oHead.Fakt_Kontonummer, oMandator) - ' cmbOrderIssuer.Properties.DataSource = oContacts - ' End If - - - ' ' DEVLIERY - ' If oHead.Lief_Kontonummer = oHeadOriginal.Lief_Kontonummer Then - ' If oHeadOriginal.Lief_Kontonummer = String.Empty Then - ' txtPlace.EditValue = oHeadOriginal.Lief_Ort - ' txtZIP.EditValue = oHeadOriginal.Lief_PLZ - ' txtStreetName.EditValue = oHeadOriginal.Lief_Strasse - ' txtName.EditValue = oHeadOriginal.Lief_Name - ' Else - ' cmbDeliveryAddress.ErrorText = GetValidationMessage("Lieferanten Konto") - ' cmbDeliveryAddress.EditValue = Nothing - ' End If - ' Else - ' Dim oMatchingAccounts = oMandatorAccounts. - ' Where(Function(oAccount) oAccount.Id = oHead.Lief_Kontonummer) - - ' If oMatchingAccounts.Count() > 1 Then - ' cmbDeliveryAddress.EditValue = Nothing - ' cmbDeliveryAddress.ErrorText = "Für die Kontonummer wurden mehrere Konten gefunden." - ' ElseIf oMatchingAccounts.Count() = 0 Then - ' cmbDeliveryAddress.EditValue = Nothing - ' cmbDeliveryAddress.ErrorText = "Für die Kontonummer wurde kein Konto gefunden." - ' Else - ' cmbDeliveryAddress.EditValue = oMatchingAccounts.SingleOrDefault() - ' End If - ' End If - - ' ' --- Find Positions ------------------------------------------------------------------------------------ - - ' Dim oPositionList = PositionData.Load(oMandator, oData, oDataOriginal) - ' GridControlPositions.DataSource = oPositionList - ' GridViewPositions.BestFitColumns() - 'End Sub - - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - TryOpenDirectory(ConfigManager.Config.InputDirectory, "Eingangsverzeichnis") - End Sub - - Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick - TryOpenDirectory(ConfigManager.Config.OutputDirectory, "Ausgangsverzeichnis") - End Sub - - Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick - Dim oUserConfigDirectory = New FileInfo(ConfigManager.UserConfigPath).Directory - TryOpenDirectory(oUserConfigDirectory.FullName, "Konfigurationsverzeichnis") - End Sub - - Private Sub checkShowXml_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkShowXml.CheckedChanged - SplitContainerControl3.Collapsed = Not checkShowXml.Checked - End Sub - - 'Private Async Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick - ' Dim oMessageText As String = "" - ' Dim oMessageStyle As MsgBoxStyle = MsgBoxStyle.Critical - - ' Dim oDocument As Document = GetFocusedDocument() - ' If oDocument Is Nothing Then - ' Exit Sub - ' End If - - ' SplashScreenManager1.ShowWaitForm() - ' ChangeUIState(False) - - ' Try - ' Dim oFinalDocument As Document = TransferChangesToDocument(oDocument) - ' Dim oResult = Await WebService.TransferDocumentToWinLine(oFinalDocument) - - ' oMessageText = "Beleg wurde erfolgreich übertragen!" - ' oMessageStyle = MsgBoxStyle.Information - - ' Catch ex As Exception - ' Logger.Error(ex) - - ' oMessageText = $"Fehler beim Übertragen des Dokuments:{vbNewLine}{vbNewLine}{ex.Message}" - ' oMessageStyle = MsgBoxStyle.Critical - - ' Finally - ' SplashScreenManager1.CloseWaitForm() - ' ChangeUIState(True) - - ' MsgBox(oMessageText, oMessageStyle, Text) - ' End Try - 'End Sub - - Private Sub ChangeUIState(pEnabled As Boolean) - GridControlPositions.Enabled = pEnabled - GridControlFiles.Enabled = pEnabled - LayoutControlHead.Enabled = pEnabled - - RibbonGroupDataTransmission.Enabled = pEnabled - RibbonGroupDataLoading.Enabled = pEnabled - RibbonGroupDocument.Enabled = pEnabled - RibbonGroupPositions.Enabled = pEnabled - End Sub - - 'Private Function TransferChangesToDocument(pDocument As Document) - ' Dim oData As Orders.Input.MESOWebService = pDocument.Data - - ' Try - ' Orders.Helpers.SetOrderHead(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT025)(oData, AddressOf UpdateOrderHead) - ' Catch ex As Exception - ' Logger.Error(ex) - - ' Throw ex - ' End Try - - ' Return pDocument - 'End Function - - 'Private Function UpdateOrderHead(pObject As Orders.Input.MESOWebServiceEXIMVRG_ordersT025) As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 - ' ' Update DocumentKind - ' If cmbDocumentKind.EditValue IsNot Nothing AndAlso TypeOf cmbDocumentKind.EditValue Is DocumentKind Then - ' pObject.Belegart = DirectCast(cmbDocumentKind.EditValue, DocumentKind).Id - ' End If - - ' ' Update Talking Person lol - ' If cmbOrderIssuer.EditValue IsNot Nothing AndAlso TypeOf cmbOrderIssuer.EditValue Is Contact Then - ' pObject.Bestellt_Von = DirectCast(cmbOrderIssuer.EditValue, Contact).Id - ' End If - - ' ' Update Delivery Address - ' If cmbDeliveryAddress.EditValue IsNot Nothing AndAlso TypeOf cmbDeliveryAddress.EditValue Is Account Then - ' pObject.Lief_Kontonummer = DirectCast(cmbDeliveryAddress.EditValue, Account)?.Id - ' End If - - ' ' Update Order Number - ' If txtOrderNumber.EditValue IsNot Nothing AndAlso txtOrderNumber.EditValue <> String.Empty Then - ' pObject.Auftragsreferenz = txtOrderNumber.EditValue - - ' End If - - ' ' Update Order Date - ' If dateOrderDate IsNot Nothing Then - ' pObject.Datum_AuftragBestellung = DirectCast(dateOrderDate.EditValue, Date).ToString("yyyy-MM-dd") - ' End If - - ' ' Update Extra Address - ' pObject.Lief_Name = txtName.EditValue - ' pObject.Lief_Ort = txtPlace.EditValue - ' pObject.Lief_PLZ = txtZIP.EditValue - ' pObject.Lief_Strasse = txtStreetName.EditValue - - ' Return pObject - 'End Function - - Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick - TryOpenDirectory(LogConfig.LogDirectory, "Logverzeichnis") - End Sub - - Private Sub cmbCustomer_Validating(sender As BaseEdit, e As System.ComponentModel.CancelEventArgs) Handles cmbCustomer.Validating, cmbDocumentKind.Validating, cmbMandator.Validating, cmbYear.Validating - If sender.EditValue Is Nothing Then - sender.ErrorText = "Dieses Feld muss ausgefüllt werden" - Else - sender.ErrorText = "" - End If - End Sub - 'Private Sub btnPreviewReport_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnPreviewReport.ItemClick - ' Dim oDocument As Document = GetFocusedDocument() - ' If oDocument Is Nothing Then - ' Exit Sub - ' End If - - ' Dim oReport As New OrderReport() - ' Dim oDataSource = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource With { - ' .DataSource = New Orders.ReportSource With { - ' .Head = Orders.Helpers.GetOrderHead(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT025)(oDocument.Data), - ' .Positions = Orders.Helpers.GetOrderPositions(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT025)(oDocument.Data) - ' } - ' } - ' oDataSource.Fill() - ' oReport.DataSource = oDataSource - - ' Dim oReportPrintTool As New ReportPrintTool(oReport) - ' oReportPrintTool.ShowPreview() - 'End Sub - - Private Sub btnReloadDocument_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadDocument.ItemClick - Dim oResult = MsgBox("Wenn sie das Dokument neu laden, werden alle manuell geänderten Wert verworfen. Wollen Sie fortfahren?", MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) - - If oResult = MsgBoxResult.Yes Then - Dim oDocument As Document = GetFocusedDocument() - - If oDocument Is Nothing Then - Exit Sub - End If - - ShowDocument(oDocument) - End If - End Sub - - Private Sub btnDeletePosition_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeletePosition.ItemClick - Dim oPosition = GetFocusedPosition() - - If oPosition Is Nothing Then - MsgBox("Bitte wählen Sie eine Position aus!", MsgBoxStyle.Exclamation, Text) - Exit Sub - End If - - Dim oResult = MsgBox($"Wollen Sie die ausgewählte Position Artikel [{oPosition.ArticleNumber}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) - - If oResult = MsgBoxResult.Yes Then - GridViewPositions.DeleteSelectedRows() - MsgBox("Position gelöscht") - End If - End Sub - - Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick - MsgBox("Mach et!") - End Sub - - Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) - Dim oUserConfigDirectory = New FileInfo(ConfigManager.UserConfigPath).Directory - TryOpenDirectory(oUserConfigDirectory.FullName, "Konfigurationsverzeichnis") - End Sub -End Class \ No newline at end of file diff --git a/MultiTool.Form/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb index c1dc841..45e49aa 100644 --- a/MultiTool.Form/frmRowEditor.vb +++ b/MultiTool.Form/frmRowEditor.vb @@ -3,6 +3,7 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraVerticalGrid.Rows Imports MultiTool.Shared.Documents Imports MultiTool.Shared.DocumentRow +Imports MultiTool.Shared Imports DevExpress.XtraEditors.Repository Imports MultiTool.Shared.Winline Imports DigitalData.Modules.Language @@ -14,38 +15,53 @@ Public Class frmRowEditor Private ReadOnly _Columns As List(Of String) Private ReadOnly _DataTable As New DataTable Private ReadOnly _Accounts As List(Of Account) - Private ReadOnly _DocumentRow As MultiTool.Shared.DocumentRow + Private ReadOnly _Articles As List(Of Article) + Private ReadOnly _DocumentKinds As List(Of DocumentKind) + Private ReadOnly _DocumentRow As DocumentRow - Private ReadOnly DatePicker As New RepositoryItemDateEdit Private ReadOnly MultilineEditor As New RepositoryItemMemoEdit Private ReadOnly AccountPicker As New RepositoryItemSearchLookUpEdit - Private ReadOnly MaskDateEditor As New RepositoryItemTextEdit + Private ReadOnly ArticlePicker As New RepositoryItemSearchLookUpEdit + Private ReadOnly DocumentKindPicker As New RepositoryItemSearchLookUpEdit Private ReadOnly ReadOnlyEditor As New RepositoryItemTextEdit + + 'Private ReadOnly MaskDateEditor As New RepositoryItemTextEdit + 'Private ReadOnly DatePicker As New RepositoryItemDateEdit + Private Const COL_KEY = "KEY" Private Const COL_VALUE_ORIGINAL = "VALUE_ORIGINAL" Private Const COL_VALUE_EXTERNAL = "VALUE_EXTERNAL" Private Const COL_VALUE_FINAL = "VALUE_FINAL" - Public ReadOnly Property DocumentRow As MultiTool.Shared.DocumentRow + Public ReadOnly Property DocumentRow As DocumentRow Get Return _DocumentRow End Get End Property - Public Sub New(pColumns As List(Of String), pDocumentRow As MultiTool.Shared.DocumentRow, pAccounts As List(Of Account)) + Public Sub New(pColumns As List(Of String), pDocumentRow As DocumentRow, pMandator As Mandator, pWinline As Data) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. _Columns = pColumns - _Accounts = pAccounts + _Accounts = pWinline.Accounts.Where(Function(a) a.Mandator.Id = pMandator.Id).ToList() + _Articles = pWinline.Articles.Where(Function(a) a.Mandator.Id = pMandator.Id).ToList() + _DocumentKinds = pWinline.DocumentKinds.Where(Function(k) k.Mandator.Id = pMandator.Id).ToList() _DocumentRow = pDocumentRow AccountPicker.DataSource = _Accounts AccountPicker.DisplayMember = "Name" AccountPicker.ValueMember = "Id" + ArticlePicker.DataSource = _Articles + ArticlePicker.DisplayMember = "Description" + ArticlePicker.ValueMember = "Id" + + DocumentKindPicker.DataSource = _DocumentKinds + DocumentKindPicker.ValueMember = "Id" + DocumentKindPicker.DisplayMember = "Name" + ReadOnlyEditor.ReadOnly = True 'DatePicker.CalendarTimeEditing = DevExpress.Utils.DefaultBoolean.False @@ -66,10 +82,7 @@ Public Class frmRowEditor End Sub Private Sub DatePicker_ParseEditValue(sender As Object, e As ConvertEditValueEventArgs) - If TypeOf sender Is RepositoryItemDateEdit Then - - Debug.WriteLine($"RepoItem # {e.Value} # {e.Value.GetType.Name}") ElseIf TypeOf sender Is DateEdit Then Debug.WriteLine($"DateEdit # {e.Value} # {e.Value.GetType.Name}") @@ -122,7 +135,7 @@ Public Class frmRowEditor If oField.Key = "Datum_Auftrag-Bestellung" And oGridValue.Length > 0 Then If TryParseDate(oGridValue) Is Nothing Then - MsgBox($"Datumswert für '{oField.Key}' enthält einen ungüligen Wert. Bitte benutzen Sie das Format 'YYYY-MM-DD'.", MsgBoxStyle.Exclamation, Text) + MsgBox(String.Format(My.Resources.frmRowEditorExtra.Datumswert_für___0___enthält_einen_ungüligen_Wert, oField.Key), MsgBoxStyle.Exclamation, Text) Exit Sub End If End If @@ -175,13 +188,8 @@ Public Class frmRowEditor Dim oDataRow As DataRow = GridView1.GetDataRow(e.RowHandle) If e.Column.FieldName = COL_VALUE_ORIGINAL Or e.Column.FieldName = COL_VALUE_FINAL Then - If oDataRow.Item(COL_KEY) = "Datum_Auftrag-Bestellung" Then - 'e.RepositoryItem = DatePicker - 'e.RepositoryItem = MaskDateEditor - ElseIf e.CellValue.ToString.Length > 100 Then + If e.CellValue.ToString.Length > 100 Then e.RepositoryItem = MultilineEditor - ElseIf oDataRow.Item(COL_KEY) = "Fakt_Kontonummer" Or oDataRow.Item(COL_KEY) = "Lief_Kontonummer" Then - e.RepositoryItem = AccountPicker End If End If @@ -192,6 +200,20 @@ Public Class frmRowEditor If oReadOnlyFields.Contains(oDataRow.Item(COL_KEY)) Then e.RepositoryItem = ReadOnlyEditor + + ElseIf oDataRow.Item(COL_KEY) = "Datum_Auftrag-Bestellung" Then + 'e.RepositoryItem = DatePicker + 'e.RepositoryItem = MaskDateEditor + + ElseIf e.CellValue.ToString.Length > 30 Then + + e.RepositoryItem = MultilineEditor + ElseIf oDataRow.Item(COL_KEY) = "Fakt_Kontonummer" Or oDataRow.Item(COL_KEY) = "Lief_Kontonummer" Then + e.RepositoryItem = AccountPicker + ElseIf oDataRow.Item(COL_KEY) = "Artikelnummer" Then + e.RepositoryItem = ArticlePicker + ElseIf oDataRow.Item(COL_KEY) = "Belegart" Then + e.RepositoryItem = DocumentKindPicker End If End If diff --git a/MultiTool.Form/packages.config b/MultiTool.Form/packages.config index 30c87d1..63f3075 100644 --- a/MultiTool.Form/packages.config +++ b/MultiTool.Form/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/MultiTool.Shared/Mapper.vb b/MultiTool.Shared/Mapper.vb deleted file mode 100644 index ec2dda0..0000000 --- a/MultiTool.Shared/Mapper.vb +++ /dev/null @@ -1,47 +0,0 @@ -Imports System.Globalization -Imports AutoMapper -Imports AutoMapper.Configuration - -Public Class MapperFactory - Private Shared MapperConfig As Object - - 'Public Shared Function GetMapper() As Mapper - ' MapperConfig = New MapperConfiguration(CreateMapperConfig()) - ' MapperConfig.AssertConfigurationIsValid() - ' Return MapperConfig.CreateMapper() - 'End Function - - 'Private Shared Function CreateMapperConfig() As MapperConfigurationExpression - ' Dim oConfig As New MapperConfigurationExpression() - - ' oConfig.CreateMap(Of String, Integer)().ConvertUsing(New IntegerTypeConverter()) - ' oConfig.CreateMap(Of String, Decimal)().ConvertUsing(New DecimalTypeConverter()) - ' oConfig.CreateMap(Of String, DateTime)().ConvertUsing(New DateTimeTypeConverter()) - ' oConfig.CreateMap(Of Schemas.Orders.Input.MESOWebService, Schemas.Orders.Output.MESOWebService)() - ' oConfig.CreateMap(Of Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT025, Schemas.Orders.Output.MESOWebServiceEXIMVRG_ordersT025)() - ' oConfig.CreateMap(Of Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT026, Schemas.Orders.Output.MESOWebServiceEXIMVRG_ordersT026)() - - ' Return oConfig - 'End Function - - Private Class DateTimeTypeConverter - Implements ITypeConverter(Of String, DateTime) - - Public Function Convert(source As String, destination As Date, context As ResolutionContext) As Date Implements ITypeConverter(Of String, Date).Convert - Return System.Convert.ToDateTime(source) - End Function - End Class - Private Class IntegerTypeConverter - Implements ITypeConverter(Of String, Integer) - Public Function Convert(source As String, destination As Integer, context As ResolutionContext) As Integer Implements ITypeConverter(Of String, Integer).Convert - Return System.Convert.ToInt32(source) - End Function - End Class - Private Class DecimalTypeConverter - Implements ITypeConverter(Of String, Decimal) - Public Function Convert(source As String, destination As Decimal, context As ResolutionContext) As Decimal Implements ITypeConverter(Of String, Decimal).Convert - Return System.Convert.ToDecimal(source, CultureInfo.InvariantCulture) - End Function - End Class - -End Class diff --git a/MultiTool.Shared/MultiTool.Shared.vbproj b/MultiTool.Shared/MultiTool.Shared.vbproj index 45e17cf..0a3578a 100644 --- a/MultiTool.Shared/MultiTool.Shared.vbproj +++ b/MultiTool.Shared/MultiTool.Shared.vbproj @@ -44,9 +44,6 @@ On - - ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll - ..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll @@ -119,7 +116,6 @@ Settings.settings True - @@ -132,6 +128,7 @@ + diff --git a/MultiTool.Shared/Schemas/SchemaLoader.vb b/MultiTool.Shared/Schemas/SchemaLoader.vb index e5bd601..8b3a6f7 100644 --- a/MultiTool.Shared/Schemas/SchemaLoader.vb +++ b/MultiTool.Shared/Schemas/SchemaLoader.vb @@ -7,7 +7,7 @@ Namespace Schemas Public Class SchemaLoader Inherits BaseClass - Private ns As XNamespace = "http://www.w3.org/2001/XMLSchema" + Private ReadOnly ns As XNamespace = "http://www.w3.org/2001/XMLSchema" Public SchemaList As List(Of FileInfo) diff --git a/MultiTool.Shared/Winline/Data.vb b/MultiTool.Shared/Winline/Data.vb index 1377d45..aae2b02 100644 --- a/MultiTool.Shared/Winline/Data.vb +++ b/MultiTool.Shared/Winline/Data.vb @@ -12,9 +12,11 @@ Namespace Winline Private ReadOnly Database As MSSQLServer Private ReadOnly Config As Config + Public Articles As New List(Of Article) Public Accounts As New List(Of Account) Public Mandators As New List(Of Mandator) Public DocumentKinds As New List(Of DocumentKind) + Public Years As List(Of Integer) Public TemplateConfiguration As New List(Of TemplateColumn) @@ -23,14 +25,18 @@ Namespace Winline Public Const ALL_MESOCOMP = "mesocomp" - Public Const V21_ARTICLENUMBER = "c011" + Public Const V21_ARTICLENUMBER = "c002" + Public Const V21_ARTICLEDESCRIPTION = "c003" + Public Const V21_MAINARTICLENUMBER = "c011" Public Const V21_REPLACEMENTARTICLENUMBER = "c123" + Public Const V21_EAN = "c075" Public Const V50_ACCOUNTNUMBER = "c002" Public Const V50_ACCOUNTNAME = "c003" Public Const V50_STREETNAME = "c050" Public Const V50_ZIPCODE = "c051" Public Const V50_CITYNAME = "c052" + Public Const V50_GLN = "c260" Public Const T45_KEY = "c000" Public Const T45_NAME = "c001" @@ -62,7 +68,46 @@ Namespace Winline Return GetWinLineYear(Config.GetYear) End Function - Public Sub LoadAccounts(pMandator As Mandator) + Public Async Function LoadArticles(pMandator As Mandator) As Task + Logger.Info("Loading Articles for Mandator [{0}]", pMandator) + Dim oYear = GetWinLineYear() + + Try + Dim oSQL = $" + SELECT DISTINCT + [c002], -- Artikelnummer + [c003], -- Bezeichnung + [c075] -- EAN + FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v021] + WHERE + mesocomp = '{pMandator.Id}' + AND mesoyear = {oYear}" + + Dim oTable = Await Database.GetDatatableAsync(oSQL) + Dim oArticles As New List(Of Article) + + For Each oRow As DataRow In oTable.Rows + Dim oArticleId As String = Utils.NotNull(oRow.Item(V21_ARTICLENUMBER), String.Empty) + Dim oArticleDescription As String = Utils.NotNull(oRow.Item(V21_ARTICLEDESCRIPTION), String.Empty) + Dim oEAN As String = Utils.NotNull(oRow.Item(V21_EAN), String.Empty) + + oArticles.Add(New Article With { + .Id = oArticleId, + .Name = oArticleDescription, + .EAN = oEAN, + .Mandator = pMandator + }) + Next + Articles.AddRange(oArticles) + + Logger.Info("[{0}] Articles loaded for Mandator [{1}]", oArticles.Count, pMandator) + Catch ex As Exception + Logger.Warn("Could not load Articles for Mandator [{0}]", pMandator) + Logger.Error(ex) + End Try + End Function + + Public Async Function LoadAccounts(pMandator As Mandator) As Task Logger.Info("Loading Accounts for Mandator [{0}]", pMandator) Dim oYear = GetWinLineYear() @@ -73,13 +118,14 @@ Namespace Winline [c003], -- Kundenname [c050], -- Straße [c052], -- Ort - [c051] -- PLZ + [c051], -- PLZ + [c260] -- GLN FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v050] WHERE c139 IS NULL AND mesocomp = '{pMandator.Id}' AND mesoyear = {oYear}" - Dim oTable = Database.GetDatatable(oSQL) + Dim oTable = Await Database.GetDatatableAsync(oSQL) Dim oAccounts As New List(Of Account) For Each oRow As DataRow In oTable.Rows @@ -88,6 +134,7 @@ Namespace Winline Dim oStreetName As String = Utils.NotNull(oRow.Item(V50_STREETNAME), String.Empty) Dim oZipCode As String = Utils.NotNull(oRow.Item(V50_ZIPCODE), String.Empty) Dim oCityName As String = Utils.NotNull(oRow.Item(V50_CITYNAME), String.Empty) + Dim oGLN As String = Utils.NotNull(oRow.Item(V50_GLN), String.Empty) oAccounts.Add(New Account With { .Id = oAccountNumber, @@ -95,7 +142,8 @@ Namespace Winline .StreetName = oStreetName, .ZipCode = oZipCode, .CityName = oCityName, - .Mandator = pMandator.Id + .GLN = oGLN, + .Mandator = pMandator }) Next Accounts.AddRange(oAccounts) @@ -105,12 +153,12 @@ Namespace Winline Logger.Warn("Could not load Accounts for Mandator [{0}]", pMandator) Logger.Error(ex) End Try - End Sub + End Function - Public Sub LoadMandators() + Public Async Function LoadMandators() As Task Try Dim oSQL = "SELECT [c000], [c003], [c004] FROM [cwlsystem].[dbo].[T001SRV] (NOLOCK)" - Dim oTable = Database.GetDatatable(oSQL) + Dim oTable = Await Database.GetDatatableAsync(oSQL) Mandators.Clear() For Each oRow As DataRow In oTable.Rows @@ -123,8 +171,8 @@ Namespace Winline } Dim oMandatorConfig As Config.MandatorConfig = Config.Mandators. - Where(Function(m) oMandator.Id = m.Name). - SingleOrDefault() + Where(Function(m) oMandator.Id = m.Name). + SingleOrDefault() If oMandatorConfig IsNot Nothing Then oMandator.IsWhitelisted = True @@ -141,7 +189,7 @@ Namespace Winline Logger.Warn("Could not load Mandators") Logger.Error(ex) End Try - End Sub + End Function Public Sub LoadEconomicYears() Dim oCurrentYear = Now.Year @@ -149,50 +197,41 @@ Namespace Winline Years = oRange End Sub - Public Sub LoadDocumentKinds(pMandators As List(Of Mandator)) - Dim oDocumentKinds As New List(Of DocumentKind) - Dim oMandatorString = String.Join(",", pMandators.Select(Function(m) $"'{m.Id}'").ToArray) + Public Async Function LoadDocumentKinds(pMandator As Mandator) As Task Dim oYear As Integer = GetWinLineYear() - DocumentKinds.Clear() - For Each oMandator As Mandator In pMandators - Try - ' TODO: This is Schaum specific, maybe move to config later - Dim oSQL = $" + Try + ' TODO: This is Schaum specific, maybe move to config later + Dim oSQL = $" SELECT [c030], [c001], [mesocomp] - FROM [{oMandator.Database}].[dbo].[t357] (NOLOCK) + FROM [{pMandator.Database}].[dbo].[t357] (NOLOCK) WHERE ( [c001] LIKE 'Werk%(VK)' OR [c001] LIKE 'Werk%(WK)' ) - AND [mesocomp] = '{oMandator.Id}' AND [mesoyear] = {oYear}" - Dim oTable As DataTable = Database.GetDatatable(oSQL) + AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}" + Dim oTable As DataTable = Await Database.GetDatatableAsync(oSQL) + Dim oKinds As New List(Of DocumentKind) - If oTable.Rows.Count = 0 Then - Logger.Debug("No DocumentKinds found for Mandator [{0}]", oMandator.Id) - Continue For - End If + For Each oRow As DataRow In oTable.Rows + oKinds.Add(New DocumentKind With { + .Id = oRow.Item(T357_KINDID), + .Name = oRow.Item(T357_KINDNAME), + .Mandator = pMandator + }) + Next - For Each oRow As DataRow In oTable.Rows - oDocumentKinds.Add(New DocumentKind With { - .Id = oRow.Item(T357_KINDID), - .Name = oRow.Item(T357_KINDNAME), - .Mandator = oRow.Item(ALL_MESOCOMP) - }) - Next + DocumentKinds.AddRange(oKinds) - Catch ex As Exception - Logger.Warn("Could not load DocumentKinds") - Logger.Error(ex) - End Try - Next - - DocumentKinds = oDocumentKinds.ToList() - - End Sub + Logger.Info("[{0}] DocumentKinds loaded for [{1}]", Mandators.Count, pMandator) + Catch ex As Exception + Logger.Warn("Could not load DocumentKinds") + Logger.Error(ex) + End Try + End Function Public Function TryGetAccount(pGLN As String, pMandator As Mandator) As Account Try @@ -241,7 +280,7 @@ Namespace Winline .StreetName = oStreetName, .CityName = oCityName, .ZipCode = oZipCode, - .Mandator = pMandator.Id + .Mandator = pMandator } Catch ex As Exception Logger.Warn("Error while trying to get account for GLN [{0}]", pGLN) @@ -279,7 +318,7 @@ Namespace Winline End If Dim oRow As DataRow = oTable.Rows.Item(0) - Dim oArticleNumber As String = Utils.NotNull(oRow.Item(V21_ARTICLENUMBER), String.Empty) + Dim oArticleNumber As String = Utils.NotNull(oRow.Item(V21_MAINARTICLENUMBER), String.Empty) Return oArticleNumber Catch ex As Exception @@ -412,7 +451,7 @@ Namespace Winline End If Dim oRow As DataRow = oTable.Rows.Item(0) - Dim oArticleNumber As String = Utils.NotNull(oRow.Item(V21_ARTICLENUMBER), String.Empty) + Dim oArticleNumber As String = Utils.NotNull(oRow.Item(V21_MAINARTICLENUMBER), String.Empty) ' EAN was found, now we need to check it against the Regex of the current Mandantor, if one exists If oMandator.Regex <> String.Empty Then diff --git a/MultiTool.Shared/Winline/Entities/Account.vb b/MultiTool.Shared/Winline/Entities/Account.vb index e2005a1..58af12d 100644 --- a/MultiTool.Shared/Winline/Entities/Account.vb +++ b/MultiTool.Shared/Winline/Entities/Account.vb @@ -6,8 +6,9 @@ Public Property StreetName As String Public Property CityName As String Public Property ZipCode As String + Public Property GLN As String - Public Property Mandator As String + Public Property Mandator As Mandator Public Overrides Function GetHashCode() As Integer Return Id.GetHashCode() diff --git a/MultiTool.Shared/Winline/Entities/Article.vb b/MultiTool.Shared/Winline/Entities/Article.vb new file mode 100644 index 0000000..a5fadd6 --- /dev/null +++ b/MultiTool.Shared/Winline/Entities/Article.vb @@ -0,0 +1,21 @@ +Namespace Winline + Public Class Article + Public Property Id + Public Property Name + Public Property EAN + Public Property Mandator As Mandator + + Public Overrides Function GetHashCode() As Integer + Return Id.GetHashCode() + End Function + + Public Overrides Function Equals(obj As Object) As Boolean + Return DirectCast(obj, Article).Id = Id + End Function + + Public Overrides Function ToString() As String + Return $"{Name} ({Id})" + End Function + End Class + +End Namespace \ No newline at end of file diff --git a/MultiTool.Shared/Winline/Entities/DocumentKind.vb b/MultiTool.Shared/Winline/Entities/DocumentKind.vb index 373b198..622c71f 100644 --- a/MultiTool.Shared/Winline/Entities/DocumentKind.vb +++ b/MultiTool.Shared/Winline/Entities/DocumentKind.vb @@ -1,8 +1,8 @@ Namespace Winline Public Class DocumentKind - Public Id As Integer - Public Name As String - Public Mandator As String + Public Property Id As Integer + Public Property Name As String + Public Property Mandator As Mandator Public Overrides Function GetHashCode() As Integer Return Id.GetHashCode() diff --git a/MultiTool.Shared/Winline/WebService.vb b/MultiTool.Shared/Winline/WebService.vb index 670a8cc..e779860 100644 --- a/MultiTool.Shared/Winline/WebService.vb +++ b/MultiTool.Shared/Winline/WebService.vb @@ -1,12 +1,9 @@ Imports System.Xml -Imports System.Net +Imports System.Text Imports System.Net.Http -Imports System.Globalization -Imports AutoMapper Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Filesystem Imports MultiTool.Shared.Documents -Imports System.Text Namespace Winline Public Class WebService @@ -14,13 +11,10 @@ Namespace Winline Private ReadOnly Config As Config Private ReadOnly Serializer As Serializer - Private ReadOnly Mapper As AutoMapper.Mapper - Private ReadOnly FileEx As File Private ReadOnly AppDataPath As String Public Sub New(pLogConfig As LogConfig, pConfig As Config, pAppDataPath As String) MyBase.New(pLogConfig, pLogConfig.GetLogger()) - FileEx = New File(pLogConfig) Serializer = New Serializer(pLogConfig) Config = pConfig AppDataPath = pAppDataPath @@ -155,11 +149,13 @@ Namespace Winline End Function Private Function GetBytesFromDocument(pDocument As Document) As Byte() + ' TODO: should "Lief_Name" be included here? Dim oFilteredFields As New List(Of String) From { - "Fakt_Name", - "Lief_Name" + "Fakt_Name" } + + Using oStream As New IO.MemoryStream() Dim w = XmlWriter.Create(oStream) diff --git a/MultiTool.Shared/packages.config b/MultiTool.Shared/packages.config index 30c87d1..63f3075 100644 --- a/MultiTool.Shared/packages.config +++ b/MultiTool.Shared/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file