diff --git a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb index a557d6c..d5e69cf 100644 --- a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb @@ -136,14 +136,19 @@ Public Class ClassDocGrid For Each oRowHandle In oSelectedRows Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID") - Dim oSQL = $"Select dwParentID FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}" - Dim odwParentID = MYDB_ECM.GetScalarValue(oSQL) - Dim oDisplayName = pGridView.GetRowCellValue(oRowHandle, "Displayname") + Dim oSQL = $"Select * FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}" + Dim oDTRow As DataTable = MYDB_ECM.GetDatatable(oSQL) + + Dim odwParentID = oDTRow.Rows(0).Item("dwParentID") + Dim oDisplayName = oDTRow.Rows(0).Item("Display_name") Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH") - Dim oObjecttype = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE") - Dim oFilename = pGridView.GetRowCellValue(oRowHandle, "Dateiname") - Dim oInWork = pGridView.GetRowCellValue(oRowHandle, "in work?") - Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "in work User") + If IsNothing(oDocPath) Then + oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULL_FILENAME") + End If + Dim oObjecttype = oDTRow.Rows(0).Item("Objecttype") + Dim oFilename = oDTRow.Rows(0).Item("Filename") + Dim oInWork = pGridView.GetRowCellValue(oRowHandle, "IN_WORK") + Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "IN_WORK_USER") oDocuments.Add(New clsWMDoc With { .DocId = oDocId, .ParentID = odwParentID, diff --git a/app/DD-Record-Organizer/Classes/ClassHelper.vb b/app/DD-Record-Organizer/Classes/ClassHelper.vb index 47d267f..8573020 100644 --- a/app/DD-Record-Organizer/Classes/ClassHelper.vb +++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb @@ -303,19 +303,12 @@ Public Class ClassHelper oExtension = Path.GetExtension(BW_DocPath).ToLower() LOGGER.Debug($"Checking if file extension [{oExtension}] may change during edit...") - If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then - oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} AND [Filename] = '{BW_Filename}'" - Dim oDTNEWDoc As DataTable = MYDB_ECM.GetDatatable(oSql) + If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) And oOverrideRunPath = "" Then + LOGGER.Debug("Create possible Document change in TBPMO_DOC_ID_CHANGED.") + Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID,DOC_PATH) VALUES (" & + $"{USER_GUID},'{ProcID}',9999,{BW_DocID},0,'{BW_DocPath}')" + MYDB_ECM.ExecuteNonQuery(oInsert) - If oDTNEWDoc IsNot Nothing AndAlso oDTNEWDoc.Rows.Count = 1 Then - Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID,DOC_PATH) VALUES (" & - $"{USER_GUID},'{ProcID}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")},'{BW_DocPath}')" - - MYDB_ECM.ExecuteNonQuery(oInsert) - LOGGER.Debug("Document change recorded in TBPMO_DOC_ID_CHANGED.") - Else - LOGGER.Debug("No matching document change detected.") - End If End If Catch ex As Exception diff --git a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb index 24cf1de..3506cf2 100644 --- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb @@ -20,7 +20,7 @@ Public Class ClassImport_Windream End If 'Die Datei nach windream importieren - Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE, True) + Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE) If streamresult = True Then Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE()) AND FULL_FILENAME = '{0}'", CURRENT_FILEIN_WD) CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(sql) diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index 42b91e3..ccedc63 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -221,6 +221,11 @@ Public Class ClassInit ElseIf oRow.Item("CAT_TITLE") = "WM_RWA2" Then WM_RWA2 = oRow.Item("CAT_STRING") LOGGER.Debug("WM_RWA2 = " + WM_RWA1) + ElseIf oRow.Item("CAT_TITLE") = "OF_FILESTORE_ENTITY" Then + OF_FILESTORE_ENTITY = oRow.Item("CAT_STRING") + Dim oSQL1 = String.Format("select A.GUID from TBPMO_FORM_CONSTRUCTOR A INNER JOIN TBPMO_FORM_CONSTRUCTOR_DETAIL B ON A.GUID = B.CONSTRUCT_ID WHERE B.FORM_ID = {0}", OF_FILESTORE_ENTITY) + OF_FILESTORE_CONSTRUCTOR = MYDB_ECM.GetScalarValue(oSQL1) + LOGGER.Debug(String.Format("OF_FILESTORE_ENTITY = {0}", OF_FILESTORE_ENTITY.ToString)) End If Next Catch ex As Exception diff --git a/app/DD-Record-Organizer/Classes/ClassJumpRecord.vb b/app/DD-Record-Organizer/Classes/ClassJumpRecord.vb index bb4b38f..0b8c963 100644 --- a/app/DD-Record-Organizer/Classes/ClassJumpRecord.vb +++ b/app/DD-Record-Organizer/Classes/ClassJumpRecord.vb @@ -57,7 +57,7 @@ Public Class ClassJumpRecord Exit Sub End If JUMP_STATE = STATE_ID - JUMP_RECORD_ID = recordId + JUMP_ID = recordId 'OpenFormConstructor(constructorId, recordId) OpenRecordView() Catch ex As Exception diff --git a/app/DD-Record-Organizer/ModuleHelperMethods.vb b/app/DD-Record-Organizer/ModuleHelperMethods.vb index 978a01d..240e827 100644 --- a/app/DD-Record-Organizer/ModuleHelperMethods.vb +++ b/app/DD-Record-Organizer/ModuleHelperMethods.vb @@ -262,8 +262,15 @@ Module ModuleHelperMethods End Sub - Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional pRecordId As Integer = -1) + Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional pJumpID As Integer = -1) Try + + If pJumpID <> -1 Then + ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen + JUMP_ID = pJumpID + End If + + If CURRENT_OPEN_CONSTRUCTOR_FORMS.Contains(id) Then Dim frm1 As New frmConstructor_Main frm1.Tag = id @@ -275,6 +282,14 @@ Module ModuleHelperMethods If frmCollection.Item(i).WindowState = FormWindowState.Minimized Then frmCollection.Item(i).WindowState = FormWindowState.Normal End If + CURRENT_CONSTRUCTOR_ID = id + CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id) + If pJumpID <> -1 Then + ' Nur ausführen, wenn das Form tatsächlich JumptoNode unterstützt + If TypeOf frmCollection.Item(i) Is frmNodeNavigation Then + DirectCast(frmCollection.Item(i), frmNodeNavigation).JumptoNode() + End If + End If Exit Sub End If Next i @@ -285,7 +300,7 @@ Module ModuleHelperMethods CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id) If NodeNav Then - Dim frmNodeNav As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID, pRecordId) + Dim frmNodeNav As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID) frmNodeNav.Tag = id If My.Settings.EntFormsChild = True Then Dim activeChild1 As Form = MAIN_FORM.ActiveMdiChild @@ -295,15 +310,15 @@ Module ModuleHelperMethods End If - If pRecordId <> -1 Then - ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen - JUMP_RECORD_ID = pRecordId - End If If My.Settings.EntFormsChild = True Then frmNodeNav.MdiParent = MAIN_FORM End If frmNodeNav.Show() + If pJumpID <> -1 Then + frmNodeNav.JumptoNode() + End If + Else Dim frm As New frmConstructor_Main() frm.Tag = id @@ -315,9 +330,9 @@ Module ModuleHelperMethods End If - If pRecordId <> -1 Then + If pJumpID <> -1 Then ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen - JUMP_RECORD_ID = pRecordId + JUMP_ID = pJumpID End If If My.Settings.EntFormsChild = True Then frm.MdiParent = MAIN_FORM diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index 5fe07f2..a683160 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -79,6 +79,9 @@ Module ModuleMySettings Public WM_RWA1 As String = "" Public WM_RWA2 As String = "" + Public OF_FILESTORE_ENTITY As Integer = 0 + Public OF_FILESTORE_CONSTRUCTOR As Integer = 0 + Dim rowresult As String = "" Public MYGDPICTURE_LICENSE_KEY As String = "" Public Function LoadFileExclusion() diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 854dad8..f14edc0 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -88,7 +88,7 @@ Module ModuleRuntimeVariables Public BOOLEAN1 As Boolean = False Public JUMP_STATE As Integer - Public JUMP_RECORD_ID As Integer + Public JUMP_ID As Long Public TEMP_FILES As List(Of String) = New List(Of String) Public FILE_FORMATS_CHANGE_DURING_EDIT As List(Of String) = New List(Of String) diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index ea2aa61..cac8b77 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/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index fe511bd..fffd6bc 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1,12 +1,13 @@ -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index bfe2ca7..b144e51 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -230,6 +230,9 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True + + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 5e6c097..40d2a7c 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -4837,7 +4837,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Private Sub tsButtonShowTaskOverview_Click(sender As Object, e As EventArgs) Handles tsButtonShowTaskOverview.Click ClassJumpRecord.JumpToRecord(2, RECORD_ID) - JUMP_RECORD_ID = 0 + JUMP_ID = 0 End Sub @@ -4978,8 +4978,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Try Dim sw As New SW("Jump_Record") - If JUMP_RECORD_ID > 0 Then - Dim sql = String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", JUMP_RECORD_ID) + If JUMP_ID > 0 Then + Dim sql = String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", JUMP_ID) Dim FormID = MYDB_ECM.GetScalarValue(sql) If FormID > 0 Then Dim n As TreeNode @@ -4991,8 +4991,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") ' wurde nicht zurückgesetzt, also ' wurde der record nicht gefunden - If JUMP_RECORD_ID <> 0 Then - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Jump Record: ", "Record-ID " & JUMP_RECORD_ID & " konnte nicht gefunden werden") + If JUMP_ID <> 0 Then + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Jump Record: ", "Record-ID " & JUMP_ID & " konnte nicht gefunden werden") End If sw.Done() Catch ex As Exception @@ -5010,10 +5010,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") 'Für Grid filtern wir die Aktuelle Ansicht nach der Record-ID, 'für Carousel und Tiles markieren wir den Record - LocateRecordinGridById(JUMP_RECORD_ID) + LocateRecordinGridById(JUMP_ID) ' Jump Record-ID wieder zurücksetzen - JUMP_RECORD_ID = 0 + JUMP_ID = 0 Exit Sub End If @@ -5026,10 +5026,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") 'Für Grid filtern wir die Aktuelle Ansicht nach der Record-ID, 'für Carousel und Tiles markieren wir den Record - LocateRecordinGridById(JUMP_RECORD_ID) + LocateRecordinGridById(JUMP_ID) ' Jump Record-ID wieder zurücksetzen - JUMP_RECORD_ID = 0 + JUMP_ID = 0 Exit For Exit Sub End If @@ -5807,7 +5807,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click ClassJumpRecord.JumpToRecord(0, RECORD_ID) - JUMP_RECORD_ID = 0 + JUMP_ID = 0 End Sub Private Sub GridViewDoc_Search_RowStyle(sender As Object, e As Views.Grid.RowStyleEventArgs) Handles GridViewDoc_Search.RowStyle If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then @@ -6414,7 +6414,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Show_Detail_Record: ", ex.Message) End Try - JUMP_RECORD_ID = 0 + JUMP_ID = 0 End Sub @@ -7227,7 +7227,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") If result = MsgBoxResult.Yes Then ClassJumpRecord.JumpToRecord(2, RECORD_ID) ClassWorkflow.Refresh_Workflows_Entity() - JUMP_RECORD_ID = 0 + JUMP_ID = 0 End If Else If USER_LANGUAGE = "de-DE" Then diff --git a/app/DD-Record-Organizer/frmCustomAppointment.vb b/app/DD-Record-Organizer/frmCustomAppointment.vb index f5bf8c6..4caf1e7 100644 --- a/app/DD-Record-Organizer/frmCustomAppointment.vb +++ b/app/DD-Record-Organizer/frmCustomAppointment.vb @@ -94,9 +94,9 @@ Partial Public Class frmCustomAppointment Private Sub btnJumpToRecord_Click(sender As Object, e As EventArgs) Handles btnJumpToRecord.Click If txtRecordID.Text.Length > 0 Then Dim RecordId = Integer.Parse(txtRecordID.Text) - JUMP_RECORD_ID = RecordId + JUMP_ID = RecordId - Dim constructDT As DataTable = MYDB_ECM.GetDatatable("SELECT T.CONSTRUCT_ID,T.NODE_NAVIGATION, T.FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS T, TBPMO_RECORD T1 WHERE T.FORM_ID = T1.FORM_ID AND T1.GUID = " & JUMP_RECORD_ID) + Dim constructDT As DataTable = MYDB_ECM.GetDatatable("SELECT T.CONSTRUCT_ID,T.NODE_NAVIGATION, T.FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS T, TBPMO_RECORD T1 WHERE T.FORM_ID = T1.FORM_ID AND T1.GUID = " & JUMP_ID) ' TODO: FormId und ConstructId herausfinden diff --git a/app/DD-Record-Organizer/frmDocRecordLink.vb b/app/DD-Record-Organizer/frmDocRecordLink.vb index 1ec7242..14256f2 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.vb @@ -16,6 +16,9 @@ Public Class frmDocRecordLink End Function End Class Private Function GET_CURRENT_ENTITY_DATA() + If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then + Return Nothing + End If Dim oDatatable As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy Return oDatatable End Function diff --git a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb index 6b0151a..48caf73 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb @@ -62,6 +62,8 @@ 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.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.Panel1.SuspendLayout() @@ -221,9 +223,9 @@ Partial Class frmGlobalSearch 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarToggleSearchCombined, Me.BarToggleSearchRecord, Me.BarToggleFulltext}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarToggleSearchCombined, Me.BarToggleSearchRecord, Me.BarToggleFulltext, Me.BarButtonItem1, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 15 + Me.RibbonControl1.MaxItemId = 17 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -332,8 +334,10 @@ Partial Class frmGlobalSearch Me.RibbonPageGroupFiles.Enabled = False Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem6) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem10) + Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroupFiles.Name = "RibbonPageGroupFiles" resources.ApplyResources(Me.RibbonPageGroupFiles, "RibbonPageGroupFiles") ' @@ -376,6 +380,20 @@ Partial Class frmGlobalSearch Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1") ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 15 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 16 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'frmGlobalSearch ' resources.ApplyResources(Me, "$this") @@ -451,4 +469,6 @@ Partial Class frmGlobalSearch Friend WithEvents BarToggleFulltext As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD-Record-Organizer/frmGlobalSearch.resx b/app/DD-Record-Organizer/frmGlobalSearch.resx index afdb747..3eecd10 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.resx +++ b/app/DD-Record-Organizer/frmGlobalSearch.resx @@ -156,12 +156,6 @@ 17, 17 - - 0, 22 - - - 6, 25 - 0, 0 @@ -234,12 +228,6 @@ Tahoma, 9pt - - Segoe UI, 8.25pt, style=Bold, Italic - - - 0, 22 - 0, 0 @@ -300,6 +288,18 @@ 0 + + 0, 22 + + + 6, 25 + + + Segoe UI, 8.25pt, style=Bold, Italic + + + 0, 22 + True @@ -330,6 +330,78 @@ 4 + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + + + lblFT_Irregular + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + txtSearch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 2 + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + + + Top + + + 0, 147 + + + 1467, 90 + + + 7 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + Tahoma, 8.25pt, style=Italic @@ -438,30 +510,6 @@ 3 - - Top - - - 0, 147 - - - 1467, 90 - - - 7 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - Tahoma, 8.25pt, style=Bold, Italic @@ -608,7 +656,7 @@ - Verknüpfungen + Verknüpfungen anzeigen @@ -662,25 +710,20 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABcEAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC - MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSW1hZ2VMb2Fk - Ij4NCiAgICA8cGF0aCBkPSJNMjcuMywxOEg3LjZMMiwyOGgxOS44YzAuNSwwLDEuMS0wLjIsMS4zLTAu - Nmw0LjktOC45QzI4LjEsMTguMiwyNy44LDE4LDI3LjMsMTh6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAg - IDxnIGNsYXNzPSJzdDEiPg0KICAgICAgPHBhdGggZD0iTTIxLDEyaC0yLjJjLTAuNCwwLjUtMC43LDEt - MC44LDEuNWMtMC4yLDAuOS0xLDEuNi0yLDEuNmMwLDAsMCwwLDAsMGMtMSwwLTEuOC0wLjctMS45LTEu - NyAgICBDMTQsMTIuOSwxNCwxMi40LDE0LDEyaC00VjljMC0wLjYtMC40LTEtMS0xSDFDMC40LDgsMCw4 - LjUsMCw5djE4YzAsMC4yLDAsMC4zLDAuMSwwLjRjMCwwLDAuMS0wLjEsMC4xLTAuMmw1LjUtMTAgICAg - QzYsMTYuNSw2LjcsMTYsNy41LDE2SDIydi0zQzIyLDEyLjUsMjEuNSwxMiwyMSwxMnoiIGNsYXNzPSJZ - ZWxsb3ciIC8+DQogICAgPC9nPg0KICAgIDxwYXRoIGQ9Ik0zMCw2bC02LTZ2NGMtNC40LDAtOCwzLjYt - OCw4YzAsMC40LDAsMC44LDAuMSwxLjFDMTYuNiwxMC4yLDIwLDgsMjQsOHY0TDMwLDZ6IiBjbGFzcz0i - Qmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlNpbmdsZVBhZ2VWaWV3Ij4NCiAgICA8cGF0aCBk + PSJNMjcsMEgzQzIuNCwwLDIsMC40LDIsMXYyOGMwLDAuNiwwLjQsMSwxLDFoMjRjMC42LDAsMS0wLjQs + MS0xVjFDMjgsMC40LDI3LjYsMCwyNywweiBNMjYsMjhINFYyaDIyVjI4eiIgY2xhc3M9IkJsYWNrIiAv + Pg0KICAgIDxwYXRoIGQ9Ik0yMiw4SDhWNmgxNFY4eiBNMjIsMTBIOHYyaDE0VjEweiBNMjIsMTRIOHYy + aDE0VjE0eiBNMjIsMThIOHYyaDE0VjE4eiBNMjIsMjJIOHYyaDE0VjIyeiIgY2xhc3M9IkJsdWUiIC8+ + DQogIDwvZz4NCjwvc3ZnPgs= @@ -692,6 +735,54 @@ Nur in Volltext + + Springe zu Filestore + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEADAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuR3JlZW57ZmlsbDojMDM5 + QzIzO30KCS5CbHVle2ZpbGw6IzExNzdENzt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTdG9yZSI+DQogICAg + PHJlY3QgeD0iMjQiIHk9IjE2IiB3aWR0aD0iMiIgaGVpZ2h0PSIxMiIgcng9IjAiIHJ5PSIwIiBjbGFz + cz0iUmVkIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMTYsMjIgOCwyMiA4LDE2IDYsMTYgNiwyMiA2 + LDI4IDgsMjggMTYsMjggMTgsMjggMTgsMjIgMTgsMTYgMTYsMTYgICIgY2xhc3M9IlJlZCIgLz4NCiAg + ICA8cGF0aCBkPSJNMjYsNEg2TDIsOHYydjAuNUMyLDEyLjQsMy42LDE0LDUuNSwxNFM5LDEyLjQsOSwx + MC41YzAsMS45LDEuNiwzLjUsMy41LDMuNWMxLjksMCwzLjUtMS42LDMuNS0zLjUgICBjMCwxLjksMS42 + LDMuNSwzLjUsMy41czMuNS0xLjYsMy41LTMuNWMwLDEuOSwxLjYsMy41LDMuNSwzLjVzMy41LTEuNiwz + LjUtMy41VjEwVjhMMjYsNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + Mit Datensatz verknüpfen + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAxNiAxNiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGluayIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTYg + MTYiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 + bGU+DQogIDxwYXRoIGQ9Ik0xMi41LDVoLTJDOS4zLDUsOC4zLDUuOSw4LjEsN0g2LjlDNi43LDUuOSw1 + LjcsNSw0LjUsNWgtMkMxLjEsNSwwLDYuMSwwLDcuNVMxLjEsMTAsMi41LDEwaDIgIGMxLjIsMCwyLjIt + MC45LDIuNC0yaDEuMWMwLjIsMS4xLDEuMiwyLDIuNCwyaDJjMS40LDAsMi41LTEuMSwyLjUtMi41UzEz + LjksNSwxMi41LDV6IE00LjUsOWgtMkMxLjcsOSwxLDguMywxLDcuNSAgQzEsNi43LDEuNyw2LDIuNSw2 + aDJjMC42LDAsMS4yLDAuNCwxLjQsMUgzLjVDMy4yLDcsMyw3LjIsMyw3LjVTMy4yLDgsMy41LDhoMi40 + QzUuNyw4LjYsNS4xLDksNC41LDl6IE0xMi41LDloLTIgIEM5LjksOSw5LjMsOC42LDkuMSw4aDIuNEMx + MS44LDgsMTIsNy44LDEyLDcuNVMxMS44LDcsMTEuNSw3SDkuMWMwLjItMC42LDAuOC0xLDEuNC0xaDJD + MTMuMyw2LDE0LDYuNywxNCw3LjVDMTQsOC4zLDEzLjMsOSwxMi41LDkgIHoiIGNsYXNzPSJCbGFjayIg + Lz4NCjwvc3ZnPgs= + + 0, 0 @@ -702,7 +793,7 @@ Datensatz - Dateien + Datei(en) Funktionen Tabelle @@ -972,6 +1063,18 @@ DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmGlobalSearch diff --git a/app/DD-Record-Organizer/frmGlobalSearch.vb b/app/DD-Record-Organizer/frmGlobalSearch.vb index 711dc58..104aea5 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.vb @@ -169,25 +169,13 @@ Public Class frmGlobalSearch GridControlFiles.DataSource = DT_Files tslblDocView.Text = String.Format("{0} files found", DT_Files.Rows.Count) Try - GridViewFiles.Columns("AddedWhen").DisplayFormat.FormatType = FormatType.DateTime - GridViewFiles.Columns("AddedWhen").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" - GridViewFiles.Columns("ChangedWhen").DisplayFormat.FormatType = FormatType.DateTime - GridViewFiles.Columns("ChangedWhen").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" + GridViewFiles.Columns.Item("FULL_FILENAME").Visible = False + GridViewFiles.OptionsView.ColumnAutoWidth = False + GridViewFiles.BestFitColumns() Catch ex As Exception End Try - Try - GridViewFiles.Columns("ErstelltWann").DisplayFormat.FormatType = FormatType.DateTime - GridViewFiles.Columns("ErstelltWann").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" - GridViewFiles.Columns("GeändertWann").DisplayFormat.FormatType = FormatType.DateTime - GridViewFiles.Columns("GeändertWann").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" - Catch ex As Exception - End Try - ' FormID und RecordID immer ausblenden - ' GridViewFiles.Columns.Item("FULL_FILENAME").Visible = False - GridViewFiles.OptionsView.ColumnAutoWidth = False - GridViewFiles.BestFitColumns() Else tslblDocView.Text = String.Format(" No files found") GridControlFiles.DataSource = Nothing @@ -230,7 +218,7 @@ Public Class frmGlobalSearch Catch ex As Exception MsgBox("Unexpected Error in Show_Detail_Record:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - JUMP_RECORD_ID = 0 + JUMP_ID = 0 End Sub Private Sub frmSearchAllOVer_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing @@ -420,6 +408,64 @@ Public Class frmGlobalSearch End Sub + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + For Each row In GridViewFiles.GetSelectedRows + Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID") + Dim oJumpToDocSQL = String.Format("DECLARE @PID BIGINT + SELECT @PID = dwParentID FROM TBPMO_DOCRESULT_LIST WHERE DocID = {0} + SELECT GUID FROM VWPMO_STRUCTURE_NODES WHERE ENTITY_ID = {1} AND ISNUMERIC(ID1) = 1 AND ID1 = @PID", SELECTED_DOC_ID, OF_FILESTORE_ENTITY) + Dim ojumpID As Integer = MYDB_ECM.GetScalarValue(oJumpToDocSQL) + If Not IsNothing(ojumpID) AndAlso ojumpID <> 0 Then + OpenFormConstructor(OF_FILESTORE_CONSTRUCTOR, 1, OF_FILESTORE_ENTITY, ojumpID) + + Else + MessageBox.Show("A parent node could not be found!", "No Node found", MessageBoxButtons.OK, MessageBoxIcon.Warning) + End If + Exit For + Next + End Sub + + Private Sub BarButtonItem2_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Dim Current_DocList As ClassDocGrid + Current_DocList = New ClassDocGrid(GridViewFiles) + Dim oDocuments = Current_DocList.SelectedDocuments + + If oDocuments.Count = 0 Or ClassDocGrid.HasNoSelectedDocuments(GridViewFiles) Then + MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + Refresh_Selected_Table() + + Dim oForm As New frmDocRecordLink With {.myDocuments = oDocuments} + oForm.Show() + End Sub + Sub Refresh_Selected_Table() + Dim table As New DataTable With { + .TableName = "SelectedFiles" + } + + ' Create two columns, ID and Name. + Dim idColumn As DataColumn = table.Columns.Add("ID", GetType(System.Int32)) + idColumn.AutoIncrement = True + idColumn.AutoIncrementSeed = 0 + idColumn.AutoIncrementStep = 1 + table.PrimaryKey = New DataColumn() {idColumn} + table.Columns.Add("FILEPATH", GetType(System.String)) + table.Columns.Add("DOC_ID", GetType(System.Int32)) + table.Columns.Add("OBJECTTYPE", GetType(System.String)) + For Each oDoc As ClassDocGrid.clsWMDoc In ClassDocGrid.GetSelectedDocuments(GridViewFiles) + If oDoc.DocPath <> String.Empty Then + 'Set the ID column as the primary key column. + Dim newRow As DataRow = table.NewRow() + newRow("FILEPATH") = oDoc.DocPath + newRow("DOC_ID") = oDoc.DocId + newRow("OBJECTTYPE") = oDoc.DocType + table.Rows.Add(newRow) + End If + Next + table.AcceptChanges() + CURRENT_DT_SELECTED_FILES = table + End Sub Sub File_open() Me.Cursor = Cursors.WaitCursor diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 4d188a8..eb435a6 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -45,11 +45,16 @@ Partial Class frmNodeNavigation Me.btnCreateNewNode = New DevExpress.XtraBars.BarButtonItem() Me.tsitmDMSReadOnly = New DevExpress.XtraBars.BarStaticItem() Me.bsiNotification = New DevExpress.XtraBars.BarStaticItem() + Me.bsiDocIDChanged = New DevExpress.XtraBars.BarStaticItem() + Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() + Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() + Me.FindNode = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RPGNodes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupRecord = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupDocResult = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.SplitContainerTreeList = New DevExpress.XtraEditors.SplitContainerControl() @@ -71,6 +76,7 @@ Partial Class frmNodeNavigation Me.tsmiFileLink_Add = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileLinkRemove = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileLink_ShowAll = New System.Windows.Forms.ToolStripMenuItem() + Me.TsmitmJumpToFilestore = New System.Windows.Forms.ToolStripMenuItem() Me.LinkPerMailVersendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiFileRename = New System.Windows.Forms.ToolStripMenuItem() @@ -125,6 +131,7 @@ Partial Class frmNodeNavigation Me.PopupMenu5 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.DD_DMSDataSet1 = New DD_Record_Organizer.DD_DMSDataSet() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerTreeList.Panel1.SuspendLayout() @@ -162,12 +169,13 @@ Partial Class frmNodeNavigation 'ribbonNodeNavigation ' Me.ribbonNodeNavigation.ExpandCollapseItem.Id = 0 - Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly, Me.bsiNotification}) + Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly, Me.bsiNotification, Me.bsiDocIDChanged, Me.BarEditItem1, Me.FindNode}) Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 0) - Me.ribbonNodeNavigation.MaxItemId = 26 + Me.ribbonNodeNavigation.MaxItemId = 30 Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation" Me.ribbonNodeNavigation.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.ribbonNodeNavigation.PopupMenuAlignment = DevExpress.XtraBars.PopupMenuAlignment.Left + Me.ribbonNodeNavigation.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1}) Me.ribbonNodeNavigation.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.ribbonNodeNavigation.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False] Me.ribbonNodeNavigation.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[True] @@ -319,9 +327,36 @@ Partial Class frmNodeNavigation Me.bsiNotification.Name = "bsiNotification" Me.bsiNotification.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' + 'bsiDocIDChanged + ' + Me.bsiDocIDChanged.Caption = "bsiDocIDChanged" + Me.bsiDocIDChanged.Id = 26 + Me.bsiDocIDChanged.ItemAppearance.Normal.BackColor = System.Drawing.Color.Yellow + Me.bsiDocIDChanged.ItemAppearance.Normal.Options.UseBackColor = True + Me.bsiDocIDChanged.Name = "bsiDocIDChanged" + Me.bsiDocIDChanged.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + ' + 'BarEditItem1 + ' + Me.BarEditItem1.Caption = "NodeGUID" + Me.BarEditItem1.Edit = Me.RepositoryItemTextEdit1 + Me.BarEditItem1.Id = 28 + Me.BarEditItem1.Name = "BarEditItem1" + ' + 'RepositoryItemTextEdit1 + ' + Me.RepositoryItemTextEdit1.AutoHeight = False + Me.RepositoryItemTextEdit1.Name = "RepositoryItemTextEdit1" + ' + 'FindNode + ' + Me.FindNode.Caption = "BarButtonItem19" + Me.FindNode.Id = 29 + Me.FindNode.Name = "FindNode" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RPGNodes, Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RPGNodes, Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Node Navigation" ' @@ -360,6 +395,13 @@ Partial Class frmNodeNavigation Me.RibbonPageGroupDocResult.Name = "RibbonPageGroupDocResult" Me.RibbonPageGroupDocResult.Text = "Dateien" ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarEditItem1) + Me.RibbonPageGroup2.ItemLinks.Add(Me.FindNode) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) @@ -369,6 +411,7 @@ Partial Class frmNodeNavigation Me.RibbonStatusBar1.ItemLinks.Add(Me.tsitmDMSReadOnly) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemLocked) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmtInfoDoc) + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocIDChanged) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 566) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation @@ -493,9 +536,9 @@ Partial Class frmNodeNavigation 'cmsResultFileDetail ' Me.cmsResultFileDetail.ImageScalingSize = New System.Drawing.Size(18, 18) - Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWorkMultiple_Lock, Me.tsmiFileInWorkMultiple_Free, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLinkRemove, Me.tsmiFileLink_ShowAll, Me.LinkPerMailVersendenToolStripMenuItem, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) + Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWorkMultiple_Lock, Me.tsmiFileInWorkMultiple_Free, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLinkRemove, Me.tsmiFileLink_ShowAll, Me.TsmitmJumpToFilestore, Me.LinkPerMailVersendenToolStripMenuItem, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles" - Me.cmsResultFileDetail.Size = New System.Drawing.Size(315, 394) + Me.cmsResultFileDetail.Size = New System.Drawing.Size(315, 440) ' 'tsmiFileProperties ' @@ -575,6 +618,14 @@ Partial Class frmNodeNavigation Me.tsmiFileLink_ShowAll.Size = New System.Drawing.Size(314, 24) Me.tsmiFileLink_ShowAll.Text = "Verknüpfungen anzeigen" ' + 'TsmitmJumpToFilestore + ' + Me.TsmitmJumpToFilestore.Image = Global.DD_Record_Organizer.My.Resources.Resources.HomeHS + Me.TsmitmJumpToFilestore.Name = "TsmitmJumpToFilestore" + Me.TsmitmJumpToFilestore.Size = New System.Drawing.Size(314, 24) + Me.TsmitmJumpToFilestore.Text = "Springe zu Filestore" + Me.TsmitmJumpToFilestore.Visible = False + ' 'LinkPerMailVersendenToolStripMenuItem ' Me.LinkPerMailVersendenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.email_go @@ -1052,6 +1103,7 @@ Partial Class frmNodeNavigation Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "frmNodeNavigation" CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerTreeList.Panel1.ResumeLayout(False) CType(Me.SplitContainerTreeList.Panel2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1188,4 +1240,10 @@ Partial Class frmNodeNavigation Friend WithEvents tsmiFileInWorkMultiple_Free As ToolStripMenuItem Friend WithEvents tsmiFileInWorkMultiple_Lock As ToolStripMenuItem Friend WithEvents DD_DMSDataSet1 As DD_DMSDataSet + Friend WithEvents bsiDocIDChanged As DevExpress.XtraBars.BarStaticItem + Friend WithEvents TsmitmJumpToFilestore As ToolStripMenuItem + Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit + Friend WithEvents FindNode As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index e3338a0..1973d63 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -762,22 +762,22 @@ 779, 17 - 17, 54 + 944, 17 - 174, 54 + 1101, 17 - 315, 54 + 1242, 17 - 480, 54 + 17, 54 - 606, 54 + 143, 54 - 84 + 151 @@ -1100,18 +1100,18 @@ - 730, 54 + 267, 54 - 856, 54 + 393, 54 - 17, 91 + 519, 54 - 143, 91 + 645, 54 - 616, 91 + 771, 54 \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 5d6c32c..5830728 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -77,7 +77,6 @@ Public Class frmNodeNavigation Public CtrlBuilder As ClassControlBuilder Public CtrlCommandUI As ClassControlCommandsUI - Public JumpKeyID As Long Private Property ParentNodeChangeinAction As Boolean = False Private Property ChildNodeGuid As Integer = 0 @@ -95,7 +94,7 @@ Public Class frmNodeNavigation Delete End Enum #End Region - Public Sub New(pEntityID As Int16, pConstructID As Int16, pNodeKeyID As Integer) + Public Sub New(pEntityID As Int16, pConstructID As Int16) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. @@ -110,7 +109,6 @@ Public Class frmNodeNavigation Current_DocList = New ClassDocGrid(GridViewDoc_Search) WindowsEx = New WindowsEx(LOGCONFIG) - JumpKeyID = pNodeKeyID ClassNodeCommands = New ClassNodeCommands(LOGCONFIG, MYDB_ECM) End Sub @@ -262,6 +260,7 @@ Public Class frmNodeNavigation End If Next + JumptoNode() Catch ex As Exception NNLogger.Error(ex) @@ -2528,6 +2527,11 @@ Public Class frmNodeNavigation Else tsmiFileRenameDisplayname.Visible = False End If + If CURRENT_ENTITY_ID <> OF_FILESTORE_ENTITY Then + TsmitmJumpToFilestore.Visible = True + Else + TsmitmJumpToFilestore.Visible = False + End If Else tsmiFileRenameDisplayname.Visible = False End If @@ -2766,13 +2770,28 @@ Public Class frmNodeNavigation Me.BringToFront() TreeListDevexpress.CollapseAll() FORM_SHOWN = True - If JumpKeyID > 0 Then - JumptoNode() - End If End Sub Public Sub JumptoNode() - If JumpKeyID > 0 Then - TreeListDevexpress.FindNodeByKeyID(JumpKeyID) + If JUMP_ID > 0 Then + If TreeListDevexpress.DataSource Is Nothing OrElse TreeListDevexpress.Nodes.Count = 0 Then + NNLogger.Debug("JumptoNode: TreeList noch nicht geladen. Warte bis Load_nodes fertig ist.") + ' Frühzeitiger Exit – Load_nodes springt später + Exit Sub + End If + Dim targetGuid As Integer = Convert.ToInt32(JUMP_ID) + ' Suche über Datenfeld "GUID" statt über die interne Node-Id + Dim oFindNode As TreeListNode = TreeListDevexpress.FindNodeByFieldValue("GUID", targetGuid) + If oFindNode IsNot Nothing Then + ' Sichtbar machen (expandiert ggf. Eltern) + TreeListDevexpress.MakeNodeVisible(oFindNode) + ' Fokus setzen + TreeListDevexpress.SetFocusedNode(oFindNode) + ' Optional: markieren + TreeListDevexpress.FocusedNode = oFindNode + Else + NNLogger.Warn($"JumpToNode: kein Knoten mit GUID={JUMP_ID} gefunden.") + End If + JUMP_ID = 0 End If End Sub Private Async Sub tsmiFileRenameDisplayname_Click(sender As Object, e As EventArgs) Handles tsmiFileRenameDisplayname.Click @@ -2843,10 +2862,7 @@ Public Class frmNodeNavigation End Sub Private Sub frmNodeNavigation_Click(sender As Object, e As EventArgs) Handles MyBase.Click - If CURRENT_ENTITY_ID <> _EntityId Then - CURRENT_ENTITY_ID = _EntityId - CURRENT_RECORD_ID = 0 - End If + End Sub Private Sub tsmiFileOpen_Click(sender As Object, e As EventArgs) Handles tsmiFileOpen.Click @@ -3701,4 +3717,47 @@ Public Class frmNodeNavigation frmFileInWork.ShowDialog() Await RUN_DOCSEARCH(True) End Sub + + Private Sub frmNodeNavigation_Activated(sender As Object, e As EventArgs) Handles Me.Activated + If CURRENT_ENTITY_ID <> CurrentEntityId Then + CURRENT_ENTITY_ID = CurrentEntityId + CURRENT_RECORD_ID = 0 + End If + End Sub + + Public ReadOnly Property CurrentEntityId As Short + Get + Return _EntityId + End Get + End Property + + Private Sub TsmitmJumpToFilestore_Click(sender As Object, e As EventArgs) Handles TsmitmJumpToFilestore.Click + Try + If mySelectedDocs.Count = 1 Then + Dim oDocId As Integer = mySelectedDocs.First.DocId + Dim oJumpToDocSQL = String.Format("DECLARE @PID BIGINT + SELECT @PID = dwParentID FROM TBPMO_DOCRESULT_LIST WHERE DocID = {0} + SELECT GUID FROM VWPMO_STRUCTURE_NODES WHERE ENTITY_ID = {1} AND ISNUMERIC(ID1) = 1 AND ID1 = @PID", oDocId, OF_FILESTORE_ENTITY) + Dim ojumpID As Integer = MYDB_ECM.GetScalarValue(oJumpToDocSQL) + If Not IsNothing(ojumpID) AndAlso ojumpID <> 0 Then + OpenFormConstructor(OF_FILESTORE_CONSTRUCTOR, 1, OF_FILESTORE_ENTITY, ojumpID) + + Else + MessageBox.Show("A parent node could not be found!", "No Node found", MessageBoxButtons.OK, MessageBoxIcon.Warning) + End If + End If + Catch ex As Exception + MessageBox.Show("Unerwarteter Fehler beim Springen zum Filestore-Knoten: " & ex.Message, "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error) + End Try + End Sub + + Private Sub FindNode_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles FindNode.ItemClick + Dim oNode = TreeListDevexpress.FindNodeByFieldValue("GUID", BarEditItem1.EditValue) + If Not IsNothing(oNode) Then + TreeListDevexpress.FocusedNode = oNode + TreeListDevexpress.MakeNodeVisible(oNode) + Else + MessageBox.Show("Knoten nicht gefunden!", "Knoten nicht gefunden", MessageBoxButtons.OK, MessageBoxIcon.Warning) + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmRecordView.vb b/app/DD-Record-Organizer/frmRecordView.vb index b814cc9..847ffdf 100644 --- a/app/DD-Record-Organizer/frmRecordView.vb +++ b/app/DD-Record-Organizer/frmRecordView.vb @@ -48,8 +48,8 @@ Public Class frmRecordView Me.Text = "Detailansicht Record" End If recordView = New ClassRecordView(pnlDetails) - RECORD_ID = JUMP_RECORD_ID - recordView.LoadRecord(JUMP_RECORD_ID) + RECORD_ID = JUMP_ID + recordView.LoadRecord(JUMP_ID) 'Titel updaten Me.Text &= " " + RECORD_ID.ToString() @@ -437,8 +437,8 @@ Public Class frmRecordView End Try Me.BringToFront() - If JUMP_RECORD_ID <> 0 Then - JUMP_RECORD_ID = 0 + If JUMP_ID <> 0 Then + JUMP_ID = 0 End If End Sub diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.resx b/app/DD-Record-Organizer/frmWM_IndexFile.resx index ac73fb1..439f3f3 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.resx +++ b/app/DD-Record-Organizer/frmWM_IndexFile.resx @@ -294,6 +294,9 @@ 8 + + 891, 17 + Segoe UI Semibold, 9.75pt, style=Bold @@ -306,9 +309,6 @@ 3 - - 891, 17 - Auswahl der Dokumentart - Wird für nächste Eingabe gespeichert @@ -390,6 +390,57 @@ 5 + + PATHTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 1 + + + DOCTYPE_IDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 3 + + + Segoe UI, 9pt, style=Italic + + + 15, 117 + + + 560, 80 + + + 7 + + + Gewählte Indexierungsdaten - Automatik: + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + Top, Left, Right @@ -438,33 +489,6 @@ 3 - - Segoe UI, 9pt, style=Italic - - - 15, 117 - - - 560, 80 - - - 7 - - - Gewählte Indexierungsdaten - Automatik: - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - Bottom, Left @@ -478,7 +502,7 @@ 24, 598 - 178, 20 + 177, 20 8 @@ -486,6 +510,9 @@ Lösche Ursprungsdatei + + 891, 17 + Die gedroppte Datei wird nach Ablage in windream gelöscht - Wird für nächste Eingabe gespeichert @@ -514,7 +541,7 @@ 24, 624 - 520, 20 + 519, 20 9 diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb index 5b3e46a..6e464f7 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -87,7 +87,7 @@ Public Class frmWM_IndexFile 'Stream File to windream '################################################################# sw = New SW("File Stream") - Dim streamresult = WMMOD.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME, OBJECT_TYPETextBox.Text, True) + Dim streamresult = WMMOD.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME, OBJECT_TYPETextBox.Text) sw.Done() '################################################################# If streamresult = True Then