diff --git a/app/DD-Record-Organizer/ClassHelper.vb b/app/DD-Record-Organizer/ClassHelper.vb index 44a6e73..787b562 100644 --- a/app/DD-Record-Organizer/ClassHelper.vb +++ b/app/DD-Record-Organizer/ClassHelper.vb @@ -244,18 +244,20 @@ Public Class ClassHelper Dim oFileExists = clsDatabase.Execute_Scalar(osql, False) If oFileExists = 0 Then CURRENT_OFFICE_FILE_CHANGED = True - ClassLogger.Add("The docId of handled file changed during editing mode!- OldDocID: " & DocID, False) - osql = $"SELECT dwDocID FROM windream60.dbo.BaseAttributes WHERE dwVersionID = {DocID}" + ClassLogger.Add($"The docId {DocID} of handled file changed during editing mode!", False) + osql = $"SELECT MAX(dwDocID) FROM windream60.dbo.BaseAttributes WHERE dwVersionID = {DocID}" Dim oNEW_DOC As DataTable = clsDatabase.Return_Datatable(osql, False) If oNEW_DOC.Rows.Count = 1 Then Dim oNEWDocID = oNEW_DOC.Rows(0).Item(0) - ClassLogger.Add($"New DocID is {oNEWDocID}!!", False) + ClassLogger.Add($"New DocID is: {oNEWDocID}!!", False) osql = $"EXEC PRPMO_DOC_CHANGE_DOCID {DocID},{oNEWDocID},'{USER_USERNAME}'" If LogErrorsOnly = False Then ClassLogger.Add(osql, False) If clsDatabase.Execute_non_Query(osql, False) = False Then - ClassLogger.Add($"Could not relink the DocID!!", False) - End If + ClassLogger.Add($"Could not relink the DocID!!", False) End If + Else + ClassLogger.Add($"Could not get the new DOCID [{osql}]!!", False) + End If End If End If diff --git a/app/DD-Record-Organizer/ClassImport_Windream.vb b/app/DD-Record-Organizer/ClassImport_Windream.vb index aaf46f9..a88d7ff 100644 --- a/app/DD-Record-Organizer/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/ClassImport_Windream.vb @@ -143,10 +143,16 @@ Public Class ClassImport_Windream If Not IsDBNull(oDYNAMIC_FOLDER) Then If oDYNAMIC_FOLDER <> String.Empty Then If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then - 'If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then - ' oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER - 'Else - oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER + If LogErrorsOnly = False Then + ClassLogger.Add(" >> After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER, False) + ClassLogger.Add(" >> After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER, False) + End If + If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then + oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER.Replace(oWMTARGET_FOLDER, "") + Else + oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER + End If + 'End If Else @@ -155,8 +161,12 @@ Public Class ClassImport_Windream End If End If End If + If LogErrorsOnly = False Then + ClassLogger.Add(" >> oWMTARGET_FOLDER: " & oWMTARGET_FOLDER, False) + ClassLogger.Add(" >> CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER, False) + End If - 'Unterordner ja oder nein + 'Untsserordner ja oder nein If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER End If diff --git a/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb index 490d599..a49e9c8 100644 --- a/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb @@ -430,6 +430,7 @@ Partial Class frmConstructorDesigner ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter @@ -1460,6 +1461,7 @@ Partial Class frmConstructorDesigner ' Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager1.TBDD_GROUPSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing diff --git a/app/DD-Record-Organizer/frmConstructorDesigner.resx b/app/DD-Record-Organizer/frmConstructorDesigner.resx index 239d8ff..aa00673 100644 --- a/app/DD-Record-Organizer/frmConstructorDesigner.resx +++ b/app/DD-Record-Organizer/frmConstructorDesigner.resx @@ -1099,7 +1099,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAUQBDQFEAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAUwBDQFMAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -2184,7 +2184,7 @@ 13 - 1090, 277 + 1086, 274 Quick-View Konfiguration @@ -3014,7 +3014,7 @@ 4 - 1090, 277 + 1086, 274 Datei-Suche/Rechte (Supervisor) @@ -3575,7 +3575,7 @@ 0, 0 - 1090, 277 + 1086, 274 0 @@ -3593,7 +3593,7 @@ 0 - 1090, 277 + 1086, 274 Einschränkungen Datensätze User @@ -3786,7 +3786,7 @@ Mandanten hinzu 5 - 1090, 277 + 1086, 274 Zuordnung Entität-Client diff --git a/app/DD-Record-Organizer/frmUserKonfig.resx b/app/DD-Record-Organizer/frmUserKonfig.resx index ffed02c..b833ce2 100644 --- a/app/DD-Record-Organizer/frmUserKonfig.resx +++ b/app/DD-Record-Organizer/frmUserKonfig.resx @@ -1776,7 +1776,7 @@ 140, 40 - 236, 173 + 236, 160 3 @@ -1800,7 +1800,7 @@ 3, 3, 3, 3 - 1128, 296 + 1124, 293 0 @@ -2137,7 +2137,7 @@ matchen 3, 3, 3, 3 - 1124, 293 + 1128, 296 1 @@ -2164,7 +2164,7 @@ matchen 0, 0 - 1136, 322 + 1132, 319 6 @@ -2182,7 +2182,7 @@ matchen 0 - 1136, 322 + 1132, 319 User-/Gruppenzuordnung @@ -2577,7 +2577,7 @@ matchen 0, 0 - 1136, 25 + 1132, 25 1 @@ -2598,7 +2598,7 @@ matchen 15 - 1136, 322 + 1132, 319 Gruppendefinition @@ -3426,7 +3426,7 @@ Mandant hinzufügen 0, 0 - 1136, 322 + 1132, 319 38 @@ -3444,7 +3444,7 @@ Mandant hinzufügen 0 - 1136, 322 + 1132, 319 Mandantenzuordnung/-definition @@ -3693,7 +3693,7 @@ Mandant hinzufügen 5 - 1136, 322 + 1132, 319 Update Konfiguration User