diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb index 93dd066..46436ca 100644 --- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb +++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb @@ -190,7 +190,7 @@ Public Class ClassAllgemeineFunktionen LOGGER.Info(" Fehler bei Move2Folder", True) LOGGER.Info(">> Fehlermeldung") LOGGER.Info(">>" & ex.Message) - Insert_LogEntry(Profile_ID, "Fehler bei Move2Folder: " & ex.Message, Environment.UserName) + Insert_LogEntry(Profile_ID, "Fehler bei Move2Folder: " & ex.Message, USER_USERNAME) Return ex.Message End Try End Function @@ -276,7 +276,7 @@ Public Class ClassAllgemeineFunktionen Catch ex As Exception LOGGER.Error(ex) MsgBox("Unvorhergesehener Fehler bei Execute_Scalar_SQLServer" & vbNewLine & "Automatischer Index (j/n): " & check.ToString & vbNewLine & "Fehler:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler bei Ausführen sql:") - Insert_LogEntry(profil_id, "Unvorhergesehener Fehler bei Execute_Scalar_Oracle: " & ex.Message, Environment.UserName) + Insert_LogEntry(profil_id, "Unvorhergesehener Fehler bei Execute_Scalar_Oracle: " & ex.Message, USER_USERNAME) LOGGER.Info(" - Unvorhergesehener Fehler bei Execute_Scalar_SQLServer" & vbNewLine & "Automatischer Index (j/n): " & check.ToString & vbNewLine & "Fehler: " & vbNewLine & ex.Message) LOGGER.Info(" - SQL: " & vsql_statement) LOGGER.Info(" - Connection: " & vconnectionString) @@ -310,7 +310,7 @@ Public Class ClassAllgemeineFunktionen Catch ex As Exception LOGGER.Error(ex) MsgBox("Unvorhergesehener Fehler bei Execute_Scalar_Oracle" & vbNewLine & "Automatischer Index (j/n): " & check.ToString & vbNewLine & "Fehler:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler bei Ausführen sql:") - Insert_LogEntry(profil_id, "Unvorhergesehener Fehler bei Execute_Scalar_Oracle: " & ex.Message, Environment.UserName) + Insert_LogEntry(profil_id, "Unvorhergesehener Fehler bei Execute_Scalar_Oracle: " & ex.Message, USER_USERNAME) LOGGER.Info(" - Unvorhergesehener Fehler bei Execute_Scalar_Oracle" & vbNewLine & "Automatischer Index (j/n): " & check.ToString & vbNewLine & "Fehler: " & vbNewLine & ex.Message) LOGGER.Info(" - SQL: " & vsql_statement) LOGGER.Info(" - Connection: " & vconnectionString) diff --git a/app/DD_PM_WINDREAM/ClassAnnotation.vb b/app/DD_PM_WINDREAM/ClassAnnotation.vb index 5fa3a36..cadcc23 100644 --- a/app/DD_PM_WINDREAM/ClassAnnotation.vb +++ b/app/DD_PM_WINDREAM/ClassAnnotation.vb @@ -3,7 +3,7 @@ Imports PdfSharp.Pdf.Annotations Imports PdfSharp.Pdf.IO Imports PdfSharp.Drawing Public Class ClassAnnotation - Public Shared Function Annotate_PDF(title As String, content As String, page As Integer, Optional ycorrect As Integer = 0, Optional sizecorrect As Integer = 0) + Public Shared Function Annotate_PDF(title As String, content As String, page As Integer, fromGui As Boolean, Optional ycorrect As Integer = 0, Optional sizecorrect As Integer = 0) Try Dim doc As PdfDocument = PdfReader.Open(CURRENT_DOC_PATH, PdfDocumentOpenMode.Modify) Dim firstPage As PdfPage = doc.Pages(page) @@ -23,6 +23,9 @@ Public Class ClassAnnotation doc.Save(CURRENT_DOC_PATH) Return True Catch ex As Exception + If fromGui = True Then + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Annotate pdf:") + End If LOGGER.Error(ex) LOGGER.Info("Unexpected error in Annotate pdf: " & ex.Message, False) Return False diff --git a/app/DD_PM_WINDREAM/ClassDatabase.vb b/app/DD_PM_WINDREAM/ClassDatabase.vb index 99c0c37..dbc49e0 100644 --- a/app/DD_PM_WINDREAM/ClassDatabase.vb +++ b/app/DD_PM_WINDREAM/ClassDatabase.vb @@ -83,13 +83,13 @@ Public Class ClassDatabase Return Nothing End Try End Function - Public Shared Function Return_Datatable_CS(SQLCommand As String, Conn_ID As Integer, Optional userInput As Boolean = False) + Public Shared Function Return_Datatable_ConId(SQLCommand As String, ConnID As Integer, Optional userInput As Boolean = False) Try - Dim oConString As String = Get_ConnectionString(Conn_ID) + Dim oConnString = Get_ConnectionString(ConnID) LOGGER.Debug(">>> ReturnDatatable: " & SQLCommand) Dim oSQLconnect As New SqlClient.SqlConnection Dim oSQLcommand As SqlClient.SqlCommand - oSQLconnect.ConnectionString = oConString + oSQLconnect.ConnectionString = oConnString oSQLconnect.Open() oSQLcommand = oSQLconnect.CreateCommand oSQLcommand.CommandText = SQLCommand @@ -102,9 +102,34 @@ Public Class ClassDatabase Catch ex As Exception LOGGER.Error(ex) If userInput = True Then - MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & SQLCommand, MsgBoxStyle.Critical) + MsgBox("Error in Return_Datatable_ConId - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & SQLCommand, MsgBoxStyle.Critical) End If - LOGGER.Info("Fehler bei Return_Datatable_CS: " & ex.Message, True) + LOGGER.Info("Fehler bei Return_Datatable_ConId: " & ex.Message, True) + LOGGER.Info("#SQL: " & SQLCommand, False) + Return Nothing + End Try + End Function + Public Shared Function Return_Datatable_ConStr(SQLCommand As String, ConNStr As String, Optional userInput As Boolean = False) + Try + LOGGER.Debug(">>> ReturnDatatable: " & SQLCommand) + Dim oSQLconnect As New SqlClient.SqlConnection + Dim oSQLcommand As SqlClient.SqlCommand + oSQLconnect.ConnectionString = ConNStr + oSQLconnect.Open() + oSQLcommand = oSQLconnect.CreateCommand + oSQLcommand.CommandText = SQLCommand + + Dim oSQLAdapter As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(oSQLcommand) + Dim oReturnDatatable As DataTable = New DataTable() + oSQLAdapter.Fill(oReturnDatatable) + oSQLconnect.Close() + Return oReturnDatatable + Catch ex As Exception + LOGGER.Error(ex) + If userInput = True Then + MsgBox("Error in Return_Datatable_ConStr - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & SQLCommand, MsgBoxStyle.Critical) + End If + LOGGER.Info("Fehler bei Return_Datatable_ConStr: " & ex.Message, True) LOGGER.Info("#SQL: " & SQLCommand, False) Return Nothing End Try @@ -114,12 +139,11 @@ Public Class ClassDatabase Dim SQLconnect As New SqlClient.SqlConnection Dim SQLcommand As SqlClient.SqlCommand SQLconnect.ConnectionString = SQLSERVERConnectionString - LOGGER.Debug(">>> Execute_non_Query: " & ExecuteCMD) SQLconnect.Open() SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = ExecuteCMD - LOGGER.Debug(">>> Execute NonQuery: " & ExecuteCMD) + LOGGER.Debug("Execute_Command Created: " & ExecuteCMD) SQLcommand.ExecuteNonQuery() SQLcommand.Dispose() SQLconnect.Close() @@ -136,13 +160,65 @@ Public Class ClassDatabase Return False End Try End Function + Public Shared Function Execute_non_Query_ConStr(ExecuteCMD As String, ConnString As String, Optional userInput As Boolean = False) + Try + Dim SQLconnect As New SqlClient.SqlConnection + Dim SQLcommand As SqlClient.SqlCommand + SQLconnect.ConnectionString = ConnString + SQLconnect.Open() + SQLcommand = SQLconnect.CreateCommand + 'Update Last Created Record in Foo + SQLcommand.CommandText = ExecuteCMD + LOGGER.Debug("Execute_Command Created: " & ExecuteCMD) + SQLcommand.ExecuteNonQuery() + SQLcommand.Dispose() + SQLconnect.Close() + Return True + Catch ex As Exception + LOGGER.Error(ex) + If userInput = True Then + MsgBox("Error in Execute_non_Query_ConStr - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical) + End If + Clipboard.SetText("Error Execute_non_Query_ConStr: " & ex.Message & vbNewLine & "SQL: " & ExecuteCMD) + LOGGER.Info("Fehler bei Execute_non_Query_ConStr: " & ex.Message, True) + LOGGER.Info("#SQL: " & ExecuteCMD, False) + + Return False + End Try + End Function Public Shared Function Execute_Scalar(cmdscalar As String, ConString As String, Optional userInput As Boolean = False) Dim result Try Dim SQLconnect As New SqlClient.SqlConnection Dim SQLcommand As SqlClient.SqlCommand SQLconnect.ConnectionString = ConString - LOGGER.Debug(">>> Execute_non_Query: " & cmdscalar) + + SQLconnect.Open() + SQLcommand = SQLconnect.CreateCommand + 'Update Last Created Record in Foo + SQLcommand.CommandText = cmdscalar + LOGGER.Debug("Execute_non_Query: " & cmdscalar) + result = SQLcommand.ExecuteScalar() + SQLcommand.Dispose() + SQLconnect.Close() + Return result + Catch ex As Exception + LOGGER.Error(ex) + If userInput = True Then + MsgBox("Error in Execute Scalar - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & cmdscalar, MsgBoxStyle.Critical) + End If + Clipboard.SetText("Error Execute_Scalar: " & ex.Message & vbNewLine & "SQL: " & cmdscalar) + LOGGER.Info("Fehler bei Execute_Scalar: " & ex.Message, True) + LOGGER.Info("#SQL: " & cmdscalar, False) + Return Nothing + End Try + End Function + Public Shared Function Execute_Scalar_ConStr(cmdscalar As String, ConString As String, Optional userInput As Boolean = False) + Dim result + Try + Dim SQLconnect As New SqlClient.SqlConnection + Dim SQLcommand As SqlClient.SqlCommand + SQLconnect.ConnectionString = ConString SQLconnect.Open() SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo @@ -155,10 +231,10 @@ Public Class ClassDatabase Catch ex As Exception LOGGER.Error(ex) If userInput = True Then - MsgBox("Error in Execute Scalar - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & cmdscalar, MsgBoxStyle.Critical) + MsgBox("Error in Execute_Scalar_ConStr - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & cmdscalar, MsgBoxStyle.Critical) End If - Clipboard.SetText("Error Execute_Scalar: " & ex.Message & vbNewLine & "SQL: " & cmdscalar) - LOGGER.Info("Fehler bei Execute_Scalar: " & ex.Message, True) + Clipboard.SetText("Error Execute_Scalar_ConStr: " & ex.Message & vbNewLine & "SQL: " & cmdscalar) + LOGGER.Info("Fehler bei Execute_Scalar_ConStr: " & ex.Message, True) LOGGER.Info("#SQL: " & cmdscalar, False) Return Nothing End Try diff --git a/app/DD_PM_WINDREAM/ClassFinalIndex.vb b/app/DD_PM_WINDREAM/ClassFinalIndex.vb index 3fc0f9e..9015330 100644 --- a/app/DD_PM_WINDREAM/ClassFinalIndex.vb +++ b/app/DD_PM_WINDREAM/ClassFinalIndex.vb @@ -1,21 +1,22 @@ Public Class ClassFinalIndex - Public Const INDEX_TYPE_STRING = 1 - Public Const INDEX_TYPE_INTEGER = 2 - Public Const INDEX_TYPE_FLOAT = 3 - Public Const INDEX_TYPE_BOOLEAN = 4 - Public Const INDEX_TYPE_DATE = 5 - Public Const INDEX_TYPE_VECTOR_INTEGER_64 = 4107 - Public Const INDEX_TYPE_VECTOR_INTEGER = 4098 - Public Const INDEX_TYPE_VECTOR_STRING = 4097 - Public Const INDEX_TYPE_VECTOR_BOOLEAN = 4100 - Public Const INDEX_TYPE_VECTOR_DATE = 4101 - Public Const INDEX_TYPE_VECTOR_CURRENCY = 4104 - Public Const INDEX_TYPE_VECTOR_FLOAT = 4099 - Public Const INDEX_TYPE_VECTOR_DATETIME = 4103 + Public INDEX_TYPE_STRING = 1 + Public INDEX_TYPE_INTEGER = 2 + Public INDEX_TYPE_FLOAT = 3 + Public INDEX_TYPE_BOOLEAN = 4 + Public INDEX_TYPE_DATE = 5 + Public INDEX_TYPE_VECTOR_INTEGER_64 = 4107 + Public INDEX_TYPE_VECTOR_INTEGER = 4098 + Public INDEX_TYPE_VECTOR_STRING = 4097 + Public INDEX_TYPE_VECTOR_BOOLEAN = 4100 + Public INDEX_TYPE_VECTOR_DATE = 4101 + Public INDEX_TYPE_VECTOR_CURRENCY = 4104 + Public INDEX_TYPE_VECTOR_FLOAT = 4099 + Public INDEX_TYPE_VECTOR_DATETIME = 4103 + Public Const PREFIX_VECTOR = "[%VKT" - Public Shared LIST_VECTOR_INDICIES As New List(Of Integer) From { + Public LIST_VECTOR_INDICIES As New List(Of Integer) From { INDEX_TYPE_VECTOR_INTEGER_64, INDEX_TYPE_VECTOR_INTEGER, INDEX_TYPE_VECTOR_STRING, @@ -26,9 +27,48 @@ INDEX_TYPE_VECTOR_DATETIME } + Public Function init() + If IDB_ACTIVE = True Then + INDEX_TYPE_STRING = 1 + INDEX_TYPE_INTEGER = 2 + INDEX_TYPE_FLOAT = 3 + INDEX_TYPE_BOOLEAN = 2 + INDEX_TYPE_DATE = 5 + INDEX_TYPE_VECTOR_INTEGER_64 = 9 + INDEX_TYPE_VECTOR_INTEGER = 9 + INDEX_TYPE_VECTOR_STRING = 8 + INDEX_TYPE_VECTOR_BOOLEAN = 9 + INDEX_TYPE_VECTOR_DATE = 8 + INDEX_TYPE_VECTOR_CURRENCY = 8 + INDEX_TYPE_VECTOR_FLOAT = 8 + INDEX_TYPE_VECTOR_DATETIME = 8 + LIST_VECTOR_INDICIES = New List(Of Integer) From { + INDEX_TYPE_VECTOR_INTEGER_64, + INDEX_TYPE_VECTOR_INTEGER, + INDEX_TYPE_VECTOR_STRING, + INDEX_TYPE_VECTOR_BOOLEAN, + INDEX_TYPE_VECTOR_DATE, + INDEX_TYPE_VECTOR_CURRENCY, + INDEX_TYPE_VECTOR_FLOAT, + INDEX_TYPE_VECTOR_DATETIME} + Else + INDEX_TYPE_STRING = 1 + INDEX_TYPE_INTEGER = 2 + INDEX_TYPE_FLOAT = 3 + INDEX_TYPE_BOOLEAN = 4 + INDEX_TYPE_DATE = 5 + INDEX_TYPE_VECTOR_INTEGER_64 = 4107 + INDEX_TYPE_VECTOR_INTEGER = 4098 + INDEX_TYPE_VECTOR_STRING = 4097 + INDEX_TYPE_VECTOR_BOOLEAN = 4100 + INDEX_TYPE_VECTOR_DATE = 4101 + INDEX_TYPE_VECTOR_CURRENCY = 4104 + INDEX_TYPE_VECTOR_FLOAT = 4099 + INDEX_TYPE_VECTOR_DATETIME = 4103 + End If + End Function - - Public Shared Function GetValue(obj As Object, indexName As String, indcies As List(Of String), types As List(Of Integer), isVector As Boolean) + Public Function GetValue(obj As Object, indexName As String, indcies As List(Of String), types As List(Of Integer), isVector As Boolean) Try Dim props As FinalIndexProperties = obj Dim i As Integer = indcies.IndexOf(indexName) @@ -52,7 +92,7 @@ End Try End Function - Public Shared Function SetValue(value As String, obj As Object, indexName As String, indcies As List(Of String), types As List(Of Integer)) + Public Function SetValue(value As String, obj As Object, indexName As String, indcies As List(Of String), types As List(Of Integer)) Try Dim props As FinalIndexProperties = obj Dim i As Integer = indcies.IndexOf(indexName) @@ -107,15 +147,20 @@ End Try End Function - Public Shared Function IsVectorIndex(type As Integer) As Boolean + Public Function IsVectorIndex(type As Integer) As Boolean Return LIST_VECTOR_INDICIES.Contains(type) End Function Public Shared Function GetIndexType(indexName As String, indicies As List(Of String), types As List(Of Integer)) - Dim position As Integer = indicies.IndexOf(indexName) - Dim type As Integer = types.Item(position) + Try + Dim position As Integer = indicies.IndexOf(indexName) + Dim type As Integer = types.Item(position) + + Return type + Catch ex As Exception + MsgBox(ex.Message & vbNewLine & $"Please check whether attribute {indexName} exists in AtributesList!", MsgBoxStyle.Critical) + End Try - Return type End Function End Class diff --git a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb index 70882af..ac6227a 100644 --- a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb +++ b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb @@ -54,7 +54,7 @@ Case "vDate" value = Now.ToShortDateString Case "vUserName" - value = Environment.UserName + value = USER_USERNAME Case Else value = dr.Item("VALUE") End Select @@ -197,7 +197,7 @@ Dim PM_String As String Try Dim Bezeichner As String = VKTBezeichner.Replace("[%VKT", "") - PM_String = "DD-PM#" & Bezeichner & "#" & input & "#" & Environment.UserName & "#" & Now.ToString + PM_String = "DD-PM#" & Bezeichner & "#" & input & "#" & USER_USERNAME & "#" & Now.ToString Catch ex As Exception LOGGER.Error(ex) LOGGER.Info(">> Fehler in Return_PM_VEKTOR: " & ex.Message, True) @@ -210,9 +210,9 @@ Dim PM_String As String Try If old = "DDFINALINDEX" Then - PM_String = "DD-PMlog-FINAL" & "#" & indexname & "#" & input & "#" & Environment.UserName & "#" & Now.ToString + PM_String = "DD-PMlog-FINAL" & "#" & indexname & "#" & input & "#" & USER_USERNAME & "#" & Now.ToString Else - PM_String = "DD-PMlog-CHG" & "#" & indexname & "#" & "NEW: '" & input & "' - OLD: '" & old & "'" & "#" & Environment.UserName & "#" & Now.ToString + PM_String = "DD-PMlog-CHG" & "#" & indexname & "#" & "NEW: '" & input & "' - OLD: '" & old & "'" & "#" & USER_USERNAME & "#" & Now.ToString End If Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb new file mode 100644 index 0000000..4a2b4dc --- /dev/null +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -0,0 +1,139 @@ +Public Class ClassIDBData + Public DTVWIDB_BE_ATTRIBUTE As DataTable + ''' + ''' Gets all indices by BusinessEntity. + ''' + ''' Title of Business Entity + ''' Array with all Indices + ''' + Public Function Init() + Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE" + DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + End Function + Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String() + Try + ' Array für Indizes vorbereiten + Dim aIndexNames(DTVWIDB_BE_ATTRIBUTE.Rows.Count - 1) As String + Dim oCount As Integer = 0 + For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows + aIndexNames(oCount) = oRow.Item("ATTR_TITLE") + oCount += 1 + 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, "Error getting the IDB Indicies") + Return Nothing + End Try + End Function + Public Function GetTypeOfIndex(ByVal indexname As String) As Integer + Try + For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows + If oRow.Item("ATTR_TITLE") = indexname Then + Dim oType = oRow.Item("TYP_ID") + Return oType + End If + Next + + Catch ex As Exception + LOGGER.Error(ex) + Return Nothing + End Try + + End Function + Public Function GetVariableValue(oAttributeName As String) As Object + Try + Dim oAttributeValue + Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))" + oAttributeValue = ClassDatabase.Return_Datatable_ConStr(oFNSQL, CONNECTION_STRING_IDB) + Dim odt As DataTable = oAttributeValue + If odt.Rows.Count = 1 Then + oAttributeValue = odt.Rows(0).Item(0) + End If + Return oAttributeValue + Catch ex As Exception + LOGGER.Error(ex) + Return Nothing + End Try + + End Function + Public Function Delete_Term_Object_From_Metadata(oAttributeName As String, oTerm2Delete As String) As Object + Try + Dim oAttributeValue + Dim oID_IS_FOREIGN As Integer + oID_IS_FOREIGN = 0 + If IDB_USES_WMFILESTORE Then + oID_IS_FOREIGN = 1 + End If + Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}" + ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB) + + Catch ex As Exception + LOGGER.Error(ex) + Return Nothing + End Try + + End Function + + Public Function SetVariableValue(oAttributeName As String, oNewValue As Object, Optional CheckDeleted As Boolean = False) + Try + Dim omytype = oNewValue.GetType.ToString + If omytype = "System.Data.DataTable" Then + Dim oDTMyNewValues As DataTable = oNewValue + + If CheckDeleted = True Then + Dim oOldAttributeResult = GetVariableValue(oAttributeName) + Dim oTypeOldResult = oOldAttributeResult.GetType.ToString + If oTypeOldResult = "System.Data.DataTable" Then + Dim myOldValues As DataTable = oOldAttributeResult + If myOldValues.Rows.Count > 1 Then + + 'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues + For Each oOldValueRow As DataRow In myOldValues.Rows + Dim oExists As Boolean = False + For Each oNewValueRow As DataRow In oDTMyNewValues.Rows + Dim oInfo1 = $"Checking oldValue[{oOldValueRow.Item(0)}] vs NewValue [{oNewValueRow.Item(1)}]" + If oNewValueRow.Item(1).ToString.ToUpper = oOldValueRow.Item(0).ToString.ToUpper Then + oExists = True + Exit For + End If + Next + + If oExists = False Then + Dim oInfo = $"Value [{oOldValueRow.Item(0)}] no longer existing in Vector-Attribute [{oAttributeName}]" + LOGGER.Info(oInfo) + Delete_Term_Object_From_Metadata(oAttributeName, oOldValueRow.Item(0)) + End If + + Next + End If + End If + End If + + + For Each oNewValueRow As DataRow In oDTMyNewValues.Rows + Dim oSuccess As Boolean = False + Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',{CURRENT_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) + If oSuccess = False Then + Return False + End If + Next + Return True + Else + Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',{CURRENT_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) + End If + + Catch ex As Exception + LOGGER.Error(ex) + Return False + End Try + End Function +End Class diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 4112adb..7d96237 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -128,7 +128,7 @@ Public Class ClassInit Try USER_USERNAME = Environment.UserName Try - DT_CLIENT_USER = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{0}')", Environment.UserName), False) + DT_CLIENT_USER = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{0}')", USER_USERNAME), False) If DT_CLIENT_USER.Rows.Count > 1 Then frmClientLogin.ShowDialog() ElseIf DT_CLIENT_USER.Rows.Count = 1 Then @@ -149,7 +149,7 @@ Public Class ClassInit LOGGER.Info(">> Username: " & USER_USERNAME) - Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) + Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED) Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) @@ -184,8 +184,14 @@ Public Class ClassInit USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) + FINALINDICES = New ClassFinalIndex() + FINALINDICES.init() + If IDB_ACTIVE = True Then + IDBData = New ClassIDBData() + End If + Try USER_RIGHT1 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT1") Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/ClassPMWindream.vb b/app/DD_PM_WINDREAM/ClassPMWindream.vb index 2dbbbc9..a01f319 100644 --- a/app/DD_PM_WINDREAM/ClassPMWindream.vb +++ b/app/DD_PM_WINDREAM/ClassPMWindream.vb @@ -434,7 +434,7 @@ Public Class ClassPMWindream 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(CURRENT_ProfilGUID, "Unvorhergesehener Fehler beim Indexieren der Datei: " & oDocument.aName & " - ERROR: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Unvorhergesehener Fehler beim Indexieren der Datei: " & oDocument.aName & " - ERROR: " & ex.Message, USER_USERNAME) oDocument.Save() oDocument.unlock() Return False diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index ac56356..43b8817 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -13,19 +13,37 @@ WORKING_MODE = "" End Try - If WORKING_MODE.Contains("PM#FORCE_LAYOUT_OVERVIEW") Then - FORCE_LAYOUT_OVERVIEW = True - End If - If WORKING_MODE.Contains("PM#NO_CHARTS") Then - SHOW_CHARTS = False - End If + Dim oSplitWorkMode As String() = WORKING_MODE.Split("#") - If WORKING_MODE.Contains("PM#DEBUG_LOG") Then - USER_DEBUG_LOG = True - LOGCONFIG.Debug = True - - End If + ' Use For Each loop over words and display them. + Dim oMode As String + For Each oMode In oSplitWorkMode + LOGGER.Debug($"oWorkingMode Parameter: {oMode}") + If oMode = "PM.FORCE_LAYOUT_OVERVIEW" Then + FORCE_LAYOUT_OVERVIEW = True + ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then + SHOW_MASS_VALIDATOR = False + ElseIf oMode = "PM.NO_CHARTS" Then + SHOW_CHARTS = False + ElseIf oMode = "PM.DEBUG_LOG" Then + USER_DEBUG_LOG = True + LOGCONFIG.Debug = True + ElseIf oMode = "PM.IDBWITHWMFS" Then + IDB_USES_WMFILESTORE = True + ElseIf oMode.StartsWith("PM.IDBCS!") Then + CONNECTION_STRING_IDB = oMode.Replace("PM.IDBCS!", "") + Dim oSQL = $"SELECT * FROM TBIDB_ATTRIBUTE" + Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + If Not IsNothing(oDT) Then + If oDT.Rows.Count > 0 Then + IDB_ACTIVE = True + End If + End If + Else + LOGGER.Info($"Wrong oMode: {oMode}") + End If + Next End If diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 2d12dcc..cbbf992 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -35,8 +35,6 @@ Partial Public Class DD_DMSLiteDataSet Private tableTBPM_ERROR_LOG As TBPM_ERROR_LOGDataTable - Private tableVWPM_CONTROL_INDEX As VWPM_CONTROL_INDEXDataTable - Private tableTBDD_CONNECTION As TBDD_CONNECTIONDataTable Private tableTBPROFILE_USER As TBPROFILE_USERDataTable @@ -113,9 +111,6 @@ Partial Public Class DD_DMSLiteDataSet If (Not (ds.Tables("TBPM_ERROR_LOG")) Is Nothing) Then MyBase.Tables.Add(New TBPM_ERROR_LOGDataTable(ds.Tables("TBPM_ERROR_LOG"))) End If - If (Not (ds.Tables("VWPM_CONTROL_INDEX")) Is Nothing) Then - MyBase.Tables.Add(New VWPM_CONTROL_INDEXDataTable(ds.Tables("VWPM_CONTROL_INDEX"))) - End If If (Not (ds.Tables("TBDD_CONNECTION")) Is Nothing) Then MyBase.Tables.Add(New TBDD_CONNECTIONDataTable(ds.Tables("TBDD_CONNECTION"))) End If @@ -216,16 +211,6 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property - _ - Public ReadOnly Property VWPM_CONTROL_INDEX() As VWPM_CONTROL_INDEXDataTable - Get - Return Me.tableVWPM_CONTROL_INDEX - End Get - End Property - _ - Private Function ShouldSerializeVWPM_CONTROL_INDEX() As Boolean - Return false - End Function - _ Private Function ShouldSerializeTBDD_CONNECTION() As Boolean @@ -824,9 +792,6 @@ Partial Public Class DD_DMSLiteDataSet _ Public Delegate Sub TBPM_ERROR_LOGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPM_ERROR_LOGRowChangeEvent) - _ - Public Delegate Sub VWPM_CONTROL_INDEXRowChangeEventHandler(ByVal sender As Object, ByVal e As VWPM_CONTROL_INDEXRowChangeEvent) - _ Public Delegate Sub TBDD_CONNECTIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_CONNECTIONRowChangeEvent) @@ -2873,659 +2838,6 @@ Partial Public Class DD_DMSLiteDataSet End Function End Class - ''' - '''Represents the strongly named DataTable class. - ''' - _ - Partial Public Class VWPM_CONTROL_INDEXDataTable - Inherits Global.System.Data.TypedTableBase(Of VWPM_CONTROL_INDEXRow) - - Private columnGUID As Global.System.Data.DataColumn - - Private columnPROFIL_ID As Global.System.Data.DataColumn - - Private columnPROFIL_NAME As Global.System.Data.DataColumn - - Private columnCTRL_NAME As Global.System.Data.DataColumn - - Private columnCTRL_TYPE As Global.System.Data.DataColumn - - Private columnCTRL_TEXT As Global.System.Data.DataColumn - - Private columnX_LOC As Global.System.Data.DataColumn - - Private columnY_LOC As Global.System.Data.DataColumn - - Private columnINDEX_NAME As Global.System.Data.DataColumn - - Private columnVALIDATION As Global.System.Data.DataColumn - - Private columnTYP As Global.System.Data.DataColumn - - Private columnCONNECTION_ID As Global.System.Data.DataColumn - - Private columnSQL_UEBERPRUEFUNG As Global.System.Data.DataColumn - - Private columnCHOICE_LIST As Global.System.Data.DataColumn - - Private columnFONT_COLOR As Global.System.Data.DataColumn - - Private columnFONT_FAMILY As Global.System.Data.DataColumn - - Private columnFONT_SIZE As Global.System.Data.DataColumn - - Private columnFONT_STYLE As Global.System.Data.DataColumn - - Private columnWIDTH As Global.System.Data.DataColumn - - Private columnHEIGHT As Global.System.Data.DataColumn - - Private columnREAD_ONLY As Global.System.Data.DataColumn - - Private columnLOAD_IDX_VALUE As Global.System.Data.DataColumn - - Private columnLOG_INDEX As Global.System.Data.DataColumn - - Private columnDEFAULT_VALUE As Global.System.Data.DataColumn - - Private columnREGEX_MATCH As Global.System.Data.DataColumn - - Private columnREGEX_MESSAGE_DE As Global.System.Data.DataColumn - - Private columnREGEX_MESSAGE_EN As Global.System.Data.DataColumn - - _ - Public Sub New() - MyBase.New - Me.TableName = "VWPM_CONTROL_INDEX" - 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 GUIDColumn() As Global.System.Data.DataColumn - Get - Return Me.columnGUID - End Get - End Property - - _ - Public ReadOnly Property PROFIL_IDColumn() As Global.System.Data.DataColumn - Get - Return Me.columnPROFIL_ID - End Get - End Property - - _ - Public ReadOnly Property PROFIL_NAMEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnPROFIL_NAME - End Get - End Property - - _ - Public ReadOnly Property CTRL_NAMEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnCTRL_NAME - End Get - End Property - - _ - Public ReadOnly Property CTRL_TYPEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnCTRL_TYPE - End Get - End Property - - _ - Public ReadOnly Property CTRL_TEXTColumn() As Global.System.Data.DataColumn - Get - Return Me.columnCTRL_TEXT - End Get - End Property - - _ - Public ReadOnly Property X_LOCColumn() As Global.System.Data.DataColumn - Get - Return Me.columnX_LOC - End Get - End Property - - _ - Public ReadOnly Property Y_LOCColumn() As Global.System.Data.DataColumn - Get - Return Me.columnY_LOC - End Get - End Property - - _ - Public ReadOnly Property INDEX_NAMEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnINDEX_NAME - End Get - End Property - - _ - Public ReadOnly Property VALIDATIONColumn() As Global.System.Data.DataColumn - Get - Return Me.columnVALIDATION - End Get - End Property - - _ - Public ReadOnly Property TYPColumn() As Global.System.Data.DataColumn - Get - Return Me.columnTYP - End Get - End Property - - _ - Public ReadOnly Property CONNECTION_IDColumn() As Global.System.Data.DataColumn - Get - Return Me.columnCONNECTION_ID - End Get - End Property - - _ - Public ReadOnly Property SQL_UEBERPRUEFUNGColumn() As Global.System.Data.DataColumn - Get - Return Me.columnSQL_UEBERPRUEFUNG - End Get - End Property - - _ - Public ReadOnly Property CHOICE_LISTColumn() As Global.System.Data.DataColumn - Get - Return Me.columnCHOICE_LIST - End Get - End Property - - _ - Public ReadOnly Property FONT_COLORColumn() As Global.System.Data.DataColumn - Get - Return Me.columnFONT_COLOR - End Get - End Property - - _ - Public ReadOnly Property FONT_FAMILYColumn() As Global.System.Data.DataColumn - Get - Return Me.columnFONT_FAMILY - End Get - End Property - - _ - Public ReadOnly Property FONT_SIZEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnFONT_SIZE - End Get - End Property - - _ - Public ReadOnly Property FONT_STYLEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnFONT_STYLE - End Get - End Property - - _ - Public ReadOnly Property WIDTHColumn() As Global.System.Data.DataColumn - Get - Return Me.columnWIDTH - End Get - End Property - - _ - Public ReadOnly Property HEIGHTColumn() As Global.System.Data.DataColumn - Get - Return Me.columnHEIGHT - End Get - End Property - - _ - Public ReadOnly Property READ_ONLYColumn() As Global.System.Data.DataColumn - Get - Return Me.columnREAD_ONLY - End Get - End Property - - _ - Public ReadOnly Property LOAD_IDX_VALUEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOAD_IDX_VALUE - End Get - End Property - - _ - Public ReadOnly Property LOG_INDEXColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOG_INDEX - End Get - End Property - - _ - Public ReadOnly Property DEFAULT_VALUEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnDEFAULT_VALUE - End Get - End Property - - _ - Public ReadOnly Property REGEX_MATCHColumn() As Global.System.Data.DataColumn - Get - Return Me.columnREGEX_MATCH - End Get - End Property - - _ - Public ReadOnly Property REGEX_MESSAGE_DEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnREGEX_MESSAGE_DE - End Get - End Property - - _ - Public ReadOnly Property REGEX_MESSAGE_ENColumn() As Global.System.Data.DataColumn - Get - Return Me.columnREGEX_MESSAGE_EN - 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_CONTROL_INDEXRow - Get - Return CType(Me.Rows(index),VWPM_CONTROL_INDEXRow) - End Get - End Property - - _ - Public Event VWPM_CONTROL_INDEXRowChanging As VWPM_CONTROL_INDEXRowChangeEventHandler - - _ - Public Event VWPM_CONTROL_INDEXRowChanged As VWPM_CONTROL_INDEXRowChangeEventHandler - - _ - Public Event VWPM_CONTROL_INDEXRowDeleting As VWPM_CONTROL_INDEXRowChangeEventHandler - - _ - Public Event VWPM_CONTROL_INDEXRowDeleted As VWPM_CONTROL_INDEXRowChangeEventHandler - - _ - Public Overloads Sub AddVWPM_CONTROL_INDEXRow(ByVal row As VWPM_CONTROL_INDEXRow) - Me.Rows.Add(row) - End Sub - - _ - Public Overloads Function AddVWPM_CONTROL_INDEXRow( _ - ByVal GUID As Integer, _ - ByVal PROFIL_ID As Integer, _ - ByVal PROFIL_NAME As String, _ - ByVal CTRL_NAME As String, _ - ByVal CTRL_TYPE As String, _ - ByVal CTRL_TEXT As String, _ - ByVal X_LOC As Double, _ - ByVal Y_LOC As Double, _ - ByVal INDEX_NAME As String, _ - ByVal VALIDATION As Boolean, _ - ByVal TYP As String, _ - ByVal CONNECTION_ID As Short, _ - ByVal SQL_UEBERPRUEFUNG As String, _ - ByVal CHOICE_LIST As String, _ - ByVal FONT_COLOR As Long, _ - ByVal FONT_FAMILY As String, _ - ByVal FONT_SIZE As Short, _ - ByVal FONT_STYLE As Short, _ - ByVal WIDTH As Short, _ - ByVal HEIGHT As Short, _ - ByVal READ_ONLY As Boolean, _ - ByVal LOAD_IDX_VALUE As Boolean, _ - ByVal LOG_INDEX As String, _ - ByVal DEFAULT_VALUE As String, _ - ByVal REGEX_MATCH As String, _ - ByVal REGEX_MESSAGE_DE As String, _ - ByVal REGEX_MESSAGE_EN As String) As VWPM_CONTROL_INDEXRow - Dim rowVWPM_CONTROL_INDEXRow As VWPM_CONTROL_INDEXRow = CType(Me.NewRow,VWPM_CONTROL_INDEXRow) - Dim columnValuesArray() As Object = New Object() {GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, INDEX_NAME, VALIDATION, TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, CHOICE_LIST, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN} - rowVWPM_CONTROL_INDEXRow.ItemArray = columnValuesArray - Me.Rows.Add(rowVWPM_CONTROL_INDEXRow) - Return rowVWPM_CONTROL_INDEXRow - End Function - - _ - Public Function FindByGUIDPROFIL_ID(ByVal GUID As Integer, ByVal PROFIL_ID As Integer) As VWPM_CONTROL_INDEXRow - Return CType(Me.Rows.Find(New Object() {GUID, PROFIL_ID}),VWPM_CONTROL_INDEXRow) - End Function - - _ - Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As VWPM_CONTROL_INDEXDataTable = CType(MyBase.Clone,VWPM_CONTROL_INDEXDataTable) - cln.InitVars - Return cln - End Function - - _ - Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New VWPM_CONTROL_INDEXDataTable() - End Function - - _ - Friend Sub InitVars() - Me.columnGUID = MyBase.Columns("GUID") - Me.columnPROFIL_ID = MyBase.Columns("PROFIL_ID") - Me.columnPROFIL_NAME = MyBase.Columns("PROFIL_NAME") - Me.columnCTRL_NAME = MyBase.Columns("CTRL_NAME") - Me.columnCTRL_TYPE = MyBase.Columns("CTRL_TYPE") - Me.columnCTRL_TEXT = MyBase.Columns("CTRL_TEXT") - Me.columnX_LOC = MyBase.Columns("X_LOC") - Me.columnY_LOC = MyBase.Columns("Y_LOC") - Me.columnINDEX_NAME = MyBase.Columns("INDEX_NAME") - Me.columnVALIDATION = MyBase.Columns("VALIDATION") - Me.columnTYP = MyBase.Columns("TYP") - Me.columnCONNECTION_ID = MyBase.Columns("CONNECTION_ID") - Me.columnSQL_UEBERPRUEFUNG = MyBase.Columns("SQL_UEBERPRUEFUNG") - Me.columnCHOICE_LIST = MyBase.Columns("CHOICE_LIST") - Me.columnFONT_COLOR = MyBase.Columns("FONT_COLOR") - Me.columnFONT_FAMILY = MyBase.Columns("FONT_FAMILY") - Me.columnFONT_SIZE = MyBase.Columns("FONT_SIZE") - Me.columnFONT_STYLE = MyBase.Columns("FONT_STYLE") - Me.columnWIDTH = MyBase.Columns("WIDTH") - Me.columnHEIGHT = MyBase.Columns("HEIGHT") - Me.columnREAD_ONLY = MyBase.Columns("READ_ONLY") - Me.columnLOAD_IDX_VALUE = MyBase.Columns("LOAD_IDX_VALUE") - Me.columnLOG_INDEX = MyBase.Columns("LOG_INDEX") - Me.columnDEFAULT_VALUE = MyBase.Columns("DEFAULT_VALUE") - Me.columnREGEX_MATCH = MyBase.Columns("REGEX_MATCH") - Me.columnREGEX_MESSAGE_DE = MyBase.Columns("REGEX_MESSAGE_DE") - Me.columnREGEX_MESSAGE_EN = MyBase.Columns("REGEX_MESSAGE_EN") - End Sub - - _ - Private Sub InitClass() - Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnGUID) - Me.columnPROFIL_ID = New Global.System.Data.DataColumn("PROFIL_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnPROFIL_ID) - Me.columnPROFIL_NAME = New Global.System.Data.DataColumn("PROFIL_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnPROFIL_NAME) - Me.columnCTRL_NAME = New Global.System.Data.DataColumn("CTRL_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnCTRL_NAME) - Me.columnCTRL_TYPE = New Global.System.Data.DataColumn("CTRL_TYPE", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnCTRL_TYPE) - Me.columnCTRL_TEXT = New Global.System.Data.DataColumn("CTRL_TEXT", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnCTRL_TEXT) - Me.columnX_LOC = New Global.System.Data.DataColumn("X_LOC", GetType(Double), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnX_LOC) - Me.columnY_LOC = New Global.System.Data.DataColumn("Y_LOC", GetType(Double), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnY_LOC) - Me.columnINDEX_NAME = New Global.System.Data.DataColumn("INDEX_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnINDEX_NAME) - Me.columnVALIDATION = New Global.System.Data.DataColumn("VALIDATION", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnVALIDATION) - Me.columnTYP = New Global.System.Data.DataColumn("TYP", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnTYP) - Me.columnCONNECTION_ID = New Global.System.Data.DataColumn("CONNECTION_ID", GetType(Short), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnCONNECTION_ID) - Me.columnSQL_UEBERPRUEFUNG = New Global.System.Data.DataColumn("SQL_UEBERPRUEFUNG", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnSQL_UEBERPRUEFUNG) - Me.columnCHOICE_LIST = New Global.System.Data.DataColumn("CHOICE_LIST", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnCHOICE_LIST) - Me.columnFONT_COLOR = New Global.System.Data.DataColumn("FONT_COLOR", GetType(Long), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnFONT_COLOR) - Me.columnFONT_FAMILY = New Global.System.Data.DataColumn("FONT_FAMILY", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnFONT_FAMILY) - Me.columnFONT_SIZE = New Global.System.Data.DataColumn("FONT_SIZE", GetType(Short), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnFONT_SIZE) - Me.columnFONT_STYLE = New Global.System.Data.DataColumn("FONT_STYLE", GetType(Short), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnFONT_STYLE) - Me.columnWIDTH = New Global.System.Data.DataColumn("WIDTH", GetType(Short), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnWIDTH) - Me.columnHEIGHT = New Global.System.Data.DataColumn("HEIGHT", GetType(Short), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnHEIGHT) - Me.columnREAD_ONLY = New Global.System.Data.DataColumn("READ_ONLY", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnREAD_ONLY) - Me.columnLOAD_IDX_VALUE = New Global.System.Data.DataColumn("LOAD_IDX_VALUE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOAD_IDX_VALUE) - Me.columnLOG_INDEX = New Global.System.Data.DataColumn("LOG_INDEX", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOG_INDEX) - Me.columnDEFAULT_VALUE = New Global.System.Data.DataColumn("DEFAULT_VALUE", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnDEFAULT_VALUE) - Me.columnREGEX_MATCH = New Global.System.Data.DataColumn("REGEX_MATCH", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnREGEX_MATCH) - Me.columnREGEX_MESSAGE_DE = New Global.System.Data.DataColumn("REGEX_MESSAGE_DE", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnREGEX_MESSAGE_DE) - Me.columnREGEX_MESSAGE_EN = New Global.System.Data.DataColumn("REGEX_MESSAGE_EN", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnREGEX_MESSAGE_EN) - Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID, Me.columnPROFIL_ID}, true)) - Me.columnGUID.AllowDBNull = false - Me.columnPROFIL_ID.AllowDBNull = false - Me.columnPROFIL_NAME.AllowDBNull = false - Me.columnPROFIL_NAME.MaxLength = 100 - Me.columnCTRL_NAME.AllowDBNull = false - Me.columnCTRL_NAME.MaxLength = 100 - Me.columnCTRL_TYPE.AllowDBNull = false - Me.columnCTRL_TYPE.MaxLength = 10 - Me.columnCTRL_TEXT.AllowDBNull = false - Me.columnCTRL_TEXT.MaxLength = 50 - Me.columnX_LOC.AllowDBNull = false - Me.columnY_LOC.AllowDBNull = false - Me.columnINDEX_NAME.MaxLength = 100 - Me.columnVALIDATION.AllowDBNull = false - Me.columnTYP.MaxLength = 50 - Me.columnSQL_UEBERPRUEFUNG.MaxLength = 2000 - Me.columnCHOICE_LIST.MaxLength = 50 - Me.columnFONT_FAMILY.MaxLength = 30 - Me.columnWIDTH.AllowDBNull = false - Me.columnHEIGHT.AllowDBNull = false - Me.columnREAD_ONLY.AllowDBNull = false - Me.columnLOAD_IDX_VALUE.AllowDBNull = false - Me.columnLOG_INDEX.AllowDBNull = false - Me.columnLOG_INDEX.MaxLength = 50 - Me.columnREGEX_MATCH.MaxLength = 1000 - Me.columnREGEX_MESSAGE_DE.AllowDBNull = false - Me.columnREGEX_MESSAGE_DE.MaxLength = 1000 - Me.columnREGEX_MESSAGE_EN.AllowDBNull = false - Me.columnREGEX_MESSAGE_EN.MaxLength = 1000 - End Sub - - _ - Public Function NewVWPM_CONTROL_INDEXRow() As VWPM_CONTROL_INDEXRow - Return CType(Me.NewRow,VWPM_CONTROL_INDEXRow) - End Function - - _ - Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New VWPM_CONTROL_INDEXRow(builder) - End Function - - _ - Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(VWPM_CONTROL_INDEXRow) - End Function - - _ - Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowChanged(e) - If (Not (Me.VWPM_CONTROL_INDEXRowChangedEvent) Is Nothing) Then - RaiseEvent VWPM_CONTROL_INDEXRowChanged(Me, New VWPM_CONTROL_INDEXRowChangeEvent(CType(e.Row,VWPM_CONTROL_INDEXRow), e.Action)) - End If - End Sub - - _ - Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowChanging(e) - If (Not (Me.VWPM_CONTROL_INDEXRowChangingEvent) Is Nothing) Then - RaiseEvent VWPM_CONTROL_INDEXRowChanging(Me, New VWPM_CONTROL_INDEXRowChangeEvent(CType(e.Row,VWPM_CONTROL_INDEXRow), e.Action)) - End If - End Sub - - _ - Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowDeleted(e) - If (Not (Me.VWPM_CONTROL_INDEXRowDeletedEvent) Is Nothing) Then - RaiseEvent VWPM_CONTROL_INDEXRowDeleted(Me, New VWPM_CONTROL_INDEXRowChangeEvent(CType(e.Row,VWPM_CONTROL_INDEXRow), e.Action)) - End If - End Sub - - _ - Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowDeleting(e) - If (Not (Me.VWPM_CONTROL_INDEXRowDeletingEvent) Is Nothing) Then - RaiseEvent VWPM_CONTROL_INDEXRowDeleting(Me, New VWPM_CONTROL_INDEXRowChangeEvent(CType(e.Row,VWPM_CONTROL_INDEXRow), e.Action)) - End If - End Sub - - _ - Public Sub RemoveVWPM_CONTROL_INDEXRow(ByVal row As VWPM_CONTROL_INDEXRow) - 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_CONTROL_INDEXDataTable" - 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. ''' @@ -9482,495 +8794,6 @@ Partial Public Class DD_DMSLiteDataSet End Property End Class - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class VWPM_CONTROL_INDEXRow - Inherits Global.System.Data.DataRow - - Private tableVWPM_CONTROL_INDEX As VWPM_CONTROL_INDEXDataTable - - _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableVWPM_CONTROL_INDEX = CType(Me.Table,VWPM_CONTROL_INDEXDataTable) - End Sub - - _ - Public Property GUID() As Integer - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.GUIDColumn),Integer) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.GUIDColumn) = value - End Set - End Property - - _ - Public Property PROFIL_ID() As Integer - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.PROFIL_IDColumn),Integer) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.PROFIL_IDColumn) = value - End Set - End Property - - _ - Public Property PROFIL_NAME() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.PROFIL_NAMEColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.PROFIL_NAMEColumn) = value - End Set - End Property - - _ - Public Property CTRL_NAME() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.CTRL_NAMEColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.CTRL_NAMEColumn) = value - End Set - End Property - - _ - Public Property CTRL_TYPE() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.CTRL_TYPEColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.CTRL_TYPEColumn) = value - End Set - End Property - - _ - Public Property CTRL_TEXT() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.CTRL_TEXTColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.CTRL_TEXTColumn) = value - End Set - End Property - - _ - Public Property X_LOC() As Double - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.X_LOCColumn),Double) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.X_LOCColumn) = value - End Set - End Property - - _ - Public Property Y_LOC() As Double - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.Y_LOCColumn),Double) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.Y_LOCColumn) = value - End Set - End Property - - _ - Public Property INDEX_NAME() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.INDEX_NAMEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte INDEX_NAME in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.INDEX_NAMEColumn) = value - End Set - End Property - - _ - Public Property VALIDATION() As Boolean - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.VALIDATIONColumn),Boolean) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.VALIDATIONColumn) = value - End Set - End Property - - _ - Public Property TYP() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.TYPColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYP in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.TYPColumn) = value - End Set - End Property - - _ - Public Property CONNECTION_ID() As Short - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.CONNECTION_IDColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CONNECTION_ID in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.CONNECTION_IDColumn) = value - End Set - End Property - - _ - Public Property SQL_UEBERPRUEFUNG() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.SQL_UEBERPRUEFUNGColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_UEBERPRUEFUNG in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.SQL_UEBERPRUEFUNGColumn) = value - End Set - End Property - - _ - Public Property CHOICE_LIST() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.CHOICE_LISTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHOICE_LIST in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.CHOICE_LISTColumn) = value - End Set - End Property - - _ - Public Property FONT_COLOR() As Long - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.FONT_COLORColumn),Long) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FONT_COLOR in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.FONT_COLORColumn) = value - End Set - End Property - - _ - Public Property FONT_FAMILY() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.FONT_FAMILYColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FONT_FAMILY in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.FONT_FAMILYColumn) = value - End Set - End Property - - _ - Public Property FONT_SIZE() As Short - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.FONT_SIZEColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FONT_SIZE in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.FONT_SIZEColumn) = value - End Set - End Property - - _ - Public Property FONT_STYLE() As Short - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.FONT_STYLEColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FONT_STYLE in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.FONT_STYLEColumn) = value - End Set - End Property - - _ - Public Property WIDTH() As Short - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn),Short) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.WIDTHColumn) = value - End Set - End Property - - _ - Public Property HEIGHT() As Short - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn),Short) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.HEIGHTColumn) = value - End Set - End Property - - _ - Public Property READ_ONLY() As Boolean - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.READ_ONLYColumn),Boolean) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.READ_ONLYColumn) = value - End Set - End Property - - _ - Public Property LOAD_IDX_VALUE() As Boolean - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.LOAD_IDX_VALUEColumn),Boolean) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.LOAD_IDX_VALUEColumn) = value - End Set - End Property - - _ - Public Property LOG_INDEX() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.LOG_INDEXColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.LOG_INDEXColumn) = value - End Set - End Property - - _ - Public Property DEFAULT_VALUE() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DEFAULT_VALUE in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn) = value - End Set - End Property - - _ - Public Property REGEX_MATCH() As String - Get - Try - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MATCHColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte REGEX_MATCH in Tabelle VWPM_CONTROL_INDEX ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MATCHColumn) = value - End Set - End Property - - _ - Public Property REGEX_MESSAGE_DE() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_DEColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_DEColumn) = value - End Set - End Property - - _ - Public Property REGEX_MESSAGE_EN() As String - Get - Return CType(Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_ENColumn),String) - End Get - Set - Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MESSAGE_ENColumn) = value - End Set - End Property - - _ - Public Function IsINDEX_NAMENull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.INDEX_NAMEColumn) - End Function - - _ - Public Sub SetINDEX_NAMENull() - Me(Me.tableVWPM_CONTROL_INDEX.INDEX_NAMEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsTYPNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.TYPColumn) - End Function - - _ - Public Sub SetTYPNull() - Me(Me.tableVWPM_CONTROL_INDEX.TYPColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCONNECTION_IDNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.CONNECTION_IDColumn) - End Function - - _ - Public Sub SetCONNECTION_IDNull() - Me(Me.tableVWPM_CONTROL_INDEX.CONNECTION_IDColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsSQL_UEBERPRUEFUNGNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.SQL_UEBERPRUEFUNGColumn) - End Function - - _ - Public Sub SetSQL_UEBERPRUEFUNGNull() - Me(Me.tableVWPM_CONTROL_INDEX.SQL_UEBERPRUEFUNGColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCHOICE_LISTNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.CHOICE_LISTColumn) - End Function - - _ - Public Sub SetCHOICE_LISTNull() - Me(Me.tableVWPM_CONTROL_INDEX.CHOICE_LISTColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsFONT_COLORNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.FONT_COLORColumn) - End Function - - _ - Public Sub SetFONT_COLORNull() - Me(Me.tableVWPM_CONTROL_INDEX.FONT_COLORColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsFONT_FAMILYNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.FONT_FAMILYColumn) - End Function - - _ - Public Sub SetFONT_FAMILYNull() - Me(Me.tableVWPM_CONTROL_INDEX.FONT_FAMILYColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsFONT_SIZENull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.FONT_SIZEColumn) - End Function - - _ - Public Sub SetFONT_SIZENull() - Me(Me.tableVWPM_CONTROL_INDEX.FONT_SIZEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsFONT_STYLENull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.FONT_STYLEColumn) - End Function - - _ - Public Sub SetFONT_STYLENull() - Me(Me.tableVWPM_CONTROL_INDEX.FONT_STYLEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsDEFAULT_VALUENull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn) - End Function - - _ - Public Sub SetDEFAULT_VALUENull() - Me(Me.tableVWPM_CONTROL_INDEX.DEFAULT_VALUEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsREGEX_MATCHNull() As Boolean - Return Me.IsNull(Me.tableVWPM_CONTROL_INDEX.REGEX_MATCHColumn) - End Function - - _ - Public Sub SetREGEX_MATCHNull() - Me(Me.tableVWPM_CONTROL_INDEX.REGEX_MATCHColumn) = Global.System.Convert.DBNull - End Sub - End Class - ''' '''Represents strongly named DataRow class. ''' @@ -13236,42 +12059,6 @@ Partial Public Class DD_DMSLiteDataSet End Property End Class - ''' - '''Row event argument class - ''' - _ - Public Class VWPM_CONTROL_INDEXRowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As VWPM_CONTROL_INDEXRow - - Private eventAction As Global.System.Data.DataRowAction - - _ - Public Sub New(ByVal row As VWPM_CONTROL_INDEXRow, ByVal action As Global.System.Data.DataRowAction) - MyBase.New - Me.eventRow = row - Me.eventAction = action - End Sub - - _ - Public ReadOnly Property Row() As VWPM_CONTROL_INDEXRow - 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 ''' @@ -16062,412 +14849,6 @@ Namespace DD_DMSLiteDataSetTableAdapters End Function End Class - ''' - '''Represents the connection and commands used to retrieve and save data. - ''' - _ - Partial Public Class VWPM_CONTROL_INDEXTableAdapter - 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_CONTROL_INDEX" - tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("PROFIL_ID", "PROFIL_ID") - tableMapping.ColumnMappings.Add("PROFIL_NAME", "PROFIL_NAME") - tableMapping.ColumnMappings.Add("CTRL_NAME", "CTRL_NAME") - tableMapping.ColumnMappings.Add("CTRL_TYPE", "CTRL_TYPE") - tableMapping.ColumnMappings.Add("CTRL_TEXT", "CTRL_TEXT") - tableMapping.ColumnMappings.Add("X_LOC", "X_LOC") - tableMapping.ColumnMappings.Add("Y_LOC", "Y_LOC") - tableMapping.ColumnMappings.Add("INDEX_NAME", "INDEX_NAME") - tableMapping.ColumnMappings.Add("VALIDATION", "VALIDATION") - tableMapping.ColumnMappings.Add("TYP", "TYP") - tableMapping.ColumnMappings.Add("CONNECTION_ID", "CONNECTION_ID") - tableMapping.ColumnMappings.Add("SQL_UEBERPRUEFUNG", "SQL_UEBERPRUEFUNG") - tableMapping.ColumnMappings.Add("CHOICE_LIST", "CHOICE_LIST") - tableMapping.ColumnMappings.Add("FONT_COLOR", "FONT_COLOR") - tableMapping.ColumnMappings.Add("FONT_FAMILY", "FONT_FAMILY") - tableMapping.ColumnMappings.Add("FONT_SIZE", "FONT_SIZE") - tableMapping.ColumnMappings.Add("FONT_STYLE", "FONT_STYLE") - tableMapping.ColumnMappings.Add("WIDTH", "WIDTH") - tableMapping.ColumnMappings.Add("HEIGHT", "HEIGHT") - tableMapping.ColumnMappings.Add("READ_ONLY", "READ_ONLY") - tableMapping.ColumnMappings.Add("LOAD_IDX_VALUE", "LOAD_IDX_VALUE") - tableMapping.ColumnMappings.Add("LOG_INDEX", "LOG_INDEX") - tableMapping.ColumnMappings.Add("DEFAULT_VALUE", "DEFAULT_VALUE") - tableMapping.ColumnMappings.Add("REGEX_MATCH", "REGEX_MATCH") - tableMapping.ColumnMappings.Add("REGEX_MESSAGE_DE", "REGEX_MESSAGE_DE") - tableMapping.ColumnMappings.Add("REGEX_MESSAGE_EN", "REGEX_MESSAGE_EN") - Me._adapter.TableMappings.Add(tableMapping) - End Sub - - _ - Private Sub InitConnection() - Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_PM_WINDREAM.My.MySettings.Default.ConnectionString - End Sub - - _ - Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(5) {} - Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LO"& _ - "C, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_N"& _ - "AME, VALIDATION, CHOICE_LIST, TYP, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CONNECTION_ID, SQL"& _ - "_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH"& _ - ", REGEX_MESSAGE_DE, REGEX_MESSAGE_EN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - " (LOWER(PROFIL_NAME) = LOWER(@Profil))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" - Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Profil", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(1).Connection = Me.Connection - Me._commandCollection(1).CommandText = "SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_ID ="& _ - " @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME)" - Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRoFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRLNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(2).Connection = Me.Connection - Me._commandCollection(2).CommandText = "SELECT INDEX_NAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFI"& _ - "L_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME)" - Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRoFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRLNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(3).Connection = Me.Connection - Me._commandCollection(3).CommandText = "SELECT CTRL_TYPE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL"& _ - "_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME)" - Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRoFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRLNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(4).Connection = Me.Connection - Me._commandCollection(4).CommandText = "SELECT LOAD_IDX_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (P"& _ - "ROFIL_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME)" - Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRoFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRLNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(5) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(5).Connection = Me.Connection - Me._commandCollection(5).CommandText = "SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LO"& _ - "C, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_N"& _ - "AME, VALIDATION, CHOICE_LIST, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TYP, CONNECTION_ID, SQL"& _ - "_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTR"& _ - "OL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_ID = @PROFIL_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" - Me._commandCollection(5).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(5).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - End Sub - - _ - Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable, ByVal Profil As String) As Integer - Me.Adapter.SelectCommand = Me.CommandCollection(0) - If (Profil Is Nothing) Then - Throw New Global.System.ArgumentNullException("Profil") - Else - Me.Adapter.SelectCommand.Parameters(0).Value = CType(Profil,String) - End If - 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(ByVal Profil As String) As DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable - Me.Adapter.SelectCommand = Me.CommandCollection(0) - If (Profil Is Nothing) Then - Throw New Global.System.ArgumentNullException("Profil") - Else - Me.Adapter.SelectCommand.Parameters(0).Value = CType(Profil,String) - End If - Dim dataTable As DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable = New DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable() - Me.Adapter.Fill(dataTable) - Return dataTable - End Function - - _ - Public Overloads Overridable Function FillByPROFIL_ID(ByVal dataTable As DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable, ByVal PROFIL_ID As Integer) As Integer - Me.Adapter.SelectCommand = Me.CommandCollection(5) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) - 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 GetDataByPROFIL_ID(ByVal PROFIL_ID As Integer) As DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable - Me.Adapter.SelectCommand = Me.CommandCollection(5) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) - Dim dataTable As DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable = New DD_DMSLiteDataSet.VWPM_CONTROL_INDEXDataTable() - Me.Adapter.Fill(dataTable) - Return dataTable - End Function - - _ - Public Overloads Overridable Function cmdGetControlID(ByVal PRoFIL_ID As Integer, ByVal CTRLNAME As String) As Global.System.Nullable(Of Integer) - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) - command.Parameters(0).Value = CType(PRoFIL_ID,Integer) - If (CTRLNAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("CTRLNAME") - Else - command.Parameters(1).Value = CType(CTRLNAME,String) - End If - Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State - If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ - <> Global.System.Data.ConnectionState.Open) Then - command.Connection.Open - End If - Dim returnValue As Object - Try - returnValue = command.ExecuteScalar - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - If ((returnValue Is Nothing) _ - OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return New Global.System.Nullable(Of Integer)() - Else - Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer)) - End If - End Function - - _ - Public Overloads Overridable Function CMDGetINDEX_NAME(ByVal PRoFIL_ID As Integer, ByVal CTRLNAME As String) As String - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(2) - command.Parameters(0).Value = CType(PRoFIL_ID,Integer) - If (CTRLNAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("CTRLNAME") - Else - command.Parameters(1).Value = CType(CTRLNAME,String) - End If - Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State - If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ - <> Global.System.Data.ConnectionState.Open) Then - command.Connection.Open - End If - Dim returnValue As Object - Try - returnValue = command.ExecuteScalar - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - If ((returnValue Is Nothing) _ - OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return Nothing - Else - Return CType(returnValue,String) - End If - End Function - - _ - Public Overloads Overridable Function cmdGetType(ByVal PRoFIL_ID As Integer, ByVal CTRLNAME As String) As String - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3) - command.Parameters(0).Value = CType(PRoFIL_ID,Integer) - If (CTRLNAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("CTRLNAME") - Else - command.Parameters(1).Value = CType(CTRLNAME,String) - End If - Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State - If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ - <> Global.System.Data.ConnectionState.Open) Then - command.Connection.Open - End If - Dim returnValue As Object - Try - returnValue = command.ExecuteScalar - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - If ((returnValue Is Nothing) _ - OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return Nothing - Else - Return CType(returnValue,String) - End If - End Function - - _ - Public Overloads Overridable Function cmdLoadIDX(ByVal PRoFIL_ID As Integer, ByVal CTRLNAME As String) As Global.System.Nullable(Of Boolean) - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(4) - command.Parameters(0).Value = CType(PRoFIL_ID,Integer) - If (CTRLNAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("CTRLNAME") - Else - command.Parameters(1).Value = CType(CTRLNAME,String) - End If - Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State - If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ - <> Global.System.Data.ConnectionState.Open) Then - command.Connection.Open - End If - Dim returnValue As Object - Try - returnValue = command.ExecuteScalar - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - If ((returnValue Is Nothing) _ - OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return New Global.System.Nullable(Of Boolean)() - Else - Return New Global.System.Nullable(Of Boolean)(CType(returnValue,Boolean)) - End If - End Function - End Class - ''' '''Represents the connection and commands used to retrieve and save data. ''' @@ -22242,39 +20623,12 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPM_KONFIGURATIONTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_KONFIGURATION.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_CONTROL_TABLETableAdapter.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) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPM_PROFILE_FILESTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If - If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.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._tBDD_CONNECTIONTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If - If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.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_ERROR_LOGTableAdapter.Update(updatedRows)) + result = (result + Me._tBPM_KONFIGURATIONTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -22287,12 +20641,39 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPM_KONFIGURATIONTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.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_KONFIGURATIONTableAdapter.Update(updatedRows)) + result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.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._tBDD_CONNECTIONTableAdapter.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) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBPM_PROFILE_FILESTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.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_CONTROL_TABLETableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -22338,35 +20719,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPM_KONFIGURATIONTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_CONTROL_TABLETableAdapter.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) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_PROFILE_FILESTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If - If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If - If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(addedRows)) + result = (result + Me._tBPM_KONFIGURATIONTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -22378,11 +20735,35 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPM_KONFIGURATIONTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_KONFIGURATIONTableAdapter.Update(addedRows)) + result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBDD_CONNECTIONTableAdapter.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) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPM_PROFILE_FILESTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -22396,35 +20777,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DD_DMSLiteDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBPM_KONFIGURATIONTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + 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) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_KONFIGURATIONTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If - If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If - If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(deletedRows)) + result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -22436,11 +20793,35 @@ Namespace DD_DMSLiteDataSetTableAdapters 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 (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(deletedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBDD_USERTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBPM_KONFIGURATIONTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPM_KONFIGURATIONTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 10948aa..8c2adb1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -639,121 +639,6 @@ WHERE (PROFIL_ID = @PROF_ID) - - - - - - SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, TYP, - CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN -FROM VWPM_CONTROL_INDEX -WHERE (LOWER(PROFIL_NAME) = LOWER(@Profil)) -ORDER BY Y_LOC, X_LOC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT GUID -FROM VWPM_CONTROL_INDEX -WHERE (PROFIL_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME) - - - - - - - - - - - SELECT INDEX_NAME -FROM VWPM_CONTROL_INDEX -WHERE (PROFIL_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME) - - - - - - - - - - - SELECT CTRL_TYPE -FROM VWPM_CONTROL_INDEX -WHERE (PROFIL_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME) - - - - - - - - - - - SELECT LOAD_IDX_VALUE -FROM VWPM_CONTROL_INDEX -WHERE (PROFIL_ID = @PRoFIL_ID) AND (CTRL_NAME = @CTRLNAME) - - - - - - - - - - - SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, - TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX -FROM VWPM_CONTROL_INDEX -WHERE (PROFIL_ID = @PROFIL_ID) -ORDER BY Y_LOC, X_LOC - - - - - - - - @@ -2330,117 +2215,6 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3169,11 +2943,6 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 9cc50b0..45ed699 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,28 +4,27 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - - + + + - + - + - + - + - + 549 @@ -37,7 +36,7 @@ - + 175 @@ -53,7 +52,7 @@ - + 603 @@ -65,7 +64,7 @@ - + 1248 @@ -77,7 +76,7 @@ - + 141 diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index a6c0d71..a67bdb6 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -141,6 +141,9 @@ False D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraTreeList.v18.1.dll + + ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + False ..\..\..\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll @@ -157,9 +160,12 @@ P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll + + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll + False - P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll + ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\Independentsoft.Msg.dll @@ -212,6 +218,7 @@ + diff --git a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb index 6358fdb..0ce0cd1 100644 --- a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb @@ -86,32 +86,32 @@ Module ModuleFinalIndexProperties End Sub Public Sub IndexTypeBooleanProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_BOOLEAN, ClassFinalIndex.INDEX_TYPE_VECTOR_BOOLEAN}) + MaybeSetBrowsable(attrs, {FINALINDICES.INDEX_TYPE_BOOLEAN, FINALINDICES.INDEX_TYPE_VECTOR_BOOLEAN}) MaybeSetReadOnlyIfSQLHasNoValue(attrs) End Sub Public Sub IndexTypeStringProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_STRING, ClassFinalIndex.INDEX_TYPE_VECTOR_STRING}) + MaybeSetBrowsable(attrs, {FINALINDICES.INDEX_TYPE_STRING, FINALINDICES.INDEX_TYPE_VECTOR_STRING}) MaybeSetReadOnlyIfSQLHasNoValue(attrs) End Sub Public Sub IndexTypeFloatProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_FLOAT}) + MaybeSetBrowsable(attrs, {FINALINDICES.INDEX_TYPE_FLOAT}) MaybeSetReadOnlyIfSQLHasNoValue(attrs) End Sub Public Sub IndexTypeIntegerProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_INTEGER, ClassFinalIndex.INDEX_TYPE_VECTOR_INTEGER_64}) + MaybeSetBrowsable(attrs, {FINALINDICES.INDEX_TYPE_INTEGER, FINALINDICES.INDEX_TYPE_VECTOR_INTEGER_64}) MaybeSetReadOnlyIfSQLHasNoValue(attrs) End Sub Public Sub IndexTypeDateProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_DATE, ClassFinalIndex.INDEX_TYPE_VECTOR_DATE}) + MaybeSetBrowsable(attrs, {FINALINDICES.INDEX_TYPE_DATE, FINALINDICES.INDEX_TYPE_VECTOR_DATE}) MaybeSetReadOnlyIfSQLHasNoValue(attrs) End Sub Public Sub VectorIndexOnlyProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_VECTOR_STRING}) + MaybeSetBrowsable(attrs, {FINALINDICES.INDEX_TYPE_VECTOR_STRING}) End Sub Public Sub MaybeSetReadOnlyIfSQLHasNoValue(attrs As PropertyAttributes) @@ -135,14 +135,14 @@ Module ModuleFinalIndexProperties ' get type of windream index Dim oType As Integer = IndiciesType.Item(oIndex) Dim oVectoryTypes = { - ClassFinalIndex.INDEX_TYPE_VECTOR_DATE, - ClassFinalIndex.INDEX_TYPE_VECTOR_BOOLEAN, - ClassFinalIndex.INDEX_TYPE_VECTOR_INTEGER_64, - ClassFinalIndex.INDEX_TYPE_VECTOR_INTEGER, - ClassFinalIndex.INDEX_TYPE_VECTOR_STRING, - ClassFinalIndex.INDEX_TYPE_VECTOR_CURRENCY, - ClassFinalIndex.INDEX_TYPE_VECTOR_FLOAT, - ClassFinalIndex.INDEX_TYPE_VECTOR_DATETIME + FINALINDICES.INDEX_TYPE_VECTOR_DATE, + FINALINDICES.INDEX_TYPE_VECTOR_BOOLEAN, + FINALINDICES.INDEX_TYPE_VECTOR_INTEGER_64, + FINALINDICES.INDEX_TYPE_VECTOR_INTEGER, + FINALINDICES.INDEX_TYPE_VECTOR_STRING, + FINALINDICES.INDEX_TYPE_VECTOR_CURRENCY, + FINALINDICES.INDEX_TYPE_VECTOR_FLOAT, + FINALINDICES.INDEX_TYPE_VECTOR_DATETIME } ' if type of index is not a vector, set attribute to read only diff --git a/app/DD_PM_WINDREAM/ModuleMySettings.vb b/app/DD_PM_WINDREAM/ModuleMySettings.vb index fdd1270..b7b312a 100644 --- a/app/DD_PM_WINDREAM/ModuleMySettings.vb +++ b/app/DD_PM_WINDREAM/ModuleMySettings.vb @@ -1,6 +1,10 @@ Module ModuleMySettings ' Connection String + Public SOURCE_INIT As Boolean = False Public CONNECTION_STRING As String = "" + Public CONNECTION_STRING_IDB As String = "" + Public IDB_ACTIVE As Boolean = False + Public IDB_USES_WMFILESTORE As Boolean = False Public TEST_MODE As String = False ' Debug Settings diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index c8c7479..4a03bb1 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -44,6 +44,7 @@ Module ModuleRuntimeVariables Public FORCE_LAYOUT_OVERVIEW As Boolean = False Public SHOW_CHARTS As Boolean = False + Public SHOW_MASS_VALIDATOR As Boolean = True Public WORKING_MODE As String = "" Public LICENSE_COUNT As Integer = 0 @@ -86,6 +87,8 @@ Module ModuleRuntimeVariables Public errormessage As String Public WINDREAM As ClassPMWindream + Public FINALINDICES As ClassFinalIndex + Public IDBData As ClassIDBData Public LOGCONFIG As LogConfig Public LOGGER As Logger Public CONFIG As ConfigManager(Of ClassConfig) diff --git a/app/DD_PM_WINDREAM/clsPatterns.vb b/app/DD_PM_WINDREAM/clsPatterns.vb index f26c9c0..7ec6b67 100644 --- a/app/DD_PM_WINDREAM/clsPatterns.vb +++ b/app/DD_PM_WINDREAM/clsPatterns.vb @@ -16,6 +16,7 @@ Imports WINDREAMLib Public Class clsPatterns ' Complex patterns that rely on a datasource like a Database or Windream Public Const PATTERN_WMI = "WMI" + Public Const PATTERN_IDBA = "IDBA" Public Const PATTERN_CTRL = "CTRL" ' Simple patterns that only rely on .NET functions Public Const PATTERN_INT = "INT" @@ -56,6 +57,7 @@ Public Class clsPatterns result = ReplaceInternalValues(result) result = ReplaceControlValues(result, panel) If Not IsNothing(document) Then result = ReplaceWindreamIndicies(result, document) + result = ReplaceIDBAttributes(result) result = ReplaceUserValues(result, prename, surname, shortname, email, userId, profileId) Return result @@ -71,7 +73,7 @@ Public Class clsPatterns ' Replace Username(s) While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_USERNAME) - result = ReplacePattern(result, PATTERN_INT, Environment.UserName) + result = ReplacePattern(result, PATTERN_INT, USER_USERNAME) End While ' Replace Machinename(s) @@ -184,6 +186,31 @@ Public Class clsPatterns LOGGER.Info("Error in ReplaceWindreamIndicies:" & ex.Message) End Try End Function + Public Shared Function ReplaceIDBAttributes(input As String) As String + Try + Dim result = input + Dim oTryCounter As Integer = 0 + While ContainsPattern(result, PATTERN_IDBA) + + Dim indexName As String = GetNextPattern(result, PATTERN_IDBA).Value + Dim oIDBValue = IDBData.GetVariableValue(indexName) + If IsNothing(oIDBValue) 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 oIDBValue IsNot Nothing Then + result = ReplacePattern(result, PATTERN_IDBA, oIDBValue) + End If + oTryCounter += 100 + End While + + Return result + Catch ex As Exception + LOGGER.Error(ex) + LOGGER.Info("Error in ReplaceWindreamIndicies:" & ex.Message) + End Try + End Function Private Shared Function ContainsPattern(input As String, type As String) As String Dim elements As MatchCollection = regex.Matches(input) diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 8f06f2f..b069130 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -141,13 +141,11 @@ Partial Class frmAdministration Me.TabPage1 = New System.Windows.Forms.TabPage() Me.tabctrl_Profilkonfig = New System.Windows.Forms.TabControl() Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() Me.DISPLAY_MODEComboBox = New System.Windows.Forms.ComboBox() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.cmbLOGIndex = New System.Windows.Forms.ComboBox() Me.PM_VEKTOR_INDEXComboBox = New System.Windows.Forms.ComboBox() - Me.SORT_BY_LATESTCheckBox = New System.Windows.Forms.CheckBox() Me.TabPage6 = New System.Windows.Forms.TabPage() Me.TabControl2 = New System.Windows.Forms.TabControl() Me.TabPage11 = New System.Windows.Forms.TabPage() @@ -194,6 +192,10 @@ Partial Class frmAdministration Me.ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox = New System.Windows.Forms.CheckBox() Me.SQL_VIEWTextBox = New System.Windows.Forms.TextBox() Me.WORK_HISTORY_ENTRYTextBox = New System.Windows.Forms.TextBox() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SORT_BY_LATESTCheckBox = New System.Windows.Forms.CheckBox() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.SplitContainerProfilzuordnung = New System.Windows.Forms.SplitContainer() Me.gridAvailableProfiles = New DevExpress.XtraGrid.GridControl() @@ -247,8 +249,6 @@ Partial Class frmAdministration Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter() Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() - Me.Label4 = New System.Windows.Forms.Label() - Me.Label9 = New System.Windows.Forms.Label() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() @@ -309,8 +309,6 @@ Partial Class frmAdministration Me.TabPage1.SuspendLayout() Me.tabctrl_Profilkonfig.SuspendLayout() Me.TabPage5.SuspendLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage6.SuspendLayout() Me.TabControl2.SuspendLayout() Me.TabPage11.SuspendLayout() @@ -322,6 +320,8 @@ Partial Class frmAdministration CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigator1.SuspendLayout() Me.TabPage12.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage2.SuspendLayout() CType(Me.SplitContainerProfilzuordnung, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerProfilzuordnung.Panel1.SuspendLayout() @@ -1025,6 +1025,7 @@ Partial Class frmAdministration Me.DESCRIPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "DESCRIPTION", True)) resources.ApplyResources(Me.DESCRIPTIONTextBox, "DESCRIPTIONTextBox") Me.DESCRIPTIONTextBox.Name = "DESCRIPTIONTextBox" + Me.DESCRIPTIONTextBox.Tag = "" ' 'WD_SEARCHTextBox ' @@ -1114,10 +1115,10 @@ Partial Class frmAdministration 'TabPage5 ' resources.ApplyResources(Me.TabPage5, "TabPage5") + Me.TabPage5.Controls.Add(Me.Label4) Me.TabPage5.Controls.Add(Me.Label1) Me.TabPage5.Controls.Add(Me.Label9) Me.TabPage5.Controls.Add(Me.cmbType) - Me.TabPage5.Controls.Add(Me.Label4) Me.TabPage5.Controls.Add(Me.FINAL_TEXTTextBox) Me.TabPage5.Controls.Add(Me.FINAL_PROFILECheckBox) Me.TabPage5.Controls.Add(DISPLAY_MODELabel) @@ -1145,6 +1146,16 @@ Partial Class frmAdministration Me.TabPage5.Name = "TabPage5" Me.TabPage5.UseVisualStyleBackColor = True ' + 'Label4 + ' + resources.ApplyResources(Me.Label4, "Label4") + Me.Label4.Name = "Label4" + ' + 'Label9 + ' + resources.ApplyResources(Me.Label9, "Label9") + Me.Label9.Name = "Label9" + ' 'DISPLAY_MODEComboBox ' Me.DISPLAY_MODEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "DISPLAY_MODE", True)) @@ -1153,41 +1164,6 @@ Partial Class frmAdministration Me.DISPLAY_MODEComboBox.Items.AddRange(New Object() {resources.GetString("DISPLAY_MODEComboBox.Items"), resources.GetString("DISPLAY_MODEComboBox.Items1"), resources.GetString("DISPLAY_MODEComboBox.Items2")}) Me.DISPLAY_MODEComboBox.Name = "DISPLAY_MODEComboBox" ' - 'GridControl1 - ' - Me.GridControl1.DataSource = Me.TBPM_PROFILEBindingSource - resources.ApplyResources(Me.GridControl1, "GridControl1") - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) - Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) - Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME}) - Me.GridView1.DetailHeight = 295 - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView1.OptionsBehavior.Editable = False - Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView1.OptionsView.EnableAppearanceEvenRow = True - Me.GridView1.OptionsView.ShowAutoFilterRow = True - Me.GridView1.OptionsView.ShowDetailButtons = False - Me.GridView1.OptionsView.ShowGroupPanel = False - ' - 'colNAME - ' - resources.ApplyResources(Me.colNAME, "colNAME") - Me.colNAME.FieldName = "NAME" - Me.colNAME.MinWidth = 16 - Me.colNAME.Name = "colNAME" - ' 'cmbLOGIndex ' Me.cmbLOGIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "LOG_INDEX", True)) @@ -1202,13 +1178,6 @@ Partial Class frmAdministration resources.ApplyResources(Me.PM_VEKTOR_INDEXComboBox, "PM_VEKTOR_INDEXComboBox") Me.PM_VEKTOR_INDEXComboBox.Name = "PM_VEKTOR_INDEXComboBox" ' - 'SORT_BY_LATESTCheckBox - ' - Me.SORT_BY_LATESTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILEBindingSource, "SORT_BY_LATEST", True)) - resources.ApplyResources(Me.SORT_BY_LATESTCheckBox, "SORT_BY_LATESTCheckBox") - Me.SORT_BY_LATESTCheckBox.Name = "SORT_BY_LATESTCheckBox" - Me.SORT_BY_LATESTCheckBox.UseVisualStyleBackColor = True - ' 'TabPage6 ' resources.ApplyResources(Me.TabPage6, "TabPage6") @@ -1238,9 +1207,9 @@ Partial Class frmAdministration ' 'Panel5 ' + resources.ApplyResources(Me.Panel5, "Panel5") Me.Panel5.Controls.Add(Me.gridFinalIndex) Me.Panel5.Controls.Add(Me.PropertyGrid1) - resources.ApplyResources(Me.Panel5, "Panel5") Me.Panel5.Name = "Panel5" ' 'gridFinalIndex @@ -1503,6 +1472,48 @@ Partial Class frmAdministration resources.ApplyResources(Me.WORK_HISTORY_ENTRYTextBox, "WORK_HISTORY_ENTRYTextBox") Me.WORK_HISTORY_ENTRYTextBox.Name = "WORK_HISTORY_ENTRYTextBox" ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBPM_PROFILEBindingSource + resources.ApplyResources(Me.GridControl1, "GridControl1") + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True + Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME}) + Me.GridView1.DetailHeight = 295 + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.Editable = False + Me.GridView1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridView1.OptionsView.EnableAppearanceEvenRow = True + Me.GridView1.OptionsView.ShowAutoFilterRow = True + Me.GridView1.OptionsView.ShowDetailButtons = False + Me.GridView1.OptionsView.ShowGroupPanel = False + ' + 'colNAME + ' + resources.ApplyResources(Me.colNAME, "colNAME") + Me.colNAME.FieldName = "NAME" + Me.colNAME.MinWidth = 16 + Me.colNAME.Name = "colNAME" + ' + 'SORT_BY_LATESTCheckBox + ' + Me.SORT_BY_LATESTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILEBindingSource, "SORT_BY_LATEST", True)) + resources.ApplyResources(Me.SORT_BY_LATESTCheckBox, "SORT_BY_LATESTCheckBox") + Me.SORT_BY_LATESTCheckBox.Name = "SORT_BY_LATESTCheckBox" + Me.SORT_BY_LATESTCheckBox.UseVisualStyleBackColor = True + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.SplitContainerProfilzuordnung) @@ -1865,16 +1876,6 @@ Partial Class frmAdministration ' Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.ClearBeforeFill = True ' - 'Label4 - ' - resources.ApplyResources(Me.Label4, "Label4") - Me.Label4.Name = "Label4" - ' - 'Label9 - ' - resources.ApplyResources(Me.Label9, "Label9") - Me.Label9.Name = "Label9" - ' 'frmAdministration ' resources.ApplyResources(Me, "$this") @@ -1922,8 +1923,6 @@ Partial Class frmAdministration Me.tabctrl_Profilkonfig.ResumeLayout(False) Me.TabPage5.ResumeLayout(False) Me.TabPage5.PerformLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage6.ResumeLayout(False) Me.TabControl2.ResumeLayout(False) Me.TabPage11.ResumeLayout(False) @@ -1938,6 +1937,8 @@ Partial Class frmAdministration Me.BindingNavigator1.PerformLayout() Me.TabPage12.ResumeLayout(False) Me.TabPage12.PerformLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) Me.SplitContainerProfilzuordnung.Panel1.ResumeLayout(False) Me.SplitContainerProfilzuordnung.Panel2.ResumeLayout(False) @@ -2168,6 +2169,6 @@ Partial Class frmAdministration Friend WithEvents btnSQLProfilehome As Button Friend WithEvents DISPLAY_MODEComboBox As ComboBox Friend WithEvents Label9 As Label - Friend WithEvents Label4 As Label Friend WithEvents ToolTip1 As ToolTip + Friend WithEvents Label4 As Label End Class diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 42ad94f..ac43792 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -247,7 +247,7 @@ 58 - 901, 266 + 901, 272 3 @@ -264,6 +264,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Benutzer: + + + MiddleLeft + Label20 @@ -397,7 +415,7 @@ 58 - 901, 231 + 901, 239 5 @@ -414,6 +432,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Benutzer: + + + MiddleLeft + Label19 @@ -463,10 +499,10 @@ 1 - 901, 551 + 901, 565 - 291 + 297 0 @@ -483,69 +519,6 @@ 0 - - 206, 17 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Benutzer: - - - MiddleLeft - - - Label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Benutzer: - - - MiddleLeft - - - Label19 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel2 - - - 0 - Fill @@ -592,7 +565,7 @@ 58 - 901, 264 + 901, 271 3 @@ -609,6 +582,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Gruppen: + + + MiddleLeft + Label22 @@ -694,7 +688,7 @@ 58 - 901, 233 + 901, 240 0 @@ -711,6 +705,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Gruppen: + + + MiddleLeft + Label23 @@ -760,10 +775,10 @@ 1 - 901, 551 + 901, 565 - 289 + 296 1 @@ -780,72 +795,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Gruppen: - - - MiddleLeft - - - Label22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel3 - - - 0 - - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Gruppen: - - - MiddleLeft - - - Label23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel4 - - - 0 - False @@ -1925,7 +1874,7 @@ TabPage5 - 0 + 1 174, 56 @@ -1952,60 +1901,6 @@ TabPage5 - 2 - - - 174, 56 - - - MOVE2FOLDERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 0 - - - btnmovetoFolderDialog - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 1 - - - Segoe UI, 8.25pt, style=Bold - - - 9, 23 - - - 1007, 57 - - - 73 - - - Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - 3 @@ -2059,6 +1954,33 @@ 1 + + Segoe UI, 8.25pt, style=Bold + + + 9, 23 + + + 1007, 57 + + + 73 + + + Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 3 + Tahoma, 9.75pt @@ -2398,17 +2320,23 @@ True - - Label9 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Tahoma, 9.75pt - - TabPage5 + + 15, 161 - - 1 + + 130, 16 + + + 88 + + + Use Vektor for Index: Label4 @@ -2420,7 +2348,58 @@ TabPage5 - 3 + 0 + + + True + + + Tahoma, 9.75pt + + + 16, 191 + + + 136, 16 + + + 87 + + + Vektor Wertänderung: + + + Label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 2 + + + Tahoma, 9.75pt + + + Overview and Detail + + + Overview + + + Detail + + + 202, 42 + + + 345, 24 + + + 85 DISPLAY_MODEComboBox @@ -2434,6 +2413,15 @@ 7 + + 202, 188 + + + 345, 24 + + + 83 + cmbLOGIndex @@ -2446,6 +2434,15 @@ 8 + + 202, 158 + + + 345, 24 + + + 81 + PM_VEKTOR_INDEXComboBox @@ -2468,7 +2465,7 @@ 3, 3, 3, 3 - 970, 383 + 970, 473 0 @@ -2491,6 +2488,9 @@ True + + Top, Bottom, Left, Right + 17, 251 @@ -2573,7 +2573,7 @@ 6 - 627, 269 + 627, 275 93 @@ -2600,7 +2600,7 @@ 627, 0 - 323, 269 + 323, 275 91 @@ -2617,14 +2617,11 @@ 1 - - Bottom - - 3, 76 + 3, 166 - 950, 269 + 950, 275 94 @@ -2930,6 +2927,9 @@ 5 + + Tahoma, 9pt + 4, 25 @@ -2937,7 +2937,7 @@ 3, 3, 3, 3 - 956, 348 + 956, 438 0 @@ -3063,7 +3063,7 @@ 3, 3, 3, 3 - 956, 348 + 956, 441 1 @@ -3090,7 +3090,7 @@ 3, 3 - 964, 377 + 964, 467 92 @@ -3114,7 +3114,7 @@ 3, 3, 3, 3 - 970, 383 + 970, 473 1 @@ -3138,7 +3138,7 @@ 288, 98 - 978, 412 + 978, 502 79 @@ -3180,7 +3180,7 @@ 129 - 276, 510 + 276, 600 84 @@ -3231,7 +3231,7 @@ 3, 3, 3, 3 - 1272, 516 + 1272, 606 0 @@ -3251,342 +3251,6 @@ 0 - - SplitContainerProfilzuordnung - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 592 - - - 1 - - - Profilzuordnung - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - btnSQLProfilehome - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 0 - - - btnUserManager - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 1 - - - Button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 2 - - - VEKTOR_DELIMITERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 4 - - - btnConnections - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 5 - - - btnopen_SQLAdmin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 6 - - - EMAIL_ACTIVECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 7 - - - grpbxEmail - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 8 - - - btnlicensemanager_open - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 9 - - - INTERVALL_CKECK_NO_OF_FILESNumericUpDown - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 11 - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 12 - - - GEAENDERTWERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 14 - - - GEAENDERTWANNTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 16 - - - btnSaveKonfig - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 17 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 592 - - - 2 - - - Grundeinstellungen - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 1280, 545 - - - 3 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMain - - - 0 - - - Tahoma, 9.75pt - - - Overview and Detail - - - Overview - - - Detail - - - 202, 42 - - - 345, 24 - - - 85 - - - DISPLAY_MODEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 7 - - - 202, 188 - - - 345, 24 - - - 83 - - - cmbLOGIndex - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 8 - - - 202, 158 - - - 345, 24 - - - 81 - - - PM_VEKTOR_INDEXComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 9 - - - 677, 212 - Fill @@ -3624,7 +3288,7 @@ 58 - 347, 561 + 347, 575 2 @@ -3683,6 +3347,21 @@ 0 + + 4, 25 + + + 3, 3, 3, 3 + + + 907, 571 + + + 0 + + + Benutzer + TabPage7 @@ -3695,6 +3374,21 @@ 0 + + 4, 25 + + + 3, 3, 3, 3 + + + 907, 571 + + + 1 + + + Gruppen + TabPage8 @@ -3714,7 +3408,7 @@ 0, 0 - 915, 586 + 915, 600 1 @@ -3744,7 +3438,7 @@ 1 - 1266, 586 + 1266, 600 347 @@ -3764,58 +3458,31 @@ 0 - + 4, 25 - + 3, 3, 3, 3 - - 907, 557 + + 1272, 606 - - 0 - - - Benutzer - - - TabPage7 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl3 - - - 0 - - - 4, 25 - - - 3, 3, 3, 3 - - - 907, 557 - - + 1 - - Gruppen + + Profilzuordnung - - TabPage8 + + TabPage2 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl3 + + TabControl1 - + 1 @@ -3938,9 +3605,6 @@ 4 - - 234, 95 - MiddleLeft @@ -4025,177 +3689,6 @@ 7 - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 0 - - - EMAIL_REMINDER_FOOTERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 2 - - - EMAIL_REMINDER_HEADERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 4 - - - EMAIL_PWTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 6 - - - EMAIL_USERTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 8 - - - EMAIL_SMTPTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 10 - - - EMAIL_FROMTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 12 - - - False - - - 21, 90 - - - 622, 324 - - - 1 - - - E-Mail Konfiguration - - - grpbxEmail - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 8 - - - txtemailEmpfaenger - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 0 - - - Label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 1 - - - btnTest_Email - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 2 - - - 307, 23 - - - 303, 87 - - - 21 - - - Email testen - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 0 - 112, 19 @@ -4277,6 +3770,30 @@ 2 + + 307, 23 + + + 303, 87 + + + 21 + + + Email testen + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 0 + 10, 258 @@ -4409,6 +3926,33 @@ 12 + + False + + + 21, 90 + + + 622, 324 + + + 1 + + + E-Mail Konfiguration + + + grpbxEmail + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + MiddleLeft @@ -4559,6 +4103,57 @@ 17 + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 606 + + + 2 + + + Grundeinstellungen + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 1280, 635 + + + 3 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMain + + + 0 + 775, 134 @@ -4568,8 +4163,14 @@ 754, 95 + + 20, 20 + + + False + - 0, 545 + 0, 635 1280, 22 @@ -4592,12 +4193,6 @@ 1 - - 20, 20 - - - False - 17, 95 @@ -4614,7 +4209,7 @@ 0, 0 - 1280, 545 + 1280, 635 4 @@ -4658,66 +4253,6 @@ 826, 212 - - True - - - Tahoma, 9.75pt - - - 16, 161 - - - 107, 16 - - - 86 - - - Vektor Metadata: - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 3 - - - True - - - Tahoma, 9.75pt - - - 16, 191 - - - 136, 16 - - - 87 - - - Vektor Wertänderung: - - - Label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 1 - 327, 251 @@ -4725,13 +4260,13 @@ True - 184 + 66 7, 16 - 1280, 567 + 1280, 657 Tahoma, 9.75pt @@ -5143,18 +4678,6 @@ System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GridView1 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colNAME - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - TBPM_PROFILE_FINAL_INDEXINGBindingSource @@ -5341,6 +4864,18 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GridView1 + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colNAME + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + viewAvailableProfiles diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 1632d35..7eb7260 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -7,15 +7,13 @@ Imports DevExpress.XtraGrid.Views.Grid Public Class frmAdministration - 'Private _windreamPM As ClassPMWindream Private email As New ClassEmail Public profile_guid As Integer = 0 Dim formloaded As Boolean Private INSERT_ACTIVE As Boolean = False - Dim Windream_Indicies As List(Of String) - Dim Windream_Indicies_Types As List(Of Integer) - + Dim MyIndicies As List(Of String) + Dim MyIndicies_Types As List(Of Integer) Private Sub frmFormDesigner_Load(sender As Object, e As System.EventArgs) Handles Me.Load formloaded = False Try @@ -41,6 +39,7 @@ Public Class frmAdministration dragDropManager.AddGridView(viewAvailableGroups) dragDropManager.AddGridView(viewAssignedGroups) + 'If clsModules.IsModuleInstalled("User Manager") Then ' btnUserManager.Enabled = True 'Else @@ -58,76 +57,92 @@ Public Class frmAdministration LOGGER.Error(ex) MsgBox("Fehler bei Laden der Wertehilfen und Konfig-Daten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try - - Try - ' Windream instanziieren - '_windreamPM = New ClassPMWindream() - 'Windream initialisieren (Connection, Session, ... aufbauen) - '_windreamPM.Create_Session() - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - End Try + If IDB_ACTIVE = True Then + IDBData.Init() + End If ObjekttypenEintragen() Indexe_eintragen() - Try - If cmbObjekttypen.Text <> String.Empty Then - Windream_Indicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() - Windream_Indicies_Types = New List(Of Integer) - For Each i In Windream_Indicies - Dim type = WINDREAM.GetTypeOfIndex(i) - Windream_Indicies_Types.Add(type) - Next - End If - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler bei Indexe_eintragen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - End Try End Sub Sub Indexe_eintragen() If cmbObjekttypen.Text <> "" Then - Try - Me.PM_VEKTOR_INDEXComboBox.Items.Clear() - Me.cmbLOGIndex.Items.Clear() - Dim indexe = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text) - Me.PM_VEKTOR_INDEXComboBox.Items.Add("") - Me.cmbLOGIndex.Items.Add("") - 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 + Me.PM_VEKTOR_INDEXComboBox.Items.Clear() + Me.cmbLOGIndex.Items.Clear() + Me.PM_VEKTOR_INDEXComboBox.Items.Add("") + Me.cmbLOGIndex.Items.Add("") + If IDB_ACTIVE = False Then + PM_VEKTOR_INDEXComboBox.Enabled = True + Label4.Enabled = True + 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 = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() + For Each i In MyIndicies + Dim type = WINDREAM.GetTypeOfIndex(i) + MyIndicies_Types.Add(type) Next - End If - If Me.PM_VEKTOR_INDEXComboBox.Text <> "" Then - PM_VEKTOR_INDEXComboBox.SelectedIndex = PM_VEKTOR_INDEXComboBox.FindStringExact(Me.PM_VEKTOR_INDEXComboBox.Text) - Else + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error in GetIndices windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") 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 - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler bei Indexe_eintragen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") + End Try + Else + PM_VEKTOR_INDEXComboBox.Enabled = False + Label4.Enabled = False + Try + For Each oRow As DataRow In IDBData.DTVWIDB_BE_ATTRIBUTE.Rows + Select Case CInt(oRow.Item("TYP_ID")) + Case 8 + Me.PM_VEKTOR_INDEXComboBox.Items.Add(oRow.Item("ATTR_TITLE")) + Me.cmbLOGIndex.Items.Add(oRow.Item("ATTR_TITLE")) + End Select + Next + + MyIndicies_Types = New List(Of Integer) + MyIndicies = IDBData.GetIndicesByBE(cmbObjekttypen.Text).ToList() + For Each oIndex In MyIndicies + Dim type = IDBData.GetTypeOfIndex(oIndex) + MyIndicies_Types.Add(type) + Next + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error in GetIndices IDB: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + + End If + + 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 Try + End If + End If @@ -156,16 +171,25 @@ Public Class frmAdministration End Sub Private Sub ObjekttypenEintragen() Me.cmbObjekttypen.Items.Clear() - 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) + 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 - 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 + End If + End Sub @@ -212,7 +236,7 @@ Public Class frmAdministration End Sub Private Sub TBPM_PROFILEBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPM_PROFILEBindingSource.AddingNew - DD_DMSLiteDataSet.TBPM_PROFILE.ADDED_WHOColumn.DefaultValue = Environment.UserName + DD_DMSLiteDataSet.TBPM_PROFILE.ADDED_WHOColumn.DefaultValue = USER_USERNAME DD_DMSLiteDataSet.TBPM_PROFILE.ADDED_WHENColumn.DefaultValue = Date.Now DD_DMSLiteDataSet.TBPM_PROFILE.TYPEColumn.DefaultValue = 1 End Sub @@ -281,7 +305,7 @@ Public Class frmAdministration End Sub Private Sub TBPM_USERBindingSource_AddingNew(sender As System.Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USERBindingSource.AddingNew - DD_DMSLiteDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = Environment.UserName + DD_DMSLiteDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = USER_USERNAME End Sub Private Function GetCurrentProfileId() As Integer @@ -315,7 +339,7 @@ Public Class frmAdministration Dim userId As Integer = data.Split("|")(0) Dim profileId = GetCurrentProfileId() - TBPROFILE_USERTableAdapter.CMDInsert(profileId, userId, Environment.UserName) + TBPROFILE_USERTableAdapter.CMDInsert(profileId, userId, USER_USERNAME) FillProfile_User(profileId) Catch ex As Exception LOGGER.Error(ex) @@ -344,8 +368,8 @@ Public Class frmAdministration Dim profileId = GetCurrentProfileId() - TBPROFILE_GROUPTableAdapter.CmdInsert(profileId, groupId, Environment.UserName) - ' TBPROFILE_USERTableAdapter.CMDInsert(profileId, userId, Environment.UserName) + TBPROFILE_GROUPTableAdapter.CmdInsert(profileId, groupId, USER_USERNAME) + ' TBPROFILE_USERTableAdapter.CMDInsert(profileId, userId, USER_USERNAME) FillProfile_User(profileId) Catch ex As Exception LOGGER.Error(ex) @@ -386,7 +410,7 @@ Public Class frmAdministration Sub Save_Konfiguration() TBPM_KONFIGURATIONBindingSource.EndEdit() If DD_DMSLiteDataSet.TBPM_KONFIGURATION.GetChanges Is Nothing = False Then - GEAENDERTWERTextBox.Text = Environment.UserName + GEAENDERTWERTextBox.Text = USER_USERNAME TBPM_KONFIGURATIONBindingSource.EndEdit() TBPM_KONFIGURATIONTableAdapter.Update(DD_DMSLiteDataSet.TBPM_KONFIGURATION) tstrpinfo.Text = "Konfiguration wurde erfolgreich gespeichert" @@ -543,7 +567,7 @@ Public Class frmAdministration ' End If ' Try - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe.Text, indexwert, Environment.UserName, 0, "") + ' 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 @@ -566,7 +590,7 @@ Public Class frmAdministration ' End If ' Try - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, "[%VKT" & txtBezeichner.Text, indexwert, Environment.UserName, 0, "") + ' 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 @@ -599,7 +623,7 @@ Public Class frmAdministration copySuffix = copySuffix & "_COPY" End While - TBPM_PROFILETableAdapter.cmdInsert_Copy(copySuffix, Environment.UserName, PROFILGUIDTextBox.Text) + TBPM_PROFILETableAdapter.cmdInsert_Copy(copySuffix, USER_USERNAME, PROFILGUIDTextBox.Text) Dim NewGUID As Integer = TBPM_PROFILETableAdapter.cmdMaxGuid If NewGUID > 0 Then Dim _sql = "INSERT INTO TBPM_PROFILE_CONTROLS " & @@ -610,11 +634,11 @@ Public Class frmAdministration "FROM TBPM_PROFILE_CONTROLS AS TBPM_PROFILE_CONTROLS_1 " & "WHERE (PROFIL_ID = @Copy_profilId) " _sql = _sql.Replace("@NEW_PROFIL_ID", NewGUID) - _sql = _sql.Replace("@User", Environment.UserName) + _sql = _sql.Replace("@User", USER_USERNAME) _sql = _sql.Replace("@Copy_profilId", PROFILGUIDTextBox.Text) - TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CopyFinalIndex(NewGUID, Environment.UserName, PROFILGUIDTextBox.Text) - 'TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertCopy(NewGUID, Environment.UserName, PROFILGUIDTextBox.Text) + TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CopyFinalIndex(NewGUID, USER_USERNAME, PROFILGUIDTextBox.Text) + 'TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertCopy(NewGUID, USER_USERNAME, PROFILGUIDTextBox.Text) Execute_SQL(_sql) MsgBox("Das Profil " & NAMETextBox.Text & " wurde erfolgreich kopiert!", MsgBoxStyle.Information, "Erfolgsmeldung") Refresh_Profildaten() @@ -775,14 +799,14 @@ Public Class frmAdministration ' MsgBox("Bitte wählen Sie eine Connection und definieren einen SQL-Befehl!", MsgBoxStyle.Exclamation) ' Exit Sub ' End If - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", Environment.UserName, cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text) + ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", USER_USERNAME, cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text) ' INSERT_ACTIVE = False ' Else ' Dim i, ID As Integer ' i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index ' ID = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(0, i).Value ' If ID > 0 Then - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.cmdUpdateSQL(cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text, Environment.UserName, ID) + ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.cmdUpdateSQL(cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text, USER_USERNAME, ID) ' End If ' End If @@ -801,7 +825,7 @@ Public Class frmAdministration ' Exit Sub ' End If - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", Environment.UserName, CONID, SQL_COMMANDTextBox.Text) + ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", USER_USERNAME, CONID, SQL_COMMANDTextBox.Text) ' End If ' Dim i, ID As Integer @@ -915,8 +939,8 @@ Public Class frmAdministration End Sub Private Sub GridView2_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles viewFinalIndex.FocusedRowChanged - Try - Dim view As GridView = sender + 'Try + Dim view As GridView = sender Dim focusedRow As DataRow = view.GetFocusedDataRow() If IsNothing(focusedRow) Then @@ -951,37 +975,11 @@ Public Class frmAdministration ' Wenn eine neue Zeile hinzugefügt wird, auf StringValue setzen If e.FocusedRowHandle <> GridControl.NewItemRowHandle Then - obj = ClassFinalIndex.SetValue(value, obj, index, Windream_Indicies, Windream_Indicies_Types) + obj = FINALINDICES.SetValue(value, obj, index, MyIndicies, MyIndicies_Types) End If - 'Dim type As Integer = ClassFinalIndex.GetIndexType(index, Windream_Indicies, Windream_Indicies_Types) - 'Dim isCurrentIndexVectorIndex = ClassFinalIndex.IsVectorIndex(type) - - 'Dim indicies As List(Of String) = Windream_Indicies.AsEnumerable _ - ' .Where(Function(currentIndex As String) - ' Dim currentType As Integer = ClassFinalIndex.GetIndexType(currentIndex, Windream_Indicies, Windream_Indicies_Types) - - ' If isCurrentIndexVectorIndex Then - ' Return ClassFinalIndex.IsVectorIndex(currentType) - ' Else - ' Return Not ClassFinalIndex.IsVectorIndex(currentType) - ' End If - ' End Function).ToList() - - 'Dim indexTypes As List(Of Integer) = Windream_Indicies_Types.AsEnumerable _ - ' .Where(Function(currentType) - ' If isCurrentIndexVectorIndex Then - ' Return ClassFinalIndex.IsVectorIndex(currentType) - ' Else - ' Return Not ClassFinalIndex.IsVectorIndex(currentType) - ' End If - ' End Function).ToList() - - - 'obj.Indicies = indicies - 'obj.IndiciesType = indexTypes - obj.Indicies = Windream_Indicies - obj.IndiciesType = Windream_Indicies_Types + obj.Indicies = MyIndicies + obj.IndiciesType = MyIndicies_Types obj.IndexName = index obj.VectorBehaviourType = New List(Of String) From { "Add", @@ -989,17 +987,17 @@ Public Class frmAdministration } If Not index Is Nothing Then - Dim indexType As Integer = ClassFinalIndex.GetIndexType(index, Windream_Indicies, Windream_Indicies_Types) - obj.VectorIndex = ClassFinalIndex.IsVectorIndex(indexType) + Dim indexType As Integer = FINALINDICES.GetIndexType(index, MyIndicies, MyIndicies_Types) + obj.VectorIndex = FINALINDICES.IsVectorIndex(indexType) End If PropertyGrid1.SelectedObject = obj PropertyGrid1.Refresh() - Catch ex As Exception - LOGGER.Error(ex) - MsgBox($"Error while loading Final Index properties: {ex.Message}") - LOGGER.Info($"Error while loading Final Index properties: {ex.Message}") - End Try + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' MsgBox($"Error while loading Final Index properties: {ex.Message}", MsgBoxStyle.Critical) + ' LOGGER.Info($"Error while loading Final Index properties: {ex.Message}") + 'End Try End Sub Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem.Click @@ -1020,7 +1018,7 @@ Public Class frmAdministration If obj.SQLCommand.Value <> String.Empty Then value = "SQL-Command" Else - value = ClassFinalIndex.GetValue(obj, obj.IndexName, Windream_Indicies, Windream_Indicies_Types, obj.VectorIndex) + value = FINALINDICES.GetValue(obj, obj.IndexName, MyIndicies, MyIndicies_Types, obj.VectorIndex) End If value = NotNull(value, String.Empty) @@ -1030,7 +1028,7 @@ Public Class frmAdministration Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''") Dim indexName As String = NotNull(obj.IndexName, String.Empty) Dim isVectorIndex As Boolean = obj.VectorIndex - Dim addedWho As String = Environment.UserName + Dim addedWho As String = USER_USERNAME Dim description As String = obj.Description Dim active As Integer = IIf(obj.Active, 1, 0) Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0) @@ -1050,7 +1048,7 @@ Public Class frmAdministration ' Add the vector prefix to the value if index is a vector index ' and value is NOT an SQL-Command If obj.VectorIndex And value <> "SQL-Command" Then - value = $"{ClassFinalIndex.PREFIX_VECTOR}{value}" + value = $"{FINALINDICES.PREFIX_VECTOR}{value}" End If If INSERT_ACTIVE = True Then @@ -1098,8 +1096,8 @@ Public Class frmAdministration propertyGrid.Refresh() ElseIf e.ChangedItem.Label = "IndexName" Then - Dim type As Integer = ClassFinalIndex.GetIndexType(e.ChangedItem.Value, Windream_Indicies, Windream_Indicies_Types) - obj.VectorIndex = ClassFinalIndex.IsVectorIndex(type) + Dim type As Integer = FINALINDICES.GetIndexType(e.ChangedItem.Value, MyIndicies, MyIndicies_Types) + obj.VectorIndex = FINALINDICES.IsVectorIndex(type) propertyGrid.Refresh() End If diff --git a/app/DD_PM_WINDREAM/frmAnnotations.vb b/app/DD_PM_WINDREAM/frmAnnotations.vb index 3ee4b9a..c873d5b 100644 --- a/app/DD_PM_WINDREAM/frmAnnotations.vb +++ b/app/DD_PM_WINDREAM/frmAnnotations.vb @@ -7,7 +7,7 @@ Public Class frmAnnotations Try Me.Cursor = Cursors.WaitCursor - ClassAnnotation.Annotate_PDF(txttitle.Text, txtcontent.Text, txtSeitenzahl.Text) + ClassAnnotation.Annotate_PDF(txttitle.Text, txtcontent.Text, txtSeitenzahl.Text, True) Me.Cursor = Cursors.Default Me.Close() Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/frmConnection.vb b/app/DD_PM_WINDREAM/frmConnection.vb index f1e3b51..6cb17cb 100644 --- a/app/DD_PM_WINDREAM/frmConnection.vb +++ b/app/DD_PM_WINDREAM/frmConnection.vb @@ -145,7 +145,7 @@ Public Class frmConnection Try Me.TBDD_CONNECTIONBindingSource.EndEdit() If DD_DMSLiteDataSet.TBDD_CONNECTION.GetChanges Is Nothing = False Then - Me.GEANDERTWERTextBox.Text = Environment.UserName + Me.GEANDERTWERTextBox.Text = USER_USERNAME Me.TBDD_CONNECTIONBindingSource.EndEdit() Me.TBDD_CONNECTIONTableAdapter.Update(DD_DMSLiteDataSet.TBDD_CONNECTION) MsgBox("Änderungen wurden erfolgreich gespeichert!", MsgBoxStyle.Information) @@ -198,7 +198,7 @@ Public Class frmConnection End Sub Private Sub TBDD_CONNECTIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_CONNECTIONBindingSource.AddingNew - DD_DMSLiteDataSet.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName + DD_DMSLiteDataSet.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = USER_USERNAME End Sub Private Sub TBDD_CONNECTIONBindingSource_PositionChanged(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONBindingSource.PositionChanged @@ -230,9 +230,9 @@ Public Class frmConnection ' Case "ORACLE" ' Case "MS-SQL" ' If Me.txtUserId.Text = "WINAUTH" Then - ' TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, SERVERTextBox.Text, txtDatasource2.Text, "WINAUTH", "", "", True, Environment.UserName) + ' TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, SERVERTextBox.Text, txtDatasource2.Text, "WINAUTH", "", "", True, USER_USERNAME) ' Else - ' TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, SERVERTextBox.Text, txtDatasource2.Text, txtUserId.Text, txtPassword.Text, "", True, Environment.UserName) + ' TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, SERVERTextBox.Text, txtDatasource2.Text, txtUserId.Text, txtPassword.Text, "", True, USER_USERNAME) ' End If ' End Select diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.vb b/app/DD_PM_WINDREAM/frmControl_Detail.vb index 976f437..feff57d 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.vb @@ -22,7 +22,7 @@ Public Class frmControl_Detail Try TBPM_CONTROL_TABLEBindingSource.EndEdit() If DD_DMSLiteDataSet.TBPM_CONTROL_TABLE.GetChanges Is Nothing = False Then - Me.CHANGED_WHOTextBox.Text = Environment.UserName + Me.CHANGED_WHOTextBox.Text = USER_USERNAME TBPM_CONTROL_TABLEBindingSource.EndEdit() TBPM_CONTROL_TABLETableAdapter.cmdUpdate(SPALTENNAMETextBox.Text, SPALTEN_HEADERTextBox.Text, SPALTENBREITETextBox.Text, True, READ_ONLYCheckBox.Checked, LOAD_IDX_VALUECheckBox.Checked, CHANGED_WHOTextBox.Text, REGEX_MATCHTextBox.Text, REGEX_MESSAGE_DETextBox.Text, REGEX_MESSAGE_DETextBox.Text, GUIDTextBox.Text) tslblAenderungen.Visible = True diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 5197d1c..2a55201 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -22,36 +22,45 @@ Public Class frmFormDesigner ' Windream List Data Private Windream_ChoiceLists As List(Of String) - Private Windream_AllIndicies As List(Of String) - Private Windream_VectorIndicies As List(Of String) - Private Windream_SimpleIndicies As List(Of String) - Private Windream_LookupIndicies As List(Of String) + Private Source_AllIndicies As List(Of String) + Private Source_VectorIndicies As List(Of String) + Private Source_SimpleIndicies As List(Of String) + Private Source_LookupIndicies As List(Of String) Private CurrentColumnId As Integer = 0 Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER - CURRENT_DESIGN_TYPE = "INPUT_INDEX" + 'Try + ' 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 - clsWindream.Create_Session() + ' Try + ' Windream initialisieren + If IDB_ACTIVE = False Then + clsWindream.Create_Session() + End If - 'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden - Dim unsortedIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList() - Dim sortedIndicies = unsortedIndicies.OrderBy(Function(index As String) index).ToList() + 'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden + Dim unsortedIndicies + Dim sortedIndicies + If IDB_ACTIVE = False Then + unsortedIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList() + sortedIndicies = unsortedIndicies.OrderBy(Function(index As String) index).ToList() + Else + sortedIndicies = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE).ToList() + End If - Windream_AllIndicies = sortedIndicies - Windream_VectorIndicies = Windream_AllIndicies.FindAll(AddressOf IsVectorIndex) - Windream_SimpleIndicies = Windream_AllIndicies.Except(Windream_VectorIndicies).ToList() - Windream_LookupIndicies = Windream_AllIndicies. + + Source_AllIndicies = sortedIndicies + Source_VectorIndicies = Source_AllIndicies.FindAll(AddressOf IsVectorIndex) + Source_SimpleIndicies = Source_AllIndicies.Except(Source_VectorIndicies).ToList() + Source_LookupIndicies = Source_AllIndicies. Where(AddressOf IsNotVectorBooleanIndex). Where(AddressOf IsNotVectorDateIndex). Where(AddressOf IsNotVectorDatetimeIndex). @@ -59,31 +68,33 @@ Public Class frmFormDesigner Where(AddressOf IsNotDateIndex). ToList() + If IDB_ACTIVE = False Then + Windream_ChoiceLists = New List(Of String) + Windream_ChoiceLists.Add(String.Empty) + Windream_ChoiceLists.AddRange(clsWD_GET.GetChoiceLists()) + End If - Windream_ChoiceLists = New List(Of String) - Windream_ChoiceLists.Add(String.Empty) - Windream_ChoiceLists.AddRange(clsWD_GET.GetChoiceLists()) - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - End Try + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") + 'End Try - Try - TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBWH_CHECK_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler bei Laden der Connection-Strings und Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - End Try - - LoadControls() + Try + TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBWH_CHECK_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) Catch ex As Exception LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "error loading form:") + MsgBox("Fehler bei Laden der Connection-Strings und Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try + + LoadControls() + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' MsgBox(ex.Message, MsgBoxStyle.Critical, "error loading form:") + 'End Try End Sub Private Sub frmFormDesigner_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing @@ -121,39 +132,64 @@ Public Class frmFormDesigner ''' Filtert aus der Liste von Indexen die Vektor Indexe heraus ''' Private Function IsVectorIndex(IndexName As String) As Boolean - Dim oType As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Dim oType As Integer + If IDB_ACTIVE = False Then + oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Else + oType = IDBData.GetTypeOfIndex(IndexName) + End If - Return ClassFinalIndex.IsVectorIndex(oType) + Return FINALINDICES.IsVectorIndex(oType) End Function Private Function IsNotBooleanIndex(IndexName As String) As Boolean - Dim oType As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) - - Return oType <> ClassFinalIndex.INDEX_TYPE_BOOLEAN + Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + If IDB_ACTIVE = False Then + oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Else + oType = IDBData.GetTypeOfIndex(IndexName) + End If + Return oType <> FINALINDICES.INDEX_TYPE_BOOLEAN End Function Private Function IsNotDateIndex(IndexName As String) As Boolean - Dim oType As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) - - Return oType <> ClassFinalIndex.INDEX_TYPE_DATE + Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + If IDB_ACTIVE = False Then + oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Else + oType = IDBData.GetTypeOfIndex(IndexName) + End If + Return oType <> FINALINDICES.INDEX_TYPE_DATE End Function Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean - Dim oType As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) - - Return oType <> ClassFinalIndex.INDEX_TYPE_VECTOR_BOOLEAN + Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + If IDB_ACTIVE = False Then + oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Else + oType = IDBData.GetTypeOfIndex(IndexName) + End If + Return oType <> FINALINDICES.INDEX_TYPE_VECTOR_BOOLEAN End Function Private Function IsNotVectorDateIndex(IndexName As String) As Boolean - Dim oType As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) - - Return oType <> ClassFinalIndex.INDEX_TYPE_VECTOR_DATE + Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + If IDB_ACTIVE = False Then + oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Else + oType = IDBData.GetTypeOfIndex(IndexName) + End If + Return oType <> FINALINDICES.INDEX_TYPE_VECTOR_DATE End Function Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean - Dim oType As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) - - Return oType <> ClassFinalIndex.INDEX_TYPE_VECTOR_DATETIME + Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + If IDB_ACTIVE = False Then + oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) + Else + oType = IDBData.GetTypeOfIndex(IndexName) + End If + Return oType <> FINALINDICES.INDEX_TYPE_VECTOR_DATETIME End Function Sub LoadControls() @@ -295,7 +331,7 @@ Public Class frmFormDesigner Dim label = ClassControlCreator.CreateNewLabel(cursorPosition) SetMovementHandlers(label) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, Environment.UserName, label.Size.Height, label.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width) CurrentControl = label CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -310,7 +346,7 @@ Public Class frmFormDesigner Dim txt = ClassControlCreator.CreateNewTextBox(cursorPosition) SetMovementHandlers(txt) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, Environment.UserName, txt.Size.Height, txt.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width) CurrentControl = txt CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -324,7 +360,7 @@ Public Class frmFormDesigner Dim cmb = ClassControlCreator.CreateNewCombobox(cursorPosition) SetMovementHandlers(cmb) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, Environment.UserName, cmb.Size.Height, cmb.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width) CurrentControl = cmb CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -338,7 +374,7 @@ Public Class frmFormDesigner Dim dtp = ClassControlCreator.CreateNewDatetimepicker(cursorPosition) SetMovementHandlers(dtp) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, Environment.UserName, dtp.Size.Height, dtp.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width) CurrentControl = dtp CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -352,7 +388,7 @@ Public Class frmFormDesigner Dim chk = ClassControlCreator.CreateNewCheckbox(cursorPosition) SetMovementHandlers(chk) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, Environment.UserName, chk.Size.Height, chk.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width) CurrentControl = chk CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -367,7 +403,7 @@ Public Class frmFormDesigner SetMovementHandlers(lc) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, Environment.UserName, lc.Size.Height, lc.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width) CurrentControl = lc CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -383,7 +419,7 @@ Public Class frmFormDesigner SetMovementHandlers(tb) AddHandler tb.MouseClick, AddressOf gridControl_MouseClick - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, Environment.UserName, tb.Size.Height, tb.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width) Dim oControlId = GetLastID() @@ -393,8 +429,8 @@ Public Class frmFormDesigner .ReadOnly = False } - TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, Environment.UserName) - TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, Environment.UserName) + TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME) + TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME) pnldesigner.Controls.Add(tb) Case ClassControlCreator.PREFIX_LINE @@ -402,7 +438,7 @@ Public Class frmFormDesigner SetMovementHandlers(line) - TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, Environment.UserName, line.Size.Height, line.Size.Width) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width) CurrentControl = line CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -791,13 +827,13 @@ Public Class frmFormDesigner props = labelProps ElseIf TypeOf sender Is CheckBox Then Dim check As CheckBox = sender - Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Windream_AllIndicies) + Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Source_AllIndicies) checkProps.Text = check.Text props = checkProps ElseIf TypeOf sender Is TextBox Then Dim txt As TextBox = sender - Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_AllIndicies) + Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Source_AllIndicies) txtProps.Regex = NotNull(row.Item("REGEX_MATCH"), String.Empty) txtProps.RegexMessage = NotNull(row.Item("REGEX_MESSAGE_DE"), String.Empty) @@ -805,7 +841,7 @@ Public Class frmFormDesigner ElseIf TypeOf sender Is ComboBox Then Dim cmb As ComboBox = sender - Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_AllIndicies) + Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Source_AllIndicies) cmbProps.ChoiceLists = Windream_ChoiceLists cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), String.Empty) @@ -814,19 +850,19 @@ Public Class frmFormDesigner ElseIf TypeOf sender Is DateTimePicker Then Dim dtp As DateTimePicker = sender - Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_AllIndicies) + Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Source_AllIndicies) props = dtpProps ElseIf TypeOf sender Is DataGridView Then Dim grid As DataGridView = sender - Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies) + Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Source_VectorIndicies) props = gridProps ElseIf TypeOf sender Is LookupControl2 Then Dim grid As LookupControl2 = sender - Dim lookupProps As LookupControlProperties = CreatePropsObjectWithIndicies(New LookupControlProperties, row, Windream_LookupIndicies) + Dim lookupProps As LookupControlProperties = CreatePropsObjectWithIndicies(New LookupControlProperties, row, Source_LookupIndicies) lookupProps.MultiSelect = StrToBool(row.Item("MULTISELECT")) lookupProps.PreventDuplicates = StrToBool(row.Item("VKT_PREVENT_MULTIPLE_VALUES")) lookupProps.AllowAddNewValues = StrToBool(row.Item("VKT_ADD_ITEM")) @@ -835,7 +871,7 @@ Public Class frmFormDesigner ElseIf TypeOf sender Is GridControl Then Dim oGridControl As GridControl = sender - Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, row, Windream_VectorIndicies) + Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, row, Source_VectorIndicies) oGridProps.AllowAddNewValues = StrToBool(row.Item("VKT_ADD_ITEM")) props = oGridProps @@ -969,7 +1005,7 @@ Public Class frmFormDesigner End If Try - If ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {guid}", True) = True Then + If ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{USER_USERNAME}' WHERE GUID = {guid}", True) = True Then tslblAenderungen.Visible = True tslblAenderungen.Text = "Änderungen gespeichert - " & Now Return True diff --git a/app/DD_PM_WINDREAM/frmLicense.vb b/app/DD_PM_WINDREAM/frmLicense.vb index ee94bf4..4074bc5 100644 --- a/app/DD_PM_WINDREAM/frmLicense.vb +++ b/app/DD_PM_WINDREAM/frmLicense.vb @@ -26,7 +26,7 @@ Public Class frmLicense Dim oDateddMMyyyy = dt.ToString("dd.MM.yyyy", CultureInfo.InvariantCulture) Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlizences.Text & "#" & oDateddMMyyyy & "#" & txtProfile.Text, "#DigitalData35452!#") txtlicensekey.Text = result - Me.TBPM_KONFIGURATIONTableAdapter.CmdUpdateLizenz(Environment.UserName, CStr(result)) + Me.TBPM_KONFIGURATIONTableAdapter.CmdUpdateLizenz(USER_USERNAME, CStr(result)) Refresh_Licence(True) 'MsgBox("Die Lizenzen wurden erfolgreich aktualisiert!", MsgBoxStyle.Exclamation, "Erfolgsmeldung:") End If diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 3da0b43..050ee40 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -365,7 +365,7 @@ Partial Class frmMain 'tsslblDEBUG_LOG ' resources.ApplyResources(Me.tsslblDEBUG_LOG, "tsslblDEBUG_LOG") - Me.tsslblDEBUG_LOG.ForeColor = System.Drawing.Color.DarkRed + Me.tsslblDEBUG_LOG.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.tsslblDEBUG_LOG.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.A_1 Me.tsslblDEBUG_LOG.Name = "tsslblDEBUG_LOG" ' diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 6b5ecd6..fea07b2 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAVQBBAFUAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAVwBBAFcAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index a28a7c8..7587ac1 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -111,7 +111,7 @@ Public Class frmMain Me.Close() End If Else - LOGGER.Info(">> Username: " & Environment.UserName, False) + LOGGER.Info(">> Username: " & USER_USERNAME, False) 'Wenn license abgelaufen und der User nicht admin ist! If LICENSE_EXPIRED = True Then If USER_IS_ADMIN = False Then @@ -138,7 +138,7 @@ Public Class frmMain LOGGER.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei User Check:") End Try - tsstlblUser.Text = Environment.UserName + tsstlblUser.Text = USER_USERNAME Try @@ -173,21 +173,23 @@ Public Class frmMain End Try Check_Timer_Notification() Restore_Form_Position() + If IDB_ACTIVE = False Then + Try + WINDREAM = New ClassPMWindream + WINDREAM.Start_WMCC_andCo() - Try - WINDREAM = New ClassPMWindream - WINDREAM.Start_WMCC_andCo() + '_windreamPM = New ClassPMWindream + '_windreamPM.Start_WMCC_andCo() + If WINDREAM.oSession.aLoggedin = False Then + MsgBox("Login on windream was not possible. Please check the log." & vbNewLine & "Application will close now!", MsgBoxStyle.Critical) + Me.Close() + End If + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Unexpected Error in windream-login - Step 5: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + End Try + End If - '_windreamPM = New ClassPMWindream - '_windreamPM.Start_WMCC_andCo() - If WINDREAM.oSession.aLoggedin = False Then - MsgBox("Login on windream was not possible. Please check the log." & vbNewLine & "Application will close now!", MsgBoxStyle.Critical) - Me.Close() - End If - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Unexpected Error in windream-login - Step 5: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - End Try LOGGER.Debug("MainForm initialized!") End If @@ -370,7 +372,7 @@ Public Class frmMain Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Load_Profile_items - Error: " & ex.Message) - MsgBox("Unexpected Error in Load_Profile_items - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + 'MsgBox("Unexpected Error in Load_Profile_items - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -620,7 +622,7 @@ Public Class frmMain sql = clsPatterns.ReplaceUserValues(sql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) sql = sql.Replace("@USER_ID", USER_ID) - sql = sql.Replace("@USERNAME", Environment.UserName) + sql = sql.Replace("@USERNAME", USER_USERNAME) sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) sql = sql.Replace("@DATE", Now.ToShortDateString) sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) @@ -771,14 +773,14 @@ Public Class frmMain ' ' this needs to stay for backwards compatibility ' sql = sql.Replace("@USER_ID", USER_ID) - ' sql = sql.Replace("@USERNAME", Environment.UserName) '{#INT#USERNAME} + ' sql = sql.Replace("@USERNAME", USER_USERNAME) '{#INT#USERNAME} ' sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) '{#INT#machineName} ' sql = sql.Replace("@DATE", Now.ToShortDateString) ' sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) ' 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & ' ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & - ' ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) + ' ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", USER_USERNAME) ' CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True) ' If Not IsNothing(CURR_DT_PROFILEGRID) Then @@ -893,12 +895,10 @@ Public Class frmMain ElseIf GRID_LOAD_TYPE.StartsWith("PROFILE#") Then Load_single_Profile() End If - If WORKING_MODE <> "" Then - If WORKING_MODE.Contains("PM#NO_MASS_VALIDATOR") Then - GridView_Docs.OptionsSelection.MultiSelect = False - tsmiMarkedFilesFinish.Visible = False - ToolStripSeparator4.Visible = False - End If + If SHOW_MASS_VALIDATOR = False Then + GridView_Docs.OptionsSelection.MultiSelect = False + tsmiMarkedFilesFinish.Visible = False + ToolStripSeparator4.Visible = False Else tsmiMarkedFilesFinish.Visible = True ToolStripSeparator4.Visible = True @@ -967,9 +967,9 @@ Public Class frmMain Sub Load_Profil_from_Grid(ID As Integer) - Try - Me.Visible = False - CURRENT_ProfilGUID = ID + 'Try + 'Me.Visible = False + CURRENT_ProfilGUID = ID CURRENT_ProfilName = ClassDatabase.Execute_Scalar("SELECT NAME FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID, CONNECTION_STRING) CURRENT_DT_PROFILE = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE where GUID = {0}", CURRENT_ProfilGUID)) CURRENT_DT_PROFILE_SEARCHES_DOC = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE_SEARCH where PROFILE_ID = {0} AND TYPE = 'DOC' AND ACTIVE = 1 ORDER BY TAB_INDEX", CURRENT_ProfilGUID)) @@ -981,11 +981,11 @@ Public Class frmMain End If frmValidator.ShowDialog() - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Load_Profil_from_Grid: ") - End Try - Me.Visible = True + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Load_Profil_from_Grid: ") + 'End Try + ' Me.Visible = True Decide_Load() End Sub @@ -1020,9 +1020,9 @@ Public Class frmMain Item_Scope("CMROW") End Sub Private Sub Item_Scope(startedFrom As String) - Try - 'GridView_Docs.EndSelection() - CURRENT_JUMP_DOC_GUID = 0 + 'Try + 'GridView_Docs.EndSelection() + CURRENT_JUMP_DOC_GUID = 0 Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation) Dim groupRowText @@ -1102,11 +1102,23 @@ Public Class frmMain MsgBox("Could not get the ProfileID of file! - Check Your configuration of MainView!", MsgBoxStyle.Critical) End If + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' MsgBox("Unexpected error in Item_Scope: " & ex.Message, MsgBoxStyle.Critical) + 'End Try + End Sub + Private Function Init_IDB() + Try + IDBData = New ClassIDBData() + + Return True Catch ex As Exception LOGGER.Error(ex) - MsgBox("Unexpected error in Item_Scope: " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error Init_IDB:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + LOGGER.Info(">> Unexpected error in Init_IDB: " & ex.Message, True) + Return False End Try - End Sub + End Function Private Function Init_windream() Try '_windream = New ClassWindream_allgemein @@ -1150,7 +1162,16 @@ Public Class frmMain MsgBox("Could not select a profile!", MsgBoxStyle.Exclamation, "Mass Validation") Exit Sub End If - If Init_windream() Then + + If IDB_ACTIVE = False Then + SOURCE_INIT = Init_windream() + + Else + SOURCE_INIT = Init_IDB() + End If + + + If SOURCE_INIT = True Then CURRENT_ProfilGUID = oProfileId CURRENT_DT_FINAL_INDEXING = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {0}", CURRENT_ProfilGUID)) @@ -1230,7 +1251,7 @@ Public Class frmMain tslblmessage.Text = "" If CURRENT_DT_VW_PROFILE_USER.Rows.Count = 0 Then - LOGGER.Info(" >> no profiles for user: '" & Environment.UserName & "' configured!", False) + LOGGER.Info(" >> no profiles for user: '" & USER_USERNAME & "' configured!", False) NO_WORKFLOWITEMS = True tslblmessage.Text = "Keine Profile für Ihren User hinterlegt" @@ -1251,14 +1272,14 @@ Public Class frmMain oSQLOverview = clsPatterns.ReplaceUserValues(oSQLOverview, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) oSQLOverview = oSQLOverview.Replace("@USER_ID", USER_ID) - oSQLOverview = oSQLOverview.Replace("@USERNAME", Environment.UserName) + oSQLOverview = oSQLOverview.Replace("@USERNAME", USER_USERNAME) oSQLOverview = oSQLOverview.Replace("@MACHINE_NAME", Environment.MachineName) oSQLOverview = oSQLOverview.Replace("@DATE", Now.ToShortDateString) oSQLOverview = oSQLOverview.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & - ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) + ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", USER_USERNAME) CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(oSQLOverview, True) Dim DTGRID_GROUPS As DataTable Try @@ -1606,7 +1627,7 @@ Public Class frmMain End If End Sub Private Sub Timer5Mins_Tick(sender As Object, e As EventArgs) Handles Timer5Mins.Tick - Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) + Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED) Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index 6e7777a..afb470a 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -879,7 +879,7 @@ Public Class frmMassValidator End Sub Private Sub Depending_Control_Set_Result(displayboxname As String, sqlCommand As String, sqlConnection As String) Try - Dim resultDT As DataTable = ClassDatabase.Return_Datatable_CS(sqlCommand, sqlConnection) + Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConStr(sqlCommand, sqlConnection) If Not IsNothing(resultDT) Then 'Ist das Control ein Control was mehrfachwerte enthalten kann If displayboxname.StartsWith(ClassControlCreator.PREFIX_COMBOBOX) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_DATAGRIDVIEW) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_TABLE) Then @@ -975,7 +975,7 @@ Public Class frmMassValidator Dim sql_Statement = ROW.Item(2) Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString() sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue) - Dim resultDT As DataTable = ClassDatabase.Return_Datatable_CS(sql_Statement, ROW.Item(1)) + Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConStr(sql_Statement, ROW.Item(1)) If resultDT.Rows.Count >= 1 Then 'Nur dediziert einen Wert zurückerhalten For Each row1 As DataRow In resultDT.Rows @@ -1135,7 +1135,7 @@ Public Class frmMassValidator If CreateWMObject() = True Then If ClassFinalizeDoc.Write_Final_Metadata(CURRENT_WMFILE) = True Then - Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID) + 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 End If @@ -1223,12 +1223,12 @@ Public Class frmMassValidator WORK_HISTORY_ENTRY.ToString.Replace("@DATE", Now.ToShortDateString) End If If WORK_HISTORY_ENTRY.ToString.Contains("@USERNAME") Then - WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", Environment.UserName) + WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", USER_USERNAME) End If Else WORK_HISTORY_ENTRY = "" End If - Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY) + Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, WORK_HISTORY_ENTRY) ClassDatabase.Execute_non_Query(ins) '####### ANNOTIEREN WENN KONFIGURIERT ####### @@ -1240,7 +1240,7 @@ Public Class frmMassValidator If Not IsNothing(DT_ENTRY) Then If DT_ENTRY.Rows.Count = 1 Then Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT") - ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0) + ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False) End If End If End If @@ -1863,7 +1863,7 @@ Public Class frmMassValidator Dim PM_String As String Try Dim Bezeichner As String = VKTBezeichner.Replace("[%VKT", "") - PM_String = "DD-PM" & Delimiter & Bezeichner & Delimiter & input & Delimiter & Environment.UserName & Delimiter & Now.ToString + PM_String = "DD-PM" & Delimiter & Bezeichner & Delimiter & input & Delimiter & USER_USERNAME & Delimiter & Now.ToString Catch ex As Exception LOGGER.Error(ex) LOGGER.Info(">> Fehler in Return_PM_VEKTOR: " & ex.Message, True) @@ -1876,9 +1876,9 @@ Public Class frmMassValidator Dim PM_String As String Try If old = "DDFINALINDEX" Then - PM_String = "DD-PMlog-FINAL" & Delimiter & indexname & Delimiter & input & Delimiter & Environment.UserName & Delimiter & Now.ToString + PM_String = "DD-PMlog-FINAL" & Delimiter & indexname & Delimiter & input & Delimiter & USER_USERNAME & Delimiter & Now.ToString Else - PM_String = "DD-PMlog-CHG" & Delimiter & indexname & Delimiter & "NEW: '" & input & "'" & Delimiter & Environment.UserName & Delimiter & Now.ToString + PM_String = "DD-PMlog-CHG" & Delimiter & indexname & Delimiter & "NEW: '" & input & "'" & Delimiter & USER_USERNAME & Delimiter & Now.ToString End If Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 3e83c44..867eac7 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -61,13 +61,31 @@ Public Class frmSQL_DESIGNER btnAddControl.Visible = True cmbIndexe.Items.Clear() - 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 + 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 End If + Else cmbControls.Visible = False lblControls.Visible = False @@ -246,8 +264,14 @@ Public Class frmSQL_DESIGNER Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndex.Click If cmbIndexe.SelectedIndex <> -1 Then - Dim value As String = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_WMI, cmbIndexe.Text) - InsertAtSelection(value) + Dim oValue As String + If IDB_ACTIVE = False Then + oValue = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_WMI, cmbIndexe.Text) + Else + oValue = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_IDBA, cmbIndexe.Text) + End If + + InsertAtSelection(oValue) End If End Sub diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 8c102a9..8d3755e 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -44,8 +44,6 @@ Partial Class frmValidator Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() - Me.VWPM_CONTROL_INDEXBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.VWPM_CONTROL_INDEXTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter() Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -140,7 +138,6 @@ Partial Class frmValidator Me.StatusStrip1.SuspendLayout() Me.Panel1.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -280,15 +277,6 @@ Partial Class frmValidator ' Me.TBPM_PROFILETableAdapter.ClearBeforeFill = True ' - 'VWPM_CONTROL_INDEXBindingSource - ' - Me.VWPM_CONTROL_INDEXBindingSource.DataMember = "VWPM_CONTROL_INDEX" - Me.VWPM_CONTROL_INDEXBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'VWPM_CONTROL_INDEXTableAdapter - ' - Me.VWPM_CONTROL_INDEXTableAdapter.ClearBeforeFill = True - ' 'TBPM_PROFILE_CONTROLSBindingSource ' Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS" @@ -851,7 +839,6 @@ Partial Class frmValidator Me.StatusStrip1.PerformLayout() Me.Panel1.ResumeLayout(False) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -895,8 +882,6 @@ Partial Class frmValidator Friend WithEvents pnldesigner As System.Windows.Forms.Panel Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager - Friend WithEvents VWPM_CONTROL_INDEXBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPM_CONTROL_INDEXTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index b90aea2..574e648 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -130,6 +130,31 @@ 608, 17 + + Segoe UI, 9pt, style=Bold + + + 22, 17 + + + sss + + + + False + + + 89, 17 + + + Anzahl Dateien: + + + 82, 17 + + + Document-ID: + 0, 621 @@ -140,7 +165,6 @@ 962, 22 - 4 @@ -159,105 +183,6 @@ 2 - - Segoe UI, 9pt, style=Bold - - - 22, 17 - - - sss - - - False - - - 89, 17 - - - Anzahl Dateien: - - - 82, 17 - - - Document-ID: - - - TITLELabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - btnSave - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - DESCRIPTIONLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - pnldesigner - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - - - Fill - - - 0, 0 - - - 3, 4, 3, 4 - - - 477, 593 - - - 24 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel1 - - - 0 - Top, Left, Right @@ -387,6 +312,33 @@ 3 + + Fill + + + 0, 0 + + + 3, 4, 3, 4 + + + 477, 593 + + + 24 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1.Panel1 + + + 0 + 725, 17 @@ -394,46 +346,40 @@ 887, 17 - 1075, 56 + 261, 95 - 278, 134 + 1004, 134 - 1183, 95 + 486, 134 - 558, 56 + 826, 56 - 262, 95 + 744, 95 - 714, 95 - - - 1060, 17 - - - 17, 56 + 17, 134 - 279, 56 + 547, 56 - 831, 56 - - 17, 95 + + 499, 95 + - 502, 95 + 984, 95 - 920, 95 + 223, 134 - 17, 134 + 743, 134 Top, Right @@ -445,7 +391,7 @@ 0, 141 - 955, 134 + 282, 173 Top @@ -544,11 +490,74 @@ 962, 643 - 17, 173 + 672, 173 Segoe UI, 9.75pt + + 156, 22 + + + Datei öffnen + + + 156, 22 + + + Info + + + 156, 22 + + + Eigenschaften + + + Magenta + + + 67, 22 + + + Datei + + + Magenta + + + 212, 22 + + + Zusätzliche Suchen aktualisieren + + + Magenta + + + 165, 22 + + + Datei überspringen (F4) + + + Magenta + + + 106, 22 + + + Datei löschen + + + Magenta + + + 105, 22 + + + Annotationen + 0, 0 @@ -619,8 +628,14 @@ 0 - 1228, 134 + 555, 173 + + 120, 17 + + + ToolStripStatusLabel1 + 3, 75 @@ -669,6 +684,21 @@ 0 + + Fill + + + Segoe UI, 9.75pt, style=Italic + + + 3, 21 + + + 194, 25 + + + 0 + txtBetreff @@ -1003,18 +1033,6 @@ DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - VWPM_CONTROL_INDEXBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - VWPM_CONTROL_INDEXTableAdapter - - - DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TBPM_PROFILE_CONTROLSBindingSource @@ -1481,7 +1499,7 @@ 0 - 690, 134 + 17, 173 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -1571,117 +1589,21 @@ 1 - 807, 134 + 134, 173 - 1080, 134 + 407, 173 - - 119, 17 - - - ToolStripStatusLabel1 - - - Fill - - - Segoe UI, 9.75pt, style=Italic - - - 3, 21 - - - 194, 25 - - - 0 - - - txtBetreff - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpBetreff - - - 0 - - - Magenta - - - 67, 22 - - - Datei - - - 156, 22 - - - Datei öffnen - - - 156, 22 - - - Info - - - 156, 22 - - - Eigenschaften - - - Magenta - - - 178, 22 - - - Zusätzliche Suchen reload - - - Magenta - - - 165, 22 - - - Datei überspringen (F4) - - - Magenta - - - 106, 22 - - - Datei löschen - - - Magenta - - - 105, 22 - - - Annotationen - - 124, 173 + 779, 173 - 273, 173 + 928, 173 - 583, 173 + 17, 212 - 888, 173 + 322, 212 \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 020a63b..2305491 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -9,6 +9,8 @@ Imports System.ComponentModel Imports DD_LIB_Standards Imports DigitalData.Controls.LookupGrid Imports DevExpress.XtraGrid +Imports DigitalData.Controls.DocumentViewer +Imports System.Reflection Public Class frmValidator Dim viewerID @@ -53,11 +55,12 @@ Public Class frmValidator Dim sumatra As Boolean = False Private _CURRENT_INDEX_ARRAY(100, 250) As String - + Dim MyDocViewer As DocumentViewer Private _frmValidatorSearch As frmValidatorSearch 'You need a reference to Form1 Private _dependingControl_in_action As Boolean = False Private DTCONTROLS As DataTable + Private DTVWCONTROL_INDEX As DataTable Private FormLoaded As Boolean = False Private ControlHandleStarted As Boolean = False @@ -87,6 +90,148 @@ Public Class frmValidator End Try End Function + Private Sub frmValidation_Load(sender As Object, e As System.EventArgs) Handles Me.Load + SplitContainer1.Panel2Collapsed = True + docCounter = 1 + OLD_Document_Path = "" + first_control = Nothing + me_closing = False + pdfxchange = False + sumatra = False + FormLoaded = False + If My.Settings.frmValidatorPosition.IsEmpty = False Then + If My.Settings.frmValidatorPosition.X > 0 And My.Settings.frmValidatorPosition.Y > 0 Then + Location = My.Settings.frmValidatorPosition + End If + End If + If My.Settings.frmValidatorSize.IsEmpty = False Then + Size = My.Settings.frmValidatorSize + End If + Dim _step = 0 + Try + MyDocViewer = New DocumentViewer + MyDocViewer.Init(LOGCONFIG, "21182889975216572111813147150675976632") + Catch ex As Exception + LOGGER.Error(ex) + End Try + Try + _step = 1 + + TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING + _step = 2 + Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX WHERE PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC" + DTVWCONTROL_INDEX = ClassDatabase.Return_Datatable(oSQL) + 'VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName) + _step = 3 + TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) + _step = 4 + TBPM_CONTROL_TABLETableAdapter.FillAll(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE) + + LOGGER.Debug("Profile Data geladen") + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error LOADING profile-data(" & _step.ToString & "):" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error LOADING profile-data: " & ex.Message, USER_USERNAME) + LOGGER.Info(">> Fehler in LOADING profile-data: " & ex.Message, True) + Me.Close() + End Try + + Try + Delimiter = TBPM_KONFIGURATIONTableAdapter.cmdGetDelimiter + + + If CURRENT_DT_PROFILE.Rows.Count = 0 Then + LOGGER.Info(">> Profildaten konnten nicht geladen werden - Übergebenes Profil: : " & CURRENT_ProfilName, True) + MsgBox("Achtung: Profildaten konnten nicht übergeben oder geladen werden.", MsgBoxStyle.Critical, "Achtung:") + Me.Close() + End If + If CURRENT_DT_PROFILE.Rows.Count > 1 Then + MsgBox("Es wurde mehr als 1 Profil (" & CURRENT_DT_PROFILE.Rows.Count & ") zurückgegeben!!", MsgBoxStyle.Critical, "Achtung:") + Else + If CURRENT_DT_PROFILE.Rows.Count = 1 Then + For Each dr As DataRow In CURRENT_DT_PROFILE.Rows + PROFIL_VEKTORINDEX = dr.Item("PM_VEKTOR_INDEX") + PROFIL_LOGINDEX = dr.Item("LOG_INDEX") + Me.Text = "Process Manager - " & dr.Item("TITLE") + + TITLELabel1.Text = dr.Item("TITLE") + DESCRIPTIONLabel.Text = IIf(IsDBNull(dr.Item("DESCRIPTION")), "", dr.Item("DESCRIPTION")) + If PROFIL_VEKTORINDEX.GetType.ToString.ToLower = "system.dbnull" Then + PROFIL_VEKTORINDEX = "" + End If + If PROFIL_LOGINDEX.GetType.ToString.ToLower = "system.dbnull" Then + PROFIL_LOGINDEX = "" + End If + + WD_Search = dr.Item("WD_SEARCH") + finalProfile = dr.Item("FINAL_PROFILE") + Move2Folder = IIf(IsDBNull(dr.Item("MOVE2Folder")), "", dr.Item("MOVE2Folder")) + Try + If finalProfile = True Then + + Dim text As String = IIf(IsDBNull(dr.Item("FINAL_TEXT")), "", dr.Item("FINAL_TEXT")) + If text <> "" Then + btnSave.Text = text + Else + btnSave.Text = "Validierung speichern - Nächstes Dokument" + End If + Else + btnSave.Text = "Validierung speichern - Nächstes Dokument" + End If + LOGGER.Debug("Final profile Text geladen") + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error loading final profile text:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error loading final profile text: " & ex.Message, USER_USERNAME) + LOGGER.Info(">> Fehler in loading final profile text: " & ex.Message, True) + End Try + ToolStripButtonJumpFile.Enabled = True + If CURRENT_JUMP_DOC_GUID <> 0 Then + ToolStripButtonJumpFile.Enabled = False + Anzahl_ValDoks = 1 + Else + + Anzahl_ValDoks = TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(CURRENT_ProfilGUID) + End If + + Next + If LOG_ERRORS_ONLY = False Then + LOGGER.Info(" >> Profildaten gespeichert") + LOGGER.Info(" >> WD_Search: " & WD_Search) + LOGGER.Info(" >> finalProfile: " & finalProfile) + LOGGER.Info(" >> Move2Folder: " & Move2Folder) + LOGGER.Info(" >> Right_Delete: " & USER_RIGHT_FILE_DELETE) + End If + + PROFIL_sortbynewest = CURRENT_DT_PROFILE.Rows(0).Item("SORT_BY_LATEST") + LOGGER.Debug("PROFIL_sortbynewest: " & PROFIL_sortbynewest.ToString) + 'Delete Button anzeigen ja/nein + If USER_RIGHT_FILE_DELETE = True Then + ToolStripButtonDeleteFile.Enabled = True + Else + ToolStripButtonDeleteFile.Enabled = False + End If + + LOGGER.Debug("Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString) + Load_Controls() + + + End If + End If + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error LOADING Profile-Data1:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error LOADING(2) Profile-Data: " & ex.Message, USER_USERNAME) + LOGGER.Info(">> Fehler in LOADING(2) Profile-Data: " & ex.Message, True) + End Try + + End Sub Private Sub frmValidation_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Try me_closing = True @@ -139,12 +284,15 @@ Public Class frmValidator TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", CURRENT_DOC_GUID) Catch ex As Exception LOGGER.Error(ex) - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Fehler bei Freigabe der Dok-ID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Fehler bei Freigabe der Dok-ID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, USER_USERNAME) End Try End If If VIEWER_ALL = "docview" Then - CloseWDDocview() + If IDB_ACTIVE = False Then + CloseWDDocview() + End If + End If If VIEWER_PDF = "system" Then @@ -227,7 +375,7 @@ Public Class frmValidator ' If proc("Name").ToString = processname Then ' Dim s(1) As String ' proc.InvokeMethod("GetOwner", CType(s, Object())) - ' If CStr(s(0)).ToLower.Contains(Environment.UserName.ToLower) Then + ' If CStr(s(0)).ToLower.Contains(USER_USERNAME.ToLower) Then ' proc.InvokeMethod("Terminate", Nothing) ' End If ' End If @@ -286,6 +434,14 @@ Public Class frmValidator LOGGER.Info(ex.Message) End Try End Sub + Private Function Init_IDB() + Try + IDBData = New ClassIDBData + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Error Init_IDB:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") + End Try + End Function Private Function Init_windream() Try WINDREAM = New ClassPMWindream() @@ -295,154 +451,12 @@ Public Class frmValidator Catch ex As Exception LOGGER.Error(ex) MsgBox("Error Init_windream:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error Init _windream: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error Init _windream: " & ex.Message, USER_USERNAME) LOGGER.Info(">> Fehler in Init_windream: " & ex.Message, True) Return False End Try End Function - Private Sub frmValidation_Load(sender As Object, e As System.EventArgs) Handles Me.Load - SplitContainer1.Panel2Collapsed = True - docCounter = 1 - OLD_Document_Path = "" - first_control = Nothing - me_closing = False - pdfxchange = False - sumatra = False - FormLoaded = False - - If My.Settings.frmValidatorPosition.IsEmpty = False Then - If My.Settings.frmValidatorPosition.X > 0 And My.Settings.frmValidatorPosition.Y > 0 Then - Location = My.Settings.frmValidatorPosition - End If - End If - If My.Settings.frmValidatorSize.IsEmpty = False Then - Size = My.Settings.frmValidatorSize - End If - Dim _step = 0 - Try - _step = 1 - - TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING - VWPM_CONTROL_INDEXTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING - _step = 2 - VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName) - _step = 3 - TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) - _step = 4 - TBPM_CONTROL_TABLETableAdapter.FillAll(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE) - - LOGGER.Debug("Profile Data geladen") - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Error LOADING profile-data(" & _step.ToString & "):" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error LOADING profile-data: " & ex.Message, Environment.UserName) - LOGGER.Info(">> Fehler in LOADING profile-data: " & ex.Message, True) - Me.Close() - End Try - - Try - Delimiter = TBPM_KONFIGURATIONTableAdapter.cmdGetDelimiter - - - If CURRENT_DT_PROFILE.Rows.Count = 0 Then - LOGGER.Info(">> Profildaten konnten nicht geladen werden - Übergebenes Profil: : " & CURRENT_ProfilName, True) - MsgBox("Achtung: Profildaten konnten nicht übergeben oder geladen werden.", MsgBoxStyle.Critical, "Achtung:") - Me.Close() - End If - If CURRENT_DT_PROFILE.Rows.Count > 1 Then - MsgBox("Es wurde mehr als 1 Profil (" & CURRENT_DT_PROFILE.Rows.Count & ") zurückgegeben!!", MsgBoxStyle.Critical, "Achtung:") - Else - If CURRENT_DT_PROFILE.Rows.Count = 1 Then - For Each dr As DataRow In CURRENT_DT_PROFILE.Rows - PROFIL_VEKTORINDEX = dr.Item("PM_VEKTOR_INDEX") - PROFIL_LOGINDEX = dr.Item("LOG_INDEX") - Me.Text = "Process Manager - " & dr.Item("TITLE") - - TITLELabel1.Text = dr.Item("TITLE") - DESCRIPTIONLabel.Text = IIf(IsDBNull(dr.Item("DESCRIPTION")), "", dr.Item("DESCRIPTION")) - If PROFIL_VEKTORINDEX.GetType.ToString.ToLower = "system.dbnull" Then - PROFIL_VEKTORINDEX = "" - End If - If PROFIL_LOGINDEX.GetType.ToString.ToLower = "system.dbnull" Then - PROFIL_LOGINDEX = "" - End If - - WD_Search = dr.Item("WD_SEARCH") - finalProfile = dr.Item("FINAL_PROFILE") - Move2Folder = IIf(IsDBNull(dr.Item("MOVE2Folder")), "", dr.Item("MOVE2Folder")) - Try - If finalProfile = True Then - - Dim text As String = IIf(IsDBNull(dr.Item("FINAL_TEXT")), "", dr.Item("FINAL_TEXT")) - If text <> "" Then - btnSave.Text = text - Else - btnSave.Text = "Validierung speichern - Nächstes Dokument" - End If - Else - btnSave.Text = "Validierung speichern - Nächstes Dokument" - End If - LOGGER.Debug("Final profile Text geladen") - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Error loading final profile text:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error loading final profile text: " & ex.Message, Environment.UserName) - LOGGER.Info(">> Fehler in loading final profile text: " & ex.Message, True) - End Try - ToolStripButtonJumpFile.Enabled = True - If CURRENT_JUMP_DOC_GUID <> 0 Then - ToolStripButtonJumpFile.Enabled = False - Anzahl_ValDoks = 1 - Else - - Anzahl_ValDoks = TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(CURRENT_ProfilGUID) - End If - - Next - If LOG_ERRORS_ONLY = False Then - LOGGER.Info(" >> Profildaten gespeichert") - LOGGER.Info(" >> WD_Search: " & WD_Search) - LOGGER.Info(" >> finalProfile: " & finalProfile) - LOGGER.Info(" >> Move2Folder: " & Move2Folder) - LOGGER.Info(" >> Right_Delete: " & USER_RIGHT_FILE_DELETE) - End If - - PROFIL_sortbynewest = CURRENT_DT_PROFILE.Rows(0).Item("SORT_BY_LATEST") - LOGGER.Debug("PROFIL_sortbynewest: " & PROFIL_sortbynewest.ToString) - 'Delete Button anzeigen ja/nein - If USER_RIGHT_FILE_DELETE = True Then - ToolStripButtonDeleteFile.Enabled = True - Else - ToolStripButtonDeleteFile.Enabled = False - End If - - LOGGER.Debug("Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString) - Load_Controls() - - - End If - End If - - - - - - - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Error LOADING Profile-Data1:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error LOADING(2) Profile-Data: " & ex.Message, Environment.UserName) - LOGGER.Info(">> Fehler in LOADING(2) Profile-Data: " & ex.Message, True) - End Try - - End Sub Public Sub Load_Additional_Searches() If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then Dim oDocResultCommand As String @@ -484,9 +498,9 @@ Public Class frmValidator End If If oDataResultsExist = True Or oDocResultsExist = True Then + ToolStripButtonSearchesReload.Enabled = True frmValidatorSearch.Show() _frmValidatorSearch = frmValidatorSearch - ToolStripButtonSearchesReload.Visible = True Dim oPnl1Collapsed As Boolean = True Dim oPnl2Collapsed As Boolean = True If oDataResultsExist = True Then @@ -517,10 +531,13 @@ Public Class frmValidator _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, CURRENT_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) End If + Else + LOGGER.Info("Not loading AdditionalSearches...!") + ToolStripButtonSearchesReload.Enabled = False End If Else LOGGER.Info("Not loading AdditionalSearches...!") - ToolStripButtonSearchesReload.Visible = False + ToolStripButtonSearchesReload.Enabled = False End If End Sub Sub LoadSQLData(control As Control, controlId As Integer) @@ -550,7 +567,7 @@ Public Class frmValidator sql = clsPatterns.ReplaceInternalValues(sql) LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql) 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) - dt = ClassDatabase.Return_Datatable_CS(sql, connectionId) + dt = ClassDatabase.Return_Datatable_ConId(sql, connectionId) If IsNothing(dt) Then MsgBox($"SQL-Query for control {control.Name} is invalid.") @@ -632,7 +649,15 @@ Public Class frmValidator clsLogger.Add("Error in LoadSimpleData: " & ex.Message) End Try End Sub - + Private Function PreventNulletc(myObject As Object) + If IsDBNull(myObject) Then + Return String.Empty + ElseIf IsNothing(myObject) Then + Return String.Empty + Else + Return myObject + End If + End Function Sub Load_Controls() Try pnldesigner.Controls.Clear() @@ -645,6 +670,7 @@ Public Class frmValidator For Each oControlRow As DataRow In DTCONTROLS.Rows Dim oMyControl As Control + Select Case oControlRow.Item("CTRL_TYPE").ToString.ToUpper Case "TXT" LOGGER.Debug("Versuch TXT zu laden") @@ -680,16 +706,16 @@ Public Class frmValidator End Sub #Region "CONTROL LIST" - Dim ControlID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, cmb.Name) + Dim ControlID = DirectCast(cmb.Tag, ClassControlCreator.ControlMetadata).Guid ' TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, cmb.Name) LOGGER.Debug("In add_ComboBox - GUID: " & ControlID) If ControlID > 0 Then LOGGER.Debug(" >>ControlID > 0") - Dim ConID = Me.TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlID) - If ConID Is Nothing = False Then - Dim commandsql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) - LOGGER.Debug("ConID Is Nothing = False") - If ConID > 0 And commandsql <> "" Then - LOGGER.Debug("CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)") + Dim ConID = PreventNulletc(oControlRow.Item("CONNECTION_ID")) ' Me.TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlID) + If ConID <> String.Empty Then + Dim commandsql = PreventNulletc(oControlRow.Item("SQL_UEBERPRUEFUNG")) 'TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) + LOGGER.Debug("ConID <> String.Empty") + If ConID > 0 And commandsql <> String.Empty Then + LOGGER.Debug("ConID > 0 And commandsql <> String.Empty") Dim connectionString As String TBDD_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) Dim DTConnection As DataTable = DD_DMSLiteDataSet.TBDD_CONNECTION @@ -734,7 +760,7 @@ Public Class frmValidator Dim sql As String - sql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) + sql = PreventNulletc(oControlRow.Item("SQL_UEBERPRUEFUNG")) 'TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID) 'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, CURRENT_WMFILE) @@ -881,7 +907,7 @@ Public Class frmValidator Select r).ToList() Dim oGrid = ClassControlCreator.CreateExistingGridControl(oControlRow, columns, False) - + AddHandler oGrid.ProcessGridKey, Sub(ByVal _sender As Object, ByVal e As KeyEventArgs) @@ -914,18 +940,18 @@ Public Class frmValidator oMyControl.TabIndex = oCount End If - + ' oMyControl.Tag = CInt(oControlRow.Item("GUID")) pnldesigner.Controls.Add(oMyControl) oCount += 1 Next LOGGER.Debug("Controls geladen") - LOGGER.Info("") + LOGGER.Debug("") Catch ex As Exception LOGGER.Error(ex) If LOG_ERRORS_ONLY = False Then MsgBox("Error Load_Controls: " & ex.Message, MsgBoxStyle.Critical, "Attention error:") - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error Load_Controls: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Error Load_Controls: " & ex.Message, USER_USERNAME) LOGGER.Info("Unvorhergesehener Fehler bei Load_Controls:" & ex.Message) LOGGER.Info("") @@ -973,6 +999,13 @@ Public Class frmValidator box.BackColor = Color.White End If End Sub + Private Function GetControlID(ByVal PROFILEID As Integer, Controlname As String) + For Each oROW As DataRow In DTVWCONTROL_INDEX.Rows + + Next + End Function + + Public Sub OnTextBoxKeyUp(sender As Object, e As KeyEventArgs) If ControlHandleStarted = True Then ControlHandleStarted = False @@ -983,7 +1016,7 @@ Public Class frmValidator If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Or (e.KeyCode = Keys.Enter) Then Try - Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, box.Name) + Dim CONTROL_ID = DirectCast(box.Tag, ClassControlCreator.ControlMetadata).Guid 'VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, box.Name) Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, box.Name) Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) If Not IsNothing(DT) And DT.Rows.Count > 0 Then @@ -1053,7 +1086,7 @@ Public Class frmValidator Public Sub onDGVRowValidating(ByVal sender As Object, ByVal e As DataGridViewCellCancelEventArgs) Dim dgv As DataGridView = sender Try - Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, dgv.Name) + Dim CONTROL_ID = DirectCast(dgv.Tag, ClassControlCreator.ControlMetadata).Guid ' VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, dgv.Name) Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, dgv.Name) Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) If Not IsNothing(DT) And DT.Rows.Count > 0 Then @@ -1064,7 +1097,7 @@ Public Class frmValidator Dim sql_Statement = ROW.Item(2) Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString() sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue) - Dim resultDT As DataTable = ClassDatabase.Return_Datatable_CS(sql_Statement, ROW.Item(1)) + Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1)) If resultDT.Rows.Count >= 1 Then 'Nur dediziert einen Wert zurückerhalten For Each row1 As DataRow In resultDT.Rows @@ -1180,7 +1213,7 @@ Public Class frmValidator 'Abschluss() Else Try - Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, cmb.Name) + Dim CONTROL_ID = DirectCast(cmb.Tag, ClassControlCreator.ControlMetadata).Guid 'VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, cmb.Name) Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, cmb.Name) Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) If Not IsNothing(DT) And DT.Rows.Count > 0 Then @@ -1256,7 +1289,7 @@ Public Class frmValidator End Sub Private Sub Depending_Control_Set_Result(displayboxname As String, sqlCommand As String, sqlConnection As String) Try - Dim resultDT As DataTable = ClassDatabase.Return_Datatable_CS(sqlCommand, sqlConnection) + Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConStr(sqlCommand, sqlConnection) If Not IsNothing(resultDT) Then 'Ist das Control ein Control was mehrfachwerte enthalten kann If displayboxname.StartsWith(ClassControlCreator.PREFIX_COMBOBOX) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_DATAGRIDVIEW) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_TABLE) Then @@ -1311,8 +1344,8 @@ Public Class frmValidator End Sub Private Function CheckValueExists(ByVal control As Control) Try - Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX - For Each dr As DataRow In dt.Rows + + For Each dr As DataRow In DTVWCONTROL_INDEX.Rows If dr.Item("PROFIL_ID") = CURRENT_ProfilGUID And dr.Item("CTRL_NAME") = control.Name Then Dim check = dr.Item("SQL_UEBERPRUEFUNG") If IsDBNull(check) Then @@ -1421,36 +1454,11 @@ Public Class frmValidator Replace("W:", "\\windream\objects"). Replace("K:", "\\windream\objects") End Function - - 'Function Next_GUID() As Integer - ' 'Dim id = CURRENT_DOC_GUID - ' 'Dim oFilePath = ReplaceWindreamDriveLetter(Filepath).ToUpper() - ' Dim oSQL = $"SELECT [dbo].[FNPM_GET_NEXT_DOC_GUID] ({CURRENT_ProfilGUID},{PROFIL_sortbynewest},{CURRENT_DOC_GUID},'{USER_USERNAME}')" - - ' 'SELECT GUID FROM TBPM_PROFILE_FILES WHERE - ' ' PROFIL_ID = {CURRENT_ProfilGUID} AND EDIT = 0 AND IN_WORK = 0 AND - ' ' UPPER(REPLACE(FILE_PATH, 'W:','\\windream\objects')) <> '{oFilePath}' AND - ' ' UPPER(REPLACE(FILE_PATH, 'W:','\\windream\objects')) NOT IN ( - ' ' SELECT UPPER(FILE_PATH) - ' ' FROM TBPM_FILES_USER_NOT_INDEXED - ' ' WHERE (PROFIL_ID = {ProfilId}) AND (UPPER(USR_NAME) = UPPER('{Environment.UserName}')) - ' ' ) - ' ' {IIf(OrderByNewest, " ORDER BY DMS_ERSTELLT_DATE DESC", "")} - ' ' " - - ' Return ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, True) - 'End Function - Function Get_Next_GUID() As Integer Try LOGGER.Debug("Get_Next_GUID...") Dim newGUID As Integer - 'If PROFIL_sortbynewest = True Then - ' newGUID = TBPM_PROFILE_FILESTableAdapter.cmdgetNextFile_GUID_Newest(CURRENT_ProfilGUID, OLD_Document_Path, Environment.UserName) - 'Else - ' newGUID = TBPM_PROFILE_FILESTableAdapter.cmdGetNextFile_GUID(CURRENT_ProfilGUID, OLD_Document_Path, Environment.UserName) - 'End If LOGGER.Debug("Old Document_Path: " & OLD_Document_Path) Dim oBIT As Integer = 0 If PROFIL_sortbynewest = True Then @@ -1549,7 +1557,7 @@ Public Class frmValidator Catch ex As Exception Dim _err1 As Boolean = False LOGGER.Error(ex) - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "error in creating WMObject - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "error in creating WMObject - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, USER_USERNAME) 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}]!" @@ -1563,16 +1571,21 @@ Public Class frmValidator Private Function GetWMDocPathWindows(_CheckStandard As Integer) Try Dim oResult As String - Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})" + Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) LOGGER.Debug($"Checking file [{oResult}] exists?...") If File.Exists(oResult) = False Then - LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") - oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)" - oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) - LOGGER.Debug($"Checking file [{oResult}] exists?...") - If File.Exists(oResult) = False Then - Return False + If USER_USERNAME = "SchreiberM" Then + 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 [{oResult}] exists?...") + If File.Exists(oResult) = False Then + LOGGER.Warn($"File {oResult} not existing!") + Return False + End If End If End If WMDocPathWindows = oResult @@ -1605,258 +1618,269 @@ Public Class frmValidator 'Me.lblerror.Visible = False _Indexe_Loaded = False LOGGER.Debug("In Load_Next_Document") - Try - If first = True Then - LOGGER.Debug("First Document") - CURRENT_WMFILE = Nothing - Else - LOGGER.Debug("Following Document ") - docCounter += 1 - End If + 'Try + If first = True Then + LOGGER.Debug("First Document") + CURRENT_WMFILE = Nothing + Else + LOGGER.Debug("Following Document ") + docCounter += 1 + End If - ' Controls nicht beim ersten Laden leeren - If first = False Then - Clear_all_Input() - End If + ' Controls nicht beim ersten Laden leeren + If first = False Then + Clear_all_Input() + End If - 'Select Case navtype - ' Case "next" - ' Case "previous" - ' Case "first" - ' Case "last" - 'End Select - LOGGER.Debug($"CURRENT_JUMP_DOC_GUID: {CURRENT_JUMP_DOC_GUID}'") - If CURRENT_JUMP_DOC_GUID = 0 Then - CURRENT_DOC_GUID = Get_Next_GUID() - ElseIf first = False Then - CURRENT_DOC_GUID = 0 + 'Select Case navtype + ' Case "next" + ' Case "previous" + ' Case "first" + ' Case "last" + 'End Select + LOGGER.Debug($"CURRENT_JUMP_DOC_GUID: {CURRENT_JUMP_DOC_GUID}'") + If CURRENT_JUMP_DOC_GUID = 0 Then + CURRENT_DOC_GUID = Get_Next_GUID() + ElseIf first = False Then + CURRENT_DOC_GUID = 0 + End If + LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") + If CURRENT_DOC_GUID > 0 Then + If GetWMDocPathWindows(0) = False Then + MsgBox("Could not acces the file! Check the log!", MsgBoxStyle.Critical, "") + Exit Sub End If - LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") - If CURRENT_DOC_GUID > 0 Then - If GetWMDocPathWindows(0) = False Then - Exit Sub - End If + If IDB_ACTIVE = False Then If CreateWMObject() = False Then Exit Sub End If - 'Beschriftung des Navigators - 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" - If WMDocPathWindows <> String.Empty Then - ' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### - TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(True, Environment.UserName, CURRENT_DOC_GUID) - ' ############ Infos eintragen ################# - tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID & " - DocGUID: " & CURRENT_DOC_GUID - ' txtDateipfad.Text = Document_Path - tstrlbl_Info.Text = "Datei " & docCounter.ToString & " von " & Anzahl_ValDoks.ToString - LOGGER.Info(">> Validierung für Dokument '" & WMDocPathWindows & "' gestartet") + End If + 'Beschriftung des Navigators + 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" + If WMDocPathWindows <> String.Empty Then + ' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### + TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(True, USER_USERNAME, CURRENT_DOC_GUID) + ' ############ Infos eintragen ################# + tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID & " - DocGUID: " & CURRENT_DOC_GUID + ' txtDateipfad.Text = Document_Path + tstrlbl_Info.Text = "Datei " & docCounter.ToString & " von " & Anzahl_ValDoks.ToString + LOGGER.Info(">> Validierung für Dokument '" & WMDocPathWindows & "' gestartet") + tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID - Dim oSQL = $"SELECT DOC_ID FROM TBPM_PROFILE_FILES WHERE GUID = {CURRENT_DOC_GUID}" - CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) - tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID - - LOGGER.Debug("WMDoc created...") + LOGGER.Debug("AllDocInfo created...") + If IDB_ACTIVE = False Then oErrorMessage = Windream_get_Doc_info() - - LOGGER.Debug("Windream-Dok Info geholt") - If oErrorMessage = "" Then - Me.grpbxMailBody.Visible = False - Me.grpBetreff.Visible = False - - load_viewer() - - If WMDocPathWindows.ToLower.EndsWith(".pdf") Then - ToolStripButtonAnnotation.Visible = True - Else - ToolStripButtonAnnotation.Visible = False - End If - - LOGGER.Debug("Viewer geladen") + Else + ' oErrorMessage = IDB_GetDocInfo() + End If - FillIndexValues(first) + If oErrorMessage = "" Then + Me.grpbxMailBody.Visible = False + Me.grpBetreff.Visible = False - For Each oControl As Control In pnldesigner.Controls - LoadSQLData(oControl, DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid) - Next + load_viewer() - LOGGER.Debug("Indexmaske geladen") - LOGGER.Debug("") - - 'Nun im Vektoprindex loggen das das Profil geladen wurde - 'If PROFIL_VEKTORINDEX <> "" Then - ' Dim Profilstring = "DD-PM" & Delimiter & "Profil: '" & PROFIL_NAME & "'" & Delimiter & Environment.UserName & Delimiter & Now.ToString - ' If Indexiere_VektorfeldPM(Profilstring, PROFIL_VEKTORINDEX) = False Then - ' If LogErrorsOnly = False Then LOGGER.Info(" >> Profilname erfolgreich in Vektorfeld PM geschrieben") - ' 'Else - ' ' errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message - ' ' My.Settings.Save() - ' ' frmError.ShowDialog() - ' ' _error = True - ' End If - 'End If - 'Nun loggen das das Profil geladen wurde - If PROFIL_LOGINDEX <> "" Then - Dim Profilstring = "DD-PMlog" & Delimiter & "In Profil: '" & CURRENT_ProfilName & "' geladen" & Delimiter & Environment.UserName & Delimiter & Now.ToString - If Indexiere_VektorfeldPM(Profilstring, PROFIL_LOGINDEX) = False Then - LOGGER.Debug("Profilname erfolgreich in Vektorfeld LOG geschrieben") - 'Else - ' errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message - ' My.Settings.Save() - ' frmError.ShowDialog() - ' _error = True - End If - End If - activate_controls(True) - Me.BringToFront() + If WMDocPathWindows.ToLower.EndsWith(".pdf") Then + ToolStripButtonAnnotation.Visible = True Else - errormessage = oErrorMessage - frmError.ShowDialog() + ToolStripButtonAnnotation.Visible = False End If - Else - errormessage = oErrorMessage - frmError.ShowDialog() - End If - Else - If oErrorMessage <> "" Then - errormessage = oErrorMessage - frmError.ShowDialog() - Else - LOGGER.Info(" >> Ende des Profils - Kein weiteres Dokument!") - LOGGER.Info("") - MsgBox("Kein weiteres Dokument gefunden - Ende des Profils!" & vbNewLine & "Das Formular wird nun geschlossen.", MsgBoxStyle.Information, "Hinweis:") - activate_controls(True) - Me.Close() - End If - End If - Catch ex As Exception - LOGGER.Error(ex) - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Unvorhergesehener Fehler bei Load_Next_Document - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) - errormessage = "Unvorhergesehener Fehler bei Load_Next_Document:" & ex.Message - My.Settings.Save() - LOGGER.Info("Unvorhergesehener Fehler in Load_Next_Document: " & ex.Message) - frmError.ShowDialog() - End Try - End Sub - Sub load_viewer() - If VIEWER_ALL = "uviewer" Then - pdfxchange = False - sumatra = False - If WMDocPathWindows.ToLower.EndsWith(".msg") Then - Show_Email() + LOGGER.Debug("Viewer geladen") + + + + FillIndexValues(first) + + For Each oControl As Control In pnldesigner.Controls + LoadSQLData(oControl, DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid) + Next + + LOGGER.Debug("Indexmaske geladen") + LOGGER.Debug("") + + 'Nun im Vektoprindex loggen das das Profil geladen wurde + 'If PROFIL_VEKTORINDEX <> "" Then + ' Dim Profilstring = "DD-PM" & Delimiter & "Profil: '" & PROFIL_NAME & "'" & Delimiter & USER_NAME & Delimiter & Now.ToString + ' If Indexiere_VektorfeldPM(Profilstring, PROFIL_VEKTORINDEX) = False Then + ' If LogErrorsOnly = False Then LOGGER.Info(" >> Profilname erfolgreich in Vektorfeld PM geschrieben") + ' 'Else + ' ' errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message + ' ' My.Settings.Save() + ' ' frmError.ShowDialog() + ' ' _error = True + ' End If + 'End If + 'Nun loggen das das Profil geladen wurde + If PROFIL_LOGINDEX <> "" Then + Dim Profilstring = $"DD-PMLog{Delimiter}Loaded profile: [{CURRENT_ProfilName}]{Delimiter}{USER_USERNAME}{Delimiter}{Now.ToString}" + If IDB_ACTIVE = False Then + WMIndexVectofield(Profilstring, PROFIL_LOGINDEX) + Else + IDBData.SetVariableValue(PROFIL_LOGINDEX, Profilstring) + LOGGER.Debug("Profilname erfolgreich in Vektorfeld LOG geschrieben") + 'Else + ' errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message + ' My.Settings.Save() + ' frmError.ShowDialog() + ' _error = True + End If + End If + activate_controls(True) + Me.BringToFront() + Else + errormessage = oErrorMessage + frmError.ShowDialog() + End If Else - ShowFile_UniversalViewer(WMDocPathWindows) - End If - ElseIf VIEWER_ALL = "docview" Then - PdfControls_visible(False) - If WMDocPathWindows.ToLower.EndsWith(".pdf") And VIEWER_PDF <> "none" Then - Select Case VIEWER_PDF - Case "internal" - SplitContainer1.Panel2Collapsed = False - PdfViewer1.LoadDocument(WMDocPathWindows) - LOGGER.Debug("Internal Viewer Path: " & WMDocPathWindows) - PdfControls_visible(True) - Me.Size = My.Settings.frmValidation_Size_PDFViewer - 'PdfViewer1.ZoomFactor = PDFViewer_ZoomMode - PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.FitToWidth - pdfxchange = False - sumatra = False - Case "pdfxchange" - SplitContainer1.Panel2Collapsed = True - Open_PDFXCHANGE(WMDocPathWindows) - pdfxchange = True - sumatra = False - System.Threading.Thread.Sleep(1000) - Me.Size = My.Settings.frmValidatorSize - Case "sumatra" - SplitContainer1.Panel2Collapsed = True - Open_Sumatra(WMDocPathWindows) - sumatra = True - pdfxchange = False - System.Threading.Thread.Sleep(1000) - Me.Size = My.Settings.frmValidatorSize - Case "system" - SplitContainer1.Panel2Collapsed = True - sumatra = False - pdfxchange = False - Open_PDF_withStandard() - System.Threading.Thread.Sleep(1000) - Me.Size = My.Settings.frmValidatorSize - End Select - ElseIf WMDocPathWindows.ToLower.EndsWith(".msg") Then - Show_Email() - Else - SplitContainer1.Panel2Collapsed = True - Me.Size = My.Settings.frmValidatorSize - pdfxchange = False - sumatra = False - DocView = Nothing - DocView = CreateObject("WMPViewXNG.Viewer") - ' open the viewer - viewer_string = CURRENT_WMFILE.aPath.ToString - DocView.ViewFile(viewer_string) + errormessage = oErrorMessage + frmError.ShowDialog() End If Else - SplitContainer1.Panel2Collapsed = True - PdfControls_visible(False) - Me.Size = My.Settings.frmValidatorSize - pdfxchange = False - sumatra = False - DocView = Nothing - DocView = CreateObject("WMPViewXNG.Viewer") - ' open the viewer - viewer_string = CURRENT_WMFILE.aPath.ToString - DocView.ViewFile(viewer_string) - End If - End Sub - Sub Show_Email() - - Me.grpBetreff.Dock = DockStyle.Top - Me.grpbxMailBody.Dock = DockStyle.Fill - Dim msg_email As New Msg.Message(WMDocPathWindows) - 'Eine tempfile generieren - Dim tempFilename = My.Computer.FileSystem.GetTempFileName() - Dim name = Path.GetFileNameWithoutExtension(tempFilename) - tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html") - 'tempfile löschen - If My.Computer.FileSystem.FileExists(tempFilename) Then - My.Computer.FileSystem.DeleteFile(tempFilename) + If oErrorMessage <> "" Then + errormessage = oErrorMessage + frmError.ShowDialog() + Else + LOGGER.Info(" >> Ende des Profils - Kein weiteres Dokument!") + LOGGER.Info("") + MsgBox("Kein weiteres Dokument gefunden - Ende des Profils!" & vbNewLine & "Das Formular wird nun geschlossen.", MsgBoxStyle.Information, "Hinweis:") + activate_controls(True) + Me.Close() + End If End If - Me.txtBetreff.Text = msg_email.Subject - Try - Dim wFile As System.IO.FileStream - Dim byteData() As Byte - byteData = msg_email.BodyHtml - - ' MsgBox(msg_email.InternetCodePage) - ' wFile = New FileStream(tempFilename, FileMode.Append) - ' wFile.Write(byteData, 0, byteData.Length) - ' wFile.Close() - 'Catch ex As IOException - ' MsgBox(ex.ToString) - 'End Try - - Dim vIn() As Byte = msg_email.BodyHtml - Dim vOut As String = System.Text.Encoding.UTF8.GetString(vIn) - File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8) - - CURRENT_HTML_DOC = tempFilename - Me.tslblWebbrowser.Text = CURRENT_HTML_DOC - WebBrowser.Navigate("file:///" & CURRENT_HTML_DOC) - SplitContainer1.Panel2Collapsed = False - Me.Size = My.Settings.frmValidation_Size_Email - Me.grpbxMailBody.Visible = True - Me.grpBetreff.Visible = True - Catch ex As Exception - LOGGER.Error(ex) - errormessage = "Unvorhergesehener Fehler bei Show_Email:" & ex.Message - LOGGER.Info("Unvorhergesehener Fehler in Show_Email: " & ex.Message) - My.Settings.Save() - frmError.ShowDialog() - End Try + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Unvorhergesehener Fehler bei Load_Next_Document - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, USER_USERNAME) + ' errormessage = "Unvorhergesehener Fehler bei Load_Next_Document:" & ex.Message + ' My.Settings.Save() + ' LOGGER.Info("Unvorhergesehener Fehler in Load_Next_Document: " & ex.Message) + ' frmError.ShowDialog() + 'End Try End Sub + Sub load_viewer() + MyDocViewer.LoadFile(WMDocPathWindows) + + 'If VIEWER_ALL = "uviewer" Then + ' pdfxchange = False + ' sumatra = False + ' If WMDocPathWindows.ToLower.EndsWith(".msg") Then + ' Show_Email() + ' Else + ' ShowFile_UniversalViewer(WMDocPathWindows) + ' End If + 'ElseIf VIEWER_ALL = "docview" Then + ' PdfControls_visible(False) + ' If WMDocPathWindows.ToLower.EndsWith(".pdf") And VIEWER_PDF <> "none" Then + ' Select Case VIEWER_PDF + ' Case "internal" + ' SplitContainer1.Panel2Collapsed = False + ' PdfViewer1.LoadDocument(WMDocPathWindows) + ' LOGGER.Debug("Internal Viewer Path: " & WMDocPathWindows) + ' PdfControls_visible(True) + ' Me.Size = My.Settings.frmValidation_Size_PDFViewer + ' 'PdfViewer1.ZoomFactor = PDFViewer_ZoomMode + ' PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.FitToWidth + ' pdfxchange = False + ' sumatra = False + ' Case "pdfxchange" + ' SplitContainer1.Panel2Collapsed = True + ' Open_PDFXCHANGE(WMDocPathWindows) + ' pdfxchange = True + ' sumatra = False + ' System.Threading.Thread.Sleep(1000) + ' Me.Size = My.Settings.frmValidatorSize + ' Case "sumatra" + ' SplitContainer1.Panel2Collapsed = True + ' Open_Sumatra(WMDocPathWindows) + ' sumatra = True + ' pdfxchange = False + ' System.Threading.Thread.Sleep(1000) + ' Me.Size = My.Settings.frmValidatorSize + ' Case "system" + ' SplitContainer1.Panel2Collapsed = True + ' sumatra = False + ' pdfxchange = False + ' Open_PDF_withStandard() + ' System.Threading.Thread.Sleep(1000) + ' Me.Size = My.Settings.frmValidatorSize + ' End Select + ' ElseIf WMDocPathWindows.ToLower.EndsWith(".msg") Then + ' Show_Email() + ' Else + ' SplitContainer1.Panel2Collapsed = True + ' Me.Size = My.Settings.frmValidatorSize + ' pdfxchange = False + ' sumatra = False + ' DocView = Nothing + ' DocView = CreateObject("WMPViewXNG.Viewer") + ' ' open the viewer + ' viewer_string = CURRENT_WMFILE.aPath.ToString + ' DocView.ViewFile(viewer_string) + ' End If + 'Else + + ' SplitContainer1.Panel2Collapsed = True + ' PdfControls_visible(False) + ' Me.Size = My.Settings.frmValidatorSize + ' pdfxchange = False + ' sumatra = False + ' DocView = Nothing + ' DocView = CreateObject("WMPViewXNG.Viewer") + ' ' open the viewer + ' viewer_string = CURRENT_WMFILE.aPath.ToString + ' DocView.ViewFile(viewer_string) + 'End If + End Sub + 'Sub Show_Email() + + ' Me.grpBetreff.Dock = DockStyle.Top + ' Me.grpbxMailBody.Dock = DockStyle.Fill + ' Dim msg_email As New Msg.Message(WMDocPathWindows) + ' 'Eine tempfile generieren + ' Dim tempFilename = My.Computer.FileSystem.GetTempFileName() + ' Dim name = Path.GetFileNameWithoutExtension(tempFilename) + ' tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html") + ' 'tempfile löschen + ' If My.Computer.FileSystem.FileExists(tempFilename) Then + ' My.Computer.FileSystem.DeleteFile(tempFilename) + ' End If + + ' Me.txtBetreff.Text = msg_email.Subject + ' Try + ' Dim wFile As System.IO.FileStream + ' Dim byteData() As Byte + ' byteData = msg_email.BodyHtml + + ' ' MsgBox(msg_email.InternetCodePage) + ' ' wFile = New FileStream(tempFilename, FileMode.Append) + ' ' wFile.Write(byteData, 0, byteData.Length) + ' ' wFile.Close() + ' 'Catch ex As IOException + ' ' MsgBox(ex.ToString) + ' 'End Try + + ' Dim vIn() As Byte = msg_email.BodyHtml + ' Dim vOut As String = System.Text.Encoding.UTF8.GetString(vIn) + ' File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8) + + ' CURRENT_HTML_DOC = tempFilename + ' Me.tslblWebbrowser.Text = CURRENT_HTML_DOC + ' WebBrowser.Navigate("file:///" & CURRENT_HTML_DOC) + ' SplitContainer1.Panel2Collapsed = False + ' Me.Size = My.Settings.frmValidation_Size_Email + ' Me.grpbxMailBody.Visible = True + ' Me.grpBetreff.Visible = True + ' Catch ex As Exception + ' LOGGER.Error(ex) + ' errormessage = "Unvorhergesehener Fehler bei Show_Email:" & ex.Message + ' LOGGER.Info("Unvorhergesehener Fehler in Show_Email: " & ex.Message) + ' My.Settings.Save() + ' frmError.ShowDialog() + ' End Try + 'End Sub Sub activate_controls(status As Boolean) Me.pnldesigner.Enabled = status Me.btnSave.Enabled = status @@ -2144,285 +2168,306 @@ Public Class frmValidator End Function + Private Function GetVariableValuefromSource(oSourceIndexName) As Object + Try + Dim oValuefroMSource + If IDB_ACTIVE = False Then + oValuefroMSource = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) + Else + oValuefroMSource = IDBData.GetVariableValue(oSourceIndexName) + End If + Return oValuefroMSource + Catch ex As Exception + LOGGER.Error(ex) + Return Nothing + End Try + + End Function + Sub FillIndexValues(first As Boolean) Dim oControlType As String Dim oIndexName As String - Try - If DD_DMSLiteDataSet.VWPM_CONTROL_INDEX.Rows.Count > 0 Then - Dim oCount As Integer = 0 - For Each oControl As Control In Me.pnldesigner.Controls - Dim oControlId = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid - Dim oControlRow = (From form In DD_DMSLiteDataSet.VWPM_CONTROL_INDEX.AsEnumerable() - Select form - Where form.Item("GUID") = oControlId).Single() + ' Try + If DTVWCONTROL_INDEX.Rows.Count > 0 Then + Dim oCount As Integer = 0 + For Each oControl As Control In Me.pnldesigner.Controls + Dim oValueFromSource + Dim oControlId = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid + Dim oControlRow = (From form In DTVWCONTROL_INDEX.AsEnumerable() + Select form + Where form.Item("GUID") = oControlId).Single() - Dim oType As String = oControl.GetType.ToString - Dim oTyp As String = oControlRow.Item("CTRL_TYPE") - Dim oWMIndexName As String = oControlRow.Item("INDEX_NAME") - ' Wenn kein defaultValue existiert, leeren String setzen - Dim oDefaultValue As String = NotNull(oControlRow.Item("DEFAULT_VALUE"), String.Empty) - oIndexName = oWMIndexName + Dim oType As String = oControl.GetType.ToString + Dim oTyp As String = oControlRow.Item("CTRL_TYPE") + Dim oSourceIndexName As String = oControlRow.Item("INDEX_NAME") + ' Wenn kein defaultValue existiert, leeren String setzen + Dim oDefaultValue As String = NotNull(oControlRow.Item("DEFAULT_VALUE"), String.Empty) + oIndexName = oSourceIndexName - Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE") - LOGGER.Debug("INDEX: " & oWMIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString) + Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE") + LOGGER.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString) - _CURRENT_INDEX_ARRAY(oCount, 0) = oWMIndexName - Select Case oType - Case "System.Windows.Forms.TextBox" - Try - oControlType = "Textbox" - If oWMIndexName = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) - Exit For + _CURRENT_INDEX_ARRAY(oCount, 0) = oSourceIndexName + Select Case oType + Case "System.Windows.Forms.TextBox" + Try + oControlType = "Textbox" + If oSourceIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Exit For + End If + If oSourceIndexName Is Nothing = False Then + If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then + ' Wenn kein Index exisitiert, defaultValue laden + oControl.Text = oDefaultValue + _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue + LOGGER.Debug("Indexwert soll nicht geladen werden.") + Exit Select End If - If oWMIndexName Is Nothing = False Then - If oLoadIndex = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then - ' Wenn kein Index exisitiert, defaultValue laden - oControl.Text = oDefaultValue - _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue - LOGGER.Debug("Indexwert soll nicht geladen werden.") - Exit Select - End If - Dim wertWD - If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(oWMIndexName) + + If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) + Else + oValueFromSource = GetVariableValuefromSource(oSourceIndexName) + + If oValueFromSource Is Nothing Then + oValueFromSource = "" Else - wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) - If wertWD Is Nothing Then - wertWD = "" - Else - If wertWD.ToString = "System.Object[]" Then - LOGGER.Debug("TextBox with VektorField: " & oWMIndexName) - Try - LOGGER.Debug($"Length of Vektorarray: {wertWD.length}") - Catch ex As Exception - LOGGER.Info($"Error in gettin the lenth of vektorfield {oWMIndexName} - {ex.Message}") - End Try - If wertWD.length = 1 Then - wertWD = wertWD(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used") - wertWD = wertWD(0) - End If - LOGGER.Debug($"wertWD has been saved...") - - End If - End If - - End If - Try - oControl.Text = NotNull(wertWD, oDefaultValue) - _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(wertWD, oDefaultValue) - Catch ex As Exception - LOGGER.Info("ERROR while converting defaultValue [" & oDefaultValue & "]: " & ex.Message) - oControl.Text = "" - _CURRENT_INDEX_ARRAY(oCount, 1) = "" - End Try - - - End If - Catch ex As Exception - LOGGER.Error(ex) - errormessage = $"Unvorhergesehener Fehler bei FillIndexValues TextBox [{oControl.Name}]:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" - My.Settings.Save() - frmError.ShowDialog() - LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValuesTextBox: " & ex.Message, True) - LOGGER.Info(">> Controltype: " & oControlType) - LOGGER.Info(">> Indexname windream: " & oIndexName) - Exit Sub - End Try - - Case "System.Windows.Forms.ComboBox" - oControlType = "ComboBox" - Dim oMyCombobox As ComboBox = oControl - Try - If oWMIndexName = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) - Exit For - End If - If oWMIndexName Is Nothing = False Then - If oLoadIndex = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then - If oDefaultValue = String.Empty Then - oMyCombobox.SelectedIndex = -1 - Else - oMyCombobox.Text = oDefaultValue - _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue - End If - LOGGER.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.") - Exit Select - End If - Dim wertWD - If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(oWMIndexName) - Else - wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) - End If - - If wertWD Is Nothing Then - - LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Indexvalue from index {oWMIndexName}: Nothing") - If oDefaultValue = String.Empty Then - LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wurde nicht gefunden") - oMyCombobox.SelectedIndex = -1 - Else - LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wird geladen") - oMyCombobox.Text = oDefaultValue - _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue - 'cmb.SelectedIndex = cmb.FindStringExact(defaultValue) - End If - Else - If wertWD.ToString = "System.Object[]" Then - LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Combobox with VektorField: " & oWMIndexName) + If oValueFromSource.ToString = "System.Object[]" Then + LOGGER.Debug("TextBox with VektorField: " & oSourceIndexName) Try - LOGGER.Debug($"Length of Vektorarray: {wertWD.length}") + LOGGER.Debug($"Length of Vektorarray: {oValueFromSource.length}") Catch ex As Exception - LOGGER.Info($"Error in gettin the length of vektorfield {oWMIndexName} - {ex.Message}") + LOGGER.Info($"Error in gettin the lenth of vektorfield {oSourceIndexName} - {ex.Message}") End Try - If wertWD.length = 1 Then - wertWD = wertWD(0) + If oValueFromSource.length = 1 Then + oValueFromSource = oValueFromSource(0) Else ' - LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used") - wertWD = wertWD(0) + 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...") - Else - - End If - LOGGER.Debug($"Indexwert from Index {oWMIndexName}: {wertWD}") - LOGGER.Debug($"Items in Combobox: {oMyCombobox.Items.Count}") - - _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD - LOGGER.Debug($"_CURRENT_INDEX_ARRAY set...") - If oMyCombobox.Items.Count = 0 Then - ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt") - oMyCombobox.Text = wertWD - Else - ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde ausgewählt") - oMyCombobox.SelectedIndex = oMyCombobox.FindStringExact(wertWD) - LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} .SelectedIndex: {oMyCombobox.SelectedIndex}") End If End If + End If - LOGGER.Debug("") - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & ex.Message, True) - LOGGER.Info(">> Controltype: " & oControlType) - LOGGER.Info(">> Indexname windream: " & oIndexName) - errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile" - My.Settings.Save() - frmError.ShowDialog() + Try + oControl.Text = NotNull(oValueFromSource, oDefaultValue) + _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(oValueFromSource, oDefaultValue) + Catch ex As Exception + LOGGER.Info("ERROR while converting defaultValue [" & oDefaultValue & "]: " & ex.Message) + oControl.Text = "" + _CURRENT_INDEX_ARRAY(oCount, 1) = "" + End Try - End Try - Case "System.Windows.Forms.DataGridView" - oControlType = "DataGridView" - Dim dgv As DataGridView = oControl - If oWMIndexName = "" Then + End If + Catch ex As Exception + LOGGER.Error(ex) + errormessage = $"Unvorhergesehener Fehler bei FillIndexValues TextBox [{oControl.Name}]:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" + My.Settings.Save() + frmError.ShowDialog() + LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValuesTextBox: " & ex.Message, True) + LOGGER.Info(">> Controltype: " & oControlType) + LOGGER.Info(">> Indexname windream: " & oIndexName) + Exit Sub + End Try + + Case "System.Windows.Forms.ComboBox" + oControlType = "ComboBox" + Dim oMyCombobox As ComboBox = oControl + Try + If oSourceIndexName = "" Then MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - If oWMIndexName Is Nothing = False Then - If oLoadIndex = False Then - LOGGER.Debug("Indexwert soll nicht geladen werden.") + If oSourceIndexName Is Nothing = False Then + If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then + If oDefaultValue = String.Empty Then + oMyCombobox.SelectedIndex = -1 + Else + oMyCombobox.Text = oDefaultValue + _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue + End If + LOGGER.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.") Exit Select End If - LOGGER.Debug($"getting wmValue for Index {oWMIndexName}...") - Dim wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) - If wertWD Is Nothing = False Then - 'Es wird gegen ein Vektorfeld nachindexiert - If wertWD.GetType.ToString.Contains("System.Object") Then - Select Case oTyp + If oSourceIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + oValueFromSource = ReturnVektor_IndexValue(oSourceIndexName) + Else + oValueFromSource = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) + End If + + 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") + oMyCombobox.SelectedIndex = -1 + Else + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wird geladen") + oMyCombobox.Text = oDefaultValue + _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue + 'cmb.SelectedIndex = cmb.FindStringExact(defaultValue) + End If + Else + If oValueFromSource.ToString = "System.Object[]" Then + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Combobox with VektorField: " & oSourceIndexName) + Try + LOGGER.Debug($"Length of Vektorarray: {oValueFromSource.length}") + Catch ex As Exception + LOGGER.Info($"Error in gettin the length 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...") + Else + + End If + LOGGER.Debug($"Indexwert from Index {oSourceIndexName}: {oValueFromSource}") + LOGGER.Debug($"Items in Combobox: {oMyCombobox.Items.Count}") + + _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource + LOGGER.Debug($"_CURRENT_INDEX_ARRAY set...") + If oMyCombobox.Items.Count = 0 Then + ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt") + oMyCombobox.Text = oValueFromSource + Else + ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde ausgewählt") + oMyCombobox.SelectedIndex = oMyCombobox.FindStringExact(oValueFromSource) + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} .SelectedIndex: {oMyCombobox.SelectedIndex}") + + End If + End If + End If + LOGGER.Debug("") + Catch ex As Exception + LOGGER.Error(ex) + LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & ex.Message, True) + LOGGER.Info(">> Controltype: " & oControlType) + LOGGER.Info(">> Indexname windream: " & oIndexName) + errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile" + My.Settings.Save() + frmError.ShowDialog() + + End Try + + Case "System.Windows.Forms.DataGridView" + oControlType = "DataGridView" + Dim dgv As DataGridView = oControl + If oSourceIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Exit For + End If + If oSourceIndexName Is Nothing = False Then + If oLoadIndex = False Then + LOGGER.Debug("Indexwert soll nicht geladen werden.") + Exit Select + End If + LOGGER.Debug($"getting wmValue for Index {oSourceIndexName}...") + Dim wertWD = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) + + If wertWD Is Nothing = False Then + 'Es wird gegen ein Vektorfeld nachindexiert + If wertWD.GetType.ToString.Contains("System.Object") Then + Select Case oTyp 'Tabellendarstellung - Case "TABLE" + Case "TABLE" - Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) - Dim SpaltenWerte As String() - LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") - If dt.Rows.Count > 1 Then - For Each Zeile As Object In wertWD - LOGGER.Debug($"vektorrow Value {Zeile.ToString}...") - SpaltenWerte = Split(Zeile, Delimiter) - Select Case dt.Rows.Count - Case 1 - dgv.Rows.Add(New String() {Zeile.ToString}) - Case 2 - If SpaltenWerte.Length = 2 Then - dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) - Else - dgv.Rows.Add(New String() {SpaltenWerte(0), ""}) - End If - Case 3 - If SpaltenWerte.Length = 3 Then - dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) - ElseIf SpaltenWerte.Length = 2 Then - dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""}) - Else - dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""}) - End If - Case 4 - If SpaltenWerte.Length = 4 Then - dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) - ElseIf SpaltenWerte.Length = 3 Then - dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""}) - ElseIf SpaltenWerte.Length = 2 Then - dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""}) - Else - dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""}) - End If + Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) + Dim SpaltenWerte As String() + LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") + If dt.Rows.Count > 1 Then + For Each Zeile As Object In wertWD + LOGGER.Debug($"vektorrow Value {Zeile.ToString}...") + SpaltenWerte = Split(Zeile, Delimiter) + Select Case dt.Rows.Count + Case 1 + dgv.Rows.Add(New String() {Zeile.ToString}) + Case 2 + If SpaltenWerte.Length = 2 Then + dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + Else + dgv.Rows.Add(New String() {SpaltenWerte(0), ""}) + End If + Case 3 + If SpaltenWerte.Length = 3 Then + dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + ElseIf SpaltenWerte.Length = 2 Then + dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""}) + Else + dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""}) + End If + Case 4 + If SpaltenWerte.Length = 4 Then + dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + ElseIf SpaltenWerte.Length = 3 Then + dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""}) + ElseIf SpaltenWerte.Length = 2 Then + dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""}) + Else + dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""}) + End If + + End Select + Next + End If + + Case Else + 'es handelt sich um ein einfaches Vektorfeld mit einem Wert + For Each obj As Object In wertWD + If obj Is Nothing = False Then + dgv.Rows.Add(New String() {obj.ToString}) - End Select - Next End If - Case Else - 'es handelt sich um ein einfaches Vektorfeld mit einem Wert - For Each obj As Object In wertWD - If obj Is Nothing = False Then - dgv.Rows.Add(New String() {obj.ToString}) - - End If - - Next - End Select + Next + End Select - End If End If End If - Case "DevExpress.XtraGrid.GridControl" - oControlType = "DataGridView" - Dim dgv As GridControl = oControl - If oWMIndexName = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) - Exit For + End If + Case "DevExpress.XtraGrid.GridControl" + oControlType = "DataGridView" + Dim dgv As GridControl = oControl + If oSourceIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Exit For + End If + If oSourceIndexName Is Nothing = False Then + If oLoadIndex = False Then + LOGGER.Debug("Indexwert soll nicht geladen werden.") + Exit Select End If - If oWMIndexName Is Nothing = False Then - If oLoadIndex = False Then - LOGGER.Debug("Indexwert soll nicht geladen werden.") - Exit Select - End If - LOGGER.Debug($"getting wmValue for Index {oWMIndexName}...") - Dim wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) + LOGGER.Debug($"getting wmValue for Index {oSourceIndexName}...") + ' Dim wertWD = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) + oValueFromSource = GetVariableValuefromSource(oSourceIndexName) - If wertWD Is Nothing = False Then - 'Es wird gegen ein Vektorfeld nachindexiert - If wertWD.GetType.ToString.Contains("System.Object") Then - Select Case oTyp + If oValueFromSource Is Nothing = False Then + Dim omytype = oValueFromSource.GetType.ToString + 'Es wird gegen ein Vektorfeld nachindexiert + If omytype.Contains("System.Object") Or omytype = "System.Data.DataTable" Or omytype = "System.String" Then + Select Case oTyp 'Tabellendarstellung - Case "TABLE" - Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) + Case "TABLE" + Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) - Dim SpaltenWerte As String() - LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") - If dt.Rows.Count >= 1 Then - Dim oDataSource As DataTable = dgv.DataSource - oDataSource.Rows.Clear() + Dim SpaltenWerte As String() + LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") + If dt.Rows.Count >= 1 Then + Dim oDataSource As DataTable = dgv.DataSource + oDataSource.Rows.Clear() - For Each Zeile As Object In wertWD + If IDB_ACTIVE = False Then + For Each Zeile As Object In oValueFromSource LOGGER.Debug($"vektorrow Value {Zeile.ToString}...") SpaltenWerte = Split(Zeile, Delimiter) @@ -2430,6 +2475,9 @@ Public Class frmValidator Select Case dt.Rows.Count Case 1 + If SpaltenWerte.Length = 2 Then + + End If oDataSource.Rows.Add(New String() {Zeile.ToString}) 'dgv.Rows.Add(New String() {Zeile.ToString}) Case 2 @@ -2468,253 +2516,335 @@ Public Class frmValidator End Select Next - End If + Else + If omytype = "System.String" Then + SpaltenWerte = Split(oValueFromSource.ToString, Delimiter) + Select Case SpaltenWerte.Length + Case 2 + oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + Case 3 + oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + Case 4 + oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(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}...") + SpaltenWerte = Split(oRow.Item(0).ToString, Delimiter) - Case Else - 'es handelt sich um ein einfaches Vektorfeld mit einem Wert - Dim oDataSource As DataTable = dgv.DataSource - For Each obj As Object In wertWD - If obj Is Nothing = False Then - oDataSource.Rows.Add(New String() {obj.ToString}) - 'dgv.Rows.Add(New String() {obj.ToString}) + Select Case SpaltenWerte.Length + Case 2 + oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + Case 3 + oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + Case 4 + oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + End Select + 'Select Case oMyDatatable.Rows.Count + ' Case 1 + ' oDataSource.Rows.Add(New String() {oRow.Item(0).ToString}) + ' 'dgv.Rows.Add(New String() {Zeile.ToString}) + ' Case 2 + ' If SpaltenWerte.Length = 2 Then + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + ' Else + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), ""}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), ""}) + ' End If + ' Case 3 + ' If SpaltenWerte.Length = 3 Then + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + ' ElseIf SpaltenWerte.Length = 2 Then + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""}) + ' Else + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), "", ""}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""}) + ' End If + ' Case 4 + ' If SpaltenWerte.Length = 4 Then + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + ' ElseIf SpaltenWerte.Length = 3 Then + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""}) + ' ElseIf SpaltenWerte.Length = 2 Then + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""}) + ' Else + ' oDataSource.Rows.Add(New String() {SpaltenWerte(0), "", "", ""}) + ' 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""}) + ' End If + 'End Select + Next End If - Next - End Select + End If + + End If + + Case Else + 'es handelt sich um ein einfaches Vektorfeld mit einem Wert + Dim oDataSource As DataTable = dgv.DataSource + For Each obj As Object In oValueFromSource + If obj Is Nothing = False Then + oDataSource.Rows.Add(New String() {obj.ToString}) + 'dgv.Rows.Add(New String() {obj.ToString}) + + End If + + Next + End Select + End If + + Else + If first = False Then + Dim oDataSource As DataTable = dgv.DataSource + + If oDataSource.Rows.Count > 0 Then + oDataSource.Rows.Clear() End If - Else - If first = False Then - Dim oDataSource As DataTable = dgv.DataSource - - If oDataSource.Rows.Count > 0 Then - oDataSource.Rows.Clear() - End If - - End If End If End If - Case "System.Windows.Forms.CheckBox" - LOGGER.Debug("Loading checkbox.") - oControlType = "CheckBox" - If oWMIndexName = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) - Exit For + End If + Case "System.Windows.Forms.CheckBox" + LOGGER.Debug("Loading checkbox.") + oControlType = "CheckBox" + If oSourceIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Exit For + End If + If oSourceIndexName Is Nothing = False Then + + Dim chk As CheckBox = oControl + + If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then + LOGGER.Debug("Indexwert soll nicht geladen werden.") + Else + + If oDefaultValue <> String.Empty Then + Dim result = False + _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue + If Boolean.TryParse(oDefaultValue, result) Then + chk.Checked = result + Exit Select + End If + End If + End If - If oWMIndexName Is Nothing = False Then - Dim chk As CheckBox = oControl - If oLoadIndex = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then - LOGGER.Debug("Indexwert soll nicht geladen werden.") - Else + 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) + Catch ex As Exception + LOGGER.Warn($"Could not get the windreamValue for CheckboxIndex: {oSourceIndexName} [{ex.Message}]") + End Try + + End If + + + 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) + _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString + If oValueFromSource.ToString = "" Then + LOGGER.Info(">> Versuch, default Value zu laden") If oDefaultValue <> String.Empty Then Dim result = False - _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue If Boolean.TryParse(oDefaultValue, result) Then + LOGGER.Info(">> defaultValue wurde geladen") chk.Checked = result - Exit Select - End If - End If - - End If - - - LOGGER.Debug("Loading Bool-Value from Windream.") - Dim wertWD - If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(oWMIndexName) - Else - Try - LOGGER.Debug($"..Now GetVariableValue({oWMIndexName})...") - wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) - Catch ex As Exception - LOGGER.Warn($"Could not get the windreamValue for CheckboxIndex: {oWMIndexName} [{ex.Message}]") - End Try - - End If - - - If wertWD 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: " & wertWD.ToString) - _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD.ToString - If wertWD.ToString = "" Then - LOGGER.Info(">> Versuch, default Value zu laden") - If oDefaultValue <> String.Empty Then - Dim result = False - If Boolean.TryParse(oDefaultValue, result) Then - LOGGER.Info(">> defaultValue wurde geladen") - chk.Checked = result - Else - chk.Checked = False - End If Else - LOGGER.Info(">> defaultValue war leer") chk.Checked = False End If Else - Dim _value - If wertWD.ToString = "System.Object[]" Then - LOGGER.Debug("CheckBoxValue with VectorField: " & oWMIndexName) - If wertWD.length = 1 Then - _value = wertWD(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used") - _value = wertWD(0) - End If - Else - LOGGER.Debug("Value is not nothing and also not System.Object[]...") - _value = wertWD - End If - Try - Select Case CBool(_value) - Case True - LOGGER.Info(">> CBool(_value) = True") - chk.Checked = True - Case Else - LOGGER.Info(">> CBool(_value) = False") - chk.Checked = False - End Select - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(">> Unvorhergesehener Fehler bei CBool(wertWD) - CheckBox: " & ex.Message & vbNewLine & "Wert WD: " & wertWD.ToString, True) - chk.Checked = False - End Try + LOGGER.Info(">> defaultValue war leer") + chk.Checked = False End If + Else + Dim _value + If oValueFromSource.ToString = "System.Object[]" Then + LOGGER.Debug("CheckBoxValue with VectorField: " & oSourceIndexName) + If oValueFromSource.length = 1 Then + _value = oValueFromSource(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oSourceIndexName & "' contains more then one value - First value will be used") + _value = oValueFromSource(0) + End If + Else + LOGGER.Debug("Value is not nothing and also not System.Object[]...") + _value = oValueFromSource + End If + Try + Select Case CBool(_value) + Case True + LOGGER.Info(">> CBool(_value) = True") + chk.Checked = True + Case Else + LOGGER.Info(">> CBool(_value) = False") + chk.Checked = False + End Select + Catch ex As Exception + LOGGER.Error(ex) + LOGGER.Info(">> Unvorhergesehener Fehler bei CBool(wertWD) - CheckBox: " & ex.Message & vbNewLine & "Wert WD: " & oValueFromSource.ToString, True) + chk.Checked = False + End Try End If - End If - Case "DigitalData.Controls.LookupGrid.LookupControl2" - Try - Dim oLookup As LookupControl2 = oControl - Dim oWindreamValue = CURRENT_WMFILE.GetVariableValue(oWMIndexName) - Try - oLookup.SelectedValues = Nothing - oLookup.SelectedValues = New List(Of String) - Catch ex As Exception - End Try - If Not IsNothing(oWindreamValue) Then - If oWindreamValue.GetType.ToString.Contains("System.Object") Then - Dim oArrlist As New List(Of String) - For Each oVectorRow As Object In oWindreamValue + End If + Case "DigitalData.Controls.LookupGrid.LookupControl2" + Try + Dim oLookup As LookupControl2 = oControl + oValueFromSource = GetVariableValuefromSource(oSourceIndexName) + 'Dim oWindreamValue = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) + Try + oLookup.SelectedValues = Nothing + oLookup.SelectedValues = New List(Of String) + Catch ex As Exception + + End Try + If Not IsNothing(oValueFromSource) Then + Dim oMyType = oValueFromSource.GetType.ToString + If oMyType.Contains("System.Object") Or oMyType = "System.Data.DataTable" Then + Dim oArrlist As New List(Of String) + If IDB_ACTIVE = False Then + For Each oVectorRow As Object In oValueFromSource Dim Ocontent = oVectorRow.ToString oArrlist.Add(Ocontent) Next - oLookup.SelectedValues = oArrlist - _CURRENT_INDEX_ARRAY(oCount, 1) = oWindreamValue.ToString Else - Dim oArrlist As New List(Of String) - oArrlist.Add(oWindreamValue.ToString) - oLookup.SelectedValues = oArrlist - _CURRENT_INDEX_ARRAY(oCount, 1) = oWindreamValue.ToString + Dim myDT As DataTable = oValueFromSource + For Each oVectorRow As DataRow In myDT.Rows + Dim Ocontent = oVectorRow.Item(0) + oArrlist.Add(Ocontent) + Next End If + + oLookup.SelectedValues = oArrlist + _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString Else - If Not IsNothing(oLookup.SelectedValues) Then - If oLookup.SelectedValues.Count = 0 And oDefaultValue <> String.Empty Then - Dim oValues As List(Of String) = oDefaultValue.Split(",").ToList() - oLookup.SelectedValues = oValues - End If + Dim oArrlist As New List(Of String) + oArrlist.Add(oValueFromSource.ToString) + oLookup.SelectedValues = oArrlist + _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString + End If + Else + If Not IsNothing(oLookup.SelectedValues) Then + If oLookup.SelectedValues.Count = 0 And oDefaultValue <> String.Empty Then + Dim oValues As List(Of String) = oDefaultValue.Split(",").ToList() + oLookup.SelectedValues = oValues End If End If + End If + + Catch ex As Exception + LOGGER.Error(ex) + LOGGER.Info(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & oIndexName & " - Fehler: " & vbNewLine & ex.Message) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Add LookupControl2:") + End Try + + Case "System.Windows.Forms.DateTimePicker" + oControlType = "DateTimePicker" + Dim DTP As DateTimePicker = oControl + If oSourceIndexName = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + 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) + + End If + + If oValueFromSource Is Nothing Then oValueFromSource = "" + Dim tempdate As Date = CDate("01.01.0001 00:00:00") + If oValueFromSource.ToString.Length > 0 Then + Try + tempdate = CDate(oValueFromSource) + LOGGER.Debug("DATE konnte umgewandelt werden") + Catch ex As Exception + LOGGER.Error(ex) + ValueDTP = tempdate + LOGGER.Debug("DATE wurde auf heute gesetzt") + End Try + DTP.Text = tempdate + Else + LOGGER.Debug("DATE ist leer") + ValueDTP = tempdate + DTP.Text = tempdate + End If + _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString + Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & oIndexName & " - Fehler: " & vbNewLine & ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Add LookupControl2:") + errormessage = "Unvorhergesehener Fehler bei DTP: " & vbNewLine & ex.Message + + LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message & vbNewLine & "Wert WD: " & oValueFromSource.ToString & vbNewLine & "Indexname: " & oSourceIndexName, True) + frmError.ShowDialog() + LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message, True) End Try - Case "System.Windows.Forms.DateTimePicker" - oControlType = "DateTimePicker" - Dim DTP As DateTimePicker = oControl - If oWMIndexName = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) - Exit For - End If - If oWMIndexName Is Nothing = False Then - Dim wertWD - Try - If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - LOGGER.Debug("DATE über PM-Vektor holen") - wertWD = ReturnVektor_IndexValue(oWMIndexName) - LOGGER.Info(">> DTP is """) - Else - wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) - End If - - If wertWD Is Nothing Then wertWD = "" - Dim tempdate As Date = CDate("01.01.0001 00:00:00") - If wertWD.ToString.Length > 0 Then - Try - tempdate = CDate(wertWD) - LOGGER.Debug("DATE konnte umgewandelt werden") - Catch ex As Exception - LOGGER.Error(ex) - ValueDTP = tempdate - LOGGER.Debug("DATE wurde auf heute gesetzt") - End Try - DTP.Text = tempdate - Else - LOGGER.Debug("DATE ist leer") - ValueDTP = tempdate - DTP.Text = tempdate - End If - _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD.ToString - - - Catch ex As Exception - LOGGER.Error(ex) - errormessage = "Unvorhergesehener Fehler bei DTP: " & vbNewLine & ex.Message - - LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message & vbNewLine & "Wert WD: " & wertWD.ToString & vbNewLine & "Indexname: " & oWMIndexName, True) - frmError.ShowDialog() - LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndex DTP: " & ex.Message, True) - End Try + End If + 'Case Else + ' MsgBox(Type) + End Select + oCount += 1 + Next + set_foreground() + If first_control Is Nothing = False Then first_control.Focus() + 'Flag setzen das Indexe geladen sind + _Indexe_Loaded = True + Load_Additional_Searches() + Else + MsgBox("Für dieses Profil wurde noch keine Eingabemaske definiert!" & vbNewLine & "Informieren Sie Ihren PM-Administrator!" & vbNewLine & "Das Fenster wird geschlossen!", MsgBoxStyle.Exclamation, "Achtung:") + Me.Close() + End If - End If - 'Case Else - ' MsgBox(Type) - End Select - oCount += 1 - Next - set_foreground() - If first_control Is Nothing = False Then first_control.Focus() - 'Flag setzen das Indexe geladen sind - _Indexe_Loaded = True - Load_Additional_Searches() - Else - MsgBox("Für dieses Profil wurde noch keine Eingabemaske definiert!" & vbNewLine & "Informieren Sie Ihren PM-Administrator!" & vbNewLine & "Das Fenster wird geschlossen!", MsgBoxStyle.Exclamation, "Achtung:") - Me.Close() - End If - - Catch ex As Exception - LOGGER.Error(ex) - errormessage = "Unvorhergesehener Fehler bei FillIndexValues:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" - My.Settings.Save() - frmError.ShowDialog() - LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues: " & ex.Message, True) - LOGGER.Info(">> Controltype: " & oControlType) - LOGGER.Info(">> Indexname windream: " & oIndexName) - LOGGER.Info(">> Stacktrace: " & ex.StackTrace) + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' errormessage = "Unvorhergesehener Fehler bei FillIndexValues:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" + ' My.Settings.Save() + ' frmError.ShowDialog() + ' LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues: " & ex.Message, True) + ' LOGGER.Info(">> Controltype: " & oControlType) + ' LOGGER.Info(">> Indexname windream: " & oIndexName) + ' LOGGER.Info(">> Stacktrace: " & ex.StackTrace) - End Try + 'End Try End Sub Private Sub frmValidation_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown - Refresh_FileList() + ' Refresh_FileList() Load_Next_Document(True) _dependingControl_in_action = False FormLoaded = True @@ -2756,54 +2886,56 @@ Public Class frmValidator End Sub Sub Abschluss() btnSave.Enabled = False - LOGGER.Debug("Abschluss für Dok: " & CURRENT_WMFILE.aName & " gestartet") + LOGGER.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet") 'Eingaben auf Form überprüfen If Check_UpdateIndexe() = False Then 'lblerror.Visible = False - Try - Dim oErrorOcurred As Boolean = False + 'Try + Dim oErrorOcurred As Boolean = False - TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) + 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("Finale(r) Index(e) für Dok: " & CURRENT_WMFILE.aName & " soll gesetzt werden") + LOGGER.Debug("FINAL INDEXING STARTING...") For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows - Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString - Dim oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME")) + 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("Indexierung mit dynamischem SQL!") + Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND") - If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### - LOGGER.Debug("Indexierung mit dynamischem SQL!") - Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND") + LOGGER.Debug("SQL_COMMAND before ReplaceAllValues: " & oSQLCommand) + oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, 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 + End If + If Not IsNothing(oSQLCommand) Then + LOGGER.Debug("SQL_COMMAND after ReplaceAllValues: " & oSQLCommand) + Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) - LOGGER.Debug("SQL_COMMAND before ReplaceAllValues: " & oSQLCommand) - oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, 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 + If Not IsNothing(dynamic_value) Then + LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString) + oValue = dynamic_value + Else + LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") End If - If Not IsNothing(oSQLCommand) Then - LOGGER.Debug("SQL_COMMAND after ReplaceAllValues: " & oSQLCommand) - Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) + End If - If Not IsNothing(dynamic_value) Then - LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString) - oValue = dynamic_value - Else - LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") - End If - End If - - Else - If oValue.StartsWith("v") Then + Else + If oValue.StartsWith("v") Then Select Case oFinalIndexRow.Item("VALUE").ToString Case "vDate" oValue = Now.ToShortDateString Case "vUserName" - oValue = Environment.UserName - Case Else + oValue = USER_USERNAME + Case Else oValue = oFinalIndexRow.Item("VALUE") End Select End If @@ -2820,7 +2952,7 @@ Public Class frmValidator 'If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then ' Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME")) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(oValue, oFinalIndexRow.Item("INDEXNAME"), oFinalIndexRow.Item("PREVENT_DUPLICATES"), oFinalIndexRow.Item("ALLOW_NEW_VALUES")) = False Then + If WMIndexVectofield(oValue, oFinalIndexRow.Item("INDEXNAME"), oFinalIndexRow.Item("PREVENT_DUPLICATES"), oFinalIndexRow.Item("ALLOW_NEW_VALUES")) = False Then LOGGER.Debug("FINALER Vektorindex '" & oFinalIndexRow.Item("INDEXNAME").ToString & "' WURDE ERFOLGREICH GESETZT") Else errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message @@ -2829,21 +2961,36 @@ Public Class frmValidator oErrorOcurred = True End If Else - LOGGER.Debug("Jetzt das indexieren") - If Indexiere_File(CURRENT_WMFILE, oFinalIndexRow.Item("INDEXNAME"), oResult) = True Then - LOGGER.Debug("FINALER INDEX '" & oFinalIndexRow.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT") + 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")) - Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX) + '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 - errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message + If IDBData.SetVariableValue(oFinalIndexRow.Item("INDEXNAME"), oValue) = True Then + oFIResult = True + LOGGER.Debug("final index '" & oFinalIndexRow.Item("INDEXNAME") & "' was written to IDB") + If PROFIL_LOGINDEX <> "" Then + Dim logstr = Return_LOGString(oValue, "DDFINALINDEX", oFinalIndexRow.Item("INDEXNAME")) + oFIResult = IDBData.SetVariableValue(PROFIL_LOGINDEX, logstr) + End If + End If + End If + If oFIResult = False Then + errormessage = "Error in final indexing:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() oErrorOcurred = True End If + End If If oErrorOcurred = True Then Exit For @@ -2853,10 +3000,9 @@ Public Class frmValidator ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde If oErrorOcurred = False Then - LOGGER.Debug("Tabelle updaten und co") - 'Das Dokument freigeben und als editiert markieren - Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID) - ClassDatabase.Execute_non_Query(sql) + 'Das Dokument freigeben und als editiert markieren + 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) + ClassDatabase.Execute_non_Query(sql) 'TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", Document_ID) ''Das Dokument 'TBPM_PROFILE_FILESTableAdapter.CmdSetEdit(Document_ID) @@ -2887,11 +3033,17 @@ Public Class frmValidator LOGGER.Debug("element in RegeX WORK_HISTORY_ENTRY: " & element.Value) Dim CTRL_ID = element.Value.Substring(2, element.Value.Length - 3) CTRL_ID = CTRL_ID.Replace("CTRLID", "") - Dim value_from_control + Dim value_from_control + If IsNumeric(CTRL_ID) Then For Each oControl As Control In Me.pnldesigner.Controls - If IsNothing(DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid) Then + Try + If IsNothing(DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid) Then + Continue For + End If + Catch ex As Exception Continue For - End If + End Try + If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = CTRL_ID Then '###### Dim Type As String = oControl.GetType.ToString @@ -2933,7 +3085,9 @@ Public Class frmValidator End If Next - If Not IsNothing(value_from_control) And value_from_control <> String.Empty Then + End If + + If Not IsNothing(value_from_control) And value_from_control <> String.Empty Then WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace(element.Value, value_from_control) End If Catch ex As Exception @@ -2942,17 +3096,17 @@ Public Class frmValidator End Try Next If WORK_HISTORY_ENTRY.ToString.Contains("@DATE") Then - WORK_HISTORY_ENTRY.ToString.Replace("@DATE", Now.ToShortDateString) - End If + WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace("@DATE", Now.ToShortDateString) + End If If WORK_HISTORY_ENTRY.ToString.Contains("@USERNAME") Then - WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", Environment.UserName) - End If + WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", USER_USERNAME) + End If Else WORK_HISTORY_ENTRY = "" End If End If - Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY) - ClassDatabase.Execute_non_Query(ins) + Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, WORK_HISTORY_ENTRY) + ClassDatabase.Execute_non_Query(ins) Close_document_viewer() If WMDocPathWindows.ToLower.EndsWith(".pdf") Then @@ -2963,7 +3117,7 @@ Public Class frmValidator If Not IsNothing(DT_ENTRY) Then If DT_ENTRY.Rows.Count = 1 Then Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT") - ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0) + ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False) End If End If End If @@ -2977,7 +3131,7 @@ Public Class frmValidator For Each rw As DataRow In DT_ENTRIES.Rows AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine Next - ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, 10, 40) + ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40) End If End If End If @@ -2994,10 +3148,10 @@ Public Class frmValidator oErrorOcurred = True End If End If - 'Validierungsfile löschen wenn vorhanden - allgFunk.Delete_xffres(WMDocPathWindows, _windream) - LOGGER.Debug("Delete_xffres ausgeführt") - LOGGER.Debug("All Input clear") + 'Validierungsfile löschen wenn vorhanden + 'allgFunk.Delete_xffres(WMDocPathWindows, _windream) + 'LOGGER.Debug("Delete_xffres ausgeführt") + LOGGER.Debug("All Input clear") Anzahl_validierte_Dok += 1 'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID) LOGGER.Debug("Anzahl hochgesetzt") @@ -3015,14 +3169,14 @@ Public Class frmValidator End If - Catch ex As Exception - LOGGER.Error(ex) - errormessage = "Unvorhergesehener Fehler bei Abschluss:" & ex.Message - My.Settings.Save() - frmError.ShowDialog() - LOGGER.Info(">> Unvorhergesehener Fehler bei Abschluss: " & ex.Message, True) - End Try - Else + 'Catch ex As Exception + ' LOGGER.Error(ex) + ' errormessage = "Unexpected error in Finish:" & ex.Message + ' My.Settings.Save() + ' frmError.ShowDialog() + ' LOGGER.Info("Unexpected error in Finish: " & ex.Message, True) + 'End Try + Else 'lblerror.Visible = True 'lblerror.Text = errmessage errormessage = oErrorMessage @@ -3043,7 +3197,7 @@ Public Class frmValidator Dim PM_String As String Try Dim Bezeichner As String = VKTBezeichner.Replace("[%VKT", "") - PM_String = "DD-PM" & Delimiter & Bezeichner & Delimiter & input & Delimiter & Environment.UserName & Delimiter & Now.ToString + PM_String = "DD-PM" & Delimiter & Bezeichner & Delimiter & input & Delimiter & USER_USERNAME & Delimiter & Now.ToString Catch ex As Exception LOGGER.Error(ex) LOGGER.Info(">> Fehler in Return_PM_VEKTOR: " & ex.Message, True) @@ -3056,9 +3210,9 @@ Public Class frmValidator Dim PM_String As String Try If old = "DDFINALINDEX" Then - PM_String = "DD-PMlog-FINAL" & Delimiter & indexname & Delimiter & input & Delimiter & Environment.UserName & Delimiter & Now.ToString + PM_String = $"DD-PMLog-FINAL{Delimiter}{indexname}{Delimiter}{input}{Delimiter}{USER_USERNAME}{Delimiter}{Now.ToString}" Else - PM_String = "DD-PMlog-CHG" & Delimiter & indexname & Delimiter & "NEW: '" & input & "' - OLD: '" & old & "'" & Delimiter & Environment.UserName & Delimiter & Now.ToString + PM_String = $"DD-PMLog-CHG{Delimiter}{indexname}{Delimiter}NEW: [{input}] - OLD: [{old}]{Delimiter}{USER_USERNAME}{Delimiter}{Now.ToString}" End If Catch ex As Exception @@ -3069,7 +3223,7 @@ Public Class frmValidator Return PM_String End Function - Private Function Indexiere_VektorfeldPM(input As String, NameVKTIndex As String, Optional PreventDuplicates As Boolean = False, Optional AllowAddNewValues As Boolean = True, Optional IndexBehaviour As String = "Add") + 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() @@ -3107,19 +3261,28 @@ Public Class frmValidator Return oMissing End Function + Function DT_FOR_ARRAY(pArr As String()) As DataTable + Dim odt As New DataTable + odt.Columns.Add("ID", GetType(Integer)) + odt.Columns.Add("Result", GetType(String)) + Dim N As Integer = odt.Columns("ID").AutoIncrement + + For Each oStr In pArr + odt.Rows.Add(N, oStr) + Next + Return odt + End Function Function Check_UpdateIndexe() Dim oControlName Dim oControlId As String Try - Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX Dim oMissing As Boolean = False - 'Jedes Control auf panel durchlaufen For Each oControl As Control In Me.pnldesigner.Controls 'Der input der Box,Cmb muss jedes mal geleert werden - Dim input As String = "" + Dim oMyInput As String = "" 'Jedes Control in Konfig Tab durchlaufn - For Each dr As DataRow In dt.Rows + For Each dr As DataRow In DTVWCONTROL_INDEX.Rows If dr.Item("CTRL_TYPE") = "LBL" Or dr.Item("CTRL_TYPE") = "LINE" Then Continue For End If @@ -3147,9 +3310,6 @@ Public Class frmValidator Case "DigitalData.Controls.LookupGrid.LookupControl2" Try Dim lookup As LookupControl2 = oControl - If oControl.Name = "DGV_ca94be19" Then - 'MsgBox("attebt") - End If If lookup.SelectedValues.Count = 0 And oIsRequired = True Then oMissing = True oErrorMessage = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'" @@ -3175,77 +3335,106 @@ Public Class frmValidator End If Next - 'Jetzt die Datei indexieren - If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren von LookupGrid - ERROR: " & idxerr_message - Exit For + If IDB_ACTIVE = False Then + + If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren von LookupGrid - ERROR: " & idxerr_message + Exit For + End If + Else + Dim oMyDT = DT_FOR_ARRAY(myVektorArr) + If IDBData.SetVariableValue(oIndexName, oMyDT, True) = False Then + oMissing = True + oErrorMessage = "Error while indexing IDB-Object LookupGrid" + Exit For + End If End If + 'Jetzt die Datei indexieren + Else Dim oValues As New List(Of Object) From {String.Empty} - If Indexiere_File(CURRENT_WMFILE, oIndexName, oValues.ToArray) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren von LookupGrid - ERROR: " & idxerr_message - Exit For + If IDB_ACTIVE = False Then + If Indexiere_File(CURRENT_WMFILE, oIndexName, oValues.ToArray) = False Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren von LookupGrid - ERROR: " & idxerr_message + Exit For + End If + End If + End If Else - input = lookup.SelectedValues.FirstOrDefault() - If IsNothing(input) And oIsRequired = True Then + oMyInput = lookup.SelectedValues.FirstOrDefault() + If IsNothing(oMyInput) And oIsRequired = True Then oMissing = True oErrorMessage = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}" Exit For - ElseIf IsNothing(input) And oIsRequired = False Then + ElseIf IsNothing(oMyInput) And oIsRequired = False Then Continue For End If 'den aktuellen Wert in windream auslesen - Dim wertWD + Dim oValueFromObject If oIndexName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(oIndexName) + oValueFromObject = ReturnVektor_IndexValue(oIndexName) Else - wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) - If Not IsNothing(wertWD) Then - If wertWD.ToString = "System.Object[]" Then - If wertWD.Length = 1 Then - wertWD = wertWD(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") - wertWD = wertWD(0) + oValueFromObject = GetVariableValuefromSource(oIndexName) + 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 End If Else - wertWD = "" + oValueFromObject = "" End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden - If IsNothing(wertWD) Or wertWD <> input Then + If IsNothing(oValueFromObject) Or oValueFromObject <> oMyInput Then 'Wenn der Wert in ein Vektorfeld geschrieben wird If oIndexName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, oIndexName) + oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True oErrorMessage = "Fehler beim Indexieren Textbox als VEKTOR - ERROR: " & idxerr_message Exit For End If Else - Dim result() As String - ReDim Preserve result(0) - result(0) = input - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message - Exit For + 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 = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message + Exit For + End If Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + Exit For End If End If + + 'Nun das Logging + If PROFIL_LOGINDEX <> "" Then + Dim oLogStr = Return_LOGString(oMyInput, oValueFromObject, oIndexName) + If IDB_ACTIVE = False Then + WMIndexVectofield(oLogStr, PROFIL_LOGINDEX) + Else + IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogStr) + End If + + End If + End If End If End If @@ -3288,52 +3477,63 @@ Public Class frmValidator oControl.BackColor = Color.Red Exit For Else - input = oControl.Text + oMyInput = oControl.Text 'den aktuellen Wert in windream auslesen - Dim wertWD + Dim oSourceValue = GetVariableValuefromSource(oIndexName) + If oIndexName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(oIndexName) + oSourceValue = ReturnVektor_IndexValue(oIndexName) Else - wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) - If Not IsNothing(wertWD) Then - If wertWD.ToString = "System.Object[]" Then - If wertWD.Length = 1 Then - wertWD = wertWD(0) + '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") - wertWD = wertWD(0) + oSourceValue = oSourceValue(0) End If End If Else - wertWD = "" + oSourceValue = "" End If End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden - If IsNothing(wertWD) Or wertWD <> input Then + If IsNothing(oSourceValue) Or oSourceValue <> oMyInput Then 'Wenn der Wert in ein Vektorfeld geschrieben wird If oIndexName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, oIndexName) + oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True oErrorMessage = "Fehler beim Indexieren Textbox als VEKTOR - ERROR: " & idxerr_message Exit For End If Else - Dim result() As String - ReDim Preserve result(0) - result(0) = input - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message - Exit For - Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + 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 = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message + Exit For End If + Else + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + Exit For + End If + End If + + If PROFIL_LOGINDEX <> "" Then + Dim oMyLogString = Return_LOGString(oMyInput, oSourceValue, oIndexName) + If IDB_ACTIVE = False Then + WMIndexVectofield(oMyLogString, PROFIL_LOGINDEX) + Else + IDBData.SetVariableValue(PROFIL_LOGINDEX, oMyLogString) + End If + End If End If @@ -3361,14 +3561,14 @@ Public Class frmValidator Exit For 'ElseIf cmb.SelectedIndex <> -1 Then Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben - input = cmb.Text + 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 = CURRENT_WMFILE.GetVariableValue(oIndexName) + oWMValue = GetVariableValuefromSource(oIndexName) End If LOGGER.Debug($"Got a WMValue...") If IsNothing(oWMValue) Then @@ -3395,7 +3595,7 @@ Public Class frmValidator LOGGER.Debug($"WMValue is a regular item...") Dim oitsadifference As Boolean = False Try - If oWMValue.ToString <> input.ToString Then + If oWMValue.ToString <> oMyInput.ToString Then oitsadifference = True End If Catch ex As Exception @@ -3408,29 +3608,44 @@ Public Class frmValidator LOGGER.Debug($"Index with ID{oControlId} will now be indexed...") 'Wenn der Wert in ein Vektorfeld geschrieben wird If oIndexName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, oIndexName) + oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True oErrorMessage = "Fehler beim Indexieren Combobox als VEKTOR - ERROR: " & idxerr_message Exit For End If Else - Dim result() As String - ReDim Preserve result(0) - result(0) = input - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - cmb.DroppedDown = True - oMissing = True - oErrorMessage = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message - Exit For + 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 = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message + Exit For + End If Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, oWMValue, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then + cmb.DroppedDown = True + oMissing = True + oErrorMessage = "Error indexing combobox idb" + Exit For End If End If + + 'Nun das Logging + If PROFIL_LOGINDEX <> "" Then + Dim ologStr = Return_LOGString(oMyInput, oWMValue, oIndexName) + If IDB_ACTIVE = False Then + WMIndexVectofield(ologStr, PROFIL_LOGINDEX) + Else + IDBData.SetVariableValue(PROFIL_LOGINDEX, ologStr) + End If + + End If + End If Else LOGGER.Debug($"oitsadifference = False...Index with ID{oControlId} will not be indexed...") @@ -3458,49 +3673,61 @@ Public Class frmValidator oErrorMessage = "Please Choose DateValue for field'" & dtp.Name & "'" Exit For ElseIf dtp.Value.ToString <> "01.01.0001 00:00:00" Then - input = CDate(dtp.Value) + oMyInput = CDate(dtp.Value) 'den aktuellen Wert in windream auslesen ' Dim wertWD As String = CURRENT_WMFILE.GetVariableValue(_IDXName) - Dim wertWD As String + Dim oObjectValue If oIndexName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(oIndexName) + oObjectValue = ReturnVektor_IndexValue(oIndexName) Else - wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) + oObjectValue = GetVariableValuefromSource(oIndexName) End If - If IsNothing(wertWD) Then - wertWD = CDate("01.01.1900") + If IsNothing(oObjectValue) Then + oObjectValue = CDate("01.01.1900") End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden - If wertWD <> input Then + If oObjectValue <> oMyInput Then 'Wenn der WErt in ein Vektorfeld geschrieben wird If oIndexName.StartsWith("[%VKT") Then 'Input = die String komponente als String - input = Return_PM_VEKTOR(input, oIndexName) + oMyInput = Return_PM_VEKTOR(oMyInput, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True oErrorMessage = "Fehler beim Indexieren DatePicker als VEKTOR - ERROR: " & idxerr_message Exit For End If Else - Dim result() - ReDim Preserve result(0) - result(0) = CDate(input) - 'MsgBox(_IDXName) - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren DatePicker- ERROR: " & idxerr_message - Exit For + 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 = "Fehler beim Indexieren DatePicker- ERROR: " & idxerr_message + Exit For + End If Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + If IDBData.SetVariableValue(oIndexName, oObjectValue) = False Then + oMissing = True + oErrorMessage = "Error indexing datepicker idb" + Exit For End If End If + + If PROFIL_LOGINDEX <> "" Then + Dim oLogstr = Return_LOGString(oMyInput, oObjectValue, oIndexName) + If IDB_ACTIVE = False Then + WMIndexVectofield(oLogstr, PROFIL_LOGINDEX) + Else + IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogstr) + End If + + End If + End If Else - LOGGER.Debug("Value WD ('" & wertWD.ToString & "') = Input-value ('" & input.ToString & "')") + LOGGER.Debug("Value WD ('" & oObjectValue.ToString & "') = Input-value ('" & oMyInput.ToString & "')") End If Else @@ -3508,7 +3735,7 @@ Public Class frmValidator End If Case "System.Windows.Forms.CheckBox" Dim chk As CheckBox = oControl - input = chk.Checked.ToString + oMyInput = chk.Checked.ToString 'If chk.Checked = False And oIsRequired = True Then ' oMissing = True @@ -3518,31 +3745,32 @@ Public Class frmValidator 'den aktuellen Wert in windream auslesen Dim WertWD As String - Dim Bool_WD As Boolean + Dim oBoolValue As Boolean If oIndexName.StartsWith("[%VKT") Then WertWD = ReturnVektor_IndexValue(oIndexName) If WertWD = "" Then - Bool_WD = False + oBoolValue = False Else - Bool_WD = CBool(WertWD) + oBoolValue = CBool(WertWD) End If Else Dim _Value - Dim ValueWD = CURRENT_WMFILE.GetVariableValue(oIndexName) - If IsNothing(ValueWD) Then - Bool_WD = False + Dim oObjectCheck = GetVariableValuefromSource(oIndexName) + + If IsNothing(oObjectCheck) Then + oBoolValue = False Else - If ValueWD.ToString = "System.Object[]" Then - If ValueWD.Length = 1 Then - _Value = ValueWD(0) + 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 = ValueWD(0) + _Value = oObjectCheck(0) End If Else - _Value = ValueWD + _Value = oObjectCheck End If - Bool_WD = CBool(_Value) + oBoolValue = CBool(_Value) End If End If @@ -3551,7 +3779,7 @@ Public Class frmValidator ' Dim Bool_WD = CBool(CURRENT_WMFILE.GetVariableValue(_IDXName)) 'wenn Wert in Windream <> der Eingabe darf indexiert werden - If Bool_WD <> chk.Checked Then + If oBoolValue <> chk.Checked Then Dim result() As String ReDim Preserve result(0) If chk.Checked Then @@ -3562,24 +3790,35 @@ Public Class frmValidator If oIndexName.StartsWith("[%VKT") Then 'Input = die String komponente mit Boolean als String - input = Return_PM_VEKTOR(chk.Checked.ToString, oIndexName) + oMyInput = Return_PM_VEKTOR(chk.Checked.ToString, oIndexName) 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True oErrorMessage = "Fehler beim Indexieren Checkbox als VEKTOR - ERROR: " & idxerr_message Exit For End If Else - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Checkbox - ERROR: " & idxerr_message - Exit For - Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(CBool(result(0)).ToString, WertWD, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + If IDB_ACTIVE = False Then + If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren 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 PROFIL_LOGINDEX <> "" Then + Dim oLogstr = Return_LOGString(CBool(result(0)).ToString, WertWD, oIndexName) + If IDB_ACTIVE = False Then + WMIndexVectofield(oLogstr, PROFIL_LOGINDEX) + Else + IDBData.SetVariableValue(PROFIL_LOGINDEX, oLogstr) + End If + End If End If End If @@ -3641,12 +3880,23 @@ Public Class frmValidator End Select Next - 'Jetzt die Datei indexieren - If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Vektorfeld - ERROR: " & idxerr_message - Exit For + If IDB_ACTIVE = False Then + If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren Vektorfeld - ERROR: " & idxerr_message + 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" @@ -3702,21 +3952,38 @@ Public Class frmValidator End Select Next - 'Jetzt die Datei indexieren - If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren der Tabelle - ERROR: " & idxerr_message - Exit For + + + If IDB_ACTIVE = False Then + If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then + oMissing = True + oErrorMessage = $"Error while indexing table (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) = 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} - 'Jetzt die Datei indexieren - If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren der Tabelle - ERROR: " & idxerr_message - Exit For + If IDB_ACTIVE = False Then + If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then + oMissing = True + 'oErrorMessage = "Fehler beim Indexieren der Tabelle - ERROR: " & idxerr_message + oErrorMessage = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message + Exit For + End If End If + End If End Select End If 'End If für Control und ReadOnly = False @@ -3772,14 +4039,14 @@ Public Class frmValidator 'File_indexiert = Me._windreamPM.RunIndexing(_dok, arrIndex, arrValue) File_indexiert = WINDREAM.RunIndexing(_dok, arrIndex, arrValue) If File_indexiert = False Then - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Fehler beim Indexieren der Datei: " & _dok.aName & " - ERROR: " & idxerr_message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Fehler beim Indexieren der Datei: " & _dok.aName & " - ERROR: " & idxerr_message, USER_USERNAME) End If Return File_indexiert End If Catch ex As Exception LOGGER.Error(ex) - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Unvorhergesehener Fehler beim Indexieren der Datei: " & _dok.aName & " - ERROR: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Unvorhergesehener Fehler beim Indexieren der Datei: " & _dok.aName & " - ERROR: " & ex.Message, USER_USERNAME) idxerr_message = "unvorhergesehener Fehler in Indexiere_File: " & ex.Message.ToString LOGGER.Info(">> Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString, True) Return False @@ -4000,14 +4267,14 @@ Public Class frmValidator End Sub Private Sub frmValidator_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp - If (e.Control AndAlso e.KeyCode = Keys.S) Then - btnSave.Enabled = False - Abschluss() - btnSave.Enabled = True - ElseIf e.KeyCode = Keys.F4 Then + If e.KeyCode = Keys.F4 Then Datei_ueberspringen() End If - + '(e.Control AndAlso e.KeyCode = Keys.S) Then + ' btnSave.Enabled = False + 'Abschluss() + 'btnSave.Enabled = True + 'Else End Sub Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButtonJumpFile.Click @@ -4078,11 +4345,11 @@ Public Class frmValidator End Sub Private Sub btnSave_MouseHover(sender As Object, e As EventArgs) Handles btnSave.MouseHover - Dim msg = "strg & s für speichern" - If USER_LANGUAGE <> "de-DE" Then - msg = "ctrl & s for saving" - End If - ToolTip1.Show(msg, btnSave) + 'Dim msg = "strg & s für speichern" + 'If USER_LANGUAGE <> "de-DE" Then + ' msg = "ctrl & s for saving" + 'End If + 'ToolTip1.Show(msg, btnSave) End Sub Private Sub frmValidator_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.vb index ac93b32..e618753 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.vb @@ -135,7 +135,7 @@ Public Class frmValidatorSearch myGridControl = GridControlSearch5 End Select myGridControl.ContextMenuStrip = ContextMenuStripSQL - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SQLCommand, ConID) + Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_ConId(SQLCommand, ConID) If Not IsNothing(oDatatable) Then XtraTabControlSQL.TabPages(TabIndex).Text = $"{TabCaption} ({oDatatable.Rows.Count})" Select Case TabIndex @@ -194,7 +194,7 @@ Public Class frmValidatorSearch myGridview = GridViewDocSearch5 End Select myGridControl.ContextMenuStrip = ContextMenuStripWMFile - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SQLCommand, ConID) + Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_ConId(SQLCommand, ConID) If Not IsNothing(oDatatable) Then XtraTabControlDocs.TabPages(TabIndex).Text = $"{TabCaption} ({oDatatable.Rows.Count})" clsWMDocGrid.DTDocuments = oDatatable