diff --git a/MARVIN_IST_COOL.txt b/MARVIN_IST_COOL.txt index e69de29..dab12f0 100644 --- a/MARVIN_IST_COOL.txt +++ b/MARVIN_IST_COOL.txt @@ -0,0 +1 @@ +Aber El Raho ist cooler! \ No newline at end of file diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index 17b47e0..5eea3d6 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -1,5 +1,5 @@ - - + + @@ -42,7 +42,7 @@ - + @@ -85,8 +85,8 @@ - - + + - + diff --git a/app/TaskFlow.sln b/app/TaskFlow.sln index 93d8ea9..b5bd68e 100644 --- a/app/TaskFlow.sln +++ b/app/TaskFlow.sln @@ -7,6 +7,10 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windream", "..\..\..\2_DLL Projekte\DDModules\Windream\Windream.vbproj", "{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControl", "..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\LookupControl.vbproj", "{3DCD6D1A-C830-4241-B7E4-27430E7EA483}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|Any CPU = CD_ROM|Any CPU @@ -61,6 +65,46 @@ Global {6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86 {6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86 {6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86 + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|Any CPU.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|Any CPU.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|x86.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|x86.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|x86.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|x86.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|Any CPU.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|x86.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|x86.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|Any CPU.Build.0 = Release|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|x86.ActiveCfg = Release|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|x86.Build.0 = Release|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|Any CPU.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|Any CPU.Build.0 = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|x86.ActiveCfg = Debug|Any CPU + {4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|x86.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|Any CPU.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|Any CPU.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|x86.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|x86.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|x86.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|x86.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|Any CPU.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|x86.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|x86.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.Build.0 = Release|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|x86.ActiveCfg = Release|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|x86.Build.0 = Release|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|Any CPU.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|Any CPU.Build.0 = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|x86.ActiveCfg = Debug|Any CPU + {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index f43c87f..d7a498c 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -512,7 +512,7 @@ Public Class ClassControlCreator oView.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CellSelect oView.OptionsSelection.MultiSelect = True oView.OptionsClipboard.CopyColumnHeaders = DefaultBoolean.False - + 'oView.OptionsView.ColumnAutoWidth = True If oView.OptionsBehavior.ReadOnly = False Then If row.Item("VKT_ADD_ITEM") = True Then oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True diff --git a/app/TaskFlow/ClassFinalizeDoc.vb b/app/TaskFlow/ClassFinalizeDoc.vb index e3d2979..430c253 100644 --- a/app/TaskFlow/ClassFinalizeDoc.vb +++ b/app/TaskFlow/ClassFinalizeDoc.vb @@ -1,4 +1,5 @@ -Imports DigitalData.Modules.EDMI.API.Constants +Imports DevExpress.DataAccess.Native.Json +Imports DigitalData.Modules.EDMI.API.Constants Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Public Class ClassFinalizeDoc @@ -18,10 +19,11 @@ Public Class ClassFinalizeDoc 'Jetzt finale Indexe setzen LOGGER.Debug("working final indices for doc: " & WMObject.aName) For Each dr As DataRow In CURRENT_DT_FINAL_INDEXING.Rows - Dim value As String = dr.Item("VALUE").ToString + Dim ovalueString As String = dr.Item("VALUE").ToString Dim INDEXNAME = dr.Item("INDEXNAME").ToString Dim oContinueOnIndifferentState As Boolean = CBool(dr.Item("CONTINUE_INDETERMINED")) - If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### + Dim VektorBeahaviour = dr.Item("IF_VEKTOR_BEHAVIOUR").ToString + If ovalueString.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 @@ -52,32 +54,32 @@ Public Class ClassFinalizeDoc LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement) Dim oDynamic_value = DatabaseFallback.GetScalarValueECM(sql_Statement) ', CONNECTION_STRING_ECM, "Write_Final_Metadata/dynamic_value") If Not IsNothing(oDynamic_value) Then - value = oDynamic_value + ovalueString = oDynamic_value Else Continue For End If Else - If value.StartsWith("v") Then + If ovalueString.StartsWith("v") Then Select Case dr.Item("VALUE").ToString Case "vDate" - value = Now.ToShortDateString + ovalueString = Now.ToShortDateString Case "vUserName" - value = USER_USERNAME + ovalueString = USER_USERNAME Case Else - value = dr.Item("VALUE") + ovalueString = dr.Item("VALUE") End Select End If End If Dim result() As String ReDim Preserve result(0) - result(0) = value + result(0) = ovalueString 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 - If Indexiere_VektorfeldPM(value, INDEXNAME, WMObject) = True Then + If Indexiere_VektorfeldPM(ovalueString, INDEXNAME, WMObject) = True Then LOGGER.Debug("FINALER INDEX '" & INDEXNAME.Replace("[%VKT", "") & "' WURDE ERFOLGREICH GESETZT") Else @@ -87,12 +89,13 @@ Public Class ClassFinalizeDoc End If Else LOGGER.Debug("now indexing..") - If Indexiere_File(INDEXNAME, result, WMObject) = True Then + + If WINDREAM_MOD.SetFileIndex(CURRENT_DOC_PATH, INDEXNAME, ovalueString, CURRENT_WMObjecttype) = True Then 'Indexiere_File(INDEXNAME, result, WMObject) = True Then LOGGER.Debug("FINALER INDEX '" & INDEXNAME & "' WURDE ERFOLGREICH GESETZT") LOGGER.Debug("") 'Nun das Logging If CURRENT_PROFILE_LOG_INDEX <> "" Then - Dim logstr = Return_LOGString(value, "DDFINALINDEX", INDEXNAME) + Dim logstr = Return_LOGString(ovalueString, "DDFINALINDEX", INDEXNAME) Indexiere_VektorfeldPM(logstr, CURRENT_PROFILE_LOG_INDEX, WMObject) End If @@ -120,39 +123,73 @@ Public Class ClassFinalizeDoc End Try End Function - Private Shared Function Indexiere_File(idxxname As String, idxvalue As Object, WMObject As WINDREAMLib.WMObject) - Dim File_indexiert As Boolean = False + Private Shared Function Indexiere_File(pIndexName As String, pIndexValues As Object, WMObject As WINDREAMLib.WMObject) As Boolean + LOGGER.Debug("### Indexiere_File Begin ###") + Dim indexierung_erfolgreich As Boolean = False + Try + Dim oIndexType As Integer = WINDREAM_MOD.GetIndexType(pIndexName) + If oIndexType > 4095 Then + LOGGER.Debug("Es Handelt sich um einen VektorIndex...") + Dim oExistingItems = WINDREAM_MOD.GetIndexValue(CURRENT_DOC_PATH, pIndexName) + + Dim oListofString As New List(Of String) + If pIndexValues.Length = 0 Then + LOGGER.Debug("oSplitArray.Length = 0") + oListofString.Add(pIndexValues(0)) + Else + LOGGER.Debug($"pIndexValues.Length is > 0 [{pIndexValues.length}] ...") + For Each oStr In pIndexValues + LOGGER.Debug("pIndexValues - oString : {0}", oStr) + oListofString.Add(oStr) + Next + End If + + If oExistingItems.Count > 0 Then + LOGGER.Debug("oOverwrite = False and WMObject already contains [{0}] values in attribute,Values will be concatted", oExistingItems.Count) + oListofString = oExistingItems.Concat(oListofString).ToList() + End If + oListofString = oListofString.Distinct().ToList() + indexierung_erfolgreich = WINDREAM_MOD.SetFileIndexLoS(CURRENT_DOC_PATH, pIndexName, oListofString, CURRENT_WMObjecttype) + Else + Dim oStringValue As String = pIndexValues(0).ToString + indexierung_erfolgreich = WINDREAM_MOD.SetFileIndex(CURRENT_DOC_PATH, pIndexName, oStringValue, CURRENT_WMObjecttype) + End If + Return indexierung_erfolgreich + Catch ex As Exception + LOGGER.Warn("Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString) + Return False + End Try ' 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 - 'Dim _windreamPM As New ClassPMWindream - 'Jetzt das eigentliche Indexieren der Datei - File_indexiert = WINDREAM.RunIndexing(WMObject, arrIndex, arrValue) + ''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 + ' 'Dim _windreamPM As New ClassPMWindream + ' 'Jetzt das eigentliche Indexieren der Datei + 'File_indexiert = WINDREAM.RunIndexing(WMObject, arrIndex, arrValue) - Return File_indexiert - End If + 'Return File_indexiert + ' End If 'Catch ex As Exception ' LOGGER.Info("Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString, True) diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb index 5a9b160..d4a375f 100644 --- a/app/TaskFlow/ClassInit.vb +++ b/app/TaskFlow/ClassInit.vb @@ -208,6 +208,7 @@ Public Class ClassInit ' We initialize the Class in anycase. ' If there is no client, it will fall back to the db by itself DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB) + If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then Return True ElseIf dbECMInitialized = True And CONNECTION_STRING_IDB <> String.Empty Then @@ -501,7 +502,6 @@ Public Class ClassInit BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStep = "TBPM_PROFILE_SEARCH" oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" - 'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX") BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .SortByColumn = "PROFILE_ID,TAB_INDEX" }) diff --git a/app/TaskFlow/ClassPMWindream.vb b/app/TaskFlow/ClassPMWindream.vb index 02bd2b6..e847dfc 100644 --- a/app/TaskFlow/ClassPMWindream.vb +++ b/app/TaskFlow/ClassPMWindream.vb @@ -159,13 +159,19 @@ Public Class ClassPMWindream 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 + If value = "String.Empty" Then + convertValue = vbEmpty + Else + 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 + Else + convertValue = CInt(value) End If - convertValue = CInt(value) + _int = True Case WMObjectVariableValueTypeInteger64bit LOGGER.Debug("Typ des windream-Indexes: Integer64bit") @@ -289,7 +295,10 @@ Public Class ClassPMWindream 'ReDim ArrName(0) 'ArrName(0) = "Tournr" 'oDocument.SetValues(ArrName, ArrValues) - If _int = True Then + If convertValue = "String.Empty" Or convertValue = vbEmpty Then + LOGGER.Debug("Now Indexing simpleAttribute with vbEmpty ...") + oDocument.SetVariableValue(aName, String.Empty) + ElseIf _int = True Then oDocument.SetVariableValue(aName, CInt(convertValue)) ElseIf _date = True Then oDocument.SetVariableValue(aName, CDate(convertValue)) @@ -414,7 +423,13 @@ Public Class ClassPMWindream LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray) 'Jetzt die Nachindexierung für Vektor-Felder - oDocument.SetVariableValue(aName, myArray) + If myArray(0) = "String.Empty" Then + LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...") + oDocument.SetVariableValue(aName, vbEmpty) + Else + oDocument.SetVariableValue(aName, myArray) + End If + LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False) End If End If diff --git a/app/TaskFlow/ClassParamRefresh.vb b/app/TaskFlow/ClassParamRefresh.vb index 454467f..152fac5 100644 --- a/app/TaskFlow/ClassParamRefresh.vb +++ b/app/TaskFlow/ClassParamRefresh.vb @@ -62,7 +62,7 @@ Public Class ClassParamRefresh LOGGER.Debug($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]") ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then SHOW_MASS_VALIDATOR = False - LOGGER.Debug($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]") + LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]") ElseIf oMode = "PM.NO_CHARTS" Then SHOW_CHARTS = False LOGGER.Debug($"SHOW_CHARTS [{SHOW_CHARTS}]") @@ -79,7 +79,7 @@ Public Class ClassParamRefresh IDB_USES_WMFILESTORE = True ElseIf oMode = "PM.NO_BASICCONF" Then BASIC_CONF_VISIBLE = False - LOGGER.Debug($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]") + LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]") ElseIf oMode = "PM.SYS_LOCKED_MAINTENANCE" Then SYS_LOCKED_MAINTENANCE = True ElseIf oMode.StartsWith("PM.IDB_CONID!") Then @@ -104,13 +104,13 @@ Public Class ClassParamRefresh End If ElseIf oMode = "PM.EXCEL_OVERVIEW" Then EXCEL_OVERVIEW = True - LOGGER.Debug($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]") + LOGGER.Info($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]") ElseIf oMode = "PM.MONITORING" Then MONITORING_ACTIVE = True LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]") ElseIf oMode = "PM.GHOSTMODE" Then GHOSTMODE_ACTIVE = True - LOGGER.Debug($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]") + LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]") ElseIf oMode.StartsWith("PM.COLORSCHEME") Then Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "") RIBBON_COLOR_SCHEME = oColorScheme.ToUpper @@ -158,6 +158,24 @@ Public Class ClassParamRefresh Catch ex As Exception LAST_ADDED_COLUMN = "" + End Try + ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then + Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "") + Try + MON_EDITED_COLUMN = oLEDITEDCOL + LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}") + Catch ex As Exception + + + End Try + ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then + Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "") + Try + MON_ADDED_COLUMN = oLEDITEDCOL + LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}") + Catch ex As Exception + + End Try ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "") diff --git a/app/TaskFlow/ClassSQLEditor.vb b/app/TaskFlow/ClassSQLEditor.vb index bb9ae58..c5966eb 100644 --- a/app/TaskFlow/ClassSQLEditor.vb +++ b/app/TaskFlow/ClassSQLEditor.vb @@ -16,26 +16,34 @@ Public Class ClassSQLEditor Dim oValueObject = DirectCast(value, SQLValue) Dim oSQLString As String = oValueObject.Value - Dim oSQLConnection As Integer = oValueObject.ConnectionId + 'Dim oSQLConnection As Integer = oValueObject.ConnectionId If oService IsNot Nothing AndAlso oSQLString IsNot Nothing Then 'CURRENT_DESIGN_TYPE = "INPUT_INDEX" Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) oForm.SQLCommand = oSQLString - oForm.SQLConnection = oSQLConnection + oForm.SQLConnection = 0 'oSQLConnection oForm.PlaceholdersManualPrefix = "CTRL" oForm.PlaceholdersManualTitle = "Controls" oForm.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST. ToDictionary(Function(name) name, Function(name) name) + If IDB_ACTIVE = False Then + oForm.ATTRIBUTE_STORE = "WM" + oForm.PlaceholdersWindream = MVSource_AllIndicies + Else + oForm.ATTRIBUTE_STORE = "IDB" + End If If oService.ShowDialog(oForm) = DialogResult.OK Then - Dim sql As New SQLValue(oForm.SQLCommand, oForm.SQLConnection) + Dim sql As New SQLValue(oForm.SQLCommand) ', oForm.SQLConnection ' CURRENT_CONN_ID_FINAL_INDEX = oForm.SQLConnection ' CURRENT_CONN_ID = oForm.SQLConnection value = sql End If + End Using + End If Return value diff --git a/app/TaskFlow/ClassSQLValue.vb b/app/TaskFlow/ClassSQLValue.vb index 298de3c..32ef9ab 100644 --- a/app/TaskFlow/ClassSQLValue.vb +++ b/app/TaskFlow/ClassSQLValue.vb @@ -7,18 +7,18 @@ Imports System.Drawing.Design Public Class SQLValue Public Property Value As String - Public Property ConnectionId As Integer + 'Public Property ConnectionId As Integer Public Sub New() Value = "" End Sub - Public Sub New(value As String) - Me.Value = value - End Sub + 'Public Sub New(value As String) + ' Me.Value = value + 'End Sub - Public Sub New(pValue As String, pConnectionId As Integer) + Public Sub New(pValue As String) ', pConnectionId As Integer) Value = pValue - ConnectionId = pConnectionId + ' ConnectionId = pConnectionId End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/FinalIndexDataSet.xss b/app/TaskFlow/FinalIndexDataSet.xss index 927c753..6914c17 100644 --- a/app/TaskFlow/FinalIndexDataSet.xss +++ b/app/TaskFlow/FinalIndexDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll new file mode 100644 index 0000000..2ad8950 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll new file mode 100644 index 0000000..387246a Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll new file mode 100644 index 0000000..b9ba4a3 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll new file mode 100644 index 0000000..8f60b41 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll new file mode 100644 index 0000000..a96a316 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll new file mode 100644 index 0000000..6d24c8b Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll new file mode 100644 index 0000000..2287de5 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll new file mode 100644 index 0000000..4984254 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.filters.64.dll b/app/TaskFlow/GdPicture.NET.14.filters.64.dll new file mode 100644 index 0000000..0f3e367 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.filters.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.filters.dll b/app/TaskFlow/GdPicture.NET.14.filters.dll new file mode 100644 index 0000000..938c3f3 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.filters.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.64.dll b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.64.dll new file mode 100644 index 0000000..80b0cf9 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll new file mode 100644 index 0000000..88eeff8 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll b/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll new file mode 100644 index 0000000..af684ac Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.machine.vision.dll b/app/TaskFlow/GdPicture.NET.14.machine.vision.dll new file mode 100644 index 0000000..da04adb Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.machine.vision.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll b/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll new file mode 100644 index 0000000..045fdd3 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.twain.client.dll b/app/TaskFlow/GdPicture.NET.14.twain.client.dll new file mode 100644 index 0000000..51d630b Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.twain.client.dll differ diff --git a/app/TaskFlow/ModuleControlProperties.vb b/app/TaskFlow/ModuleControlProperties.vb index 55ee917..eab8a9c 100644 --- a/app/TaskFlow/ModuleControlProperties.vb +++ b/app/TaskFlow/ModuleControlProperties.vb @@ -84,7 +84,7 @@ Public Module ModuleControlProperties Private _index_type As String Private _sql_command As String - Friend _sql_connection As Integer = 0 + 'Friend _sql_connection As Integer = 0 Private _Enable_SQL As String Private _Enable_SQL_ONLOAD As String Private _default_value @@ -124,36 +124,37 @@ Public Module ModuleControlProperties Public Property SQLCommand() As SQLValue Get - Return New SQLValue(NotNull(_sql_command, ""), _sql_connection) + Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection End Get Set(ByVal value As SQLValue) _sql_command = value.Value - SQLConnection = value.ConnectionId + 'SQLConnection = value.ConnectionId + End Set End Property - - - <[ReadOnly](True)> - Public Property SQLConnection() As Integer - Get - Return _sql_connection - End Get - Set(value As Integer) - _sql_connection = value - End Set - End Property + ' + ' + '<[ReadOnly](True)> + 'Public Property SQLConnection() As Integer + ' Get + ' Return _sql_connection + ' End Get + ' Set(value As Integer) + ' _sql_connection = value + ' End Set + 'End Property Public Property Enable_SQL() As SQLValue Get - Return New SQLValue(NotNull(_Enable_SQL, ""), _sql_connection) + Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection End Get Set(ByVal value As SQLValue) _Enable_SQL = value.Value - SQLConnection = value.ConnectionId + 'SQLConnection = value.ConnectionId End Set End Property @@ -162,11 +163,11 @@ Public Module ModuleControlProperties Public Property Enable_SQL_OnLoad() As SQLValue Get - Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, ""), _sql_connection) + Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection End Get Set(ByVal value As SQLValue) _Enable_SQL_ONLOAD = value.Value - SQLConnection = value.ConnectionId + 'SQLConnection = value.ConnectionId End Set End Property @@ -189,11 +190,11 @@ Public Module ModuleControlProperties Public Property SetControlData As SQLValue Get - Return New SQLValue(_set_control_data, _sql_connection) + Return New SQLValue(_set_control_data) ', _sql_connection End Get Set(value As SQLValue) _set_control_data = value.Value - SQLConnection = value.ConnectionId + 'SQLConnection = value.ConnectionId End Set End Property End Class @@ -345,11 +346,11 @@ Public Module ModuleControlProperties Public Property Override_SQL() As SQLValue Get - Return New SQLValue(NotNull(_Override_SQL, ""), _sql_connection) + Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection End Get Set(ByVal value As SQLValue) _Override_SQL = value.Value - SQLConnection = value.ConnectionId + 'SQLConnection = value.ConnectionId End Set End Property End Class diff --git a/app/TaskFlow/ModuleFinalIndexProperties.vb b/app/TaskFlow/ModuleFinalIndexProperties.vb index f0c8e8e..fbd0558 100644 --- a/app/TaskFlow/ModuleFinalIndexProperties.vb +++ b/app/TaskFlow/ModuleFinalIndexProperties.vb @@ -11,10 +11,10 @@ Module ModuleFinalIndexProperties <[ReadOnly](True)> Public Property GUID As Integer - - - <[ReadOnly](True)> - Public Property ConnectionId As Integer + ' + ' + '<[ReadOnly](True)> + 'Public Property ConnectionId As Integer Public Property Description As String @@ -97,6 +97,7 @@ Module ModuleFinalIndexProperties Public Property VectorBehaviourType As List(Of String) Public Sub VectorIndexBooleanProvider(attrs As PropertyAttributes) + 'Sd MaybeSetReadOnlyIfNotVectorIndex(attrs) End Sub @@ -182,7 +183,12 @@ Module ModuleFinalIndexProperties If indexType.Contains(type) Then attrs.IsBrowsable = True Else - attrs.IsBrowsable = False + If attrs.DisplayName = "Index Behaviour" Then + attrs.IsBrowsable = True + Else + attrs.IsBrowsable = False + End If + End If End Sub diff --git a/app/TaskFlow/ModuleRuntimeVariables.vb b/app/TaskFlow/ModuleRuntimeVariables.vb index 7db4ba6..ff51a68 100644 --- a/app/TaskFlow/ModuleRuntimeVariables.vb +++ b/app/TaskFlow/ModuleRuntimeVariables.vb @@ -91,6 +91,8 @@ Module ModuleRuntimeVariables Public Property INACTIVITYRecognized As Boolean = False Public Property LAST_EDITED_COLUMN As String = "NONE" Public Property LAST_ADDED_COLUMN As String = "NONE" + Public Property MON_EDITED_COLUMN As String = "NONE" + Public Property MON_ADDED_COLUMN As String = "NONE" Public Property USE_APPSERVER As Boolean = False Public Property SEARCH1 As String = "" Public Property SEARCH2 As String = "" @@ -181,4 +183,6 @@ Module ModuleRuntimeVariables Public LIC_MODULES As String = "NONE" Public oSQLLoginAttempt As String + + Public MVSource_AllIndicies As List(Of String) End Module diff --git a/app/TaskFlow/README.txt b/app/TaskFlow/README.txt new file mode 100644 index 0000000..58cbced --- /dev/null +++ b/app/TaskFlow/README.txt @@ -0,0 +1,5 @@ +BASE MODULE +=========== + +This module is intended for often used constants and datastructures. +Therefor it is important that this module does not have any dependencies on other modules!! \ No newline at end of file diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 4c9830a..34adb31 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -1,5 +1,6 @@  + Debug x86 @@ -159,25 +160,28 @@ False - ..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll - - ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll + + + ..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll ..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll + + ..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll + + + ..\packages\DigitalData.Modules.Filesystem.1.3.3\lib\net462\DigitalData.Modules.Filesystem.dll ..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll @@ -188,14 +192,21 @@ ..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll - + + ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + + False - ..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll - - ..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + + ..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll - + + ..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll + + + False ..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll @@ -210,9 +221,85 @@ ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll + P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + True + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll False @@ -229,6 +316,9 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True + + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -236,6 +326,12 @@ ..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -263,6 +359,9 @@ ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + ..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll @@ -277,6 +376,9 @@ + + ..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll + @@ -286,6 +388,7 @@ ..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll + ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll @@ -1145,6 +1248,22 @@ + + + + + + + + + + + + + + + + PreserveNewest @@ -1172,6 +1291,7 @@ + @@ -1250,7 +1370,10 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + +