From 64be5b93635e8236ad786df6dbaa3a7b350b3f63 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 5 Mar 2020 11:51:18 +0100 Subject: [PATCH 01/13] MS Initial without WM --- .../ClassAllgemeineFunktionen.vb | 76 -- app/DD_PM_WINDREAM/ClassConfig.vb | 9 - app/DD_PM_WINDREAM/ClassFinalizeDoc.vb | 40 +- app/DD_PM_WINDREAM/ClassInit.vb | 2 +- app/DD_PM_WINDREAM/ClassPMWindream.vb | 628 ---------- app/DD_PM_WINDREAM/ClassWindream_allgemein.vb | 488 -------- app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 27 +- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 6 +- app/DD_PM_WINDREAM/clsPatterns.vb | 31 +- app/DD_PM_WINDREAM/frmAdministration.vb | 277 +--- app/DD_PM_WINDREAM/frmFormDesigner.vb | 12 +- app/DD_PM_WINDREAM/frmMain.vb | 65 +- app/DD_PM_WINDREAM/frmMassValidator.vb | 163 +-- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 30 +- app/DD_PM_WINDREAM/frmValidator.vb | 1109 +++-------------- app/DD_PM_WINDREAM/frmValidatorSearch.vb | 12 +- 16 files changed, 265 insertions(+), 2710 deletions(-) delete mode 100644 app/DD_PM_WINDREAM/ClassPMWindream.vb delete mode 100644 app/DD_PM_WINDREAM/ClassWindream_allgemein.vb diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb index 720413f..b8e0d59 100644 --- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb +++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb @@ -1,8 +1,6 @@ Imports System.Data.SqlClient Imports System.Data.OracleClient Imports System.IO -Imports WINDREAMLib - Public Class ClassAllgemeineFunktionen Public Shared Function GUI_LANGUAGE_INFO(pTITLE As String) Dim oFilteredDatatable As DataTable = BASEDATA_DT_GUI_LANGUAGE_PHRASES.Clone() @@ -149,82 +147,8 @@ Public Class ClassAllgemeineFunktionen End If End Sub - Public Function Delete_xffres(originFile As String, clsWD As ClassWindream_allgemein) - Try - Dim Stammname As String = System.IO.Path.GetFileNameWithoutExtension(originFile) - Dim Path As String = System.IO.Path.GetDirectoryName(originFile) - Dim xffres As String = Path & "\" & Stammname & ".xffres" - If file_exists(xffres, clsWD) = True Then - System.IO.File.Delete(xffres) - LOGGER.Info("Datei " & xffres & " erfolgreich gelöscht") - Return True - Else - Return Nothing - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(" Fehler bei Delete_xffres", True) - LOGGER.Info("Fehlermeldung: " & ex.Message) - End Try - End Function - 'Public Function Delete_File(originFile As String) - ' Try - - ' If file_exists(originFile, False) = True Then - ' System.IO.File.Delete(originFile) - ' LOGGER.Info("Manuelles Löschen: Datei " & originFile & " erfolgreich gelöscht", False) - ' Return True - ' Else - ' MsgBox("Die Datei konnte nicht gelsöcht werden. File NOT EXISTS", MsgBoxStyle.Exclamation) - ' Return False - ' End If - ' Catch ex As Exception - ' LOGGER.Info(" Fehler bei Delete_File", True) - ' LOGGER.Info("Fehlermeldung: " & ex.Message) - ' End Try - 'End Function - Public Function Move2Folder(ByVal vMove_File As String, ByVal vZiel_Pfad As String, Profile_ID As Integer, clsWD As ClassWindream_allgemein) - Try - Dim extension As String = IO.Path.GetExtension(vMove_File) - Dim Filename As String = IO.Path.GetFileName(vMove_File) - Dim path As String = IO.Path.GetDirectoryName(vMove_File) - Dim _Ziel As String - _Ziel = vZiel_Pfad & "\" & Filename - Dim version As Integer = 1 - If vZiel_Pfad <> path Then - Dim Stammname As String = IO.Path.GetFileNameWithoutExtension(vMove_File) - Do While file_exists(_Ziel, clsWD) = True - Dim neuername As String = Stammname & "~" & version & extension - _Ziel = neuername - version = version + 1 - Loop - My.Computer.FileSystem.MoveFile(vMove_File, _Ziel) - LOGGER.Info("Datei erfolgreich verschoben - Ziel: " & _Ziel) - Else - LOGGER.Info("Ziel und Quellpfad sind identisch!") - End If - - Return "" - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Fehler bei Move2Folder", True) - LOGGER.Info("Fehlermeldung") - LOGGER.Info(ex.Message) - Insert_LogEntry($"ERROR {ex.Message}") - Return ex.Message - End Try - End Function - Public Function file_exists(ByVal _file As String, clsWD As ClassWindream_allgemein) - Try - Return clsWD.CheckFileExists(_file) - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Fehler in Funktion file_exists - Fehler: ", ex.Message) - Return False - End Try - End Function Public Function checkValue_Exists(sqlbefehl As String, Replace_value As String, Check_value As String, Typ As String, connString As String, profilid As Integer) Try Dim sql As String diff --git a/app/DD_PM_WINDREAM/ClassConfig.vb b/app/DD_PM_WINDREAM/ClassConfig.vb index 997841c..27e2087 100644 --- a/app/DD_PM_WINDREAM/ClassConfig.vb +++ b/app/DD_PM_WINDREAM/ClassConfig.vb @@ -8,15 +8,6 @@ Public Class ClassConfig Public Property ConnectionStringTest As String = "" Public Property TestMode As Boolean = False - ' PDF Viewer Settings - Public Property UniversalViewerPath As String = "" - Public Property XChangeViewerPath As String = "" - Public Property SumatraViewerPath As String = "" - - Public Property PDFViewerZoomLevel As Integer = 3 - Public Property PDFViewer As String = "internal" - Public Property DefaultViewer As String = "docview" - ' Windream Settings Public Property IndexDmsErstellt As String = "DMS erstellt" Public Property IndexDmsErstelltZeit As String = "DMS erstellt (Zeit)" diff --git a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb index 041a15a..089b9ef 100644 --- a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb +++ b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb @@ -1,5 +1,5 @@ Public Class ClassFinalizeDoc - Public Shared Function Write_Final_Metadata(WMObject As WINDREAMLib.WMObject) + Public Shared Function WMWrite_Final_Metadata(WMObject As Object) 'WINDREAMLib.WMObject) Try Dim _error As Boolean = False If CURRENT_DT_FINAL_INDEXING Is Nothing Then @@ -14,32 +14,10 @@ Dim INDEXNAME = dr.Item("INDEXNAME").ToString If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### LOGGER.Debug("indexing with dynamic sql...") - 'Dim SQL_COMMAND = dr.Item("SQL_COMMAND") - '' Regulären Ausdruck zum Auslesen der Indexe definieren - 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" - '' einen Regulären Ausdruck laden - 'Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg) - '' die Vorkommen im SQL-String auslesen - 'Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(SQL_COMMAND) - ''#### - '' alle Vorkommen innerhalbd er Namenkonvention durchlaufen - 'For Each element As System.Text.RegularExpressions.Match In elemente - ' Try - ' If LogErrorsOnly = False Then LOGGER.Info(" element in RegeX: " & element.Value) - ' Dim WDINDEXNAME = element.Value.Substring(2, element.Value.Length - 3) - ' Dim wertWD = WMObject.GetVariableValue(WDINDEXNAME) - ' If Not IsNothing(wertWD) Then - ' SQL_COMMAND = SQL_COMMAND.ToString.Replace(element.Value, wertWD) - ' Else - ' LOGGER.Info(">>Attention: indexvalue is invalid") - ' End If - ' Catch ex As Exception - ' LOGGER.Info("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message) - ' End Try - 'Next + Dim sql_Statement = clsPatterns.ReplaceUserValues(dr.Item("SQL_COMMAND"), USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) sql_Statement = clsPatterns.ReplaceInternalValues(sql_Statement) - sql_Statement = clsPatterns.ReplaceWindreamIndicies(sql_Statement, WMObject) + LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement) Dim dynamic_value = ClassDatabase.Execute_Scalar(sql_Statement, CONNECTION_STRING, True) @@ -65,7 +43,7 @@ ReDim Preserve result(0) result(0) = value - Dim oIndexType = WINDREAM.GetTypeOfIndex(INDEXNAME) + Dim oIndexType = "" 'WINDREAM.GetTypeOfIndex(INDEXNAME) LOGGER.Debug($"oIndexType {oIndexType.ToString}") If oIndexType > 4000 And oIndexType < 5000 Then 'Hier muss nun separat als Vektorfeld indexiert werden @@ -79,7 +57,7 @@ End If Else LOGGER.Debug("now indexing..") - If Indexiere_File(INDEXNAME, result, WMObject) = True Then + If WMIndexiere_File(INDEXNAME, result, WMObject) = True Then LOGGER.Debug("FINALER INDEX '" & INDEXNAME & "' WURDE ERFOLGREICH GESETZT") LOGGER.Debug("") 'Nun das Logging @@ -112,7 +90,7 @@ End Try End Function - Private Shared Function Indexiere_File(idxxname As String, idxvalue As Object, WMObject As WINDREAMLib.WMObject) + Private Shared Function WMIndexiere_File(idxxname As String, idxvalue As Object, WMObject As Object) 'WINDREAMLib.WMObject) Dim File_indexiert As Boolean = False ' Try @@ -141,7 +119,7 @@ End If 'Dim _windreamPM As New ClassPMWindream 'Jetzt das eigentliche Indexieren der Datei - File_indexiert = WINDREAM.RunIndexing(WMObject, arrIndex, arrValue) + File_indexiert = "ToDo IDB" ' WINDREAM.RunIndexing(WMObject, arrIndex, arrValue) Return File_indexiert End If @@ -151,7 +129,7 @@ ' Return Err() 'End Try End Function - Private Shared Function Indexiere_VektorfeldPM(input As String, NameVectorfield As String, WMObject As WINDREAMLib.WMObject) + Private Shared Function Indexiere_VektorfeldPM(input As String, NameVectorfield As String, WMObject As Object) ' WINDREAMLib.WMObject) Dim _success As Boolean = True Dim Anzahl As Integer = 0 @@ -185,7 +163,7 @@ If myInputArr.Length > 0 Then 'Jetzt die Datei indexieren - If Indexiere_File(NameVectorfield, myInputArr, WMObject) = False Then + If WMIndexiere_File(NameVectorfield, myInputArr, WMObject) = False Then _success = False 'errmessage = "Fehler beim Indexieren Vektorfeld '" & NameVKTIndex & "' - ERROR: " & idxerr_message End If diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 4c19896..de049f7 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -17,7 +17,7 @@ Public Class ClassInit LOGCONFIG = New LogConfig(LogConfig.PathType.AppData) LOGGER = LOGCONFIG.GetLogger("ProcessManager") - LOGGER.Info("## ProcessManager für Windream gestartet - {0}", Now) + LOGGER.Info("## ProcessManager started - {0}", Now) End Sub diff --git a/app/DD_PM_WINDREAM/ClassPMWindream.vb b/app/DD_PM_WINDREAM/ClassPMWindream.vb deleted file mode 100644 index 26ebceb..0000000 --- a/app/DD_PM_WINDREAM/ClassPMWindream.vb +++ /dev/null @@ -1,628 +0,0 @@ -Imports WINDREAMLib -Imports WMOSRCHLib - -Public Class ClassPMWindream - - Inherits ClassWindream_allgemein - Dim clsWM As ClassWindream_allgemein - 'Private email As New ClassNIEmail - Private allgFunk As New ClassAllgemeineFunktionen -#Region "+++++ Konstanten +++++" - Protected Const WMObjectEditModeObject = &H1F - Protected Const WMObjectStreamOpenModeReadWrite = 2 - Protected Const WMEntityObjectType = 10 - Protected Const WMEntityDocument = 1 - - Const WMObjectVariableValueTypeUndefined = 0 - Const WMObjectVariableValueTypeString = 1 - Const WMObjectVariableValueTypeInteger = 2 - Const WMObjectVariableValueTypeFloat = 3 - Const WMObjectVariableValueTypeBoolean = 4 - Const WMObjectVariableValueTypeDate = 5 - Const WMObjectVariableValueTypeFixedPoint = 6 - Const WMObjectVariableValueTypeTimeStamp = 7 - Const WMObjectVariableValueTypeCurrency = 8 - Const WMObjectVariableValueTypeTime = 9 - Const WMObjectVariableValueTypeVariant = 10 - Const WMObjectVariableValueTypeMask = &HFFF - Const WMObjectVariableValueFlagMask = &HFFFFF000 - Const WMObjectVariableValueTypeVector = &H1000 - Const WMObjectVariableValueTypeFulltext = &H2000 - Const WMObjectVariableValueTypeDefaultValue = &H4000 - - Const WMObjectEditModeIndexEdit = &H3DA -#End Region - -#Region "+++++ Variablen +++++" - Private oController As New WMOSearchController -#End Region - -#Region "+++++ Allgemeine Methoden und Funktionen +++++" - Sub New() - MyBase.New() - End Sub - Private Function IsNotEmpty(ByVal aValue As Object) - If aValue IsNot Nothing Then - Return True - - 'If TypeOf aValue Is String Then - ' ' Änderung 28.08.2018: Auch ein leerer String gilt als Wert, damit indexfelder auch geleert werden können - ' 'If Not aValue = "" Then - ' ' Return True - ' 'End If - - ' Return False - 'Else - ' Return True - 'End If - Else - Return False - End If - End Function - Private Function return_type(ByVal _wert As Object) - Return _wert.GetType - End Function - Public Function GetValuesfromAuswahlliste(ByVal listname As String) - Try - 'Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, listname) - 'Dim vType = oAttribute.getVariableValue("vItems") - 'Return vType - Dim oChoiceList = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityChoiceList, listname) - If Err.Number = 0 And TypeName(oChoiceList) <> "Nothing" Then - Dim Values = oChoiceList - Values = oChoiceList.GetVariableValue("vItems") - Dim anz As Integer = 0 - - For Each CLItem In Values - If oChoiceList.aName IsNot Nothing Then - anz += 1 - End If - Next - Dim strListe(anz - 1) - Dim zahl As Integer = 0 - For Each CLItem In Values - If oChoiceList.aName IsNot Nothing Then - strListe(zahl) = CLItem - zahl += 1 - End If - Next - Return strListe - Else - MsgBox("Auswahlliste: " & listname & " nicht gefunden!", MsgBoxStyle.Critical, "Fehler:") - Return Nothing - End If - - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in GetValuesfromAuswahlliste:") - Return Nothing - End Try - End Function - Public Function Return_Type(Indexname As String) - Try - ' das entsprechende Attribut aus windream auslesen - Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indexname) - ' den Variablentyp (String, Integer, ...) auslesen - Dim vType = oAttribute.getVariableValue("dwAttrType") - Return vType.ToString - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in Return_Type:") - Return "" - End Try - End Function - - Public Function RunIndexing(ByVal oDocument As WMObject, ByVal Indizes() As String, ByVal aValues() As Object) - Dim vType - Try - If Indizes IsNot Nothing And aValues IsNot Nothing Then - If Not oDocument.aLocked Then - - ' 02.07. Änderung der Lock Methode, um eine Validierung auch zuzulassen, wenn das Recht "Datei ändern" - ' nicht gesetzt ist - 'oDocument.lock() - - Try - oDocument.LockFor(WMObjectEditModeIndexEdit) - Catch ex As Exception - LOGGER.Error(ex) - frmValidator.idxerr_message = "Could not lock WMFile - Check Your rights and inform the admin!" - Return False - End Try - - Dim i As Integer = 0 - Dim indexname As String - If aValues.Length = 1 And aValues(0) = "" Then - LOGGER.Debug("Indexwert ist leer/Nothing - Keine Indexierung") - End If - 'Jetzt jeden Indexwert durchlaufen - For Each aName As String In Indizes - indexname = aName - ' das entsprechende Attribut aus windream auslesen - Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indizes(i)) - ' den Variablentyp (String, Integer, ...) auslesen - vType = oAttribute.getVariableValue("dwAttrType") - ' wenn in aValues an Position i ein Wert steht - - If IsNotEmpty(aValues(i)) Then - Dim _int As Boolean = False - Dim _date As Boolean = False - Dim _dbl As Boolean = False - Dim _bool As Boolean = False - 'If indexname = "Tournr" Then - ' MsgBox("Index: " & indexname & vbNewLine & "wert: " & aValues(i), MsgBoxStyle.Information, "Index: " & aName.ToString) - 'End If - LOGGER.Debug(" ### Indexierung von Index: " & indexname & " ####") - 'MsgBox(oDocument.aName & vbNewLine & aValues(i) & vbNewLine & vType, MsgBoxStyle.Exclamation, "Zeile 87") - Dim value = aValues(i) - Dim convertValue - Dim vektor As Boolean = False - 'Den Typ des Index-Feldes auslesen - 'MsgBox(value.GetType.ToString) - Select Case vType - 'Case WMObjectVariableValueTypeUndefined - Case WMObjectVariableValueTypeString - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString") - convertValue = CStr(value) - Case WMObjectVariableValueTypeInteger - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeInteger") - If IsNumeric(value) = False Then - frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value - LOGGER.Debug("Achtung: Value " & value & " kann nicht in Zahl konvertiert werden!") - oDocument.Save() - oDocument.unlock() - Return False - End If - convertValue = CInt(value) - _int = True - Case WMObjectVariableValueTypeFloat - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFloat") - Try - convertValue = CDbl(value) - Catch ex As Exception - LOGGER.Error(ex) - frmValidator.idxerr_message = "Could't convert value '" & value & "' to double!" - oDocument.Save() - oDocument.unlock() - Return False - End Try - - Case WMObjectVariableValueTypeFixedPoint - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFixedPoint") - Try - convertValue = CDbl(value) - Catch ex As Exception - LOGGER.Error(ex) - frmValidator.idxerr_message = "Could't convert value '" & value & "' to double!" - oDocument.Save() - oDocument.unlock() - Return False - End Try - - _dbl = True - Case WMObjectVariableValueTypeBoolean - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeBoolean") - convertValue = CBool(value) - _bool = True - Case WMObjectVariableValueTypeDate - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeDate") - _date = True - 'Dim _date As Date = value - convertValue = value - Case WMObjectVariableValueTypeTimeStamp - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeTimeStamp") - convertValue = CInt(value) - Case WMObjectVariableValueTypeCurrency - LOGGER.Info(" >> Typ des windream-Indexes: WMObjectVariableValueTypeCurrency") - 'Wegen currency muß ein eigenes Objekt vom typ Variant erzeugt werden - Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(value)) - convertValue = aValueWrapper - Case WMObjectVariableValueTypeTime - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeTime", False) - 'If ((value)) Then - ' convertValue = CDate(value) - 'Else - ' convertValue = "" - 'End If - 'Dim _date As Date = value - convertValue = convertValue '*_date.ToShortTimeString - Case WMObjectVariableValueTypeFloat - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFloat", False) - convertValue = CStr(value) - Case WMObjectVariableValueTypeVariant - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeVariant", False) - convertValue = CStr(value) - Case WMObjectVariableValueTypeFulltext - LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFulltext", False) - convertValue = CStr(value) - Case 4100 - LOGGER.Debug("Typ des windream-Indexes: 4100 Vektor Boolean", False) - vektor = True - Case 4101 - LOGGER.Debug("Typ des windream-Indexes: 4101 Vektor Date", False) - vektor = True - Case 4104 - LOGGER.Debug("Typ des windream-Indexes: 4104 Vektor Currency", False) - vektor = True - Case 4097 - LOGGER.Debug("Typ des windream-Indexes: 4097 Vektor alphanumerisch", False) - vektor = True - Case 4098 - LOGGER.Debug("Typ des windream-Indexes: 4098 Vektor Numerisch", False) - vektor = True - Case 4099 - LOGGER.Debug("Typ des windream-Indexes: 4099 Vektor Kommazahl", False) - vektor = True - Case 36865 - LOGGER.Debug("Typ des windream-Indexes: 36865 Vektor alphanumerisch", False) - vektor = True - Case Else - LOGGER.Debug("Typ des windream-Indexes konnte nicht bestimmt werden!", False) - LOGGER.Debug("Versuch des Auslesens (vType): " & vType) - 'MsgBox(vType & vbNewLine & CStr(value), MsgBoxStyle.Exclamation, "Marlon-Case Else") - convertValue = "" - End Select - If vektor = False Then - If convertValue.ToString Is Nothing = False Then - LOGGER.Debug("Konvertierter Wert: '" & convertValue.ToString & "'", False) - End If - End If - '############################################################################################ - '####################### Der eigentliche Indexierungsvorgang ################################ - '############################################################################################ - If vektor = False Then - If convertValue.ToString Is Nothing = False Then - Try - LOGGER.Debug("Jetzt indexieren: oDocument.SetVariableValue(" & aName & ", " & convertValue.ToString & ")", False) - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(" >> Unexpected Error in Logging SetVariableValue for " & aName & ": " & ex.Message, False) - End Try - - 'Dim ArrValues() - 'ReDim ArrValues(0) - 'ArrValues(0) = convertValue - 'Dim ArrName() - 'ReDim ArrName(0) - 'ArrName(0) = "Tournr" - 'oDocument.SetValues(ArrName, ArrValues) - If _int = True Then - oDocument.SetVariableValue(aName, CInt(convertValue)) - ElseIf _date = True Then - oDocument.SetVariableValue(aName, CDate(convertValue)) - ElseIf _bool Then - oDocument.SetVariableValue(aName, CBool(convertValue)) - ElseIf _dbl Then - oDocument.SetVariableValue(aName, CDbl(convertValue)) - Else - oDocument.SetVariableValue(aName, convertValue) - End If - LOGGER.Debug("Index '" & aName & "' wurde geschrieben", False) - Else - LOGGER.Info(" >> Kein Indexwert vorhanden", False) - End If - Else - 'VEKTORFELDER, ALSO ÜBERPRÜFEN OB ERGEBNIS-ARRAY GEFÜLLT IST - LOGGER.Debug("VEKTORFELD: Vorbereiten des Arrays", False) - Dim myArray() - 'Dim anz As Integer = 0 - 'For Each obj In aValues - 'ReDim Preserve myArray(anz) - Select Case vType - Case 4100 - 'Vektortyp Boolean - 'Umwandeln in Boolean - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - Select Case obj.ToString.ToLower - Case "falsch" - obj = False - Case "wahr" - obj = True - Case "nein" - obj = False - Case "ja" - obj = True - End Select - myArray(i1) = CBool(obj) - i1 = i1 + 1 - Next - Case 4101 - 'Vektortyp Date - 'Umwandeln in String - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - myArray(i1) = CDate(obj) - i1 = i1 + 1 - Next - Case 4104 - 'Vektortyp Currency - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(obj)) - myArray(i1) = aValueWrapper - i1 = i1 + 1 - Next - Case 4097 - 'Vektortyp ALPHANUMERISCH - 'Umwandeln in String - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - myArray(i1) = CStr(obj) - i1 = i1 + 1 - Next - - Case 4098 - 'Umwandeln in Integer - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - myArray(i1) = CInt(obj) - i1 = i1 + 1 - Next - Case 4099 - 'Umwandeln in Double - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - Dim Str As String = obj - myArray(i1) = CDbl(Str.Replace(".", ",")) - i1 = i1 + 1 - Next - - Case 36865 - 'Umwandeln in String - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - myArray(i1) = CStr(obj) - i1 = i1 + 1 - Next - Case Else - 'Umwandeln in String - 'Die Größe des Arrays festlegen - ReDim myArray(aValues.Length - 1) - Dim i1 As Integer = 0 - 'Das Array durchlaufen und Werte für den Index in Array schreiben - For Each obj In aValues - myArray(i1) = CStr(obj) - i1 = i1 + 1 - Next - End Select - - 'Jetzt die Nachindexierung für Vektor-Felder - oDocument.SetVariableValue(aName, myArray) - LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False) - End If - End If - i += 1 - - Next - - ' oDocument.LockRights() - - 'SetRights(WMObject, User) - oDocument.Save() - oDocument.unlock() - LOGGER.Debug(" ### Indexierung erfolgreich beendet (Save und Unlock durchgeführt) ###", False) - Return True - Else - LOGGER.Info(" ### Dokument ist gesperrt, Indexierung nicht möglich! ###", False) - frmValidator.idxerr_message = "Dokument " & oDocument.aName & " ist gesperrt, Indexierung nicht möglich" - Return False - End If - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("ClassSearchResult.RunIndexing - " & ex.Message, True) - frmValidator.idxerr_message = "Unvorhergesehener Fehler in Indexing: " & ex.Message & vbNewLine & "vType: " & vType.ToString - allgFunk.Insert_LogEntry($"ERROR RunIndexing>> {ex.Message}") - oDocument.Save() - oDocument.unlock() - Return False - End Try - End Function - - Public Sub SetfinalIndex(ByVal oDocument As WMObject, ByVal Indexname As String, ByVal _state As Boolean) - Try - If Indexname IsNot Nothing Then - If Not oDocument.aLocked Then - oDocument.LockFor(WMObjectEditModeIndexEdit) - Dim i As Integer = 0 - - ' das entsprechende Attribut aus windream auslesen - Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indexname) - ' den Variablentyp (String, Integer, ...) auslesen - Dim vType = oAttribute.getVariableValue("dwAttrType") - 'MsgBox("Typ: " & vType.ToString, MsgBoxStyle.Critical, "_state: " & _state.ToString) - ' wenn in aValues an Position i ein Wert steht - 'MsgBox(oDocument.aName & vbNewLine & aValues(i) & vbNewLine & vType, MsgBoxStyle.Exclamation, "Zeile 87") - Dim value = _state - Dim convertValue - 'Den Typ des Index-Feldes auslesen - LOGGER.Debug(">> Typ des windream-Indexes: " & vType.ToString) - Select Case (vType) - Case WMObjectVariableValueTypeBoolean - convertValue = CBool(value) - Case Else - LOGGER.Info(">> Typ des windream-Indexes ist nicht BOOLEAN also Abbruch:") - End Select - '############################################################################################ - '####################### Der eigentliche Indexierungsvorgang ################################ - - oDocument.SetVariableValue(Indexname, convertValue) - LOGGER.Debug(">> Index '" & Indexname & "' wurde gesetzt") - oDocument.Save() - oDocument.unlock() - LOGGER.Info(">> DATEI wurde erfolgreich als fertig nachindexiert gekennzeichnet") - Else - LOGGER.Info(">> Dokument ist gesperrt, Indexierung erst im nächsten Durchlauf!") - End If - End If - - - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("ClassSearchResult.SetfinalIndex - " & ex.Message, True) - 'If My.Settings.vNIMailsenden = True Then - ' email.Send_EMail("Fehler bei SetfinalIndex - Datei: " & oDocument.aName.ToString & " - Fehler: " & ex.Message) - 'End If - oDocument.Save() - oDocument.unlock() - End Try - End Sub -#End Region - - -#Region "+++++ Allgemeine Funktionen die Informationen zurückliefern +++++" - - Public Function Get_No_Documents(Profil As String, WD_Search As String) - Try - Dim wmsearch_exists As Boolean - Try - wmsearch_exists = System.IO.File.Exists(WD_Search) - Catch ex As Exception - LOGGER.Error(ex) - wmsearch_exists = clsWM.CheckFileExists(WD_Search) - - End Try - If wmsearch_exists = False Then - - LOGGER.Info(">> Windream Suche für Profil: '" & Profil & "' konnte nicht ausgeführt werden! Die Datei '" & WD_Search & "' existiert nicht!", False) - MsgBox("Windream Suche für Profil: '" & Profil & "' konnte nicht ausgeführt werden!" & vbNewLine & "Die Datei '" & WD_Search & "' existiert nicht!", MsgBoxStyle.Exclamation, "Achtung:") - 'wenn die gesuchte File eine Suche ist: per MAil informierne und Indexierung abbrechen - 'If My.Settings.vNIMailsenden = True Then - ' email.Send_EMail("Fehler bei Nachindexierung:
>> Profil: " & Me.aktivesProfil.Profilname & "
>> die windream-Suche : " & Me.aktivesProfil.WindreamSuche & " konnte nicht gefunden werden!" & _ - ' "
>> Mögliche Fehlerursache: Das W-Laufwerk ist nicht verfügbar!") - 'End If - Return 0 - Else - ' windream-Suche für Profil starten - Dim windreamSucheErgebnisse As WMObjects = Me.GetSearchDocuments(WD_Search) - - If windreamSucheErgebnisse.Count > 0 Then - ' neue Anzahl von Dateien - Return windreamSucheErgebnisse.Count - Else - ' keine Dateien zum Importieren - Return 0 - End If - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(ex.Message) - Return 0 - End Try - - End Function - - Public Function GetSearchDocuments(ByVal wdfLocation As String) - - If clsWM.CheckFileExists(wdfLocation) = True Then - - Try - Dim ProfileName = wdfLocation.Substring(wdfLocation.LastIndexOf("\") + 1) - Dim ProfilePath = wdfLocation.Substring(0, wdfLocation.Length - ProfileName.Length) - - Me.oController.CheckSearchProfile(wdfLocation.ToLower) - Dim suchTyp = Me.oController.SearchProfileTargetProgID - Dim ExSettings As Object - Dim oSearch As Object - ExSettings = Me.oController.SearchProfileExSettings - If ExSettings = 0 Then ExSettings = 7 - - Dim srchQuick As WMOSRCHLib.WMQuickSearch = CreateObject("WMOSrch.WMQuickSearch") - Dim srchIndex As WMOSRCHLib.WMIndexSearch = CreateObject("WMOSrch.WMIndexSearch") - Dim srchObjectType As WMOSRCHLib.WMObjectTypeSearch = CreateObject("WMOSrch.WMObjectTypeSearch") - - Select Case suchTyp.ToString.ToUpper - Case "WMOSRCH.WMQUICKSEARCH" - srchQuick.WMSession = CreateObject("Windream.WMSession", Me.GetCurrentServer) - - Me.oConnect.LoginSession(srchQuick.WMSession) - - srchQuick.ClearSearch() - srchQuick.SearchProfilePath = ProfilePath - srchQuick.LoadSearchProfile(ProfileName) - - oSearch = srchQuick.GetSearch() - - Case "WMOSRCH.WMINDEXSEARCH" - srchIndex.WMSession = CreateObject("Windream.WMSession", Me.GetCurrentServer) - - Me.oConnect.LoginSession(srchIndex.WMSession) - - srchIndex.ClearSearch() - srchIndex.SearchProfilePath = ProfilePath - srchIndex.LoadSearchProfile(ProfileName) - - oSearch = srchIndex.GetSearch() - - Case "WMOSRCH.WMOBJECTTYPESEARCH" - srchObjectType.WMSession = CreateObject("Windream.WMSession", Me.GetCurrentServer) - - Me.oConnect.LoginSession(srchObjectType.WMSession) - - srchObjectType.ClearSearch() - srchObjectType.SearchProfilePath = ProfilePath - srchObjectType.LoadSearchProfile(ProfileName) - - oSearch = srchObjectType.GetSearch() - - Case Else - LOGGER.Info("KEIN GÜLTIGER WINDREAM-SUCHTYP") - Return Nothing - End Select - Dim WMObjects As Object - WMObjects = oSearch.Execute - Return oSearch.execute - - Catch ex As Exception - LOGGER.Error(ex) - ' bei einem Fehler einen Eintrag in der Logdatei machen - LOGGER.Info("Fehler in GetSearchDocuments - " & ex.Message, True) - Return Nothing - End Try - - End If - - Return Nothing - - End Function - ''' Liefert den Wert eines Indexes als String - ''' _indexname = Name des zu überprüfenden Indexfeldes - Public Function GetValueforIndex(ByVal _fullfilepath As String, _indexname As String) - Try - Const WMEntityDocument = 1 - Dim IndexwertAusWindream As Object = Nothing - Dim _dok As WINDREAMLib.WMObject - _dok = Nothing - _dok = oSession.GetWMObjectByPath(WMEntityDocument, _fullfilepath) 'WINDREAMLib.WMEntity.WMEntityDocument - IndexwertAusWindream = _dok.GetVariableValue(_indexname) - Return IndexwertAusWindream.ToString - Catch ex As Exception - LOGGER.Error(ex) - 'MsgBox(ex.Message) - Return Nothing - End Try - End Function -#End Region -End Class diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb deleted file mode 100644 index 17b0692..0000000 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ /dev/null @@ -1,488 +0,0 @@ -Imports WINDREAMLib -Imports WINDREAMLib.WMCOMEvent -Imports WINDREAMLib.WMEntity -Imports WINDREAMLib.WMObjectEditMode -Imports WINDREAMLib.WMSearchOperator -Imports WINDREAMLib.WMSearchRelation -Imports WMOBRWSLib - -Public Class ClassWindream_allgemein - -#Region "+++++ Konstanten +++++" - Const DEBUG = AUS - Const AUS = 0 - Const WINDREAM = 1 - Const VARIABLEN = 2 -#End Region - -#Region "+++++ Variablen +++++" - Public oConnect ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht) - Public oSession 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht) - Public oBrowser As New WMOBRWSLib.ServerBrowser - Public oDokumentTypen As WINDREAMLib.WMObjects -#End Region - - -#Region "+++++ Allgemeine Methoden und Funktionen +++++" - - ''' - ''' Konstruktor für die windream-Klasse - ''' - ''' - Sub New() - ' wenn ein Fehler bei der Initialisierung auftrat - 'If Not Me.Init() Then - ' ' Nachricht ausgeben - ' MsgBox("Es trat ein Fehler bei der Initialisierung der Klasse windream auf. Bitte prüfen Sie ob der windream-Server aktiv ist und alle Dienste gestartet sind.", MsgBoxStyle.Exclamation, "Fehler bei Initialisierung") - - ' ' das Programm "abschießen" - ' Process.GetCurrentProcess.Kill() - 'End If - End Sub - - - ''' - ''' Initialisiert die statische Klasse (Login, Session starten, usw.) - ''' - ''' Liefert True wenn das Anmelden erfolgreich war, sonst False - ''' - Public Function Create_Session() As Boolean - Try - Try - ' Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen - Me.oSession = CreateObject("Windream.WMSession", Me.GetCurrentServer) - LOGGER.Debug("windream-Server: '" & Me.GetCurrentServer & "'") - ' Connection-Objekt instanziieren - Me.oConnect = CreateObject("Windream.WMConnect") - 'MsgBox("windrem init 'ed") - Catch ex As Exception -LOGGER.Error(ex) - LOGGER.Debug($"Error while creating WMConnect Object: {vbCrLf}{ex.Message}") - Return False - End Try - - - ' wenn windream nicht angemeldet ist - If Not Me.IsLoggedIn Then - - ' Art der Anmeldung an windream festlegen - ' 0x0L (also 0) = Standard windream Benutzer - ' WM_MODULE_ID_DOCTYPEEDITOR_LIC = ermöglicht Zugriff auf die windream Management Funktionen (Z.B. zur Verwaltung der windream Dokumententypen, Auswahllisten, etc.) - ' WM_MODULE_ID_INDEXSERVICE = ermöglicht der Session die Indexierungs-Events vom windream DMS-Service zu empfangen - Me.oConnect.ModuleID = 0 - - ' setzt die minimal erwartete windream-Version - Me.oConnect.MinReqVersion = "3" - - ' -- Impersonifizierung nur möglich mit registry-eintrag -- - ' oConnect.UserName "\schulung\windream" - ' oConnect.Password "windream" - - ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen - Me.oConnect.LoginSession(Me.oSession) - If Me.oSession.aLoggedin = False Then - MsgBox("Es konnte keine Verbindung mit dem windream-Server hergestellt werden", MsgBoxStyle.Exclamation, "Verbindung konnte nicht hergestellt werden") - Return False - End If - - If LOG_ERRORS_ONLY = False Then - LOGGER.Info(" >> windream-Version: '" & oSession.GetSystemInfo("WindreamVersion") & "'") - End If - - ' AUSGABE VON SYSTEMINFORMATIONEN - ' Gibt die Versionsart (Lizenztyp) also Small-Business-Edition (SBE), Small-Business-Extension (SBX) - ' oder Business-Edition (BE) aus - 'MsgBox("WindreamVersion: " & oSession.GetSystemInfo("WindreamVersion") & vbNewLine & "LicenceKey: " & oSession.GetSystemInfo("LicenceKey") & vbNewLine & _ - ' vbNewLine & "LicenceName: " & oSession.GetSystemInfo("LicenceName")) - - 'Dim WMCtrl As AISCONTROLDATACOMLib.AISControlData - 'WMCtrl = New AISCONTROLDATACOMLib.AISControlData - - '' liefert die Versionsnummer des Clients - - 'MsgBox(WMCtrl.WMWorkstationBuildNo) - 'MsgBox(WMCtrl.W - '' liefert den Servernamen des angemeldeten windreams - 'MsgBox(WMCtrl.WMServerName) - - Try - Me.oSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False) - ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine - ' Ordnertypen ausgelesen werden - Me.oDokumentTypen = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) - Catch ex As Exception -LOGGER.Error(ex) - Return False - End Try - - End If - - LOGGER.Debug($"windream login successful") - Return True - - Catch ex As Exception -LOGGER.Error(ex) - If Err.Number = -2147220985 Then - MsgBox("Die installierte windream-Version ist nicht ausreichend für den Betrieb der Tool Collection für windream." & vbNewLine & - "Bitte kontaktieren Sie Digital Data." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & Err.Description, MsgBoxStyle.Exclamation, "Unzureichende windream-Version") - Else - MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Login an windream") - End If - Return False - End Try - - End Function - Public Function Start_WMCC_andCo() - Try - ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist - Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID - Dim userExistsInServerUserGroup = ClassDatabase.Execute_Scalar(sql, CONNECTION_STRING) - - If WMSESSION_STARTSTOP_STARTUP = True Then - 'And userExistsInServerUserGroup Is Nothing - LOGGER.Info(">> WINDREAM-Start on ApplicationStart is active!") - - Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter") - Dim owindreamIndexService = CreateObject("WMIndexServer.WMIdxSvControl") - owindreamControlCenter.StartVFSService(1) - System.Threading.Thread.Sleep(1000) - owindreamIndexService.Start() - System.Threading.Thread.Sleep(1500) - End If - Create_Session() - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Error while starting up WMCC and IndexService: " & ex.Message, True) - End Try - End Function - Public Function Stop_WMCC_andCo() - Try - ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist - Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID - Dim userExistsInServerUserGroup = ClassDatabase.Execute_Scalar(sql, CONNECTION_STRING) - - If WMSESSION_STARTSTOP_STARTUP = True Then 'And userExistsInServerUserGroup Is Nothing - Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter") - Dim owindreamIndexService = CreateObject("WMIndexServer.WMIdxSvControl") - owindreamControlCenter.StartVFSService(0) - owindreamIndexService.Shutdown() - owindreamControlCenter.ExitCC(0) - End If - Catch ex As Exception -LOGGER.Error(ex) - LOGGER.Info("Error while Stopping WMCC and IndexService: " & ex.Message, True) - End Try - End Function -#End Region - - - -#Region "+++++ Funktionen die für den Objekttyp relevate Informationen zurückliefern +++++" - - ''' - ''' Liefert alle Objekttypen des aktuellen Servers als windream-Objekte. - ''' - ''' Alle Objekttypen als WMObjects-Objekt - ''' - Public Function GetObjecttypesAsObjects() As WMObjects - Try - - Return Me.oDokumentTypen - - Catch ex As Exception -LOGGER.Error(ex) - MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen der Objekttypen") - Return Nothing - End Try - End Function - - ''' - ''' Liefert alle Objekttypen des aktuellen Servers als Array aus Strings. - ''' - ''' Array mit allen Objekttypen als Strings - ''' - Public Function GetObjecttypesAsStrings() As String() - - Try - Dim objektTypenStr(Me.oDokumentTypen.Count) As String - - For i As Integer = 0 To Me.oDokumentTypen.Count - objektTypenStr(i) = Me.oDokumentTypen.Item(i).aName - Next - - Return objektTypenStr - - Catch ex As Exception -LOGGER.Error(ex) - MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen der Objekttypen als String") - Return Nothing - End Try - - End Function - Public Function GetTypeOfIndex(ByVal indexname As String) As Integer - Try - Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname) - Dim vType = oAttribute.getVariableValue("dwAttrType") - Return vType - Catch ex As Exception -LOGGER.Error(ex) - Return Nothing - End Try - - End Function - - Public Function NormalizePath(Path As String) - Dim oNormalizedPath As String - If Path.StartsWith("\\windream") Then - oNormalizedPath = Path.Replace("\\windream\objects\", "") - ElseIf Path.StartsWith("\\") Then - oNormalizedPath = Path.Substring(1) - ElseIf Path.StartsWith("\") Then - Return Path - Else - oNormalizedPath = "\" & Path - End If - - Return oNormalizedPath - End Function - - Public Function CheckFileExists(Path As String) - Dim oNormalizedPath = NormalizePath(Path) - - Try - Dim oObjectId = 0 - Dim oObjectDbId = 0 - Dim WMObject As WINDREAMLib.WMObject '= CreateObject("WINDREAMLib.WMObject") 'New WINDREAMLib.WMObject - If IsNothing(oSession) Then - If Create_Session() = False Then - Return False - End If - End If - WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, oNormalizedPath) - Return True - Catch ex As Exception -LOGGER.Error(ex) - Return False - End Try - End Function - ''' - ''' Liefert alle Indexe eines Objekttypen. - ''' - ''' Name des Objekttyps - ''' Array mit allen Objekttyp zugeordneten Indexen als String - ''' - Public Function GetIndicesByObjecttype(ByVal Objecttype_name As String) As String() - Try - Dim oObjectType As WMObject - Dim oIndexAttributes As WMObjectRelation - Dim oIndexAttribute As WMObject - Dim oIndex As WMObject - Dim oRelProperties As WMObjectRelationClass - - ' den Objekttyp laden - oObjectType = Me.oSession.GetWMObjectByName(WMEntityObjectType, Objecttype_name) - - ' Beziehung zu Indizes des Objekttyp auslesen - oIndexAttributes = oObjectType.GetWMObjectRelationByName("TypeAttributes") - - ' Array für Indizes vorbereiten - Dim aIndexNames(oIndexAttributes.Count - 1) As String - - ' alle Indizes durchlaufen - For j As Integer = 0 To oIndexAttributes.Count - 1 - - ' aktuellen Index auslesen - oIndexAttribute = oIndexAttributes.Item(j) - - ' Eigenschaften des Index auslesen - oRelProperties = oIndexAttribute.GetWMObjectRelationByName("Attribute") - - ' Index aus den Eigenschaften auslesen - oIndex = oRelProperties.Item(0) - - ' Indexname speichern - aIndexNames(j) = oIndex.aName - Next - ' Indexarray sortiert zurückgeben - Array.Sort(aIndexNames) - ' Indexarray zurückgeben - Return aIndexNames - - Catch ex As Exception -LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen der windream-Indexe") - Return Nothing - End Try - End Function - ''' - ''' Liefert einen Objekttyp als WMObject an Hand dessen Name. - ''' - ''' Name des Objekttyps - ''' Objekttyp als WMObject - ''' - Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject - Try - ' alle Objekttypen auslesen - Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) - - ' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen - For Each oObjectType As WMObject In oObjectTypes - If oObjectType.aName = objekttypName Then - Return oObjectType - End If - Next - - Return Nothing - - Catch ex As Exception -LOGGER.Error(ex) - MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden") - Return Nothing - End Try - End Function - - ''' - ''' Überprüft ob der angegebene Index im Objekttyp existiert - ''' - ''' Name des zu durchsuchenden Objekttyps - ''' Name des zu suchenden Indexes - ''' Liefert True wenn der Index im Objekttyp existiert, sonst False - ''' - Public Function ExistIndexInObjekttyp(ByVal objekttyp As String, ByVal indexname As String) As Boolean - Try - Dim indexnamen() As String = Me.GetIndicesByObjecttype(objekttyp) - - If indexnamen Is Nothing Then Return False - - For Each index As String In indexnamen - If index = indexname Then Return True - Next - - Catch ex As Exception -LOGGER.Error(ex) - MsgBox("Beim Prüfen ob ein Index für einen Objekttypen existiert, ist ein Fehler aufgetreten." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Prüfen auf Existenz eines Index in einem Objekttyp") - End Try - - Return False - - End Function - -#End Region - - - -#Region "+++++ Allgemeine Funktionen die Informationen zurückliefern +++++" - - ''' - ''' Liefert True wenn die windream-Session angemeldet ist und False für den Fall, dass die Session nicht eingeloggt ist. - ''' - ''' Anmeldestatus als Boolean - ''' - Public Function IsLoggedIn() As Boolean - Try - Return Me.oSession.aLoggedin - Catch ex As Exception -LOGGER.Error(ex) - MsgBox("Es konnte nicht erfolgreich geprüft werden, ob das Programm am windream-Server angemeldted ist." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler bei Loggedin-Prüfung") - End Try - - Return False - End Function - - ''' - ''' Liefert den Servernamen an dem windream aktuell angemeldet ist. - ''' - ''' Servername als String - ''' - Public Function GetCurrentServer() As String - Try - Return Me.oBrowser.GetCurrentServer 'ClassWindream.oBrowser.GetCurrentServer - Catch ex As Exception -LOGGER.Error(ex) - MsgBox("Der aktuell gewählte windream-Server konnte nicht ausgelesen werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen des windream-Servers") - End Try - - Return "" - End Function - - 'Public Function GetSharedCurrentServer() As String - ' Try - ' Return ClassWindream.oBrowser.GetCurrentServer - ' Catch ex As Exception - ' MsgBox("Der aktuell gewählte windream-Server konnte nicht ausgelesen werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen des windream-Servers") - ' End Try - - ' Return "" - 'End Function - - - ''' - ''' Liefert das Windream-Laufwerk des windream-Servers, in Form '[Laufwerksbuchstabe]:'. (z.B. 'W:') - ''' - ''' Laufwerksbuchstabe mit Doppelpunkt als String - ''' - 'Public Function GetWindreamDriveLetter() As String - - ' Try - ' Dim oControl As AISCONTROLDATACOMLib.AISControlData - ' Dim sDrive As String = "" - - ' oControl = New AISCONTROLDATACOMLib.AISControlData - - ' sDrive = oControl.GetStringValue(&H10040003) - - ' Return sDrive & ":" - - ' Catch ex As Exception - ' MsgBox("Fehlernachricht: " & ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen des windream-Laufwerks") - ' End Try - - ' Return "" - 'End Function - - ''' - ''' Liefert den Typen eines Indexes als Integer. - ''' - ''' Name des zu überprüfenden Indexfeldes - ''' Liefert eine Zahl, die einen Typen beschreibt - ''' - - Public Function GetValuesfromAuswahlliste(ByVal _auswahlliste As String) As Object - Try - 'Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname) - 'Dim vType = oAttribute.getVariableValue("vItems") - 'Return vType - Dim oChoiceList = oSession.GetWMObjectByName(WMEntityChoiceList, _auswahlliste) - If Err.Number = 0 And TypeName(oChoiceList) <> "Nothing" Then - Dim Values = oChoiceList - Values = oChoiceList.GetVariableValue("vItems") - Dim anz As Integer = 0 - 'If LogErrorsOnly = False Then MsgBox("Try getting values for resullist: " & _auswahlliste) - For Each CLItem In Values - If oChoiceList.aName IsNot Nothing Then - anz += 1 - End If - Next - Dim strListe(anz - 1) - Dim zahl As Integer = 0 - For Each CLItem In Values - 'If LogErrorsOnly = False Then MsgBox("Item: " & CLItem) - If oChoiceList.aName IsNot Nothing Then - strListe(zahl) = CLItem - zahl += 1 - End If - Next - Return strListe - Else - MsgBox("Auswahlliste: " & _auswahlliste & " nicht gefunden!", MsgBoxStyle.Critical, "Fehler:") - Return Nothing - End If - - Catch ex As Exception -LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in GetValuesfromAuswahlliste:") - Return Nothing - End Try - End Function -#End Region -End Class diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 68b5975..673fca5 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -139,7 +139,8 @@ False - + + False ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll @@ -158,26 +159,8 @@ P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll - - False - ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\Independentsoft.Msg.dll - - - False - True - ..\..\..\..\Interop.WINDREAMLib.dll - - - ..\..\..\..\Interop.WMOBRWSLib.dll - True - - - ..\..\..\..\Interop.WMOSRCHLib.dll - True - - - ..\..\..\..\Interop.WMOTOOLLib.dll - True + + ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\Independentsoft.Msg.2.0.570.21482.dll @@ -266,8 +249,6 @@ - - True diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index f88afdb..a994254 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -1,5 +1,4 @@ -Imports WINDREAMLib -Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging Module ModuleRuntimeVariables @@ -30,7 +29,6 @@ Module ModuleRuntimeVariables Public CURRENT_CONN_ID As Integer Public CURRENT_JUMP_DOC_GUID As Integer - Public CURRENT_WMFILE As WMObject Public CURRENT_DOC_PATH As String Public ERROR_STATE = "" @@ -108,8 +106,6 @@ Module ModuleRuntimeVariables Public CURRENT_CONTROL_ID As Integer Public errormessage As String - - Public WINDREAM As ClassPMWindream Public FINALINDICES As ClassFinalIndex Public IDBData As ClassIDBData Public LOGCONFIG As LogConfig diff --git a/app/DD_PM_WINDREAM/clsPatterns.vb b/app/DD_PM_WINDREAM/clsPatterns.vb index d852e1a..4f35cd7 100644 --- a/app/DD_PM_WINDREAM/clsPatterns.vb +++ b/app/DD_PM_WINDREAM/clsPatterns.vb @@ -1,6 +1,4 @@ Imports System.Text.RegularExpressions -Imports WINDREAMLib - ''' ''' Defines common Functions for Checking for and replacing placeholders. ''' This Class also includes a child class `Pattern` for passing around Patterns. @@ -51,13 +49,13 @@ Public Class clsPatterns End Function - Public Shared Function ReplaceAllValues(input As String, panel As Panel, document As WMObject, prename As Object, surname As Object, shortname As Object, language As Object, email As Object, userId As Object, profileId As Object) As String + Public Shared Function ReplaceAllValues(input As String, panel As Panel, WMdocument As Object, prename As Object, surname As Object, shortname As Object, language As Object, email As Object, userId As Object, profileId As Object) As String Try Dim result = input LOGGER.Debug($"inputString BEFORE replacing: [{result}]") result = ReplaceInternalValues(result) result = ReplaceControlValues(result, panel) - If Not IsNothing(document) Then result = ReplaceWindreamIndicies(result, document) + If IDB_ACTIVE = True Then result = ReplaceIDBAttributes(result) End If @@ -171,31 +169,6 @@ Public Class clsPatterns End Try End Function - Public Shared Function ReplaceWindreamIndicies(input As String, document As WMObject) As String - Try - Dim result = input - Dim oTryCounter As Integer = 0 - While ContainsPattern(result, PATTERN_WMI) - - Dim indexName As String = GetNextPattern(result, PATTERN_WMI).Value - Dim oWMValue = document.GetVariableValue(indexName) - If IsNothing(oWMValue) And oTryCounter = MAX_TRY_COUNT Then - LOGGER.Warn("Exit from ReplaceWindreamIndicies as oWMValue is still nothing and oTryCounter is 500!") - Throw New Exception("Max tries in ReplaceWindreamIndicies exceeded.") - - End If - If oWMValue IsNot Nothing Then - result = ReplacePattern(result, PATTERN_WMI, oWMValue) - End If - oTryCounter += 100 - End While - LOGGER.Debug("sql after ReplaceWindreamIndicies: " & input) - Return result - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Error in ReplaceWindreamIndicies:" & ex.Message) - End Try - End Function Public Shared Function ReplaceIDBAttributes(input As String) As String Try Dim result = input diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index c5c43c8..776198c 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -73,58 +73,9 @@ Public Class frmAdministration Me.cmbLOGIndex.Items.Add("") cmbLOGIndex.Enabled = True Label9.Enabled = True - If IDB_ACTIVE = False Then - PM_VEKTOR_INDEXComboBox.Enabled = True - Label4.Enabled = True - If cmbObjekttypen.Text = "DEFAULT" And IDB_ACTIVE = False Then - MsgBox("The Objecttype is invalid!", MsgBoxStyle.Exclamation) - Exit Sub - End If - Try - Dim indexe = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text) - If indexe IsNot Nothing Then - For Each index As String In indexe - Dim _vektorString As Boolean = False - Select Case WINDREAM.GetTypeOfIndex(index) - Case 4097 - _vektorString = True - Case 36865 - _vektorString = True - Case Else - _vektorString = False - End Select - If _vektorString = True Then - Me.PM_VEKTOR_INDEXComboBox.Items.Add(index) - Me.cmbLOGIndex.Items.Add(index) - End If - - Next - End If - MyIndicies_Types = New List(Of Integer) - MyIndicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() - For Each i In MyIndicies - Dim type = WINDREAM.GetTypeOfIndex(i) - MyIndicies_Types.Add(type) - Next - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Error in GetIndices windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - PM_VEKTOR_INDEXComboBox.SelectedIndex = -1 - cmbLOGIndex.SelectedIndex = -1 - End Try - If Me.PM_VEKTOR_INDEXComboBox.Text <> "" Then - PM_VEKTOR_INDEXComboBox.SelectedIndex = PM_VEKTOR_INDEXComboBox.FindStringExact(Me.PM_VEKTOR_INDEXComboBox.Text) - Else - PM_VEKTOR_INDEXComboBox.SelectedIndex = -1 - End If - If Me.cmbLOGIndex.Text <> "" Then - cmbLOGIndex.SelectedIndex = cmbLOGIndex.FindStringExact(Me.cmbLOGIndex.Text) - Else - cmbLOGIndex.SelectedIndex = -1 - End If - Else '############## IDB ACTIVE ################# + '############## IDB ACTIVE ################# - PM_VEKTOR_INDEXComboBox.Enabled = False + PM_VEKTOR_INDEXComboBox.Enabled = False Label4.Enabled = False Try For Each oRow As DataRow In IDBData.DTVWIDB_BE_ATTRIBUTE.Rows @@ -151,7 +102,6 @@ Public Class frmAdministration - End If End Sub @@ -179,26 +129,11 @@ Public Class frmAdministration End Sub Private Sub ObjekttypenEintragen() Me.cmbObjekttypen.Items.Clear() - If IDB_ACTIVE = False Then - Try - Dim oDokumentTypen As WINDREAMLib.WMObjects = WINDREAM.GetObjecttypesAsObjects() - If oDokumentTypen Is Nothing Then Exit Sub - For Each aType In oDokumentTypen - Me.cmbObjekttypen.Items.Add(aType.aName) - Next - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Es konnte keine Verbindung zum windream-Server hergestellt werden.", MsgBoxStyle.Critical, "Fehler beim Zugriff auf windream-Server") - End Try - Else - Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY" - Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) - For Each oROW As DataRow In oDT.Rows - Me.cmbObjekttypen.Items.Add(oROW.Item(1)) - Next - End If - - + Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY" + Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + For Each oROW As DataRow In oDT.Rows + Me.cmbObjekttypen.Items.Add(oROW.Item(1)) + Next End Sub Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles btnWMSuche.Click @@ -444,180 +379,6 @@ Public Class frmAdministration End Select End Sub - 'Private Sub cmbIndexe_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) - ' If cmbIndexe.SelectedIndex <> -1 Then - ' 'MsgBox(_windreamPM.GetTypeOfIndex(cmbIndexe.Text)) - ' btnInsert_FinalIndex.Enabled = True - ' Me.btnStampDate.Visible = False - ' Me.btnStampDate.Visible = False - ' Dim type = _windreamPM.GetTypeOfIndex(cmbIndexe.Text) - ' Select Case type - ' Case 1 'String - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Text)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 2 'Integer - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Zahl)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 3 'Float - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Decimal)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4 ' Boolean - ' Me.lblIndex.Text = "Wählen Sie den Boolean-Wert: (Ja/Nein)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = False - ' Me.grbxSystemStamps.Visible = False - ' Me.chkbxfinalIndex.CheckState = CheckState.Checked - ' Me.chkbxfinalIndex.Visible = True - ' Case 5 'Date - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Date)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4107 'Vektor Zahl - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Zahl)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4097 'Vektor String - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Text)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4100 'Vektor Bool - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Boolean)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.btnStampDate.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4101 'Vektor Date - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Date)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4104 - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Currency)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case Else - ' btnInsert_FinalIndex.Enabled = False - ' End Select - - ' End If - 'End Sub - - 'Private Sub btnInsert_FinalIndex_Click(sender As System.Object, e As System.EventArgs) - ' Me.lblSaveFinalIndex.Visible = False - ' If CheckBoxPMVEKTOR.Checked = False Then - ' If cmbIndexe.SelectedIndex <> -1 Then - ' Dim indexwert As String = "" - ' If txtindexwert_final.Visible = True Then - ' indexwert = txtindexwert_final.Text - ' Else - ' If chkbxfinalIndex.CheckState = CheckState.Checked Then - ' indexwert = 1 - ' Else - ' indexwert = 0 - ' End If - - ' End If - ' Try - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe.Text, indexwert, USER_USERNAME, 0, "") - ' Me.lblSaveFinalIndex.Text = "Der Index wurde erfolgreich angelegt - " & Now - ' Me.lblSaveFinalIndex.Visible = True - - ' Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Anlage Final Index:") - ' End Try - - ' End If - ' Else - ' If txtBezeichner.Text <> "" Then - ' Dim indexwert As String = "" - ' If txtindexwert_final.Visible = True Then - ' indexwert = txtindexwert_final.Text - ' Else - ' If chkbxfinalIndex.CheckState = CheckState.Checked Then - ' indexwert = "True" - ' Else - ' indexwert = "False" - ' End If - - ' End If - ' Try - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, "[%VKT" & txtBezeichner.Text, indexwert, USER_USERNAME, 0, "") - ' Me.lblSaveFinalIndex.Text = "Der Index wurde erfolgreich angelegt - " & Now - ' Me.lblSaveFinalIndex.Visible = True - ' Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Anlage Final Index in VEKTORFELD:") - ' End Try - ' End If - ' End If - ' Refresh_Final_indexe() - ' INSERT_ACTIVE = False - ' TabControlFinalIndices.Enabled = False - - 'End Sub - 'Private Sub ToolStripButton1_Click_1(sender As System.Object, e As System.EventArgs) - ' Refresh_Final_indexe() - ' INSERT_ACTIVE = False - ' TabControlFinalIndices.Enabled = False - - ' txtBezeichner.Text = String.Empty - ' txtindexwert_final.Text = String.Empty - 'End Sub - - Private Sub tsbtnProfilkopieren_Click(sender As System.Object, e As System.EventArgs) - - End Sub - Private Function Execute_SQL(SQL As String) - Try - Dim SQLconnection As New SqlClient.SqlConnection(CONNECTION_STRING) - Dim SQLcommand As New SqlCommand(SQL, SQLconnection) - SQLconnection.Open() - SQLcommand.ExecuteNonQuery() - SQLcommand.Dispose() - SQLconnection.Close() - Return True - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler in Execute_SQL: " & vbNewLine & ex.Message & vbNewLine & vbNewLine & " SQL: " & SQL) - Return False - End Try - End Function - - Private Sub CancelFinalIndexInsert() INSERT_ACTIVE = False @@ -638,12 +399,6 @@ Public Class frmAdministration End If End Sub - Private Sub ToolStripButton4_Click(sender As Object, e As EventArgs) - Cursor = Cursors.WaitCursor - frmUserKonfig_AddUsers.ShowDialog() - Load_User() - Cursor = Cursors.Default - End Sub Private Sub ToolStripButton12_Click(sender As Object, e As EventArgs) Load_User() End Sub @@ -666,24 +421,6 @@ Public Class frmAdministration Indexe_eintragen() End If End Sub - - Private Sub Button3_Click_1(sender As Object, e As EventArgs) - Dim indexe = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text) - If indexe IsNot Nothing Then - For Each index As String In indexe - MsgBox(index & vbNewLine & WINDREAM.GetTypeOfIndex(index)) - Select Case WINDREAM.GetTypeOfIndex(index) - Case 4107 'Vektor Zahl - - Case 4097 - - Case Else - - End Select - Next - End If - End Sub - 'Private Sub TabControlFinalIndices_SelectedIndexChanged(sender As Object, e As EventArgs) ' If TabControlFinalIndices.SelectedIndex = 1 Then ' Me.cmbIndexe2.Enabled = False diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 3c3f4ce..fe4eedf 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -36,21 +36,13 @@ Public Class frmFormDesigner ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER CURRENT_DESIGN_TYPE = "INPUT_INDEX" - ' Profil Name in Fenstertitel setzen Text = $"Validation Designer - Profil: {ProfileName}" ' Try - ' Windream initialisieren - If IDB_ACTIVE = False Then - clsWindream.Create_Session() - btnButton.Visible = False - Else - btnButton.Visible = True - End If - + btnButton.Visible = True - 'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden + 'Abfragen, sollten einmal beim Start des Formulars geladen werden Dim unsortedIndicies Dim sortedIndicies As List(Of String) If IDB_ACTIVE = False Then diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index daf873e..fc6a40c 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -52,16 +52,7 @@ Public Class frmMain LOGGER.Error(ex) LOGGER.Info("Error in Save FormLayout: " & ex.Message) End Try - If IDB_ACTIVE = False Then - Try - If WINDREAM?.oSession?.aLoggedin = True Then - WINDREAM.Stop_WMCC_andCo() - End If - Catch ex As Exception - - End Try - End If Try ClassAllgemeineFunktionen.LoginOut("LOGOUT") @@ -190,32 +181,9 @@ Public Class frmMain Check_Timer_Notification() formShown = True Restore_Form_Position() - - If IDB_ACTIVE = False And ERROR_STATE = "" Then - Try - WINDREAM = New ClassPMWindream - WINDREAM.Start_WMCC_andCo() - If Not IsNothing(WINDREAM.oSession) Then - If WINDREAM.oSession.aLoggedin = False Then - MsgBox("You could not be logged in to windream. Please check the log.", MsgBoxStyle.Critical) - End If - Else - MsgBox("Login on windream was not possible. Please check the log.", MsgBoxStyle.Critical) - End If - '_windreamPM = New ClassPMWindream - '_windreamPM.Start_WMCC_andCo() - - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Unexpected Error in windream-login - Step 5: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - End Try - Else - Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" - IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) - LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}") - End If - - + Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" + IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}") LOGGER.Debug("MainForm initialized!") End If formopenClose = False @@ -1265,24 +1233,7 @@ Public Class frmMain Return False End Try End Function - Private Function Init_windream() - Try - '_windream = New ClassWindream_allgemein - '_windream.Create_Session() - '_windreamPM = New ClassPMWindream() - '_windreamPM.Create_Session() - WINDREAM = New ClassPMWindream() - WINDREAM.Create_Session() - - LOGGER.Debug("windream initialized") - Return True - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Error Init_windream:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - LOGGER.Info("Unexpected error in Init_windream: " & ex.Message, True) - Return False - End Try - End Function + Private Sub tsmiMarkedFilesFinish_Click(sender As Object, e As EventArgs) Handles tsmiMarkedFilesFinish.Click Try Dim oSelectedRows As Integer() = GridView_Docs.GetSelectedRows() @@ -1309,13 +1260,7 @@ Public Class frmMain Exit Sub End If - If IDB_ACTIVE = False Then - SOURCE_INIT = Init_windream() - - Else - SOURCE_INIT = Init_IDB() - End If - + SOURCE_INIT = Init_IDB() If SOURCE_INIT = True Then diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index 1b226dc..41b389d 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -1,5 +1,4 @@ -Imports WINDREAMLib -Imports Oracle.ManagedDataAccess.Client +Imports Oracle.ManagedDataAccess.Client Imports System.ComponentModel Imports DD_LIB_Standards Imports DigitalData.Controls.LookupGrid @@ -23,29 +22,24 @@ Public Class frmMassValidator Private _dependingControl_in_action As Boolean = False Private oErrorMessage As String - Private _windream As New ClassWindream_allgemein - 'Private _windreamPM As New ClassPMWindream + + Private _allgFunk As New ClassAllgemeineFunktionen Dim viewer_string As String Dim pdfxchange As Boolean = False Dim sumatra As Boolean = False - Dim WMObject As WMObject + Private Sub frmMassValidator_Load(sender As Object, e As EventArgs) Handles Me.Load FORM_Shown = False Try - ' 05.10.18: Nutzung des Globalen Windream Objekts WINDREAM - '_windream = New ClassWindream_allgemein - '_windream.Create_Session() - '_windreamPM = New ClassPMWindream() - '_windreamPM.Create_Session() - LOGGER.Debug("windream initialized frmMassValidator") + LOGGER.Debug("initialized frmMassValidator") Catch ex As Exception LOGGER.Error(ex) - MsgBox("Error Init_windream:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - LOGGER.Info(">> Fehler in Init_windream: " & ex.Message, True) + MsgBox("Error Init:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + LOGGER.Info(">> Fehler in Init: " & ex.Message, True) Exit Sub End Try @@ -258,7 +252,7 @@ Public Class frmMassValidator Else If CURR_CHOICE_LIST <> "" Then LOGGER.Debug("In add_ComboBox - AListe: " & CURR_CHOICE_LIST) - Dim liste = WINDREAM.GetValuesfromAuswahlliste(CURR_CHOICE_LIST) + Dim liste = "ToDo IDB LIST" If liste IsNot Nothing Then cmb.Items.Add("") For Each index As String In liste @@ -266,7 +260,7 @@ Public Class frmMassValidator Next cmb.SelectedIndex = -1 Else - MsgBox("Resultliste windream is nothing!", MsgBoxStyle.Exclamation, CURR_CHOICE_LIST) + MsgBox("ChiceList is nothing!", MsgBoxStyle.Exclamation, CURR_CHOICE_LIST) End If End If End If @@ -400,7 +394,7 @@ Public Class frmMassValidator End If If Not IsDBNull(filteredData.Rows(0).Item("CONNECTION_ID")) And Not IsDBNull(filteredData.Rows(0).Item("SQL_UEBERPRUEFUNG")) Then Dim oSqlCommand = IIf(IsDBNull(filteredData.Rows(0).Item("SQL_UEBERPRUEFUNG")), "", filteredData.Rows(0).Item("SQL_UEBERPRUEFUNG")) - oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) LOGGER.Debug(">>> sql after ReplaceAllValues: " & oSqlCommand) _dependingControl_in_action = True Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand) @@ -486,7 +480,7 @@ Public Class frmMassValidator frmError.ShowDialog() LOGGER.Info(">> Unexpected error in FillIndexValues TextBox(MI): " & ex.Message, True) LOGGER.Info(">> Controltype: " & controltype) - LOGGER.Info(">> Indexname windream: " & indexname) + LOGGER.Info(">> Indexname: " & indexname) Exit Sub End Try @@ -709,7 +703,7 @@ Public Class frmMassValidator frmError.ShowDialog() LOGGER.Info(">> Unexpected Error in FillIndexValues(MIs: " & ex.Message, True) LOGGER.Info(">> Controltype: " & controltype) - LOGGER.Info(">> Indexname windream: " & indexname) + LOGGER.Info(">> Indexname: " & indexname) End Try @@ -722,18 +716,18 @@ Public Class frmMassValidator Dim tempIndexValue Dim idoccount As Integer = 1 For Each docrow As DataRow In CURRENT_DT_MASS_CHANGE_DOCS.Rows - Dim WMDOC As WMObject + Dim WMDOC As Object = Nothing Try - WMDOC = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, docrow.Item("FULL_PATH")) + WMDOC = "ToDo Get IDB DOC Info" Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("error while creating WMObject in (textCheckIndex): " & ex.Message) Exit For End Try If Not IsNothing(WMDOC) Then - CURRENT_WMFILE = WMDOC + If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - tempIndexValue = ReturnVektor_IndexValue(idxname, WMDOC) + tempIndexValue = Nothing 'IDB Else Try tempIndexValue = WMDOC.GetVariableValue(idxname) @@ -774,53 +768,8 @@ Public Class frmMassValidator Return "Unexp. error in GetWM_Value_Multiple_Docs" End Try End Function - Private Function ReturnVektor_IndexValue(VKTBezeichner As String, WMFile As WMObject) - Try - Dim value - Dim name = VKTBezeichner.Replace("[%VKT", "") - Dim Sort_Arr() As String - Dim i As Integer = 0 - 'Jetzt im Vektorfeld des Profils nachsehen ob der WErt bereits vorhanden ist - Dim wertWD = WMFile.GetVariableValue(PROFIL_VEKTORINDEX) - If wertWD Is Nothing = False Then - 'Es wird gegen ein Vektorfeld nachindexiert - If wertWD.GetType.ToString.Contains("System.Object") Then - 'es handelt sich um ein Vektorfeld - Zuweisen der Indexwerte des Vektorfeldes zu Array - For Each obj As Object In wertWD - If obj Is Nothing = False Then - ReDim Preserve Sort_Arr(i) - Sort_Arr(i) = obj.ToString() - i += 1 - End If - Next - 'Das Ergebnis-Array nun Rückwärts sortieren, um die letzte Änderung zu finden - For Each _string As Object In Sort_Arr.Reverse() - Dim DDPM_String As String = _string.ToString() - ' - Dim VektorArray() = Split(DDPM_String, Delimiter) - If VektorArray(1).ToString.ToLower = name.ToLower Then - value = VektorArray(2) - Exit For - End If - - Next - - End If - End If - If value Is Nothing Then value = "" - Return value - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Unexpected Error in ReturnVektor_IndexValue(MV): " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - LOGGER.Info("Unexpected Error in ReturnVektor_IndexValue(MV): " & ex.Message) - Return "" - End Try - - - End Function - Public Sub OnTextBoxFocus(sender As Object, e As EventArgs) Dim box As TextBox = sender box.BackColor = Color.Lime @@ -851,7 +800,7 @@ Public Class frmMassValidator Dim displayboxname = ROW.Item(Name).ToString If Not IsDBNull(ROW.Item(1)) And Not IsDBNull(ROW.Item(2)) Then Dim sql_Statement = ROW.Item(2) - sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, WMObject, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _dependingControl_in_action = True Depending_Control_Set_Result(displayboxname, sql_Statement, ROW.Item(1)) @@ -927,7 +876,7 @@ Public Class frmMassValidator If Not IsDBNull(ROW.Item("CONNECTION_ID")) And Not IsDBNull(ROW.Item("SQL_UEBERPRUEFUNG")) Then Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG") - sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, WMObject, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _dependingControl_in_action = True @@ -1127,7 +1076,7 @@ Public Class frmMassValidator GetWMDocPathWindows(0) If CreateWMObject() = True Then - If ClassFinalizeDoc.Write_Final_Metadata(CURRENT_WMFILE) = True Then + If ClassFinalizeDoc.WMWrite_Final_Metadata(Nothing) = True Then Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", USER_USERNAME, CURRENT_DOC_GUID) If ClassDatabase.Execute_non_Query(sql) = True Then workedFiles += 1 @@ -1256,11 +1205,12 @@ Public Class frmMassValidator '####### WENN MOVE2FOLDER KONFIGURIERT IST####### If MOVE2Folder <> "" Then - Dim idxerr_message = _allgFunk.Move2Folder(docrow.Item("FULL_PATH").ToString, MOVE2Folder, CURRENT_ProfilGUID, _windream) - If idxerr_message <> "" Then - MsgBox("Error in Move2Folder - Check the log And inform Your sysadmin", MsgBoxStyle.Critical) + ' "ToDo IDB" + 'Dim idxerr_message = _allgFunk.Move2Folder(docrow.Item("FULL_PATH").ToString, MOVE2Folder, CURRENT_ProfilGUID, _windream) + 'If idxerr_message <> "" Then + ' MsgBox("Error in Move2Folder - Check the log And inform Your sysadmin", MsgBoxStyle.Critical) - End If + 'End If End If End If @@ -1322,7 +1272,7 @@ Public Class frmMassValidator End Function Private Function CreateWMObject() As String - CURRENT_WMFILE = Nothing + LOGGER.Debug($"in GetWMDocFileString...'") Dim oWMRELPATH As String = BASEDATA_DT_CONFIG.Rows.Item(0).Item("WM_REL_PATH") If oWMRELPATH.EndsWith("\") = False Then @@ -1331,9 +1281,9 @@ Public Class frmMassValidator Dim oWMOwnPath = WMDocPathWindows.Replace(oWMRELPATH, "") LOGGER.Debug($"oWMOwnPath: {oWMOwnPath}") Try - Dim oNormalizedPath = WINDREAM.NormalizePath(oWMOwnPath) + Dim oNormalizedPath = "ToDo IDB Normalize" LOGGER.Debug($"oNormalizedPath: {oNormalizedPath}") - CURRENT_WMFILE = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, oNormalizedPath) + WMDocFileString = oNormalizedPath LOGGER.Debug("WMDocFileString: " & WMDocFileString) Return True @@ -1700,7 +1650,7 @@ Public Class frmMassValidator If docrow.Item("DOC_ID") = 0 Then Continue For End If - Dim WMDOC As WMObject + Dim oRelPath = docrow.Item("FULL_PATH").ToString Try If oRelPath.StartsWith("W") Then @@ -1713,7 +1663,6 @@ Public Class frmMassValidator End If End If - WMDOC = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, oRelPath) Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("error while creating WMObject in (IndexMultipleFiles): " & oRelPath) @@ -1746,10 +1695,11 @@ Public Class frmMassValidator arrValue(0) = idxvalue(0).ToString End If 'Jetzt das eigentliche Indexieren der Datei - If WINDREAM.RunIndexing(WMDOC, arrIndex, arrValue) = False Then - _allfine = False - Exit For - End If + '"ToDo Set Variable" + 'If WINDREAM.RunIndexing(WMDOC, arrIndex, arrValue) = False Then + ' _allfine = False + ' Exit For + 'End If End If Next @@ -1765,9 +1715,9 @@ Public Class frmMassValidator Dim _allfine As Boolean = True Dim missing As Boolean = False For Each docrow As DataRow In CURRENT_DT_MASS_CHANGE_DOCS.Rows - Dim WMDOC As WMObject + Dim WMDOC As Object '"To Do IDB" Try - WMDOC = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, docrow.Item("FULL_PATH")) + WMDOC = "ToDo IDB" Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("error while creating WMObject in (IndexVKTMultipleFiles): " & ex.Message) @@ -1807,51 +1757,16 @@ Public Class frmMassValidator If myInputArr.Length > 0 Then 'Jetzt die Datei indexieren - If IndexSinglefile(WMDOC, NameVKTIndex, myInputArr) = False Then - missing = True - End If + 'IDB ToDO + 'If IndexSinglefile(WMDOC, NameVKTIndex, myInputArr) = False Then + ' missing = True + 'End If End If Next Return missing End Function - Private Function IndexSinglefile(_dok As WINDREAMLib.WMObject, idxxname As String, idxvalue As Object) - Dim File_indexiert As Boolean = False - Try - 'Die Arrays vorbereiten - Dim arrIndex() As String = Nothing - Dim arrValue() As String = Nothing - arrIndex = Nothing - arrValue = Nothing - 'Den Indexnamen übergeben - ReDim Preserve arrIndex(0) - arrIndex(0) = idxxname - 'Das Array der Idnexwerte überprüfen - If idxvalue Is Nothing = False Then - If idxvalue.Length() > 1 Then - LOGGER.Debug("Indexing Index '" & idxxname & "' with Arrayvalue") - Dim anzahl As Integer = 0 - For Each indexvalue As String In idxvalue - ReDim Preserve arrValue(anzahl) - arrValue(anzahl) = indexvalue - anzahl += 1 - Next - Else - LOGGER.Debug("Indexing Index '" & idxxname & "' with value '" & idxvalue(0) & "'") - ReDim Preserve arrValue(0) - arrValue(0) = idxvalue(0).ToString - End If - 'Jetzt das eigentliche Indexieren der Datei - File_indexiert = WINDREAM.RunIndexing(_dok, arrIndex, arrValue) - Return File_indexiert - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Unexpected Error in IndexSinglefile: " & ex.Message.ToString, True) - Return Err() - End Try - End Function Function Return_PM_VEKTOR(input As String, VKTBezeichner As String) Dim PM_String As String Try diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 7ee6de4..103fd4f 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -58,29 +58,12 @@ Public Class frmSQL_DESIGNER btnAddControl.Visible = True cmbIndexe.Items.Clear() - If IDB_ACTIVE = False Then - Dim oIndicies = WINDREAM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE) - If oIndicies IsNot Nothing Then - For Each index As String In oIndicies - cmbIndexe.Items.Add(index) - Next - cmbIndexe.SelectedIndex = -1 - End If - 'cmbIndexe.Enabled = True - 'lbIndexe.Enabled = True - 'btnAddIndex.Enabled = True - Else - Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) - If oAttributes IsNot Nothing Then - For Each oAttribute As String In oAttributes - cmbIndexe.Items.Add(oAttribute) - Next - cmbIndexe.SelectedIndex = -1 - End If - - 'cmbIndexe.Enabled = False - 'lbIndexe.Enabled = False - 'btnAddIndex.Enabled = False + Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) + If oAttributes IsNot Nothing Then + For Each oAttribute As String In oAttributes + cmbIndexe.Items.Add(oAttribute) + Next + cmbIndexe.SelectedIndex = -1 End If Else @@ -90,7 +73,6 @@ Public Class frmSQL_DESIGNER cmbIndexe.Visible = False lbIndexe.Visible = False btnAddIndex.Visible = False - End If Catch ex As Exception LOGGER.Error(ex) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 77ce34a..81931cd 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1,5 +1,4 @@ -Imports WINDREAMLib -Imports System.Threading +Imports System.Threading Imports System.Runtime.InteropServices Imports Oracle.ManagedDataAccess.Client Imports Independentsoft @@ -23,8 +22,6 @@ Public Class frmValidator Dim WD_Search As String Dim finalProfile As Boolean Dim Move2Folder As String - 'Private _windreamPM As New ClassPMWindream - Private _windream As New ClassWindream_allgemein Private allgFunk As New ClassAllgemeineFunktionen 'speichert die DocumentDaten @@ -305,21 +302,6 @@ Public Class frmValidator MsgBox("Error Init_IDB:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") End Try End Function - Private Function Init_windream() - Try - WINDREAM = New ClassPMWindream() - WINDREAM.Create_Session() - LOGGER.Debug("windream initialized") - Return True - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Error Init_windream:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - allgFunk.Insert_LogEntry($"ERROR Init_windream >> {ex.Message}") - LOGGER.Info(">> Error Init_windream: " & ex.Message, True) - Return False - End Try - End Function - Public Sub Load_Additional_Searches() If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then Dim oDocResultCommand As String @@ -330,14 +312,14 @@ Public Class frmValidator 'Check whether DocData is there Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") oDataResultCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") - oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) oDatatableDataResult = ClassDatabase.Return_Datatable(oDataResultCommand) End If If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then 'Check whether DocData is there Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) oDatatableDocResult = ClassDatabase.Return_Datatable(oDocResultCommand) End If @@ -381,7 +363,7 @@ Public Class frmValidator _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) End If @@ -389,7 +371,7 @@ Public Class frmValidator _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) End If @@ -444,7 +426,7 @@ Public Class frmValidator End If 'oSql = clsPatterns.ReplaceUserValues(sqlStatement, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) 'oSql = clsPatterns.ReplaceInternalValues(oSql) - oSQLStatement = clsPatterns.ReplaceAllValues(oSQLStatement, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSQLStatement = clsPatterns.ReplaceAllValues(oSQLStatement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) If IsNothing(oSQLStatement) Then Continue For End If @@ -558,7 +540,7 @@ Public Class frmValidator ' Dim oSqlStatement As String = row.Item("SQL_UEBERPRUEFUNG") ' Dim oConnectionId As Integer = row.Item("CONNECTION_ID") - ' oSql = clsPatterns.ReplaceAllValues(oSqlStatement, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + ' oSql = clsPatterns.ReplaceAllValues(oSqlStatement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) ' If clsPatterns.HasComplexPatterns(oSqlStatement) Then ' LOGGER.Warn($"Unexpected error LoadSQLData2 - sql Statement still has complex patterns! [{oSql}]") @@ -750,7 +732,7 @@ Public Class frmValidator sql = PreventNulletc(oControlRow.Item("SQL_UEBERPRUEFUNG")) 'TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) - 'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, CURRENT_WMFILE) + 'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, Nothing) 'If ClassPatterns.HasOnlySimplePatterns(sql) Then If clsPatterns.HasOnlySimplePatterns(sql) Then @@ -781,24 +763,9 @@ Public Class frmValidator LOGGER.Debug("Else Row 571") End If Else - LOGGER.Debug("AListe Handling") + LOGGER.Debug("CHOICE_LIST Handling") Dim AListe As String = oControlRow.Item("CHOICE_LIST") - LOGGER.Debug("In add_ComboBox - AListe: " & AListe) - If AListe Is Nothing = False Then - 'Dim liste = _windreamPM.GetValuesfromAuswahlliste(AListe) - Dim liste = WINDREAM.GetValuesfromAuswahlliste(AListe) - If liste IsNot Nothing Then - cmb.Items.Add("") - For Each index As String In liste - cmb.Items.Add(index) - Next - cmb.SelectedIndex = -1 - Else - MsgBox("Resultliste windream is nothing!", MsgBoxStyle.Exclamation, AListe) - End If - Else - MsgBox("AListe from database is nothing!", MsgBoxStyle.Exclamation, AListe) - End If + End If @@ -1058,7 +1025,7 @@ Public Class frmValidator Dim sql_Statement = ROW.Item(2) - sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) '' Regulären Ausdruck zum Auslesen der Indexe definieren 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" @@ -1126,8 +1093,8 @@ Public Class frmValidator Override_SQLCommand = "" End If ' = $"select SQL_UEBERPRUEFUNG,SQL2 FROM TBPM_PROFILE_CONTROLS WHERE GUID = {oControlID}" - oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL) If IsNothing(oDT_ACTIONS) Then MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) @@ -1372,7 +1339,7 @@ Public Class frmValidator End If If Not IsDBNull(oFilteredDatatable.Rows(0).Item("CONNECTION_ID")) And Not IsDBNull(oFilteredDatatable.Rows(0).Item("SET_CONTROL_DATA")) Then Dim oSqlCommand = IIf(IsDBNull(oFilteredDatatable.Rows(0).Item("SET_CONTROL_DATA")), "", oFilteredDatatable.Rows(0).Item("SET_CONTROL_DATA")) - oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _SetControlValue_in_action = True Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand) For Each oRowControl2Set As DataRow In oDTDEPENDING_RESULT.Rows @@ -1483,7 +1450,7 @@ Public Class frmValidator End If If Not IsDBNull(oRowDependingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")) Then Dim oSqlCommand = IIf(IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")), "", oRowDependingControl.Item("SQL_UEBERPRUEFUNG")) - oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _dependingControl_in_action = True Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand) Try @@ -1576,7 +1543,7 @@ Public Class frmValidator If _dependingColumn_in_action = True Then Exit Sub End If - oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _dependingColumn_in_action = True Try @@ -1620,7 +1587,7 @@ Public Class frmValidator _Step = 2 Dim sql_Statement = IIf(IsDBNull(ROW.Item("SQL_UEBERPRUEFUNG")), "", ROW.Item("SQL_UEBERPRUEFUNG")) - sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _Step = 3 '' Regulären Ausdruck zum Auslesen der Indexe definieren @@ -1808,7 +1775,6 @@ Public Class frmValidator WMDocPathWindows = "" CURRENT_DOC_PATH = "" - CURRENT_WMFILE = Nothing If newGUID > 0 Then LOGGER.Debug("newGUID: " & newGUID.ToString) @@ -1829,34 +1795,6 @@ Public Class frmValidator - Private Function CreateWMObject() As String - LOGGER.Debug($"in GetWMDocFileString...'") - Dim oWMRELPATH As String = BASEDATA_DT_CONFIG.Rows.Item(0).Item("WM_REL_PATH") - If oWMRELPATH.EndsWith("\") = False Then - oWMRELPATH = oWMRELPATH & "\" - End If - Dim oWMOwnPath = WMDocPathWindows.Replace(oWMRELPATH, "") - LOGGER.Debug($"oWMOwnPath: {oWMOwnPath}") - Try - Dim oNormalizedPath = WINDREAM.NormalizePath(oWMOwnPath) - CURRENT_WMFILE = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, oNormalizedPath) - WMDocFileString = oNormalizedPath - LOGGER.Debug("WMDocFileString: " & WMDocFileString) - Return True - Catch ex As Exception - Dim _err1 As Boolean = False - LOGGER.Error(ex) - allgFunk.Insert_LogEntry($"ERROR CreateWMObject >> {ex.Message}") - LOGGER.Info("Unexpected error creating WMObject(1) in GetWMDocFileString: " & ex.Message) - LOGGER.Info("Error Number: " & Err.Number.ToString) - errormessage = $"Could not create a WMObject(1) for [{oWMOwnPath}]!" - frmError.ShowDialog() - WMDocFileString = "" - Return False - - End Try - - End Function Private Function GetWMDocPathWindows(_CheckStandard As Integer) Try Dim oResult As String @@ -1864,13 +1802,15 @@ Public Class frmValidator oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") If File.Exists(oResult) = False Then - 'If USER_USERNAME = "SchreiberM" Then - ' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" - 'ElseIf USER_USERNAME = "Administrator" Then - ' 'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf" - ' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" - 'Else - LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") + If IDB_ACTIVE = True And USER_USERNAME.ToLower = "schreiberm" Then + oResult = "Q:\DigitalData - Geschäftsprozesse\BusinessApplication01\File\Ausgangsangebot\Gestempelt\GAANG-3471-aveco.pdf" + 'If USER_USERNAME = "SchreiberM" Then + ' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" + 'ElseIf USER_USERNAME = "Administrator" Then + ' 'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf" + ' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" + Else + LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) LOGGER.Debug($"Checking file 1[{oResult}] exists?...") @@ -1878,9 +1818,9 @@ Public Class frmValidator LOGGER.Warn($"File {oResult} not existing!") Return False End If - 'End If - End If - WMDocPathWindows = oResult + End If + End If + WMDocPathWindows = oResult OLD_Document_Path = WMDocPathWindows CURRENT_DOC_PATH = WMDocPathWindows LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") @@ -1907,7 +1847,7 @@ Public Class frmValidator Sub Load_Next_Document(first As Boolean) - CURRENT_WMFILE = Nothing + activate_controls(False) oErrorMessage = "" WMDocPathWindows = "" @@ -1921,7 +1861,6 @@ Public Class frmValidator Try If first = True Then LOGGER.Debug("First Document") - CURRENT_WMFILE = Nothing Else LOGGER.Debug("Following Document ") docCounter += 1 @@ -1950,17 +1889,11 @@ Public Class frmValidator MsgBox("Could not access the file! Check the log!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) Exit Sub End If - If IDB_ACTIVE = False Then - If CreateWMObject() = False Then - Exit Sub - End If - Else - Load_IDB_DOC_DATA() + Load_IDB_DOC_DATA() - If IDB_DT_DOC_DATA.Rows.Count = 1 Then + If IDB_DT_DOC_DATA.Rows.Count = 1 Then LOGGER.Debug("Got one IDB DocData Result") End If - End If 'Beschriftung des Navigators 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" If WMDocPathWindows <> String.Empty Then @@ -1975,13 +1908,6 @@ Public Class frmValidator bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID LOGGER.Debug("AllDocInfo created...") - If IDB_ACTIVE = False Then - oErrorMessage = Windream_get_Doc_info() - Else - ' oErrorMessage = IDB_GetDocInfo() - End If - - If oErrorMessage = "" Then @@ -2018,21 +1944,10 @@ Public Class frmValidator 'Nun loggen das das Profil geladen wurde If PROFIL_LOGINDEX <> "" Then Dim oLogString = $"PMProfile loaded: [{CURRENT_ProfilGUID}-{CURRENT_ProfilName}]{PMDelimiter}{USER_USERNAME}{PMDelimiter}{Now.ToString}" - If IDB_ACTIVE = False Then - WMIndexVectofield(oLogString, PROFIL_LOGINDEX) - Else - oLogString = $"PMProfile loaded: [{CURRENT_ProfilGUID}-{CURRENT_ProfilName}]" - IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogString) - 'LOGGER.Debug("Profilname erfolgreich in Vektorfeld LOG geschrieben") - 'Else - ' errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message - ' My.Settings.Save() - ' frmError.ShowDialog() - ' _error = True - + oLogString = $"PMProfile loaded: [{CURRENT_ProfilGUID}-{CURRENT_ProfilName}]" + IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogString) End If - End If activate_controls(True) Else errormessage = oErrorMessage @@ -2069,222 +1984,26 @@ Public Class frmValidator End Try End Sub Sub load_viewer() - DocumentViewerValidator.LoadFile(WMDocPathWindows) - DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) - If USER_RIGHT_VIEW_ONLY = True Then - RibbonPageFile.Visible = False - Else - RibbonPageFile.Visible = True - End If - SplitContainer1.Panel2Collapsed = False - - End Sub - Sub activate_controls(status As Boolean) - Me.pnldesigner.Enabled = status - Me.btnSave.Enabled = status - End Sub - Private Function Windream_get_Doc_info() Try - - 'If CultureInfo.CurrentUICulture.ThreeLetterISOLanguageName = "eng" Then - ' My.Settings.vIDX_DMS_ERSTELLT = "DMS Created" - ' dmsCreated = "DMS Created" - ' My.Settings.vIDX_DMS_ERSTELLT_Zeit = "DMS Created Time" - ' dmscreatedtime = "DMS Created Time" - ' My.Settings.Save() - 'Else - - 'End If - Try - LOGGER.Debug($"GetVariableValue [{INDEX_DMS_ERSTELLT}]...") - CURRENT_DOC_CREATION_DATE = CURRENT_WMFILE.GetVariableValue(INDEX_DMS_ERSTELLT) - Catch ex As Exception - LOGGER.Error(ex) - If ex.Message.Contains("Variable: " & INDEX_DMS_ERSTELLT & " not found!") Then - LOGGER.Info("1. Ausnahme in Windream_get_Doc_info: Variable: " & INDEX_DMS_ERSTELLT & " not found", True) - LOGGER.Info("1. Ausnahme-Fehler: " & ex.Message) - If INDEX_DMS_ERSTELLT = "DMS Created" Then - - INDEX_DMS_ERSTELLT = "DMS erstellt" - INDEX_DMS_ERSTELLT_ZEIT = "DMS erstellt (Zeit)" - CONFIG.Config.IndexDmsErstellt = INDEX_DMS_ERSTELLT - CONFIG.Config.IndexDmsErstelltZeit = INDEX_DMS_ERSTELLT_ZEIT - CONFIG.Save() - - 'SaveMySettingsValue("IDX_DMS_ERSTELLT_ZEIT", "DMS erstellt (Zeit)") - 'SaveMySettingsValue("IDX_DMS_ERSTELLT", "DMS erstellt") - Else - INDEX_DMS_ERSTELLT = "DMS Created" - INDEX_DMS_ERSTELLT_ZEIT = "DMS Created Time" - CONFIG.Config.IndexDmsErstellt = INDEX_DMS_ERSTELLT - CONFIG.Config.IndexDmsErstelltZeit = INDEX_DMS_ERSTELLT_ZEIT - 'SaveMySettingsValue("IDX_DMS_ERSTELLT", "DMS Created") - 'SaveMySettingsValue("IDX_DMS_ERSTELLT_ZEIT", "DMS erstellt Time") - End If - - CURRENT_DOC_CREATION_DATE = CURRENT_WMFILE.GetVariableValue(INDEX_DMS_ERSTELLT) - Else - LOGGER.Info("error in Windream_get_Doc_info 1: " & ex.Message) - Return "error in Windream_get_Doc_info 1: " & ex.Message - End If - End Try - - LOGGER.Debug("DMS-Erstellt aus WD: " & CURRENT_DOC_CREATION_DATE) - - Try - LOGGER.Debug($"GetVariableValue [{INDEX_DMS_ERSTELLT_ZEIT}]...") - CURRENT_DOC_CREATION_TIME = CURRENT_WMFILE.GetVariableValue(INDEX_DMS_ERSTELLT_ZEIT) - Catch ex As Exception - - If ex.Message.Contains("Variable: " & INDEX_DMS_ERSTELLT_ZEIT & " not found!") Then - LOGGER.Info("1. Ausnahme in Windream_get_Doc_info: Variable: " & INDEX_DMS_ERSTELLT_ZEIT & " not found", True) - If INDEX_DMS_ERSTELLT = "DMS Created" Then - - INDEX_DMS_ERSTELLT = "DMS erstellt" - INDEX_DMS_ERSTELLT_ZEIT = "DMS erstellt (Zeit)" - - CONFIG.Config.IndexDmsErstellt = INDEX_DMS_ERSTELLT - CONFIG.Config.IndexDmsErstelltZeit = INDEX_DMS_ERSTELLT_ZEIT - CONFIG.Save() - - 'SaveMySettingsValue("IDX_DMS_ERSTELLT_ZEIT", "DMS erstellt (Zeit)") - Else - INDEX_DMS_ERSTELLT = "DMS Created" - INDEX_DMS_ERSTELLT_ZEIT = "DMS Created Time" - - CONFIG.Config.IndexDmsErstellt = INDEX_DMS_ERSTELLT - CONFIG.Config.IndexDmsErstelltZeit = INDEX_DMS_ERSTELLT_ZEIT - CONFIG.Save() - - 'SaveMySettingsValue("IDX_DMS_ERSTELLT", "DMS Created") - 'SaveMySettingsValue("IDX_DMS_ERSTELLT_ZEIT", "DMS Created Time") - End If - LOGGER.Debug($"GetVariableValue (2) [{INDEX_DMS_ERSTELLT_ZEIT}]...") - CURRENT_DOC_CREATION_TIME = CURRENT_WMFILE.GetVariableValue(INDEX_DMS_ERSTELLT_ZEIT) - Else - LOGGER.Error(ex) - LOGGER.Info("error in Windream_get_Doc_info 3: " & ex.Message) - Return "error in Windream_get_Doc_info 3: " & ex.Message - End If - End Try - - LOGGER.Debug("DMSErstelltZeit aus WD: " & CURRENT_DOC_CREATION_TIME) - - If CURRENT_DOC_CREATION_TIME.Length > 11 Then - CURRENT_DOC_CREATION_DATE = CURRENT_DOC_CREATION_DATE & " " & CURRENT_DOC_CREATION_TIME.Substring(10) + DocumentViewerValidator.LoadFile(WMDocPathWindows) + DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) + If USER_RIGHT_VIEW_ONLY = True Then + RibbonPageFile.Visible = False Else - CURRENT_DOC_CREATION_DATE = CURRENT_DOC_CREATION_DATE & " " & CURRENT_DOC_CREATION_TIME + RibbonPageFile.Visible = True End If - - Return "" + SplitContainer1.Panel2Collapsed = False Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info("error in Windream_get_Doc_info (GENERELL): " & ex.Message) - Return "error in Windream_get_Doc_info (GENERELL): " & ex.Message + allgFunk.Insert_LogEntry($"ERROR load_viewer >> {ex.Message}") End Try - End Function - Private Function Return_VektorArray(ByVal oDocument As WMObject, vktIndexName As String, NIIndexe As Object, CheckDuplikat As Boolean, vType As Object) - Dim ValueArray() - - ' Try - Dim missing As Boolean = False - Dim Anzahl As Integer = 0 - - 'Jeden Wert des Vektorfeldes durchlaufen - Dim wertWD = oDocument.GetVariableValue(vktIndexName) - If wertWD Is Nothing = False Then - 'Nochmals prüfen ob wirklich Array - If wertWD.GetType.ToString.Contains("System.Object") Then - 'Keine Duplikatprüfung also einfach neues Array füllen - If CheckDuplikat = False Then - For Each value As Object In wertWD - 'Das Array anpassen - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, value) - Anzahl += 1 - Next - 'Und jetzt den/die Neuen Wert(e) anfügen - For Each NewValue As Object In NIIndexe - If NewValue Is Nothing = False Then - 'Das Array anpassen - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, NewValue) - Anzahl += 1 - - End If - Next - Else - - 'Duplikat Prüfung an, also nur anhängen wenn Wert <> - For Each WDValue As Object In wertWD - If WDValue Is Nothing = False Then - 'Erst einmal die ALten Werte schreiben - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, WDValue) - Anzahl += 1 - End If - Next - 'Jetzt die Neuen Werte auf Duplikate überprüfen - For Each NewValue As Object In NIIndexe - If NewValue Is Nothing = False Then - If ValueArray.Contains(NewValue) = False Then - 'Das Array anpassen - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, NewValue) - Anzahl += 1 - Else - End If - End If - Next - End If - End If - Else - 'Den/die Neuen Wert(e) anfügen - For Each NewValue As Object In NIIndexe - If NewValue Is Nothing = False Then - If CheckDuplikat = True Then - If ValueArray Is Nothing = False Then - If ValueArray.Contains(NewValue) = False Then - 'Das Array anpassen - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, NewValue) - Anzahl += 1 - Else - End If - Else 'Dererste Wert, also hinzufügen - 'Das Array anpassen - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, NewValue) - Anzahl += 1 - - End If - - Else - 'Das Array anpassen - ReDim Preserve ValueArray(Anzahl) - 'Den Wert im Array speichern - ValueArray(Anzahl) = ConvertVectorType(vType, NewValue) - Anzahl += 1 - End If - End If - Next - End If - - Return ValueArray - 'Catch ex As Exception - ' Return ValueArray - 'End Try - - - End Function + End Sub + Sub activate_controls(status As Boolean) + Me.pnldesigner.Enabled = status + Me.btnSave.Enabled = status + End Sub Public Function ConvertVectorType(vType As Object, value As String) Select Case vType Case 36865 ' 36865 @@ -2320,60 +2039,10 @@ Public Class frmValidator End Select End Function - Private Function ReturnVektor_IndexValue(VKTBezeichner As String) - Try - Dim value - Dim name = VKTBezeichner.Replace("[%VKT", "") - Dim Sort_Arr() As String - Dim i As Integer = 0 - 'Jetzt im Vektorfeld des Profils nachsehen ob der WErt bereits vorhanden ist - Dim wertWD = CURRENT_WMFILE.GetVariableValue(PROFIL_VEKTORINDEX) - If wertWD Is Nothing = False Then - 'Es wird gegen ein Vektorfeld nachindexiert - If wertWD.GetType.ToString.Contains("System.Object") Then - 'es handelt sich um ein Vektorfeld - Zuweisen der Indexwerte des Vektorfeldes zu Array - For Each obj As Object In wertWD - If obj Is Nothing = False Then - ReDim Preserve Sort_Arr(i) - Sort_Arr(i) = obj.ToString() - i += 1 - End If - Next - 'Das Ergebnis-Array nun Rückwärts sortieren, um die letzte Änderung zu finden - For Each _string As Object In Sort_Arr.Reverse() - Dim DDPM_String As String = _string.ToString() - ' - Dim VektorArray() = Split(DDPM_String, PMDelimiter) - If VektorArray(1).ToString.ToLower = name.ToLower Then - value = VektorArray(2) - Exit For - End If - - Next - - End If - End If - If value Is Nothing Then value = "" - Return value - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("error in ReturnVektor_IndexValue: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) - LOGGER.Info("error in ReturnVektor_IndexValue: " & ex.Message) - Return "" - End Try - - - - - End Function Private Function GetVariableValuefromSource(oSourceIndexName As String, Optional oIDBTyp As Integer = 0, Optional FromIDB As Boolean = False) As Object Try Dim oValuefromSource - If IDB_ACTIVE = False Then - oValuefromSource = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) - Else - oValuefromSource = IDBData.GetVariableValue(oSourceIndexName, oIDBTyp, FromIDB) - End If + oValuefromSource = IDBData.GetVariableValue(oSourceIndexName, oIDBTyp, FromIDB) Return oValuefromSource Catch ex As Exception LOGGER.Error(ex) @@ -2438,35 +2107,27 @@ Public Class frmValidator LOGGER.Debug("Indexwert soll nicht geladen werden.") Exit Select End If + oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) - - If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) + If oValueFromSource Is Nothing Then + oValueFromSource = "" Else - - oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) - - If oValueFromSource Is Nothing Then - oValueFromSource = "" - Else - If oValueFromSource.ToString = "System.Object[]" Then - LOGGER.Debug("TextBox with VektorField: " & oSourceIndexName) - Try - LOGGER.Debug($"Length of Vektorarray: {oValueFromSource.length}") - Catch ex As Exception - LOGGER.Info($"Error in gettin the lenth of vektorfield {oSourceIndexName} - {ex.Message}") - End Try - If oValueFromSource.length = 1 Then - oValueFromSource = oValueFromSource(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oSourceIndexName & "' contains more then one value - First value will be used") - oValueFromSource = oValueFromSource(0) - End If - LOGGER.Debug($"wertWD has been saved...") - + If oValueFromSource.ToString = "System.Object[]" Then + LOGGER.Debug("TextBox with VektorField: " & oSourceIndexName) + Try + LOGGER.Debug($"Length of Vektorarray: {oValueFromSource.length}") + Catch ex As Exception + LOGGER.Info($"Error in gettin the lenth of vektorfield {oSourceIndexName} - {ex.Message}") + End Try + If oValueFromSource.length = 1 Then + oValueFromSource = oValueFromSource(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oSourceIndexName & "' contains more then one value - First value will be used") + oValueFromSource = oValueFromSource(0) End If - End If + LOGGER.Debug($"wertWD has been saved...") + End If End If Try oControl.Text = NotNull(oValueFromSource, oDefaultValue) @@ -2476,8 +2137,6 @@ Public Class frmValidator oControl.Text = "" _CURRENT_INDEX_ARRAY(oCount, 1) = "" End Try - - End If Catch ex As Exception LOGGER.Error(ex) @@ -2510,14 +2169,9 @@ Public Class frmValidator Exit Select End If - If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) - Else - oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) - End If + oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) If oValueFromSource Is Nothing Then - LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Indexvalue from index {oSourceIndexName}: Nothing") If oDefaultValue = String.Empty Then LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wurde nicht gefunden") @@ -2772,22 +2426,16 @@ Public Class frmValidator LOGGER.Debug("Loading Bool-Value from Windream.") - If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) - Else - Try - LOGGER.Debug($"..Now GetVariableValue({oSourceIndexName})...") - oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) - Catch ex As Exception - LOGGER.Warn($"Could not get the windreamValue for CheckboxIndex: {oSourceIndexName} [{ex.Message}]") - End Try - - End If + Try + LOGGER.Debug($"..Now GetVariableValue({oSourceIndexName})...") + oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) + Catch ex As Exception + LOGGER.Warn($"Could not get the windreamValue for CheckboxIndex: {oSourceIndexName} [{ex.Message}]") + End Try If oValueFromSource Is Nothing Then LOGGER.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Check defaultvalue") - chk.Checked = False Else LOGGER.Debug("Index value loaded: " & oValueFromSource.ToString) @@ -2897,17 +2545,8 @@ Public Class frmValidator Exit For End If If oSourceIndexName Is Nothing = False Then - Try - If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - LOGGER.Debug("DATE über PM-Vektor holen") - - oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) - LOGGER.Info(">> DTP is """) - Else - oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) - - End If + oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) If oValueFromSource Is Nothing Then oValueFromSource = "" Dim tempdate As Date = CDate("01.01.0001 00:00:00") @@ -2954,7 +2593,7 @@ Public Class frmValidator Dim oDEPENDING_GUID = oRow.Item("CONTROL_ID") Dim oDEPENDING_COLUMN = oRow.Item("SPALTENNAME") Dim oSqlCommand = oRow.Item("SQL_COMMAND") - oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Try @@ -3085,7 +2724,7 @@ Public Class frmValidator Private Function btnFinish_continue() Try Dim oSQL = PROFIL_FINISH_SQL - oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL) If IsNothing(oDT_ACTIONS) Then @@ -3170,14 +2809,11 @@ Public Class frmValidator For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString Dim oIndexType = 0 - If IDB_ACTIVE = False Then - oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME")) - End If If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### LOGGER.Debug("Indexing wih dynamic sql...") Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND") - oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) If IsNothing(oSQLCommand) Then errormessage = "Error while replacing Values in final indexing - Check the log" My.Settings.Save() @@ -3216,39 +2852,14 @@ Public Class frmValidator oResult(0) = oValue LOGGER.Debug($"oIndexType {oIndexType.ToString}") - If oIndexType > 4000 And oIndexType < 5000 Then - 'If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then - ' Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME")) - 'Hier muss nun separat as Vektorfeld indexiert werden - If WMIndexVectofield(oValue, oFinalIndexRow.Item("INDEXNAME"), oFinalIndexRow.Item("PREVENT_DUPLICATES"), oFinalIndexRow.Item("ALLOW_NEW_VALUES")) = False Then - LOGGER.Debug("Final Vektorindex '" & oFinalIndexRow.Item("INDEXNAME").ToString & "' has beens et suxxessfully!") - Else - errormessage = "Error in final indexing:" & vbNewLine & idxerr_message - My.Settings.Save() - frmError.ShowDialog() - oErrorOcurred = True - ItemWorked = False - End If - Else - LOGGER.Debug("Now the final indexing...") + + LOGGER.Debug("Now the final indexing...") Dim oFIResult As Boolean = False - If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oFinalIndexRow.Item("INDEXNAME"), oResult) = True Then - oFIResult = True - LOGGER.Debug("FINALER INDEX '" & oFinalIndexRow.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT") - - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", oFinalIndexRow.Item("INDEXNAME")) - WMIndexVectofield(logstr, PROFIL_LOGINDEX) - End If - End If - Else - If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then - oFIResult = True - LOGGER.Debug("Final index IDB '" & oFinalIndexRow.Item("INDEXNAME") & "' was updated.") - End If + If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then + oFIResult = True + LOGGER.Debug("Final index IDB '" & oFinalIndexRow.Item("INDEXNAME") & "' was updated.") End If + If oFIResult = False Then errormessage = "Error in final indexing:" & vbNewLine & idxerr_message My.Settings.Save() @@ -3257,7 +2868,6 @@ Public Class frmValidator ItemWorked = False End If - End If If oErrorOcurred = True Then ItemWorked = False Exit For @@ -3407,7 +3017,7 @@ Public Class frmValidator 'wenn Move2Folder aktiviert wurde If Move2Folder <> "" Then - idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, _windream) + 'idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, _windream) If idxerr_message <> "" Then errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message My.Settings.Save() @@ -3515,44 +3125,7 @@ Public Class frmValidator Return PM_String End Function - Private Function WMIndexVectofield(input As String, NameVKTIndex As String, Optional PreventDuplicates As Boolean = False, Optional AllowAddNewValues As Boolean = True, Optional IndexBehaviour As String = "Add") - Dim oOldValue As Object = CURRENT_WMFILE.GetVariableValue(NameVKTIndex) - Dim oValueList As New List(Of Object) - Dim oNewValue As Object() - Dim oMissing As Boolean = False - - If oOldValue IsNot Nothing AndAlso TypeOf oOldValue Is Object Then - - ' If new values are allowed, add the old values first - If AllowAddNewValues Then - oValueList = DirectCast(oOldValue, Object()).ToList() - End If - - ' Add the new value - oValueList.Add(input) - Else - ' Just add input as the only value - oValueList.Add(input) - End If - If PreventDuplicates Then - oValueList = oValueList. - Distinct(). - ToList() - End If - - oNewValue = oValueList.ToArray() - - If oNewValue.Length > 0 Then - 'Jetzt die Datei indexieren - If Indexiere_File(CURRENT_WMFILE, NameVKTIndex, oNewValue) = False Then - oMissing = True - oErrorMessage = "Error while indexing Vektorfeld '" & NameVKTIndex & "' - ERROR: " & idxerr_message - End If - End If - - Return oMissing - End Function Function DT_FOR_ARRAY(pArr As String()) As DataTable Dim odt As New DataTable odt.Columns.Add("ID", GetType(Integer)) @@ -3620,9 +3193,8 @@ Public Class frmValidator Dim Zeilen As Integer = lookup.SelectedValues.Count 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss - If Zeilen > 0 Then - Dim ZeilenGrid As Integer = 0 - Dim myVektorArr As String() + Dim ZeilenGrid As Integer = 0 + Dim myVektorArr As String() 'Jeden Werte des Datagridviews durchlaufen For Each value As String In lookup.SelectedValues If value Is Nothing = False Then @@ -3634,34 +3206,14 @@ Public Class frmValidator End If Next - If IDB_ACTIVE = False Then - - If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then - oMissing = True - oErrorMessage = "Error while indexing von LookupGrid - ERROR: " & idxerr_message - Exit For - End If - Else - Dim oMyDT = DT_FOR_ARRAY(myVektorArr) + Dim oMyDT = DT_FOR_ARRAY(myVektorArr) - If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then + If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then oMissing = True oErrorMessage = "Error while indexing IDB-Object LookupGrid" Exit For End If - End If - Else - Dim oValues As New List(Of Object) From {String.Empty} - If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oIndexName, oValues.ToArray) = False Then - oMissing = True - oErrorMessage = "Error while indexing von LookupGrid - ERROR: " & idxerr_message - Exit For - End If - End If - - End If Else @@ -3675,97 +3227,59 @@ Public Class frmValidator End If 'den aktuellen Wert in windream auslesen Dim oValueFromObject - - If oIndexName.StartsWith("[%VKT") Then - oValueFromObject = ReturnVektor_IndexValue(oIndexName) - Else - oValueFromObject = GetVariableValuefromSource(oIndexName, oIDBTyp) - Dim oValueIsIndifferent As Boolean = False - If Not IsNothing(oValueFromObject) Then - - If IDB_ACTIVE = False Then - If oValueFromObject.ToString = "System.Object[]" Then - If oValueFromObject.Length = 1 Then - oValueFromObject = oValueFromObject(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") - oValueFromObject = oValueFromObject(0) - End If + oValueFromObject = GetVariableValuefromSource(oIndexName, oIDBTyp) + Dim oValueIsIndifferent As Boolean = False + If Not IsNothing(oValueFromObject) Then + If IDB_ACTIVE = False Then + If oValueFromObject.ToString = "System.Object[]" Then + If oValueFromObject.Length = 1 Then + oValueFromObject = oValueFromObject(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") + oValueFromObject = oValueFromObject(0) End If End If - Else - oValueFromObject = "" End If - - If IsNothing(oValueFromObject) Then - LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: oValueFromObject is NOTHING!") + Else + oValueFromObject = "" + End If + If IsNothing(oValueFromObject) Then + LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: oValueFromObject is NOTHING!") + oValueIsIndifferent = True + End If + If oValueIsIndifferent = False Then + If IsDBNull(oValueFromObject) Then + LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: oValueFromObject is DBNULL!") oValueIsIndifferent = True End If - If oValueIsIndifferent = False Then - If IsDBNull(oValueFromObject) Then - LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: oValueFromObject is DBNULL!") - oValueIsIndifferent = True - End If - End If - Dim oValueSourceIsDifferent As Boolean = False - If oValueIsIndifferent = False Then - LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: oValueFromObject is [{oValueFromObject}]") - Try - If oValueFromObject <> oMyInput Then - oValueSourceIsDifferent = True - LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: There is a difference between oValueFromObject and [{oValueFromObject}]") - End If - Catch ex As Exception + End If + Dim oValueSourceIsDifferent As Boolean = False + If oValueIsIndifferent = False Then + LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: oValueFromObject is [{oValueFromObject}]") + Try + If oValueFromObject <> oMyInput Then oValueSourceIsDifferent = True - LOGGER.Debug($"oValueFromObject <> oMyInput not possible as one object might be a multiple row object") - End Try + LOGGER.Debug($"CheckUpdateIndex.LookUpGrid: There is a difference between oValueFromObject and [{oValueFromObject}]") + End If + Catch ex As Exception + oValueSourceIsDifferent = True + LOGGER.Debug($"oValueFromObject <> oMyInput not possible as one object might be a multiple row object") + End Try - Else + Else - End If + End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden 'IsNothing(oValueFromObject) Or oValueFromObject <> oMyInput If (oValueIsIndifferent = True Or oValueSourceIsDifferent = True) Then - 'Wenn der Wert in ein Vektorfeld geschrieben wird - If oIndexName.StartsWith("[%VKT") Then - oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) - 'Hier muss nun separat as Vektorfeld indexiert werden - If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Error while indexing Textbox as VEKTOR - ERROR: " & idxerr_message - Exit For - End If - Else - If IDB_ACTIVE = False Then - Dim result() As String - ReDim Preserve result(0) - result(0) = oMyInput - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Error while indexing Textbox - ERROR: " & idxerr_message - Exit For - End If - Else - If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then - Exit For - End If - End If - If IDB_ACTIVE = False Then - If PROFIL_LOGINDEX <> "" Then - Dim oLogStr = Return_LOGString(oMyInput, oValueFromObject, oIndexName) - WMIndexVectofield(oLogStr, PROFIL_LOGINDEX) - 'Else - ' IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogStr) - End If - End If - 'Nun das Logging - - + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + Exit For End If + End If + End If - End If End If Catch ex As Exception @@ -3802,24 +3316,20 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen Dim oSourceValue = GetVariableValuefromSource(oIndexName, oIDBTyp) - - If oIndexName.StartsWith("[%VKT") Then - oSourceValue = ReturnVektor_IndexValue(oIndexName) - Else - 'wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) - If Not IsNothing(oSourceValue) Then - If oSourceValue.ToString = "System.Object[]" Then - If oSourceValue.Length = 1 Then - oSourceValue = oSourceValue(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") - oSourceValue = oSourceValue(0) - End If + 'wertWD = Nothing.GetVariableValue(oIndexName) + If Not IsNothing(oSourceValue) Then + If oSourceValue.ToString = "System.Object[]" Then + If oSourceValue.Length = 1 Then + oSourceValue = oSourceValue(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") + oSourceValue = oSourceValue(0) End If - Else - oSourceValue = "" End If + Else + oSourceValue = "" End If + Dim oSetValue As Boolean = False If IsDBNull(oSourceValue) Then oSetValue = True @@ -3836,45 +3346,11 @@ Public Class frmValidator End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden If oSetValue = True Then - 'Wenn der Wert in ein Vektorfeld geschrieben wird - If oIndexName.StartsWith("[%VKT") Then - oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) - 'Hier muss nun separat as Vektorfeld indexiert werden - If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Error while indexing textbox as VEKTOR - ERROR: " & idxerr_message - Exit For - End If - Else - If IDB_ACTIVE = False Then - Dim result() As String - ReDim Preserve result(0) - result(0) = oMyInput - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Error while indexing Textbox - ERROR: " & idxerr_message - Exit For - End If - Else - If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then - Exit For - End If - End If - If IDB_ACTIVE = False Then - If PROFIL_LOGINDEX <> "" Then - Dim oMyLogString = Return_LOGString(oMyInput, oSourceValue, oIndexName) - WMIndexVectofield(oMyLogString, PROFIL_LOGINDEX) - 'Else - 'IDBData.SetVariableValue(PROFIL_LOGINDEX, oMyLogString) - - - End If - End If + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + Exit For End If - - End If End If Catch ex As Exception @@ -3900,12 +3376,8 @@ Public Class frmValidator oMyInput = cmb.Text LOGGER.Debug($"inputvalue Combobox: {cmb.Text}") Dim oWMValue - 'den aktuellen Wert in windream auslesen - If oIndexName.StartsWith("[%VKT") Then - oWMValue = ReturnVektor_IndexValue(oIndexName) - Else - oWMValue = GetVariableValuefromSource(oIndexName, oIDBTyp) - End If + oWMValue = GetVariableValuefromSource(oIndexName, oIDBTyp) + LOGGER.Debug($"Got a WMValue...") If IsNothing(oWMValue) Then LOGGER.Debug($"WMValue is nothing...Value EmptyString will be used") @@ -3941,46 +3413,12 @@ Public Class frmValidator End Try 'wenn Wert in Windream <> der Eingabe darf indexiert werden If oitsadifference = True Then - LOGGER.Debug($"Index with ID{oControlId} will now be indexed...") - 'Wenn der Wert in ein Vektorfeld geschrieben wird - If oIndexName.StartsWith("[%VKT") Then - oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) - 'Hier muss nun separat as Vektorfeld indexiert werden - If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Error while indexing Combobox as VEKTOR - ERROR: " & idxerr_message - Exit For - End If - Else - If IDB_ACTIVE = False Then - Dim result() As String - ReDim Preserve result(0) - result(0) = oMyInput - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - cmb.DroppedDown = True - oMissing = True - oErrorMessage = "Error while indexing Combobox - ERROR: " & idxerr_message - Exit For - End If - Else - If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then - cmb.DroppedDown = True - oMissing = True - oErrorMessage = "Error indexing combobox idb" - Exit For - End If - End If - If IDB_ACTIVE = False Then - If PROFIL_LOGINDEX <> "" Then - Dim ologStr = Return_LOGString(oMyInput, oWMValue, oIndexName) - WMIndexVectofield(ologStr, PROFIL_LOGINDEX) - 'Else - 'IDBData.SetVariableValue(PROFIL_LOGINDEX, ologStr) - End If - - End If - 'Nun das Logging - + LOGGER.Debug($"Index with ID [{oControlId}] will now be indexed...") + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + cmb.DroppedDown = True + oMissing = True + oErrorMessage = "Error indexing combobox idb" + Exit For End If Else LOGGER.Debug($"oitsadifference = False...Index with ID{oControlId} will not be indexed...") @@ -4010,57 +3448,21 @@ Public Class frmValidator ElseIf dtp.Value.ToString <> "01.01.0001 00:00:00" Then oMyInput = CDate(dtp.Value) 'den aktuellen Wert in windream auslesen - ' Dim wertWD As String = CURRENT_WMFILE.GetVariableValue(_IDXName) + ' Dim wertWD As String = Nothing.GetVariableValue(_IDXName) Dim oObjectValue - If oIndexName.StartsWith("[%VKT") Then - oObjectValue = ReturnVektor_IndexValue(oIndexName) - Else - oObjectValue = GetVariableValuefromSource(oIndexName, oIDBTyp) - End If + oObjectValue = GetVariableValuefromSource(oIndexName, oIDBTyp) If IsNothing(oObjectValue) Then oObjectValue = CDate("01.01.1900") End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden If oObjectValue <> oMyInput Then - 'Wenn der WErt in ein Vektorfeld geschrieben wird - If oIndexName.StartsWith("[%VKT") Then - 'Input = die String komponente as String - oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) - 'Hier muss nun separat as Vektorfeld indexiert werden - If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Error while indexing DatePicker as VEKTOR - ERROR: " & idxerr_message - Exit For - End If - Else - If IDB_ACTIVE = False Then - Dim result() - ReDim Preserve result(0) - result(0) = CDate(oMyInput) - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Error while indexing DatePicker- ERROR: " & idxerr_message - Exit For - End If - Else - If IDBData.SetVariableValue(oIndexName, oObjectValue) = False Then - oMissing = True - oErrorMessage = "Error indexing datepicker idb" - Exit For - End If - End If - If IDB_ACTIVE = False Then - If PROFIL_LOGINDEX <> "" Then - Dim oLogstr = Return_LOGString(oMyInput, oObjectValue, oIndexName) - WMIndexVectofield(oLogstr, PROFIL_LOGINDEX) - 'Else - 'IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogstr) - End If - End If + If IDBData.SetVariableValue(oIndexName, oObjectValue) = False Then + oMissing = True + oErrorMessage = "Error indexing datepicker idb" + Exit For End If Else LOGGER.Debug("Value WD ('" & oObjectValue.ToString & "') = Input-value ('" & oMyInput.ToString & "')") - End If Else LOGGER.Debug("DateValue is 01.01.0001 00:00:00") @@ -4078,21 +3480,12 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen Dim WertWD As String Dim oBoolValue As Boolean - If oIndexName.StartsWith("[%VKT") Then - WertWD = ReturnVektor_IndexValue(oIndexName) - If WertWD = "" Then - oBoolValue = False - Else - oBoolValue = CBool(WertWD) - End If + Dim _Value + Dim oObjectCheck = GetVariableValuefromSource(oIndexName, oIDBTyp) + If IsNothing(oObjectCheck) Then + oBoolValue = False Else - Dim _Value - Dim oObjectCheck = GetVariableValuefromSource(oIndexName, oIDBTyp) - - If IsNothing(oObjectCheck) Then - oBoolValue = False - Else - If oObjectCheck.ToString = "System.Object[]" Then + If oObjectCheck.ToString = "System.Object[]" Then If oObjectCheck.Length = 1 Then _Value = oObjectCheck(0) Else ' @@ -4105,11 +3498,7 @@ Public Class frmValidator oBoolValue = CBool(_Value) End If - End If - - - ' Dim Bool_WD = CBool(CURRENT_WMFILE.GetVariableValue(_IDXName)) 'wenn Wert in Windream <> der Eingabe darf indexiert werden If oBoolValue <> chk.Checked Then Dim result() As String @@ -4120,42 +3509,12 @@ Public Class frmValidator result(0) = 0 End If - If oIndexName.StartsWith("[%VKT") Then - 'Input = die String komponente mit Boolean as String - oMyInput = Return_PM_VEKTOR(chk.Checked.ToString, oIndexName) - 'Hier muss nun separat as Vektorfeld indexiert werden - If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Error while indexing Checkbox as VEKTOR - ERROR: " & idxerr_message - Exit For - End If - Else - If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Error while indexing Checkbox - ERROR: " & idxerr_message - Exit For - End If - Else - If IDBData.SetVariableValue(oIndexName, chk.Checked.ToString) Then - oErrorMessage = "error indexing checkboxidb" - Exit For - End If - End If - If IDB_ACTIVE = False Then - If PROFIL_LOGINDEX <> "" Then - Dim oLogstr = Return_LOGString(CBool(result(0)).ToString, WertWD, oIndexName) - WMIndexVectofield(oLogstr, PROFIL_LOGINDEX) - 'Else - 'IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogstr) - End If - End If - + If IDBData.SetVariableValue(oIndexName, chk.Checked.ToString) Then + oErrorMessage = "error indexing checkboxidb" + Exit For End If End If - - Case "System.Windows.Forms.DataGridView" Dim dgv As DataGridView = oControl @@ -4211,23 +3570,15 @@ Public Class frmValidator End Select Next - If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then + + Dim oDT As DataTable = DT_FOR_ARRAY(myVektorArr) + If oDT.Rows.Count > 0 Then + If IDBData.SetVariableValue(oIndexName, oDT, True) = False Then oMissing = True - oErrorMessage = "Error while indexing Vektorfeld - ERROR: " & idxerr_message + oErrorMessage = "Error indexing Datagridview idb" Exit For End If - Else - Dim oDT As DataTable = DT_FOR_ARRAY(myVektorArr) - If oDT.Rows.Count > 0 Then - If IDBData.SetVariableValue(oIndexName, oDT, True) = False Then - oMissing = True - oErrorMessage = "Error indexing Datagridview idb" - Exit For - End If - End If End If - 'Jetzt die Datei indexieren End If Case "DevExpress.XtraGrid.GridControl" @@ -4290,51 +3641,29 @@ Public Class frmValidator Next + Dim oMyDT = DT_FOR_ARRAY(myVektorArr) - If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then + If oMyDT.Rows.Count > 0 Then + If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then oMissing = True - oErrorMessage = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message + oErrorMessage = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message Exit For End If - Else - Dim oMyDT = DT_FOR_ARRAY(myVektorArr) - If oMyDT.Rows.Count > 0 Then - If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then - oMissing = True - oErrorMessage = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message - Exit For - End If - End If End If - - Else - Dim oValue As New List(Of Object) From {String.Empty} - - If IDB_ACTIVE = False Then - If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then - oMissing = True - 'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message - oErrorMessage = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message - Exit For - End If - Else - Dim oOldAttributeResult = IDBData.GetVariableValue(oIndexName, oIDBTyp) - Dim oTypeOldResult = oOldAttributeResult.GetType.ToString - If oTypeOldResult = "System.Data.DataTable" Then - Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp) - If oDT.Rows.Count > 0 Then - LOGGER.Debug("User cleared the grid, so data needs to be erased!") - IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName) - End If - Else - LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!") + Else Dim oValue As New List(Of Object) From {String.Empty} + Dim oOldAttributeResult = IDBData.GetVariableValue(oIndexName, oIDBTyp) + Dim oTypeOldResult = oOldAttributeResult.GetType.ToString + If oTypeOldResult = "System.Data.DataTable" Then + Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp) + If oDT.Rows.Count > 0 Then + LOGGER.Debug("User cleared the grid, so data needs to be erased!") IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName) End If - + Else + LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!") + IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName) End If - End If End Select End If 'End If für Control und ReadOnly = False @@ -4359,47 +3688,7 @@ Public Class frmValidator End Try End Function - Private Function Indexiere_File(_dok As WINDREAMLib.WMObject, idxxname As String, idxvalue As Object) As Boolean - Dim File_indexiert As Boolean = False - idxerr_message = "" - Try - 'Die Arrays vorbereiten - Dim arrIndex() As String = Nothing - Dim arrValue() As String = Nothing - arrIndex = Nothing - arrValue = Nothing - 'Den Indexnamen übergeben - ReDim Preserve arrIndex(0) - arrIndex(0) = idxxname - 'Das Array der Idnexwerte überprüfen - If idxvalue Is Nothing = False Then - If idxvalue.Length() > 1 Then - LOGGER.Debug("Indexing Index '" & idxxname & "' with Arrayvalue") - Dim anzahl As Integer = 0 - For Each indexvalue As String In idxvalue - ReDim Preserve arrValue(anzahl) - arrValue(anzahl) = indexvalue - anzahl += 1 - Next - Else - LOGGER.Debug("Indexing Index '" & idxxname & "' with value '" & idxvalue(0) & "'") - ReDim Preserve arrValue(0) - arrValue(0) = idxvalue(0).ToString - End If - 'Jetzt das eigentliche Indexieren der Datei - 'File_indexiert = Me._windreamPM.RunIndexing(_dok, arrIndex, arrValue) - File_indexiert = WINDREAM.RunIndexing(_dok, arrIndex, arrValue) - Return File_indexiert - End If - Catch ex As Exception - LOGGER.Error(ex) - allgFunk.Insert_LogEntry($"ERROR Indexiere_File Validator >> {ex.Message}") - idxerr_message = "Unexpected error in Indexiere_File: " & ex.Message.ToString - LOGGER.Info("Unexpected error in Indexiere_File: " & ex.Message.ToString, True) - Return False - End Try - End Function Private Sub btnfinal_Click(sender As System.Object, e As System.EventArgs) Finish_WFStep() @@ -4469,54 +3758,22 @@ Public Class frmValidator 'Aus der Tabelle löschen Dim oDelete = $"DELETE FROM TBPM_PROFILE_FILES WHERE (GUID = {CURRENT_DOC_GUID})" If ClassDatabase.Execute_non_Query(oDelete) = True Then - - End If - - Dim resul = allgFunk.Delete_xffres(WMDocPathWindows, _windream) - If resul = Nothing Or resul = True Then Dim oDeleteResult As Boolean = False - If IDB_ACTIVE = False Then - oDeleteResult = Delete_WMFile() - End If + 'To Do Delete IDB File If oDeleteResult = True Then Load_Next_Document(False) End If - End If + + + End If Catch ex As Exception LOGGER.Error(ex) - MsgBox("Fehler bei Löschen windream-Datei:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub - Private Function Delete_WMFile() - Try - If CURRENT_WMFILE Is Nothing = False Then - 'Close_document_viewer() - 'Me.PdfViewer1.DocumentFilePath = "" - Try - If CURRENT_WMFILE.aLocked Then - ' unlock the windream object - CURRENT_WMFILE.unlock() - End If - CURRENT_WMFILE.Delete() - LOGGER.Info(">> Manuelles Löschen: Datei " & CURRENT_WMFILE.aName & " erfolgreich gelöscht") - Return True - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Das windream-Objekt konnte nicht gelöscht werden!" & vbNewLine & vbNewLine & "Fehlermeldung:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - LOGGER.Info(" windream-Objekt konnte nicht gelöscht werden - Fehlermeldung: " & ex.Message, True) - Return False - End Try - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(" Fehler bei Delete_File", True) - LOGGER.Info(">> Fehlermeldung: " & ex.Message) - Return False - End Try - End Function Private Const SEE_MASK_INVOKEIDLIST = &HC Private Const SEE_MASK_NOCLOSEPROCESS = &H40 Private Const SEE_MASK_FLAG_NO_UI = &H400 diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.vb index ae6b3f5..4b66b59 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.vb @@ -414,7 +414,7 @@ Public Class frmValidatorSearch If IsNothing(_DTSQLSearches) Then Exit Sub Dim oConID = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("CONN_ID") Dim oCommand = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Dim oTabIndex = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_INDEX") Dim oTabCaption = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_TITLE") RefreshTabSQL(oConID, oCommand, oTabIndex, oTabCaption) @@ -423,7 +423,7 @@ Public Class frmValidatorSearch If IsNothing(_DTDocSearches) Then Exit Sub Dim oConID = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("CONN_ID") Dim oCommand = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Dim oTabIndex = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_INDEX") Dim oTabCaption = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_TITLE") RefreshTabDoc(oConID, oCommand, oTabIndex, oTabCaption) @@ -610,7 +610,7 @@ Public Class frmValidatorSearch _DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) XtraTabControlSQL.SelectedTabPageIndex = 0 Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) End If @@ -618,7 +618,7 @@ Public Class frmValidatorSearch _DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) XtraTabControlDocs.SelectedTabPageIndex = 0 RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) End If @@ -635,7 +635,7 @@ Public Class frmValidatorSearch Dim oTabIndex = XtraTabControlDocs.SelectedTabPageIndex Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("CONN_ID") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) RefreshTabDoc(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("TAB_TITLE")) End Sub @@ -667,7 +667,7 @@ Public Class frmValidatorSearch Dim oTabIndex = XtraTabControlSQL.SelectedTabPageIndex Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("CONN_ID") Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) RefreshTabSQL(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("TAB_TITLE")) End Sub From 5cca37fe39f12b48355ef8819938b8bbe8d0ca52 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 5 Mar 2020 13:49:27 +0100 Subject: [PATCH 02/13] MS --- app/DD_PM_WINDREAM/frmValidator.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 81931cd..09230d5 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1886,8 +1886,7 @@ Public Class frmValidator LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then If GetWMDocPathWindows(0) = False Then - MsgBox("Could not access the file! Check the log!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) - Exit Sub + MsgBox("The file can not be diplayed!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) End If Load_IDB_DOC_DATA() From a6da85ce98ea5d849947876f0abaab84a53edb71 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 5 Mar 2020 14:00:38 +0100 Subject: [PATCH 03/13] Revert "MS" This reverts commit 5cca37fe39f12b48355ef8819938b8bbe8d0ca52. --- app/DD_PM_WINDREAM/frmValidator.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 09230d5..81931cd 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1886,7 +1886,8 @@ Public Class frmValidator LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then If GetWMDocPathWindows(0) = False Then - MsgBox("The file can not be diplayed!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) + MsgBox("Could not access the file! Check the log!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) + Exit Sub End If Load_IDB_DOC_DATA() From 1dd35d4dc5580092193c6f714465946c12c603b4 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 5 Mar 2020 15:19:31 +0100 Subject: [PATCH 04/13] ms test clswm --- app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 7 +- app/DD_PM_WINDREAM/clswindream.vb | 12 + app/DD_PM_WINDREAM/frmValidator.Designer.vb | 15 +- app/DD_PM_WINDREAM/frmValidator.resx | 331 +++++++++----------- app/DD_PM_WINDREAM/frmValidator.vb | 13 +- 5 files changed, 185 insertions(+), 193 deletions(-) create mode 100644 app/DD_PM_WINDREAM/clswindream.vb diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 673fca5..4cf73ab 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -153,15 +153,15 @@ ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\..\DDMonorepo\Modules.Windream\bin\Debug\DigitalData.Modules.Windream.dll + P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll - - ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\Independentsoft.Msg.2.0.570.21482.dll - ..\packages\NLog.4.5.11\lib\net45\NLog.dll @@ -233,6 +233,7 @@ + True diff --git a/app/DD_PM_WINDREAM/clswindream.vb b/app/DD_PM_WINDREAM/clswindream.vb new file mode 100644 index 0000000..34922b0 --- /dev/null +++ b/app/DD_PM_WINDREAM/clswindream.vb @@ -0,0 +1,12 @@ +Imports DigitalData.Modules.Windream +Public Class clswindream + Public Sub New() + LOGGER.Debug("Initializing windream...") + Try + Dim clswmDD As New Windream(LOGCONFIG, True, "W", "\\windream\onjects", False, "", "", "", "") + Catch ex As Exception + + End Try + + End Sub +End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index c3f5818..fd0df2e 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -94,6 +94,7 @@ Partial Class frmValidator Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -188,11 +189,13 @@ Partial Class frmValidator 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing + Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing @@ -460,9 +463,9 @@ Partial Class frmValidator 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnItm}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnItm, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 17 + Me.RibbonControl1.MaxItemId = 18 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -614,6 +617,7 @@ Partial Class frmValidator Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniNext) Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniDelete) Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniAnnotation) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' @@ -641,6 +645,12 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 17 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'frmValidator ' Me.Appearance.Options.UseFont = True @@ -749,4 +759,5 @@ Partial Class frmValidator Friend WithEvents bsiInfo2 As DevExpress.XtraBars.BarStaticItem Friend WithEvents DocumentViewerValidator As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BbtnItm As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 5d749d5..114ac26 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -125,6 +125,31 @@ 0, 146 + + Top, Left, Right + + + Segoe UI Symbol, 12pt, style=Bold + + + 3, 4 + + + No + + + 455, 29 + + + + 1 + + + Label1 + + + MiddleLeft + TITLELabel1 @@ -137,6 +162,30 @@ 0 + + Bottom, Left, Right + + + Tahoma, 9.75pt + + + MiddleLeft + + + 7, 419 + + + 3, 4, 3, 4 + + + 467, 50 + + + 11 + + + Validierung speichern - Nächstes Dokument + btnSave @@ -149,6 +198,21 @@ 1 + + Top, Left, Right + + + 5, 33 + + + 469, 48 + + + 1 + + + Label3 + DESCRIPTIONLabel @@ -161,6 +225,24 @@ 2 + + Top, Bottom, Left, Right + + + True + + + 8, 85 + + + 3, 4, 3, 4 + + + 466, 326 + + + 18 + pnldesigner @@ -185,7 +267,6 @@ 477, 476 - 24 @@ -273,135 +354,6 @@ 0 - - Top, Left, Right - - - Segoe UI Symbol, 12pt, style=Bold - - - 3, 4 - - - No - - - 455, 29 - - - 1 - - - Label1 - - - MiddleLeft - - - TITLELabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Bottom, Left, Right - - - Tahoma, 9.75pt - - - MiddleLeft - - - 7, 419 - - - 3, 4, 3, 4 - - - 467, 50 - - - 11 - - - Validierung speichern - Nächstes Dokument - - - btnSave - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - Top, Left, Right - - - 5, 33 - - - 469, 48 - - - 1 - - - Label3 - - - DESCRIPTIONLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - Top, Bottom, Left, Right - - - True - - - 8, 85 - - - 3, 4, 3, 4 - - - 466, 326 - - - 18 - - - pnldesigner - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - 17, 17 @@ -890,9 +842,34 @@ uOVgTgFgJVQ5UIMszEGUwFP1hRCKJ8gHxL8Yk0HaAAAAAElFTkSuQmCC + + BarButtonItem2 + 0, 0 + + Datei + + + Aktionen + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF + l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw + DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ + k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 + XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR + Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng + kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg + gg== + + + + Information + Menü @@ -1493,6 +1470,12 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmValidator @@ -1725,39 +1708,6 @@ Zoom - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu - My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4zLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s - VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw - BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh - bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl - bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF - eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA - Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs - dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz - cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z - CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN - QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs - b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT - eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg - Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k - ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E - cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO - AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL - - 10% @@ -1800,6 +1750,39 @@ sichtbare einpassen + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu + My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4zLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s + VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw + BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh + bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl + bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF + eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA + Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz + cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z + CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs + b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT + eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg + Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ + dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k + ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E + cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO + AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL + + BarButtonItem1 @@ -1821,28 +1804,6 @@ 1054, 56 - - Datei - - - Aktionen - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF - l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw - DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ - k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 - XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR - Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng - kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg - gg== - - - - Information - RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 09230d5..b0bb80f 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1802,8 +1802,8 @@ Public Class frmValidator oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") If File.Exists(oResult) = False Then - If IDB_ACTIVE = True And USER_USERNAME.ToLower = "schreiberm" Then - oResult = "Q:\DigitalData - Geschäftsprozesse\BusinessApplication01\File\Ausgangsangebot\Gestempelt\GAANG-3471-aveco.pdf" + If IDB_ACTIVE = True And (USER_USERNAME.ToLower = "schreiberm" Or USER_USERNAME.ToLower = "administrator" Or USER_USERNAME.ToLower = "jennej") Then + oResult = "E:\TEMP\Files\PMTest.pdf" 'If USER_USERNAME = "SchreiberM" Then ' oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" 'ElseIf USER_USERNAME = "Administrator" Then @@ -2423,7 +2423,7 @@ Public Class frmValidator End If - LOGGER.Debug("Loading Bool-Value from Windream.") + LOGGER.Debug("Loading Bool-Value...") Try LOGGER.Debug($"..Now GetVariableValue({oSourceIndexName})...") @@ -3984,4 +3984,11 @@ Public Class frmValidator Dim Filename As String = String.Format($"DevExpressValidatorGridControl_{pProfilID}-{pControlID}.xml") Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function + + Private Sub BarButtonItem2_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Dim clswm As New clswindream + If Not IsNothing(clswm) Then + MsgBox("initialized") + End If + End Sub End Class \ No newline at end of file From 12121cb0ed448ac805bf2022ec2023e2e5201e2d Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 10 Mar 2020 17:05:38 +0100 Subject: [PATCH 05/13] MS 20001 --- app/DD_PM_WINDREAM/ClassIDBData.vb | 20 +- .../DD_DMSLiteDataSet.Designer.vb | 683 +++++++- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 99 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 53 +- app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 4 - app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/clswindream.vb | 12 - .../frmInvDashboard.Designer.vb | 1465 ++++++++++++++++- app/DD_PM_WINDREAM/frmInvDashboard.resx | 418 +++++ app/DD_PM_WINDREAM/frmInvDashboard.vb | 303 +++- app/DD_PM_WINDREAM/frmMain.Designer.vb | 335 +--- app/DD_PM_WINDREAM/frmMain.resx | 974 +++-------- app/DD_PM_WINDREAM/frmMain.vb | 292 +--- app/DD_PM_WINDREAM/frmValidator.Designer.vb | 15 +- app/DD_PM_WINDREAM/frmValidator.resx | 12 +- app/DD_PM_WINDREAM/frmValidator.vb | 105 +- 16 files changed, 3217 insertions(+), 1575 deletions(-) delete mode 100644 app/DD_PM_WINDREAM/clswindream.vb diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index 7908aef..d5a0366 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -178,13 +178,15 @@ Next End If Else + '### Old Value is a single value ### If oDTMyNewValues.Rows.Count > 1 Then - Dim oExists As Boolean = False + '### there is more than one new value ### + Dim oExists As Boolean For Each oNewValueRow As DataRow In oDTMyNewValues.Rows + oExists = False Dim oInfo1 = $"Checking oldValue[{oOldAttributeResult}] vs NewValue [{oNewValueRow.Item(1)}]" If oNewValueRow.Item(1).ToString.ToUpper = oOldAttributeResult.ToString.ToUpper Then oExists = True - Exit For End If Next If oExists = False Then @@ -194,10 +196,16 @@ Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) End If Else - Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!" - LOGGER.Info(oInfo) - SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo) - Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) + '### there is only ONE new value ### + If oDTMyNewValues.Rows(0).Item(1) <> oOldAttributeResult Then + Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!" + LOGGER.Info(oInfo) + SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo) + Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) + Else + LOGGER.Debug($"Attributvalue of [{oAttributeName}] did not change!") + End If + End If End If diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index fec0976..7b1f9f8 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -63,6 +63,8 @@ Partial Public Class DD_DMSLiteDataSet Private tableVWPM_CHART_INVOICE_MONITOR_SERIES As VWPM_CHART_INVOICE_MONITOR_SERIESDataTable + Private tableVWPM_CHART_TOP5 As VWPM_CHART_TOP5DataTable + Private tableTBWH_CONNECTION As TBWH_CONNECTIONDataTable Private relationFK_TBPM_ERROR_LOG_PROFILE1 As Global.System.Data.DataRelation @@ -161,6 +163,9 @@ Partial Public Class DD_DMSLiteDataSet If (Not (ds.Tables("VWPM_CHART_INVOICE_MONITOR_SERIES")) Is Nothing) Then MyBase.Tables.Add(New VWPM_CHART_INVOICE_MONITOR_SERIESDataTable(ds.Tables("VWPM_CHART_INVOICE_MONITOR_SERIES"))) End If + If (Not (ds.Tables("VWPM_CHART_TOP5")) Is Nothing) Then + MyBase.Tables.Add(New VWPM_CHART_TOP5DataTable(ds.Tables("VWPM_CHART_TOP5"))) + End If If (Not (ds.Tables("TBWH_CONNECTION")) Is Nothing) Then MyBase.Tables.Add(New TBWH_CONNECTIONDataTable(ds.Tables("TBWH_CONNECTION"))) End If @@ -371,6 +376,16 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property VWPM_CHART_TOP5() As VWPM_CHART_TOP5DataTable + Get + Return Me.tableVWPM_CHART_TOP5 + End Get + End Property + _ + Private Function ShouldSerializeVWPM_CHART_TOP5() As Boolean + Return false + End Function + _ Private Function ShouldSerializeTBWH_CONNECTION() As Boolean @@ -962,6 +994,9 @@ Partial Public Class DD_DMSLiteDataSet _ Public Delegate Sub VWPM_CHART_INVOICE_MONITOR_SERIESRowChangeEventHandler(ByVal sender As Object, ByVal e As VWPM_CHART_INVOICE_MONITOR_SERIESRowChangeEvent) + _ + Public Delegate Sub VWPM_CHART_TOP5RowChangeEventHandler(ByVal sender As Object, ByVal e As VWPM_CHART_TOP5RowChangeEvent) + _ Public Delegate Sub TBWH_CONNECTIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_CONNECTIONRowChangeEvent) @@ -9169,6 +9204,300 @@ Partial Public Class DD_DMSLiteDataSet End Function End Class + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class VWPM_CHART_TOP5DataTable + Inherits Global.System.Data.TypedTableBase(Of VWPM_CHART_TOP5Row) + + Private columnKRED_NAME As Global.System.Data.DataColumn + + Private columnANZ_BELEG As Global.System.Data.DataColumn + + Private columnNetto As Global.System.Data.DataColumn + + Private columnSkonto As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "VWPM_CHART_TOP5" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property KRED_NAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnKRED_NAME + End Get + End Property + + _ + Public ReadOnly Property ANZ_BELEGColumn() As Global.System.Data.DataColumn + Get + Return Me.columnANZ_BELEG + End Get + End Property + + _ + Public ReadOnly Property NettoColumn() As Global.System.Data.DataColumn + Get + Return Me.columnNetto + End Get + End Property + + _ + Public ReadOnly Property SkontoColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSkonto + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As VWPM_CHART_TOP5Row + Get + Return CType(Me.Rows(index),VWPM_CHART_TOP5Row) + End Get + End Property + + _ + Public Event VWPM_CHART_TOP5RowChanging As VWPM_CHART_TOP5RowChangeEventHandler + + _ + Public Event VWPM_CHART_TOP5RowChanged As VWPM_CHART_TOP5RowChangeEventHandler + + _ + Public Event VWPM_CHART_TOP5RowDeleting As VWPM_CHART_TOP5RowChangeEventHandler + + _ + Public Event VWPM_CHART_TOP5RowDeleted As VWPM_CHART_TOP5RowChangeEventHandler + + _ + Public Overloads Sub AddVWPM_CHART_TOP5Row(ByVal row As VWPM_CHART_TOP5Row) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddVWPM_CHART_TOP5Row(ByVal KRED_NAME As String, ByVal ANZ_BELEG As Short, ByVal Netto As Decimal, ByVal Skonto As Decimal) As VWPM_CHART_TOP5Row + Dim rowVWPM_CHART_TOP5Row As VWPM_CHART_TOP5Row = CType(Me.NewRow,VWPM_CHART_TOP5Row) + Dim columnValuesArray() As Object = New Object() {KRED_NAME, ANZ_BELEG, Netto, Skonto} + rowVWPM_CHART_TOP5Row.ItemArray = columnValuesArray + Me.Rows.Add(rowVWPM_CHART_TOP5Row) + Return rowVWPM_CHART_TOP5Row + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As VWPM_CHART_TOP5DataTable = CType(MyBase.Clone,VWPM_CHART_TOP5DataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New VWPM_CHART_TOP5DataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnKRED_NAME = MyBase.Columns("KRED_NAME") + Me.columnANZ_BELEG = MyBase.Columns("ANZ_BELEG") + Me.columnNetto = MyBase.Columns("Netto") + Me.columnSkonto = MyBase.Columns("Skonto") + End Sub + + _ + Private Sub InitClass() + Me.columnKRED_NAME = New Global.System.Data.DataColumn("KRED_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnKRED_NAME) + Me.columnANZ_BELEG = New Global.System.Data.DataColumn("ANZ_BELEG", GetType(Short), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnANZ_BELEG) + Me.columnNetto = New Global.System.Data.DataColumn("Netto", GetType(Decimal), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnNetto) + Me.columnSkonto = New Global.System.Data.DataColumn("Skonto", GetType(Decimal), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSkonto) + Me.columnKRED_NAME.AllowDBNull = false + Me.columnKRED_NAME.MaxLength = 200 + Me.columnANZ_BELEG.AllowDBNull = false + End Sub + + _ + Public Function NewVWPM_CHART_TOP5Row() As VWPM_CHART_TOP5Row + Return CType(Me.NewRow,VWPM_CHART_TOP5Row) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New VWPM_CHART_TOP5Row(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(VWPM_CHART_TOP5Row) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.VWPM_CHART_TOP5RowChangedEvent) Is Nothing) Then + RaiseEvent VWPM_CHART_TOP5RowChanged(Me, New VWPM_CHART_TOP5RowChangeEvent(CType(e.Row,VWPM_CHART_TOP5Row), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.VWPM_CHART_TOP5RowChangingEvent) Is Nothing) Then + RaiseEvent VWPM_CHART_TOP5RowChanging(Me, New VWPM_CHART_TOP5RowChangeEvent(CType(e.Row,VWPM_CHART_TOP5Row), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.VWPM_CHART_TOP5RowDeletedEvent) Is Nothing) Then + RaiseEvent VWPM_CHART_TOP5RowDeleted(Me, New VWPM_CHART_TOP5RowChangeEvent(CType(e.Row,VWPM_CHART_TOP5Row), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.VWPM_CHART_TOP5RowDeletingEvent) Is Nothing) Then + RaiseEvent VWPM_CHART_TOP5RowDeleting(Me, New VWPM_CHART_TOP5RowChangeEvent(CType(e.Row,VWPM_CHART_TOP5Row), e.Action)) + End If + End Sub + + _ + Public Sub RemoveVWPM_CHART_TOP5Row(ByVal row As VWPM_CHART_TOP5Row) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DD_DMSLiteDataSet = New DD_DMSLiteDataSet() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "VWPM_CHART_TOP5DataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + ''' '''Represents the strongly named DataTable class. ''' @@ -14427,6 +14756,98 @@ Partial Public Class DD_DMSLiteDataSet End Property End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class VWPM_CHART_TOP5Row + Inherits Global.System.Data.DataRow + + Private tableVWPM_CHART_TOP5 As VWPM_CHART_TOP5DataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableVWPM_CHART_TOP5 = CType(Me.Table,VWPM_CHART_TOP5DataTable) + End Sub + + _ + Public Property KRED_NAME() As String + Get + Return CType(Me(Me.tableVWPM_CHART_TOP5.KRED_NAMEColumn),String) + End Get + Set + Me(Me.tableVWPM_CHART_TOP5.KRED_NAMEColumn) = value + End Set + End Property + + _ + Public Property ANZ_BELEG() As Short + Get + Return CType(Me(Me.tableVWPM_CHART_TOP5.ANZ_BELEGColumn),Short) + End Get + Set + Me(Me.tableVWPM_CHART_TOP5.ANZ_BELEGColumn) = value + End Set + End Property + + _ + Public Property Netto() As Decimal + Get + Try + Return CType(Me(Me.tableVWPM_CHART_TOP5.NettoColumn),Decimal) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Netto in Tabelle VWPM_CHART_TOP5 ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableVWPM_CHART_TOP5.NettoColumn) = value + End Set + End Property + + _ + Public Property Skonto() As Decimal + Get + Try + Return CType(Me(Me.tableVWPM_CHART_TOP5.SkontoColumn),Decimal) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Skonto in Tabelle VWPM_CHART_TOP5 ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableVWPM_CHART_TOP5.SkontoColumn) = value + End Set + End Property + + _ + Public Function IsNettoNull() As Boolean + Return Me.IsNull(Me.tableVWPM_CHART_TOP5.NettoColumn) + End Function + + _ + Public Sub SetNettoNull() + Me(Me.tableVWPM_CHART_TOP5.NettoColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsSkontoNull() As Boolean + Return Me.IsNull(Me.tableVWPM_CHART_TOP5.SkontoColumn) + End Function + + _ + Public Sub SetSkontoNull() + Me(Me.tableVWPM_CHART_TOP5.SkontoColumn) = Global.System.Convert.DBNull + End Sub + End Class + ''' '''Represents strongly named DataRow class. ''' @@ -15414,6 +15835,42 @@ Partial Public Class DD_DMSLiteDataSet End Property End Class + ''' + '''Row event argument class + ''' + _ + Public Class VWPM_CHART_TOP5RowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As VWPM_CHART_TOP5Row + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As VWPM_CHART_TOP5Row, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As VWPM_CHART_TOP5Row + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + ''' '''Row event argument class ''' @@ -23932,6 +24389,182 @@ Namespace DD_DMSLiteDataSetTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class VWPM_CHART_TOP5TableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "VWPM_CHART_TOP5" + tableMapping.ColumnMappings.Add("KRED_NAME", "KRED_NAME") + tableMapping.ColumnMappings.Add("ANZ_BELEG", "ANZ_BELEG") + tableMapping.ColumnMappings.Add("Netto", "Netto") + tableMapping.ColumnMappings.Add("Skonto", "Skonto") + Me._adapter.TableMappings.Add(tableMapping) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT *"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CHART_TOP5"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Netto DESC" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSLiteDataSet.VWPM_CHART_TOP5DataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As DD_DMSLiteDataSet.VWPM_CHART_TOP5DataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DD_DMSLiteDataSet.VWPM_CHART_TOP5DataTable = New DD_DMSLiteDataSet.VWPM_CHART_TOP5DataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + End Class + ''' '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios ''' @@ -24306,15 +24939,6 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FINAL_INDEXING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBDD_GUI_LANGUAGE_PHRASETableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_GUI_LANGUAGE_PHRASE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -24342,6 +24966,15 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FINAL_INDEXING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If If (Not (Me._tBPM_PROFILE_FILESTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -24421,14 +25054,6 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FINAL_INDEXING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBDD_GUI_LANGUAGE_PHRASETableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_GUI_LANGUAGE_PHRASE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -24453,6 +25078,14 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FINAL_INDEXING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If If (Not (Me._tBPM_PROFILE_FILESTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -24543,6 +25176,14 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If + If (Not (Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FINAL_INDEXING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -24567,14 +25208,6 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_FINAL_INDEXING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_PROFILE_FINAL_INDEXINGTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBPM_PROFILE_CONTROLSTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE_CONTROLS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 9df6478..584219c 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1102,7 +1102,7 @@ WHERE (GUID = @GUID) - + SELECT MAX(GUID) FROM TBPM_PROFILE @@ -1110,7 +1110,7 @@ WHERE (GUID = @GUID) - + SELECT COUNT(GUID) FROM TBPM_PROFILE WHERE NAME = @NAME @@ -1120,7 +1120,7 @@ WHERE (GUID = @GUID) - + UPDATE TBPM_PROFILE @@ -1135,7 +1135,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + UPDATE TBPM_PROFILE @@ -1149,7 +1149,7 @@ WHERE (GUID = @GUID) - + UPDATE TBPM_PROFILE @@ -1458,7 +1458,7 @@ VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ - + UPDATE TBPM_PROFILE_CONTROLS @@ -2023,6 +2023,27 @@ ORDER BY SEQ + + + + + + SELECT * +FROM VWPM_CHART_TOP5 +ORDER BY Netto DESC + + + + + + + + + + + + + @@ -2031,7 +2052,7 @@ ORDER BY SEQ - + @@ -2091,7 +2112,7 @@ ORDER BY SEQ - + @@ -2187,7 +2208,7 @@ ORDER BY SEQ - + @@ -2252,7 +2273,7 @@ ORDER BY SEQ - + @@ -2282,7 +2303,7 @@ ORDER BY SEQ - + @@ -2305,7 +2326,7 @@ ORDER BY SEQ - + @@ -2379,7 +2400,7 @@ ORDER BY SEQ - + @@ -2428,7 +2449,7 @@ ORDER BY SEQ - + @@ -2443,7 +2464,7 @@ ORDER BY SEQ - + @@ -2565,7 +2586,7 @@ ORDER BY SEQ - + @@ -2638,7 +2659,7 @@ ORDER BY SEQ - + @@ -2689,7 +2710,7 @@ ORDER BY SEQ - + @@ -2827,7 +2848,7 @@ ORDER BY SEQ - + @@ -2905,7 +2926,7 @@ ORDER BY SEQ - + @@ -2946,7 +2967,7 @@ ORDER BY SEQ - + @@ -2984,7 +3005,7 @@ ORDER BY SEQ - + @@ -3041,7 +3062,7 @@ ORDER BY SEQ - + @@ -3099,7 +3120,7 @@ ORDER BY SEQ - + @@ -3200,7 +3221,7 @@ ORDER BY SEQ - + @@ -3253,7 +3274,7 @@ ORDER BY SEQ - + @@ -3269,6 +3290,22 @@ ORDER BY SEQ + + + + + + + + + + + + + + + + @@ -3350,11 +3387,11 @@ ORDER BY SEQ - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index a6a20be..596878b 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,31 +4,32 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + 549 @@ -40,7 +41,7 @@ - + 175 @@ -56,7 +57,7 @@ - + 603 @@ -68,7 +69,7 @@ - + 1248 @@ -80,7 +81,7 @@ - + 141 diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 4cf73ab..a590d6e 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -153,9 +153,6 @@ ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll - - ..\..\..\DDMonorepo\Modules.Windream\bin\Debug\DigitalData.Modules.Windream.dll - P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll @@ -233,7 +230,6 @@ - True diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 1579df1..df461c8 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/clswindream.vb b/app/DD_PM_WINDREAM/clswindream.vb deleted file mode 100644 index 34922b0..0000000 --- a/app/DD_PM_WINDREAM/clswindream.vb +++ /dev/null @@ -1,12 +0,0 @@ -Imports DigitalData.Modules.Windream -Public Class clswindream - Public Sub New() - LOGGER.Debug("Initializing windream...") - Try - Dim clswmDD As New Windream(LOGCONFIG, True, "W", "\\windream\onjects", False, "", "", "", "") - Catch ex As Exception - - End Try - - End Sub -End Class diff --git a/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb b/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb index 27c9ff8..7a1bed5 100644 --- a/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb +++ b/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb @@ -23,6 +23,119 @@ Partial Class frmInvDashboard Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim ChartControlCommandGalleryItemGroup2DColumn1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DColumn = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DColumn() + Dim CreateBarChartItem1 As DevExpress.XtraCharts.UI.CreateBarChartItem = New DevExpress.XtraCharts.UI.CreateBarChartItem() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmInvDashboard)) + Dim CreateFullStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedBarChartItem() + Dim CreateSideBySideFullStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateSideBySideFullStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateSideBySideFullStackedBarChartItem() + Dim CreateSideBySideStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateSideBySideStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateSideBySideStackedBarChartItem() + Dim CreateStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateStackedBarChartItem() + Dim CreateWaterfallChartItem1 As DevExpress.XtraCharts.UI.CreateWaterfallChartItem = New DevExpress.XtraCharts.UI.CreateWaterfallChartItem() + Dim ChartControlCommandGalleryItemGroup3DColumn1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DColumn = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DColumn() + Dim CreateBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateBar3DChartItem = New DevExpress.XtraCharts.UI.CreateBar3DChartItem() + Dim CreateFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedBar3DChartItem() + Dim CreateManhattanBarChartItem1 As DevExpress.XtraCharts.UI.CreateManhattanBarChartItem = New DevExpress.XtraCharts.UI.CreateManhattanBarChartItem() + Dim CreateSideBySideFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateSideBySideFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateSideBySideFullStackedBar3DChartItem() + Dim CreateSideBySideStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateSideBySideStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateSideBySideStackedBar3DChartItem() + Dim CreateStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateStackedBar3DChartItem() + Dim ChartControlCommandGalleryItemGroupCylinderColumn1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupCylinderColumn = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupCylinderColumn() + Dim CreateCylinderBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateCylinderBar3DChartItem = New DevExpress.XtraCharts.UI.CreateCylinderBar3DChartItem() + Dim CreateCylinderFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateCylinderFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateCylinderFullStackedBar3DChartItem() + Dim CreateCylinderManhattanBarChartItem1 As DevExpress.XtraCharts.UI.CreateCylinderManhattanBarChartItem = New DevExpress.XtraCharts.UI.CreateCylinderManhattanBarChartItem() + Dim CreateCylinderSideBySideFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateCylinderSideBySideFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateCylinderSideBySideFullStackedBar3DChartItem() + Dim CreateCylinderSideBySideStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateCylinderSideBySideStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateCylinderSideBySideStackedBar3DChartItem() + Dim CreateCylinderStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateCylinderStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateCylinderStackedBar3DChartItem() + Dim ChartControlCommandGalleryItemGroupConeColumn1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupConeColumn = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupConeColumn() + Dim CreateConeBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateConeBar3DChartItem = New DevExpress.XtraCharts.UI.CreateConeBar3DChartItem() + Dim CreateConeFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateConeFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateConeFullStackedBar3DChartItem() + Dim CreateConeManhattanBarChartItem1 As DevExpress.XtraCharts.UI.CreateConeManhattanBarChartItem = New DevExpress.XtraCharts.UI.CreateConeManhattanBarChartItem() + Dim CreateConeSideBySideFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateConeSideBySideFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateConeSideBySideFullStackedBar3DChartItem() + Dim CreateConeSideBySideStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateConeSideBySideStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateConeSideBySideStackedBar3DChartItem() + Dim CreateConeStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreateConeStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreateConeStackedBar3DChartItem() + Dim ChartControlCommandGalleryItemGroupPyramidColumn1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupPyramidColumn = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupPyramidColumn() + Dim CreatePyramidBar3DChartItem1 As DevExpress.XtraCharts.UI.CreatePyramidBar3DChartItem = New DevExpress.XtraCharts.UI.CreatePyramidBar3DChartItem() + Dim CreatePyramidFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreatePyramidFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreatePyramidFullStackedBar3DChartItem() + Dim CreatePyramidManhattanBarChartItem1 As DevExpress.XtraCharts.UI.CreatePyramidManhattanBarChartItem = New DevExpress.XtraCharts.UI.CreatePyramidManhattanBarChartItem() + Dim CreatePyramidSideBySideFullStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreatePyramidSideBySideFullStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreatePyramidSideBySideFullStackedBar3DChartItem() + Dim CreatePyramidSideBySideStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreatePyramidSideBySideStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreatePyramidSideBySideStackedBar3DChartItem() + Dim CreatePyramidStackedBar3DChartItem1 As DevExpress.XtraCharts.UI.CreatePyramidStackedBar3DChartItem = New DevExpress.XtraCharts.UI.CreatePyramidStackedBar3DChartItem() + Dim ChartControlCommandGalleryItemGroup2DLine1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DLine = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DLine() + Dim CreateLineChartItem1 As DevExpress.XtraCharts.UI.CreateLineChartItem = New DevExpress.XtraCharts.UI.CreateLineChartItem() + Dim CreateFullStackedLineChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedLineChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedLineChartItem() + Dim CreateScatterLineChartItem1 As DevExpress.XtraCharts.UI.CreateScatterLineChartItem = New DevExpress.XtraCharts.UI.CreateScatterLineChartItem() + Dim CreateSplineChartItem1 As DevExpress.XtraCharts.UI.CreateSplineChartItem = New DevExpress.XtraCharts.UI.CreateSplineChartItem() + Dim CreateStackedLineChartItem1 As DevExpress.XtraCharts.UI.CreateStackedLineChartItem = New DevExpress.XtraCharts.UI.CreateStackedLineChartItem() + Dim CreateStepLineChartItem1 As DevExpress.XtraCharts.UI.CreateStepLineChartItem = New DevExpress.XtraCharts.UI.CreateStepLineChartItem() + Dim ChartControlCommandGalleryItemGroup3DLine1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DLine = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DLine() + Dim CreateLine3DChartItem1 As DevExpress.XtraCharts.UI.CreateLine3DChartItem = New DevExpress.XtraCharts.UI.CreateLine3DChartItem() + Dim CreateFullStackedLine3DChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedLine3DChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedLine3DChartItem() + Dim CreateSpline3DChartItem1 As DevExpress.XtraCharts.UI.CreateSpline3DChartItem = New DevExpress.XtraCharts.UI.CreateSpline3DChartItem() + Dim CreateStackedLine3DChartItem1 As DevExpress.XtraCharts.UI.CreateStackedLine3DChartItem = New DevExpress.XtraCharts.UI.CreateStackedLine3DChartItem() + Dim CreateStepLine3DChartItem1 As DevExpress.XtraCharts.UI.CreateStepLine3DChartItem = New DevExpress.XtraCharts.UI.CreateStepLine3DChartItem() + Dim ChartControlCommandGalleryItemGroup2DPie1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DPie = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DPie() + Dim CreatePieChartItem1 As DevExpress.XtraCharts.UI.CreatePieChartItem = New DevExpress.XtraCharts.UI.CreatePieChartItem() + Dim CreateDoughnutChartItem1 As DevExpress.XtraCharts.UI.CreateDoughnutChartItem = New DevExpress.XtraCharts.UI.CreateDoughnutChartItem() + Dim CreateNestedDoughnutChartItem1 As DevExpress.XtraCharts.UI.CreateNestedDoughnutChartItem = New DevExpress.XtraCharts.UI.CreateNestedDoughnutChartItem() + Dim ChartControlCommandGalleryItemGroup3DPie1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DPie = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DPie() + Dim CreatePie3DChartItem1 As DevExpress.XtraCharts.UI.CreatePie3DChartItem = New DevExpress.XtraCharts.UI.CreatePie3DChartItem() + Dim CreateDoughnut3DChartItem1 As DevExpress.XtraCharts.UI.CreateDoughnut3DChartItem = New DevExpress.XtraCharts.UI.CreateDoughnut3DChartItem() + Dim ChartControlCommandGalleryItemGroup2DBar1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DBar = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DBar() + Dim CreateRotatedBarChartItem1 As DevExpress.XtraCharts.UI.CreateRotatedBarChartItem = New DevExpress.XtraCharts.UI.CreateRotatedBarChartItem() + Dim CreateRotatedFullStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateRotatedFullStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateRotatedFullStackedBarChartItem() + Dim CreateRotatedSideBySideFullStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateRotatedSideBySideFullStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateRotatedSideBySideFullStackedBarChartItem() + Dim CreateRotatedSideBySideStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateRotatedSideBySideStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateRotatedSideBySideStackedBarChartItem() + Dim CreateRotatedStackedBarChartItem1 As DevExpress.XtraCharts.UI.CreateRotatedStackedBarChartItem = New DevExpress.XtraCharts.UI.CreateRotatedStackedBarChartItem() + Dim ChartControlCommandGalleryItemGroup2DArea1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DArea = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup2DArea() + Dim CreateAreaChartItem1 As DevExpress.XtraCharts.UI.CreateAreaChartItem = New DevExpress.XtraCharts.UI.CreateAreaChartItem() + Dim CreateFullStackedAreaChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedAreaChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedAreaChartItem() + Dim CreateFullStackedSplineAreaChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedSplineAreaChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedSplineAreaChartItem() + Dim CreateFullStackedStepAreaChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedStepAreaChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedStepAreaChartItem() + Dim CreateSplineAreaChartItem1 As DevExpress.XtraCharts.UI.CreateSplineAreaChartItem = New DevExpress.XtraCharts.UI.CreateSplineAreaChartItem() + Dim CreateStackedAreaChartItem1 As DevExpress.XtraCharts.UI.CreateStackedAreaChartItem = New DevExpress.XtraCharts.UI.CreateStackedAreaChartItem() + Dim CreateStackedStepAreaChartItem1 As DevExpress.XtraCharts.UI.CreateStackedStepAreaChartItem = New DevExpress.XtraCharts.UI.CreateStackedStepAreaChartItem() + Dim CreateStackedSplineAreaChartItem1 As DevExpress.XtraCharts.UI.CreateStackedSplineAreaChartItem = New DevExpress.XtraCharts.UI.CreateStackedSplineAreaChartItem() + Dim CreateStepAreaChartItem1 As DevExpress.XtraCharts.UI.CreateStepAreaChartItem = New DevExpress.XtraCharts.UI.CreateStepAreaChartItem() + Dim ChartControlCommandGalleryItemGroup3DArea1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DArea = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroup3DArea() + Dim CreateArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateArea3DChartItem = New DevExpress.XtraCharts.UI.CreateArea3DChartItem() + Dim CreateFullStackedArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedArea3DChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedArea3DChartItem() + Dim CreateFullStackedSplineArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateFullStackedSplineArea3DChartItem = New DevExpress.XtraCharts.UI.CreateFullStackedSplineArea3DChartItem() + Dim CreateSplineArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateSplineArea3DChartItem = New DevExpress.XtraCharts.UI.CreateSplineArea3DChartItem() + Dim CreateStackedArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateStackedArea3DChartItem = New DevExpress.XtraCharts.UI.CreateStackedArea3DChartItem() + Dim CreateStackedSplineArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateStackedSplineArea3DChartItem = New DevExpress.XtraCharts.UI.CreateStackedSplineArea3DChartItem() + Dim CreateStepArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateStepArea3DChartItem = New DevExpress.XtraCharts.UI.CreateStepArea3DChartItem() + Dim ChartControlCommandGalleryItemGroupPoint1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupPoint = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupPoint() + Dim CreatePointChartItem1 As DevExpress.XtraCharts.UI.CreatePointChartItem = New DevExpress.XtraCharts.UI.CreatePointChartItem() + Dim CreateBubbleChartItem1 As DevExpress.XtraCharts.UI.CreateBubbleChartItem = New DevExpress.XtraCharts.UI.CreateBubbleChartItem() + Dim ChartControlCommandGalleryItemGroupFunnel1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupFunnel = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupFunnel() + Dim CreateFunnelChartItem1 As DevExpress.XtraCharts.UI.CreateFunnelChartItem = New DevExpress.XtraCharts.UI.CreateFunnelChartItem() + Dim CreateFunnel3DChartItem1 As DevExpress.XtraCharts.UI.CreateFunnel3DChartItem = New DevExpress.XtraCharts.UI.CreateFunnel3DChartItem() + Dim ChartControlCommandGalleryItemGroupFinancial1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupFinancial = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupFinancial() + Dim CreateStockChartItem1 As DevExpress.XtraCharts.UI.CreateStockChartItem = New DevExpress.XtraCharts.UI.CreateStockChartItem() + Dim CreateCandleStickChartItem1 As DevExpress.XtraCharts.UI.CreateCandleStickChartItem = New DevExpress.XtraCharts.UI.CreateCandleStickChartItem() + Dim ChartControlCommandGalleryItemGroupRadar1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupRadar = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupRadar() + Dim CreateRadarPointChartItem1 As DevExpress.XtraCharts.UI.CreateRadarPointChartItem = New DevExpress.XtraCharts.UI.CreateRadarPointChartItem() + Dim CreateRadarLineChartItem1 As DevExpress.XtraCharts.UI.CreateRadarLineChartItem = New DevExpress.XtraCharts.UI.CreateRadarLineChartItem() + Dim CreateRadarAreaChartItem1 As DevExpress.XtraCharts.UI.CreateRadarAreaChartItem = New DevExpress.XtraCharts.UI.CreateRadarAreaChartItem() + Dim CreateRadarRangeAreaChartItem1 As DevExpress.XtraCharts.UI.CreateRadarRangeAreaChartItem = New DevExpress.XtraCharts.UI.CreateRadarRangeAreaChartItem() + Dim CreateScatterRadarLineChartItem1 As DevExpress.XtraCharts.UI.CreateScatterRadarLineChartItem = New DevExpress.XtraCharts.UI.CreateScatterRadarLineChartItem() + Dim ChartControlCommandGalleryItemGroupPolar1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupPolar = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupPolar() + Dim CreatePolarPointChartItem1 As DevExpress.XtraCharts.UI.CreatePolarPointChartItem = New DevExpress.XtraCharts.UI.CreatePolarPointChartItem() + Dim CreatePolarLineChartItem1 As DevExpress.XtraCharts.UI.CreatePolarLineChartItem = New DevExpress.XtraCharts.UI.CreatePolarLineChartItem() + Dim CreatePolarAreaChartItem1 As DevExpress.XtraCharts.UI.CreatePolarAreaChartItem = New DevExpress.XtraCharts.UI.CreatePolarAreaChartItem() + Dim CreatePolarRangeAreaChartItem1 As DevExpress.XtraCharts.UI.CreatePolarRangeAreaChartItem = New DevExpress.XtraCharts.UI.CreatePolarRangeAreaChartItem() + Dim CreateScatterPolarLineChartItem1 As DevExpress.XtraCharts.UI.CreateScatterPolarLineChartItem = New DevExpress.XtraCharts.UI.CreateScatterPolarLineChartItem() + Dim ChartControlCommandGalleryItemGroupRange1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupRange = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupRange() + Dim CreateRangeBarChartItem1 As DevExpress.XtraCharts.UI.CreateRangeBarChartItem = New DevExpress.XtraCharts.UI.CreateRangeBarChartItem() + Dim CreateSideBySideRangeBarChartItem1 As DevExpress.XtraCharts.UI.CreateSideBySideRangeBarChartItem = New DevExpress.XtraCharts.UI.CreateSideBySideRangeBarChartItem() + Dim CreateRangeAreaChartItem1 As DevExpress.XtraCharts.UI.CreateRangeAreaChartItem = New DevExpress.XtraCharts.UI.CreateRangeAreaChartItem() + Dim CreateRangeArea3DChartItem1 As DevExpress.XtraCharts.UI.CreateRangeArea3DChartItem = New DevExpress.XtraCharts.UI.CreateRangeArea3DChartItem() + Dim ChartControlCommandGalleryItemGroupGantt1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupGantt = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupGantt() + Dim CreateGanttChartItem1 As DevExpress.XtraCharts.UI.CreateGanttChartItem = New DevExpress.XtraCharts.UI.CreateGanttChartItem() + Dim CreateSideBySideGanttChartItem1 As DevExpress.XtraCharts.UI.CreateSideBySideGanttChartItem = New DevExpress.XtraCharts.UI.CreateSideBySideGanttChartItem() + Dim ChartControlCommandGalleryItemGroupBoxPlot1 As DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupBoxPlot = New DevExpress.XtraCharts.UI.ChartControlCommandGalleryItemGroupBoxPlot() + Dim CreateBoxPlotChartItem1 As DevExpress.XtraCharts.UI.CreateBoxPlotChartItem = New DevExpress.XtraCharts.UI.CreateBoxPlotChartItem() + Dim SkinPaddingEdges1 As DevExpress.Skins.SkinPaddingEdges = New DevExpress.Skins.SkinPaddingEdges() + Dim SkinPaddingEdges2 As DevExpress.Skins.SkinPaddingEdges = New DevExpress.Skins.SkinPaddingEdges() Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() @@ -33,10 +146,13 @@ Partial Class frmInvDashboard Me.colTitle = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.colAnzahl = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.colNettoSumme = New DevExpress.XtraGrid.Columns.TileViewColumn() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.CommandBarGalleryDropDown1 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CommandBarGalleryDropDown2 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CommandBarGalleryDropDown3 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CommandBarGalleryDropDown4 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CommandBarGalleryDropDown5 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CommandBarGalleryDropDown6 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CommandBarGalleryDropDown7 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() @@ -46,11 +162,105 @@ Partial Class frmInvDashboard Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView() Me.Label1 = New System.Windows.Forms.Label() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() + Me.VWPM_CHART_TOP5BindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colKRED_NAME = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colANZ_BELEG = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colNetto = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colSkonto = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SplitContainerDashboard = New System.Windows.Forms.SplitContainer() + Me.SplitContainerTop = New System.Windows.Forms.SplitContainer() + Me.ChartTopLeft = New DevExpress.XtraCharts.ChartControl() + Me.VWPM_CHART_TOP5TableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.VWPM_CHART_TOP5TableAdapter() + Me.ChartTopRight = New DevExpress.XtraCharts.ChartControl() + Me.SplitContainerBottom = New System.Windows.Forms.SplitContainer() + Me.ChartBottomLeft = New DevExpress.XtraCharts.ChartControl() + Me.ChartBottomRight = New DevExpress.XtraCharts.ChartControl() + Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() + Me.ChartBarController1 = New DevExpress.XtraCharts.UI.ChartBarController(Me.components) + Me.CreateChartOtherRibbonPage1 = New DevExpress.XtraCharts.UI.CreateChartOtherRibbonPage() + Me.ChartPrintExportRibbonPageGroup1 = New DevExpress.XtraCharts.UI.ChartPrintExportRibbonPageGroup() + Me.ChartTemplatesRibbonPageGroup1 = New DevExpress.XtraCharts.UI.ChartTemplatesRibbonPageGroup() + Me.ChartWizardRibbonPageGroup1 = New DevExpress.XtraCharts.UI.ChartWizardRibbonPageGroup() + Me.CreateChartRibbonPage1 = New DevExpress.XtraCharts.UI.CreateChartRibbonPage() + Me.ChartAppearanceRibbonPageGroup1 = New DevExpress.XtraCharts.UI.ChartAppearanceRibbonPageGroup() + Me.ChartTypeRibbonPageGroup1 = New DevExpress.XtraCharts.UI.ChartTypeRibbonPageGroup() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.ChartRibbonPageCategory1 = New DevExpress.XtraCharts.UI.ChartRibbonPageCategory() + Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.CreateBarBaseItem1 = New DevExpress.XtraCharts.UI.CreateBarBaseItem() + Me.CreateLineBaseItem1 = New DevExpress.XtraCharts.UI.CreateLineBaseItem() + Me.CreatePieBaseItem1 = New DevExpress.XtraCharts.UI.CreatePieBaseItem() + Me.CreateRotatedBarBaseItem1 = New DevExpress.XtraCharts.UI.CreateRotatedBarBaseItem() + Me.CreateAreaBaseItem1 = New DevExpress.XtraCharts.UI.CreateAreaBaseItem() + Me.CreateOtherSeriesTypesBaseItem1 = New DevExpress.XtraCharts.UI.CreateOtherSeriesTypesBaseItem() + Me.ChangePaletteGalleryBaseItem1 = New DevExpress.XtraCharts.UI.ChangePaletteGalleryBaseItem() + Me.ChangeAppearanceGalleryBaseItem1 = New DevExpress.XtraCharts.UI.ChangeAppearanceGalleryBaseItem() + Me.RunDesignerChartItem1 = New DevExpress.XtraCharts.UI.RunDesignerChartItem() + Me.SaveAsTemplateChartItem1 = New DevExpress.XtraCharts.UI.SaveAsTemplateChartItem() + Me.LoadTemplateChartItem1 = New DevExpress.XtraCharts.UI.LoadTemplateChartItem() + Me.PrintPreviewChartItem1 = New DevExpress.XtraCharts.UI.PrintPreviewChartItem() + Me.PrintChartItem1 = New DevExpress.XtraCharts.UI.PrintChartItem() + Me.CreateExportBaseItem1 = New DevExpress.XtraCharts.UI.CreateExportBaseItem() + Me.ExportToPDFChartItem1 = New DevExpress.XtraCharts.UI.ExportToPDFChartItem() + Me.ExportToHTMLChartItem1 = New DevExpress.XtraCharts.UI.ExportToHTMLChartItem() + Me.ExportToMHTChartItem1 = New DevExpress.XtraCharts.UI.ExportToMHTChartItem() + Me.ExportToXLSChartItem1 = New DevExpress.XtraCharts.UI.ExportToXLSChartItem() + Me.ExportToXLSXChartItem1 = New DevExpress.XtraCharts.UI.ExportToXLSXChartItem() + Me.ExportToRTFChartItem1 = New DevExpress.XtraCharts.UI.ExportToRTFChartItem() + Me.ExportToBMPChartItem1 = New DevExpress.XtraCharts.UI.ExportToBMPChartItem() + Me.ExportToGIFChartItem1 = New DevExpress.XtraCharts.UI.ExportToGIFChartItem() + Me.ExportToJPEGChartItem1 = New DevExpress.XtraCharts.UI.ExportToJPEGChartItem() + Me.ExportToPNGChartItem1 = New DevExpress.XtraCharts.UI.ExportToPNGChartItem() + Me.ExportToTIFFChartItem1 = New DevExpress.XtraCharts.UI.ExportToTIFFChartItem() + Me.CreateExportToImageBaseItem1 = New DevExpress.XtraCharts.UI.CreateExportToImageBaseItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + CType(Me.CommandBarGalleryDropDown1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CommandBarGalleryDropDown2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CommandBarGalleryDropDown3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CommandBarGalleryDropDown4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CommandBarGalleryDropDown5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CommandBarGalleryDropDown6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CommandBarGalleryDropDown7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.VWPM_CHART_TOP5BindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDashboard.Panel1.SuspendLayout() + Me.SplitContainerDashboard.Panel2.SuspendLayout() + Me.SplitContainerDashboard.SuspendLayout() + CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTop.Panel1.SuspendLayout() + Me.SplitContainerTop.Panel2.SuspendLayout() + Me.SplitContainerTop.SuspendLayout() + CType(Me.ChartTopLeft, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChartTopRight, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerBottom.Panel1.SuspendLayout() + Me.SplitContainerBottom.Panel2.SuspendLayout() + Me.SplitContainerBottom.SuspendLayout() + CType(Me.ChartBottomLeft, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChartBottomRight, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChartBarController1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.SuspendLayout() + Me.Panel2.SuspendLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'colTitle @@ -76,39 +286,581 @@ Partial Class frmInvDashboard Me.colNettoSumme.Visible = True Me.colNettoSumme.VisibleIndex = 2 ' - 'RibbonControl1 + 'CommandBarGalleryDropDown1 ' - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) - Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(800, 146) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' - 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" ' - 'RibbonPageGroup1 + Me.CommandBarGalleryDropDown1.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown1.Gallery.ColumnCount = 4 + ChartControlCommandGalleryItemGroup2DColumn1.Caption = "Spalte 2-D" + CreateBarChartItem1.Caption = "Gruppierte Säulen" + CreateBarChartItem1.Description = resources.GetString("CreateBarChartItem1.Description") + CreateBarChartItem1.Hint = resources.GetString("CreateBarChartItem1.Hint") + CreateFullStackedBarChartItem1.Caption = "100 % Gestapelte Säule" + CreateFullStackedBarChartItem1.Description = "Vergleichen den Prozentsatz, der jeder Wert mit vertikalen Rechtecke aller Katego" & + "rien auf insgesamt beiträgt." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Sie es, den Anteil der einzelnen Daten" & + "reihen hervorzuheben." + CreateFullStackedBarChartItem1.Hint = "Vergleichen den Prozentsatz, der jeder Wert mit vertikalen Rechtecke aller Katego" & + "rien auf insgesamt beiträgt." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Sie es, den Anteil der einzelnen Daten" & + "reihen hervorzuheben." + CreateSideBySideFullStackedBarChartItem1.Caption = "Gruppierte 100 % gestapelte Spalte" + CreateSideBySideFullStackedBarChartItem1.Description = "Verbinden die Vorteile der beiden 100 % gestapelte und gruppierte Säulen Diagramm" & + "typen, so dass Sie können verschiedene Spalten Stapeln und sie in Gruppen auf de" & + "r gleichen Achsenwert kombinieren." + CreateSideBySideFullStackedBarChartItem1.Hint = "Verbinden die Vorteile der beiden 100 % gestapelte und gruppierte Säulen Diagramm" & + "typen, so dass Sie können verschiedene Spalten Stapeln und sie in Gruppen auf de" & + "r gleichen Achsenwert kombinieren." + CreateSideBySideStackedBarChartItem1.Caption = "Gruppierte gestapelte Säule" + CreateSideBySideStackedBarChartItem1.Description = "Verbinden die Vorteile von sowohl die gestapelte und gruppierte Säulen Diagrammty" & + "pen, so dass Sie können verschiedene Spalten Stapeln und sie in Gruppen über den" & + " gleichen Achsenwert kombinieren." + CreateSideBySideStackedBarChartItem1.Hint = "Verbinden die Vorteile von sowohl die gestapelte und gruppierte Säulen Diagrammty" & + "pen, so dass Sie können verschiedene Spalten Stapeln und sie in Gruppen über den" & + " gleichen Achsenwert kombinieren." + CreateStackedBarChartItem1.Caption = "Gestapelte Spalte" + CreateStackedBarChartItem1.Description = "Vergleich der Beitrag eines jeden Wert insgesamt aller Kategorien mit vertikalen " & + "Rechtecke." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Damit können sie um die gesamte Serie für eine Kategorie zu betone" & + "n." + CreateStackedBarChartItem1.Hint = "Vergleich der Beitrag eines jeden Wert insgesamt aller Kategorien mit vertikalen " & + "Rechtecke." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Damit können sie um die gesamte Serie für eine Kategorie zu betone" & + "n." + CreateWaterfallChartItem1.Caption = "Waterfall" + CreateWaterfallChartItem1.Description = "A Waterfall chart displays a sequence of bars that indicate positive or negative " & + "changes." + CreateWaterfallChartItem1.Hint = "A Waterfall chart displays a sequence of bars that indicate positive or negative " & + "changes." + ChartControlCommandGalleryItemGroup2DColumn1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateBarChartItem1, CreateFullStackedBarChartItem1, CreateSideBySideFullStackedBarChartItem1, CreateSideBySideStackedBarChartItem1, CreateStackedBarChartItem1, CreateWaterfallChartItem1}) + ChartControlCommandGalleryItemGroup3DColumn1.Caption = "3D-Säulen" + CreateBar3DChartItem1.Caption = "3-D gruppierten Spalte" + CreateBar3DChartItem1.Description = "Werte verschiedener Kategorien vergleichen und gruppierte Spalten im 3D-Format an" & + "zeigen." + CreateBar3DChartItem1.Hint = "Werte verschiedener Kategorien vergleichen und gruppierte Spalten im 3D-Format an" & + "zeigen." + CreateFullStackedBar3DChartItem1.Caption = "100 % Gestapelte Spalte in 3-d" + CreateFullStackedBar3DChartItem1.Description = "vergleichen Sie den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt" & + " und 100 % gestapelte Spalten im 3D-Format anzeigen." + CreateFullStackedBar3DChartItem1.Hint = "vergleichen Sie den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt" & + " und 100 % gestapelte Spalten im 3D-Format anzeigen." + CreateManhattanBarChartItem1.Caption = "3D-Säulen" + CreateManhattanBarChartItem1.Description = "Vergleichen Werte über Kategorien und über Serie auf drei Achsen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Si" & + "e es, wenn die Kategorien und die Serie ebenso wichtig sind." + CreateManhattanBarChartItem1.Hint = "Vergleichen Werte über Kategorien und über Serie auf drei Achsen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Si" & + "e es, wenn die Kategorien und die Serie ebenso wichtig sind." + CreateSideBySideFullStackedBar3DChartItem1.Caption = "Gruppierte 100 % gestapelte Spalte in 3-d" + CreateSideBySideFullStackedBar3DChartItem1.Description = resources.GetString("CreateSideBySideFullStackedBar3DChartItem1.Description") + CreateSideBySideFullStackedBar3DChartItem1.Hint = resources.GetString("CreateSideBySideFullStackedBar3DChartItem1.Hint") + CreateSideBySideStackedBar3DChartItem1.Caption = "Gruppierte gestapelte Säule in 3-d" + CreateSideBySideStackedBar3DChartItem1.Description = resources.GetString("CreateSideBySideStackedBar3DChartItem1.Description") + CreateSideBySideStackedBar3DChartItem1.Hint = resources.GetString("CreateSideBySideStackedBar3DChartItem1.Hint") + CreateStackedBar3DChartItem1.Caption = "Gestapelte Spalte in 3-d" + CreateStackedBar3DChartItem1.Description = "Die Verteilung der Einzelwerte auf insgesamt Kategoriengesamtwert vergleichen und" & + " gestapelte Spalten im 3D-Format anzeigen." + CreateStackedBar3DChartItem1.Hint = "Die Verteilung der Einzelwerte auf insgesamt Kategoriengesamtwert vergleichen und" & + " gestapelte Spalten im 3D-Format anzeigen." + ChartControlCommandGalleryItemGroup3DColumn1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateBar3DChartItem1, CreateFullStackedBar3DChartItem1, CreateManhattanBarChartItem1, CreateSideBySideFullStackedBar3DChartItem1, CreateSideBySideStackedBar3DChartItem1, CreateStackedBar3DChartItem1}) + ChartControlCommandGalleryItemGroupCylinderColumn1.Caption = "Zylinder" + CreateCylinderBar3DChartItem1.Caption = "Gruppierte Zylinder" + CreateCylinderBar3DChartItem1.Description = "Vergleicht Werte verschiedener Kategorien." + CreateCylinderBar3DChartItem1.Hint = "Vergleicht Werte verschiedener Kategorien." + CreateCylinderFullStackedBar3DChartItem1.Caption = "100 % Gestapelt Zylinder" + CreateCylinderFullStackedBar3DChartItem1.Description = "Den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt vergleichen." + CreateCylinderFullStackedBar3DChartItem1.Hint = "Den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt vergleichen." + CreateCylinderManhattanBarChartItem1.Caption = "3-D-Zylinder" + CreateCylinderManhattanBarChartItem1.Description = "Werte zu vergleichen, über Kategorien und über Serie und einem Zylinder-Diagramm " & + "der drei Achsen anzeigen." + CreateCylinderManhattanBarChartItem1.Hint = "Werte zu vergleichen, über Kategorien und über Serie und einem Zylinder-Diagramm " & + "der drei Achsen anzeigen." + CreateCylinderSideBySideFullStackedBar3DChartItem1.Caption = "Gruppierte 100 % gestapelt Zylinder" + CreateCylinderSideBySideFullStackedBar3DChartItem1.Description = resources.GetString("CreateCylinderSideBySideFullStackedBar3DChartItem1.Description") + CreateCylinderSideBySideFullStackedBar3DChartItem1.Hint = resources.GetString("CreateCylinderSideBySideFullStackedBar3DChartItem1.Hint") + CreateCylinderSideBySideStackedBar3DChartItem1.Caption = "Gruppierte gestapelte Zylinder" + CreateCylinderSideBySideStackedBar3DChartItem1.Description = "Verbinden die Vorteile von gestapelt Zylinder sowohl Clustered Zylinder Diagrammt" & + "ypen, so dass Sie können verschiedene Zylinder Stapeln und sie in Gruppen über d" & + "en gleichen Achsenwert kombinieren." + CreateCylinderSideBySideStackedBar3DChartItem1.Hint = "Verbinden die Vorteile von gestapelt Zylinder sowohl Clustered Zylinder Diagrammt" & + "ypen, so dass Sie können verschiedene Zylinder Stapeln und sie in Gruppen über d" & + "en gleichen Achsenwert kombinieren." + CreateCylinderStackedBar3DChartItem1.Caption = "Gestapelte Zylinder" + CreateCylinderStackedBar3DChartItem1.Description = "Verteilung der Einzelwerte der Einzelwerte mit insgesamt über Kategorien vergleic" & + "hen." + CreateCylinderStackedBar3DChartItem1.Hint = "Verteilung der Einzelwerte der Einzelwerte mit insgesamt über Kategorien vergleic" & + "hen." + ChartControlCommandGalleryItemGroupCylinderColumn1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateCylinderBar3DChartItem1, CreateCylinderFullStackedBar3DChartItem1, CreateCylinderManhattanBarChartItem1, CreateCylinderSideBySideFullStackedBar3DChartItem1, CreateCylinderSideBySideStackedBar3DChartItem1, CreateCylinderStackedBar3DChartItem1}) + ChartControlCommandGalleryItemGroupConeColumn1.Caption = "Kegel" + CreateConeBar3DChartItem1.Caption = "Gruppierte Kegel" + CreateConeBar3DChartItem1.Description = "Werte verschiedener Kategorien vergleichen." + CreateConeBar3DChartItem1.Hint = "Werte verschiedener Kategorien vergleichen." + CreateConeFullStackedBar3DChartItem1.Caption = "100 % Gestapelt Kegel" + CreateConeFullStackedBar3DChartItem1.Description = "Den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt vergleichen." + CreateConeFullStackedBar3DChartItem1.Hint = "Den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt vergleichen." + CreateConeManhattanBarChartItem1.Caption = "3-D-Kegel" + CreateConeManhattanBarChartItem1.Description = "Werte zu vergleichen, über Kategorien und über Serie und ein Kegel-Diagramm auf d" & + "rei Achsen anzeigen." + CreateConeManhattanBarChartItem1.Hint = "Werte zu vergleichen, über Kategorien und über Serie und ein Kegel-Diagramm auf d" & + "rei Achsen anzeigen." + CreateConeSideBySideFullStackedBar3DChartItem1.Caption = "Gruppierte 100 % gestapelt Kegel" + CreateConeSideBySideFullStackedBar3DChartItem1.Description = resources.GetString("CreateConeSideBySideFullStackedBar3DChartItem1.Description") + CreateConeSideBySideFullStackedBar3DChartItem1.Hint = resources.GetString("CreateConeSideBySideFullStackedBar3DChartItem1.Hint") + CreateConeSideBySideStackedBar3DChartItem1.Caption = "Gruppierte gestapelte Kegel" + CreateConeSideBySideStackedBar3DChartItem1.Description = "Verbinden die Vorteile von gestapelt Kegel sowohl gruppierte Kegel Diagrammtypen," & + " so dass Sie können verschiedene Vulkankegel Stapeln und sie in Gruppen über den" & + " gleichen Achsenwert kombinieren." + CreateConeSideBySideStackedBar3DChartItem1.Hint = "Verbinden die Vorteile von gestapelt Kegel sowohl gruppierte Kegel Diagrammtypen," & + " so dass Sie können verschiedene Vulkankegel Stapeln und sie in Gruppen über den" & + " gleichen Achsenwert kombinieren." + CreateConeStackedBar3DChartItem1.Caption = "Gestapelte Kegel" + CreateConeStackedBar3DChartItem1.Description = "Verteilung der Einzelwerte der Einzelwerte mit insgesamt über Kategorien vergleic" & + "hen." + CreateConeStackedBar3DChartItem1.Hint = "Verteilung der Einzelwerte der Einzelwerte mit insgesamt über Kategorien vergleic" & + "hen." + ChartControlCommandGalleryItemGroupConeColumn1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateConeBar3DChartItem1, CreateConeFullStackedBar3DChartItem1, CreateConeManhattanBarChartItem1, CreateConeSideBySideFullStackedBar3DChartItem1, CreateConeSideBySideStackedBar3DChartItem1, CreateConeStackedBar3DChartItem1}) + ChartControlCommandGalleryItemGroupPyramidColumn1.Caption = "Pyramide" + CreatePyramidBar3DChartItem1.Caption = "Gruppierte Pyramide" + CreatePyramidBar3DChartItem1.Description = "Vergleicht Werte verschiedener Kategorien." + CreatePyramidBar3DChartItem1.Hint = "Vergleicht Werte verschiedener Kategorien." + CreatePyramidFullStackedBar3DChartItem1.Caption = "100 % Gestapelt Pyramide" + CreatePyramidFullStackedBar3DChartItem1.Description = "Den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt vergleichen." + CreatePyramidFullStackedBar3DChartItem1.Hint = "Den Prozentsatz Einzelwerte zum Gesamtwert aller Kategorien trägt vergleichen." + CreatePyramidManhattanBarChartItem1.Caption = "3D Pyramide" + CreatePyramidManhattanBarChartItem1.Description = "Werte zu vergleichen, über Kategorien und über Serie und zeigen ein Pyramidendiag" & + "ramm auf drei Achsen." + CreatePyramidManhattanBarChartItem1.Hint = "Werte zu vergleichen, über Kategorien und über Serie und zeigen ein Pyramidendiag" & + "ramm auf drei Achsen." + CreatePyramidSideBySideFullStackedBar3DChartItem1.Caption = "Gruppierte 100 % gestapelte Pyramide" + CreatePyramidSideBySideFullStackedBar3DChartItem1.Description = resources.GetString("CreatePyramidSideBySideFullStackedBar3DChartItem1.Description") + CreatePyramidSideBySideFullStackedBar3DChartItem1.Hint = resources.GetString("CreatePyramidSideBySideFullStackedBar3DChartItem1.Hint") + CreatePyramidSideBySideStackedBar3DChartItem1.Caption = "Gruppierte gestapelte Pyramide" + CreatePyramidSideBySideStackedBar3DChartItem1.Description = resources.GetString("CreatePyramidSideBySideStackedBar3DChartItem1.Description") + CreatePyramidSideBySideStackedBar3DChartItem1.Hint = resources.GetString("CreatePyramidSideBySideStackedBar3DChartItem1.Hint") + CreatePyramidStackedBar3DChartItem1.Caption = "Pyramide gestapelt" + CreatePyramidStackedBar3DChartItem1.Description = "Verteilung der Einzelwerte der Einzelwerte mit insgesamt über Kategorien vergleic" & + "hen." + CreatePyramidStackedBar3DChartItem1.Hint = "Verteilung der Einzelwerte der Einzelwerte mit insgesamt über Kategorien vergleic" & + "hen." + ChartControlCommandGalleryItemGroupPyramidColumn1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreatePyramidBar3DChartItem1, CreatePyramidFullStackedBar3DChartItem1, CreatePyramidManhattanBarChartItem1, CreatePyramidSideBySideFullStackedBar3DChartItem1, CreatePyramidSideBySideStackedBar3DChartItem1, CreatePyramidStackedBar3DChartItem1}) + Me.CommandBarGalleryDropDown1.Gallery.Groups.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItemGroup() {ChartControlCommandGalleryItemGroup2DColumn1, ChartControlCommandGalleryItemGroup3DColumn1, ChartControlCommandGalleryItemGroupCylinderColumn1, ChartControlCommandGalleryItemGroupConeColumn1, ChartControlCommandGalleryItemGroupPyramidColumn1}) + Me.CommandBarGalleryDropDown1.Gallery.ImageSize = New System.Drawing.Size(32, 32) + Me.CommandBarGalleryDropDown1.Gallery.RowCount = 10 + Me.CommandBarGalleryDropDown1.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown1.Name = "CommandBarGalleryDropDown1" + Me.CommandBarGalleryDropDown1.Ribbon = Me.RibbonControl1 ' - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + 'CommandBarGalleryDropDown2 + ' + ' + ' + ' + Me.CommandBarGalleryDropDown2.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown2.Gallery.ColumnCount = 3 + ChartControlCommandGalleryItemGroup2DLine1.Caption = "2-D-Linie" + CreateLineChartItem1.Caption = "Linie" + CreateLineChartItem1.Description = "Display Trend Überstunden (Termine, Jahre) oder sortierte Kategorien. Nützlich, w" & + "enn viele Datenpunkte vorhanden sind und die Reihenfolge wichtig ist." + CreateLineChartItem1.Hint = "Display Trend Überstunden (Termine, Jahre) oder sortierte Kategorien. Nützlich, w" & + "enn viele Datenpunkte vorhanden sind und die Reihenfolge wichtig ist." + CreateFullStackedLineChartItem1.Caption = "100 % Gestapelte Linie" + CreateFullStackedLineChartItem1.Description = "Zeigen den Trend für den Prozentsatz jeder Wert über Zeit oder geordnete Kategori" & + "en beiträgt." + CreateFullStackedLineChartItem1.Hint = "Zeigen den Trend für den Prozentsatz jeder Wert über Zeit oder geordnete Kategori" & + "en beiträgt." + CreateScatterLineChartItem1.Caption = "Scatter Linie" + CreateScatterLineChartItem1.Description = "Serie Punkte in der gleichen Reihenfolge, die sie in der Auflistung darstellen." + CreateScatterLineChartItem1.Hint = "Serie Punkte in der gleichen Reihenfolge, die sie in der Auflistung darstellen." + CreateSplineChartItem1.Caption = "Keil" + CreateSplineChartItem1.Description = "Grundstück eine eingepassten Kurve durch jeden Datenpunkt in einer Reihe." + CreateSplineChartItem1.Hint = "Grundstück eine eingepassten Kurve durch jeden Datenpunkt in einer Reihe." + CreateStackedLineChartItem1.Caption = "Gestapelte Linie" + CreateStackedLineChartItem1.Description = "Displays the trend of the contribution of each value over time or ordered categor" & + "ies." + CreateStackedLineChartItem1.Hint = "Displays the trend of the contribution of each value over time or ordered categor" & + "ies." + CreateStepLineChartItem1.Caption = "Stufenlinie" + CreateStepLineChartItem1.Description = "Zeigt, inwieweit sich die Werte für verschiedene Punkte in der gleichen Serie geä" & + "ndert haben." + CreateStepLineChartItem1.Hint = "Zeigt, inwieweit sich die Werte für verschiedene Punkte in der gleichen Serie geä" & + "ndert haben." + ChartControlCommandGalleryItemGroup2DLine1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateLineChartItem1, CreateFullStackedLineChartItem1, CreateScatterLineChartItem1, CreateSplineChartItem1, CreateStackedLineChartItem1, CreateStepLineChartItem1}) + ChartControlCommandGalleryItemGroup3DLine1.Caption = "3-D-Linie" + CreateLine3DChartItem1.Caption = "3-D-Linie" + CreateLine3DChartItem1.Description = "Zeigt jede Zeile oder Spalte mit Daten als ein 3-d Band auf drei Achsen." + CreateLine3DChartItem1.Hint = "Zeigt jede Zeile oder Spalte mit Daten als ein 3-d Band auf drei Achsen." + CreateFullStackedLine3DChartItem1.Caption = "100 % Gestapelte Linie in 3-d" + CreateFullStackedLine3DChartItem1.Description = "anzeigen alle gestapelten und ist nützlich, wenn es erforderlich ist, vergleichen" & + ", wie viel jede Reihe der aggregierten Gesamtwert für bestimmte Argumente (als P" & + "rozente) hinzufügt." + CreateFullStackedLine3DChartItem1.Hint = "anzeigen alle gestapelten und ist nützlich, wenn es erforderlich ist, vergleichen" & + ", wie viel jede Reihe der aggregierten Gesamtwert für bestimmte Argumente (als P" & + "rozente) hinzufügt." + CreateSpline3DChartItem1.Caption = "3D-Spline" + CreateSpline3DChartItem1.Description = "Grundstück eine eingepassten Kurve durch jeden Datenpunkt in einer Reihe." + CreateSpline3DChartItem1.Hint = "Grundstück eine eingepassten Kurve durch jeden Datenpunkt in einer Reihe." + CreateStackedLine3DChartItem1.Caption = "Gestapelte Linie in 3-d" + CreateStackedLine3DChartItem1.Description = resources.GetString("CreateStackedLine3DChartItem1.Description") + CreateStackedLine3DChartItem1.Hint = resources.GetString("CreateStackedLine3DChartItem1.Hint") + CreateStepLine3DChartItem1.Caption = "Schritt-Linie in 3-d" + CreateStepLine3DChartItem1.Description = "Zeigt, inwieweit sich die Werte für verschiedene Punkte in der gleichen Serie geä" & + "ndert haben." + CreateStepLine3DChartItem1.Hint = "Zeigt, inwieweit sich die Werte für verschiedene Punkte in der gleichen Serie geä" & + "ndert haben." + ChartControlCommandGalleryItemGroup3DLine1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateLine3DChartItem1, CreateFullStackedLine3DChartItem1, CreateSpline3DChartItem1, CreateStackedLine3DChartItem1, CreateStepLine3DChartItem1}) + Me.CommandBarGalleryDropDown2.Gallery.Groups.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItemGroup() {ChartControlCommandGalleryItemGroup2DLine1, ChartControlCommandGalleryItemGroup3DLine1}) + Me.CommandBarGalleryDropDown2.Gallery.ImageSize = New System.Drawing.Size(32, 32) + Me.CommandBarGalleryDropDown2.Gallery.RowCount = 4 + Me.CommandBarGalleryDropDown2.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown2.Name = "CommandBarGalleryDropDown2" + Me.CommandBarGalleryDropDown2.Ribbon = Me.RibbonControl1 + ' + 'CommandBarGalleryDropDown3 ' - 'RibbonPageGroup2 ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' + ' + Me.CommandBarGalleryDropDown3.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown3.Gallery.ColumnCount = 3 + ChartControlCommandGalleryItemGroup2DPie1.Caption = "Torte 2-D" + CreatePieChartItem1.Caption = "Torte" + CreatePieChartItem1.Description = resources.GetString("CreatePieChartItem1.Description") + CreatePieChartItem1.Hint = resources.GetString("CreatePieChartItem1.Hint") + CreateDoughnutChartItem1.Caption = "Ring" + CreateDoughnutChartItem1.Description = "Zeigen die Verteilung der Einzelwerte zum Gesamtwert wie ein Kreisdiagramm, aber " & + "es kann mehrere Reihen enthalten." + CreateDoughnutChartItem1.Hint = "Zeigen die Verteilung der Einzelwerte zum Gesamtwert wie ein Kreisdiagramm, aber " & + "es kann mehrere Reihen enthalten." + CreateNestedDoughnutChartItem1.Caption = "Verschachtelter Donut" + CreateNestedDoughnutChartItem1.Description = "Zeigen die Verteilung der Einzelwerte zum Gesamtwert während vergleichen-Serie mi" & + "t einem Donut in einem anderen geschachtelt." + CreateNestedDoughnutChartItem1.Hint = "Zeigen die Verteilung der Einzelwerte zum Gesamtwert während vergleichen-Serie mi" & + "t einem Donut in einem anderen geschachtelt." + ChartControlCommandGalleryItemGroup2DPie1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreatePieChartItem1, CreateDoughnutChartItem1, CreateNestedDoughnutChartItem1}) + ChartControlCommandGalleryItemGroup3DPie1.Caption = "3-D Torte" + CreatePie3DChartItem1.Caption = "3D-Kreis" + CreatePie3DChartItem1.Description = "zeigen die Verteilung der Einzelwerte zum Gesamtwert." + CreatePie3DChartItem1.Hint = "zeigen die Verteilung der Einzelwerte zum Gesamtwert." + CreateDoughnut3DChartItem1.Caption = "Donut in 3-d" + CreateDoughnut3DChartItem1.Description = "Vergleichen die Prozentwerte der verschiedenen Argumente in der gleichen Serie un" & + "d illustrieren diese Werte als leicht verständliche Kreissegmente, sondern mit e" & + "inem Loch in der Mitte." + CreateDoughnut3DChartItem1.Hint = "Vergleichen die Prozentwerte der verschiedenen Argumente in der gleichen Serie un" & + "d illustrieren diese Werte als leicht verständliche Kreissegmente, sondern mit e" & + "inem Loch in der Mitte." + ChartControlCommandGalleryItemGroup3DPie1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreatePie3DChartItem1, CreateDoughnut3DChartItem1}) + Me.CommandBarGalleryDropDown3.Gallery.Groups.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItemGroup() {ChartControlCommandGalleryItemGroup2DPie1, ChartControlCommandGalleryItemGroup3DPie1}) + Me.CommandBarGalleryDropDown3.Gallery.ImageSize = New System.Drawing.Size(32, 32) + Me.CommandBarGalleryDropDown3.Gallery.RowCount = 2 + Me.CommandBarGalleryDropDown3.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown3.Name = "CommandBarGalleryDropDown3" + Me.CommandBarGalleryDropDown3.Ribbon = Me.RibbonControl1 + ' + 'CommandBarGalleryDropDown4 + ' + ' + ' + ' + Me.CommandBarGalleryDropDown4.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown4.Gallery.ColumnCount = 3 + ChartControlCommandGalleryItemGroup2DBar1.Caption = "2D-Balken" + CreateRotatedBarChartItem1.Caption = "Balken" + CreateRotatedBarChartItem1.Description = "ein Balkendiagramm." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Balkendiagramme sind der beste Chart-Typ für den Vergleich" & + " mehrerer Werte." + CreateRotatedBarChartItem1.Hint = "ein Balkendiagramm." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Balkendiagramme sind der beste Chart-Typ für den Vergleich" & + " mehrerer Werte." + CreateRotatedFullStackedBarChartItem1.Caption = "100 % Gestapelt Bar" + CreateRotatedFullStackedBarChartItem1.Description = resources.GetString("CreateRotatedFullStackedBarChartItem1.Description") + CreateRotatedFullStackedBarChartItem1.Hint = resources.GetString("CreateRotatedFullStackedBarChartItem1.Hint") + CreateRotatedSideBySideFullStackedBarChartItem1.Caption = "Gruppierte 100 % gestapelt Bar" + CreateRotatedSideBySideFullStackedBarChartItem1.Description = "Verbinden die Vorteile der beiden 100 % gestapelte Balken und gruppierte Balken D" & + "iagrammtypen, so können Sie verschiedene Bars Stapeln und sie in Gruppen über de" & + "n gleichen Achsenwert kombinieren." + CreateRotatedSideBySideFullStackedBarChartItem1.Hint = "Verbinden die Vorteile der beiden 100 % gestapelte Balken und gruppierte Balken D" & + "iagrammtypen, so können Sie verschiedene Bars Stapeln und sie in Gruppen über de" & + "n gleichen Achsenwert kombinieren." + CreateRotatedSideBySideStackedBarChartItem1.Caption = "Gruppierte gestapelte Balken" + CreateRotatedSideBySideStackedBarChartItem1.Description = "Verbinden die Vorteile der beiden gestapelte Balken und gruppierte Balken Diagram" & + "mtypen, so dass Sie können verschiedene Bars Stapeln und sie in Gruppen auf der " & + "gleichen Achsenwert kombinieren." + CreateRotatedSideBySideStackedBarChartItem1.Hint = "Verbinden die Vorteile der beiden gestapelte Balken und gruppierte Balken Diagram" & + "mtypen, so dass Sie können verschiedene Bars Stapeln und sie in Gruppen auf der " & + "gleichen Achsenwert kombinieren." + CreateRotatedStackedBarChartItem1.Caption = "Gestapelte Balken" + CreateRotatedStackedBarChartItem1.Description = "Die Verteilung der Einzelwerte auf insgesamt über Kategorien mithilfe von horizon" & + "talen Rechtecke vergleichen." + CreateRotatedStackedBarChartItem1.Hint = "Die Verteilung der Einzelwerte auf insgesamt über Kategorien mithilfe von horizon" & + "talen Rechtecke vergleichen." + ChartControlCommandGalleryItemGroup2DBar1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateRotatedBarChartItem1, CreateRotatedFullStackedBarChartItem1, CreateRotatedSideBySideFullStackedBarChartItem1, CreateRotatedSideBySideStackedBarChartItem1, CreateRotatedStackedBarChartItem1}) + Me.CommandBarGalleryDropDown4.Gallery.Groups.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItemGroup() {ChartControlCommandGalleryItemGroup2DBar1}) + Me.CommandBarGalleryDropDown4.Gallery.ImageSize = New System.Drawing.Size(32, 32) + Me.CommandBarGalleryDropDown4.Gallery.RowCount = 2 + Me.CommandBarGalleryDropDown4.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown4.Name = "CommandBarGalleryDropDown4" + Me.CommandBarGalleryDropDown4.Ribbon = Me.RibbonControl1 + ' + 'CommandBarGalleryDropDown5 + ' + ' + ' + ' + Me.CommandBarGalleryDropDown5.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown5.Gallery.ColumnCount = 4 + ChartControlCommandGalleryItemGroup2DArea1.Caption = "2-D Bereich" + CreateAreaChartItem1.Caption = "Fläche" + CreateAreaChartItem1.Description = "Zeigen den Trend für Werte über einen Zeitraum oder Kategorien." + CreateAreaChartItem1.Hint = "Zeigen den Trend für Werte über einen Zeitraum oder Kategorien." + CreateFullStackedAreaChartItem1.Caption = "100 % Gestapeltes Flächendiagramm" + CreateFullStackedAreaChartItem1.Description = "Anzeige der Trend des Prozentsatzes trägt jeder Wert über einen Zeitraum oder Kat" & + "egorien." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Sie es, um die Entwicklung des Anteils der einzelnen Reihe" & + "n zu betonen." + CreateFullStackedAreaChartItem1.Hint = "Anzeige der Trend des Prozentsatzes trägt jeder Wert über einen Zeitraum oder Kat" & + "egorien." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Sie es, um die Entwicklung des Anteils der einzelnen Reihe" & + "n zu betonen." + CreateFullStackedSplineAreaChartItem1.Caption = "100 % Gestapelt Spline-Bereich" + CreateFullStackedSplineAreaChartItem1.Description = "Verhalten sich ähnlich wie 100 % Stacked Area, aber Handlung eine eingepassten Ku" & + "rve durch jeden Datenpunkt in einer Reihe." + CreateFullStackedSplineAreaChartItem1.Hint = "Verhalten sich ähnlich wie 100 % Stacked Area, aber Handlung eine eingepassten Ku" & + "rve durch jeden Datenpunkt in einer Reihe." + CreateFullStackedStepAreaChartItem1.Caption = "100% Stacked Step Area" + CreateFullStackedStepAreaChartItem1.Description = "Behaves similarly to the 100% Stacked Area Chart but connects data points using h" & + "orizontal and vertical lines." + CreateFullStackedStepAreaChartItem1.Hint = "Behaves similarly to the 100% Stacked Area Chart but connects data points using h" & + "orizontal and vertical lines." + CreateSplineAreaChartItem1.Caption = "Splinefläche" + CreateSplineAreaChartItem1.Description = "Verhalten sich ähnlich wie Flächendiagramm aber plot eine eingepassten Kurve durc" & + "h jeden Datenpunkt in einer Reihe." + CreateSplineAreaChartItem1.Hint = "Verhalten sich ähnlich wie Flächendiagramm aber plot eine eingepassten Kurve durc" & + "h jeden Datenpunkt in einer Reihe." + CreateStackedAreaChartItem1.Caption = "Gestapelte Fläche" + CreateStackedAreaChartItem1.Description = "Anzeige der Tendenz des Beitrags der einzelnen Wert über einen Zeitraum oder Kate" & + "gorien." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Sie es, um den Trend in der Summe über Serie für eine Kateg" & + "orie zu betonen." + CreateStackedAreaChartItem1.Hint = "Anzeige der Tendenz des Beitrags der einzelnen Wert über einen Zeitraum oder Kate" & + "gorien." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verwenden Sie es, um den Trend in der Summe über Serie für eine Kateg" & + "orie zu betonen." + CreateStackedStepAreaChartItem1.Caption = "Stacked Step Area" + CreateStackedStepAreaChartItem1.Description = "Behaves similarly to the Stacked Area Chart but connects data points using horizo" & + "ntal and vertical lines." + CreateStackedStepAreaChartItem1.Hint = "Behaves similarly to the Stacked Area Chart but connects data points using horizo" & + "ntal and vertical lines." + CreateStackedSplineAreaChartItem1.Caption = "Gestapelte Spline-Fläche" + CreateStackedSplineAreaChartItem1.Description = "Verhalten sich ähnlich wie gestapeltes Flächendiagramm aber plot eine eingepasste" & + "n Kurve durch jeden Datenpunkt in einer Reihe." + CreateStackedSplineAreaChartItem1.Hint = "Verhalten sich ähnlich wie gestapeltes Flächendiagramm aber plot eine eingepasste" & + "n Kurve durch jeden Datenpunkt in einer Reihe." + CreateStepAreaChartItem1.Caption = "Step Bereich" + CreateStepAreaChartItem1.Description = "Zeigen, wie sehr die Werte für verschiedene Punkte der gleichen Serie verändert h" & + "aben." + CreateStepAreaChartItem1.Hint = "Zeigen, wie sehr die Werte für verschiedene Punkte der gleichen Serie verändert h" & + "aben." + ChartControlCommandGalleryItemGroup2DArea1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateAreaChartItem1, CreateFullStackedAreaChartItem1, CreateFullStackedSplineAreaChartItem1, CreateFullStackedStepAreaChartItem1, CreateSplineAreaChartItem1, CreateStackedAreaChartItem1, CreateStackedStepAreaChartItem1, CreateStackedSplineAreaChartItem1, CreateStepAreaChartItem1}) + ChartControlCommandGalleryItemGroup3DArea1.Caption = "3-D Bereich" + CreateArea3DChartItem1.Caption = "3-D Bereich" + CreateArea3DChartItem1.Description = resources.GetString("CreateArea3DChartItem1.Description") + CreateArea3DChartItem1.Hint = resources.GetString("CreateArea3DChartItem1.Hint") + CreateFullStackedArea3DChartItem1.Caption = "100 % Gestapelt Bereich in 3-d" + CreateFullStackedArea3DChartItem1.Description = resources.GetString("CreateFullStackedArea3DChartItem1.Description") + CreateFullStackedArea3DChartItem1.Hint = resources.GetString("CreateFullStackedArea3DChartItem1.Hint") + CreateFullStackedSplineArea3DChartItem1.Caption = "100 % Gestapelt Spline Bereich in 3-d" + CreateFullStackedSplineArea3DChartItem1.Description = "Verhalten ähnlich wie 100 % gestapeltes Flächendiagramm in 3D, aber plot eine ein" & + "gepassten Kurve durch jeden Datenpunkt in einer Reihe." + CreateFullStackedSplineArea3DChartItem1.Hint = "Verhalten ähnlich wie 100 % gestapeltes Flächendiagramm in 3D, aber plot eine ein" & + "gepassten Kurve durch jeden Datenpunkt in einer Reihe." + CreateSplineArea3DChartItem1.Caption = "Spline-Bereich in 3-d" + CreateSplineArea3DChartItem1.Description = "Verhalten sich ähnlich wie 3D Flächendiagramm, aber plot eine eingepassten Kurve " & + "durch jeden Datenpunkt in einer Reihe." + CreateSplineArea3DChartItem1.Hint = "Verhalten sich ähnlich wie 3D Flächendiagramm, aber plot eine eingepassten Kurve " & + "durch jeden Datenpunkt in einer Reihe." + CreateStackedArea3DChartItem1.Caption = "Gestapelte Fläche in 3-d)" + CreateStackedArea3DChartItem1.Description = "Serie als Bereiche in einem Diagramm anzeigen, so dass der Wert der einzelnen Dat" & + "enpunkte mit der zugrunde liegenden Datenpunkte Werte aggregiert wird." + CreateStackedArea3DChartItem1.Hint = "Serie als Bereiche in einem Diagramm anzeigen, so dass der Wert der einzelnen Dat" & + "enpunkte mit der zugrunde liegenden Datenpunkte Werte aggregiert wird." + CreateStackedSplineArea3DChartItem1.Caption = "Gestapelte Spline-Fläche in 3-d)" + CreateStackedSplineArea3DChartItem1.Description = "Verhalten sich ähnlich wie gestapelt Bereich in 3D Diagramm, aber plot eine einge" & + "passten Kurve durch jeden Datenpunkt in einer Reihe." + CreateStackedSplineArea3DChartItem1.Hint = "Verhalten sich ähnlich wie gestapelt Bereich in 3D Diagramm, aber plot eine einge" & + "passten Kurve durch jeden Datenpunkt in einer Reihe." + CreateStepArea3DChartItem1.Caption = "Schrittbereich in 3-d" + CreateStepArea3DChartItem1.Description = "Zeigt, inwieweit sich die Werte für verschiedene Punkte in der gleichen Serie geä" & + "ndert haben." + CreateStepArea3DChartItem1.Hint = "Zeigt, inwieweit sich die Werte für verschiedene Punkte in der gleichen Serie geä" & + "ndert haben." + ChartControlCommandGalleryItemGroup3DArea1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateArea3DChartItem1, CreateFullStackedArea3DChartItem1, CreateFullStackedSplineArea3DChartItem1, CreateSplineArea3DChartItem1, CreateStackedArea3DChartItem1, CreateStackedSplineArea3DChartItem1, CreateStepArea3DChartItem1}) + Me.CommandBarGalleryDropDown5.Gallery.Groups.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItemGroup() {ChartControlCommandGalleryItemGroup2DArea1, ChartControlCommandGalleryItemGroup3DArea1}) + Me.CommandBarGalleryDropDown5.Gallery.ImageSize = New System.Drawing.Size(32, 32) + Me.CommandBarGalleryDropDown5.Gallery.RowCount = 5 + Me.CommandBarGalleryDropDown5.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown5.Name = "CommandBarGalleryDropDown5" + Me.CommandBarGalleryDropDown5.Ribbon = Me.RibbonControl1 + ' + 'CommandBarGalleryDropDown6 + ' + ' + ' + ' + Me.CommandBarGalleryDropDown6.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown6.Gallery.ColumnCount = 4 + ChartControlCommandGalleryItemGroupPoint1.Caption = "Punkt" + CreatePointChartItem1.Caption = "Punkt" + CreatePointChartItem1.Description = "Verwenden Sie es, wenn es notwendig ist eigenständige Datenpunkte auf dem gleiche" & + "n Diagramm zu zeigen." + CreatePointChartItem1.Hint = "Verwenden Sie es, wenn es notwendig ist eigenständige Datenpunkte auf dem gleiche" & + "n Diagramm zu zeigen." + CreateBubbleChartItem1.Caption = "Blase" + CreateBubbleChartItem1.Description = "Ein Punktdiagramm ähneln, aber vergleichen Sie Gruppen von drei Werten anstelle v" & + "on zwei. Der dritte Wert bestimmt die Größe des Blasengrundwerts." + CreateBubbleChartItem1.Hint = "Ein Punktdiagramm ähneln, aber vergleichen Sie Gruppen von drei Werten anstelle v" & + "on zwei. Der dritte Wert bestimmt die Größe des Blasengrundwerts." + ChartControlCommandGalleryItemGroupPoint1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreatePointChartItem1, CreateBubbleChartItem1}) + ChartControlCommandGalleryItemGroupFunnel1.Caption = "Trichter" + CreateFunnelChartItem1.Caption = "Trichter" + CreateFunnelChartItem1.Description = resources.GetString("CreateFunnelChartItem1.Description") + CreateFunnelChartItem1.Hint = resources.GetString("CreateFunnelChartItem1.Hint") + CreateFunnel3DChartItem1.Caption = "3-D-Trichter" + CreateFunnel3DChartItem1.Description = resources.GetString("CreateFunnel3DChartItem1.Description") + CreateFunnel3DChartItem1.Hint = resources.GetString("CreateFunnel3DChartItem1.Hint") + ChartControlCommandGalleryItemGroupFunnel1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateFunnelChartItem1, CreateFunnel3DChartItem1}) + ChartControlCommandGalleryItemGroupFinancial1.Caption = "Finanziell" + CreateStockChartItem1.Caption = "Kurs" + CreateStockChartItem1.Description = resources.GetString("CreateStockChartItem1.Description") + CreateStockChartItem1.Hint = resources.GetString("CreateStockChartItem1.Hint") + CreateCandleStickChartItem1.Caption = "Leuchter" + CreateCandleStickChartItem1.Description = resources.GetString("CreateCandleStickChartItem1.Description") + CreateCandleStickChartItem1.Hint = resources.GetString("CreateCandleStickChartItem1.Hint") + ChartControlCommandGalleryItemGroupFinancial1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateStockChartItem1, CreateCandleStickChartItem1}) + ChartControlCommandGalleryItemGroupRadar1.Caption = "Radar" + CreateRadarPointChartItem1.Caption = "Radar Punkte" + CreateRadarPointChartItem1.Description = "Zeigen Punkte aus zwei oder mehr unterschiedlichen Reihe auf die gleichen Punkte " & + "Argumente auf einem kreisförmigen Raster, die mehrere Achsen hat die Daten gezei" & + "chnet werden können." + CreateRadarPointChartItem1.Hint = "Zeigen Punkte aus zwei oder mehr unterschiedlichen Reihe auf die gleichen Punkte " & + "Argumente auf einem kreisförmigen Raster, die mehrere Achsen hat die Daten gezei" & + "chnet werden können." + CreateRadarLineChartItem1.Caption = "Radar Linie" + CreateRadarLineChartItem1.Description = resources.GetString("CreateRadarLineChartItem1.Description") + CreateRadarLineChartItem1.Hint = resources.GetString("CreateRadarLineChartItem1.Hint") + CreateRadarAreaChartItem1.Caption = "Radar Fläche" + CreateRadarAreaChartItem1.Description = "Anzeigen-Serie als gefüllte Fläche auf einem kreisförmigen Raster, die mehrere Ac" & + "hsen hat die Daten gezeichnet werden können." + CreateRadarAreaChartItem1.Hint = "Anzeigen-Serie als gefüllte Fläche auf einem kreisförmigen Raster, die mehrere Ac" & + "hsen hat die Daten gezeichnet werden können." + CreateRadarRangeAreaChartItem1.Caption = "Radar Range Area" + CreateRadarRangeAreaChartItem1.Description = resources.GetString("CreateRadarRangeAreaChartItem1.Description") + CreateRadarRangeAreaChartItem1.Hint = resources.GetString("CreateRadarRangeAreaChartItem1.Hint") + CreateScatterRadarLineChartItem1.Caption = "Radar-Linie zu zerstreuen" + CreateScatterRadarLineChartItem1.Description = resources.GetString("CreateScatterRadarLineChartItem1.Description") + CreateScatterRadarLineChartItem1.Hint = resources.GetString("CreateScatterRadarLineChartItem1.Hint") + ChartControlCommandGalleryItemGroupRadar1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateRadarPointChartItem1, CreateRadarLineChartItem1, CreateRadarAreaChartItem1, CreateRadarRangeAreaChartItem1, CreateScatterRadarLineChartItem1}) + ChartControlCommandGalleryItemGroupPolar1.Caption = "Polar" + CreatePolarPointChartItem1.Caption = "Polar Punkte" + CreatePolarPointChartItem1.Description = "Punkte aus zwei oder mehr unterschiedlichen Reihe auf das gleiche kreisförmige Di" & + "agramm auf der Grundlage der Winkel anzeigen." + CreatePolarPointChartItem1.Hint = "Punkte aus zwei oder mehr unterschiedlichen Reihe auf das gleiche kreisförmige Di" & + "agramm auf der Grundlage der Winkel anzeigen." + CreatePolarLineChartItem1.Caption = "Polar Linie" + CreatePolarLineChartItem1.Description = "Zeigen Trends für mehrere Serien und ihre Werte zu vergleichen, denn die gleichen" & + " Argumente in einem kreisförmigen Diagramm auf der Grundlage von Winkeln verweis" & + "t." + CreatePolarLineChartItem1.Hint = "Zeigen Trends für mehrere Serien und ihre Werte zu vergleichen, denn die gleichen" & + " Argumente in einem kreisförmigen Diagramm auf der Grundlage von Winkeln verweis" & + "t." + CreatePolarAreaChartItem1.Caption = "Polar Fläche" + CreatePolarAreaChartItem1.Description = "Serie als gefüllte Fläche in einem kreisförmigen Diagramm auf der Grundlage der W" & + "inkel angezeigt." + CreatePolarAreaChartItem1.Hint = "Serie als gefüllte Fläche in einem kreisförmigen Diagramm auf der Grundlage der W" & + "inkel angezeigt." + CreatePolarRangeAreaChartItem1.Caption = "Polar Range Area" + CreatePolarRangeAreaChartItem1.Description = resources.GetString("CreatePolarRangeAreaChartItem1.Description") + CreatePolarRangeAreaChartItem1.Hint = resources.GetString("CreatePolarRangeAreaChartItem1.Hint") + CreateScatterPolarLineChartItem1.Caption = "Streue Polar Linie" + CreateScatterPolarLineChartItem1.Description = resources.GetString("CreateScatterPolarLineChartItem1.Description") + CreateScatterPolarLineChartItem1.Hint = resources.GetString("CreateScatterPolarLineChartItem1.Hint") + ChartControlCommandGalleryItemGroupPolar1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreatePolarPointChartItem1, CreatePolarLineChartItem1, CreatePolarAreaChartItem1, CreatePolarRangeAreaChartItem1, CreateScatterPolarLineChartItem1}) + ChartControlCommandGalleryItemGroupRange1.Caption = "Bereich" + CreateRangeBarChartItem1.Caption = "Bereich Spalte" + CreateRangeBarChartItem1.Description = "Display vertikale Spalten entlang der Y-Achse (die Achse der Werte). Jede Spalte " & + "stellt einen Bereich von Daten für jede Argumentwert." + CreateRangeBarChartItem1.Hint = "Display vertikale Spalten entlang der Y-Achse (die Achse der Werte). Jede Spalte " & + "stellt einen Bereich von Daten für jede Argumentwert." + CreateSideBySideRangeBarChartItem1.Caption = "Gruppierter Spaltenbereich" + CreateSideBySideRangeBarChartItem1.Description = "Aktivität anzeigen Spalten aus unterschiedlichen Reihe gruppiert nach ihrer Argum" & + "ente. Jede Spalte stellt einen Bereich von Daten mit zwei Werte für Einzelwerte " & + "Argument." + CreateSideBySideRangeBarChartItem1.Hint = "Aktivität anzeigen Spalten aus unterschiedlichen Reihe gruppiert nach ihrer Argum" & + "ente. Jede Spalte stellt einen Bereich von Daten mit zwei Werte für Einzelwerte " & + "Argument." + CreateRangeAreaChartItem1.Caption = "Range Bereich" + CreateRangeAreaChartItem1.Description = resources.GetString("CreateRangeAreaChartItem1.Description") + CreateRangeAreaChartItem1.Hint = resources.GetString("CreateRangeAreaChartItem1.Hint") + CreateRangeArea3DChartItem1.Caption = "Bereich in 3D" + CreateRangeArea3DChartItem1.Description = resources.GetString("CreateRangeArea3DChartItem1.Description") + CreateRangeArea3DChartItem1.Hint = resources.GetString("CreateRangeArea3DChartItem1.Hint") + ChartControlCommandGalleryItemGroupRange1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateRangeBarChartItem1, CreateSideBySideRangeBarChartItem1, CreateRangeAreaChartItem1, CreateRangeArea3DChartItem1}) + ChartControlCommandGalleryItemGroupGantt1.Caption = "Balkendiagramm" + CreateGanttChartItem1.Caption = "Balkendiagramm" + CreateGanttChartItem1.Description = "verfolgen verschiedene Aktivitäten während der zeitliche Rahmen." + CreateGanttChartItem1.Hint = "verfolgen verschiedene Aktivitäten während der zeitliche Rahmen." + CreateSideBySideGanttChartItem1.Caption = "Clustered Gantt" + CreateSideBySideGanttChartItem1.Description = resources.GetString("CreateSideBySideGanttChartItem1.Description") + CreateSideBySideGanttChartItem1.Hint = resources.GetString("CreateSideBySideGanttChartItem1.Hint") + ChartControlCommandGalleryItemGroupGantt1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateGanttChartItem1, CreateSideBySideGanttChartItem1}) + ChartControlCommandGalleryItemGroupBoxPlot1.Caption = "BoxPlot" + CreateBoxPlotChartItem1.Caption = "BoxPlot" + CreateBoxPlotChartItem1.Description = resources.GetString("CreateBoxPlotChartItem1.Description") + CreateBoxPlotChartItem1.Hint = resources.GetString("CreateBoxPlotChartItem1.Hint") + ChartControlCommandGalleryItemGroupBoxPlot1.Items.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItem() {CreateBoxPlotChartItem1}) + Me.CommandBarGalleryDropDown6.Gallery.Groups.AddRange(New DevExpress.XtraBars.Ribbon.GalleryItemGroup() {ChartControlCommandGalleryItemGroupPoint1, ChartControlCommandGalleryItemGroupFunnel1, ChartControlCommandGalleryItemGroupFinancial1, ChartControlCommandGalleryItemGroupRadar1, ChartControlCommandGalleryItemGroupPolar1, ChartControlCommandGalleryItemGroupRange1, ChartControlCommandGalleryItemGroupGantt1, ChartControlCommandGalleryItemGroupBoxPlot1}) + Me.CommandBarGalleryDropDown6.Gallery.ImageSize = New System.Drawing.Size(32, 32) + Me.CommandBarGalleryDropDown6.Gallery.RowCount = 9 + Me.CommandBarGalleryDropDown6.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown6.Name = "CommandBarGalleryDropDown6" + Me.CommandBarGalleryDropDown6.Ribbon = Me.RibbonControl1 + ' + 'CommandBarGalleryDropDown7 + ' + ' + ' + ' + Me.CommandBarGalleryDropDown7.Gallery.AllowFilter = False + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Hovered.Options.UseFont = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Hovered.Options.UseTextOptions = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Hovered.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Normal.Options.UseFont = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Normal.Options.UseTextOptions = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Normal.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Pressed.Options.UseFont = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Pressed.Options.UseTextOptions = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemCaptionAppearance.Pressed.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Hovered.Options.UseFont = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Hovered.Options.UseTextOptions = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Hovered.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Normal.Options.UseFont = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Normal.Options.UseTextOptions = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Normal.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Pressed.Options.UseFont = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Pressed.Options.UseTextOptions = True + Me.CommandBarGalleryDropDown7.Gallery.Appearance.ItemDescriptionAppearance.Pressed.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Me.CommandBarGalleryDropDown7.Gallery.ColumnCount = 1 + Me.CommandBarGalleryDropDown7.Gallery.ImageSize = New System.Drawing.Size(160, 10) + Me.CommandBarGalleryDropDown7.Gallery.ItemImageLayout = DevExpress.Utils.Drawing.ImageLayoutMode.MiddleLeft + Me.CommandBarGalleryDropDown7.Gallery.ItemImageLocation = DevExpress.Utils.Locations.Right + SkinPaddingEdges1.Bottom = -3 + SkinPaddingEdges1.Top = -3 + Me.CommandBarGalleryDropDown7.Gallery.ItemImagePadding = SkinPaddingEdges1 + SkinPaddingEdges2.Bottom = -3 + SkinPaddingEdges2.Top = -3 + Me.CommandBarGalleryDropDown7.Gallery.ItemTextPadding = SkinPaddingEdges2 + Me.CommandBarGalleryDropDown7.Gallery.RowCount = 10 + Me.CommandBarGalleryDropDown7.Gallery.ShowGroupCaption = False + Me.CommandBarGalleryDropDown7.Gallery.ShowItemText = True + Me.CommandBarGalleryDropDown7.Gallery.ShowScrollBar = DevExpress.XtraBars.Ribbon.Gallery.ShowScrollBar.[Auto] + Me.CommandBarGalleryDropDown7.Name = "CommandBarGalleryDropDown7" + Me.CommandBarGalleryDropDown7.Ribbon = Me.RibbonControl1 ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 429) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 745) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 21) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1124, 21) ' 'RibbonPage2 ' @@ -152,11 +904,11 @@ Partial Class frmInvDashboard Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GridControl1.DataSource = Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource - Me.GridControl1.Location = New System.Drawing.Point(12, 168) + Me.GridControl1.Location = New System.Drawing.Point(7, 16) Me.GridControl1.MainView = Me.TileView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(776, 112) + Me.GridControl1.Size = New System.Drawing.Size(1114, 119) Me.GridControl1.TabIndex = 5 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1}) ' @@ -208,41 +960,599 @@ Partial Class frmInvDashboard ' 'Label1 ' + Me.Label1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Tahoma", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(9, 149) + Me.Label1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.Color.DodgerBlue + Me.Label1.Location = New System.Drawing.Point(479, 3) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(160, 16) + Me.Label1.Size = New System.Drawing.Size(162, 13) Me.Label1.TabIndex = 8 - Me.Label1.Text = "Alle Belege - Verteilung" + Me.Label1.Text = "Verteilung Belege Workflow" + ' + 'GridControl2 + ' + Me.GridControl2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControl2.DataSource = Me.VWPM_CHART_TOP5BindingSource + Me.GridControl2.Location = New System.Drawing.Point(7, 141) + Me.GridControl2.MainView = Me.GridView1 + Me.GridControl2.MenuManager = Me.RibbonControl1 + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.Size = New System.Drawing.Size(1105, 152) + Me.GridControl2.TabIndex = 9 + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'VWPM_CHART_TOP5BindingSource + ' + Me.VWPM_CHART_TOP5BindingSource.DataMember = "VWPM_CHART_TOP5" + Me.VWPM_CHART_TOP5BindingSource.DataSource = Me.DD_DMSLiteDataSet + ' + 'GridView1 + ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colKRED_NAME, Me.colANZ_BELEG, Me.colNetto, Me.colSkonto}) + Me.GridView1.GridControl = Me.GridControl2 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsView.ShowGroupPanel = False + Me.GridView1.OptionsView.ShowViewCaption = True + Me.GridView1.ViewCaption = "Top Kreditoren" + ' + 'colKRED_NAME + ' + Me.colKRED_NAME.Caption = "Kreditor" + Me.colKRED_NAME.FieldName = "KRED_NAME" + Me.colKRED_NAME.ImageOptions.SvgImage = CType(resources.GetObject("colKRED_NAME.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.colKRED_NAME.Name = "colKRED_NAME" + Me.colKRED_NAME.OptionsColumn.AllowEdit = False + Me.colKRED_NAME.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] + Me.colKRED_NAME.Visible = True + Me.colKRED_NAME.VisibleIndex = 0 + Me.colKRED_NAME.Width = 215 + ' + 'colANZ_BELEG + ' + Me.colANZ_BELEG.Caption = "Anzahl" + Me.colANZ_BELEG.FieldName = "ANZ_BELEG" + Me.colANZ_BELEG.ImageOptions.SvgImage = CType(resources.GetObject("colANZ_BELEG.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.colANZ_BELEG.Name = "colANZ_BELEG" + Me.colANZ_BELEG.OptionsColumn.AllowEdit = False + Me.colANZ_BELEG.Visible = True + Me.colANZ_BELEG.VisibleIndex = 1 + Me.colANZ_BELEG.Width = 97 + ' + 'colNetto + ' + Me.colNetto.Caption = "Netto" + Me.colNetto.DisplayFormat.FormatString = "c2" + Me.colNetto.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric + Me.colNetto.FieldName = "Netto" + Me.colNetto.ImageOptions.Image = CType(resources.GetObject("colNetto.ImageOptions.Image"), System.Drawing.Image) + Me.colNetto.Name = "colNetto" + Me.colNetto.OptionsColumn.AllowEdit = False + Me.colNetto.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] + Me.colNetto.Visible = True + Me.colNetto.VisibleIndex = 2 + Me.colNetto.Width = 191 + ' + 'colSkonto + ' + Me.colSkonto.Caption = "Skonto" + Me.colSkonto.DisplayFormat.FormatString = "c2" + Me.colSkonto.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric + Me.colSkonto.FieldName = "Skonto" + Me.colSkonto.Name = "colSkonto" + Me.colSkonto.OptionsColumn.AllowEdit = False + Me.colSkonto.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] + Me.colSkonto.Visible = True + Me.colSkonto.VisibleIndex = 3 + Me.colSkonto.Width = 286 + ' + 'SplitContainerDashboard + ' + Me.SplitContainerDashboard.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerDashboard.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerDashboard.Name = "SplitContainerDashboard" + Me.SplitContainerDashboard.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainerDashboard.Panel1 + ' + Me.SplitContainerDashboard.Panel1.Controls.Add(Me.SplitContainerTop) + ' + 'SplitContainerDashboard.Panel2 + ' + Me.SplitContainerDashboard.Panel2.Controls.Add(Me.SplitContainerBottom) + Me.SplitContainerDashboard.Size = New System.Drawing.Size(1124, 291) + Me.SplitContainerDashboard.SplitterDistance = 158 + Me.SplitContainerDashboard.TabIndex = 12 + ' + 'SplitContainerTop + ' + Me.SplitContainerTop.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerTop.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerTop.Name = "SplitContainerTop" + ' + 'SplitContainerTop.Panel1 + ' + Me.SplitContainerTop.Panel1.Controls.Add(Me.ChartTopLeft) + ' + 'SplitContainerTop.Panel2 + ' + Me.SplitContainerTop.Panel2.Controls.Add(Me.ChartTopRight) + Me.SplitContainerTop.Size = New System.Drawing.Size(1124, 158) + Me.SplitContainerTop.SplitterDistance = 359 + Me.SplitContainerTop.TabIndex = 0 + ' + 'ChartTopLeft + ' + Me.ChartTopLeft.DataAdapter = Me.VWPM_CHART_TOP5TableAdapter + Me.ChartTopLeft.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartTopLeft.Legend.Name = "Default Legend" + Me.ChartTopLeft.Location = New System.Drawing.Point(0, 0) + Me.ChartTopLeft.Name = "ChartTopLeft" + Me.ChartTopLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartTopLeft.Size = New System.Drawing.Size(359, 158) + Me.ChartTopLeft.TabIndex = 2 + ' + 'VWPM_CHART_TOP5TableAdapter + ' + Me.VWPM_CHART_TOP5TableAdapter.ClearBeforeFill = True + ' + 'ChartTopRight + ' + Me.ChartTopRight.DataAdapter = Me.VWPM_CHART_TOP5TableAdapter + Me.ChartTopRight.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartTopRight.Legend.Name = "Default Legend" + Me.ChartTopRight.Location = New System.Drawing.Point(0, 0) + Me.ChartTopRight.Name = "ChartTopRight" + Me.ChartTopRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartTopRight.Size = New System.Drawing.Size(761, 158) + Me.ChartTopRight.TabIndex = 1 + ' + 'SplitContainerBottom + ' + Me.SplitContainerBottom.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerBottom.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerBottom.Name = "SplitContainerBottom" + ' + 'SplitContainerBottom.Panel1 + ' + Me.SplitContainerBottom.Panel1.Controls.Add(Me.ChartBottomLeft) + ' + 'SplitContainerBottom.Panel2 + ' + Me.SplitContainerBottom.Panel2.Controls.Add(Me.ChartBottomRight) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1124, 129) + Me.SplitContainerBottom.SplitterDistance = 359 + Me.SplitContainerBottom.TabIndex = 0 + ' + 'ChartBottomLeft + ' + Me.ChartBottomLeft.DataAdapter = Me.VWPM_CHART_TOP5TableAdapter + Me.ChartBottomLeft.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartBottomLeft.Legend.Name = "Default Legend" + Me.ChartBottomLeft.Location = New System.Drawing.Point(0, 0) + Me.ChartBottomLeft.Name = "ChartBottomLeft" + Me.ChartBottomLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartBottomLeft.Size = New System.Drawing.Size(359, 129) + Me.ChartBottomLeft.TabIndex = 1 + ' + 'ChartBottomRight + ' + Me.ChartBottomRight.DataAdapter = Me.VWPM_CHART_TOP5TableAdapter + Me.ChartBottomRight.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartBottomRight.Legend.Name = "Default Legend" + Me.ChartBottomRight.Location = New System.Drawing.Point(0, 0) + Me.ChartBottomRight.Name = "ChartBottomRight" + Me.ChartBottomRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartBottomRight.Size = New System.Drawing.Size(761, 129) + Me.ChartBottomRight.TabIndex = 1 + ' + 'CreateChartOtherRibbonPage1 + ' + Me.CreateChartOtherRibbonPage1.Name = "CreateChartOtherRibbonPage1" + ' + 'ChartPrintExportRibbonPageGroup1 + ' + Me.ChartPrintExportRibbonPageGroup1.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[False] + Me.ChartPrintExportRibbonPageGroup1.Name = "ChartPrintExportRibbonPageGroup1" + Me.ChartPrintExportRibbonPageGroup1.Text = "" + ' + 'ChartTemplatesRibbonPageGroup1 + ' + Me.ChartTemplatesRibbonPageGroup1.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[False] + Me.ChartTemplatesRibbonPageGroup1.Name = "ChartTemplatesRibbonPageGroup1" + Me.ChartTemplatesRibbonPageGroup1.Text = "" + ' + 'ChartWizardRibbonPageGroup1 + ' + Me.ChartWizardRibbonPageGroup1.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[False] + Me.ChartWizardRibbonPageGroup1.Name = "ChartWizardRibbonPageGroup1" + Me.ChartWizardRibbonPageGroup1.Text = "" + ' + 'CreateChartRibbonPage1 + ' + Me.CreateChartRibbonPage1.Name = "CreateChartRibbonPage1" + ' + 'ChartAppearanceRibbonPageGroup1 + ' + Me.ChartAppearanceRibbonPageGroup1.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[False] + Me.ChartAppearanceRibbonPageGroup1.Name = "ChartAppearanceRibbonPageGroup1" + Me.ChartAppearanceRibbonPageGroup1.Text = "" + ' + 'ChartTypeRibbonPageGroup1 + ' + Me.ChartTypeRibbonPageGroup1.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[False] + Me.ChartTypeRibbonPageGroup1.Name = "ChartTypeRibbonPageGroup1" + Me.ChartTypeRibbonPageGroup1.Text = "" + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Horizontal = False + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 146) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + Me.SplitContainerControl1.Panel1.AutoScroll = True + Me.SplitContainerControl1.Panel1.Controls.Add(Me.Panel2) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl2) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerDashboard) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(1124, 599) + Me.SplitContainerControl1.SplitterPosition = 296 + Me.SplitContainerControl1.TabIndex = 15 + ' + 'Panel2 + ' + Me.Panel2.Controls.Add(Me.Label1) + Me.Panel2.Controls.Add(Me.GridControl1) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(1124, 135) + Me.Panel2.TabIndex = 12 + ' + 'ChartRibbonPageCategory1 + ' + Me.ChartRibbonPageCategory1.Control = Nothing + Me.ChartRibbonPageCategory1.Name = "ChartRibbonPageCategory1" + ' + 'RibbonPage3 + ' + Me.RibbonPage3.Name = "RibbonPage3" + Me.RibbonPage3.Text = "RibbonPage3" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Funktionen" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem5) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Dashboard" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Funktionen - Charts" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Export als PDF" + Me.BarButtonItem1.Hint = "Export den ausgewählten Chart als PDF" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Export als Bild" + Me.BarButtonItem2.Hint = "Exportiert den ausgewählten Chart als Bild" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Export Verteilung als PDF" + Me.BarButtonItem3.Hint = "Exportiert das Dashboard als PDF" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'CreateBarBaseItem1 + ' + Me.CreateBarBaseItem1.Caption = "Spalte" + Me.CreateBarBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown1 + Me.CreateBarBaseItem1.Enabled = False + Me.CreateBarBaseItem1.Id = 4 + Me.CreateBarBaseItem1.Name = "CreateBarBaseItem1" + ' + 'CreateLineBaseItem1 + ' + Me.CreateLineBaseItem1.Caption = "Linie" + Me.CreateLineBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown2 + Me.CreateLineBaseItem1.Enabled = False + Me.CreateLineBaseItem1.Id = 5 + Me.CreateLineBaseItem1.Name = "CreateLineBaseItem1" + ' + 'CreatePieBaseItem1 + ' + Me.CreatePieBaseItem1.Caption = "Torte" + Me.CreatePieBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown3 + Me.CreatePieBaseItem1.Enabled = False + Me.CreatePieBaseItem1.Id = 6 + Me.CreatePieBaseItem1.Name = "CreatePieBaseItem1" + ' + 'CreateRotatedBarBaseItem1 + ' + Me.CreateRotatedBarBaseItem1.Caption = "Balken" + Me.CreateRotatedBarBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown4 + Me.CreateRotatedBarBaseItem1.Enabled = False + Me.CreateRotatedBarBaseItem1.Id = 7 + Me.CreateRotatedBarBaseItem1.Name = "CreateRotatedBarBaseItem1" + ' + 'CreateAreaBaseItem1 + ' + Me.CreateAreaBaseItem1.Caption = "Fläche" + Me.CreateAreaBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown5 + Me.CreateAreaBaseItem1.Enabled = False + Me.CreateAreaBaseItem1.Id = 8 + Me.CreateAreaBaseItem1.Name = "CreateAreaBaseItem1" + ' + 'CreateOtherSeriesTypesBaseItem1 + ' + Me.CreateOtherSeriesTypesBaseItem1.Caption = "Sonstiges Charts" + Me.CreateOtherSeriesTypesBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown6 + Me.CreateOtherSeriesTypesBaseItem1.Enabled = False + Me.CreateOtherSeriesTypesBaseItem1.Id = 9 + Me.CreateOtherSeriesTypesBaseItem1.Name = "CreateOtherSeriesTypesBaseItem1" + ' + 'ChangePaletteGalleryBaseItem1 + ' + Me.ChangePaletteGalleryBaseItem1.Caption = "Palette" + Me.ChangePaletteGalleryBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown7 + Me.ChangePaletteGalleryBaseItem1.Enabled = False + Me.ChangePaletteGalleryBaseItem1.Id = 10 + Me.ChangePaletteGalleryBaseItem1.Name = "ChangePaletteGalleryBaseItem1" + ' + 'ChangeAppearanceGalleryBaseItem1 + ' + Me.ChangeAppearanceGalleryBaseItem1.Enabled = False + ' + ' + ' + Me.ChangeAppearanceGalleryBaseItem1.Gallery.ColumnCount = 7 + Me.ChangeAppearanceGalleryBaseItem1.Gallery.ImageSize = New System.Drawing.Size(80, 50) + Me.ChangeAppearanceGalleryBaseItem1.Gallery.RowCount = 4 + Me.ChangeAppearanceGalleryBaseItem1.Id = 11 + Me.ChangeAppearanceGalleryBaseItem1.Name = "ChangeAppearanceGalleryBaseItem1" + ' + 'RunDesignerChartItem1 + ' + Me.RunDesignerChartItem1.Caption = "Führen Sie den Diagrammassistenten..." + Me.RunDesignerChartItem1.Enabled = False + Me.RunDesignerChartItem1.Id = 12 + Me.RunDesignerChartItem1.Name = "RunDesignerChartItem1" + ' + 'SaveAsTemplateChartItem1 + ' + Me.SaveAsTemplateChartItem1.Caption = "Als Vorlage speichern" + Me.SaveAsTemplateChartItem1.Enabled = False + Me.SaveAsTemplateChartItem1.Id = 13 + Me.SaveAsTemplateChartItem1.Name = "SaveAsTemplateChartItem1" + ' + 'LoadTemplateChartItem1 + ' + Me.LoadTemplateChartItem1.Caption = "Laden" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Vorlage" + Me.LoadTemplateChartItem1.Enabled = False + Me.LoadTemplateChartItem1.Id = 14 + Me.LoadTemplateChartItem1.Name = "LoadTemplateChartItem1" + ' + 'PrintPreviewChartItem1 + ' + Me.PrintPreviewChartItem1.Caption = "Druckvorschau" + Me.PrintPreviewChartItem1.Enabled = False + Me.PrintPreviewChartItem1.Id = 15 + Me.PrintPreviewChartItem1.Name = "PrintPreviewChartItem1" + ' + 'PrintChartItem1 + ' + Me.PrintChartItem1.Caption = "Drucken" + Me.PrintChartItem1.Enabled = False + Me.PrintChartItem1.Id = 16 + Me.PrintChartItem1.Name = "PrintChartItem1" + ' + 'CreateExportBaseItem1 + ' + Me.CreateExportBaseItem1.Caption = "Exportieren" + Me.CreateExportBaseItem1.Enabled = False + Me.CreateExportBaseItem1.Id = 17 + Me.CreateExportBaseItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToPDFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToHTMLChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToMHTChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToXLSChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToXLSXChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToRTFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.CreateExportToImageBaseItem1)}) + Me.CreateExportBaseItem1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText + Me.CreateExportBaseItem1.Name = "CreateExportBaseItem1" + Me.CreateExportBaseItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu + ' + 'ExportToPDFChartItem1 + ' + Me.ExportToPDFChartItem1.Caption = "In PDF exportieren" + Me.ExportToPDFChartItem1.Enabled = False + Me.ExportToPDFChartItem1.Id = 18 + Me.ExportToPDFChartItem1.Name = "ExportToPDFChartItem1" + ' + 'ExportToHTMLChartItem1 + ' + Me.ExportToHTMLChartItem1.Caption = "Export in HTML" + Me.ExportToHTMLChartItem1.Enabled = False + Me.ExportToHTMLChartItem1.Id = 19 + Me.ExportToHTMLChartItem1.Name = "ExportToHTMLChartItem1" + ' + 'ExportToMHTChartItem1 + ' + Me.ExportToMHTChartItem1.Caption = "Exportieren in MHT" + Me.ExportToMHTChartItem1.Enabled = False + Me.ExportToMHTChartItem1.Id = 20 + Me.ExportToMHTChartItem1.Name = "ExportToMHTChartItem1" + ' + 'ExportToXLSChartItem1 + ' + Me.ExportToXLSChartItem1.Caption = "Export in XLS" + Me.ExportToXLSChartItem1.Enabled = False + Me.ExportToXLSChartItem1.Id = 21 + Me.ExportToXLSChartItem1.Name = "ExportToXLSChartItem1" + ' + 'ExportToXLSXChartItem1 + ' + Me.ExportToXLSXChartItem1.Caption = "Exportieren in XLSX" + Me.ExportToXLSXChartItem1.Enabled = False + Me.ExportToXLSXChartItem1.Id = 22 + Me.ExportToXLSXChartItem1.Name = "ExportToXLSXChartItem1" + ' + 'ExportToRTFChartItem1 + ' + Me.ExportToRTFChartItem1.Caption = "Export in RTF" + Me.ExportToRTFChartItem1.Enabled = False + Me.ExportToRTFChartItem1.Id = 23 + Me.ExportToRTFChartItem1.Name = "ExportToRTFChartItem1" + ' + 'ExportToBMPChartItem1 + ' + Me.ExportToBMPChartItem1.Caption = "BMP" + Me.ExportToBMPChartItem1.Enabled = False + Me.ExportToBMPChartItem1.Id = 24 + Me.ExportToBMPChartItem1.Name = "ExportToBMPChartItem1" + ' + 'ExportToGIFChartItem1 + ' + Me.ExportToGIFChartItem1.Caption = "GIF" + Me.ExportToGIFChartItem1.Enabled = False + Me.ExportToGIFChartItem1.Id = 25 + Me.ExportToGIFChartItem1.Name = "ExportToGIFChartItem1" + ' + 'ExportToJPEGChartItem1 + ' + Me.ExportToJPEGChartItem1.Caption = "JPEG" + Me.ExportToJPEGChartItem1.Enabled = False + Me.ExportToJPEGChartItem1.Id = 26 + Me.ExportToJPEGChartItem1.Name = "ExportToJPEGChartItem1" + ' + 'ExportToPNGChartItem1 + ' + Me.ExportToPNGChartItem1.Caption = "PNG" + Me.ExportToPNGChartItem1.Enabled = False + Me.ExportToPNGChartItem1.Id = 27 + Me.ExportToPNGChartItem1.Name = "ExportToPNGChartItem1" + ' + 'ExportToTIFFChartItem1 + ' + Me.ExportToTIFFChartItem1.Caption = "TIFF" + Me.ExportToTIFFChartItem1.Enabled = False + Me.ExportToTIFFChartItem1.Id = 28 + Me.ExportToTIFFChartItem1.Name = "ExportToTIFFChartItem1" + ' + 'CreateExportToImageBaseItem1 + ' + Me.CreateExportToImageBaseItem1.Caption = "Bild exportieren" + Me.CreateExportToImageBaseItem1.Enabled = False + Me.CreateExportToImageBaseItem1.Id = 29 + Me.CreateExportToImageBaseItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToBMPChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToGIFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToJPEGChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToPNGChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToTIFFChartItem1)}) + Me.CreateExportToImageBaseItem1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText + Me.CreateExportToImageBaseItem1.Name = "CreateExportToImageBaseItem1" + ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Export Top Kreditoren als xlsx" + Me.BarButtonItem4.Id = 30 + Me.BarButtonItem4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem5 + ' + Me.BarButtonItem5.Caption = "Export Top Kreditoren als pdf" + Me.BarButtonItem5.Id = 31 + Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem5.Name = "BarButtonItem5" + ' + 'BarButtonItem6 + ' + Me.BarButtonItem6.Caption = "BarButtonItem6" + Me.BarButtonItem6.Id = 32 + Me.BarButtonItem6.Name = "BarButtonItem6" + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.CreateBarBaseItem1, Me.CreateLineBaseItem1, Me.CreatePieBaseItem1, Me.CreateRotatedBarBaseItem1, Me.CreateAreaBaseItem1, Me.CreateOtherSeriesTypesBaseItem1, Me.ChangePaletteGalleryBaseItem1, Me.ChangeAppearanceGalleryBaseItem1, Me.RunDesignerChartItem1, Me.SaveAsTemplateChartItem1, Me.LoadTemplateChartItem1, Me.PrintPreviewChartItem1, Me.PrintChartItem1, Me.CreateExportBaseItem1, Me.ExportToPDFChartItem1, Me.ExportToHTMLChartItem1, Me.ExportToMHTChartItem1, Me.ExportToXLSChartItem1, Me.ExportToXLSXChartItem1, Me.ExportToRTFChartItem1, Me.ExportToBMPChartItem1, Me.ExportToGIFChartItem1, Me.ExportToJPEGChartItem1, Me.ExportToPNGChartItem1, Me.ExportToTIFFChartItem1, Me.CreateExportToImageBaseItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 33 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.ChartRibbonPageCategory1}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) + Me.RibbonControl1.Size = New System.Drawing.Size(1124, 146) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'frmInvDashboard ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.GridControl1) + Me.ClientSize = New System.Drawing.Size(1124, 766) + Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Name = "frmInvDashboard" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmInvDashboard" - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Text = "Invoice Dashboard" + CType(Me.CommandBarGalleryDropDown1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CommandBarGalleryDropDown2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CommandBarGalleryDropDown3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CommandBarGalleryDropDown4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CommandBarGalleryDropDown5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CommandBarGalleryDropDown6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CommandBarGalleryDropDown7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.VWPM_CHART_TOP5BindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDashboard.Panel1.ResumeLayout(False) + Me.SplitContainerDashboard.Panel2.ResumeLayout(False) + CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDashboard.ResumeLayout(False) + Me.SplitContainerTop.Panel1.ResumeLayout(False) + Me.SplitContainerTop.Panel2.ResumeLayout(False) + CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTop.ResumeLayout(False) + CType(Me.ChartTopLeft, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChartTopRight, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerBottom.Panel1.ResumeLayout(False) + Me.SplitContainerBottom.Panel2.ResumeLayout(False) + CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerBottom.ResumeLayout(False) + CType(Me.ChartBottomLeft, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChartBottomRight, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChartBarController1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents DD_DMSLiteDataSet As DD_DMSLiteDataSet @@ -255,4 +1565,75 @@ Partial Class frmInvDashboard Friend WithEvents colNettoSumme As DevExpress.XtraGrid.Columns.TileViewColumn Friend WithEvents colTitle As DevExpress.XtraGrid.Columns.TileViewColumn Friend WithEvents Label1 As Label + Friend WithEvents SplitContainerDashboard As SplitContainer + Friend WithEvents SplitContainerTop As SplitContainer + Friend WithEvents ChartTopLeft As DevExpress.XtraCharts.ChartControl + Friend WithEvents ChartTopRight As DevExpress.XtraCharts.ChartControl + Friend WithEvents SplitContainerBottom As SplitContainer + Friend WithEvents ChartBottomLeft As DevExpress.XtraCharts.ChartControl + Friend WithEvents ChartBottomRight As DevExpress.XtraCharts.ChartControl + Friend WithEvents SaveFileDialog1 As SaveFileDialog + Friend WithEvents VWPM_CHART_TOP5TableAdapter As DD_DMSLiteDataSetTableAdapters.VWPM_CHART_TOP5TableAdapter + Friend WithEvents VWPM_CHART_TOP5BindingSource As BindingSource + Friend WithEvents CommandBarGalleryDropDown1 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents CommandBarGalleryDropDown2 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents CommandBarGalleryDropDown3 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents CommandBarGalleryDropDown4 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents CommandBarGalleryDropDown5 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents CommandBarGalleryDropDown6 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents CommandBarGalleryDropDown7 As DevExpress.XtraBars.Commands.CommandBarGalleryDropDown + Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colKRED_NAME As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colANZ_BELEG As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colNetto As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colSkonto As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ChartBarController1 As DevExpress.XtraCharts.UI.ChartBarController + Friend WithEvents CreateChartOtherRibbonPage1 As DevExpress.XtraCharts.UI.CreateChartOtherRibbonPage + Friend WithEvents ChartPrintExportRibbonPageGroup1 As DevExpress.XtraCharts.UI.ChartPrintExportRibbonPageGroup + Friend WithEvents ChartTemplatesRibbonPageGroup1 As DevExpress.XtraCharts.UI.ChartTemplatesRibbonPageGroup + Friend WithEvents ChartWizardRibbonPageGroup1 As DevExpress.XtraCharts.UI.ChartWizardRibbonPageGroup + Friend WithEvents CreateChartRibbonPage1 As DevExpress.XtraCharts.UI.CreateChartRibbonPage + Friend WithEvents ChartAppearanceRibbonPageGroup1 As DevExpress.XtraCharts.UI.ChartAppearanceRibbonPageGroup + Friend WithEvents ChartTypeRibbonPageGroup1 As DevExpress.XtraCharts.UI.ChartTypeRibbonPageGroup + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents Panel2 As Panel + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents CreateBarBaseItem1 As DevExpress.XtraCharts.UI.CreateBarBaseItem + Friend WithEvents CreateLineBaseItem1 As DevExpress.XtraCharts.UI.CreateLineBaseItem + Friend WithEvents CreatePieBaseItem1 As DevExpress.XtraCharts.UI.CreatePieBaseItem + Friend WithEvents CreateRotatedBarBaseItem1 As DevExpress.XtraCharts.UI.CreateRotatedBarBaseItem + Friend WithEvents CreateAreaBaseItem1 As DevExpress.XtraCharts.UI.CreateAreaBaseItem + Friend WithEvents CreateOtherSeriesTypesBaseItem1 As DevExpress.XtraCharts.UI.CreateOtherSeriesTypesBaseItem + Friend WithEvents ChangePaletteGalleryBaseItem1 As DevExpress.XtraCharts.UI.ChangePaletteGalleryBaseItem + Friend WithEvents ChangeAppearanceGalleryBaseItem1 As DevExpress.XtraCharts.UI.ChangeAppearanceGalleryBaseItem + Friend WithEvents RunDesignerChartItem1 As DevExpress.XtraCharts.UI.RunDesignerChartItem + Friend WithEvents SaveAsTemplateChartItem1 As DevExpress.XtraCharts.UI.SaveAsTemplateChartItem + Friend WithEvents LoadTemplateChartItem1 As DevExpress.XtraCharts.UI.LoadTemplateChartItem + Friend WithEvents PrintPreviewChartItem1 As DevExpress.XtraCharts.UI.PrintPreviewChartItem + Friend WithEvents PrintChartItem1 As DevExpress.XtraCharts.UI.PrintChartItem + Friend WithEvents CreateExportBaseItem1 As DevExpress.XtraCharts.UI.CreateExportBaseItem + Friend WithEvents ExportToPDFChartItem1 As DevExpress.XtraCharts.UI.ExportToPDFChartItem + Friend WithEvents ExportToHTMLChartItem1 As DevExpress.XtraCharts.UI.ExportToHTMLChartItem + Friend WithEvents ExportToMHTChartItem1 As DevExpress.XtraCharts.UI.ExportToMHTChartItem + Friend WithEvents ExportToXLSChartItem1 As DevExpress.XtraCharts.UI.ExportToXLSChartItem + Friend WithEvents ExportToXLSXChartItem1 As DevExpress.XtraCharts.UI.ExportToXLSXChartItem + Friend WithEvents ExportToRTFChartItem1 As DevExpress.XtraCharts.UI.ExportToRTFChartItem + Friend WithEvents CreateExportToImageBaseItem1 As DevExpress.XtraCharts.UI.CreateExportToImageBaseItem + Friend WithEvents ExportToBMPChartItem1 As DevExpress.XtraCharts.UI.ExportToBMPChartItem + Friend WithEvents ExportToGIFChartItem1 As DevExpress.XtraCharts.UI.ExportToGIFChartItem + Friend WithEvents ExportToJPEGChartItem1 As DevExpress.XtraCharts.UI.ExportToJPEGChartItem + Friend WithEvents ExportToPNGChartItem1 As DevExpress.XtraCharts.UI.ExportToPNGChartItem + Friend WithEvents ExportToTIFFChartItem1 As DevExpress.XtraCharts.UI.ExportToTIFFChartItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents ChartRibbonPageCategory1 As DevExpress.XtraCharts.UI.ChartRibbonPageCategory + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage End Class diff --git a/app/DD_PM_WINDREAM/frmInvDashboard.resx b/app/DD_PM_WINDREAM/frmInvDashboard.resx index d76d63a..bcec75d 100644 --- a/app/DD_PM_WINDREAM/frmInvDashboard.resx +++ b/app/DD_PM_WINDREAM/frmInvDashboard.resx @@ -117,6 +117,319 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Vergleichen Werte verschiedener Kategorien mit vertikalen Rechtecke. + +Verwenden Sie es, wenn die Reihenfolge der Kategorien nicht wichtig ist oder für die Anzeige der Anzahl der Elemente wie z.B. ein Histogramm. + + + Vergleichen Werte verschiedener Kategorien mit vertikalen Rechtecke. + +Verwenden Sie es, wenn die Reihenfolge der Kategorien nicht wichtig ist oder für die Anzeige der Anzahl der Elemente wie z.B. ein Histogramm. + + + Verbinden die Vorteile der beiden 100 % gestapelte und gruppierte Säulen Diagrammtypen im 3D-Format, damit können verschiedene Spalten zu stapeln und sie in Gruppen über den gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelte und gruppierte Säulen Diagrammtypen im 3D-Format, damit können verschiedene Spalten zu stapeln und sie in Gruppen über den gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile von sowohl die gestapelte und gruppierte Säulen Diagrammtypen im 3D-Format, so dass Sie können verschiedene Spalten Stapeln und sie in Gruppen über den gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile von sowohl die gestapelte und gruppierte Säulen Diagrammtypen im 3D-Format, so dass Sie können verschiedene Spalten Stapeln und sie in Gruppen über den gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelt Zylinder und gruppierte Zylinder Diagrammtypen, so dass Sie können verschiedene Zylinder Stapeln und sie in Gruppen auf der gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelt Zylinder und gruppierte Zylinder Diagrammtypen, so dass Sie können verschiedene Zylinder Stapeln und sie in Gruppen auf der gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelt Kegel und Kegel gruppierten Diagrammtypen, so dass Sie können verschiedene Vulkankegel Stapeln und sie in Gruppen auf der gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelt Kegel und Kegel gruppierten Diagrammtypen, so dass Sie können verschiedene Vulkankegel Stapeln und sie in Gruppen auf der gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelt Pyramide und Pyramide gruppierten Diagrammtypen, damit können verschiedene Pyramiden zu stapeln und sie in Gruppen über den gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile der beiden 100 % gestapelt Pyramide und Pyramide gruppierten Diagrammtypen, damit können verschiedene Pyramiden zu stapeln und sie in Gruppen über den gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile von der Pyramide gestapelt und die gruppierten Pyramide Diagrammtypen, so dass Sie können verschiedene Pyramiden zu stapeln und sie in Gruppen auf der gleichen Achsenwert kombinieren. + + + Verbinden die Vorteile von der Pyramide gestapelt und die gruppierten Pyramide Diagrammtypen, so dass Sie können verschiedene Pyramiden zu stapeln und sie in Gruppen auf der gleichen Achsenwert kombinieren. + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRvY3VtZW50UERGIj4NCiAgICA8cGF0aCBkPSJN + MjIsMjR2NEgyVjJoMTR2NWMwLDAuNiwwLjQsMSwxLDFoNXY0aDJWN2wtNy03SDFDMC40LDAsMCwwLjQs + MCwxdjI4YzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTEgICB2LTVIMjJ6IiBjbGFzcz0i + QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE5LjIsMTZjMC4zLDAuNSwwLjQsMS4xLDAuNCwxLjljMCww + LjktMC4yLDEuNS0wLjUsMmMtMC4zLDAuNS0wLjcsMC43LTEuMywwLjdoLTAuNnYtNS4zaDAuNiAgIEMx + OC40LDE1LjMsMTguOSwxNS42LDE5LjIsMTZ6IE0xMi4xLDE1LjNoLTAuNXYyLjZoMC41YzAuNywwLDEu + MS0wLjQsMS4xLTEuM2MwLTAuNC0wLjEtMC44LTAuMy0xQzEyLjYsMTUuNCwxMi40LDE1LjMsMTIuMSwx + NS4zeiAgICBNMzAsMTJ2MTJINlYxMkgzMHogTTE0LjgsMTYuNWMwLTAuOC0wLjItMS41LTAuNi0xLjlj + LTAuNC0wLjQtMS0wLjctMS44LTAuN0gxMHY4aDEuNnYtMi43aDAuNmMwLjgsMCwxLjQtMC4zLDEuOS0w + LjggICBDMTQuNSwxOCwxNC44LDE3LjMsMTQuOCwxNi41eiBNMjEuMiwxNy45YzAtMi42LTEuMS0zLjkt + My40LTMuOWgtMi4xdjhoMi4yYzEuMSwwLDEuOS0wLjQsMi41LTEuMUMyMC45LDIwLjIsMjEuMiwxOS4y + LDIxLjIsMTcuOXogICAgTTI2LDE0aC0zLjd2OGgxLjZ2LTMuMWgydi0xLjNoLTJ2LTIuMkgyNlYxNHoi + IGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANECAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUGljdHVyZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + R3JlZW57ZmlsbDojMDM5QzIzO30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5zdDB7b3BhY2l0eTow + LjU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjksNEgzQzIuNSw0LDIsNC41LDIsNXYyMmMwLDAuNSww + LjUsMSwxLDFoMjZjMC41LDAsMS0wLjUsMS0xVjVDMzAsNC41LDI5LjUsNCwyOSw0eiBNMjgsMjZINFY2 + aDI0VjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8Y2lyY2xlIGN4PSIyMSIgY3k9IjExIiByPSIzIiBj + bGFzcz0iWWVsbG93IiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjIwLDI0IDEwLDE0IDYsMTggNiwyNCAi + IGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIy + MiwyNCAxOCwyMCAyMCwxOCAyNiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRvY3VtZW50UERGIj4NCiAgICA8cGF0aCBkPSJN + MjIsMjR2NEgyVjJoMTR2NWMwLDAuNiwwLjQsMSwxLDFoNXY0aDJWN2wtNy03SDFDMC40LDAsMCwwLjQs + MCwxdjI4YzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTEgICB2LTVIMjJ6IiBjbGFzcz0i + QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE5LjIsMTZjMC4zLDAuNSwwLjQsMS4xLDAuNCwxLjljMCww + LjktMC4yLDEuNS0wLjUsMmMtMC4zLDAuNS0wLjcsMC43LTEuMywwLjdoLTAuNnYtNS4zaDAuNiAgIEMx + OC40LDE1LjMsMTguOSwxNS42LDE5LjIsMTZ6IE0xMi4xLDE1LjNoLTAuNXYyLjZoMC41YzAuNywwLDEu + MS0wLjQsMS4xLTEuM2MwLTAuNC0wLjEtMC44LTAuMy0xQzEyLjYsMTUuNCwxMi40LDE1LjMsMTIuMSwx + NS4zeiAgICBNMzAsMTJ2MTJINlYxMkgzMHogTTE0LjgsMTYuNWMwLTAuOC0wLjItMS41LTAuNi0xLjlj + LTAuNC0wLjQtMS0wLjctMS44LTAuN0gxMHY4aDEuNnYtMi43aDAuNmMwLjgsMCwxLjQtMC4zLDEuOS0w + LjggICBDMTQuNSwxOCwxNC44LDE3LjMsMTQuOCwxNi41eiBNMjEuMiwxNy45YzAtMi42LTEuMS0zLjkt + My40LTMuOWgtMi4xdjhoMi4yYzEuMSwwLDEuOS0wLjQsMi41LTEuMUMyMC45LDIwLjIsMjEuMiwxOS4y + LDIxLjIsMTcuOXogICAgTTI2LDE0aC0zLjd2OGgxLjZ2LTMuMWgydi0xLjNoLTJ2LTIuMkgyNlYxNHoi + IGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + zeigt alle Punkte aus verschiedenen Serien in gewissem Sinne gestapelt und ist nützlich, wenn es erforderlich ist, vergleichen Sie den gesamten Aggregatwert für bestimmte Argumente wie viel jede Reihe hinzufügt. + + + zeigt alle Punkte aus verschiedenen Serien in gewissem Sinne gestapelt und ist nützlich, wenn es erforderlich ist, vergleichen Sie den gesamten Aggregatwert für bestimmte Argumente wie viel jede Reihe hinzufügt. + + + ein Kreisdiagramm. + +Kreisdiagramme zeigen die Verteilung der Einzelwerte auf insgesamt. + +Verwenden Sie es, wenn Werte addiert werden können oder wenn Sie nur eine Datenreihe und alle Werte positiv sind. + + + ein Kreisdiagramm. + +Kreisdiagramme zeigen die Verteilung der Einzelwerte auf insgesamt. + +Verwenden Sie es, wenn Werte addiert werden können oder wenn Sie nur eine Datenreihe und alle Werte positiv sind. + + + Vergleichen den Prozentsatz jeder Wert trägt zur insgesamt in verschiedenen Kategorien mit horizontalen Rechtecke. + +Verwenden Sie es, wenn die Werte im Diagramm Laufzeiten stellen oder der Kategorietext sehr lang ist. + + + Vergleichen den Prozentsatz jeder Wert trägt zur insgesamt in verschiedenen Kategorien mit horizontalen Rechtecke. + +Verwenden Sie es, wenn die Werte im Diagramm Laufzeiten stellen oder der Kategorietext sehr lang ist. + + + Anzeigen von Daten als Bereiche in einem Diagramm mit jedem Datenpunkt angezeigt als Höhepunkt oder Mulde im Bereich gefüllt. Verwenden Sie es, wenn du musst zeigen Trends für mehrere Serien im gleichen Diagramm, und zeigen auch die Beziehung der Teile zum ganzen. + + + Anzeigen von Daten als Bereiche in einem Diagramm mit jedem Datenpunkt angezeigt als Höhepunkt oder Mulde im Bereich gefüllt. Verwenden Sie es, wenn du musst zeigen Trends für mehrere Serien im gleichen Diagramm, und zeigen auch die Beziehung der Teile zum ganzen. + + + Anzeigen von Daten als Bereiche in einem Diagramm, ist so dass der Wert der einzelnen Daten zeigen mit alle anderen entsprechenden Datenpunkte Werte gestapelt. + +Verwenden sie für den Vergleich die Prozentwerte der mehrere Reihen für das gleiche Argument. + + + Anzeigen von Daten als Bereiche in einem Diagramm, ist so dass der Wert der einzelnen Daten zeigen mit alle anderen entsprechenden Datenpunkte Werte gestapelt. + +Verwenden sie für den Vergleich die Prozentwerte der mehrere Reihen für das gleiche Argument. + + + Display ein breites Gebiet an der Spitze, die Summe der Punkte Wert, angibt, während andere Bereiche proportional kleiner sind. + +Verwenden Sie es, wenn es erforderlich ist, Phasen eines Vertriebsprozesses darstellen, zeigen die Höhe der möglichen Einnahmen für die einzelnen Phasen, sowie die Problembereiche in sales-Prozesse eines Unternehmens zu identifizieren. + + + Display ein breites Gebiet an der Spitze, die Summe der Punkte Wert, angibt, während andere Bereiche proportional kleiner sind. + +Verwenden Sie es, wenn es erforderlich ist, Phasen eines Vertriebsprozesses darstellen, zeigen die Höhe der möglichen Einnahmen für die einzelnen Phasen, sowie die Problembereiche in sales-Prozesse eines Unternehmens zu identifizieren. + + + Display ein breites Gebiet an der Spitze, die Summe der Punkte Wert, angibt, während andere Bereiche proportional kleiner sind. + +Verwenden Sie es, wenn es erforderlich ist, Phasen eines Vertriebsprozesses darstellen, zeigen die Höhe der möglichen Einnahmen für die einzelnen Phasen, sowie die Problembereiche in sales-Prozesse eines Unternehmens zu identifizieren. + + + Display ein breites Gebiet an der Spitze, die Summe der Punkte Wert, angibt, während andere Bereiche proportional kleiner sind. + +Verwenden Sie es, wenn es erforderlich ist, Phasen eines Vertriebsprozesses darstellen, zeigen die Höhe der möglichen Einnahmen für die einzelnen Phasen, sowie die Problembereiche in sales-Prozesse eines Unternehmens zu identifizieren. + + + Karte Variation der Aktienkurse im Laufe eines Tages. Das Öffnen und schließen-Preise werden von linken und rechten Linien auf jeden Punkt, die Preise niedrig und hoch sind dargestellt und durch die unteren und oberen Werte der vertikalen Linie, die an jedem Punkt dargestellt ist. + + + Karte Variation der Aktienkurse im Laufe eines Tages. Das Öffnen und schließen-Preise werden von linken und rechten Linien auf jeden Punkt, die Preise niedrig und hoch sind dargestellt und durch die unteren und oberen Werte der vertikalen Linie, die an jedem Punkt dargestellt ist. + + + Zeigen die Variation im Preis der Aktie im Laufe eines Tages. Das Öffnen und schließen-Preise werden durch ein ausgefülltes Rechteck dargestellt, und die Preise niedrig und hoch werden dargestellt durch die unteren und oberen Werte der vertikalen Linie, die an jedem Punkt dargestellt ist. + + + Zeigen die Variation im Preis der Aktie im Laufe eines Tages. Das Öffnen und schließen-Preise werden durch ein ausgefülltes Rechteck dargestellt, und die Preise niedrig und hoch werden dargestellt durch die unteren und oberen Werte der vertikalen Linie, die an jedem Punkt dargestellt ist. + + + Zeigen Trends für mehrere Serien und ihre Werte zu vergleichen, denn die gleichen Argumente auf einem kreisförmigen Raster verweist, die mehrere Achsen enthält entlang die Daten gezeichnet werden können. + + + Zeigen Trends für mehrere Serien und ihre Werte zu vergleichen, denn die gleichen Argumente auf einem kreisförmigen Raster verweist, die mehrere Achsen enthält entlang die Daten gezeichnet werden können. + + + Displays series on a circular diagram on the basis of angles as filled areas, defined by data points with two values that are minimum and maximum limits. Use it when you need to accentuate the delta between the start and end values. + + + Displays series on a circular diagram on the basis of angles as filled areas, defined by data points with two values that are minimum and maximum limits. Use it when you need to accentuate the delta between the start and end values. + + + Anzeigen von Daten als Linie in einem kreisförmigen Raster, das mehrere Achsen hat die Daten gezeichnet werden können. Die Serie, die Punkte werden in das kreisförmige Raster in der gleichen Reihenfolge, die sie in der Serie haben gezeichnet zeigen Sammlung. + + + Anzeigen von Daten als Linie in einem kreisförmigen Raster, das mehrere Achsen hat die Daten gezeichnet werden können. Die Serie, die Punkte werden in das kreisförmige Raster in der gleichen Reihenfolge, die sie in der Serie haben gezeichnet zeigen Sammlung. + + + Displays series on a circular diagram as filled areas, defined by data points with two values that are minimum and maximum limits. Use it when you need to accentuate the delta between the start and end values. + + + Displays series on a circular diagram as filled areas, defined by data points with two values that are minimum and maximum limits. Use it when you need to accentuate the delta between the start and end values. + + + Trends für mehrere Serien zeigen und vergleichen Sie ihre Werte für die gleichen Punkt Argumente in einem kreisförmigen Diagramm auf der Grundlage von Winkeln. Die Serie, die Punkte werden in das kreisförmige Raster in der gleichen Reihenfolge, die sie in der Serie haben gezeichnet zeigen Sammlung. + + + Trends für mehrere Serien zeigen und vergleichen Sie ihre Werte für die gleichen Punkt Argumente in einem kreisförmigen Diagramm auf der Grundlage von Winkeln. Die Serie, die Punkte werden in das kreisförmige Raster in der gleichen Reihenfolge, die sie in der Serie haben gezeichnet zeigen Sammlung. + + + Display Serie als gefüllte Bereiche in einem Diagramm mit zwei Datenpunkte, die Mindest-und Höchstwerte zu definieren. + +Verwenden Sie es, wenn Sie benötigen, um das Delta zwischen Anfangs-und Endwerte zu akzentuieren. + + + Display Serie als gefüllte Bereiche in einem Diagramm mit zwei Datenpunkte, die Mindest-und Höchstwerte zu definieren. + +Verwenden Sie es, wenn Sie benötigen, um das Delta zwischen Anfangs-und Endwerte zu akzentuieren. + + + Display Serie als gefüllte Bereiche in einem Diagramm mit zwei Datenpunkte, die Mindest-und Höchstwerte zu definieren. + +Verwenden Sie es, wenn Sie benötigen, um das Delta zwischen Anfangs-und Endwerte zu akzentuieren. + + + Display Serie als gefüllte Bereiche in einem Diagramm mit zwei Datenpunkte, die Mindest-und Höchstwerte zu definieren. + +Verwenden Sie es, wenn Sie benötigen, um das Delta zwischen Anfangs-und Endwerte zu akzentuieren. + + + Horizontale Balken entlang der Zeitachse angezeigt. Jeder Balken steht ein separates Ereignis mit den Start- und End-Werten, daher werden diese Diagramme verwendet, um verschiedene Aktivitäten in den Zeitraum zu verfolgen. + +Verwenden Sie es, wenn es notwendig ist, zeigen Aktivität Bars aus verschiedenen Datenreihe über einander, um ihre Dauer zu vergleichen ist. + + + Horizontale Balken entlang der Zeitachse angezeigt. Jeder Balken steht ein separates Ereignis mit den Start- und End-Werten, daher werden diese Diagramme verwendet, um verschiedene Aktivitäten in den Zeitraum zu verfolgen. + +Verwenden Sie es, wenn es notwendig ist, zeigen Aktivität Bars aus verschiedenen Datenreihe über einander, um ihre Dauer zu vergleichen ist. + + + The Box Plot chart is used to analyze statistic-driven data points. To draw a Box Plot point, pass the Min, Quartile1, Median, Quartile3, and Max parameters. You can also display a set of Outliers and a Mean value. + + + The Box Plot chart is used to analyze statistic-driven data points. To draw a Box Plot point, pass the Min, Quartile1, Median, Quartile3, and Max parameters. You can also display a set of Outliers and a Mean value. + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEV4cG9ydDtYbHM7RXhwb3J0VG9Y + bHM7TKCZ/gAAAHFJREFUOE/dkMkNgDAMBKmaCtwDJfCiCL5pyrBIG8XGgP1lpFEuMoqYVNUoIloxDGT5 + a+A0TQ/M66IViQmAaIRb26814Bm4BfihD4xzroEJ8DJGfyk6A+kXUO6Rz38AxvnrCyqSHnCmCQPYzPIY + yCt6APRYR9ABL1x3AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEV4cG9ydDtYbHM7RXhwb3J0VG9Y + bHM7TKCZ/gAAATNJREFUWEflkD1uwkAQhTmfj5ID5ARuXUQUVK4pKZGQ6NJRUruKlEOEYvMe4qHNemyP + rcX85EmflpmdZT55EUK4K2ZzTszmnJjNOTGbpCzLMJIvUAC+bWHtIGaT4BEOfzhfVdWprusCZfpff+oY + s3lhVCjQNI0pMSjwvl6FqSj6YpYEBTDbgnfZBZhUwi3AWKfYHQ/nHqOeEgswF4kfSowS0BLVurNq9ZhU + gJEE7grMDgtoOU/WjO6se80wFOjhG7PDAkzfFxBx3xNKYNYnkJ5KXFtfoC9ugSl48hQC1mW2DAos3zYt + +ChnrB1o5xPYfHxyyRlGv2OS/h5lPgG8udJV64z6/0Sgq4/cTqArydxtBLwgLyjgSTT74AJeGLzJKzCB + xxAYQ26BLTAXdbC9CtyPsPgFto7Q9L8du98AAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRvY3VtZW50UERGIj4NCiAgICA8cGF0aCBkPSJN + MjIsMjR2NEgyVjJoMTR2NWMwLDAuNiwwLjQsMSwxLDFoNXY0aDJWN2wtNy03SDFDMC40LDAsMCwwLjQs + MCwxdjI4YzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTEgICB2LTVIMjJ6IiBjbGFzcz0i + QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE5LjIsMTZjMC4zLDAuNSwwLjQsMS4xLDAuNCwxLjljMCww + LjktMC4yLDEuNS0wLjUsMmMtMC4zLDAuNS0wLjcsMC43LTEuMywwLjdoLTAuNnYtNS4zaDAuNiAgIEMx + OC40LDE1LjMsMTguOSwxNS42LDE5LjIsMTZ6IE0xMi4xLDE1LjNoLTAuNXYyLjZoMC41YzAuNywwLDEu + MS0wLjQsMS4xLTEuM2MwLTAuNC0wLjEtMC44LTAuMy0xQzEyLjYsMTUuNCwxMi40LDE1LjMsMTIuMSwx + NS4zeiAgICBNMzAsMTJ2MTJINlYxMkgzMHogTTE0LjgsMTYuNWMwLTAuOC0wLjItMS41LTAuNi0xLjlj + LTAuNC0wLjQtMS0wLjctMS44LTAuN0gxMHY4aDEuNnYtMi43aDAuNmMwLjgsMCwxLjQtMC4zLDEuOS0w + LjggICBDMTQuNSwxOCwxNC44LDE3LjMsMTQuOCwxNi41eiBNMjEuMiwxNy45YzAtMi42LTEuMS0zLjkt + My40LTMuOWgtMi4xdjhoMi4yYzEuMSwwLDEuOS0wLjQsMi41LTEuMUMyMC45LDIwLjIsMjEuMiwxOS4y + LDIxLjIsMTcuOXogICAgTTI2LDE0aC0zLjd2OGgxLjZ2LTMuMWgydi0xLjNoLTJ2LTIuMkgyNlYxNHoi + IGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 17, 17 @@ -129,4 +442,109 @@ 905, 17 + + 637, 134 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMADAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H + cmVlbntmaWxsOiMwMzlDMjM7fQoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsYWNre2ZpbGw6Izcy + NzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkJ1c2luZXNzbWFuIj4NCiAgICA8cGF0aCBkPSJN + MTAsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNGMwLjIsMC41LTAuMSwxLjcsMC45LDEuNmMwLDAs + MCwwLjEsMCwwLjJjMC42LDIuMywyLDQuOSw0LjcsNC45ICAgYzIuNywwLDQuMi0yLjYsNC43LTQuOWMw + LDAsMC0wLjEsMC0wLjFjMSwwLjEsMC42LTEuMSwwLjktMS42YzAuMi0wLjUsMC40LTAuOSwwLjMtMS40 + Yy0wLjEtMC40LTAuNC0wLjQtMC41LTAuMyAgIGMxLjgtNC45LTEuMS00LjctMS4xLTQuN1MyMCwyLDE0 + LjgsMkMxMCwyLDkuNCw2LDEwLjUsOS42QzEwLjQsOS42LDEwLjEsOS43LDEwLDkuOXoiIGNsYXNzPSJC + bGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMjAsMThsLTIuNCw3LjlMMTcsMjJsMC42LTJoLTMuMmwwLjYs + MmwtMC42LDMuOUwxMiwxOGMtMi4zLDMuNS04LDEtOCw4LjVWMzBoMTBoMWgyaDFoMTB2LTMuNSAgIEMy + OCwxOS4xLDIyLjMsMjEuNCwyMCwxOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUGFnZUNvdW50IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAg + MCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30K + CS5CbHVle2ZpbGw6IzExNzdENzt9Cjwvc3R5bGU+DQogIDxwYXRoIGQ9Ik0yNyw2aC0zVjNjMC0wLjUt + MC41LTEtMS0xSDNDMi41LDIsMiwyLjUsMiwzdjIyYzAsMC41LDAuNSwxLDEsMWgzdjNjMCwwLjUsMC41 + LDEsMSwxaDIwYzAuNSwwLDEtMC41LDEtMVY3ICBDMjgsNi41LDI3LjUsNiwyNyw2eiBNNiw3djE3SDRW + NGgxOHYySDdDNi41LDYsNiw2LjUsNiw3eiBNMjYsMjhIOFY4aDE4VjI4eiIgY2xhc3M9IkJsYWNrIiAv + Pg0KICA8cGF0aCBkPSJNMjIsMTUuM2wtMC4zLDEuNkgyMGwtMC41LDIuM2gxLjhMMjEsMjAuOGgtMS43 + TDE4LjUsMjRoLTEuOGwwLjYtMy4yaC0yTDE0LjgsMjRIMTNsMC42LTMuMkgxMmwwLjMtMS42SDE0ICBs + MC41LTIuM2gtMS44bDAuMy0xLjZoMS44bDAuNy0zLjNoMS44bC0wLjcsMy4zaDJsMC43LTMuM0gyMWwt + MC43LDMuM0gyMnogTTE4LjMsMTYuOWgtMmwtMC41LDIuM2gyTDE4LjMsMTYuOXoiIGNsYXNzPSJCbHVl + IiAvPg0KPC9zdmc+Cw== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB90RVh0VGl0 + bGUAQ3VycmVuY3k7RG9sbGFyO0J1Y2s7RXVyb/jzRY8AAAoDSURBVFhHnZYHVFRXGsfHbEhi1iTrYS1Y + UBQbLmLAiIBYIARUylAGEAFXIoLgDEgXQboS2kAAmVCkSVGkKBqwUGewIHUsVLEBIlEREsWQPee/9z7B + 4NlJovs/53fu4/Le9//ud+/73rC68zhvQTSF8AHhb4QPCR8RPp4E/ZvO03umdOVwWF3Hx8l+DRWAd4Ix + HesrYf32REifo+bU+KMc/03yLWns4PZsU1Fnjll/dw4HHcfN+tuyTEWtqcZBJwK0FpD7pAhMImOPq1iv + HhSwOjP/zwSIaKAPLbUWfSE+Zhx3J99q9LEwDCMduRjtO4/fntZhtLccw205GKgNRVfOjpGriYZ25Bla + FZr0lFf38lntx8zI5fskkPum7FKJ+9UXkBU29l3ywau+CxgbqMCvD4sx2pOD0TtpGO0m9GTj1YNCvLxb + jIfl3hCnmJSmumnKkOeZStxOMaXxJJpJgoqaf2igLju9LdO0cbDuO/xKjEfvF2C0KwWPL4dBFGOMsx7q + OOW4CqXuahBGsTEgCiXJ5KK/KhRigbHI2UBhGonzwU2BCRNUkpkkqGjmnzQns/l9F33xqr+MBM7CL7fi + 0Zq5CyU8FZz31URloBZqQnVQQcbyA5oo3vclmlNt8aIjGfdK9qM+1jCCxKGHky5IopkkqKTiuWrLO7O3 + j73sOYWX3RnEPA71CeY466aKqiBtVBPoWBk4ToA2Kg5tJsmtwWOhP4Zb4tCaYPoiw3U9PZh0QRLNJEH1 + ybUEw8jeck+8vJONX27G4H6ZO2NeGbgZFQGb0CCwJlsRiV860jBQF4HrSVa46LcB7Se4GGkMw/PrQejK + s0NVsK47iUcPpEQzSVD9vSWJfe3pFXLim0Lxc/Nh1EYa4pLfRmKiiYak7aQiCRgh88MNga/vuRGHJ/UR + ZC4Cz6/64WmFI3pP20MUoldD4tFteC99Jk4yHnzeeATPhC5IZi9gSnveZz3Oe2vgNLk+Zr4YxzjjmC3C + 0GUfPL/ihyGRF55cdMDjs9vRX7oTNYe+7iHx6GvJvBHj/KU+b01gjw03BJOV2GO4PgClXCWUua1Dmcc6 + jLTG4mdxHH4m40grHyMtMXhWsx9PqlwwUGaL/hLzh71FpkV3T5pGlrpv8CbxphL+p2N6J69jef+gyvKk + CNayPJLWkunX+ryRbzD4THQAP5XbIlZnFgrslqHg2+UodlSEwGA+kgxlCQtw1ECWrHgPHp/bSYzNBu+e + YCdXpev5J6ZtPBeSotHtm6w2dCBVHd4pav1eAlWRa/yaIGsvhbc6Zs/Tk6yWviiWW+Ia6s1oWt1hvfq+ + Mh4Gy2wwVOeD2lBtnNy5BCdsl6DSXxPPat0xVOtGVu6G/kJjPCgwutWSvsWbn6JZGZixYex4lRNq2qIg + 7ktHz1AhxL3pqL4dicxLjjiQrDHiFPHlWx2zuS+S5RqvTL0ZTf3RVyu6LcOWJGCLgdNm6Mq2QL6NPPKt + 5ZFuIov8XcsgjtdCf4EhGvkbb8btWuoXlKJ+X3DOBjeIaceTDIgfxeD6w2Bcue/LUE+uW/pj0PQgEfEl + luDylUvZe+XfdExe7GrGnErqkMm/FGqDdcceldrhURHpciXmEIZsRq7VYuRsX4w0tiyiN8/CYXXpwcBN + M319YlUe5NVw0flTFpr6InH5njdEdz0g6vGAudcicAjCHncGUY8nGnvDkUm2zjlaSbRWbzbTMZ2iV712 + J6JlmVrE04hv4LPxqNAI/Sf1MVBqjSvhOsixXIRsczlkc+ToG3L0YNCqCrrytsEUsuIg1Pa44VL7PoRk + f4094Upw+34tg3/aJhzO0UVFBxdV3S64cu8QYgqMYX945Vsdk4r5FmjIS0uf5qrVN8dtQ1+eHnpz9Ugl + LHEn1xLnPVWRs2NJb7iVXID3D2r/abjHR/2DENTc4eFiuxN2Byvi2xBFOEcowzX2K7jEqmBX8ErsDFiB + I7mkfXc541KnEy7ecqdVeGHktPBNx2T96KpOB5qElIuW3KLCPV81C0n3u5uujYfZ2uglyfQXW6Dn1I4z + EUfXXxCcMycl90E1WVUlCRyWrQPnyNXgxagQlFF9K5wcwhTEnTLHPjLvc3QjLrQ7MBSJzRGerw2bQ0vf + dEzWmb2qdJhoGlJbFWbOSN+hyD9lrzwq9F+HGzEa6BRooCVeLdqbr3y3pGEvytr+jbO3rMiqHOCXogVu + 1GrsIzgTPOM1kCO0QlNvFDoGM9Dcx0fZ7W9R2MLB8eu6SK7Qx87Apb93zMLdKqyhqwH0ciIJmtnHTurz + 5VI4K4KzLFcKMywUOhLYy/y50UrDF27zUHKDg5PN+igWmyKukAPHCEU4fkcIV4St/1IY8WRh4bUY/GI9 + nLm5EyeaDJFd/w2yCBl1W2ETsIR2TNobprBO2iqxTtiuYuXbKLLyrBXJ3FuJ0JtoR/uUMN0patXYpc59 + KGg2JEG3Ib9pK0qbdjPGdsHLsDtMAfYEu9DlsD4oDz2H2TiYrozMazrIvPo1Mgjpl3VgfUh+eDw29flD + TSRCoeX63OG7lYNnxfbIa9xG2ILchi2kEkY4f8MDHgnrwPGeDzOK1zzCXJh6zoUBdy7Sr2jjGIMWBJUb + YXlQ7vcKSPpETmZctBrT7EJW1B8n+0sTyCH7SdG0kYaXgBy+bg+UNrgiIE2LMTaheMyBsfs8pNVtRmrd + JobIM+okSdmJM/DOCdBXZqqV75LoI/k6pPxGZE91kXXtG5CkoLNnJrySlZAu0kdpqwPMfWSJMTWfAxf+ + GqSINuEH4UbCBrgLVoHtOo++BUxHlGg6mXHRbZDaYCajsDtsxVjeNVOypzrMnoZk6TCr3bzrn1C1+AdU + OV/AyG0O2ARLXznkCm0hIMaCWk3EXVCDhe+CF1q2M2XHY/71L5dx0ZuZjsnxXBjvm6pGEvgGaZe1cbpl + F+KKTOBKVmrsLkOMZeBwRBGBx7RRJnYhh04XR6vXI7FaA3tjlsGQNydsPNZ7JUDFHMb5yz+VtvBZWB+Y + rYFUUtq0Oi0UtVqTRsMDe78MjAgX211wWmxHSq6FhCp1xBNck1bA0FWmZrnaZ/RbMMXQdTYTVKLpZCa0 + 3U+ODsxWrN0mvcjMS7bZNUEJ31doIImUN6l2Pfnw+EF45yASqtXHjdUQVb4W9hGLoc+b3ahuJk1daYwp + +rxZNN67J2BxYCEdmIcJUvIq02boc+fyLXxkR10TFRBSoIyYclXEV6ojsuwrBOSvhtP3S+lBfLFl76zI + ZeumMSunlN92Y23lziSXRJJMJzMhjrcsq6bLn15OJMF0TJUt0+W27p0dbMCbLdTnyXSQMmMbGfW5s6p0 + HWf4qplMn0fue/PTjJqX33JjbXGeQf4kkmQ6mQmZes1jmXjMYxm7zyXMoVOTE5nomPRXzwR0jv6PMd5K + DKnpxPjeCfyJJhL5I/5ELNZ/ARYVvuKnEwoEAAAAAElFTkSuQmCC + + + + 883, 134 + + + 500, 134 + + + 1123, 134 + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmInvDashboard.vb b/app/DD_PM_WINDREAM/frmInvDashboard.vb index 0d006cc..1067405 100644 --- a/app/DD_PM_WINDREAM/frmInvDashboard.vb +++ b/app/DD_PM_WINDREAM/frmInvDashboard.vb @@ -1,12 +1,210 @@ -Imports DevExpress.XtraGrid.Views.Tile +Imports System.Drawing.Imaging +Imports System.IO +Imports DevExpress.XtraCharts +Imports DevExpress.XtraGrid.Views.Tile Public Class frmInvDashboard + Private _selectedChart As ChartControl Private Sub frmInvDashboard_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSLiteDataSet.VWPM_CHART_INVOICE_MONITOR_SERIES". Sie können sie bei Bedarf verschieben oder entfernen. - Me.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter.Fill(Me.DD_DMSLiteDataSet.VWPM_CHART_INVOICE_MONITOR_SERIES) + 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSLiteDataSet.VWPM_CHART_TOP5". Sie können sie bei Bedarf verschieben oder entfernen. + Try + VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter.Connection.ConnectionString = CONNECTION_STRING + Me.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter.Fill(Me.DD_DMSLiteDataSet.VWPM_CHART_INVOICE_MONITOR_SERIES) + VWPM_CHART_TOP5TableAdapter.Connection.ConnectionString = CONNECTION_STRING + Me.VWPM_CHART_TOP5TableAdapter.Fill(Me.DD_DMSLiteDataSet.VWPM_CHART_TOP5) + Layout_Dashboard() + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error laoding form - " & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) + End Try + + + End Sub + Sub Layout_Dashboard() + Try + Dim groupCount As Integer + Dim charts As List(Of ChartControl) + Dim oGroups As DataRowCollection = BASEDATA_DT_CHARTS.Rows + groupCount = oGroups.Count + Configure_Split_Containers(groupCount) + charts = New List(Of ChartControl) From {ChartTopLeft, ChartTopRight, ChartBottomLeft, ChartBottomRight} + If groupCount >= 1 Then + SplitContainerDashboard.Visible = True + RibbonPageGroup1.Visible = True + RibbonPageGroup1.Enabled = False + SplitContainerControl1.Collapsed = True + Else + SplitContainerDashboard.Visible = False + RibbonPageGroup1.Visible = False + SplitContainerControl1.Collapsed = True + LOGGER.Debug($"ChartCreating...No chart-Configuration!! BASEDATA_DT_CHARTS = 0") + Exit Sub + End If + If groupCount > 1 Then + LOGGER.Debug($"ChartCreating...Found more than one charts [{groupCount}]") + For Each gRow As DataRow In oGroups + Dim oGroupIndex As Integer = oGroups.IndexOf(gRow) + Dim oGroupID As String = gRow.Item("GROUP_ID") + + Dim groupCharts = BASEDATA_DT_CHARTS.Select(String.Format("GROUP_ID = '{0}'", oGroupID)) + Dim chart As ChartControl + + For Each cRow As DataRow In groupCharts + + Dim oChartType = cRow.Item("TYPE_CHART") + LOGGER.Debug($"oChartType [{oChartType}]") + Dim oChartTitle = cRow.Item("TITLE") + LOGGER.Debug($"oChartTitle [{oChartTitle}]") + Dim guid = cRow.Item("GUID") + LOGGER.Debug($"guid [{guid}]") + Dim oChartValue = cRow.Item("VALUE") + Dim oChartArgument = cRow.Item("ARGUMENT") + Dim oSqlchart = cRow.Item("SQL_COMMAND") + oSqlchart = oSqlchart.Replace("@USER", USER_USERNAME) + Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(oSqlchart) + + Dim series As Series = Create_Series(oChartTitle, oChartType) + + ' Select Current Chart + chart = Select_Chart(oGroupIndex) + chart = charts.Item(oGroupIndex) + Try + chart.Series.Clear() + Catch ex As Exception + LOGGER.Error(ex) + + End Try + ' Set DataSource + chart.DataSource = DATA_DT + + ' Set shown Columns for Chart + series.ArgumentDataMember = oChartArgument + series.ValueDataMembers.AddRange(New String() {oChartValue}) + + 'set some options + chart.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True + + ' Show Data + chart.Series.Add(series) + + Next ' End Charts + Next 'End Groups + Else + ' Create Charts + For Each cRow As DataRow In BASEDATA_DT_CHARTS.Rows + + Dim chart As ChartControl + + Dim chartIndex As Integer = BASEDATA_DT_CHARTS.Rows.IndexOf(cRow) + + Dim oChartType = cRow.Item("TYPE_CHART") + Dim oChartTitle = cRow.Item("TITLE") + Dim guid = cRow.Item("GUID") + Dim oChartValue = cRow.Item("VALUE") + Dim oChartArgument = cRow.Item("ARGUMENT") + Dim oSqlchart = cRow.Item("SQL_COMMAND") + + oSqlchart = clsPatterns.ReplaceInternalValues(oSqlchart) + oSqlchart = clsPatterns.ReplaceUserValues(oSqlchart, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + + oSqlchart = oSqlchart.ToString.ToUpper.Replace("@USER_ID", USER_ID) + oSqlchart = oSqlchart.ToString.ToUpper.Replace("@USER", USER_USERNAME) + Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(oSqlchart) + + ' Create Series based on type + Dim series As Series = Create_Series(oChartTitle, oChartType) + + ' Select Current Chart + chart = Select_Chart(chartIndex) + Try + chart.Series.Clear() + Catch ex As Exception + LOGGER.Error(ex) + + End Try + ' Set DataSource + chart.DataSource = DATA_DT + + ' Set shown Columns for Chart + series.ArgumentDataMember = oChartArgument + series.ValueDataMembers.AddRange(New String() {oChartValue}) + + 'set some options + chart.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True + chart.OptionsPrint.SizeMode = Printing.PrintSizeMode.Stretch + + ' Show Data + chart.Series.Add(series) + + Next + End If + + Catch ex As Exception + LOGGER.Error(ex) + LOGGER.Info("Layout Dashboard - Error: " & ex.Message) + MsgBox("Unexpected Error in Layout Dashboard - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) + End Try + End Sub + Private Sub Configure_Split_Containers(VisibleContainers As Integer) + Select Case VisibleContainers + Case 1 + ' Show only ChartTopLeft + SplitContainerTop.Panel2Collapsed = True + ' Collapse SplitContainerBottom + SplitContainerDashboard.Panel2Collapsed = True + Case 2 + ' Collapse SplitContainerBottom + SplitContainerDashboard.Panel2Collapsed = True + Case 3 + ' Collapse ChartBottomRight + SplitContainerBottom.Panel2Collapsed = True + ' Show SplitContainerBottom + SplitContainerDashboard.Panel2Collapsed = False + Case 4 + ' Show SplitContainerBottom + SplitContainerDashboard.Panel2Collapsed = False + End Select + SplitContainerDashboard.Dock = DockStyle.Fill End Sub + Private Function Select_Chart(index As Integer) + Select Case index + Case 0 + Return ChartTopLeft + Case 1 + Return ChartTopRight + Case 2 + Return ChartBottomLeft + Case Else + Return ChartBottomRight + End Select + End Function + Private Function Create_Series(title As String, type As String) As Series + Dim series As Series + LOGGER.Debug($"In Create new series: type [{type}]") + Select Case type + Case "BAR" + LOGGER.Debug("Create new series: ViewType.Bar") + series = New Series(title, ViewType.Bar) + Case "LINE" + LOGGER.Debug("Create new series: ViewType.Line") + series = New Series(title, ViewType.Line) + Case "AREA" + LOGGER.Debug("Create new series: ViewType.Area") + series = New Series(title, ViewType.Area) + Case "PIE" + LOGGER.Debug("Create new series: ViewType.Pie") + series = New Series(title, ViewType.Pie) + series.Label.TextPattern = "{A}: {VP:p0}" + Dim view As PieSeriesView = DirectCast(series.View, PieSeriesView) + view.Titles.Add(New SeriesTitle()) + view.Titles(0).Text = title + Case Else + series = New Series(title, ViewType.Bar) + End Select + Return series + End Function Private Sub TileView1_ItemCustomize(sender As Object, e As DevExpress.XtraGrid.Views.Tile.TileViewItemCustomizeEventArgs) Handles TileView1.ItemCustomize Dim oView As TileView = sender Dim ovalue = oView.GetRowCellValue(e.RowHandle, "Title") @@ -23,4 +221,103 @@ Public Class frmInvDashboard e.Item.Elements(2).Appearance.Normal.ForeColor = Color.Red End If End Sub + + Private Sub ChartTopLeft_Click(sender As Object, e As EventArgs) Handles ChartTopLeft.Click, ChartTopRight.Click, ChartBottomLeft.Click, ChartBottomRight.Click + _selectedChart = sender + RibbonPageGroup1.Enabled = True + RibbonPageGroup2.Enabled = False + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + If Not IsNothing(_selectedChart) Then + SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" + If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then + ExportChart2Pdf(_selectedChart, SaveFileDialog1.FileName) + End If + Else + MsgBox("Please select a chart via clicking on it!", MsgBoxStyle.Information, ADDITIONAL_TITLE) + End If + + End Sub + Sub ExportChart2Pdf(pMyChart As ChartControl, pFilePath As String) + Try + pMyChart.OptionsPrint.ImageFormat = DevExpress.XtraCharts.Printing.PrintImageFormat.Metafile + pMyChart.ExportToPdf(pFilePath, New DevExpress.XtraPrinting.PdfExportOptions With { + .ConvertImagesToJpeg = False + }) + ' Exports to a stream as PDF. + Dim pdfStream As FileStream = New FileStream(pFilePath, FileMode.Create) + pMyChart.ExportToPdf(pdfStream) + ' ... + pdfStream.Close() + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub + Sub ExportCharttoimage(pMyChart As ChartControl, pFilePath As String) + Try + SaveChartImageToFile(pMyChart, ImageFormat.Png, pFilePath) + Dim image As Image = GetChartImage(pMyChart, ImageFormat.Png) + image.Save(pFilePath) + Catch ex As Exception + LOGGER.Error(ex) + End Try + + End Sub + Private Sub SaveChartImageToFile(ByVal chart As ChartControl, ByVal format As ImageFormat, ByVal fileName As String) + ' Create an image in the specified format from the chart + ' and save it to the specified path. + chart.ExportToImage(fileName, format) + End Sub + Private Function GetChartImage(ByVal chart As ChartControl, ByVal format As ImageFormat) As Image + ' Create an image. + Dim image As Image = Nothing + + ' Create an image of the chart. + Using s As New MemoryStream() + chart.ExportToImage(s, format) + image = System.Drawing.Image.FromStream(s) + End Using + + ' Return the image. + Return image + End Function + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + If Not IsNothing(_selectedChart) Then + SaveFileDialog1.Filter = "PNG Files(* .png *)|*.png" + If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then + ExportCharttoimage(_selectedChart, SaveFileDialog1.FileName) + End If + Else + MsgBox("Please select a chart via clicking on it!", MsgBoxStyle.Information, ADDITIONAL_TITLE) + End If + + End Sub + + Private Sub GridControl1_Click(sender As Object, e As EventArgs) Handles GridControl1.Click + RibbonPageGroup1.Enabled = False + RibbonPageGroup2.Enabled = True + End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" + If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then + TileView1.ExportToPdf(SaveFileDialog1.FileName) + End If + End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + SaveFileDialog1.Filter = "Excel Files (*.xlsx*)|*.xlsx" + If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then + GridView1.ExportToXlsx(SaveFileDialog1.FileName) + End If + End Sub + + Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick + SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" + If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then + GridView1.ExportToPdf(SaveFileDialog1.FileName) + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 1c2c45c..81ddf94 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -24,25 +24,6 @@ Partial Class frmMain Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) - Me.SplitContainerDashboard = New System.Windows.Forms.SplitContainer() - Me.SplitContainerTop = New System.Windows.Forms.SplitContainer() - Me.ChartTopLeft = New DevExpress.XtraCharts.ChartControl() - Me.ToolStripTopLeft = New System.Windows.Forms.ToolStrip() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton() - Me.ChartTopRight = New DevExpress.XtraCharts.ChartControl() - Me.ToolStripTopRight = New System.Windows.Forms.ToolStrip() - Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton6 = New System.Windows.Forms.ToolStripButton() - Me.SplitContainerBottom = New System.Windows.Forms.SplitContainer() - Me.ChartBottomLeft = New DevExpress.XtraCharts.ChartControl() - Me.ToolStripBottomLeft = New System.Windows.Forms.ToolStrip() - Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton7 = New System.Windows.Forms.ToolStripButton() - Me.ChartBottomRight = New DevExpress.XtraCharts.ChartControl() - Me.ToolStripBottomRight = New System.Windows.Forms.ToolStrip() - Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton8 = New System.Windows.Forms.ToolStripButton() Me.ImageListProfile = New System.Windows.Forms.ImageList(Me.components) Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -79,7 +60,6 @@ Partial Class frmMain Me.tsmiValidationProfil = New System.Windows.Forms.ToolStripMenuItem() Me.NavBarGroupMore = New DevExpress.XtraNavBar.NavBarGroup() Me.NavBarItemOverview = New DevExpress.XtraNavBar.NavBarItem() - Me.NavBarItemDashboard = New DevExpress.XtraNavBar.NavBarItem() Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.ContextMenuNotifyIcon = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.PopupErinnerungInaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -112,6 +92,7 @@ Partial Class frmMain Me.bbtniMetadataFile = New DevExpress.XtraBars.BarButtonItem() Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemProgressBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemProgressBar() + Me.bbtnItemDashboard = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -121,9 +102,12 @@ Partial Class frmMain Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.bwSync = New System.ComponentModel.BackgroundWorker() - Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.bwBasicData = New System.ComponentModel.BackgroundWorker() Me.DocumentViewerBarManager1 = New DevExpress.XtraPrinting.Preview.DocumentViewerBarManager(Me.components) + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.PrintPreviewStaticItem1 = New DevExpress.XtraPrinting.Preview.PrintPreviewStaticItem() Me.ProgressBarEditItem1 = New DevExpress.XtraPrinting.Preview.ProgressBarEditItem() Me.RepositoryItemProgressBar2 = New DevExpress.XtraEditors.Repository.RepositoryItemProgressBar() @@ -131,10 +115,6 @@ Partial Class frmMain Me.PrintPreviewStaticItem2 = New DevExpress.XtraPrinting.Preview.PrintPreviewStaticItem() Me.ZoomTrackBarEditItem1 = New DevExpress.XtraPrinting.Preview.ZoomTrackBarEditItem() Me.RepositoryItemZoomTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemZoomTrackBar() - Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.bbiDocumentMap = New DevExpress.XtraPrinting.Preview.PrintPreviewBarItem() Me.bbiParameters = New DevExpress.XtraPrinting.Preview.PrintPreviewBarItem() Me.bbiThumbnails = New DevExpress.XtraPrinting.Preview.PrintPreviewBarItem() @@ -190,26 +170,6 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem17 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem18 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem19 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() - CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerDashboard.Panel1.SuspendLayout() - Me.SplitContainerDashboard.Panel2.SuspendLayout() - Me.SplitContainerDashboard.SuspendLayout() - CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerTop.Panel1.SuspendLayout() - Me.SplitContainerTop.Panel2.SuspendLayout() - Me.SplitContainerTop.SuspendLayout() - CType(Me.ChartTopLeft, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ToolStripTopLeft.SuspendLayout() - CType(Me.ChartTopRight, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ToolStripTopRight.SuspendLayout() - CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerBottom.Panel1.SuspendLayout() - Me.SplitContainerBottom.Panel2.SuspendLayout() - Me.SplitContainerBottom.SuspendLayout() - CType(Me.ChartBottomLeft, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ToolStripBottomLeft.SuspendLayout() - CType(Me.ChartBottomRight, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ToolStripBottomRight.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() @@ -234,162 +194,6 @@ Partial Class frmMain CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'SplitContainerDashboard - ' - resources.ApplyResources(Me.SplitContainerDashboard, "SplitContainerDashboard") - Me.SplitContainerDashboard.Name = "SplitContainerDashboard" - ' - 'SplitContainerDashboard.Panel1 - ' - Me.SplitContainerDashboard.Panel1.Controls.Add(Me.SplitContainerTop) - ' - 'SplitContainerDashboard.Panel2 - ' - Me.SplitContainerDashboard.Panel2.Controls.Add(Me.SplitContainerBottom) - ' - 'SplitContainerTop - ' - resources.ApplyResources(Me.SplitContainerTop, "SplitContainerTop") - Me.SplitContainerTop.Name = "SplitContainerTop" - ' - 'SplitContainerTop.Panel1 - ' - Me.SplitContainerTop.Panel1.Controls.Add(Me.ChartTopLeft) - Me.SplitContainerTop.Panel1.Controls.Add(Me.ToolStripTopLeft) - ' - 'SplitContainerTop.Panel2 - ' - Me.SplitContainerTop.Panel2.Controls.Add(Me.ChartTopRight) - Me.SplitContainerTop.Panel2.Controls.Add(Me.ToolStripTopRight) - ' - 'ChartTopLeft - ' - resources.ApplyResources(Me.ChartTopLeft, "ChartTopLeft") - Me.ChartTopLeft.Legend.Name = "Default Legend" - Me.ChartTopLeft.Name = "ChartTopLeft" - Me.ChartTopLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} - ' - 'ToolStripTopLeft - ' - Me.ToolStripTopLeft.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStripTopLeft.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ToolStripTopLeft.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1, Me.ToolStripButton5}) - resources.ApplyResources(Me.ToolStripTopLeft, "ToolStripTopLeft") - Me.ToolStripTopLeft.Name = "ToolStripTopLeft" - ' - 'ToolStripButton1 - ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.DD_ProcessManager.My.Resources.Resources.pdf - resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1") - Me.ToolStripButton1.Name = "ToolStripButton1" - ' - 'ToolStripButton5 - ' - Me.ToolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton5.Image = Global.DD_ProcessManager.My.Resources.Resources.image - resources.ApplyResources(Me.ToolStripButton5, "ToolStripButton5") - Me.ToolStripButton5.Name = "ToolStripButton5" - ' - 'ChartTopRight - ' - resources.ApplyResources(Me.ChartTopRight, "ChartTopRight") - Me.ChartTopRight.Legend.Name = "Default Legend" - Me.ChartTopRight.Name = "ChartTopRight" - Me.ChartTopRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} - ' - 'ToolStripTopRight - ' - Me.ToolStripTopRight.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStripTopRight.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ToolStripTopRight.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton2, Me.ToolStripButton6}) - resources.ApplyResources(Me.ToolStripTopRight, "ToolStripTopRight") - Me.ToolStripTopRight.Name = "ToolStripTopRight" - ' - 'ToolStripButton2 - ' - Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton2.Image = Global.DD_ProcessManager.My.Resources.Resources.pdf - resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2") - Me.ToolStripButton2.Name = "ToolStripButton2" - ' - 'ToolStripButton6 - ' - Me.ToolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.ToolStripButton6, "ToolStripButton6") - Me.ToolStripButton6.Name = "ToolStripButton6" - ' - 'SplitContainerBottom - ' - resources.ApplyResources(Me.SplitContainerBottom, "SplitContainerBottom") - Me.SplitContainerBottom.Name = "SplitContainerBottom" - ' - 'SplitContainerBottom.Panel1 - ' - Me.SplitContainerBottom.Panel1.Controls.Add(Me.ChartBottomLeft) - Me.SplitContainerBottom.Panel1.Controls.Add(Me.ToolStripBottomLeft) - ' - 'SplitContainerBottom.Panel2 - ' - Me.SplitContainerBottom.Panel2.Controls.Add(Me.ChartBottomRight) - Me.SplitContainerBottom.Panel2.Controls.Add(Me.ToolStripBottomRight) - ' - 'ChartBottomLeft - ' - resources.ApplyResources(Me.ChartBottomLeft, "ChartBottomLeft") - Me.ChartBottomLeft.Legend.Name = "Default Legend" - Me.ChartBottomLeft.Name = "ChartBottomLeft" - Me.ChartBottomLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} - ' - 'ToolStripBottomLeft - ' - Me.ToolStripBottomLeft.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStripBottomLeft.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ToolStripBottomLeft.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton7}) - resources.ApplyResources(Me.ToolStripBottomLeft, "ToolStripBottomLeft") - Me.ToolStripBottomLeft.Name = "ToolStripBottomLeft" - ' - 'ToolStripButton3 - ' - Me.ToolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton3.Image = Global.DD_ProcessManager.My.Resources.Resources.pdf - resources.ApplyResources(Me.ToolStripButton3, "ToolStripButton3") - Me.ToolStripButton3.Name = "ToolStripButton3" - ' - 'ToolStripButton7 - ' - Me.ToolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.ToolStripButton7, "ToolStripButton7") - Me.ToolStripButton7.Name = "ToolStripButton7" - ' - 'ChartBottomRight - ' - resources.ApplyResources(Me.ChartBottomRight, "ChartBottomRight") - Me.ChartBottomRight.Legend.Name = "Default Legend" - Me.ChartBottomRight.Name = "ChartBottomRight" - Me.ChartBottomRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} - ' - 'ToolStripBottomRight - ' - Me.ToolStripBottomRight.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStripBottomRight.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ToolStripBottomRight.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton4, Me.ToolStripButton8}) - resources.ApplyResources(Me.ToolStripBottomRight, "ToolStripBottomRight") - Me.ToolStripBottomRight.Name = "ToolStripBottomRight" - ' - 'ToolStripButton4 - ' - Me.ToolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton4.Image = Global.DD_ProcessManager.My.Resources.Resources.pdf - resources.ApplyResources(Me.ToolStripButton4, "ToolStripButton4") - Me.ToolStripButton4.Name = "ToolStripButton4" - ' - 'ToolStripButton8 - ' - Me.ToolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.ToolStripButton8, "ToolStripButton8") - Me.ToolStripButton8.Name = "ToolStripButton8" - ' 'ImageListProfile ' Me.ImageListProfile.ImageStream = CType(resources.GetObject("ImageListProfile.ImageStream"), System.Windows.Forms.ImageListStreamer) @@ -431,7 +235,6 @@ Partial Class frmMain ' 'Panel1 ' - Me.Panel1.Controls.Add(Me.SplitContainerDashboard) Me.Panel1.Controls.Add(Me.GridControl_Docs) Me.Panel1.Controls.Add(Me.BindingNavigator1) Me.Panel1.Controls.Add(Me.NavBarControl1) @@ -523,7 +326,7 @@ Partial Class frmMain Me.BindingNavigator1.AddNewItem = Nothing Me.BindingNavigator1.BindingSource = Me.bindsourcegrid Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem - Me.BindingNavigator1.CountItemFormat = "von {0} Dateien" + Me.BindingNavigator1.CountItemFormat = "von {0} Vorgängen" Me.BindingNavigator1.DeleteItem = Nothing Me.BindingNavigator1.ImageScalingSize = New System.Drawing.Size(20, 20) Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelViewTape, Me.BindingNavigatorSeparator2, Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem}) @@ -595,7 +398,7 @@ Partial Class frmMain Me.NavBarControl1.ContextMenuStrip = Me.cmsNavPane resources.ApplyResources(Me.NavBarControl1, "NavBarControl1") Me.NavBarControl1.Groups.AddRange(New DevExpress.XtraNavBar.NavBarGroup() {Me.NavBarGroupMore, Me.NavBarGroupProfiles}) - Me.NavBarControl1.Items.AddRange(New DevExpress.XtraNavBar.NavBarItem() {Me.NavBarItemOverview, Me.NavBarItemDashboard}) + Me.NavBarControl1.Items.AddRange(New DevExpress.XtraNavBar.NavBarItem() {Me.NavBarItemOverview}) Me.NavBarControl1.Name = "NavBarControl1" Me.NavBarControl1.OptionsNavPane.ExpandedWidth = CType(resources.GetObject("resource.ExpandedWidth"), Integer) Me.NavBarControl1.View = New DevExpress.XtraNavBar.ViewInfo.StandardSkinExplorerBarViewInfoRegistrator("DevExpress Style") @@ -627,7 +430,7 @@ Partial Class frmMain Me.NavBarGroupMore.Expanded = True Me.NavBarGroupMore.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.LargeIconsText Me.NavBarGroupMore.ImageOptions.LargeImage = CType(resources.GetObject("NavBarGroupMore.ImageOptions.LargeImage"), System.Drawing.Image) - Me.NavBarGroupMore.ItemLinks.AddRange(New DevExpress.XtraNavBar.NavBarItemLink() {New DevExpress.XtraNavBar.NavBarItemLink(Me.NavBarItemOverview), New DevExpress.XtraNavBar.NavBarItemLink(Me.NavBarItemDashboard)}) + Me.NavBarGroupMore.ItemLinks.AddRange(New DevExpress.XtraNavBar.NavBarItemLink() {New DevExpress.XtraNavBar.NavBarItemLink(Me.NavBarItemOverview)}) Me.NavBarGroupMore.Name = "NavBarGroupMore" ' 'NavBarItemOverview @@ -639,12 +442,6 @@ Partial Class frmMain Me.NavBarItemOverview.ImageOptions.LargeImage = CType(resources.GetObject("NavBarItemOverview.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarItemOverview.Name = "NavBarItemOverview" ' - 'NavBarItemDashboard - ' - resources.ApplyResources(Me.NavBarItemDashboard, "NavBarItemDashboard") - Me.NavBarItemDashboard.ImageOptions.LargeImage = CType(resources.GetObject("NavBarItemDashboard.ImageOptions.LargeImage"), System.Drawing.Image) - Me.NavBarItemDashboard.Name = "NavBarItemDashboard" - ' 'NotifyIcon1 ' Me.NotifyIcon1.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info @@ -709,9 +506,9 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnItemDashboard}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 17 + Me.RibbonControl1.MaxItemId = 18 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.QuickToolbarItemLinks.Add(Me.bbtnitemInfo) @@ -852,6 +649,13 @@ Partial Class frmMain Me.RepositoryItemProgressBar1.Name = "RepositoryItemProgressBar1" Me.RepositoryItemProgressBar1.ShowTitle = True ' + 'bbtnItemDashboard + ' + resources.ApplyResources(Me.bbtnItemDashboard, "bbtnItemDashboard") + Me.bbtnItemDashboard.Id = 17 + Me.bbtnItemDashboard.ImageOptions.SvgImage = CType(resources.GetObject("bbtnItemDashboard.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnItemDashboard.Name = "bbtnItemDashboard" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4}) @@ -868,6 +672,7 @@ Partial Class frmMain ' Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMetadataFile) + Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnItemDashboard) Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMonitor) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") @@ -917,10 +722,6 @@ Partial Class frmMain Me.bwSync.WorkerReportsProgress = True Me.bwSync.WorkerSupportsCancellation = True ' - 'SaveFileDialog1 - ' - resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1") - ' 'bwBasicData ' Me.bwBasicData.WorkerReportsProgress = True @@ -939,6 +740,30 @@ Partial Class frmMain Me.DocumentViewerBarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar2, Me.RepositoryItemZoomTrackBar1, Me.PrintPreviewRepositoryItemComboBox1}) Me.DocumentViewerBarManager1.TransparentEditorsMode = DevExpress.Utils.DefaultBoolean.[True] ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") + Me.barDockControlTop.Manager = Me.DocumentViewerBarManager1 + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.CausesValidation = False + resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") + Me.barDockControlBottom.Manager = Me.DocumentViewerBarManager1 + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") + Me.barDockControlLeft.Manager = Me.DocumentViewerBarManager1 + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") + Me.barDockControlRight.Manager = Me.DocumentViewerBarManager1 + ' 'PrintPreviewStaticItem1 ' Me.PrintPreviewStaticItem1.Border = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder @@ -1000,30 +825,6 @@ Partial Class frmMain Me.RepositoryItemZoomTrackBar1.Maximum = 180 Me.RepositoryItemZoomTrackBar1.Name = "RepositoryItemZoomTrackBar1" ' - 'barDockControlTop - ' - Me.barDockControlTop.CausesValidation = False - resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") - Me.barDockControlTop.Manager = Me.DocumentViewerBarManager1 - ' - 'barDockControlBottom - ' - Me.barDockControlBottom.CausesValidation = False - resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") - Me.barDockControlBottom.Manager = Me.DocumentViewerBarManager1 - ' - 'barDockControlLeft - ' - Me.barDockControlLeft.CausesValidation = False - resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") - Me.barDockControlLeft.Manager = Me.DocumentViewerBarManager1 - ' - 'barDockControlRight - ' - Me.barDockControlRight.CausesValidation = False - resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") - Me.barDockControlRight.Manager = Me.DocumentViewerBarManager1 - ' 'bbiDocumentMap ' Me.bbiDocumentMap.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check @@ -1518,34 +1319,6 @@ Partial Class frmMain Me.Name = "frmMain" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.SplitContainerDashboard.Panel1.ResumeLayout(False) - Me.SplitContainerDashboard.Panel2.ResumeLayout(False) - CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerDashboard.ResumeLayout(False) - Me.SplitContainerTop.Panel1.ResumeLayout(False) - Me.SplitContainerTop.Panel1.PerformLayout() - Me.SplitContainerTop.Panel2.ResumeLayout(False) - Me.SplitContainerTop.Panel2.PerformLayout() - CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerTop.ResumeLayout(False) - CType(Me.ChartTopLeft, System.ComponentModel.ISupportInitialize).EndInit() - Me.ToolStripTopLeft.ResumeLayout(False) - Me.ToolStripTopLeft.PerformLayout() - CType(Me.ChartTopRight, System.ComponentModel.ISupportInitialize).EndInit() - Me.ToolStripTopRight.ResumeLayout(False) - Me.ToolStripTopRight.PerformLayout() - Me.SplitContainerBottom.Panel1.ResumeLayout(False) - Me.SplitContainerBottom.Panel1.PerformLayout() - Me.SplitContainerBottom.Panel2.ResumeLayout(False) - Me.SplitContainerBottom.Panel2.PerformLayout() - CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerBottom.ResumeLayout(False) - CType(Me.ChartBottomLeft, System.ComponentModel.ISupportInitialize).EndInit() - Me.ToolStripBottomLeft.ResumeLayout(False) - Me.ToolStripBottomLeft.PerformLayout() - CType(Me.ChartBottomRight, System.ComponentModel.ISupportInitialize).EndInit() - Me.ToolStripBottomRight.ResumeLayout(False) - Me.ToolStripBottomRight.PerformLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) @@ -1595,21 +1368,8 @@ Partial Class frmMain Friend WithEvents NavBarGroupProfiles As DevExpress.XtraNavBar.NavBarGroup Friend WithEvents NavBarGroupMore As DevExpress.XtraNavBar.NavBarGroup Friend WithEvents NavBarItemOverview As DevExpress.XtraNavBar.NavBarItem - Friend WithEvents NavBarItemDashboard As DevExpress.XtraNavBar.NavBarItem Friend WithEvents cmsNavPane As ContextMenuStrip Friend WithEvents tsmiValidationProfil As ToolStripMenuItem - Friend WithEvents Panel1 As Panel - Friend WithEvents SplitContainerDashboard As SplitContainer - Friend WithEvents SplitContainerTop As SplitContainer - Friend WithEvents ChartTopLeft As DevExpress.XtraCharts.ChartControl - Friend WithEvents ToolStripTopLeft As ToolStrip - Friend WithEvents ChartTopRight As DevExpress.XtraCharts.ChartControl - Friend WithEvents ToolStripTopRight As ToolStrip - Friend WithEvents SplitContainerBottom As SplitContainer - Friend WithEvents ChartBottomLeft As DevExpress.XtraCharts.ChartControl - Friend WithEvents ToolStripBottomLeft As ToolStrip - Friend WithEvents ChartBottomRight As DevExpress.XtraCharts.ChartControl - Friend WithEvents ToolStripBottomRight As ToolStrip Friend WithEvents TabellenlayoutZurücksetzenToolStripMenuItem As ToolStripMenuItem Friend WithEvents tsmiMarkedFilesFinish As ToolStripMenuItem Friend WithEvents GridControl_Docs As DevExpress.XtraGrid.GridControl @@ -1663,15 +1423,6 @@ Partial Class frmMain Friend WithEvents bwSync As System.ComponentModel.BackgroundWorker Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemProgressBar1 As DevExpress.XtraEditors.Repository.RepositoryItemProgressBar - Friend WithEvents ToolStripButton1 As ToolStripButton - Friend WithEvents ToolStripButton2 As ToolStripButton - Friend WithEvents ToolStripButton3 As ToolStripButton - Friend WithEvents ToolStripButton4 As ToolStripButton - Friend WithEvents SaveFileDialog1 As SaveFileDialog - Friend WithEvents ToolStripButton5 As ToolStripButton - Friend WithEvents ToolStripButton6 As ToolStripButton - Friend WithEvents ToolStripButton7 As ToolStripButton - Friend WithEvents ToolStripButton8 As ToolStripButton Friend WithEvents bwBasicData As System.ComponentModel.BackgroundWorker Friend WithEvents DocumentViewerBarManager1 As DevExpress.XtraPrinting.Preview.DocumentViewerBarManager Friend WithEvents PrintPreviewStaticItem1 As DevExpress.XtraPrinting.Preview.PrintPreviewStaticItem @@ -1740,4 +1491,6 @@ Partial Class frmMain Friend WithEvents PrintPreviewBarCheckItem17 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem Friend WithEvents PrintPreviewBarCheckItem18 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem Friend WithEvents PrintPreviewBarCheckItem19 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem + Friend WithEvents Panel1 As Panel + Friend WithEvents bbtnItemDashboard As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 3095ac6..fc503c1 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -117,540 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 913, 73 - - - - Horizontal - - - Fill - - - 0, 0 - - - Fill - - - 0, 27 - - - 101, 73 - - - - 2 - - - ChartTopLeft - - - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerTop.Panel1 - - - 0 - - - 662, 95 - - - Magenta - - - 24, 24 - - - Export to pdf - - - Magenta - - - 24, 24 - - - Export png - - - 0, 0 - - - 101, 27 - - - 1 - - - ToolStrip1 - - - ToolStripTopLeft - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerTop.Panel1 - - - 1 - - - SplitContainerTop.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerTop - - - 0 - - - Fill - - - 0, 27 - - - 209, 73 - - - 1 - - - ChartTopRight - - - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerTop.Panel2 - - - 0 - - - 804, 95 - - - Magenta - - - 24, 24 - - - Export to pdf - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAYwSURBVFhHxZfZU1NXHMcZXzrT9771H+tDH/rQl04XtaO0 - LtWqrSguFVtBCJtAgkAgIMq+hYRFFpGt7MgSCIQAIQmQ3CTffn8n91KQq+ODpcx85iT3HvL9nN8595y5 - Kdmlzfg/SElJ+YScUgIRLfFB7GvxI+wJ0RhJtrsRIq3xWaEdENa5mVkqAp8piQ8ReDtUtSo0zjBBQiXk - aKiEHQ4O7yf59vIDEficfHpEoKax+wjVxF7X+dEI7UcVX3x39d0Cbi+O0LUOdJMeH9C3AQyS135gZBMY - 20zg780YJrdimNoWNNXKd7ku96Wf9C+qcScF9kwF4gcCnQx1EaN1r/0r8ZIS/RQYIsP84VEGjDNogoES - OkkBFU7kutwfZviQEnAxPILQ7jsqIPMqAs5VhhPV6iJdlBCBXgoMMPwVGfEnMOZnEMO25icQ66kBXuQj - 5nZga25cXZf7w+wnwk+qXQjuRhTHBIwFJnPezmChQ0dEXHoVeskAORDgKCUck61AaBLANhBkO9qIrdkx - JSD9pH+hLrBjJqAeJy2mBFo9QOsKYdvOVknoU9FD+kSAlXi9EccoAzQZuQoP63BuAoPQnHZ1f4j9pH+h - o1OFmwvoj5MINC3jgGaRIW2GBBGJfkoMrscpoamyq5EjSDhU8B9BoeosDPs0hsdV1UQgEI4gYCZgbB4i - UL8IRcMS0EhEQmhjNWRtiESvkpCRsQLuKo54lKG8iTdkHFhqhtZepu4PsJ/0L6hyUmBfYS7AjcJBgecM - f77AgQkiQwmRadIlnKRLKuFNcDpi8E2NcZnXAutuIDoELDTS0ArfxAglY+hlP+lfUCUVoEDITEDfvRwN - XajhIIRqva2liEjV6RWRKREJ12oC3V6OzhvDOsM0Z7kqu4x8fWIYL3m9ZzUON/tJf6nANsO3QntmAskt - UwQq56CoIo75JDWUEBGpiFSjhRLtpHMlwYA4ulcZxkCRkVa+y3W5LwtZpjC/soMCewpTAdmrRcA+C1QI - M4Bd0GWqjIrItBBZpK2kgz/e4UkwjIGeOFxsnfzexutSLekn/UVARm9agZAhUO/GU4YextIfQrpjEjdK - BpDXMgWHiBjrg6iFypAWXUjaZn26Gnhf1tMzkmenQHCXArsmAjyhZI921HeheAoHZPeFcDO/HWubYcz7 - w2h0zyK3ZRqVs3FUUsRYJ88YVEfu1Uzjm7RaXMoZQslYRIlWk0pOoyGwSUwEkoeEVKCIG9sTktm9g6sW - F+a8QYSiCaxwnw9EErheMozstgWUsTrl/OEKTk8tJS7ldMHSOovBxShcs1GkPu5F9lBETWE5ybW3q/DN - HTMBhstBUdk8gEKGZzj9+D3PiUVfmNOTwLwvioJmL3LqVpH3bEVJWHq3YZvmNE3HcS6jFZYXy1gOx9E/ - p8HSEEB5dxhnMl3IGY7CStm8iqSA30wgyHDZp8sbXuJOvUeFT66GsR6I89lNYHuPB1VPABZuBlmsZyaH - fTG7Gw+7tnD6Wg2s/TuY47nQP63htmMb10p9+NnqxXnrBr6824c/X0VUBSTcHwibCDBcsNe58VtuBwZn - tjHt1xRrQUpQoHMiDEvtkhLI4CNxr2wC5x85UeAKYmwtBueEhqxarpkKP65Q4HKJF+dyVvBV5jy+vutC - LiuwsRPGRiB0XMA4JGzVLRia28OIR8PEUlLAs8PdLhTHzLKG4vo1PKx4g4zKGaTbxpFWPI7UvzpgZ7mz - 6pLhMnoJTy1YwY+5y/g+axE/PFpGevZThr9DQA4IwVbdhL43u4qRBQ1ji/uYo8wb7nhNoyHkOzxK4H7l - LNKezuJG4Qiu5fXizP02pFrXcN3O0duSAufzPTibs4Sz2Us4/WgJ6Y/fK5A8JKxVTbiYXoTUm0/w060i - XLxTjAt3SnDhrpXYcOmeDVf+KMXlB4TtL+QKP/+aQR7aFOk5ZWq0tw9x63Ep0rJEIISNbTMB/ZRSG4UJ - 8uj4OX8KGYVq+WMKGZWBce0QDPTpyHcfOS7AQ0L26LdDk8EGSYH3Bh4KUaFGa6D3OSZgHBL/uYDOMQHj - kDgscJiPNQXvFzAJPbEKyLuavC7JjZPiQIB/8pYqL4py4SRJvpzy75T+QWxOEmamnPoHWoE6fcw+Ub4A - AAAASUVORK5CYII= - - - - Magenta - - - 24, 24 - - - Export png - - - 0, 0 - - - 209, 27 - - - 0 - - - ToolStrip2 - - - ToolStripTopRight - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerTop.Panel2 - - - 1 - - - SplitContainerTop.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerTop - - - 1 - - - 314, 100 - - - 101 - - - 0 - - - SplitContainerTop - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerDashboard.Panel1 - - - 0 - - - SplitContainerDashboard.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerDashboard - - - 0 - - - Fill - - - 0, 0 - - - Fill - - - 0, 27 - - - 101, 47 - - - 1 - - - ChartBottomLeft - - - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerBottom.Panel1 - - - 0 - - - 955, 95 - - - Magenta - - - 24, 24 - - - Export to pdf - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAYwSURBVFhHxZfZU1NXHMcZXzrT9771H+tDH/rQl04XtaO0 - LtWqrSguFVtBCJtAgkAgIMq+hYRFFpGt7MgSCIQAIQmQ3CTffn8n91KQq+ODpcx85iT3HvL9nN8595y5 - Kdmlzfg/SElJ+YScUgIRLfFB7GvxI+wJ0RhJtrsRIq3xWaEdENa5mVkqAp8piQ8ReDtUtSo0zjBBQiXk - aKiEHQ4O7yf59vIDEficfHpEoKax+wjVxF7X+dEI7UcVX3x39d0Cbi+O0LUOdJMeH9C3AQyS135gZBMY - 20zg780YJrdimNoWNNXKd7ku96Wf9C+qcScF9kwF4gcCnQx1EaN1r/0r8ZIS/RQYIsP84VEGjDNogoES - OkkBFU7kutwfZviQEnAxPILQ7jsqIPMqAs5VhhPV6iJdlBCBXgoMMPwVGfEnMOZnEMO25icQ66kBXuQj - 5nZga25cXZf7w+wnwk+qXQjuRhTHBIwFJnPezmChQ0dEXHoVeskAORDgKCUck61AaBLANhBkO9qIrdkx - JSD9pH+hLrBjJqAeJy2mBFo9QOsKYdvOVknoU9FD+kSAlXi9EccoAzQZuQoP63BuAoPQnHZ1f4j9pH+h - o1OFmwvoj5MINC3jgGaRIW2GBBGJfkoMrscpoamyq5EjSDhU8B9BoeosDPs0hsdV1UQgEI4gYCZgbB4i - UL8IRcMS0EhEQmhjNWRtiESvkpCRsQLuKo54lKG8iTdkHFhqhtZepu4PsJ/0L6hyUmBfYS7AjcJBgecM - f77AgQkiQwmRadIlnKRLKuFNcDpi8E2NcZnXAutuIDoELDTS0ArfxAglY+hlP+lfUCUVoEDITEDfvRwN - XajhIIRqva2liEjV6RWRKREJ12oC3V6OzhvDOsM0Z7kqu4x8fWIYL3m9ZzUON/tJf6nANsO3QntmAskt - UwQq56CoIo75JDWUEBGpiFSjhRLtpHMlwYA4ulcZxkCRkVa+y3W5LwtZpjC/soMCewpTAdmrRcA+C1QI - M4Bd0GWqjIrItBBZpK2kgz/e4UkwjIGeOFxsnfzexutSLekn/UVARm9agZAhUO/GU4YextIfQrpjEjdK - BpDXMgWHiBjrg6iFypAWXUjaZn26Gnhf1tMzkmenQHCXArsmAjyhZI921HeheAoHZPeFcDO/HWubYcz7 - w2h0zyK3ZRqVs3FUUsRYJ88YVEfu1Uzjm7RaXMoZQslYRIlWk0pOoyGwSUwEkoeEVKCIG9sTktm9g6sW - F+a8QYSiCaxwnw9EErheMozstgWUsTrl/OEKTk8tJS7ldMHSOovBxShcs1GkPu5F9lBETWE5ybW3q/DN - HTMBhstBUdk8gEKGZzj9+D3PiUVfmNOTwLwvioJmL3LqVpH3bEVJWHq3YZvmNE3HcS6jFZYXy1gOx9E/ - p8HSEEB5dxhnMl3IGY7CStm8iqSA30wgyHDZp8sbXuJOvUeFT66GsR6I89lNYHuPB1VPABZuBlmsZyaH - fTG7Gw+7tnD6Wg2s/TuY47nQP63htmMb10p9+NnqxXnrBr6824c/X0VUBSTcHwibCDBcsNe58VtuBwZn - tjHt1xRrQUpQoHMiDEvtkhLI4CNxr2wC5x85UeAKYmwtBueEhqxarpkKP65Q4HKJF+dyVvBV5jy+vutC - LiuwsRPGRiB0XMA4JGzVLRia28OIR8PEUlLAs8PdLhTHzLKG4vo1PKx4g4zKGaTbxpFWPI7UvzpgZ7mz - 6pLhMnoJTy1YwY+5y/g+axE/PFpGevZThr9DQA4IwVbdhL43u4qRBQ1ji/uYo8wb7nhNoyHkOzxK4H7l - LNKezuJG4Qiu5fXizP02pFrXcN3O0duSAufzPTibs4Sz2Us4/WgJ6Y/fK5A8JKxVTbiYXoTUm0/w060i - XLxTjAt3SnDhrpXYcOmeDVf+KMXlB4TtL+QKP/+aQR7aFOk5ZWq0tw9x63Ep0rJEIISNbTMB/ZRSG4UJ - 8uj4OX8KGYVq+WMKGZWBce0QDPTpyHcfOS7AQ0L26LdDk8EGSYH3Bh4KUaFGa6D3OSZgHBL/uYDOMQHj - kDgscJiPNQXvFzAJPbEKyLuavC7JjZPiQIB/8pYqL4py4SRJvpzy75T+QWxOEmamnPoHWoE6fcw+Ub4A - AAAASUVORK5CYII= - - - - Magenta - - - 24, 24 - - - Export png - - - 0, 0 - - - 101, 27 - - - 0 - - - ToolStrip4 - - - ToolStripBottomLeft - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerBottom.Panel1 - - - 1 - - - SplitContainerBottom.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerBottom - - - 0 - - - Fill - - - 0, 27 - - - 209, 47 - - - 1 - - - ChartBottomRight - - - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerBottom.Panel2 - - - 0 - - - 1117, 95 - - - Magenta - - - 24, 24 - - - Export to pdf - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAYwSURBVFhHxZfZU1NXHMcZXzrT9771H+tDH/rQl04XtaO0 - LtWqrSguFVtBCJtAgkAgIMq+hYRFFpGt7MgSCIQAIQmQ3CTffn8n91KQq+ODpcx85iT3HvL9nN8595y5 - Kdmlzfg/SElJ+YScUgIRLfFB7GvxI+wJ0RhJtrsRIq3xWaEdENa5mVkqAp8piQ8ReDtUtSo0zjBBQiXk - aKiEHQ4O7yf59vIDEficfHpEoKax+wjVxF7X+dEI7UcVX3x39d0Cbi+O0LUOdJMeH9C3AQyS135gZBMY - 20zg780YJrdimNoWNNXKd7ku96Wf9C+qcScF9kwF4gcCnQx1EaN1r/0r8ZIS/RQYIsP84VEGjDNogoES - OkkBFU7kutwfZviQEnAxPILQ7jsqIPMqAs5VhhPV6iJdlBCBXgoMMPwVGfEnMOZnEMO25icQ66kBXuQj - 5nZga25cXZf7w+wnwk+qXQjuRhTHBIwFJnPezmChQ0dEXHoVeskAORDgKCUck61AaBLANhBkO9qIrdkx - JSD9pH+hLrBjJqAeJy2mBFo9QOsKYdvOVknoU9FD+kSAlXi9EccoAzQZuQoP63BuAoPQnHZ1f4j9pH+h - o1OFmwvoj5MINC3jgGaRIW2GBBGJfkoMrscpoamyq5EjSDhU8B9BoeosDPs0hsdV1UQgEI4gYCZgbB4i - UL8IRcMS0EhEQmhjNWRtiESvkpCRsQLuKo54lKG8iTdkHFhqhtZepu4PsJ/0L6hyUmBfYS7AjcJBgecM - f77AgQkiQwmRadIlnKRLKuFNcDpi8E2NcZnXAutuIDoELDTS0ArfxAglY+hlP+lfUCUVoEDITEDfvRwN - XajhIIRqva2liEjV6RWRKREJ12oC3V6OzhvDOsM0Z7kqu4x8fWIYL3m9ZzUON/tJf6nANsO3QntmAskt - UwQq56CoIo75JDWUEBGpiFSjhRLtpHMlwYA4ulcZxkCRkVa+y3W5LwtZpjC/soMCewpTAdmrRcA+C1QI - M4Bd0GWqjIrItBBZpK2kgz/e4UkwjIGeOFxsnfzexutSLekn/UVARm9agZAhUO/GU4YextIfQrpjEjdK - BpDXMgWHiBjrg6iFypAWXUjaZn26Gnhf1tMzkmenQHCXArsmAjyhZI921HeheAoHZPeFcDO/HWubYcz7 - w2h0zyK3ZRqVs3FUUsRYJ88YVEfu1Uzjm7RaXMoZQslYRIlWk0pOoyGwSUwEkoeEVKCIG9sTktm9g6sW - F+a8QYSiCaxwnw9EErheMozstgWUsTrl/OEKTk8tJS7ldMHSOovBxShcs1GkPu5F9lBETWE5ybW3q/DN - HTMBhstBUdk8gEKGZzj9+D3PiUVfmNOTwLwvioJmL3LqVpH3bEVJWHq3YZvmNE3HcS6jFZYXy1gOx9E/ - p8HSEEB5dxhnMl3IGY7CStm8iqSA30wgyHDZp8sbXuJOvUeFT66GsR6I89lNYHuPB1VPABZuBlmsZyaH - fTG7Gw+7tnD6Wg2s/TuY47nQP63htmMb10p9+NnqxXnrBr6824c/X0VUBSTcHwibCDBcsNe58VtuBwZn - tjHt1xRrQUpQoHMiDEvtkhLI4CNxr2wC5x85UeAKYmwtBueEhqxarpkKP65Q4HKJF+dyVvBV5jy+vutC - LiuwsRPGRiB0XMA4JGzVLRia28OIR8PEUlLAs8PdLhTHzLKG4vo1PKx4g4zKGaTbxpFWPI7UvzpgZ7mz - 6pLhMnoJTy1YwY+5y/g+axE/PFpGevZThr9DQA4IwVbdhL43u4qRBQ1ji/uYo8wb7nhNoyHkOzxK4H7l - LNKezuJG4Qiu5fXizP02pFrXcN3O0duSAufzPTibs4Sz2Us4/WgJ6Y/fK5A8JKxVTbiYXoTUm0/w060i - XLxTjAt3SnDhrpXYcOmeDVf+KMXlB4TtL+QKP/+aQR7aFOk5ZWq0tw9x63Ep0rJEIISNbTMB/ZRSG4UJ - 8uj4OX8KGYVq+WMKGZWBce0QDPTpyHcfOS7AQ0L26LdDk8EGSYH3Bh4KUaFGa6D3OSZgHBL/uYDOMQHj - kDgscJiPNQXvFzAJPbEKyLuavC7JjZPiQIB/8pYqL4py4SRJvpzy75T+QWxOEmamnPoHWoE6fcw+Ub4A - AAAASUVORK5CYII= - - - - Magenta - - - 24, 24 - - - Export png - - - 0, 0 - - - 209, 27 - - - 0 - - - ToolStrip3 - - - ToolStripBottomRight - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerBottom.Panel2 - - - 1 - - - SplitContainerBottom.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerBottom - - - 1 - - - 314, 74 - - - 101 - - - 0 - - - SplitContainerBottom - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerDashboard.Panel2 - - - 0 - - - SplitContainerDashboard.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerDashboard - - - 1 - - - 314, 178 - - - 100 - - - 7 - - - False - - - SplitContainerDashboard - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - 770, 17 @@ -659,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAARwBBgEcAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATwBBgE8AQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -713,88 +179,9 @@ 597, 17 - 392, 95 + 1347, 56 - - 269, 26 - - - Validierung für Gruppe/Profil starten - - - 269, 26 - - - Validierung für Datei starten - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y - 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb - mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N - CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO - RK5CYII= - - - - 269, 26 - - - Metadaten Datei anzeigen - - - False - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA - qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg - 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY - AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC - - - - 269, 26 - - - Massenabschluss markierte Dateien - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF - RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF - ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d - C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3 - AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg== - - - - 269, 26 - - - Lösche alle Filter - - - 269, 26 - - - Layout zurücksetzen - - - 269, 26 - - - Layout speichern - + 270, 198 @@ -804,12 +191,17 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + - 256, 30 + 201, 27 - 631, 241 + 1146, 333 + 8 @@ -826,19 +218,19 @@ Panel1 - 1 + 0 - 17, 134 + 138, 95 - 171, 134 + 292, 95 - 87, 24 + 104, 24 - von {0} Dateien + von {0} Vorgängen Die Gesamtanzahl der Elemente. @@ -902,9 +294,6 @@ False - - Segoe UI, 9pt - 50, 23 @@ -956,10 +345,10 @@ Letzte verschieben - 233, 0 + 201, 0 - 1114, 27 + 1146, 27 9 @@ -977,7 +366,7 @@ Panel1 - 2 + 1 weitere Profile @@ -1032,14 +421,8 @@ - 541, 95 + 17, 95 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -1164,60 +547,16 @@ BRnoEWzCm9O8ZqfHCoxJ/b1MItPA4Iub48nzt8k3KKMWusaDqO0Yt7BJHtbkuinWVPJgAlIEd8Y/mSYr LEnkpvBLIlchUZjkq0gQJvr8nXia6B1PP3jF1Y0cv9CVdYF8lvM7mU/45cBl4bX5Nz7+j/Ac/ADiT3LO Xv4z4j/shDt4Td40rMN6rCsG+FAnbxPtIKL/EXL5C4aQjGB1h9mhAAAAAElFTkSuQmCC - - - - Dashboard - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhck9mUGllO7hVPVUAAAf4SURB - VFhHvZdZUFTZGcfJOJuzZalJHvOQhzwklap5sSqjJpWlMknGiZPggqIzUUZFZBPBEQFZZbMBAUFFEGVr - oIVmaWj2RRRkRxih2USWQaCh6WZv1n/Od+69dI/LVMxDqPrV953z3f7+/3PvuQsW4t9rjC2vwOv/I2+I - UE59fsCweC1Z2VKVmtuG7yOFyHkBSoqtSCaULycpW6KFk6horBZNWGxJvNOM//dfnLweTJvOhsXrNxWC - gZWVdSyvrIlIOUVzhLrR7BjKjSw3Los1Fr+PjY0NXEt9QAbe5AbiM5uwwQyYC7wILsKjAJ9/pvnSC+LS - 8qo4priKdWbgqrmBG+mNzBXEprQSYTUcEjOPrIFUE5qLGAURLmYUx3xOjDQn1shAbHIdGXiLDLwRJ28Q - DDzT3JQL85vNxfqiGElgkc3TeFEUXJTmNnOBBTKwvoErSbUmA9fT6rkB+qGRIQkIKxFy+rGwEtGE1JzX - nheSWCCWhLhIkUEGom7fMxmg60EGyL3QUBDSj46jW3EH9f7+qLC1RcXxY6j380Nnmhy6oRGTACGKUFRU - +SJCsQ/hmXsRlmEJWbol0sq8WG0F84srWGMGIhNryMDbZODN2JQ6vjPNXT8uKUWjjze646/jaZEKhqY6 - DuWauGt44OGB7uwczLGGXJyaiyv0TfgrhqdLMKQrxqCuiKGGa+ROVl/hx3MDN++aDMQk1/KNwRvNLaFZ - Fob2cBkmilXQV5VgqigX2jwFR8dyfXUxxovy0RIaAu8btdDPLbOVrfLVER7X/oyO0QSUadwYrnj4bRwc - Ln3Ma2RgdW0DEfHVZGArGXgrml0Pui60ikcpqWiXhWKqVAVtbgbGM5MxoUjCuCKZ51J8cicdTZ0jCM9o - Q1RmK28s4Rb1ezQNRaPwG3sUdJxC4+Bl2AZuw9zCCma5gXWE3TAzEJUoGNA+HsR9V1d8q0jDuDwRT1Pj - McZ4mpqAsRQhJ3oTb0DdNISafgNym5/CIbwS7b1aLj7LRJxk21HbHwJlqw2yW47iXl8gbHw/4jWCDMiu - V5oMRN6s4delIykFHWEhGEtLwOitWIwmMm5dFaKIJi4GeQ8GUN6jh6JlAjntWsgy2xApb+bNZxgng7ah - UuON9AZryBsOolzjiS+8fsNrxMrqOkKvVZCBd8jA2xEJd7mBShdX9EZdwkjcZYxcf57OKxHIuteHoi4d - UhrHNrla0gdrj3zMzAsCVRc+g3FYjYXu2xzjUCFKv/4EBlYnlpmBkNhyk4Fwdj3W2MYoOGCNPt+zGAhw - x1BUMIajQzbpC/ZCas1jqB5NIrFulHOTEVU1jPDSAXxiJ4dWvwTD3AoT+wsWOhMw2xCA2Xp/LDyKh9rl - D7zGDbCnbXBMGRl4lwxsDYur4jszf58VNG4n0eN6Aj0s9l9wwUDgeTy55INen7PIfqjF1bvDiK4cwqWy - QQSoB+Cn7odvXi/+dDwFkzNL0M8vc7H5jljM1F7gzD+MQb79dna3rHDIQGB0qclAcGwZvy5Fx0+i1f4o - epy/Qjdx2oZBuQ0eHt3Lxb3z++CtMoONXW63YLdzBqZnlzE9s8zEdmCuOQKG6nOcuaYwKI9v47XpWSN/ - svpeLiYD73EDgVdKuav6yBjc/+pLaByPPEfbl5aIqRqCZ27vcxyVVeJ8VMWmgPLENszUBUFf6oLp0tOY - uR+AzCMfQTdjZMcY2cNuDT7h6k0D71xkp4MMDHd0Q221H23HrKE59QU09gJdjLbDnyOqchDuOd1wV/aw - yGDRMakNf3fMRDW7LXXMAImQmKHaC7pCO+hUdjBUekB+6Ne8RtAD70IYN/A+N+AfWcxet+v8FNYEy1B+ - YC++sbVGl90hdJ0krNF68DNcLn+Cs1ndcMvSMLrhkv4I//RQwTFIvdlcZzAijYnpS9wwlWODSaUNpovO - IGX/LzFlWGIIBrzCCjcNvOtHBtg3AJ0e7eQs1PbOKLH8HC1H9qHT9iA6TxxAi9UuvtvPKLo4tvFN2PV1 - DvY4ZWB4bJY3lgRITKdywKTiMLSZhzGVZ4dblr/AJLtLJtkx9Nj2DFWZDPhEFPGNQe5pFRPMRJVfEJSf - foqKPbvRcMgSjXv/hou53fh3dC12exZgp00STvmpMDI+hylqrBcMTLIet0lMeQxauRUm0vZjMtsGCbt/ - zm9TOm6ODIRwAx+Qgfe82YagjWG+Cor9je2o9AtG5j/+heTf/RG/2hWF31rFwSlQjYr6J0zYyAX5yjYx - ItV5P4J3/gwhO36K4B0fImj7h0h22MMNEPTIPh+cbzLgJSvkr2ESlk6TsCqhoXlzQvudOaHpy1nkcUIc - U6RHtnsQN/BDMvC+p6yAbwyp2X/fXGJRFJCiKZ/gUcqFMT2uzwXmmhkILeAfE1JDqYn0o2fnTWPz5t/N - x4npJSGyOYoTNJ4WDJy9yA38iBvwCMnnXysvEjM1fVlOkcTMEMeSoPkcoWfvA7eAnE0DH9D1oJ1pai42 - FpvwKDWlKNaEhmYiZnNjYj6mY5jVKKf3hZu/0nQGzgXl8S8V6YOBw8bS+1vCwOMyi8vs1StgEKGm9GnG - ozk0xzFyplk+zeIZP5OBrU5e8ruu/jlwZa4EstkB2XBhB7n4ZcHFl+GThdM+d+BMeDMuKODkrYAji4SD - V6aAZwbsPYh02LP8FIuc8+mwI9zlHJvTCfeYNn8b0r/m9GlE9yTtSoKcvQo/fgV+wqDfMHGLLf8BKVH4 - p8+ug0MAAAAASUVORK5CYII= 0, 0 - 233 + 201 - 233, 360 + 201, 360 5 @@ -1235,7 +574,7 @@ Panel1 - 3 + 2 Fill @@ -1264,24 +603,98 @@ 3 + + 269, 26 + + + Validierung für Gruppe/Profil starten + + + 269, 26 + + + Validierung für Datei starten + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y + 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb + mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N + CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO + RK5CYII= + + + + 269, 26 + + + Metadaten Datei anzeigen + + + False + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA + qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg + 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY + AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC + + + + 269, 26 + + + Massenabschluss markierte Dateien + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF + RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF + ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d + C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3 + AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg== + + + + 269, 26 + + + Lösche alle Filter + + + 269, 26 + + + Layout zurücksetzen + + + 269, 26 + + + Layout speichern + + + 219, 26 + + + Starte Validierung für Profil + 908, 17 - 519, 134 + 640, 95 - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 234, 22 - - - Monitor anzeigen - 235, 48 @@ -1463,35 +876,47 @@ True + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 234, 22 + + + Monitor anzeigen + 1023, 17 - 17, 56 + 1146, 17 - 213, 56 + 17, 56 - 403, 56 + 207, 56 - 666, 56 + 470, 56 - 923, 56 + 727, 56 - 17, 95 + 972, 56 - 257, 95 + 1212, 56 - 305, 134 + 426, 95 - 420, 134 + 541, 95 Aktualisieren @@ -1783,20 +1208,39 @@ Sync in Progress - - 0, 0 - - - Allgemein + + Dashboard Invoice - - Funktionen + + Öffnet das Dashboard - - Verwaltung + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iR2F1Z2VTdHls + ZUhhbGZDaXJjdWxhciI+DQogICAgPHBhdGggZD0iTTIzLjcsMTEuN2wtNiw2YzAuMiwwLjQsMC4zLDAu + OCwwLjMsMS4zYzAsMS43LTEuMywzLTMsM3MtMy0xLjMtMy0zczEuMy0zLDMtM2MwLjUsMCwwLjksMC4x + LDEuMywwLjNsNi02ICAgTDIzLjcsMTEuN3ogTTMwLDE5djdIMHYtN0MwLDEwLjcsNi43LDQsMTUsNFMz + MCwxMC43LDMwLDE5eiBNMjgsMTljMC03LjItNS44LTEzLTEzLTEzUzIsMTEuOCwyLDE5djVoMjZWMTl6 + IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE1LDhDOC45LDgsNCwxMi45LDQsMTl2M2g0 + di0zYzAtMy45LDMuMS03LDctN2MwLjgsMCwxLjYsMC4xLDIuMywwLjRsMy0zQzE4LjgsOC41LDE2Ljks + OCwxNSw4eiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTI0LjYsMTMuNmwtMywzYzAuMyww + LjcsMC40LDEuNSwwLjQsMi40djNoNHYtM0MyNiwxNywyNS41LDE1LjIsMjQuNiwxMy42eiIgY2xhc3M9 + IlJlZCIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + - - Grundeinstellungen + + 0, 0 Funktionen @@ -1834,26 +1278,32 @@ 5 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + RibbonPage2 - 701, 134 + 822, 95 - 853, 134 - - - 946, 134 + 974, 95 - - PDF Files (*.pdf*)|*.pdf - - 1083, 134 + 1067, 95 - 1203, 134 + 1187, 95 Top @@ -2129,54 +1579,6 @@ 4565465 - - ToolStripButton1 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton5 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton2 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton6 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton3 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton7 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton4 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButton8 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ImageListProfile @@ -2357,12 +1759,6 @@ DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - NavBarItemDashboard - - - DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - NotifyIcon1 @@ -2543,6 +1939,12 @@ DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bbtnItemDashboard + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -2591,12 +1993,6 @@ System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - SaveFileDialog1 - - - System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - bwBasicData @@ -3193,6 +2589,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -3205,9 +2604,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index fc6a40c..e1f8fbc 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -167,12 +167,12 @@ Public Class frmMain If SHOW_CHARTS = True Then If BASEDATA_DT_CHARTS.Rows.Count = 0 Then - NavBarItemDashboard.Visible = False + bbtnItemDashboard.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Else - NavBarItemDashboard.Visible = True + bbtnItemDashboard.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End If Else - NavBarItemDashboard.Visible = False + bbtnItemDashboard.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If Catch ex As Exception @@ -449,136 +449,11 @@ Public Class frmMain Sub Layout_Single_Profile() If GridControl_Docs.Visible = False Then BindingNavigator1.Visible = True - BindingNavigator1.Dock = DockStyle.Top GridControl_Docs.Visible = True - GridControl_Docs.Dock = DockStyle.Fill - SplitContainerDashboard.Visible = False - SplitContainerDashboard.Dock = DockStyle.None End If End Sub - Sub Layout_Dashboard() - Try - - If GridControl_Docs.Visible = True Then - BindingNavigator1.Dock = DockStyle.None - BindingNavigator1.Visible = False - - - GridControl_Docs.Dock = DockStyle.None - GridControl_Docs.Visible = False - Dim groupCount As Integer - Dim charts As List(Of ChartControl) - SplitContainerDashboard.Visible = True - Dim oGroups As DataRowCollection = BASEDATA_DT_CHARTS.Rows - groupCount = oGroups.Count - Configure_Split_Containers(groupCount) - charts = New List(Of ChartControl) From {ChartTopLeft, ChartTopRight, ChartBottomLeft, ChartBottomRight} - If groupCount > 1 Then - LOGGER.Debug($"ChartCreating...Found more than one charts [{groupCount}]") - For Each gRow As DataRow In oGroups - Dim oGroupIndex As Integer = oGroups.IndexOf(gRow) - Dim oGroupID As String = gRow.Item("GROUP_ID") - - Dim groupCharts = BASEDATA_DT_CHARTS.Select(String.Format("GROUP_ID = '{0}'", oGroupID)) - Dim chart As ChartControl - - For Each cRow As DataRow In groupCharts - - Dim oChartType = cRow.Item("TYPE_CHART") - LOGGER.Debug($"oChartType [{oChartType}]") - Dim oChartTitle = cRow.Item("TITLE") - LOGGER.Debug($"oChartTitle [{oChartTitle}]") - Dim guid = cRow.Item("GUID") - LOGGER.Debug($"guid [{guid}]") - Dim oChartValue = cRow.Item("VALUE") - Dim oChartArgument = cRow.Item("ARGUMENT") - Dim oSqlchart = cRow.Item("SQL_COMMAND") - oSqlchart = oSqlchart.Replace("@USER", USER_USERNAME) - Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(oSqlchart) - - Dim series As Series = Create_Series(oChartTitle, oChartType) - - ' Select Current Chart - chart = Select_Chart(oGroupIndex) - chart = charts.Item(oGroupIndex) - Try - chart.Series.Clear() - Catch ex As Exception - LOGGER.Error(ex) - - End Try - ' Set DataSource - chart.DataSource = DATA_DT - - ' Set shown Columns for Chart - series.ArgumentDataMember = oChartArgument - series.ValueDataMembers.AddRange(New String() {oChartValue}) - - 'set some options - chart.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True - - ' Show Data - chart.Series.Add(series) - - Next ' End Charts - Next 'End Groups - Else - ' Create Charts - For Each cRow As DataRow In BASEDATA_DT_CHARTS.Rows - - Dim chart As ChartControl - - Dim chartIndex As Integer = BASEDATA_DT_CHARTS.Rows.IndexOf(cRow) - - Dim oChartType = cRow.Item("TYPE_CHART") - Dim oChartTitle = cRow.Item("TITLE") - Dim guid = cRow.Item("GUID") - Dim oChartValue = cRow.Item("VALUE") - Dim oChartArgument = cRow.Item("ARGUMENT") - Dim oSqlchart = cRow.Item("SQL_COMMAND") - - oSqlchart = clsPatterns.ReplaceInternalValues(oSqlchart) - oSqlchart = clsPatterns.ReplaceUserValues(oSqlchart, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - - oSqlchart = oSqlchart.ToString.ToUpper.Replace("@USER_ID", USER_ID) - oSqlchart = oSqlchart.ToString.ToUpper.Replace("@USER", USER_USERNAME) - Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(oSqlchart) - ' Create Series based on type - Dim series As Series = Create_Series(oChartTitle, oChartType) - - ' Select Current Chart - chart = Select_Chart(chartIndex) - Try - chart.Series.Clear() - Catch ex As Exception - LOGGER.Error(ex) - - End Try - ' Set DataSource - chart.DataSource = DATA_DT - - ' Set shown Columns for Chart - series.ArgumentDataMember = oChartArgument - series.ValueDataMembers.AddRange(New String() {oChartValue}) - - 'set some options - chart.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True - chart.OptionsPrint.SizeMode = Printing.PrintSizeMode.Stretch - - ' Show Data - chart.Series.Add(series) - - Next - End If - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Layout Dashboard - Error: " & ex.Message) - MsgBox("Unexpected Error in Layout Dashboard - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) - End Try - End Sub Private Function Create_Series(title As String, type As String) As Series Dim series As Series LOGGER.Debug($"In Create new series: type [{type}]") @@ -605,39 +480,8 @@ Public Class frmMain Return series End Function - Private Function Select_Chart(index As Integer) - Select Case index - Case 0 - Return ChartTopLeft - Case 1 - Return ChartTopRight - Case 2 - Return ChartBottomLeft - Case Else - Return ChartBottomRight - End Select - End Function - Private Sub Configure_Split_Containers(VisibleContainers As Integer) - Select Case VisibleContainers - Case 1 - ' Show only ChartTopLeft - SplitContainerTop.Panel2Collapsed = True - ' Collapse SplitContainerBottom - SplitContainerDashboard.Panel2Collapsed = True - Case 2 - ' Collapse SplitContainerBottom - SplitContainerDashboard.Panel2Collapsed = True - Case 3 - ' Collapse ChartBottomRight - SplitContainerBottom.Panel2Collapsed = True - ' Show SplitContainerBottom - SplitContainerDashboard.Panel2Collapsed = False - Case 4 - ' Show SplitContainerBottom - SplitContainerDashboard.Panel2Collapsed = False - End Select - SplitContainerDashboard.Dock = DockStyle.Fill - End Sub + + Sub Load_single_Profile() Try @@ -1334,7 +1178,6 @@ Public Class frmMain End Sub Sub Load_Grid_Overview() Dim oStopWatch As New RefreshHelper.SW("Load_Grid_Overview(LGO)") - SplitContainerDashboard.Visible = False Layout_Single_Profile() GRID_LOAD_TYPE = "OVERVIEW" CURRENT_CLICKED_PROFILE_ID = 0 @@ -1411,10 +1254,10 @@ Public Class frmMain End If BindingNavigator1.Visible = True - BindingNavigator1.Dock = DockStyle.Top + GridControl_Docs.Visible = True - GridControl_Docs.Dock = DockStyle.Fill + ' Spalte für Status Icon erstellen Dim columnStateIcon As New DataColumn() @@ -1523,9 +1366,9 @@ Public Class frmMain NO_WORKFLOWITEMS = True GridControl_Docs.Visible = False BindingNavigator1.Visible = False - BindingNavigator1.Dock = DockStyle.None + GridControl_Docs.DataSource = Nothing - GridControl_Docs.Dock = DockStyle.None + Try GridView_Docs.Columns.Clear() Catch ex As Exception @@ -1547,14 +1390,6 @@ Public Class frmMain End If End Sub - Private Sub NavBarItemDashboard_LinkClicked(sender As Object, e As NavBarLinkEventArgs) Handles NavBarItemDashboard.LinkClicked - If TimerRefresh.Enabled = True Then - TimerRefresh.Enabled = False - End If - Layout_Dashboard() - frmInvDashboard.Show() - End Sub - Private Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click Reset_GridLayout() @@ -1919,107 +1754,6 @@ Public Class frmMain 'BarEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub - Private Sub Panel1_Paint(sender As Object, e As PaintEventArgs) Handles Panel1.Paint - - End Sub - Sub ExportChart2Pdf(pMyChart As ChartControl, pFilePath As String) - Try - pMyChart.OptionsPrint.ImageFormat = DevExpress.XtraCharts.Printing.PrintImageFormat.Metafile - pMyChart.ExportToPdf(pFilePath, New DevExpress.XtraPrinting.PdfExportOptions With { - .ConvertImagesToJpeg = False - }) - ' Exports to a stream as PDF. - Dim pdfStream As FileStream = New FileStream(pFilePath, FileMode.Create) - pMyChart.ExportToPdf(pdfStream) - ' ... - pdfStream.Close() - Catch ex As Exception - LOGGER.Error(ex) - End Try - End Sub - Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click - SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportChart2Pdf(ChartTopLeft, SaveFileDialog1.FileName) - End If - End Sub - - Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click - SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportChart2Pdf(ChartTopRight, SaveFileDialog1.FileName) - End If - End Sub - - Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click - SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportChart2Pdf(ChartBottomLeft, SaveFileDialog1.FileName) - End If - End Sub - - Private Sub ToolStripButton4_Click(sender As Object, e As EventArgs) Handles ToolStripButton4.Click - SaveFileDialog1.Filter = "PDF Files (*.pdf*)|*.pdf" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportChart2Pdf(ChartBottomRight, SaveFileDialog1.FileName) - End If - End Sub - - Private Sub ToolStripButton5_Click(sender As Object, e As EventArgs) Handles ToolStripButton5.Click - SaveFileDialog1.Filter = "PNG Files(* .png *)|*.png" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportCharttoimage(ChartTopLeft, SaveFileDialog1.FileName) - End If - End Sub - Sub ExportCharttoimage(pMyChart As ChartControl, pFilePath As String) - Try - SaveChartImageToFile(pMyChart, ImageFormat.Png, pFilePath) - Dim image As Image = GetChartImage(pMyChart, ImageFormat.Png) - image.Save(pFilePath) - Catch ex As Exception - LOGGER.Error(ex) - End Try - - End Sub - Private Sub SaveChartImageToFile(ByVal chart As ChartControl, ByVal format As ImageFormat, ByVal fileName As String) - ' Create an image in the specified format from the chart - ' and save it to the specified path. - chart.ExportToImage(fileName, format) - End Sub - Private Function GetChartImage(ByVal chart As ChartControl, ByVal format As ImageFormat) As Image - ' Create an image. - Dim image As Image = Nothing - - ' Create an image of the chart. - Using s As New MemoryStream() - chart.ExportToImage(s, format) - image = System.Drawing.Image.FromStream(s) - End Using - - ' Return the image. - Return image - End Function - - Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles ToolStripButton6.Click - SaveFileDialog1.Filter = "PNG Files(* .png *)|*.png" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportCharttoimage(ChartTopRight, SaveFileDialog1.FileName) - End If - End Sub - - Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click - SaveFileDialog1.Filter = "PNG Files(* .png *)|*.png" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportCharttoimage(ChartBottomLeft, SaveFileDialog1.FileName) - End If - End Sub - - Private Sub ToolStripButton8_Click(sender As Object, e As EventArgs) Handles ToolStripButton8.Click - SaveFileDialog1.Filter = "PNG Files(* .png *)|*.png" - If SaveFileDialog1.ShowDialog = Windows.Forms.DialogResult.OK Then - ExportCharttoimage(ChartBottomRight, SaveFileDialog1.FileName) - End If - End Sub Private Sub Timer5Mins_Tick(sender As Object, e As EventArgs) Handles Timer5Mins.Tick If Not bwBasicData.IsBusy Then @@ -2063,4 +1797,12 @@ Public Class frmMain Private Sub bwBasicData_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles bwBasicData.ProgressChanged BarEditItem1.EditValue = e.ProgressPercentage End Sub + + Private Sub bbtnItemDashboard_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnItemDashboard.ItemClick + If Application.OpenForms().OfType(Of frmInvDashboard).Any Then + Exit Sub + End If + frmInvDashboard.Show() + + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index fd0df2e..f3b72f1 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -88,13 +88,13 @@ Partial Class frmValidator Me.bsiInfo1 = New DevExpress.XtraBars.BarStaticItem() Me.bsiInfo2 = New DevExpress.XtraBars.BarStaticItem() Me.BbtnItm = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -594,6 +594,12 @@ Partial Class frmValidator Me.BbtnItm.ImageOptions.LargeImage = CType(resources.GetObject("BbtnItm.ImageOptions.LargeImage"), System.Drawing.Image) Me.BbtnItm.Name = "BbtnItm" ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 17 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) @@ -617,7 +623,6 @@ Partial Class frmValidator Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniNext) Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniDelete) Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniAnnotation) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' @@ -645,12 +650,6 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'BarButtonItem2 - ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 17 - Me.BarButtonItem2.Name = "BarButtonItem2" - ' 'frmValidator ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 114ac26..c2f57a6 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -1440,6 +1440,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1470,12 +1476,6 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem2 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmValidator diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index b0bb80f..bbcb749 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1818,9 +1818,9 @@ Public Class frmValidator LOGGER.Warn($"File {oResult} not existing!") Return False End If - End If End If - WMDocPathWindows = oResult + End If + WMDocPathWindows = oResult OLD_Document_Path = WMDocPathWindows CURRENT_DOC_PATH = WMDocPathWindows LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") @@ -1891,8 +1891,8 @@ Public Class frmValidator Load_IDB_DOC_DATA() If IDB_DT_DOC_DATA.Rows.Count = 1 Then - LOGGER.Debug("Got one IDB DocData Result") - End If + LOGGER.Debug("Got one IDB DocData Result") + End If 'Beschriftung des Navigators 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" If WMDocPathWindows <> String.Empty Then @@ -1946,7 +1946,7 @@ Public Class frmValidator oLogString = $"PMProfile loaded: [{CURRENT_ProfilGUID}-{CURRENT_ProfilName}]" IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogString) - End If + End If activate_controls(True) Else errormessage = oErrorMessage @@ -2853,19 +2853,19 @@ Public Class frmValidator LOGGER.Debug($"oIndexType {oIndexType.ToString}") LOGGER.Debug("Now the final indexing...") - Dim oFIResult As Boolean = False - If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then - oFIResult = True - LOGGER.Debug("Final index IDB '" & oFinalIndexRow.Item("INDEXNAME") & "' was updated.") - End If + Dim oFIResult As Boolean = False + If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then + oFIResult = True + LOGGER.Debug("Final index IDB '" & oFinalIndexRow.Item("INDEXNAME") & "' was updated.") + End If - If oFIResult = False Then - errormessage = "Error in final indexing:" & vbNewLine & idxerr_message - My.Settings.Save() - frmError.ShowDialog() - oErrorOcurred = True - ItemWorked = False - End If + If oFIResult = False Then + errormessage = "Error in final indexing:" & vbNewLine & idxerr_message + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + ItemWorked = False + End If If oErrorOcurred = True Then ItemWorked = False @@ -3194,24 +3194,24 @@ Public Class frmValidator 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss Dim ZeilenGrid As Integer = 0 Dim myVektorArr As String() - 'Jeden Werte des Datagridviews durchlaufen - For Each value As String In lookup.SelectedValues - If value Is Nothing = False Then - 'Das Array anpassen - ReDim Preserve myVektorArr(ZeilenGrid) - 'Den Wert im Array speichern - myVektorArr(ZeilenGrid) = value - ZeilenGrid += 1 - End If + 'Jeden Werte des Datagridviews durchlaufen + For Each value As String In lookup.SelectedValues + If value Is Nothing = False Then + 'Das Array anpassen + ReDim Preserve myVektorArr(ZeilenGrid) + 'Den Wert im Array speichern + myVektorArr(ZeilenGrid) = value + ZeilenGrid += 1 + End If - Next - Dim oMyDT = DT_FOR_ARRAY(myVektorArr) + Next + Dim oMyDT = DT_FOR_ARRAY(myVektorArr) - If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then - oMissing = True - oErrorMessage = "Error while indexing IDB-Object LookupGrid" - Exit For - End If + If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then + oMissing = True + oErrorMessage = "Error while indexing IDB-Object LookupGrid" + Exit For + End If @@ -3269,17 +3269,17 @@ Public Class frmValidator End If - 'wenn Wert in Windream <> der Eingabe darf indexiert werden - 'IsNothing(oValueFromObject) Or oValueFromObject <> oMyInput - If (oValueIsIndifferent = True Or oValueSourceIsDifferent = True) Then - If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then - Exit For - End If - + 'wenn Wert in Windream <> der Eingabe darf indexiert werden + 'IsNothing(oValueFromObject) Or oValueFromObject <> oMyInput + If (oValueIsIndifferent = True Or oValueSourceIsDifferent = True) Then + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + Exit For End If End If + End If + End If Catch ex As Exception LOGGER.Error(ex) @@ -3485,17 +3485,17 @@ Public Class frmValidator oBoolValue = False Else If oObjectCheck.ToString = "System.Object[]" Then - If oObjectCheck.Length = 1 Then - _Value = oObjectCheck(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") - _Value = oObjectCheck(0) - End If - Else - _Value = oObjectCheck + If oObjectCheck.Length = 1 Then + _Value = oObjectCheck(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") + _Value = oObjectCheck(0) End If - oBoolValue = CBool(_Value) + Else + _Value = oObjectCheck End If + oBoolValue = CBool(_Value) + End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden @@ -3984,11 +3984,4 @@ Public Class frmValidator Dim Filename As String = String.Format($"DevExpressValidatorGridControl_{pProfilID}-{pControlID}.xml") Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function - - Private Sub BarButtonItem2_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick - Dim clswm As New clswindream - If Not IsNothing(clswm) Then - MsgBox("initialized") - End If - End Sub End Class \ No newline at end of file From b8cfb26e0bfe8504c7a4bb9cd43455ff702037da Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 10 Mar 2020 17:07:51 +0100 Subject: [PATCH 06/13] MS --- app/DD_PM_WINDREAM/frmAdministration.vb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 776198c..08f011c 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -128,12 +128,18 @@ Public Class frmAdministration End Sub Private Sub ObjekttypenEintragen() - Me.cmbObjekttypen.Items.Clear() - Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY" - Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) - For Each oROW As DataRow In oDT.Rows - Me.cmbObjekttypen.Items.Add(oROW.Item(1)) - Next + Try + Me.cmbObjekttypen.Items.Clear() + Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY" + Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + For Each oROW As DataRow In oDT.Rows + Me.cmbObjekttypen.Items.Add(oROW.Item(1)) + Next + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error ObjekttypenEintragen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + End Try + End Sub Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles btnWMSuche.Click From 6ac60fac92e02ba265da0614aaf9f4c65c608073 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 16 Mar 2020 14:25:10 +0100 Subject: [PATCH 07/13] MS --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/frmFormDesigner.vb | 5 - .../frmInvDashboard.Designer.vb | 762 +++++++++--------- app/DD_PM_WINDREAM/frmInvDashboard.vb | 13 +- app/DD_PM_WINDREAM/frmValidator.vb | 18 +- 5 files changed, 406 insertions(+), 394 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index df461c8..0649d40 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index fe4eedf..3728b39 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -285,11 +285,6 @@ Public Class frmFormDesigner Mouse_IsPressed = True CurrentControl = Nothing - Try - TBPM_PROFILE_CONTROLSBindingSource.Clear() - Catch ex As Exception - LOGGER.Error(ex) - End Try End Sub Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove, btnLine.MouseMove, btnButton.MouseMove diff --git a/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb b/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb index 7a1bed5..1f4350d 100644 --- a/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb +++ b/app/DD_PM_WINDREAM/frmInvDashboard.Designer.vb @@ -147,12 +147,50 @@ Partial Class frmInvDashboard Me.colAnzahl = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.colNettoSumme = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.CommandBarGalleryDropDown1 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.CreateBarBaseItem1 = New DevExpress.XtraCharts.UI.CreateBarBaseItem() + Me.CreateLineBaseItem1 = New DevExpress.XtraCharts.UI.CreateLineBaseItem() Me.CommandBarGalleryDropDown2 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CreatePieBaseItem1 = New DevExpress.XtraCharts.UI.CreatePieBaseItem() Me.CommandBarGalleryDropDown3 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CreateRotatedBarBaseItem1 = New DevExpress.XtraCharts.UI.CreateRotatedBarBaseItem() Me.CommandBarGalleryDropDown4 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CreateAreaBaseItem1 = New DevExpress.XtraCharts.UI.CreateAreaBaseItem() Me.CommandBarGalleryDropDown5 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.CreateOtherSeriesTypesBaseItem1 = New DevExpress.XtraCharts.UI.CreateOtherSeriesTypesBaseItem() Me.CommandBarGalleryDropDown6 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.ChangePaletteGalleryBaseItem1 = New DevExpress.XtraCharts.UI.ChangePaletteGalleryBaseItem() Me.CommandBarGalleryDropDown7 = New DevExpress.XtraBars.Commands.CommandBarGalleryDropDown(Me.components) + Me.ChangeAppearanceGalleryBaseItem1 = New DevExpress.XtraCharts.UI.ChangeAppearanceGalleryBaseItem() + Me.RunDesignerChartItem1 = New DevExpress.XtraCharts.UI.RunDesignerChartItem() + Me.SaveAsTemplateChartItem1 = New DevExpress.XtraCharts.UI.SaveAsTemplateChartItem() + Me.LoadTemplateChartItem1 = New DevExpress.XtraCharts.UI.LoadTemplateChartItem() + Me.PrintPreviewChartItem1 = New DevExpress.XtraCharts.UI.PrintPreviewChartItem() + Me.PrintChartItem1 = New DevExpress.XtraCharts.UI.PrintChartItem() + Me.CreateExportBaseItem1 = New DevExpress.XtraCharts.UI.CreateExportBaseItem() + Me.ExportToPDFChartItem1 = New DevExpress.XtraCharts.UI.ExportToPDFChartItem() + Me.ExportToHTMLChartItem1 = New DevExpress.XtraCharts.UI.ExportToHTMLChartItem() + Me.ExportToMHTChartItem1 = New DevExpress.XtraCharts.UI.ExportToMHTChartItem() + Me.ExportToXLSChartItem1 = New DevExpress.XtraCharts.UI.ExportToXLSChartItem() + Me.ExportToXLSXChartItem1 = New DevExpress.XtraCharts.UI.ExportToXLSXChartItem() + Me.ExportToRTFChartItem1 = New DevExpress.XtraCharts.UI.ExportToRTFChartItem() + Me.CreateExportToImageBaseItem1 = New DevExpress.XtraCharts.UI.CreateExportToImageBaseItem() + Me.ExportToBMPChartItem1 = New DevExpress.XtraCharts.UI.ExportToBMPChartItem() + Me.ExportToGIFChartItem1 = New DevExpress.XtraCharts.UI.ExportToGIFChartItem() + Me.ExportToJPEGChartItem1 = New DevExpress.XtraCharts.UI.ExportToJPEGChartItem() + Me.ExportToPNGChartItem1 = New DevExpress.XtraCharts.UI.ExportToPNGChartItem() + Me.ExportToTIFFChartItem1 = New DevExpress.XtraCharts.UI.ExportToTIFFChartItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() + Me.ChartRibbonPageCategory1 = New DevExpress.XtraCharts.UI.ChartRibbonPageCategory() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() @@ -188,45 +226,8 @@ Partial Class frmInvDashboard Me.ChartTypeRibbonPageGroup1 = New DevExpress.XtraCharts.UI.ChartTypeRibbonPageGroup() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.Panel2 = New System.Windows.Forms.Panel() - Me.ChartRibbonPageCategory1 = New DevExpress.XtraCharts.UI.ChartRibbonPageCategory() - Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() - Me.CreateBarBaseItem1 = New DevExpress.XtraCharts.UI.CreateBarBaseItem() - Me.CreateLineBaseItem1 = New DevExpress.XtraCharts.UI.CreateLineBaseItem() - Me.CreatePieBaseItem1 = New DevExpress.XtraCharts.UI.CreatePieBaseItem() - Me.CreateRotatedBarBaseItem1 = New DevExpress.XtraCharts.UI.CreateRotatedBarBaseItem() - Me.CreateAreaBaseItem1 = New DevExpress.XtraCharts.UI.CreateAreaBaseItem() - Me.CreateOtherSeriesTypesBaseItem1 = New DevExpress.XtraCharts.UI.CreateOtherSeriesTypesBaseItem() - Me.ChangePaletteGalleryBaseItem1 = New DevExpress.XtraCharts.UI.ChangePaletteGalleryBaseItem() - Me.ChangeAppearanceGalleryBaseItem1 = New DevExpress.XtraCharts.UI.ChangeAppearanceGalleryBaseItem() - Me.RunDesignerChartItem1 = New DevExpress.XtraCharts.UI.RunDesignerChartItem() - Me.SaveAsTemplateChartItem1 = New DevExpress.XtraCharts.UI.SaveAsTemplateChartItem() - Me.LoadTemplateChartItem1 = New DevExpress.XtraCharts.UI.LoadTemplateChartItem() - Me.PrintPreviewChartItem1 = New DevExpress.XtraCharts.UI.PrintPreviewChartItem() - Me.PrintChartItem1 = New DevExpress.XtraCharts.UI.PrintChartItem() - Me.CreateExportBaseItem1 = New DevExpress.XtraCharts.UI.CreateExportBaseItem() - Me.ExportToPDFChartItem1 = New DevExpress.XtraCharts.UI.ExportToPDFChartItem() - Me.ExportToHTMLChartItem1 = New DevExpress.XtraCharts.UI.ExportToHTMLChartItem() - Me.ExportToMHTChartItem1 = New DevExpress.XtraCharts.UI.ExportToMHTChartItem() - Me.ExportToXLSChartItem1 = New DevExpress.XtraCharts.UI.ExportToXLSChartItem() - Me.ExportToXLSXChartItem1 = New DevExpress.XtraCharts.UI.ExportToXLSXChartItem() - Me.ExportToRTFChartItem1 = New DevExpress.XtraCharts.UI.ExportToRTFChartItem() - Me.ExportToBMPChartItem1 = New DevExpress.XtraCharts.UI.ExportToBMPChartItem() - Me.ExportToGIFChartItem1 = New DevExpress.XtraCharts.UI.ExportToGIFChartItem() - Me.ExportToJPEGChartItem1 = New DevExpress.XtraCharts.UI.ExportToJPEGChartItem() - Me.ExportToPNGChartItem1 = New DevExpress.XtraCharts.UI.ExportToPNGChartItem() - Me.ExportToTIFFChartItem1 = New DevExpress.XtraCharts.UI.ExportToTIFFChartItem() - Me.CreateExportToImageBaseItem1 = New DevExpress.XtraCharts.UI.CreateExportToImageBaseItem() - Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() CType(Me.CommandBarGalleryDropDown1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CommandBarGalleryDropDown2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CommandBarGalleryDropDown3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CommandBarGalleryDropDown4, System.ComponentModel.ISupportInitialize).BeginInit() @@ -260,7 +261,6 @@ Partial Class frmInvDashboard CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.SuspendLayout() Me.Panel2.SuspendLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'colTitle @@ -446,6 +446,58 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown1.Name = "CommandBarGalleryDropDown1" Me.CommandBarGalleryDropDown1.Ribbon = Me.RibbonControl1 ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.CreateBarBaseItem1, Me.CreateLineBaseItem1, Me.CreatePieBaseItem1, Me.CreateRotatedBarBaseItem1, Me.CreateAreaBaseItem1, Me.CreateOtherSeriesTypesBaseItem1, Me.ChangePaletteGalleryBaseItem1, Me.ChangeAppearanceGalleryBaseItem1, Me.RunDesignerChartItem1, Me.SaveAsTemplateChartItem1, Me.LoadTemplateChartItem1, Me.PrintPreviewChartItem1, Me.PrintChartItem1, Me.CreateExportBaseItem1, Me.ExportToPDFChartItem1, Me.ExportToHTMLChartItem1, Me.ExportToMHTChartItem1, Me.ExportToXLSChartItem1, Me.ExportToXLSXChartItem1, Me.ExportToRTFChartItem1, Me.ExportToBMPChartItem1, Me.ExportToGIFChartItem1, Me.ExportToJPEGChartItem1, Me.ExportToPNGChartItem1, Me.ExportToTIFFChartItem1, Me.CreateExportToImageBaseItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 33 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.ChartRibbonPageCategory1}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) + Me.RibbonControl1.Size = New System.Drawing.Size(1124, 146) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Export als PDF" + Me.BarButtonItem1.Hint = "Export den ausgewählten Chart als PDF" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Export als Bild" + Me.BarButtonItem2.Hint = "Exportiert den ausgewählten Chart als Bild" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Export Verteilung als PDF" + Me.BarButtonItem3.Hint = "Exportiert das Dashboard als PDF" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'CreateBarBaseItem1 + ' + Me.CreateBarBaseItem1.Caption = "Spalte" + Me.CreateBarBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown1 + Me.CreateBarBaseItem1.Enabled = False + Me.CreateBarBaseItem1.Id = 4 + Me.CreateBarBaseItem1.Name = "CreateBarBaseItem1" + ' + 'CreateLineBaseItem1 + ' + Me.CreateLineBaseItem1.Caption = "Linie" + Me.CreateLineBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown2 + Me.CreateLineBaseItem1.Enabled = False + Me.CreateLineBaseItem1.Id = 5 + Me.CreateLineBaseItem1.Name = "CreateLineBaseItem1" + ' 'CommandBarGalleryDropDown2 ' ' @@ -511,6 +563,14 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown2.Name = "CommandBarGalleryDropDown2" Me.CommandBarGalleryDropDown2.Ribbon = Me.RibbonControl1 ' + 'CreatePieBaseItem1 + ' + Me.CreatePieBaseItem1.Caption = "Torte" + Me.CreatePieBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown3 + Me.CreatePieBaseItem1.Enabled = False + Me.CreatePieBaseItem1.Id = 6 + Me.CreatePieBaseItem1.Name = "CreatePieBaseItem1" + ' 'CommandBarGalleryDropDown3 ' ' @@ -552,6 +612,14 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown3.Name = "CommandBarGalleryDropDown3" Me.CommandBarGalleryDropDown3.Ribbon = Me.RibbonControl1 ' + 'CreateRotatedBarBaseItem1 + ' + Me.CreateRotatedBarBaseItem1.Caption = "Balken" + Me.CreateRotatedBarBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown4 + Me.CreateRotatedBarBaseItem1.Enabled = False + Me.CreateRotatedBarBaseItem1.Id = 7 + Me.CreateRotatedBarBaseItem1.Name = "CreateRotatedBarBaseItem1" + ' 'CommandBarGalleryDropDown4 ' ' @@ -595,6 +663,14 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown4.Name = "CommandBarGalleryDropDown4" Me.CommandBarGalleryDropDown4.Ribbon = Me.RibbonControl1 ' + 'CreateAreaBaseItem1 + ' + Me.CreateAreaBaseItem1.Caption = "Fläche" + Me.CreateAreaBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown5 + Me.CreateAreaBaseItem1.Enabled = False + Me.CreateAreaBaseItem1.Id = 8 + Me.CreateAreaBaseItem1.Name = "CreateAreaBaseItem1" + ' 'CommandBarGalleryDropDown5 ' ' @@ -691,6 +767,14 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown5.Name = "CommandBarGalleryDropDown5" Me.CommandBarGalleryDropDown5.Ribbon = Me.RibbonControl1 ' + 'CreateOtherSeriesTypesBaseItem1 + ' + Me.CreateOtherSeriesTypesBaseItem1.Caption = "Sonstiges Charts" + Me.CreateOtherSeriesTypesBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown6 + Me.CreateOtherSeriesTypesBaseItem1.Enabled = False + Me.CreateOtherSeriesTypesBaseItem1.Id = 9 + Me.CreateOtherSeriesTypesBaseItem1.Name = "CreateOtherSeriesTypesBaseItem1" + ' 'CommandBarGalleryDropDown6 ' ' @@ -814,6 +898,14 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown6.Name = "CommandBarGalleryDropDown6" Me.CommandBarGalleryDropDown6.Ribbon = Me.RibbonControl1 ' + 'ChangePaletteGalleryBaseItem1 + ' + Me.ChangePaletteGalleryBaseItem1.Caption = "Palette" + Me.ChangePaletteGalleryBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown7 + Me.ChangePaletteGalleryBaseItem1.Enabled = False + Me.ChangePaletteGalleryBaseItem1.Id = 10 + Me.ChangePaletteGalleryBaseItem1.Name = "ChangePaletteGalleryBaseItem1" + ' 'CommandBarGalleryDropDown7 ' ' @@ -855,75 +947,270 @@ Partial Class frmInvDashboard Me.CommandBarGalleryDropDown7.Name = "CommandBarGalleryDropDown7" Me.CommandBarGalleryDropDown7.Ribbon = Me.RibbonControl1 ' - 'RibbonStatusBar1 + 'ChangeAppearanceGalleryBaseItem1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 745) - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1124, 21) + Me.ChangeAppearanceGalleryBaseItem1.Enabled = False ' - 'RibbonPage2 ' - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" ' - 'DD_DMSLiteDataSet + Me.ChangeAppearanceGalleryBaseItem1.Gallery.ColumnCount = 7 + Me.ChangeAppearanceGalleryBaseItem1.Gallery.ImageSize = New System.Drawing.Size(80, 50) + Me.ChangeAppearanceGalleryBaseItem1.Gallery.RowCount = 4 + Me.ChangeAppearanceGalleryBaseItem1.Id = 11 + Me.ChangeAppearanceGalleryBaseItem1.Name = "ChangeAppearanceGalleryBaseItem1" ' - Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" - Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + 'RunDesignerChartItem1 ' - 'VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource + Me.RunDesignerChartItem1.Caption = "Führen Sie den Diagrammassistenten..." + Me.RunDesignerChartItem1.Enabled = False + Me.RunDesignerChartItem1.Id = 12 + Me.RunDesignerChartItem1.Name = "RunDesignerChartItem1" ' - Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource.DataMember = "VWPM_CHART_INVOICE_MONITOR_SERIES" - Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource.DataSource = Me.DD_DMSLiteDataSet + 'SaveAsTemplateChartItem1 ' - 'VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter + Me.SaveAsTemplateChartItem1.Caption = "Als Vorlage speichern" + Me.SaveAsTemplateChartItem1.Enabled = False + Me.SaveAsTemplateChartItem1.Id = 13 + Me.SaveAsTemplateChartItem1.Name = "SaveAsTemplateChartItem1" ' - Me.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter.ClearBeforeFill = True + 'LoadTemplateChartItem1 ' - 'TableAdapterManager + Me.LoadTemplateChartItem1.Caption = "Laden" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Vorlage" + Me.LoadTemplateChartItem1.Enabled = False + Me.LoadTemplateChartItem1.Id = 14 + Me.LoadTemplateChartItem1.Name = "LoadTemplateChartItem1" ' - Me.TableAdapterManager.BackupDataSetBeforeUpdate = False - Me.TableAdapterManager.Connection = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing - Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing - Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing - Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing - Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing - Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + 'PrintPreviewChartItem1 ' - 'GridControl1 + Me.PrintPreviewChartItem1.Caption = "Druckvorschau" + Me.PrintPreviewChartItem1.Enabled = False + Me.PrintPreviewChartItem1.Id = 15 + Me.PrintPreviewChartItem1.Name = "PrintPreviewChartItem1" ' - Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GridControl1.DataSource = Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource - Me.GridControl1.Location = New System.Drawing.Point(7, 16) - Me.GridControl1.MainView = Me.TileView1 - Me.GridControl1.MenuManager = Me.RibbonControl1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(1114, 119) - Me.GridControl1.TabIndex = 5 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1}) + 'PrintChartItem1 ' - 'TileView1 + Me.PrintChartItem1.Caption = "Drucken" + Me.PrintChartItem1.Enabled = False + Me.PrintChartItem1.Id = 16 + Me.PrintChartItem1.Name = "PrintChartItem1" ' - Me.TileView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colTitle, Me.colAnzahl, Me.colNettoSumme}) - Me.TileView1.GridControl = Me.GridControl1 - Me.TileView1.Name = "TileView1" - Me.TileView1.OptionsTiles.IndentBetweenItems = 7 - Me.TileView1.OptionsTiles.ItemPadding = New System.Windows.Forms.Padding(13) - Me.TileView1.OptionsTiles.ItemSize = New System.Drawing.Size(144, 86) - Me.TileView1.OptionsTiles.Padding = New System.Windows.Forms.Padding(5) - Me.TileView1.TileColumns.Add(TableColumnDefinition1) - Me.TileView1.TileRows.Add(TableRowDefinition1) - Me.TileView1.TileRows.Add(TableRowDefinition2) + 'CreateExportBaseItem1 + ' + Me.CreateExportBaseItem1.Caption = "Exportieren" + Me.CreateExportBaseItem1.Enabled = False + Me.CreateExportBaseItem1.Id = 17 + Me.CreateExportBaseItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToPDFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToHTMLChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToMHTChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToXLSChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToXLSXChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToRTFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.CreateExportToImageBaseItem1)}) + Me.CreateExportBaseItem1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText + Me.CreateExportBaseItem1.Name = "CreateExportBaseItem1" + Me.CreateExportBaseItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu + ' + 'ExportToPDFChartItem1 + ' + Me.ExportToPDFChartItem1.Caption = "In PDF exportieren" + Me.ExportToPDFChartItem1.Enabled = False + Me.ExportToPDFChartItem1.Id = 18 + Me.ExportToPDFChartItem1.Name = "ExportToPDFChartItem1" + ' + 'ExportToHTMLChartItem1 + ' + Me.ExportToHTMLChartItem1.Caption = "Export in HTML" + Me.ExportToHTMLChartItem1.Enabled = False + Me.ExportToHTMLChartItem1.Id = 19 + Me.ExportToHTMLChartItem1.Name = "ExportToHTMLChartItem1" + ' + 'ExportToMHTChartItem1 + ' + Me.ExportToMHTChartItem1.Caption = "Exportieren in MHT" + Me.ExportToMHTChartItem1.Enabled = False + Me.ExportToMHTChartItem1.Id = 20 + Me.ExportToMHTChartItem1.Name = "ExportToMHTChartItem1" + ' + 'ExportToXLSChartItem1 + ' + Me.ExportToXLSChartItem1.Caption = "Export in XLS" + Me.ExportToXLSChartItem1.Enabled = False + Me.ExportToXLSChartItem1.Id = 21 + Me.ExportToXLSChartItem1.Name = "ExportToXLSChartItem1" + ' + 'ExportToXLSXChartItem1 + ' + Me.ExportToXLSXChartItem1.Caption = "Exportieren in XLSX" + Me.ExportToXLSXChartItem1.Enabled = False + Me.ExportToXLSXChartItem1.Id = 22 + Me.ExportToXLSXChartItem1.Name = "ExportToXLSXChartItem1" + ' + 'ExportToRTFChartItem1 + ' + Me.ExportToRTFChartItem1.Caption = "Export in RTF" + Me.ExportToRTFChartItem1.Enabled = False + Me.ExportToRTFChartItem1.Id = 23 + Me.ExportToRTFChartItem1.Name = "ExportToRTFChartItem1" + ' + 'CreateExportToImageBaseItem1 + ' + Me.CreateExportToImageBaseItem1.Caption = "Bild exportieren" + Me.CreateExportToImageBaseItem1.Enabled = False + Me.CreateExportToImageBaseItem1.Id = 29 + Me.CreateExportToImageBaseItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToBMPChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToGIFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToJPEGChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToPNGChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToTIFFChartItem1)}) + Me.CreateExportToImageBaseItem1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText + Me.CreateExportToImageBaseItem1.Name = "CreateExportToImageBaseItem1" + ' + 'ExportToBMPChartItem1 + ' + Me.ExportToBMPChartItem1.Caption = "BMP" + Me.ExportToBMPChartItem1.Enabled = False + Me.ExportToBMPChartItem1.Id = 24 + Me.ExportToBMPChartItem1.Name = "ExportToBMPChartItem1" + ' + 'ExportToGIFChartItem1 + ' + Me.ExportToGIFChartItem1.Caption = "GIF" + Me.ExportToGIFChartItem1.Enabled = False + Me.ExportToGIFChartItem1.Id = 25 + Me.ExportToGIFChartItem1.Name = "ExportToGIFChartItem1" + ' + 'ExportToJPEGChartItem1 + ' + Me.ExportToJPEGChartItem1.Caption = "JPEG" + Me.ExportToJPEGChartItem1.Enabled = False + Me.ExportToJPEGChartItem1.Id = 26 + Me.ExportToJPEGChartItem1.Name = "ExportToJPEGChartItem1" + ' + 'ExportToPNGChartItem1 + ' + Me.ExportToPNGChartItem1.Caption = "PNG" + Me.ExportToPNGChartItem1.Enabled = False + Me.ExportToPNGChartItem1.Id = 27 + Me.ExportToPNGChartItem1.Name = "ExportToPNGChartItem1" + ' + 'ExportToTIFFChartItem1 + ' + Me.ExportToTIFFChartItem1.Caption = "TIFF" + Me.ExportToTIFFChartItem1.Enabled = False + Me.ExportToTIFFChartItem1.Id = 28 + Me.ExportToTIFFChartItem1.Name = "ExportToTIFFChartItem1" + ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Export Top Kreditoren als xlsx" + Me.BarButtonItem4.Id = 30 + Me.BarButtonItem4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem5 + ' + Me.BarButtonItem5.Caption = "Export Top Kreditoren als pdf" + Me.BarButtonItem5.Id = 31 + Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem5.Name = "BarButtonItem5" + ' + 'BarButtonItem6 + ' + Me.BarButtonItem6.Caption = "BarButtonItem6" + Me.BarButtonItem6.Id = 32 + Me.BarButtonItem6.Name = "BarButtonItem6" + ' + 'ChartRibbonPageCategory1 + ' + Me.ChartRibbonPageCategory1.Control = Nothing + Me.ChartRibbonPageCategory1.Name = "ChartRibbonPageCategory1" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Funktionen" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Funktionen - Charts" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem5) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Dashboard" + ' + 'RibbonPage3 + ' + Me.RibbonPage3.Name = "RibbonPage3" + Me.RibbonPage3.Text = "RibbonPage3" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 745) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1124, 21) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'DD_DMSLiteDataSet + ' + Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" + Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' + 'VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource + ' + Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource.DataMember = "VWPM_CHART_INVOICE_MONITOR_SERIES" + Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource.DataSource = Me.DD_DMSLiteDataSet + ' + 'VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter + ' + Me.VWPM_CHART_INVOICE_MONITOR_SERIESTableAdapter.ClearBeforeFill = True + ' + 'TableAdapterManager + ' + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.Connection = Nothing + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing + Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing + Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing + Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing + Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing + Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing + Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + ' + 'GridControl1 + ' + Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControl1.DataSource = Me.VWPM_CHART_INVOICE_MONITOR_SERIESBindingSource + Me.GridControl1.Location = New System.Drawing.Point(7, 16) + Me.GridControl1.MainView = Me.TileView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(1114, 119) + Me.GridControl1.TabIndex = 5 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1}) + ' + 'TileView1 + ' + Me.TileView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colTitle, Me.colAnzahl, Me.colNettoSumme}) + Me.TileView1.GridControl = Me.GridControl1 + Me.TileView1.Name = "TileView1" + Me.TileView1.OptionsTiles.IndentBetweenItems = 7 + Me.TileView1.OptionsTiles.ItemPadding = New System.Windows.Forms.Padding(13) + Me.TileView1.OptionsTiles.ItemSize = New System.Drawing.Size(144, 86) + Me.TileView1.OptionsTiles.Padding = New System.Windows.Forms.Padding(5) + Me.TileView1.TileColumns.Add(TableColumnDefinition1) + Me.TileView1.TileRows.Add(TableRowDefinition1) + Me.TileView1.TileRows.Add(TableRowDefinition2) Me.TileView1.TileRows.Add(TableRowDefinition3) TileViewItemElement1.AnchorAlignment = DevExpress.Utils.AnchorAlignment.Left TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1214,293 +1501,6 @@ Partial Class frmInvDashboard Me.Panel2.Size = New System.Drawing.Size(1124, 135) Me.Panel2.TabIndex = 12 ' - 'ChartRibbonPageCategory1 - ' - Me.ChartRibbonPageCategory1.Control = Nothing - Me.ChartRibbonPageCategory1.Name = "ChartRibbonPageCategory1" - ' - 'RibbonPage3 - ' - Me.RibbonPage3.Name = "RibbonPage3" - Me.RibbonPage3.Text = "RibbonPage3" - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "Funktionen" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem5) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Dashboard" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "Funktionen - Charts" - ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Export als PDF" - Me.BarButtonItem1.Hint = "Export den ausgewählten Chart als PDF" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "Export als Bild" - Me.BarButtonItem2.Hint = "Exportiert den ausgewählten Chart als Bild" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'BarButtonItem3 - ' - Me.BarButtonItem3.Caption = "Export Verteilung als PDF" - Me.BarButtonItem3.Hint = "Exportiert das Dashboard als PDF" - Me.BarButtonItem3.Id = 3 - Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem3.Name = "BarButtonItem3" - ' - 'CreateBarBaseItem1 - ' - Me.CreateBarBaseItem1.Caption = "Spalte" - Me.CreateBarBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown1 - Me.CreateBarBaseItem1.Enabled = False - Me.CreateBarBaseItem1.Id = 4 - Me.CreateBarBaseItem1.Name = "CreateBarBaseItem1" - ' - 'CreateLineBaseItem1 - ' - Me.CreateLineBaseItem1.Caption = "Linie" - Me.CreateLineBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown2 - Me.CreateLineBaseItem1.Enabled = False - Me.CreateLineBaseItem1.Id = 5 - Me.CreateLineBaseItem1.Name = "CreateLineBaseItem1" - ' - 'CreatePieBaseItem1 - ' - Me.CreatePieBaseItem1.Caption = "Torte" - Me.CreatePieBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown3 - Me.CreatePieBaseItem1.Enabled = False - Me.CreatePieBaseItem1.Id = 6 - Me.CreatePieBaseItem1.Name = "CreatePieBaseItem1" - ' - 'CreateRotatedBarBaseItem1 - ' - Me.CreateRotatedBarBaseItem1.Caption = "Balken" - Me.CreateRotatedBarBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown4 - Me.CreateRotatedBarBaseItem1.Enabled = False - Me.CreateRotatedBarBaseItem1.Id = 7 - Me.CreateRotatedBarBaseItem1.Name = "CreateRotatedBarBaseItem1" - ' - 'CreateAreaBaseItem1 - ' - Me.CreateAreaBaseItem1.Caption = "Fläche" - Me.CreateAreaBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown5 - Me.CreateAreaBaseItem1.Enabled = False - Me.CreateAreaBaseItem1.Id = 8 - Me.CreateAreaBaseItem1.Name = "CreateAreaBaseItem1" - ' - 'CreateOtherSeriesTypesBaseItem1 - ' - Me.CreateOtherSeriesTypesBaseItem1.Caption = "Sonstiges Charts" - Me.CreateOtherSeriesTypesBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown6 - Me.CreateOtherSeriesTypesBaseItem1.Enabled = False - Me.CreateOtherSeriesTypesBaseItem1.Id = 9 - Me.CreateOtherSeriesTypesBaseItem1.Name = "CreateOtherSeriesTypesBaseItem1" - ' - 'ChangePaletteGalleryBaseItem1 - ' - Me.ChangePaletteGalleryBaseItem1.Caption = "Palette" - Me.ChangePaletteGalleryBaseItem1.DropDownControl = Me.CommandBarGalleryDropDown7 - Me.ChangePaletteGalleryBaseItem1.Enabled = False - Me.ChangePaletteGalleryBaseItem1.Id = 10 - Me.ChangePaletteGalleryBaseItem1.Name = "ChangePaletteGalleryBaseItem1" - ' - 'ChangeAppearanceGalleryBaseItem1 - ' - Me.ChangeAppearanceGalleryBaseItem1.Enabled = False - ' - ' - ' - Me.ChangeAppearanceGalleryBaseItem1.Gallery.ColumnCount = 7 - Me.ChangeAppearanceGalleryBaseItem1.Gallery.ImageSize = New System.Drawing.Size(80, 50) - Me.ChangeAppearanceGalleryBaseItem1.Gallery.RowCount = 4 - Me.ChangeAppearanceGalleryBaseItem1.Id = 11 - Me.ChangeAppearanceGalleryBaseItem1.Name = "ChangeAppearanceGalleryBaseItem1" - ' - 'RunDesignerChartItem1 - ' - Me.RunDesignerChartItem1.Caption = "Führen Sie den Diagrammassistenten..." - Me.RunDesignerChartItem1.Enabled = False - Me.RunDesignerChartItem1.Id = 12 - Me.RunDesignerChartItem1.Name = "RunDesignerChartItem1" - ' - 'SaveAsTemplateChartItem1 - ' - Me.SaveAsTemplateChartItem1.Caption = "Als Vorlage speichern" - Me.SaveAsTemplateChartItem1.Enabled = False - Me.SaveAsTemplateChartItem1.Id = 13 - Me.SaveAsTemplateChartItem1.Name = "SaveAsTemplateChartItem1" - ' - 'LoadTemplateChartItem1 - ' - Me.LoadTemplateChartItem1.Caption = "Laden" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Vorlage" - Me.LoadTemplateChartItem1.Enabled = False - Me.LoadTemplateChartItem1.Id = 14 - Me.LoadTemplateChartItem1.Name = "LoadTemplateChartItem1" - ' - 'PrintPreviewChartItem1 - ' - Me.PrintPreviewChartItem1.Caption = "Druckvorschau" - Me.PrintPreviewChartItem1.Enabled = False - Me.PrintPreviewChartItem1.Id = 15 - Me.PrintPreviewChartItem1.Name = "PrintPreviewChartItem1" - ' - 'PrintChartItem1 - ' - Me.PrintChartItem1.Caption = "Drucken" - Me.PrintChartItem1.Enabled = False - Me.PrintChartItem1.Id = 16 - Me.PrintChartItem1.Name = "PrintChartItem1" - ' - 'CreateExportBaseItem1 - ' - Me.CreateExportBaseItem1.Caption = "Exportieren" - Me.CreateExportBaseItem1.Enabled = False - Me.CreateExportBaseItem1.Id = 17 - Me.CreateExportBaseItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToPDFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToHTMLChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToMHTChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToXLSChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToXLSXChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToRTFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.CreateExportToImageBaseItem1)}) - Me.CreateExportBaseItem1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText - Me.CreateExportBaseItem1.Name = "CreateExportBaseItem1" - Me.CreateExportBaseItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu - ' - 'ExportToPDFChartItem1 - ' - Me.ExportToPDFChartItem1.Caption = "In PDF exportieren" - Me.ExportToPDFChartItem1.Enabled = False - Me.ExportToPDFChartItem1.Id = 18 - Me.ExportToPDFChartItem1.Name = "ExportToPDFChartItem1" - ' - 'ExportToHTMLChartItem1 - ' - Me.ExportToHTMLChartItem1.Caption = "Export in HTML" - Me.ExportToHTMLChartItem1.Enabled = False - Me.ExportToHTMLChartItem1.Id = 19 - Me.ExportToHTMLChartItem1.Name = "ExportToHTMLChartItem1" - ' - 'ExportToMHTChartItem1 - ' - Me.ExportToMHTChartItem1.Caption = "Exportieren in MHT" - Me.ExportToMHTChartItem1.Enabled = False - Me.ExportToMHTChartItem1.Id = 20 - Me.ExportToMHTChartItem1.Name = "ExportToMHTChartItem1" - ' - 'ExportToXLSChartItem1 - ' - Me.ExportToXLSChartItem1.Caption = "Export in XLS" - Me.ExportToXLSChartItem1.Enabled = False - Me.ExportToXLSChartItem1.Id = 21 - Me.ExportToXLSChartItem1.Name = "ExportToXLSChartItem1" - ' - 'ExportToXLSXChartItem1 - ' - Me.ExportToXLSXChartItem1.Caption = "Exportieren in XLSX" - Me.ExportToXLSXChartItem1.Enabled = False - Me.ExportToXLSXChartItem1.Id = 22 - Me.ExportToXLSXChartItem1.Name = "ExportToXLSXChartItem1" - ' - 'ExportToRTFChartItem1 - ' - Me.ExportToRTFChartItem1.Caption = "Export in RTF" - Me.ExportToRTFChartItem1.Enabled = False - Me.ExportToRTFChartItem1.Id = 23 - Me.ExportToRTFChartItem1.Name = "ExportToRTFChartItem1" - ' - 'ExportToBMPChartItem1 - ' - Me.ExportToBMPChartItem1.Caption = "BMP" - Me.ExportToBMPChartItem1.Enabled = False - Me.ExportToBMPChartItem1.Id = 24 - Me.ExportToBMPChartItem1.Name = "ExportToBMPChartItem1" - ' - 'ExportToGIFChartItem1 - ' - Me.ExportToGIFChartItem1.Caption = "GIF" - Me.ExportToGIFChartItem1.Enabled = False - Me.ExportToGIFChartItem1.Id = 25 - Me.ExportToGIFChartItem1.Name = "ExportToGIFChartItem1" - ' - 'ExportToJPEGChartItem1 - ' - Me.ExportToJPEGChartItem1.Caption = "JPEG" - Me.ExportToJPEGChartItem1.Enabled = False - Me.ExportToJPEGChartItem1.Id = 26 - Me.ExportToJPEGChartItem1.Name = "ExportToJPEGChartItem1" - ' - 'ExportToPNGChartItem1 - ' - Me.ExportToPNGChartItem1.Caption = "PNG" - Me.ExportToPNGChartItem1.Enabled = False - Me.ExportToPNGChartItem1.Id = 27 - Me.ExportToPNGChartItem1.Name = "ExportToPNGChartItem1" - ' - 'ExportToTIFFChartItem1 - ' - Me.ExportToTIFFChartItem1.Caption = "TIFF" - Me.ExportToTIFFChartItem1.Enabled = False - Me.ExportToTIFFChartItem1.Id = 28 - Me.ExportToTIFFChartItem1.Name = "ExportToTIFFChartItem1" - ' - 'CreateExportToImageBaseItem1 - ' - Me.CreateExportToImageBaseItem1.Caption = "Bild exportieren" - Me.CreateExportToImageBaseItem1.Enabled = False - Me.CreateExportToImageBaseItem1.Id = 29 - Me.CreateExportToImageBaseItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToBMPChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToGIFChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToJPEGChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToPNGChartItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.ExportToTIFFChartItem1)}) - Me.CreateExportToImageBaseItem1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText - Me.CreateExportToImageBaseItem1.Name = "CreateExportToImageBaseItem1" - ' - 'BarButtonItem4 - ' - Me.BarButtonItem4.Caption = "Export Top Kreditoren als xlsx" - Me.BarButtonItem4.Id = 30 - Me.BarButtonItem4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem4.Name = "BarButtonItem4" - ' - 'BarButtonItem5 - ' - Me.BarButtonItem5.Caption = "Export Top Kreditoren als pdf" - Me.BarButtonItem5.Id = 31 - Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem5.Name = "BarButtonItem5" - ' - 'BarButtonItem6 - ' - Me.BarButtonItem6.Caption = "BarButtonItem6" - Me.BarButtonItem6.Id = 32 - Me.BarButtonItem6.Name = "BarButtonItem6" - ' - 'RibbonControl1 - ' - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.CreateBarBaseItem1, Me.CreateLineBaseItem1, Me.CreatePieBaseItem1, Me.CreateRotatedBarBaseItem1, Me.CreateAreaBaseItem1, Me.CreateOtherSeriesTypesBaseItem1, Me.ChangePaletteGalleryBaseItem1, Me.ChangeAppearanceGalleryBaseItem1, Me.RunDesignerChartItem1, Me.SaveAsTemplateChartItem1, Me.LoadTemplateChartItem1, Me.PrintPreviewChartItem1, Me.PrintChartItem1, Me.CreateExportBaseItem1, Me.ExportToPDFChartItem1, Me.ExportToHTMLChartItem1, Me.ExportToMHTChartItem1, Me.ExportToXLSChartItem1, Me.ExportToXLSXChartItem1, Me.ExportToRTFChartItem1, Me.ExportToBMPChartItem1, Me.ExportToGIFChartItem1, Me.ExportToJPEGChartItem1, Me.ExportToPNGChartItem1, Me.ExportToTIFFChartItem1, Me.CreateExportToImageBaseItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6}) - Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 33 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.ChartRibbonPageCategory1}) - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) - Me.RibbonControl1.Size = New System.Drawing.Size(1124, 146) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 - ' 'frmInvDashboard ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1514,6 +1514,7 @@ Partial Class frmInvDashboard Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Invoice Dashboard" CType(Me.CommandBarGalleryDropDown1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CommandBarGalleryDropDown2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CommandBarGalleryDropDown3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CommandBarGalleryDropDown4, System.ComponentModel.ISupportInitialize).EndInit() @@ -1548,7 +1549,6 @@ Partial Class frmInvDashboard Me.SplitContainerControl1.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/app/DD_PM_WINDREAM/frmInvDashboard.vb b/app/DD_PM_WINDREAM/frmInvDashboard.vb index 1067405..dfcd5ba 100644 --- a/app/DD_PM_WINDREAM/frmInvDashboard.vb +++ b/app/DD_PM_WINDREAM/frmInvDashboard.vb @@ -37,7 +37,7 @@ Public Class frmInvDashboard Else SplitContainerDashboard.Visible = False RibbonPageGroup1.Visible = False - SplitContainerControl1.Collapsed = True + SplitContainerControl1.Collapsed = False LOGGER.Debug($"ChartCreating...No chart-Configuration!! BASEDATA_DT_CHARTS = 0") Exit Sub End If @@ -298,6 +298,9 @@ Public Class frmInvDashboard Private Sub GridControl1_Click(sender As Object, e As EventArgs) Handles GridControl1.Click RibbonPageGroup1.Enabled = False RibbonPageGroup2.Enabled = True + BarButtonItem3.Enabled = True + BarButtonItem4.Enabled = False + BarButtonItem5.Enabled = False End Sub Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick @@ -320,4 +323,12 @@ Public Class frmInvDashboard GridView1.ExportToPdf(SaveFileDialog1.FileName) End If End Sub + + Private Sub GridControl2_Click(sender As Object, e As EventArgs) Handles GridControl2.Click + RibbonPageGroup1.Enabled = False + RibbonPageGroup2.Enabled = True + BarButtonItem3.Enabled = False + BarButtonItem4.Enabled = True + BarButtonItem5.Enabled = True + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index bbcb749..59a0d3d 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1837,11 +1837,15 @@ Public Class frmValidator End Function Sub Load_IDB_DOC_DATA() - Dim oSQl As String = IDB_DOC_DATA_SQL - oSQl = oSQl.Replace("@DOC_GUID", CURRENT_DOC_GUID) - oSQl = oSQl.Replace("@DOC_ID", CURRENT_DOC_ID) - oSQl = oSQl.Replace("@DocID", CURRENT_DOC_ID) - IDB_DT_DOC_DATA = ClassDatabase.Return_Datatable(oSQl) + Try + Dim oSQl As String = IDB_DOC_DATA_SQL + oSQl = oSQl.Replace("@DOC_GUID", CURRENT_DOC_GUID) + oSQl = oSQl.Replace("@DOC_ID", CURRENT_DOC_ID) + oSQl = oSQl.Replace("@DocID", CURRENT_DOC_ID) + IDB_DT_DOC_DATA = ClassDatabase.Return_Datatable(oSQl) + Catch ex As Exception + LOGGER.Error(ex) + End Try End Sub @@ -3860,7 +3864,9 @@ Public Class frmValidator End Sub Sub Reload_Controls(SingleAttribute As String) - Load_IDB_DOC_DATA() + If IDB_ACTIVE = True Then + Load_IDB_DOC_DATA() + End If FillIndexValues(False) End Sub From c20867509fbf5eb33f18cf0bcc3af5ac1055fad2 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 17 Mar 2020 15:16:30 +0100 Subject: [PATCH 08/13] MS --- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 2 + .../frmFormDesigner.Designer.vb | 230 ++++++++++++------ app/DD_PM_WINDREAM/frmFormDesigner.resx | 30 ++- app/DD_PM_WINDREAM/frmFormDesigner.vb | 8 +- 4 files changed, 185 insertions(+), 85 deletions(-) diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index a994254..7d5b07e 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -52,6 +52,8 @@ Module ModuleRuntimeVariables Public USER_RIGHT3 As Boolean = False Public USER_RIGHT4 As Boolean = False Public USER_DEBUG_LOG As Boolean = False + Public CHANGES_IN_ADMINISTRATION As Boolean = False + Public FORCE_LAYOUT_OVERVIEW As Boolean = False diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 8442184..c42559f 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmFormDesigner - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -49,11 +49,9 @@ Partial Class frmFormDesigner Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.btndelete = New System.Windows.Forms.Button() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) - Me.btnrefresh = New System.Windows.Forms.Button() Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() @@ -64,6 +62,15 @@ Partial Class frmFormDesigner Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() @@ -80,12 +87,11 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 ' - Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox1.Controls.Add(Me.btnButton) Me.GroupBox1.Controls.Add(Me.btnLine) Me.GroupBox1.Controls.Add(Me.btnTabelle) @@ -94,10 +100,13 @@ Partial Class frmFormDesigner Me.GroupBox1.Controls.Add(Me.btndtp) Me.GroupBox1.Controls.Add(Me.btntextbox) Me.GroupBox1.Controls.Add(Me.btnlabel) + Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox1.Location = New System.Drawing.Point(7, 9) + Me.GroupBox1.Location = New System.Drawing.Point(0, 0) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(363, 129) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.GroupBox1.Size = New System.Drawing.Size(381, 137) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -107,9 +116,10 @@ Partial Class frmFormDesigner Me.btnButton.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnButton.Image = CType(resources.GetObject("btnButton.Image"), System.Drawing.Image) Me.btnButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnButton.Location = New System.Drawing.Point(290, 22) + Me.btnButton.Location = New System.Drawing.Point(249, 18) + Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(112, 27) + Me.btnButton.Size = New System.Drawing.Size(96, 32) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -120,9 +130,10 @@ Partial Class frmFormDesigner Me.btnLine.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLine.Image = CType(resources.GetObject("btnLine.Image"), System.Drawing.Image) Me.btnLine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLine.Location = New System.Drawing.Point(290, 90) + Me.btnLine.Location = New System.Drawing.Point(249, 93) + Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(112, 27) + Me.btnLine.Size = New System.Drawing.Size(96, 34) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -133,9 +144,10 @@ Partial Class frmFormDesigner Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTabelle.Image = Global.DD_ProcessManager.My.Resources.Resources.table_add Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTabelle.Location = New System.Drawing.Point(151, 22) + Me.btnTabelle.Location = New System.Drawing.Point(129, 18) + Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(133, 27) + Me.btnTabelle.Size = New System.Drawing.Size(114, 32) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -146,9 +158,10 @@ Partial Class frmFormDesigner Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnCheckbox.Image = Global.DD_ProcessManager.My.Resources.Resources.checkbox_16xLG Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCheckbox.Location = New System.Drawing.Point(151, 90) + Me.btnCheckbox.Location = New System.Drawing.Point(129, 93) + Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(133, 27) + Me.btnCheckbox.Size = New System.Drawing.Size(114, 34) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -159,9 +172,10 @@ Partial Class frmFormDesigner Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnVektor.Image = Global.DD_ProcessManager.My.Resources.Resources.ComboBox_16xLG Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVektor.Location = New System.Drawing.Point(13, 88) + Me.btnVektor.Location = New System.Drawing.Point(10, 93) + Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(133, 27) + Me.btnVektor.Size = New System.Drawing.Size(114, 34) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,9 +186,10 @@ Partial Class frmFormDesigner Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btndtp.Image = Global.DD_ProcessManager.My.Resources.Resources.DateOrTimePicker_675 Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndtp.Location = New System.Drawing.Point(151, 55) + Me.btndtp.Location = New System.Drawing.Point(130, 54) + Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(133, 27) + Me.btndtp.Size = New System.Drawing.Size(114, 35) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -185,9 +200,10 @@ Partial Class frmFormDesigner Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btntextbox.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox_708 Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btntextbox.Location = New System.Drawing.Point(13, 55) + Me.btntextbox.Location = New System.Drawing.Point(10, 54) + Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(133, 27) + Me.btntextbox.Size = New System.Drawing.Size(114, 35) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -198,9 +214,10 @@ Partial Class frmFormDesigner Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnlabel.Image = Global.DD_ProcessManager.My.Resources.Resources.Label_684 Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnlabel.Location = New System.Drawing.Point(12, 22) + Me.btnlabel.Location = New System.Drawing.Point(10, 18) + Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(133, 27) + Me.btnlabel.Size = New System.Drawing.Size(113, 32) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -217,16 +234,17 @@ Partial Class frmFormDesigner Me.pnldesigner.Dock = System.Windows.Forms.DockStyle.Fill Me.pnldesigner.GridSize = 10 Me.pnldesigner.Location = New System.Drawing.Point(0, 0) + Me.pnldesigner.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pnldesigner.Name = "pnldesigner" Me.pnldesigner.ShowGrid = True - Me.pnldesigner.Size = New System.Drawing.Size(842, 650) + Me.pnldesigner.Size = New System.Drawing.Size(842, 483) Me.pnldesigner.TabIndex = 3 ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(91, 150) + Me.Label1.Location = New System.Drawing.Point(80, 120) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -237,7 +255,7 @@ Partial Class frmFormDesigner Me.lblhintergrund.AutoSize = True Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.lblhintergrund.Location = New System.Drawing.Point(89, 111) + Me.lblhintergrund.Location = New System.Drawing.Point(80, 90) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -251,19 +269,21 @@ Partial Class frmFormDesigner Me.TabControlEigenschaften.Controls.Add(Me.pageProperties) Me.TabControlEigenschaften.Controls.Add(Me.pageFormat) Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 144) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 141) + Me.TabControlEigenschaften.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.TabControlEigenschaften.Name = "TabControlEigenschaften" Me.TabControlEigenschaften.SelectedIndex = 0 - Me.TabControlEigenschaften.Size = New System.Drawing.Size(371, 465) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(372, 340) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties ' Me.pageProperties.Controls.Add(Me.pgControls) Me.pageProperties.Location = New System.Drawing.Point(4, 25) + Me.pageProperties.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageProperties.Name = "pageProperties" - Me.pageProperties.Padding = New System.Windows.Forms.Padding(3) - Me.pageProperties.Size = New System.Drawing.Size(363, 436) + Me.pageProperties.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pageProperties.Size = New System.Drawing.Size(364, 311) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -272,9 +292,10 @@ Partial Class frmFormDesigner ' Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pgControls.HelpVisible = False - Me.pgControls.Location = New System.Drawing.Point(3, 3) + Me.pgControls.Location = New System.Drawing.Point(3, 2) + Me.pgControls.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pgControls.Name = "pgControls" - Me.pgControls.Size = New System.Drawing.Size(357, 430) + Me.pgControls.Size = New System.Drawing.Size(358, 307) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -286,10 +307,11 @@ Partial Class frmFormDesigner Me.pageFormat.Controls.Add(Me.btnwidth_minus) Me.pageFormat.Controls.Add(Me.btnwidth_plus) Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pageFormat.Location = New System.Drawing.Point(4, 22) + Me.pageFormat.Location = New System.Drawing.Point(4, 25) + Me.pageFormat.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageFormat.Name = "pageFormat" - Me.pageFormat.Padding = New System.Windows.Forms.Padding(3) - Me.pageFormat.Size = New System.Drawing.Size(363, 439) + Me.pageFormat.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pageFormat.Size = New System.Drawing.Size(364, 311) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -299,9 +321,10 @@ Partial Class frmFormDesigner Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_minus.Location = New System.Drawing.Point(94, 69) + Me.btnheight_minus.Location = New System.Drawing.Point(93, 67) + Me.btnheight_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_minus.Name = "btnheight_minus" - Me.btnheight_minus.Size = New System.Drawing.Size(75, 25) + Me.btnheight_minus.Size = New System.Drawing.Size(76, 33) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -312,9 +335,10 @@ Partial Class frmFormDesigner Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_plus.Location = New System.Drawing.Point(13, 69) + Me.btnheight_plus.Location = New System.Drawing.Point(12, 67) + Me.btnheight_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_plus.Name = "btnheight_plus" - Me.btnheight_plus.Size = New System.Drawing.Size(75, 25) + Me.btnheight_plus.Size = New System.Drawing.Size(75, 33) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -323,7 +347,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(10, 50) + Me.Label3.Location = New System.Drawing.Point(9, 49) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -332,7 +356,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(10, 3) + Me.Label2.Location = New System.Drawing.Point(9, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -343,9 +367,10 @@ Partial Class frmFormDesigner Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_minus.Location = New System.Drawing.Point(94, 22) + Me.btnwidth_minus.Location = New System.Drawing.Point(93, 18) + Me.btnwidth_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_minus.Name = "btnwidth_minus" - Me.btnwidth_minus.Size = New System.Drawing.Size(75, 25) + Me.btnwidth_minus.Size = New System.Drawing.Size(76, 29) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -356,9 +381,10 @@ Partial Class frmFormDesigner Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_plus.Location = New System.Drawing.Point(13, 22) + Me.btnwidth_plus.Location = New System.Drawing.Point(11, 18) + Me.btnwidth_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_plus.Name = "btnwidth_plus" - Me.btnwidth_plus.Size = New System.Drawing.Size(75, 25) + Me.btnwidth_plus.Size = New System.Drawing.Size(76, 29) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -379,23 +405,10 @@ Partial Class frmFormDesigner Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' - 'btndelete - ' - Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btndelete.Image = Global.DD_ProcessManager.My.Resources.Resources.delete_12x12 - Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndelete.Location = New System.Drawing.Point(7, 624) - Me.btndelete.Name = "btndelete" - Me.btndelete.Size = New System.Drawing.Size(124, 23) - Me.btndelete.TabIndex = 1 - Me.btndelete.Text = "Control löschen" - Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btndelete.UseVisualStyleBackColor = True - ' 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 650) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 629) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Size = New System.Drawing.Size(1227, 22) Me.StatusStrip1.TabIndex = 20 @@ -408,19 +421,6 @@ Partial Class frmFormDesigner Me.tslblAenderungen.Size = New System.Drawing.Size(152, 17) Me.tslblAenderungen.Text = "Noch keine Änderungen" ' - 'btnrefresh - ' - Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnrefresh.Image = Global.DD_ProcessManager.My.Resources.Resources.arrow_refresh - Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnrefresh.Location = New System.Drawing.Point(260, 624) - Me.btnrefresh.Name = "btnrefresh" - Me.btnrefresh.Size = New System.Drawing.Size(110, 23) - Me.btnrefresh.TabIndex = 24 - Me.btnrefresh.Text = "Refresh" - Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnrefresh.UseVisualStyleBackColor = True - ' 'TBPM_PROFILE_CONTROLSTableAdapter ' Me.TBPM_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True @@ -479,7 +479,7 @@ Partial Class frmFormDesigner 'SplitContainer1 ' Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 146) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -490,24 +490,88 @@ Partial Class frmFormDesigner ' Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1) Me.SplitContainer1.Panel2.Controls.Add(Me.TabControlEigenschaften) - Me.SplitContainer1.Panel2.Controls.Add(Me.btnrefresh) - Me.SplitContainer1.Panel2.Controls.Add(Me.btndelete) - Me.SplitContainer1.Size = New System.Drawing.Size(1227, 650) + Me.SplitContainer1.Size = New System.Drawing.Size(1227, 483) Me.SplitContainer1.SplitterDistance = 842 Me.SplitContainer1.TabIndex = 25 ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 651) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1227, 21) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Button Abschluss CheckSQL" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "BarButtonItem2" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "BarButtonItem3" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'frmFormDesigner ' + Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1227, 672) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon) Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.MinimizeBox = False Me.Name = "frmFormDesigner" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Validation-Designer" Me.GroupBox1.ResumeLayout(False) Me.pnldesigner.ResumeLayout(False) @@ -528,6 +592,7 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -542,7 +607,6 @@ Partial Class frmFormDesigner Friend WithEvents pnldesigner As DD_ProcessManager.ClassSnapPanel Friend WithEvents btndtp As System.Windows.Forms.Button Friend WithEvents lblhintergrund As System.Windows.Forms.Label - Friend WithEvents btndelete As System.Windows.Forms.Button Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel @@ -564,7 +628,6 @@ Partial Class frmFormDesigner Friend WithEvents btnTabelle As System.Windows.Forms.Button Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter - Friend WithEvents btnrefresh As System.Windows.Forms.Button Friend WithEvents pageProperties As TabPage Friend WithEvents pgControls As PropertyGrid Friend WithEvents btnLine As Button @@ -572,4 +635,13 @@ Partial Class frmFormDesigner Friend WithEvents MenuItemAddColumn As ToolStripMenuItem Friend WithEvents SplitContainer1 As SplitContainer Friend WithEvents btnButton As Button + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 3c86179..672d396 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -140,9 +140,6 @@ 206, 17 - - 206, 17 - 17, 56 @@ -176,10 +173,35 @@ 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAN4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iRmluaXNoTWVyZ2UiPg0KICAgIDxwYXRoIGQ9Ik0xMy4yLDE4Yy0wLjMsMC42LTAu + NiwxLjMtMC44LDJINnYtMkgxMy4yeiBNMTIuMSwyNEg0VjJoMTZ2MTAuNGMwLjYtMC4yLDEuMy0wLjMs + Mi0wLjRWMWMwLTAuNS0wLjUtMS0xLTEgICBIM0MyLjUsMCwyLDAuNSwyLDF2MjRjMCwwLjUsMC41LDEs + MSwxaDkuNEMxMi4yLDI1LjQsMTIuMSwyNC43LDEyLjEsMjR6IE02LDE2aDguNWMwLjYtMC44LDEuNC0x + LjQsMi4yLTJINlYxNnogTTYsOGgxMlY2SDZWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cmVjdCB4 + PSI2IiB5PSIxMCIgd2lkdGg9IjEyIiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IlllbGxv + dyIgLz4NCiAgICA8cGF0aCBkPSJNMjMsMTRjLTUsMC05LDQtOSw5YzAsNSw0LDksOSw5czktNCw5LTlD + MzIsMTgsMjgsMTQsMjMsMTR6IE0yMiwyOGwtNS01bDItMmwzLDNsNS01bDIsMkwyMiwyOHoiIGNsYXNz + PSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 213 - + AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAALzAAAAEA CACoDgAADgsAACAgAAABAAgAqAgAALYZAAAQEAAAAQAIAGgFAABeIgAALzAAAAEAIADoJAAAxicAACAg diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 3728b39..b3352d7 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -581,7 +581,7 @@ Public Class frmFormDesigner Return pnldesigner.PointToClient(Cursor.Position) End Function - Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click + Private Sub btndelete_Click(sender As System.Object, e As EventArgs) If CurrentControl Is Nothing = False Then DeleteControl(CurrentControl.Name) TabControlEigenschaften.Enabled = False @@ -640,7 +640,7 @@ Public Class frmFormDesigner End If End Sub - Private Sub btnrefresh_Click(sender As Object, e As EventArgs) Handles btnrefresh.Click + Private Sub btnrefresh_Click(sender As Object, e As EventArgs) LoadControls() End Sub @@ -1130,4 +1130,8 @@ Public Class frmFormDesigner LOGGER.Error(ex) End Try End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + + End Sub End Class \ No newline at end of file From c84138172962306145c34d2d7e594c33af95df95 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 17 Mar 2020 18:12:37 +0100 Subject: [PATCH 09/13] MS Changes 1703 --- .../frmFormDesigner.Designer.vb | 122 +++++++++--------- app/DD_PM_WINDREAM/frmFormDesigner.resx | 47 +++++++ app/DD_PM_WINDREAM/frmFormDesigner.vb | 63 +++++++-- app/DD_PM_WINDREAM/frmMain.vb | 10 +- app/DD_PM_WINDREAM/frmValidator.vb | 120 ++++++++++++----- 5 files changed, 258 insertions(+), 104 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index c42559f..04baf47 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -63,14 +63,14 @@ Partial Class frmFormDesigner Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() @@ -106,7 +106,7 @@ Partial Class frmFormDesigner Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.GroupBox1.Size = New System.Drawing.Size(381, 137) + Me.GroupBox1.Size = New System.Drawing.Size(381, 111) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -116,10 +116,10 @@ Partial Class frmFormDesigner Me.btnButton.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnButton.Image = CType(resources.GetObject("btnButton.Image"), System.Drawing.Image) Me.btnButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnButton.Location = New System.Drawing.Point(249, 18) + Me.btnButton.Location = New System.Drawing.Point(213, 15) Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(96, 32) + Me.btnButton.Size = New System.Drawing.Size(82, 26) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -130,10 +130,10 @@ Partial Class frmFormDesigner Me.btnLine.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLine.Image = CType(resources.GetObject("btnLine.Image"), System.Drawing.Image) Me.btnLine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLine.Location = New System.Drawing.Point(249, 93) + Me.btnLine.Location = New System.Drawing.Point(213, 76) Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(96, 34) + Me.btnLine.Size = New System.Drawing.Size(82, 28) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -144,10 +144,10 @@ Partial Class frmFormDesigner Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTabelle.Image = Global.DD_ProcessManager.My.Resources.Resources.table_add Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTabelle.Location = New System.Drawing.Point(129, 18) + Me.btnTabelle.Location = New System.Drawing.Point(111, 15) Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(114, 32) + Me.btnTabelle.Size = New System.Drawing.Size(98, 26) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -158,10 +158,10 @@ Partial Class frmFormDesigner Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnCheckbox.Image = Global.DD_ProcessManager.My.Resources.Resources.checkbox_16xLG Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCheckbox.Location = New System.Drawing.Point(129, 93) + Me.btnCheckbox.Location = New System.Drawing.Point(111, 76) Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(114, 34) + Me.btnCheckbox.Size = New System.Drawing.Size(98, 28) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,10 +172,10 @@ Partial Class frmFormDesigner Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnVektor.Image = Global.DD_ProcessManager.My.Resources.Resources.ComboBox_16xLG Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVektor.Location = New System.Drawing.Point(10, 93) + Me.btnVektor.Location = New System.Drawing.Point(9, 76) Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(114, 34) + Me.btnVektor.Size = New System.Drawing.Size(98, 28) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -186,10 +186,10 @@ Partial Class frmFormDesigner Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btndtp.Image = Global.DD_ProcessManager.My.Resources.Resources.DateOrTimePicker_675 Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndtp.Location = New System.Drawing.Point(130, 54) + Me.btndtp.Location = New System.Drawing.Point(111, 44) Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(114, 35) + Me.btndtp.Size = New System.Drawing.Size(98, 28) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -200,10 +200,10 @@ Partial Class frmFormDesigner Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btntextbox.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox_708 Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btntextbox.Location = New System.Drawing.Point(10, 54) + Me.btntextbox.Location = New System.Drawing.Point(9, 44) Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(114, 35) + Me.btntextbox.Size = New System.Drawing.Size(98, 28) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -214,10 +214,10 @@ Partial Class frmFormDesigner Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnlabel.Image = Global.DD_ProcessManager.My.Resources.Resources.Label_684 Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnlabel.Location = New System.Drawing.Point(10, 18) + Me.btnlabel.Location = New System.Drawing.Point(9, 15) Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(113, 32) + Me.btnlabel.Size = New System.Drawing.Size(97, 26) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -244,7 +244,7 @@ Partial Class frmFormDesigner ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(80, 120) + Me.Label1.Location = New System.Drawing.Point(70, 100) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -255,7 +255,7 @@ Partial Class frmFormDesigner Me.lblhintergrund.AutoSize = True Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.lblhintergrund.Location = New System.Drawing.Point(80, 90) + Me.lblhintergrund.Location = New System.Drawing.Point(70, 70) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -269,11 +269,11 @@ Partial Class frmFormDesigner Me.TabControlEigenschaften.Controls.Add(Me.pageProperties) Me.TabControlEigenschaften.Controls.Add(Me.pageFormat) Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 141) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 115) Me.TabControlEigenschaften.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.TabControlEigenschaften.Name = "TabControlEigenschaften" Me.TabControlEigenschaften.SelectedIndex = 0 - Me.TabControlEigenschaften.Size = New System.Drawing.Size(372, 340) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(373, 367) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties @@ -283,7 +283,7 @@ Partial Class frmFormDesigner Me.pageProperties.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageProperties.Name = "pageProperties" Me.pageProperties.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.pageProperties.Size = New System.Drawing.Size(364, 311) + Me.pageProperties.Size = New System.Drawing.Size(365, 338) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -295,7 +295,7 @@ Partial Class frmFormDesigner Me.pgControls.Location = New System.Drawing.Point(3, 2) Me.pgControls.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pgControls.Name = "pgControls" - Me.pgControls.Size = New System.Drawing.Size(358, 307) + Me.pgControls.Size = New System.Drawing.Size(359, 334) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -307,11 +307,11 @@ Partial Class frmFormDesigner Me.pageFormat.Controls.Add(Me.btnwidth_minus) Me.pageFormat.Controls.Add(Me.btnwidth_plus) Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pageFormat.Location = New System.Drawing.Point(4, 25) + Me.pageFormat.Location = New System.Drawing.Point(4, 22) Me.pageFormat.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageFormat.Name = "pageFormat" Me.pageFormat.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.pageFormat.Size = New System.Drawing.Size(364, 311) + Me.pageFormat.Size = New System.Drawing.Size(311, 250) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -321,10 +321,10 @@ Partial Class frmFormDesigner Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_minus.Location = New System.Drawing.Point(93, 67) + Me.btnheight_minus.Location = New System.Drawing.Point(80, 54) Me.btnheight_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_minus.Name = "btnheight_minus" - Me.btnheight_minus.Size = New System.Drawing.Size(76, 33) + Me.btnheight_minus.Size = New System.Drawing.Size(65, 27) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -335,10 +335,10 @@ Partial Class frmFormDesigner Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_plus.Location = New System.Drawing.Point(12, 67) + Me.btnheight_plus.Location = New System.Drawing.Point(10, 54) Me.btnheight_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_plus.Name = "btnheight_plus" - Me.btnheight_plus.Size = New System.Drawing.Size(75, 33) + Me.btnheight_plus.Size = New System.Drawing.Size(64, 27) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -347,7 +347,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(9, 49) + Me.Label3.Location = New System.Drawing.Point(8, 40) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -356,7 +356,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(9, 2) + Me.Label2.Location = New System.Drawing.Point(8, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -367,10 +367,10 @@ Partial Class frmFormDesigner Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_minus.Location = New System.Drawing.Point(93, 18) + Me.btnwidth_minus.Location = New System.Drawing.Point(80, 15) Me.btnwidth_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_minus.Name = "btnwidth_minus" - Me.btnwidth_minus.Size = New System.Drawing.Size(76, 29) + Me.btnwidth_minus.Size = New System.Drawing.Size(65, 24) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -381,10 +381,10 @@ Partial Class frmFormDesigner Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_plus.Location = New System.Drawing.Point(11, 18) + Me.btnwidth_plus.Location = New System.Drawing.Point(9, 15) Me.btnwidth_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_plus.Name = "btnwidth_plus" - Me.btnwidth_plus.Size = New System.Drawing.Size(76, 29) + Me.btnwidth_plus.Size = New System.Drawing.Size(65, 24) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -505,24 +505,45 @@ Partial Class frmFormDesigner Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Button Abschluss CheckSQL" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Lösche Control" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Aktualisieren" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Funktionen" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Aktionen" ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Control Aktionen" ' 'RibbonStatusBar1 ' @@ -536,25 +557,6 @@ Partial Class frmFormDesigner Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Button Abschluss CheckSQL" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "BarButtonItem2" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'BarButtonItem3 - ' - Me.BarButtonItem3.Caption = "BarButtonItem3" - Me.BarButtonItem3.Id = 3 - Me.BarButtonItem3.Name = "BarButtonItem3" - ' 'frmFormDesigner ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 672d396..2aa0895 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -140,6 +140,9 @@ 206, 17 + + 206, 17 + 17, 56 @@ -196,6 +199,50 @@ dyIgLz4NCiAgICA8cGF0aCBkPSJNMjMsMTRjLTUsMC05LDQtOSw5YzAsNSw0LDksOSw5czktNCw5LTlD MzIsMTgsMjgsMTQsMjMsMTR6IE0yMiwyOGwtNS01bDItMmwzLDNsNS01bDIsMkwyMiwyOHoiIGNsYXNz PSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N + CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu + NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w + LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt + MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks + Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 + LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2hhbmdlVmlldyI+DQogICAgPHBh + dGggZD0iTTI0LjUsNy41QzIyLjMsNS4zLDE5LjMsNCwxNiw0QzEwLjEsNCw1LjEsOC4zLDQuMiwxNGg0 + LjFjMC45LTMuNCw0LTYsNy43LTZjMi4yLDAsNC4yLDAuOSw1LjYsMi40TDE4LDE0ICAgaDUuN2g0LjFI + MjhWNEwyNC41LDcuNXogTTE2LDI0Yy0yLjIsMC00LjItMC45LTUuNi0yLjRMMTQsMThIOC4yaC00SDR2 + MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo + LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2 + Zz4L diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index b3352d7..74c9c0a 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -339,7 +339,7 @@ Public Class frmFormDesigner .Guid = GetLastID(), .ReadOnly = False } - + CHANGES_IN_ADMINISTRATION = True pnldesigner.Controls.Add(label) @@ -348,7 +348,7 @@ Public Class frmFormDesigner SetMovementHandlers(txt) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = txt CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -362,7 +362,7 @@ Public Class frmFormDesigner SetMovementHandlers(cmb) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = cmb CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -376,7 +376,7 @@ Public Class frmFormDesigner SetMovementHandlers(dtp) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = dtp CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -390,7 +390,7 @@ Public Class frmFormDesigner SetMovementHandlers(chk) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = chk CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -405,7 +405,7 @@ Public Class frmFormDesigner SetMovementHandlers(lc) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = lc CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -421,7 +421,7 @@ Public Class frmFormDesigner AddHandler tb.MouseClick, AddressOf gridControl_MouseClick TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width) - + CHANGES_IN_ADMINISTRATION = True Dim oControlId = GetLastID() CurrentControl = tb @@ -440,7 +440,7 @@ Public Class frmFormDesigner SetMovementHandlers(line) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = line CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -455,7 +455,7 @@ Public Class frmFormDesigner SetMovementHandlers(oButton) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = oButton CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -592,6 +592,7 @@ Public Class frmFormDesigner If CurrentControl Is Nothing = False Then CurrentControl.Size = New Size(CurrentControl.Width + 5, CurrentControl.Height) UpdateSingleValue("WIDTH", CurrentControl.Size.Width) + End If End Sub @@ -606,6 +607,7 @@ Public Class frmFormDesigner CurrentControl.Size = New Size(newWidth, CurrentControl.Height) UpdateSingleValue("WIDTH", CurrentControl.Size.Width) + End If End Sub @@ -1020,10 +1022,16 @@ Public Class frmFormDesigner Case "Enable_SQL" UpdateSingleValue("SQL_ENABLE", newValue) + UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID) + UpdateSingleValue("CHOICE_LIST", "") Case "Override_SQL" UpdateSingleValue("SQL2", newValue) + UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID) + UpdateSingleValue("CHOICE_LIST", "") Case "SetControlData" UpdateSingleValue("SET_CONTROL_DATA", newValue) + UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID) + UpdateSingleValue("CHOICE_LIST", "") Case "ChoiceList" UpdateSingleValue("CHOICE_LIST", newValue) UpdateSingleValue("SQL_UEBERPRUEFUNG", "") @@ -1050,6 +1058,7 @@ Public Class frmFormDesigner Dim myPath As ImageValue = newValue UpdateImage(myPath.Value) End Select + CHANGES_IN_ADMINISTRATION = True End Sub Private Function UpdateImage(ImageLocation As String) Try @@ -1069,6 +1078,7 @@ Public Class frmFormDesigner tslblAenderungen.Visible = True tslblAenderungen.Text = "Änderungen gespeichert - " & Now + CHANGES_IN_ADMINISTRATION = True Return True Catch ex As Exception @@ -1099,6 +1109,7 @@ Public Class frmFormDesigner Dim oSQL = $"EXEC PRPM_CHANGE_CONTROL_CAPTION {guid},{escapedValue},'{USER_USERNAME}','{USER_LANGUAGE}'" ClassDatabase.Execute_non_Query(oSQL) End If + CHANGES_IN_ADMINISTRATION = True Return True End If @@ -1132,6 +1143,40 @@ Public Class frmFormDesigner End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Try + CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" + Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}" + Dim oldSQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + If oldSQL <> oForm.SQLCommand Then + Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" + If ClassDatabase.Execute_non_Query(oUpdate) = True Then + tslblAenderungen.Text = $"Profile SQLFinish saved - {Now.ToLongTimeString}" + tslblAenderungen.Visible = True + CHANGES_IN_ADMINISTRATION = True + Else + tslblAenderungen.Visible = False + End If + + End If + End If + Catch ex As Exception + MsgBox("Error in Saving Profile SQLFinish: " & vbNewLine & vbNewLine & ex.Message) + LOGGER.Error(ex) + End Try + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + If CurrentControl Is Nothing = False Then + DeleteControl(CurrentControl.Name) + TabControlEigenschaften.Enabled = False + End If + End Sub + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + LoadControls() End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index e1f8fbc..c75cd08 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -831,7 +831,15 @@ Public Class frmMain Dim oExpression = $"GUID = {CURRENT_ProfilGUID}" CURRENT_DT_PROFILE.Clear() - CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges) + If CHANGES_IN_ADMINISTRATION = True Then + CURRENT_DT_PROFILES = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE where ACTIVE = 1") + Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC" + DTVWCONTROLS_INDEX = ClassDatabase.Return_Datatable(oSQL) + CHANGES_IN_ADMINISTRATION = False + Else + CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges) + End If + If CURRENT_DT_PROFILE.Rows.Count = 1 Then CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME") Else diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 59a0d3d..e44fe53 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -231,7 +231,7 @@ Public Class frmValidator End If LOGGER.Debug("Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString) Create_Controls() - + Controls2beDisabled End If End If @@ -244,6 +244,26 @@ Public Class frmValidator End Try End Sub + Private Sub Controls2beDisabled() + Try + Dim oFilteredDatatable As DataTable = DTCONTROLS.Clone() + Dim oExpression = $"LEN(SQL_ENABLE) > 0'" + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) + If oFilteredDatatable.Rows.Count > 0 Then + LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which need to be disabled!!") + End If + For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows + Dim oENABLE_GUID = oRowEnablingControl.Item("GUID") + Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME") + For Each oControl As Control In pnldesigner.Controls + oControl.Enabled = False + Exit For + Next + Next + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub Private Sub frmValidation_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Try me_closing = True @@ -1287,6 +1307,7 @@ Public Class frmValidator If Not IsNothing(SelectedValues) Then If SelectedValues.Count = 1 Then LookupControl_DependingControls(oLookup, SelectedValues) + LookupControl_EnablingControls(oLookup, SelectedValues) LookupControl_DependingColumn(oLookup, SelectedValues) Else LOGGER.Debug("Uups: SelectedValues.Count <> 1 ") @@ -1296,6 +1317,69 @@ Public Class frmValidator LOGGER.Error(ex) End Try End Sub + Private Sub LookupControl_EnablingControls(LookupControl As LookupControl2, SelectedValues As List(Of String)) + Dim oLOOKUPValue = SelectedValues.Item(0) + LOGGER.Debug($"oLOOKUPValue is [{oLOOKUPValue}]!") + Dim oControlID = DirectCast(LookupControl.Tag, ClassControlCreator.ControlMetadata).Guid + Controls2beEnabled(LookupControl.Name) + + End Sub + + Private Sub Controls2beEnabled(pControlName As String) + Try + Dim oFilteredDatatable As DataTable = DTCONTROLS.Clone() + Dim oExpression = $"SQL_ENABLE like '%#CTRL#{pControlName}%'" + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) + If oFilteredDatatable.Rows.Count > 0 Then + LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which got enable definitions!!") + Else + LOGGER.Debug($"Sorry NO controls with enabling definition!!") + End If + For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows + Dim oENABLE_GUID = oRowEnablingControl.Item("GUID") + Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME") + LOGGER.Debug($"Control {oENABLE_CtrlName} is depending on lookUp {pControlName}..") + If _dependingControl_in_action = True Then + LOGGER.Debug($"..but _dependingControl_in_action = True ==> Exit Sub!") + Exit Sub + End If + If Not IsDBNull(oRowEnablingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")) Then + Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")), "", oRowEnablingControl.Item("SQL_ENABLE")) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + _dependingControl_in_action = True + Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar(oSqlCommand, CONNECTION_STRING) + Try + Dim oFound As Boolean = False + 'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() + For Each oControl As Control In pnldesigner.Controls + If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oENABLE_GUID Then + oFound = True + LOGGER.Debug($"Got the depending control ID:{oENABLE_GUID}..Setting enabled/Disabled...") + oControl.Enabled = oENABLERESULT + _dependingControl_in_action = False + Exit For + End If + + Next + + If oFound = False Then + LOGGER.Debug($"Could not find the enabling Control with ID {oENABLE_GUID} on panel!!!") + End If + Catch ex As Exception + LOGGER.Warn($"Error while setting enabling control-value for [{oENABLE_CtrlName}]: " & ex.Message) + _dependingControl_in_action = False + End Try + Else + LOGGER.Debug($"Error: Check CoNN ID and SQL on NULL VALUES!") + End If + Next + + + + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub Public Sub onLookUpselectedValue_Control2Set(sender As Object, SelectedValues As List(Of String)) LOGGER.Debug("onLookUpselectedValue_Control2Set") If FormLoaded = False Then @@ -1590,36 +1674,6 @@ Public Class frmValidator sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _Step = 3 - '' Regulären Ausdruck zum Auslesen der Indexe definieren - 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" - '' einen Regulären Ausdruck laden - 'Dim regulärerAusdruck As Text.RegularExpressions.Regex = New Text.RegularExpressions.Regex(preg) - '' die Vorkommen im SQL-String auslesen - 'Dim elemente As Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(sql_Statement) - ''#### - '' alle Vorkommen innerhalbd er Namenkonvention durchlaufen - 'For Each element As Text.RegularExpressions.Match In elemente - ' Try - ' If LogErrorsOnly = False Then LOGGER.Info(" >> element in RegeX: " & element.Value) - ' Dim MyPattern = element.Value.Substring(2, element.Value.Length - 3) - ' Dim input_value - - ' If MyPattern.Contains(ClassControlCreator.PREFIX_TEXTBOX) Then - ' Dim txt As TextBox = CType(pnldesigner.Controls(MyPattern), TextBox) - ' input_value = txt.Text - ' ElseIf MyPattern.Contains(ClassControlCreator.PREFIX_COMBOBOX) Then - ' Dim cmb1 As ComboBox = CType(pnldesigner.Controls(MyPattern), ComboBox) - ' input_value = cmb1.Text - ' End If - ' sql_Statement = sql_Statement.ToString.Replace(element.Value, input_value) - - ' Catch ex As Exception - ' LOGGER.Info("Unexpected Error in Checking control values for Variable SQL Result ComboBox - ERROR: " & ex.Message) - ' End Try - - 'Next - 'If LogErrorsOnly = False Then LOGGER.Info(">>> sql_Statement after replacement: " & sql_Statement) - _dependingControl_in_action = True _Step = 4 Depending_Control_Set_Result(displayboxname, sql_Statement, ROW.Item(1)) @@ -1633,15 +1687,13 @@ Public Class frmValidator End Try Next End If + Controls2beEnabled(cmb.Name) Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected Error in Eventhandler Variable SQL Result ComboBox - ERROR: " & ex.Message) End Try - - SendKeys.Send("{TAB}") ControlHandleStarted = True - End If End If End Sub From 9216c3fd92c47e77c1ca5cb40602d6c47a4553ba Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 18 Mar 2020 08:39:53 +0100 Subject: [PATCH 10/13] MS --- app/DD_PM_WINDREAM/frmAdministration.vb | 8 +++-- app/DD_PM_WINDREAM/frmValidator.vb | 42 +++++++++++++++---------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 08f011c..a1458d1 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -954,8 +954,12 @@ Public Class frmAdministration Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then - ClassDatabase.Execute_non_Query(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) - BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand + If oSQL <> oForm.SQLCommand Then + ClassDatabase.Execute_non_Query(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) + BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand + BASEDATA_DT_CONFIG.AcceptChanges() + End If + End If Catch ex As Exception MsgBox("Error in Saving SQL Overview: " & vbNewLine & vbNewLine & ex.Message) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index e44fe53..353d4d1 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2367,6 +2367,7 @@ Public Class frmValidator Next Else If omytype = "System.String" Then + MsgBox("IDB Fill Grid with String") oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) Select Case oColValuesfromSource.Length Case 2 @@ -2377,23 +2378,32 @@ Public Class frmValidator oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) End Select ElseIf omytype = "System.Data.DataTable" Then - Dim oMyDatatable As DataTable = oValueFromSource - For Each oRow As DataRow In oMyDatatable.Rows - LOGGER.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...") - oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) - - Select Case oColValuesfromSource.Length - Case 1 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) - Case 2 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) - Case 3 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) - Case 4 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) - End Select - Next + Try + Dim oMyDatatable As DataTable = oValueFromSource + MsgBox($"IDB Fill Grid with Datatable - Rows: " & oMyDatatable.Rows.Count) + For Each oRow As DataRow In oMyDatatable.Rows + LOGGER.Debug($"IDB-Wert Mehrfachfeld: {oRow.Item(0).ToString}...") + oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) + MsgBox($"Item is: {oRow.Item(0).ToString}" & vbNewLine & $"oColValuesfromSource.Length: {oColValuesfromSource.Length}") + Select Case oColValuesfromSource.Length + Case 1 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) + Case 2 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) + Case 3 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) + Case 4 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) + End Select + Next + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) + LOGGER.Error(ex) + End Try + + Else + LOGGER.Debug($"omytype is invalid... {omytype}...") End If End If From ffa0017f4a8842775dfc2d8bd34bf812b51b0e23 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 18 Mar 2020 12:10:03 +0100 Subject: [PATCH 11/13] MS Designer und DropDown GridControl --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- .../frmFormDesigner.Designer.vb | 103 +++++++++++------- app/DD_PM_WINDREAM/frmFormDesigner.resx | 29 ++++- app/DD_PM_WINDREAM/frmFormDesigner.vb | 29 ++++- app/DD_PM_WINDREAM/frmValidator.vb | 24 ++-- 5 files changed, 127 insertions(+), 60 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 0649d40..ef81e1f 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 04baf47..c354c2b 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -66,11 +66,13 @@ Partial Class frmFormDesigner Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.Panel1 = New System.Windows.Forms.Panel() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() @@ -88,6 +90,7 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 @@ -106,7 +109,7 @@ Partial Class frmFormDesigner Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.GroupBox1.Size = New System.Drawing.Size(381, 111) + Me.GroupBox1.Size = New System.Drawing.Size(381, 127) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -116,10 +119,10 @@ Partial Class frmFormDesigner Me.btnButton.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnButton.Image = CType(resources.GetObject("btnButton.Image"), System.Drawing.Image) Me.btnButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnButton.Location = New System.Drawing.Point(213, 15) + Me.btnButton.Location = New System.Drawing.Point(219, 30) Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(82, 26) + Me.btnButton.Size = New System.Drawing.Size(100, 24) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -130,10 +133,10 @@ Partial Class frmFormDesigner Me.btnLine.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLine.Image = CType(resources.GetObject("btnLine.Image"), System.Drawing.Image) Me.btnLine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLine.Location = New System.Drawing.Point(213, 76) + Me.btnLine.Location = New System.Drawing.Point(219, 86) Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(82, 28) + Me.btnLine.Size = New System.Drawing.Size(100, 24) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -144,10 +147,10 @@ Partial Class frmFormDesigner Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTabelle.Image = Global.DD_ProcessManager.My.Resources.Resources.table_add Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTabelle.Location = New System.Drawing.Point(111, 15) + Me.btnTabelle.Location = New System.Drawing.Point(113, 30) Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(98, 26) + Me.btnTabelle.Size = New System.Drawing.Size(100, 24) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -158,10 +161,10 @@ Partial Class frmFormDesigner Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnCheckbox.Image = Global.DD_ProcessManager.My.Resources.Resources.checkbox_16xLG Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCheckbox.Location = New System.Drawing.Point(111, 76) + Me.btnCheckbox.Location = New System.Drawing.Point(113, 86) Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(98, 28) + Me.btnCheckbox.Size = New System.Drawing.Size(100, 24) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,10 +175,10 @@ Partial Class frmFormDesigner Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnVektor.Image = Global.DD_ProcessManager.My.Resources.Resources.ComboBox_16xLG Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVektor.Location = New System.Drawing.Point(9, 76) + Me.btnVektor.Location = New System.Drawing.Point(7, 86) Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(98, 28) + Me.btnVektor.Size = New System.Drawing.Size(100, 24) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -186,10 +189,10 @@ Partial Class frmFormDesigner Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btndtp.Image = Global.DD_ProcessManager.My.Resources.Resources.DateOrTimePicker_675 Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndtp.Location = New System.Drawing.Point(111, 44) + Me.btndtp.Location = New System.Drawing.Point(113, 58) Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(98, 28) + Me.btndtp.Size = New System.Drawing.Size(100, 24) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -200,10 +203,10 @@ Partial Class frmFormDesigner Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btntextbox.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox_708 Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btntextbox.Location = New System.Drawing.Point(9, 44) + Me.btntextbox.Location = New System.Drawing.Point(7, 58) Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(98, 28) + Me.btntextbox.Size = New System.Drawing.Size(100, 24) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -214,10 +217,10 @@ Partial Class frmFormDesigner Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnlabel.Image = Global.DD_ProcessManager.My.Resources.Resources.Label_684 Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnlabel.Location = New System.Drawing.Point(9, 15) + Me.btnlabel.Location = New System.Drawing.Point(7, 30) Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(97, 26) + Me.btnlabel.Size = New System.Drawing.Size(100, 24) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -244,7 +247,7 @@ Partial Class frmFormDesigner ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(70, 100) + Me.Label1.Location = New System.Drawing.Point(50, 60) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -255,7 +258,7 @@ Partial Class frmFormDesigner Me.lblhintergrund.AutoSize = True Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.lblhintergrund.Location = New System.Drawing.Point(70, 70) + Me.lblhintergrund.Location = New System.Drawing.Point(50, 50) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -263,17 +266,15 @@ Partial Class frmFormDesigner ' 'TabControlEigenschaften ' - Me.TabControlEigenschaften.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.TabControlEigenschaften.Controls.Add(Me.pageProperties) Me.TabControlEigenschaften.Controls.Add(Me.pageFormat) + Me.TabControlEigenschaften.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 115) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(0, 0) Me.TabControlEigenschaften.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.TabControlEigenschaften.Name = "TabControlEigenschaften" Me.TabControlEigenschaften.SelectedIndex = 0 - Me.TabControlEigenschaften.Size = New System.Drawing.Size(373, 367) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(381, 356) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties @@ -283,7 +284,7 @@ Partial Class frmFormDesigner Me.pageProperties.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageProperties.Name = "pageProperties" Me.pageProperties.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.pageProperties.Size = New System.Drawing.Size(365, 338) + Me.pageProperties.Size = New System.Drawing.Size(373, 327) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -295,7 +296,7 @@ Partial Class frmFormDesigner Me.pgControls.Location = New System.Drawing.Point(3, 2) Me.pgControls.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pgControls.Name = "pgControls" - Me.pgControls.Size = New System.Drawing.Size(359, 334) + Me.pgControls.Size = New System.Drawing.Size(367, 323) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -307,11 +308,11 @@ Partial Class frmFormDesigner Me.pageFormat.Controls.Add(Me.btnwidth_minus) Me.pageFormat.Controls.Add(Me.btnwidth_plus) Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pageFormat.Location = New System.Drawing.Point(4, 22) + Me.pageFormat.Location = New System.Drawing.Point(4, 25) Me.pageFormat.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageFormat.Name = "pageFormat" Me.pageFormat.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.pageFormat.Size = New System.Drawing.Size(311, 250) + Me.pageFormat.Size = New System.Drawing.Size(373, 327) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -321,10 +322,10 @@ Partial Class frmFormDesigner Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_minus.Location = New System.Drawing.Point(80, 54) + Me.btnheight_minus.Location = New System.Drawing.Point(117, 64) Me.btnheight_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_minus.Name = "btnheight_minus" - Me.btnheight_minus.Size = New System.Drawing.Size(65, 27) + Me.btnheight_minus.Size = New System.Drawing.Size(100, 24) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -335,10 +336,10 @@ Partial Class frmFormDesigner Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_plus.Location = New System.Drawing.Point(10, 54) + Me.btnheight_plus.Location = New System.Drawing.Point(11, 64) Me.btnheight_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_plus.Name = "btnheight_plus" - Me.btnheight_plus.Size = New System.Drawing.Size(64, 27) + Me.btnheight_plus.Size = New System.Drawing.Size(100, 24) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -347,7 +348,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(8, 40) + Me.Label3.Location = New System.Drawing.Point(6, 46) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -356,7 +357,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(8, 2) + Me.Label2.Location = New System.Drawing.Point(6, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -367,10 +368,10 @@ Partial Class frmFormDesigner Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_minus.Location = New System.Drawing.Point(80, 15) + Me.btnwidth_minus.Location = New System.Drawing.Point(117, 20) Me.btnwidth_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_minus.Name = "btnwidth_minus" - Me.btnwidth_minus.Size = New System.Drawing.Size(65, 24) + Me.btnwidth_minus.Size = New System.Drawing.Size(100, 24) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -381,10 +382,10 @@ Partial Class frmFormDesigner Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_plus.Location = New System.Drawing.Point(9, 15) + Me.btnwidth_plus.Location = New System.Drawing.Point(11, 20) Me.btnwidth_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_plus.Name = "btnwidth_plus" - Me.btnwidth_plus.Size = New System.Drawing.Size(65, 24) + Me.btnwidth_plus.Size = New System.Drawing.Size(100, 24) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -488,8 +489,8 @@ Partial Class frmFormDesigner ' 'SplitContainer1.Panel2 ' + Me.SplitContainer1.Panel2.Controls.Add(Me.Panel1) Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1) - Me.SplitContainer1.Panel2.Controls.Add(Me.TabControlEigenschaften) Me.SplitContainer1.Size = New System.Drawing.Size(1227, 483) Me.SplitContainer1.SplitterDistance = 842 Me.SplitContainer1.TabIndex = 25 @@ -497,9 +498,9 @@ Partial Class frmFormDesigner 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) @@ -526,6 +527,13 @@ Partial Class frmFormDesigner Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Designer locked" + Me.BarButtonItem4.Id = 4 + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -535,6 +543,7 @@ Partial Class frmFormDesigner 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Aktionen" ' @@ -557,6 +566,15 @@ Partial Class frmFormDesigner Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.TabControlEigenschaften) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 127) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(381, 356) + Me.Panel1.TabIndex = 23 + ' 'frmFormDesigner ' Me.Appearance.Options.UseFont = True @@ -595,6 +613,7 @@ Partial Class frmFormDesigner CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -646,4 +665,6 @@ Partial Class frmFormDesigner Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Panel1 As Panel End Class diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 2aa0895..9c755e7 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -140,9 +140,6 @@ 206, 17 - - 206, 17 - 17, 56 @@ -243,6 +240,32 @@ MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2 Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFYEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTZWN1cml0eV94NUZf + UGVybWlzc2lvbiI+DQogICAgPHBhdGggZD0iTTI3LDEwaC0zVjhjMC00LjQtMy42LTgtOC04UzgsMy42 + LDgsOHYySDVjLTAuNiwwLTEsMC41LTEsMXYxOGMwLDAuNSwwLjQsMSwxLDFoMjJjMC42LDAsMS0wLjUs + MS0xVjExICAgQzI4LDEwLjUsMjcuNiwxMCwyNywxMHogTTE4LDI0aC00bDEuNC00LjFjLTAuOC0wLjMt + MS40LTEtMS40LTEuOWMwLTEuMSwwLjktMiwyLTJzMiwwLjksMiwyYzAsMC45LTAuNiwxLjYtMS40LDEu + OUwxOCwyNHogTTEyLDEwICAgVjhjMC0yLjIsMS44LTQsNC00czQsMS44LDQsNHYySDEyeiIgY2xhc3M9 + IlllbGxvdyIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 74c9c0a..ced0107 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -8,6 +8,7 @@ Imports DigitalData.Controls.LookupGrid Imports System.Drawing Public Class frmFormDesigner + Public Designer_Locked As Boolean = True Public ProfileId As Integer Public ProfileName As String Public ProfileObjectType As String @@ -33,6 +34,9 @@ Public Class frmFormDesigner Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load Try + BarButtonItem4.Caption = "Designer locked" + BarButtonItem4.ItemAppearance.Normal.BackColor = Color.Red + Designer_Locked = True ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER CURRENT_DESIGN_TYPE = "INPUT_INDEX" @@ -282,8 +286,10 @@ Public Class frmFormDesigner End Sub Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown, btnLine.MouseDown, btnButton.MouseDown + If Designer_Locked Then + Exit Sub + End If Mouse_IsPressed = True - CurrentControl = Nothing End Sub @@ -581,7 +587,7 @@ Public Class frmFormDesigner Return pnldesigner.PointToClient(Cursor.Position) End Function - Private Sub btndelete_Click(sender As System.Object, e As EventArgs) + Private Sub btndelete_Click(sender As System.Object, e As EventArgs) If CurrentControl Is Nothing = False Then DeleteControl(CurrentControl.Name) TabControlEigenschaften.Enabled = False @@ -642,7 +648,7 @@ Public Class frmFormDesigner End If End Sub - Private Sub btnrefresh_Click(sender As Object, e As EventArgs) + Private Sub btnrefresh_Click(sender As Object, e As EventArgs) LoadControls() End Sub @@ -658,6 +664,9 @@ Public Class frmFormDesigner Private Sub OnControl_MouseDown(sender As Control, e As MouseEventArgs) If e.Button = MouseButtons.Left Then + If Designer_Locked Then + Exit Sub + End If CurrentControl = sender Mouse_BeginLocation = e.Location sender.BringToFront() @@ -1179,4 +1188,18 @@ Public Class frmFormDesigner Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick LoadControls() End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + If BarButtonItem4.Caption = "Designer locked" Then + + BarButtonItem4.Caption = "Designer active" + BarButtonItem4.ItemAppearance.Normal.BackColor = Color.Lime + Designer_Locked = False + Else + + BarButtonItem4.Caption = "Designer locked" + BarButtonItem4.ItemAppearance.Normal.BackColor = Color.Red + Designer_Locked = True + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 353d4d1..dc3f6e4 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -55,7 +55,7 @@ Public Class frmValidator Private DTCONTROLS As DataTable Private DTGRID_COLUMNS_WITH_SQL As DataTable Private DTGRID_COLUMNS As DataTable - Private DTGRID_COLUMNS_TEXTBOX As DataTable + Private DTGRID_SQL_DEFINITION As DataTable Public FormLoaded As Boolean = False Private ItemWorked As Boolean = False @@ -231,7 +231,7 @@ Public Class frmValidator End If LOGGER.Debug("Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString) Create_Controls() - Controls2beDisabled + Controls2beDisabled() End If End If @@ -247,7 +247,7 @@ Public Class frmValidator Private Sub Controls2beDisabled() Try Dim oFilteredDatatable As DataTable = DTCONTROLS.Clone() - Dim oExpression = $"LEN(SQL_ENABLE) > 0'" + Dim oExpression = $"LEN(SQL_ENABLE) > 0" DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) If oFilteredDatatable.Rows.Count > 0 Then LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which need to be disabled!!") @@ -256,8 +256,10 @@ Public Class frmValidator Dim oENABLE_GUID = oRowEnablingControl.Item("GUID") Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME") For Each oControl As Control In pnldesigner.Controls - oControl.Enabled = False - Exit For + If oENABLE_GUID = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid Then + oControl.Enabled = False + Exit For + End If Next Next Catch ex As Exception @@ -669,8 +671,8 @@ Public Class frmValidator oSQL = $"SELECT T.* from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE" DTGRID_COLUMNS = ClassDatabase.Return_Datatable(oSQL) - oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.SQL_COMMAND, T.SPALTENNAME from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 1 ORDER BY T.SEQUENCE" - DTGRID_COLUMNS_TEXTBOX = ClassDatabase.Return_Datatable(oSQL) + oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 1 ORDER BY T.SEQUENCE" + DTGRID_SQL_DEFINITION = ClassDatabase.Return_Datatable(oSQL) Dim oCount As Integer = 0 @@ -2654,20 +2656,18 @@ Public Class frmValidator ' set_foreground() If first_control Is Nothing = False Then first_control.Focus() Try - For Each oRow As DataRow In DTGRID_COLUMNS_TEXTBOX.Rows + For Each oRow As DataRow In DTGRID_SQL_DEFINITION.Rows Dim oDEPENDING_GUID = oRow.Item("CONTROL_ID") Dim oDEPENDING_COLUMN = oRow.Item("SPALTENNAME") + Dim oCONNID = oRow.Item("CONNECTION_ID") Dim oSqlCommand = oRow.Item("SQL_COMMAND") oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - - Try - Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand) + Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID) If Not IsNothing(oDTDEPENDING_RESULT) Then For Each oControl As Control In pnldesigner.Controls If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_GUID Then ClassControlCreator.GridTables.Add(oDEPENDING_COLUMN, oDTDEPENDING_RESULT) - Exit For End If Next From f7138569751497a076f553c4a22c65b045034f87 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 18 Mar 2020 14:05:40 +0100 Subject: [PATCH 12/13] MS IDB GridControl with ConnID --- app/DD_PM_WINDREAM/frmValidator.vb | 184 ++++++++++++++++------------- 1 file changed, 102 insertions(+), 82 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index dc3f6e4..33573b4 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -666,7 +666,7 @@ Public Class frmValidator pnldesigner.Controls.Clear() Dim oSQL = $"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{USER_LANGUAGE}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, * FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC" DTCONTROLS = ClassDatabase.Return_Datatable(oSQL) - oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.SQL_COMMAND, T.SPALTENNAME from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 0 ORDER BY T.SEQUENCE" + oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID,T.SQL_COMMAND, T.SPALTENNAME from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 0 ORDER BY T.SEQUENCE" DTGRID_COLUMNS_WITH_SQL = ClassDatabase.Return_Datatable(oSQL) oSQL = $"SELECT T.* from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE" DTGRID_COLUMNS = ClassDatabase.Return_Datatable(oSQL) @@ -1228,6 +1228,8 @@ Public Class frmValidator Case "Override_Direct".ToUpper Override = True Finish_WFStep() + Case "Override incFinal".ToUpper + Finish_WFStep(False) Case Else MsgBox($"No configured action provided for onCustomButtonClick [{oAction}]", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) LOGGER.Warn($"No configured action provided for onCustomButtonClick [{oAction}]") @@ -1624,6 +1626,7 @@ Public Class frmValidator If oSQLColumnDatatable.Rows.Count > 0 Then For Each oRow As DataRow In oSQLColumnDatatable.Rows Dim oDEPENDING_GUID = DTGRID_COLUMNS_WITH_SQL.Rows(0).Item("CONTROL_ID") + Dim oCONNID = DTGRID_COLUMNS_WITH_SQL.Rows(0).Item("CONNECTION_ID") Dim oDEPENDING_COLUMN = DTGRID_COLUMNS_WITH_SQL.Rows(0).Item("SPALTENNAME") Dim oSqlCommand = DTGRID_COLUMNS_WITH_SQL.Rows(0).Item("SQL_COMMAND") If _dependingColumn_in_action = True Then @@ -1633,14 +1636,19 @@ Public Class frmValidator _dependingColumn_in_action = True Try - Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand) - For Each oControl As Control In pnldesigner.Controls - If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_GUID Then - ClassControlCreator.GridTables.Add(oDEPENDING_COLUMN, oDTDEPENDING_RESULT) - _dependingColumn_in_action = False - Exit For - End If - Next + + Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID) + If Not IsNothing(oDTDEPENDING_RESULT) Then + LOGGER.Debug($"Trying to fill the DropDown (DC) for GridColumnGuid [{oDEPENDING_GUID}]..RowCount: [{oDTDEPENDING_RESULT.Rows.Count}] ") + For Each oControl As Control In pnldesigner.Controls + If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_GUID Then + ClassControlCreator.GridTables.Add(oDEPENDING_COLUMN, oDTDEPENDING_RESULT) + _dependingColumn_in_action = False + Exit For + End If + Next + End If + Catch ex As Exception LOGGER.Error(ex) _dependingColumn_in_action = False @@ -2659,22 +2667,26 @@ Public Class frmValidator For Each oRow As DataRow In DTGRID_SQL_DEFINITION.Rows Dim oDEPENDING_GUID = oRow.Item("CONTROL_ID") Dim oDEPENDING_COLUMN = oRow.Item("SPALTENNAME") - Dim oCONNID = oRow.Item("CONNECTION_ID") Dim oSqlCommand = oRow.Item("SQL_COMMAND") + Dim oCONNID = oRow.Item("CONNECTION_ID") oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + Try - Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID) - If Not IsNothing(oDTDEPENDING_RESULT) Then + Dim oDTRESULT_FOR_COLUMN As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID) + If Not IsNothing(oDTRESULT_FOR_COLUMN) Then + LOGGER.Debug($"Trying to create a DropDown(FI) for GridColumnGuid [{oDEPENDING_GUID}]..RowCount: [{oDTRESULT_FOR_COLUMN.Rows.Count}] ") For Each oControl As Control In pnldesigner.Controls If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_GUID Then - ClassControlCreator.GridTables.Add(oDEPENDING_COLUMN, oDTDEPENDING_RESULT) + ClassControlCreator.GridTables.Add(oDEPENDING_COLUMN, oDTRESULT_FOR_COLUMN) Exit For End If Next + Else + LOGGER.Warn($"oDTRESULT_FOR_COLUMN is nothing!") End If Catch ex As Exception - LOGGER.Warn($"Unexpected error in creating dropdown for oDEPENDING_GUID {oDEPENDING_GUID} an Column {oDEPENDING_COLUMN} " & ex.Message) + LOGGER.Warn($"Unexpected error in creating dropdown(FI) for oDEPENDING_GUID {oDEPENDING_GUID} an Column {oDEPENDING_COLUMN} " & ex.Message) End Try Next @@ -2849,7 +2861,7 @@ Public Class frmValidator Return False End Try End Function - Sub Finish_WFStep() + Sub Finish_WFStep(Optional includeFI As Boolean = True) btnSave.Enabled = False LOGGER.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet") ItemWorked = True @@ -2864,81 +2876,89 @@ Public Class frmValidator End If End If - 'lblerror.Visible = False - Try - TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) - Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING - If oDTFinalIndexes?.Rows.Count > 0 Then - 'Jetzt finale Indexe setzen - LOGGER.Debug("FINAL INDEXING STARTING...") - For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows - Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString - Dim oIndexType = 0 - If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### - LOGGER.Debug("Indexing wih dynamic sql...") - Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND") - - oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - If IsNothing(oSQLCommand) Then - errormessage = "Error while replacing Values in final indexing - Check the log" - My.Settings.Save() - frmError.ShowDialog() - oErrorOcurred = True - ItemWorked = False - End If - If Not IsNothing(oSQLCommand) Then - Dim oResultfromSQL = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) + If includeFI = True Then + Try + TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) + Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING + If oDTFinalIndexes?.Rows.Count > 0 Then + 'Jetzt finale Indexe setzen + LOGGER.Debug("FINAL INDEXING STARTING...") + For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows + Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString + Dim oIndexType = 0 + + If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### + LOGGER.Debug("Indexing wih dynamic sql...") + Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND") + + oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + If IsNothing(oSQLCommand) Then + errormessage = "Error while replacing Values in final indexing - Check the log" + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + ItemWorked = False + End If + If Not IsNothing(oSQLCommand) Then + Dim oResultfromSQL = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) - If Not IsNothing(oResultfromSQL) Then - LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]") - oValue = oResultfromSQL - Else - LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") + If Not IsNothing(oResultfromSQL) Then + LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]") + oValue = oResultfromSQL + Else + LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") + End If End If - End If - Else - If oValue.StartsWith("v") Then - Select Case oFinalIndexRow.Item("VALUE").ToString - Case "vDate" - oValue = Now.ToShortDateString - Case "vUserName" - oValue = USER_USERNAME - Case Else - oValue = oFinalIndexRow.Item("VALUE") - End Select + Else + If oValue.StartsWith("v") Then + Select Case oFinalIndexRow.Item("VALUE").ToString + Case "vDate" + oValue = Now.ToShortDateString + Case "vUserName" + oValue = USER_USERNAME + Case Else + oValue = oFinalIndexRow.Item("VALUE") + End Select + End If End If - End If - If oErrorOcurred Then - Exit For - End If - Dim oResult() As String - ReDim Preserve oResult(0) - oResult(0) = oValue + If oErrorOcurred Then + Exit For + End If + Dim oResult() As String + ReDim Preserve oResult(0) + oResult(0) = oValue - LOGGER.Debug($"oIndexType {oIndexType.ToString}") + LOGGER.Debug($"oIndexType {oIndexType.ToString}") - LOGGER.Debug("Now the final indexing...") - Dim oFIResult As Boolean = False - If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then - oFIResult = True - LOGGER.Debug("Final index IDB '" & oFinalIndexRow.Item("INDEXNAME") & "' was updated.") - End If + LOGGER.Debug("Now the final indexing...") + Dim oFIResult As Boolean = False + If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then + oFIResult = True + LOGGER.Debug("Final index IDB '" & oFinalIndexRow.Item("INDEXNAME") & "' was updated.") + End If - If oFIResult = False Then - errormessage = "Error in final indexing:" & vbNewLine & idxerr_message - My.Settings.Save() - frmError.ShowDialog() - oErrorOcurred = True - ItemWorked = False - End If + If oFIResult = False Then + errormessage = "Error in final indexing:" & vbNewLine & idxerr_message + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + ItemWorked = False + End If + + If oErrorOcurred = True Then + ItemWorked = False + Exit For + End If + Next + End If + Catch ex As Exception + LOGGER.Warn($"Error in finalIndexing: {ex.Message}") + oErrorOcurred = True + End Try + End If + Try - If oErrorOcurred = True Then - ItemWorked = False - Exit For - End If - Next - End If ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde If Override = True And Override_SQLCommand <> "" Then ClassDatabase.Execute_non_Query(Override_SQLCommand) From 77d5ec923b32df51a73bb7d531fceb27ff976dd0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 20 Apr 2020 15:16:57 +0200 Subject: [PATCH 13/13] fix LogConfig constructor --- app/DD_PM_WINDREAM/ClassInit.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index de049f7..56395df 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -14,7 +14,7 @@ Public Class ClassInit Public Sub InitLogger() - LOGCONFIG = New LogConfig(LogConfig.PathType.AppData) + LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Process Manager") LOGGER = LOGCONFIG.GetLogger("ProcessManager") LOGGER.Info("## ProcessManager started - {0}", Now)