AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Div

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber 2019-01-23 18:00:12 +01:00
parent 9b2da41c72
commit 0a4720c931
5 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/DD-Record-Organizer/ClassHelper.vb
View File

@ -244,18 +244,20 @@ Public Class ClassHelper
Dim oFileExists = clsDatabase.Execute_Scalar(osql, False) Dim oFileExists = clsDatabase.Execute_Scalar(osql, False)
If oFileExists = 0 Then If oFileExists = 0 Then
CURRENT_OFFICE_FILE_CHANGED = True CURRENT_OFFICE_FILE_CHANGED = True
ClassLogger.Add("The docId of handled file changed during editing mode!- OldDocID: " & DocID, False) ClassLogger.Add($"The docId {DocID} of handled file changed during editing mode!", False)
osql = $"SELECT dwDocID FROM windream60.dbo.BaseAttributes WHERE dwVersionID = {DocID}" osql = $"SELECT MAX(dwDocID) FROM windream60.dbo.BaseAttributes WHERE dwVersionID = {DocID}"
Dim oNEW_DOC As DataTable = clsDatabase.Return_Datatable(osql, False) Dim oNEW_DOC As DataTable = clsDatabase.Return_Datatable(osql, False)
If oNEW_DOC.Rows.Count = 1 Then If oNEW_DOC.Rows.Count = 1 Then
Dim oNEWDocID = oNEW_DOC.Rows(0).Item(0) 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}'" osql = $"EXEC PRPMO_DOC_CHANGE_DOCID {DocID},{oNEWDocID},'{USER_USERNAME}'"
If LogErrorsOnly = False Then ClassLogger.Add(osql, False) If LogErrorsOnly = False Then ClassLogger.Add(osql, False)
If clsDatabase.Execute_non_Query(osql, False) = False Then If clsDatabase.Execute_non_Query(osql, False) = False Then
ClassLogger.Add($"Could not relink the DocID!!", False) ClassLogger.Add($"Could not relink the DocID!!", False)
End If
End If End If
Else
ClassLogger.Add($"Could not get the new DOCID [{osql}]!!", False)
End If
End If End If
End If End If

20
app/DD-Record-Organizer/ClassImport_Windream.vb
View File

@ -143,10 +143,16 @@ Public Class ClassImport_Windream
If Not IsDBNull(oDYNAMIC_FOLDER) Then If Not IsDBNull(oDYNAMIC_FOLDER) Then
If oDYNAMIC_FOLDER <> String.Empty Then If oDYNAMIC_FOLDER <> String.Empty Then
If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
'If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then If LogErrorsOnly = False Then
' oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER ClassLogger.Add(" >> After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER, False)
'Else ClassLogger.Add(" >> After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER, False)
oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER 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 'End If
Else Else
@ -155,8 +161,12 @@ Public Class ClassImport_Windream
End If End If
End If 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 If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then
oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER
End If End If

2
app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb generated
View File

@ -430,6 +430,7 @@ Partial Class frmConstructorDesigner
' '
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Nothing
Me.TableAdapterManager.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing
Me.TableAdapterManager.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing
Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter
@ -1460,6 +1461,7 @@ Partial Class frmConstructorDesigner
' '
Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False
Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Nothing
Me.TableAdapterManager1.TBDD_GROUPSTableAdapter = Nothing
Me.TableAdapterManager1.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing
Me.TableAdapterManager1.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing
Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing

12
app/DD-Record-Organizer/frmConstructorDesigner.resx
View File

@ -1099,7 +1099,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
CQAAAk1TRnQBSQFMAgEBAgEAAUQBDQFEAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CQAAAk1TRnQBSQFMAgEBAgEAAUwBDQFMAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -2184,7 +2184,7 @@
<value>13</value> <value>13</value>
</data> </data>
<data name="XtraTabPage5.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage5.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 277</value> <value>1086, 274</value>
</data> </data>
<data name="XtraTabPage5.Text" xml:space="preserve"> <data name="XtraTabPage5.Text" xml:space="preserve">
<value>Quick-View Konfiguration</value> <value>Quick-View Konfiguration</value>
@ -3014,7 +3014,7 @@
<value>4</value> <value>4</value>
</data> </data>
<data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 277</value> <value>1086, 274</value>
</data> </data>
<data name="XtraTabPage4.Text" xml:space="preserve"> <data name="XtraTabPage4.Text" xml:space="preserve">
<value>Datei-Suche/Rechte (Supervisor)</value> <value>Datei-Suche/Rechte (Supervisor)</value>
@ -3575,7 +3575,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 277</value> <value>1086, 274</value>
</data> </data>
<data name="TabControl1.TabIndex" type="System.Int32, mscorlib"> <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -3593,7 +3593,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 277</value> <value>1086, 274</value>
</data> </data>
<data name="XtraTabPage2.Text" xml:space="preserve"> <data name="XtraTabPage2.Text" xml:space="preserve">
<value>Einschränkungen Datensätze User</value> <value>Einschränkungen Datensätze User</value>
@ -3786,7 +3786,7 @@ Mandanten hinzu</value>
<value>5</value> <value>5</value>
</data> </data>
<data name="XtraTabPage6.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage6.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 277</value> <value>1086, 274</value>
</data> </data>
<data name="XtraTabPage6.Text" xml:space="preserve"> <data name="XtraTabPage6.Text" xml:space="preserve">
<value>Zuordnung Entität-Client</value> <value>Zuordnung Entität-Client</value>

20
app/DD-Record-Organizer/frmUserKonfig.resx
View File

@ -1776,7 +1776,7 @@
<value>140, 40</value> <value>140, 40</value>
</data> </data>
<data name="lbGroups.Size" type="System.Drawing.Size, System.Drawing"> <data name="lbGroups.Size" type="System.Drawing.Size, System.Drawing">
<value>236, 173</value> <value>236, 160</value>
</data> </data>
<data name="lbGroups.TabIndex" type="System.Int32, mscorlib"> <data name="lbGroups.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
@ -1800,7 +1800,7 @@
<value>3, 3, 3, 3</value> <value>3, 3, 3, 3</value>
</data> </data>
<data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>1128, 296</value> <value>1124, 293</value>
</data> </data>
<data name="TabPage1.TabIndex" type="System.Int32, mscorlib"> <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -2137,7 +2137,7 @@ matchen</value>
<value>3, 3, 3, 3</value> <value>3, 3, 3, 3</value>
</data> </data>
<data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>1124, 293</value> <value>1128, 296</value>
</data> </data>
<data name="TabPage2.TabIndex" type="System.Int32, mscorlib"> <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -2164,7 +2164,7 @@ matchen</value>
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 322</value> <value>1132, 319</value>
</data> </data>
<data name="TabControl1.TabIndex" type="System.Int32, mscorlib"> <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
<value>6</value> <value>6</value>
@ -2182,7 +2182,7 @@ matchen</value>
<value>0</value> <value>0</value>
</data> </data>
<data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 322</value> <value>1132, 319</value>
</data> </data>
<data name="XtraTabPage1.Text" xml:space="preserve"> <data name="XtraTabPage1.Text" xml:space="preserve">
<value>User-/Gruppenzuordnung</value> <value>User-/Gruppenzuordnung</value>
@ -2577,7 +2577,7 @@ matchen</value>
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="BindingNavigator1.Size" type="System.Drawing.Size, System.Drawing"> <data name="BindingNavigator1.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 25</value> <value>1132, 25</value>
</data> </data>
<data name="BindingNavigator1.TabIndex" type="System.Int32, mscorlib"> <data name="BindingNavigator1.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -2598,7 +2598,7 @@ matchen</value>
<value>15</value> <value>15</value>
</data> </data>
<data name="TabGruppendefinition.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabGruppendefinition.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 322</value> <value>1132, 319</value>
</data> </data>
<data name="TabGruppendefinition.Text" xml:space="preserve"> <data name="TabGruppendefinition.Text" xml:space="preserve">
<value>Gruppendefinition</value> <value>Gruppendefinition</value>
@ -3426,7 +3426,7 @@ Mandant hinzufügen</value>
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="TabControl3.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabControl3.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 322</value> <value>1132, 319</value>
</data> </data>
<data name="TabControl3.TabIndex" type="System.Int32, mscorlib"> <data name="TabControl3.TabIndex" type="System.Int32, mscorlib">
<value>38</value> <value>38</value>
@ -3444,7 +3444,7 @@ Mandant hinzufügen</value>
<value>0</value> <value>0</value>
</data> </data>
<data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 322</value> <value>1132, 319</value>
</data> </data>
<data name="XtraTabPage2.Text" xml:space="preserve"> <data name="XtraTabPage2.Text" xml:space="preserve">
<value>Mandantenzuordnung/-definition</value> <value>Mandantenzuordnung/-definition</value>
@ -3693,7 +3693,7 @@ Mandant hinzufügen</value>
<value>5</value> <value>5</value>
</data> </data>
<data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>1136, 322</value> <value>1132, 319</value>
</data> </data>
<data name="XtraTabPage3.Text" xml:space="preserve"> <data name="XtraTabPage3.Text" xml:space="preserve">
<value>Update Konfiguration User</value> <value>Update Konfiguration User</value>