From e8f3b68041119f44cf5efd0454f22ea7d1570943 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 7 May 2025 14:57:07 +0200 Subject: [PATCH] MS Logging, Import windream, Hash-wert --- .../Classes/ClassDOC_SEARCH.vb | 2 +- .../Classes/ClassDragDrop.vb | 2 +- .../Classes/ClassFolderWatcher.vb | 4 +- .../Classes/ClassHelper.vb | 37 +++++++++-- .../Classes/ClassImport_Windream.vb | 53 ++++++++------- app/DD-Record-Organizer/Classes/ClassInit.vb | 11 ++-- .../Classes/ClassWDRights.vb | 4 +- .../ModuleRuntimeVariables.vb | 6 +- .../My Project/AssemblyInfo.vb | 2 +- .../frmConstructor_Main.vb | 9 +-- .../frmDocRecordLink.Designer.vb | 66 +++++++++---------- app/DD-Record-Organizer/frmDocRecordLink.resx | 51 +++++++------- app/DD-Record-Organizer/frmDocRecordLink.vb | 46 ++++++------- app/DD-Record-Organizer/frmFileRename.vb | 2 +- .../frmGlobalSearch.Designer.vb | 10 +++ app/DD-Record-Organizer/frmGlobalSearch.resx | 39 +++++++++-- app/DD-Record-Organizer/frmNodeNavigation.vb | 18 +++-- app/DD-Record-Organizer/frmWM_IndexFile.vb | 31 ++++----- 18 files changed, 240 insertions(+), 153 deletions(-) diff --git a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb index 11afe92..fb070f2 100644 --- a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb @@ -516,7 +516,7 @@ Public Class ClassDOC_SEARCH Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer) Try - Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) + Dim execute = String.Format("EXEC PROF_DOC_CREATE_UPDATE {0},{1},'{2}','{3}'", DOC_ID, RECORD_ID, USER_USERNAME, CURRENT_FILE_HASH) If MYDB_ECM.ExecuteNonQuery(execute) = True Then Return True Else diff --git a/app/DD-Record-Organizer/Classes/ClassDragDrop.vb b/app/DD-Record-Organizer/Classes/ClassDragDrop.vb index 8b5ba19..ebe5061 100644 --- a/app/DD-Record-Organizer/Classes/ClassDragDrop.vb +++ b/app/DD-Record-Organizer/Classes/ClassDragDrop.vb @@ -8,7 +8,7 @@ Public Class ClassDragDrop LOGGER.Debug("In Drop_File....") files_dropped = Nothing - Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND USER_WORK = '" & USER_USERNAME & "'" + Dim Sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND USER_WORK = '" & USER_USERNAME & "'" MYDB_ECM.ExecuteNonQuery(sql) diff --git a/app/DD-Record-Organizer/Classes/ClassFolderWatcher.vb b/app/DD-Record-Organizer/Classes/ClassFolderWatcher.vb index 7e50615..0e95d76 100644 --- a/app/DD-Record-Organizer/Classes/ClassFolderWatcher.vb +++ b/app/DD-Record-Organizer/Classes/ClassFolderWatcher.vb @@ -87,7 +87,9 @@ Public Class ClassFolderWatcher 'Die Datei übergeben LOGGER.Debug("OnCreated-File:" & e.FullPath) If FileExistsinDropTable(CURRENT_FILENAME) = False Then - ClassHelper.Insert_USER_File(e.FullPath, handleType) + If ClassHelper.Insert_USER_File(e.FullPath, handleType) = False Then + Exit Sub + End If Else Console.WriteLine("File existiert bereits") End If diff --git a/app/DD-Record-Organizer/Classes/ClassHelper.vb b/app/DD-Record-Organizer/Classes/ClassHelper.vb index 5ccf304..b3b4931 100644 --- a/app/DD-Record-Organizer/Classes/ClassHelper.vb +++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb @@ -446,13 +446,42 @@ Public Class ClassHelper Return False End Try End Function - Public Shared Function Insert_USER_File(filename As String, handleType As String) + Public Shared Function Insert_USER_File(pFilename As String, handleType As String) Try - Dim filename_only As String = Path.GetFileName(filename) - Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, USER_USERNAME, handleType, filename_only) + Dim filename_only As String = Path.GetFileName(pFilename) + CURRENT_FILE_HASH = "" + + If File.Exists(pFilename) Then + If (pFilename.ToUpper.EndsWith(".MSG") Or pFilename.ToUpper.EndsWith(".EML")) And (handleType = "|OUTLOOK_MESSAGE|" Or handleType = "|MSGONLY|") Then + CURRENT_FILE_HASH = FILESYSTEM.GetChecksumFromString(pFilename) + Else + CURRENT_FILE_HASH = FILESYSTEM.GetChecksum(pFilename) + End If + End If + Dim oSQL = $"SELECT ADDED_WHO, FORMAT(ADDED_WHEN, 'dd-MM-yyyy HH:mm') AS ADDED_WHEN_STRING FROM TBPMO_DOCRESULT_LIST WHERE FILE_HASH = '{CURRENT_FILE_HASH}' ORDER BY ADDED_WHEN DESC" + LOGGER.Debug($"Inserting File - hash is [{CURRENT_FILE_HASH}]") + Dim oDTCHECK As DataTable = MYDB_ECM.GetDatatable(oSQL) + If Not IsNothing(oDTCHECK) Then + If oDTCHECK.Rows.Count >= 1 Then + LOGGER.Info($"We got a file with the same hash [{CURRENT_FILE_HASH}]") + Dim oUSER = oDTCHECK.Rows(0).Item(0) + Dim oADDED_WHEN = oDTCHECK.Rows(0).Item(1) + Dim oMSG = $"Achtung:" & vbNewLine & "Die Datei wurde bereits nach orgFLOW importiert. Anzahl: " & oDTCHECK.Rows.Count.ToString & vbNewLine & + $"Importiert wann: {oADDED_WHEN}" & vbNewLine & + $"Importiert wer: {oUSER}" & vbNewLine & + "Wollen Sie die Datei dennoch importieren?" + Dim result As MsgBoxResult + result = MessageBox.Show(oMSG, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.No Then + Return False + End If + End If + End If + + Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", pFilename, USER_USERNAME, handleType, filename_only) Return MYDB_ECM.ExecuteNonQuery(ins) Catch ex As Exception - MsgBox("Unexpected Error in Insert Scan-File: " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error in Insert file for user (TBPMO_FILES_USER): " & ex.Message, MsgBoxStyle.Critical) Return False End Try End Function diff --git a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb index 1a949cb..7ad29c0 100644 --- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb @@ -103,8 +103,10 @@ Public Class ClassImport_Windream End Function Public Shared Function Name_Generieren(DocTypeID As Integer) - + Dim myLogger As New DigitalData.Modules.Logging.Logger Try + + myLogger = LOGCONFIG.GetLogger() Dim FILE_DELIMITER, VERSION_DELIMITER, _WDOBJECTTYPE, _NewFileString As String Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES where NAME = 'Global-Indexer'" Dim DT1 As DataTable = MYDB_ECM.GetDatatable(sql) @@ -124,6 +126,7 @@ Public Class ClassImport_Windream oWMTARGET_FOLDER = oDT.Rows(0).Item("ZIEL_PFAD") sql = $"SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}" + myLogger.Debug(sql) Dim oDTFW_DOCTYPES As DataTable = MYDB_ECM.GetDatatable(sql) Dim oDYNAMIC_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER") Dim oNAME_CONVENTION = oDTFW_DOCTYPES.Rows(0).Item("NAME_CONVENTION") @@ -144,8 +147,8 @@ Public Class ClassImport_Windream If oDYNAMIC_FOLDER <> String.Empty Then If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then - LOGGER.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER) - LOGGER.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER) + myLogger.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER) + myLogger.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER) If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then If CURRENT_VARIABLE_FOLDER.StartsWith("\") Then @@ -165,8 +168,8 @@ Public Class ClassImport_Windream End If End If - LOGGER.Debug("oWMTARGET_FOLDER: " & oWMTARGET_FOLDER) - LOGGER.Debug("CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER) + myLogger.Debug("oWMTARGET_FOLDER: " & oWMTARGET_FOLDER) + myLogger.Debug("CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER) 'Untsserordner ja oder nein @@ -174,7 +177,7 @@ Public Class ClassImport_Windream oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER End If If oWMTARGET_FOLDER.Contains("/") Then - LOGGER.Info(String.Format("Targetpath contains /-sign. / will be replaced with _")) + myLogger.Info(String.Format("Targetpath contains /-sign. / will be replaced with _")) oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("/", "_") End If @@ -183,17 +186,17 @@ Public Class ClassImport_Windream If WMMOD.TestFolderExists(oWMTARGET_FOLDER) = False Then oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("W:", "\\windream\objects") oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0) - LOGGER.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2))) + myLogger.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2))) If WMMOD.NewFolder(oWMTARGET_FOLDER) = False Then - LOGGER.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", oWMTARGET_FOLDER, oWMTARGET_FOLDER.Substring(2))) + myLogger.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", oWMTARGET_FOLDER, oWMTARGET_FOLDER.Substring(2))) Return False End If End If Catch ex As Exception If Not ex.Message.Contains("Filename exists!") Then - LOGGER.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER)) + myLogger.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER)) Return False End If End Try @@ -202,15 +205,15 @@ Public Class ClassImport_Windream Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" 'Namenkonvention laden If IsDBNull(oNAME_CONVENTION) Then - LOGGER.Warn("Achtung: Namenskonvention is DBNull") + myLogger.Warn("Achtung: Namenskonvention is DBNull") oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) ElseIf oNAME_CONVENTION = String.Empty Then - LOGGER.Warn("Achtung: Namenskonvention is String empty") + myLogger.Warn("Achtung: Namenskonvention is String empty") oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) End If 'schonmal den gesamten Pfad laden Dim oNewWM_Filename As String = oWMTARGET_FOLDER & "\" & oNAME_CONVENTION - LOGGER.Debug("oNewWM_Filename: " & oNewWM_Filename) + myLogger.Debug("oNewWM_Filename: " & oNewWM_Filename) ' einen Regulären Ausdruck laden Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg) @@ -220,7 +223,7 @@ Public Class ClassImport_Windream ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente - LOGGER.Debug("element in RegeX: " & element.Value) + myLogger.Debug("element in RegeX: " & element.Value) Dim oSubstring = element.Value.Substring(2, 1).ToUpper '%CTRL Dim oSubstr = element.Value.Substring(2, 4) @@ -247,7 +250,7 @@ Public Class ClassImport_Windream If IsNumeric(INDEX_ID) Then Dim sql_AUTOindexresult = MYDB_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID) If IsNothing(sql_AUTOindexresult) Then - LOGGER.Debug("unexpected: sql_AUTOindexresult is nothing!!") + myLogger.Debug("unexpected: sql_AUTOindexresult is nothing!!") oPatternvalue = "" Else If IsDBNull(sql_AUTOindexresult) Then @@ -256,8 +259,8 @@ Public Class ClassImport_Windream sql_AUTOindexresult = sql_AUTOindexresult.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID) Dim AUTOindexresult = MYDB_ECM.GetScalarValue(sql_AUTOindexresult) If IsNothing(AUTOindexresult) Then - LOGGER.Warn("ATTENTION: unexpected: AUTOindexresult is nothing!!") - LOGGER.Warn("" & sql_AUTOindexresult) + myLogger.Warn("ATTENTION: unexpected: AUTOindexresult is nothing!!") + myLogger.Warn("" & sql_AUTOindexresult) oPatternvalue = "" Else If IsDBNull(AUTOindexresult) Then @@ -270,16 +273,16 @@ Public Class ClassImport_Windream End If End If Else - LOGGER.Warn("INDEX_ID is not numeric: " & INDEX_ID.ToString & "- APattern: " & APattern) + myLogger.Warn("INDEX_ID is not numeric: " & INDEX_ID.ToString & "- APattern: " & APattern) oPatternvalue = "" End If Else - LOGGER.Warn("split.Length <> 2 - APattern: " & APattern) + myLogger.Warn("split.Length <> 2 - APattern: " & APattern) oPatternvalue = "" End If ElseIf APattern.Contains("#") Then - LOGGER.Debug("element [" & APattern & "] filled with Record-Data...: ") + myLogger.Debug("element [" & APattern & "] filled with Record-Data...: ") Dim split() As String = APattern.Split("#") If split.Length = 2 Then @@ -294,7 +297,7 @@ Public Class ClassImport_Windream If oPatternvalue <> String.Empty Then oNewWM_Filename = oNewWM_Filename.Replace(element.Value, oPatternvalue) _NewFileString = oNewWM_Filename - LOGGER.Debug("Actual NEWFILESTRING: " & _NewFileString) + myLogger.Debug("Actual NEWFILESTRING: " & _NewFileString) ' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString AnzahlIndexe += 1 ' sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'" @@ -357,7 +360,7 @@ Public Class ClassImport_Windream Case Else If element.Value.Substring(2, 4).ToUpper = "CTRL" Then Dim APattern = element.Value.Substring(3, element.Value.Length - 4) - LOGGER.Debug("element [" & element.Value & "] with Control-Data...: ") + myLogger.Debug("element [" & element.Value & "] with Control-Data...: ") Dim split() As String = APattern.Split("#") If split.Length = 2 Then Dim CONTROL_ID = split(1) @@ -370,7 +373,7 @@ Public Class ClassImport_Windream If USER_LANGUAGE <> "de-DE" Then msg = "In nameconvention an element was defined which could not be replaced." & vbNewLine & "Elementname: " & element.Value.ToUpper End If - LOGGER.Warn(msg) + myLogger.Warn(msg) MsgBox(msg, MsgBoxStyle.Exclamation, "Error in Name Convention:") End If @@ -383,13 +386,13 @@ Public Class ClassImport_Windream 'ungültige Zeichen entfernen oNewWM_Filename = ClassHelper.CleanFilename(oNewWM_Filename, "") If oNewWM_Filename.Contains("/") Then - LOGGER.Info(String.Format("DATEINAME contains /-sign. / will be replaced with _")) + myLogger.Info(String.Format("DATEINAME contains /-sign. / will be replaced with _")) oNewWM_Filename = oNewWM_Filename.Replace("/", "_") End If oNewWM_Filename = oNewWM_Filename.Replace("\\", "\") Catch ex As Exception - LOGGER.Warn(" - Error in Versioning file - Error: " & vbNewLine & ex.Message) + myLogger.Warn(" - Error in Versioning file - Error: " & vbNewLine & ex.Message) MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Versioning file:") err = True End Try @@ -410,7 +413,7 @@ Public Class ClassImport_Windream End If Catch ex As Exception - LOGGER.Warn(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message) + myLogger.Warn(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message) MsgBox(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False End Try diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index c65a8f5..4bfd22a 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports DigitalData.Modules.Base Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging @@ -221,13 +222,13 @@ Public Class ClassInit oSql = "SELECT * FROM TBPMO_CONTROL" CURRENT_TBPMO_CONTROL = MYDB_ECM.GetDatatable(oSql) - oSql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1") + oSql = "SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1" DT_DOCSEARCH_RESULTLIST_CONFIG = MYDB_ECM.GetDatatable(oSql) - oSql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS") + oSql = "SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS" CURRENT_VARIABLE_CONTROLS = MYDB_ECM.GetDatatable(oSql) - oSql = String.Format("SELECT * FROM TBPMO_FORM_VIEW") + oSql = "SELECT * FROM TBPMO_FORM_VIEW" CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(oSql) - oSql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID") + oSql = "select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID" CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(oSql) 'clsCURRENT.LOG_ERRORS_ONLY = DEBUG @@ -245,6 +246,8 @@ Public Class ClassInit End If MYGDPICTURE_LICENSE_KEY = MYDB_ECM.GetGDPictureString() + FILESYSTEM = New FilesystemEx(LOGCONFIG) + Catch ex As Exception LOGGER.Error(ex) diff --git a/app/DD-Record-Organizer/Classes/ClassWDRights.vb b/app/DD-Record-Organizer/Classes/ClassWDRights.vb index 38b2cad..ab39eb2 100644 --- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb +++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb @@ -86,9 +86,9 @@ Public Class ClassWDRights If Not IsNothing(oSession) Then LOGGER.Debug("Session created.") - Dim oSql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0},{1}) where USER_OR_GROUP = 'USER'", doc_id, CURRENT_ENTITY_ID) + Dim oSql = String.Format("SELECT * FROM [dbo].[FNOF_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'USER'", doc_id) DT_USER_RIGHT = MYDB_ECM.GetDatatable(oSql) - oSql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0},{1}) where USER_OR_GROUP = 'GROUP'", doc_id, CURRENT_ENTITY_ID) + oSql = String.Format("SELECT * FROM [dbo].[FNOF_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'GROUP'", doc_id) DT_GROUP_RIGHT = MYDB_ECM.GetDatatable(oSql) If IsNothing(DT_USER_RIGHT) Then Dim msg = "Error while receiving rights for DocID" diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 7e4a069..80c3568 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -1,4 +1,5 @@ -Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Module ModuleRuntimeVariables @@ -61,6 +62,7 @@ Module ModuleRuntimeVariables Public CURRENT_CONSTRUCTOR_DETAIL_ID As Integer Public CURRENT_FILEID As Integer Public CURRENT_FILENAME As String + Public CURRENT_FILE_HASH As String = "" Public CURRENT_OFFICE_FILE_CHANGED As Boolean = False Public CURRENT_NEWFILENAME As String Public CURRENT_CONTROL_DOCTYPE_MATCH As String = "" @@ -201,7 +203,7 @@ Module ModuleRuntimeVariables Public SQL_OF_NODE_SEARCH As String = "" Public CONF_SUPPORTPORTAL As String = "https://www.digitaldata.works/Support'" - + Public Property FILESYSTEM As FilesystemEx Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable Public Property MYDB_ECM As MSSQLServer diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 817fda0..397d614 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 5d3da54..db56bdd 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -4620,7 +4620,9 @@ Public Class frmConstructor_Main MsgBox("File contains invalid operator '!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation) Continue For End If - ClassHelper.Insert_USER_File(CURRENT_WORKFILE, DropType) + If ClassHelper.Insert_USER_File(CURRENT_WORKFILE, DropType) = False Then + Exit Sub + End If End If End If Next @@ -6566,10 +6568,9 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") My.Computer.FileSystem.RenameFile(OldName, NewName) LOGGER.Info($"Renaming FileSystem done!") Cursor = Cursors.WaitCursor - Dim oEXEC As String = $"EXEC PRPMO_DOC_CREATE_NEW_DOC {ClassDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}'" + Dim oEXEC As String = $"EXEC PROF_DOC_CREATE_UPDATE {ClassDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}',''" If MYDB_ECM.ExecuteNonQuery(oEXEC) Then - LOGGER.Info($"Exec PRPMO_DOC_CREATE_NEW_DOC done!") - + LOGGER.Info($"Exec PROF_DOC_CREATE_UPDATE done - rename abgeschlossen") End If Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle diff --git a/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb b/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb index 21af8c8..621e404 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb @@ -32,12 +32,11 @@ Partial Class frmDocRecordLink Me.btnloadData2Entity = New System.Windows.Forms.Button() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmLinkRecords = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmsaveLayout = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmresetlayout = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -111,7 +110,7 @@ Partial Class frmDocRecordLink 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.bbtnitmLinkRecords, Me.bbtnitmsaveLayout, Me.bbtnitmresetlayout}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" @@ -128,49 +127,51 @@ Partial Class frmDocRecordLink Me.bsiInfo.Id = 1 Me.bsiInfo.Name = "bsiInfo" ' - 'BarButtonItem1 + 'bbtnitmLinkRecords ' - Me.BarButtonItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 2 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.bbtnitmLinkRecords.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left + resources.ApplyResources(Me.bbtnitmLinkRecords, "bbtnitmLinkRecords") + Me.bbtnitmLinkRecords.Id = 2 + Me.bbtnitmLinkRecords.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmLinkRecords.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem1.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.bbtnitmLinkRecords.ItemAppearance.Normal.Options.UseFont = True + Me.bbtnitmLinkRecords.Name = "bbtnitmLinkRecords" ' - 'BarButtonItem2 + 'bbtnitmsaveLayout ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 3 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem2.Name = "BarButtonItem2" + resources.ApplyResources(Me.bbtnitmsaveLayout, "bbtnitmsaveLayout") + Me.bbtnitmsaveLayout.Id = 3 + Me.bbtnitmsaveLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmsaveLayout.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem2.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.bbtnitmsaveLayout.ItemAppearance.Normal.Options.UseFont = True + Me.bbtnitmsaveLayout.Name = "bbtnitmsaveLayout" ' - 'BarButtonItem3 + 'bbtnitmresetlayout ' - resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3") - Me.BarButtonItem3.Id = 4 - Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem3.Name = "BarButtonItem3" + resources.ApplyResources(Me.bbtnitmresetlayout, "bbtnitmresetlayout") + Me.bbtnitmresetlayout.Id = 4 + Me.bbtnitmresetlayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmresetlayout.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem3.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.bbtnitmresetlayout.ItemAppearance.Normal.Options.UseFont = True + Me.bbtnitmresetlayout.Name = "bbtnitmresetlayout" ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmsaveLayout) + Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmresetlayout) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - ' 'RibbonPageGroup3 ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtnitmLinkRecords) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' @@ -235,11 +236,10 @@ Partial Class frmDocRecordLink Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents bbtnitmLinkRecords As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bbtnitmsaveLayout As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bbtnitmresetlayout As DevExpress.XtraBars.BarButtonItem Friend WithEvents Label2 As Label Friend WithEvents txtcurrSichtData As TextBox End Class diff --git a/app/DD-Record-Organizer/frmDocRecordLink.resx b/app/DD-Record-Organizer/frmDocRecordLink.resx index 6d5ff77..3f56489 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.resx +++ b/app/DD-Record-Organizer/frmDocRecordLink.resx @@ -288,7 +288,7 @@ Waiting for Record-Selection... - + Datei(en) verknüpfen @@ -313,7 +313,10 @@ Lz4NCjwvc3ZnPgs= - + + Tahoma, 8.25pt, style=Bold + + ...speichern @@ -336,7 +339,10 @@ bGxvdyIgLz4NCjwvc3ZnPgs= - + + Tahoma, 8.25pt, style=Bold + + ...zurücksetzen @@ -362,9 +368,18 @@ LjR6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== + + Tahoma, 8.25pt, style=Bold + 0, 0 + + Layout + + + Funktionen + Start @@ -401,12 +416,6 @@ 9 - - Layout - - - Funktionen - RibbonPage2 @@ -1722,22 +1731,22 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem1 + + bbtnitmLinkRecords - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem2 + + bbtnitmsaveLayout - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem3 + + bbtnitmresetlayout - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1752,12 +1761,6 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup2 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageGroup3 diff --git a/app/DD-Record-Organizer/frmDocRecordLink.vb b/app/DD-Record-Organizer/frmDocRecordLink.vb index aeb6b76..d9c06ae 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.vb @@ -271,8 +271,11 @@ Public Class frmDocRecordLink txtcurrSichtData.Text = entity.title Refresh_Grid_Data(False, DT_RESULT) End If + Load_DocGrid_Layout() + Else + bsiInfo.Caption = "Bitte wöhlen Sie eine Sicht aus! " + Now.ToShortTimeString End If - Load_DocGrid_Layout() + Me.Cursor = Cursors.Default End Sub Private Function ReturnDataforEntity(oEntityID As Integer) As DataTable @@ -285,7 +288,7 @@ Public Class frmDocRecordLink Return MYDB_ECM.GetDatatable(ResultSQL) End Function - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmLinkRecords.ItemClick If WMMOD.SessionLoggedin = False Then MsgBox("No session to windream created! Check Your connection!", MsgBoxStyle.Critical) Exit Sub @@ -293,33 +296,25 @@ Public Class frmDocRecordLink Dim selectedRows As Integer() = grvwGrid.GetSelectedRows() Dim oLinkCount As Integer = 0 + LOGGER.Info("Start der Verknüpfung - Es wurden [{0}] Datensätze ausgewählt!", selectedRows.Count) For Each rowhandle As Integer In selectedRows - Dim SELECTED_RECORDID = grvwGrid.GetRowCellValue(rowhandle, "Record-ID") - If IsNothing(SELECTED_RECORDID) Then + Dim oSelectedRecordID = grvwGrid.GetRowCellValue(rowhandle, "Record-ID") + If IsNothing(oSelectedRecordID) Then Continue For End If - LOGGER.Debug(">>> Doc will be linked with Record: " & SELECTED_RECORDID.ToString) Try For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows + CURRENT_DOC_ID = row.Item("DOC_ID") + LOGGER.Info("DocID {0} will be linked with Record {1} ", CURRENT_DOC_ID.ToString, oSelectedRecordID.ToString) Dim DOC_PATH = row.Item("FILEPATH") Dim _objecttype = row.Item("OBJECTTYPE") WMOBJECTTYPE = _objecttype - Dim sql_Exec = String.Format("EXEC PRPMO_CHECK_DOC_RECORD_LINK {0},{1},'{2}','{3}'", SELECTED_RECORDID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME) - 'Dim ins = String.Format("INSERT INTO TBPMO_DOC_RECORD_LINK (RECORD_ID,DOC_ID,COMMENT,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", SELECTED_RECORDID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME) + Dim sql_Exec = String.Format("EXEC PRPMO_CHECK_DOC_RECORD_LINK {0},{1},'{2}','{3}'", oSelectedRecordID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME) If MYDB_ECM.ExecuteNonQuery(sql_Exec) = False Then MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical) Else - 'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - ' Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DOC_REC_LINK {0},{1}", CURRENT_DOC_ID, SELECTED_RECORDID) - ' MYDB_ECM.ExecuteNonQuery(proc) - 'End If - Dim msg = String.Format("Der Datensatz wurde erfolgreich verknüpft!") - If USER_LANGUAGE <> "de-DE" Then - msg = "The record was successfully linked" - End If - bsiInfo.Caption = msg - ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & SELECTED_RECORDID.ToString) + ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & oSelectedRecordID.ToString) oLinkCount += 1 End If Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _objecttype) @@ -327,29 +322,34 @@ Public Class frmDocRecordLink If DT_OBJTYPE.Rows.Count = 1 Then Dim Entity_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_ENTITYID") Dim Record_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_RECORDID") - Dim ENT_ID = MYDB_ECM.GetScalarValue(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", SELECTED_RECORDID)) + Dim ENT_ID = MYDB_ECM.GetScalarValue(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", oSelectedRecordID)) If ENT_ID > 1 And Entity_Index <> String.Empty Then WMMOD.SetFileIndex(DOC_PATH, Entity_Index, ENT_ID, _objecttype) End If If Record_Index <> String.Empty Then - WMMOD.SetFileIndex(DOC_PATH, Record_Index, SELECTED_RECORDID, _objecttype) + WMMOD.SetFileIndex(DOC_PATH, Record_Index, oSelectedRecordID, _objecttype) End If End If Next - bsiInfo.Caption = $"[{oLinkCount}] records successfully linked - {Now.ToShortTimeString}" - Refresh_Grid_Data(True, Nothing) Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Linking Record to file", ex.Message, ex.StackTrace) End Try Next + Dim omsg = $"[{oLinkCount}] Datensätze erfolgreich verknüpft! - {Now.ToShortTimeString}" + If USER_LANGUAGE <> "de-DE" Then + omsg = $"[{oLinkCount}] records successfully linked - {Now.ToShortTimeString}" + End If + MsgBox(omsg, MsgBoxStyle.Information, "orgFLOW") + Refresh_Grid_Data(True, Nothing) + Load_DocGrid_Layout() grvwGrid.ClearSelection() End Sub - Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmsaveLayout.ItemClick Save_DocGrid_Layout() End Sub - Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmresetlayout.ItemClick Reset_View_layout() End Sub Sub Reset_View_layout() diff --git a/app/DD-Record-Organizer/frmFileRename.vb b/app/DD-Record-Organizer/frmFileRename.vb index 4b392d4..949da74 100644 --- a/app/DD-Record-Organizer/frmFileRename.vb +++ b/app/DD-Record-Organizer/frmFileRename.vb @@ -64,7 +64,7 @@ Public Class frmFileRename My.Computer.FileSystem.RenameFile(OldName, NewName) LOGGER.Info($"Renaming FileSystem done!") Cursor = Cursors.WaitCursor - Dim oEXEC As String = $"EXEC PRPMO_DOC_CREATE_NEW_DOC {ClassDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}'" + Dim oEXEC As String = $"EXEC PROF_DOC_CREATE_UPDATE {ClassDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}',''" If MYDB_ECM.ExecuteNonQuery(oEXEC) Then Me.Close() Else diff --git a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb index 071be01..228a4cf 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb @@ -61,6 +61,7 @@ Partial Class frmGlobalSearch Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DD_ECMAdmin1 = New DD_Record_Organizer.DD_ECMAdmin() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.Panel1.SuspendLayout() @@ -186,6 +187,7 @@ Partial Class frmGlobalSearch ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.LabelControl1) Me.Panel1.Controls.Add(Me.lblFT_Irregular) Me.Panel1.Controls.Add(Me.txtSearch) Me.Panel1.Controls.Add(Me.Label2) @@ -360,6 +362,13 @@ Partial Class frmGlobalSearch Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1") ' + 'LabelControl1 + ' + Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) + Me.LabelControl1.Appearance.Options.UseFont = True + resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.Name = "LabelControl1" + ' 'frmGlobalSearch ' resources.ApplyResources(Me, "$this") @@ -434,4 +443,5 @@ Partial Class frmGlobalSearch Friend WithEvents BarToggleSearchRecord As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents BarToggleFulltext As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl End Class diff --git a/app/DD-Record-Organizer/frmGlobalSearch.resx b/app/DD-Record-Organizer/frmGlobalSearch.resx index 91b52c6..937badf 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.resx +++ b/app/DD-Record-Organizer/frmGlobalSearch.resx @@ -328,7 +328,34 @@ Panel1 - 3 + 4 + + + Tahoma, 8.25pt, style=Italic + + + 382, 74 + + + 134, 13 + + + 10 + + + Leerzeichen mit % ersetzen + + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 True @@ -361,7 +388,7 @@ Panel1 - 0 + 1 15, 50 @@ -382,7 +409,7 @@ Panel1 - 1 + 2 True @@ -391,13 +418,13 @@ 15, 31 - 66, 13 + 69, 13 8 - Suchbegriff: + Suchbegriff: Label2 @@ -409,7 +436,7 @@ Panel1 - 2 + 3 Top diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 1ad1d57..03d0fbf 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -459,7 +459,7 @@ Public Class frmNodeNavigation End Function Public Async Sub ShowDialogAsync2() Await Task.Run(Sub() - MsgBox("Der Parent-Node wurde erfolgreich getauscht. Aktualisieren Sie die Ansicht!", MsgBoxStyle.Information) + MsgBox("Der Parent-Node wurde erfolgreich getauscht. Aktualisieren Sie nun die Ansicht!", MsgBoxStyle.Information) End Sub) End Sub @@ -2153,7 +2153,9 @@ Public Class frmNodeNavigation MsgBox("File contains invalid operator '!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation) Continue For End If - ClassHelper.Insert_USER_File(CURRENT_WORKFILE, DropType) + If ClassHelper.Insert_USER_File(CURRENT_WORKFILE, DropType) = False Then + Exit Sub + End If End If End If Next @@ -3333,13 +3335,17 @@ Public Class frmNodeNavigation End If End Sub - Private Sub KnotenLöschenadminToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KnotenLöschenadminToolStripMenuItem.Click + Private Async Sub KnotenLöschenadminToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KnotenLöschenadminToolStripMenuItem.Click If CURRENT_NODEID <> 0 Then Dim result As DialogResult = MessageBox.Show("Wollen Sie fortfahren? Der Knoten wird in Folge mit den Unterknoten als gelöscht markiert!", "Bestätigung erforderlich", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = System.Windows.Forms.DialogResult.Yes Then Dim oSQL = $"EXEC [dbo].[PRPMO_DELETE_NODE] {CURRENT_NODEID}, '{USER_USERNAME}', 1, 0" If MYDB_ECM.ExecuteNonQuery(oSQL) = True Then - MsgBox("Knoten wurde erfolgreich gelöscht. Aktualisieren Sie die Ansicht!", MsgBoxStyle.Information) + result = MessageBox.Show("Wollen Sie die Ansicht aktualisieren?", "Knoten wurde erfolgreich gelöscht!", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = System.Windows.Forms.DialogResult.Yes Then + Await ReloadTreeView() + End If + End If End If End If @@ -3356,4 +3362,8 @@ Public Class frmNodeNavigation End If End If End Sub + + Private Sub frmNodeNavigation_DragDrop(sender As Object, e As DragEventArgs) Handles Me.DragDrop + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb index ab734bd..6e464f7 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -33,7 +33,7 @@ Public Class frmWM_IndexFile End Class Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean) - Dim swWORK_FILE As New SW("WORK_FILE: " & DOCTYPE_IDTextBox.Text) + 'Dim swWORK_FILE As New SW("WORK_FILE: " & DOCTYPE_IDTextBox.Text) Try CURRENT_DOC_ID = Nothing Dim odeleteRights As Boolean = True @@ -47,7 +47,7 @@ Public Class frmWM_IndexFile '################################################################# Dim sw As New SW("GetUse Nameconvention ID: " & DOCTYPE_IDTextBox.Text) If ClassImport_Windream.Name_Generieren(DOCTYPE_IDTextBox.Text) = False Then - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End If sw.Done() @@ -63,7 +63,7 @@ Public Class frmWM_IndexFile result = MessageBox.Show(msg, "File already exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then If WMMOD.RemoveFile(CURRENT_NEWFILENAME) Then - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End If Else @@ -111,15 +111,12 @@ Public Class frmWM_IndexFile sql = "SELECT * FROM VWCUST_DOCTYPE_CONFIG WHERE DOCTYPE_ID = " & vDokart_ID Dim DTVWCUST_DOCTYPE_CONFIG As DataTable = MYDB_ECM.GetDatatable(sql) If Not IsNothing(DTVWCUST_DOCTYPE_CONFIG) Then - For Each oRow As DataRow In DTVWCUST_DOCTYPE_CONFIG.Rows - If oRow.Item(0) = "DELETE_RIGHTS" Then - odeleteRights = CBool(oRow.Item(1)) - End If - Next + If DTVWCUST_DOCTYPE_CONFIG.Rows.Count = 1 Then + odeleteRights = CBool(DTVWCUST_DOCTYPE_CONFIG.Rows(0).Item("DELETE_RIGHTS")) + End If End If Catch ex As Exception LOGGER.Warn($"Unexpected error in VWCUST_DOCTYPE_CONFIG Area: {ex.Message}") - End Try Dim indexierung_erfolgreich As Boolean = True @@ -129,7 +126,7 @@ Public Class frmWM_IndexFile err = True ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing Doctype '" & WMINDEX_DOCTYPE & "') - Check logfile!") sw.Done() - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End If @@ -138,7 +135,7 @@ Public Class frmWM_IndexFile err = True ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing AddiRelation '" & WMINDEX_RELATION & "') - Check logfile!") sw.Done() - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End If @@ -213,7 +210,7 @@ Public Class frmWM_IndexFile Next If err = True Then - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End If @@ -222,7 +219,7 @@ Public Class frmWM_IndexFile 'Return False End If Else - swWORK_FILE.Done() + 'swWORK_FILE.Done() MsgBox("Attention in Work-File:" & vbNewLine & "No indices were defined (0)!", MsgBoxStyle.Critical) Return False @@ -324,18 +321,18 @@ Public Class frmWM_IndexFile End If Else MsgBox("An unexpected error occured while indexing file. Please check the log!", MsgBoxStyle.Exclamation) - swWORK_FILE.Done() + ' swWORK_FILE.Done() Return False End If - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return True Else - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End If Catch ex As Exception MsgBox("Unexpected error in Work-File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - swWORK_FILE.Done() + 'swWORK_FILE.Done() Return False End Try