diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index e21c343..e9eb273 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -7219,12 +7219,14 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_Showlinks.Click Try - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then - MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + + Dim oDocID = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "DocID") + If IsNothing(oDocID) Then + MsgBox("Could not get DocID!", MsgBoxStyle.Exclamation) Exit Sub End If - Refresh_Selected_Table() + CURRENT_DOC_ID = oDocID + Dim frm As New frmDoc_Links frm.Show() frm.BringToFront() diff --git a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb index 2fcd89e..09c9a16 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class frmDocSearchResult - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ @@ -23,14 +23,8 @@ Partial Class frmDocSearchResult _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult)) - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.tslblDocID = New System.Windows.Forms.ToolStripStatusLabel() - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripLabelCaption = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem() @@ -42,72 +36,31 @@ Partial Class frmDocSearchResult Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator() Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() - Me.StatusStrip1.SuspendLayout() - Me.ToolStrip1.SuspendLayout() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.bsiDocID = New DevExpress.XtraBars.BarStaticItem() + Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStripResultFiles.SuspendLayout() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'StatusStrip1 - ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocID}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 623) - Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(1083, 22) - Me.StatusStrip1.TabIndex = 0 - Me.StatusStrip1.Text = "StatusStrip1" - ' - 'tslblDocID - ' - Me.tslblDocID.Name = "tslblDocID" - Me.tslblDocID.Size = New System.Drawing.Size(92, 17) - Me.tslblDocID.Text = "No row selected" - ' - 'ToolStrip1 - ' - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton3}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) - Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(1083, 25) - Me.ToolStrip1.TabIndex = 1 - Me.ToolStrip1.Text = "ToolStrip1" - ' - 'ToolStripLabelCaption - ' - Me.ToolStripLabelCaption.Name = "ToolStripLabelCaption" - Me.ToolStripLabelCaption.Size = New System.Drawing.Size(87, 22) - Me.ToolStripLabelCaption.Text = "ToolStripLabel1" - ' - 'ToolStripButton1 - ' - Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(95, 22) - Me.ToolStripButton1.Text = "Aktualisieren" - ' - 'ToolStripButton2 - ' - Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel - Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton2.Name = "ToolStripButton2" - Me.ToolStripButton2.Size = New System.Drawing.Size(120, 22) - Me.ToolStripButton2.Text = "Export nach Excel" - Me.ToolStripButton2.ToolTipText = "Export nach Excel" - ' 'GridControlDocSearch ' Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode2.RelationName = "Level1" - Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) - Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25) + GridLevelNode1.RelationName = "Level1" + Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 158) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" - Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 598) + Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 463) Me.GridControlDocSearch.TabIndex = 8 Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) @@ -189,44 +142,98 @@ Partial Class frmDocSearchResult Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] ' - 'ToolStripButton3 + 'RibbonControl1 ' - Me.ToolStripButton3.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete - Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton3.Name = "ToolStripButton3" - Me.ToolStripButton3.Size = New System.Drawing.Size(134, 22) - Me.ToolStripButton3.Text = "Layout zurücksetzen" + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiDocID, Me.bsiInfo}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 5 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.Size = New System.Drawing.Size(1083, 158) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Export Excel" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Layout zurücksetzen" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'bsiDocID + ' + Me.bsiDocID.Id = 3 + Me.bsiDocID.Name = "bsiDocID" + ' + 'bsiInfo + ' + Me.bsiInfo.Caption = "BarStaticItem1" + Me.bsiInfo.Id = 4 + Me.bsiInfo.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True + Me.bsiInfo.Name = "bsiInfo" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "DocResults" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.AllowTextClipping = False + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Funktionen" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID) + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 621) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1083, 24) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" ' 'frmDocSearchResult ' + Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1083, 645) Me.Controls.Add(Me.GridControlDocSearch) - Me.Controls.Add(Me.ToolStrip1) - Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.IconOptions.Icon = CType(resources.GetObject("frmDocSearchResult.IconOptions.Icon"), System.Drawing.Icon) Me.Name = "frmDocSearchResult" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "frmDocSearchResult" - Me.StatusStrip1.ResumeLayout(False) - Me.StatusStrip1.PerformLayout() - Me.ToolStrip1.ResumeLayout(False) - Me.ToolStrip1.PerformLayout() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStripResultFiles.ResumeLayout(False) CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents StatusStrip1 As StatusStrip - Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents GridControlDocSearch As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewDoc_Search As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents tslblDocID As ToolStripStatusLabel - Friend WithEvents ToolStripLabelCaption As ToolStripLabel Friend WithEvents ContextMenuStripResultFiles As ContextMenuStrip Friend WithEvents docCM_Open As ToolStripMenuItem Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem @@ -236,7 +243,13 @@ Partial Class frmDocSearchResult Friend WithEvents ToolStripSeparator22 As ToolStripSeparator Friend WithEvents docCM_PropertiesFile As ToolStripMenuItem Friend WithEvents ToolStripSeparator25 As ToolStripSeparator - Friend WithEvents ToolStripButton1 As ToolStripButton - Friend WithEvents ToolStripButton2 As ToolStripButton - Friend WithEvents ToolStripButton3 As ToolStripButton + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bsiDocID As DevExpress.XtraBars.BarStaticItem + Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD-Record-Organizer/frmDocSearchResult.resx b/app/DD-Record-Organizer/frmDocSearchResult.resx index 41a6a20..d3d7b62 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.resx +++ b/app/DD-Record-Organizer/frmDocSearchResult.resx @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 134, 17 - 241, 17 @@ -135,7 +129,47 @@ WA2AuQDZZphimAvwGkAoDLBhqFYgYGAAAFMd0furxZnJAAAAAElFTkSuQmCC - + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2 + djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho + MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln + b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALICAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUmVzZXRfUmFuZ2UiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg + MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdENzt9 + CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh + c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI5LDJIM0MyLjUsMiwyLDIuNSwyLDN2MjZjMCwwLjUsMC41 + LDEsMSwxaDI2YzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41LDIsMjksMnogTTI4LDEyaC0zLjJs + LTQsNGwyLDIgICBIMjh2MTBINFYxNGg1LjJsLTItMkg0VjRoMTJ2NGgzLjJMMjAsNy4yTDIwLjgsOEgy + OFYxMnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxwb2x5Z29uIHBvaW50cz0iMjIsMTIgMjAs + MTAgMTYsMTQgMTIsMTAgMTAsMTIgMTQsMTYgMTAsMjAgMTIsMjIgMTYsMTggMjAsMjIgMjIsMjAgMTgs + MTYgIiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== + + + AAABAAoAMDAQAAEABABoBgAApgAAACAgEAABAAQA6AIAAA4HAAAQEBAAAQAEACgBAAD2CQAAMDAAAAEA CACoDgAAHgsAACAgAAABAAgAqAgAAMYZAAAQEAAAAQAIAGgFAABuIgAAAAAAAAEAIAC6hAAA1icAADAw diff --git a/app/DD-Record-Organizer/frmDocSearchResult.vb b/app/DD-Record-Organizer/frmDocSearchResult.vb index ba1fbba..cfaaf59 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.vb @@ -30,6 +30,8 @@ Public Class frmDocSearchResult Private Const SEE_MASK_FLAG_NO_UI = &H400 Public Const SW_SHOW As Short = 5 Private DT_RESULT As DataTable + Private SelectedDocID As Int64 + Private SelectedFULL_FILEPATH As String Public Sub LoadDocSearch(reload As Boolean) Try Cursor = Cursors.WaitCursor @@ -43,7 +45,7 @@ Public Class frmDocSearchResult GridViewDoc_Search.Columns.Clear() GridControlDocSearch.DataSource = DT_RESULT GridViewDoc_Search.BestFitColumns(True) - ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DT_RESULT.Rows.Count} rows)" + bsiInfo.Caption = $"{CURRENT_DOCSEARCH_CAPTION} ({DT_RESULT.Rows.Count} rows)" Load_DocGrid_Layout() GridControlDocSearch.DataSource = DT_RESULT GridControlDocSearch.DataSource = DT_RESULT @@ -58,7 +60,6 @@ Public Class frmDocSearchResult 'Else ' ToolStripButton2.Enabled = True 'End If - ToolStripButton2.Enabled = True Catch ex As Exception LOGGER.Warn("Unexpected Error in LoadDocSearch: " & ex.Message) End Try @@ -67,7 +68,7 @@ Public Class frmDocSearchResult End Sub Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged If GridViewDoc_Search.RowCount > 0 Then - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + GetDocID() Refresh_DocID() End If @@ -75,25 +76,39 @@ Public Class frmDocSearchResult Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged If GridViewDoc_Search.RowCount > 0 Then - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + GetDocID() Refresh_DocID() End If End Sub Sub Refresh_DocID() - If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then - Dim msg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString - tslblDocID.Text = msg + If SelectedDocID <> 0 Then + Dim msg = "Doc-ID: " & SelectedDocID.ToString + bsiDocID.Caption = msg Else - tslblDocID.Text = "DocRow not selected" + bsiDocID.Caption = "DocRow not selected" End If End Sub + Sub GetDocID() + Try + Dim oDocID = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "DocID") + SelectedFULL_FILEPATH = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "FULL_FILENAME") + If Not IsNothing(oDocID) Then + SelectedDocID = oDocID + SelectedFULL_FILEPATH = GridViewDoc_Search.GetRowCellValue(GridViewDoc_Search.FocusedRowHandle, "FULL_FILENAME") + End If + + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub + Sub Open_File() Me.Cursor = Cursors.WaitCursor Dim allow_Open As Boolean = False - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID) + GetDocID() + Dim Result = ClassDOC_SEARCH.Get_File_Rights(SelectedDocID) If Not IsNothing(Result) Then Select Case Result.ToString Case "R" @@ -106,14 +121,13 @@ Public Class frmDocSearchResult End Select End If If allow_Open = True Then - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + If IsNothing(SelectedDocID) Then MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation) Exit Sub End If - For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows - ClassHelper.File_open(row.Item("FULL_FILENAME"), row.Item("DocID")) - If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True) - Next + ClassHelper.File_open(SelectedFULL_FILEPATH, SelectedDocID) + If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True) + Else ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!") End If @@ -125,13 +139,13 @@ Public Class frmDocSearchResult End Sub Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + If IsNothing(SelectedFULL_FILEPATH) Then MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation) Exit Sub End If - For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows - ClassHelper.Open_Folder(row.Item("FULL_FILENAME"), row.Item("DocID")) - Next + + ClassHelper.Open_Folder(SelectedFULL_FILEPATH, SelectedDocID) + End Sub Private Sub docCM_Copy_Click(sender As Object, e As EventArgs) Handles docCM_Copy.Click @@ -168,29 +182,28 @@ Public Class frmDocSearchResult End Sub Private Sub docCM_PropertiesFile_Click(sender As Object, e As EventArgs) Handles docCM_PropertiesFile.Click - + Show_File_Properties() End Sub Sub Show_File_Properties() - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + If IsNothing(SelectedFULL_FILEPATH) Then MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation) Exit Sub End If - For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows - If row.Item("FULL_FILENAME") <> "" Then - Cursor = Cursors.WaitCursor - Dim sei As New SHELLEXECUTEINFO - sei.cbSize = Marshal.SizeOf(sei) - sei.lpVerb = "properties" - sei.lpFile = row.Item("FULL_FILENAME") - sei.nShow = SW_SHOW - sei.fMask = SEE_MASK_INVOKEIDLIST - If Not ShellExecuteEx(sei) Then - Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error()) - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message) - End If + If SelectedFULL_FILEPATH <> "" Then + Cursor = Cursors.WaitCursor + Dim sei As New SHELLEXECUTEINFO + sei.cbSize = Marshal.SizeOf(sei) + sei.lpVerb = "properties" + sei.lpFile = SelectedFULL_FILEPATH + sei.nShow = SW_SHOW + sei.fMask = SEE_MASK_INVOKEIDLIST + If Not ShellExecuteEx(sei) Then + Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error()) + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file properties:", ex.Message) End If - Cursor = Cursors.Default - Next + End If + Cursor = Cursors.Default + End Sub Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load @@ -230,24 +243,32 @@ Public Class frmDocSearchResult End Sub Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + GetDocID() Refresh_DocID() End Sub Private Sub GridViewDoc_Search_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged - ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({GridViewDoc_Search.RowCount} rows [filtered])" - If GridViewDoc_Search.RowCount > 12000 Then - ToolStripButton2.Enabled = False - Else - ToolStripButton2.Enabled = True - End If + bsiInfo.Caption = $"{CURRENT_DOCSEARCH_CAPTION} ({GridViewDoc_Search.RowCount} rows [filtered])" + End Sub - Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) LoadDocSearch(False) End Sub - Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click + + + + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Dim XMLPath = Get_DocGrid_Layout_Filename() + If File.Exists(XMLPath) Then + File.Delete(XMLPath) + LoadDocSearch(True) + End If + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick Try Dim saveFileDialogDocSearchResult As New SaveFileDialog saveFileDialogDocSearchResult.Filter = "Excel File|*.xlsx" @@ -273,12 +294,4 @@ Public Class frmDocSearchResult End Try Cursor = Cursors.Default End Sub - - Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click - Dim XMLPath = Get_DocGrid_Layout_Filename() - If File.Exists(XMLPath) Then - File.Delete(XMLPath) - LoadDocSearch(True) - End If - End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb index b0d445a..38facc9 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb +++ b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class frmDoc_Links - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ @@ -23,45 +23,33 @@ Partial Class frmDoc_Links _ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDoc_Links)) - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.tslbl = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripButtonDelete = New System.Windows.Forms.ToolStripButton() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.dgRecords = New DevExpress.XtraGrid.GridControl() + Me.GridControlRecords = New DevExpress.XtraGrid.GridControl() Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.ToolStrip1.SuspendLayout() - CType(Me.dgRecords, System.ComponentModel.ISupportInitialize).BeginInit() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarStaticItemStatus = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'ToolStrip1 - ' - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbl, Me.ToolStripButtonDelete}) - resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") - Me.ToolStrip1.Name = "ToolStrip1" - ' - 'tslbl - ' - resources.ApplyResources(Me.tslbl, "tslbl") - Me.tslbl.Name = "tslbl" - ' - 'ToolStripButtonDelete - ' - Me.ToolStripButtonDelete.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete - resources.ApplyResources(Me.ToolStripButtonDelete, "ToolStripButtonDelete") - Me.ToolStripButtonDelete.Name = "ToolStripButtonDelete" - ' 'StatusStrip1 ' resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") Me.StatusStrip1.Name = "StatusStrip1" ' - 'dgRecords + 'GridControlRecords ' - resources.ApplyResources(Me.dgRecords, "dgRecords") - Me.dgRecords.MainView = Me.grvwGrid - Me.dgRecords.Name = "dgRecords" - Me.dgRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGrid}) + resources.ApplyResources(Me.GridControlRecords, "GridControlRecords") + Me.GridControlRecords.MainView = Me.grvwGrid + Me.GridControlRecords.Name = "GridControlRecords" + Me.GridControlRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGrid}) ' 'grvwGrid ' @@ -74,7 +62,7 @@ Partial Class frmDoc_Links Me.grvwGrid.Appearance.SelectedRow.BackColor = System.Drawing.Color.Yellow Me.grvwGrid.Appearance.SelectedRow.Options.UseBackColor = True Me.grvwGrid.Appearance.SelectedRow.Options.UseForeColor = True - Me.grvwGrid.GridControl = Me.dgRecords + Me.grvwGrid.GridControl = Me.GridControlRecords Me.grvwGrid.Name = "grvwGrid" Me.grvwGrid.OptionsBehavior.Editable = False Me.grvwGrid.OptionsBehavior.ReadOnly = True @@ -89,27 +77,91 @@ Partial Class frmDoc_Links Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True Me.grvwGrid.OptionsView.ShowAutoFilterRow = True ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarStaticItemStatus, Me.BarButtonItem2}) + resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") + Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarStaticItemStatus + ' + Me.BarStaticItemStatus.Id = 2 + Me.BarStaticItemStatus.ItemAppearance.Normal.Font = CType(resources.GetObject("BarStaticItemStatus.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.BarStaticItemStatus.ItemAppearance.Normal.Options.UseFont = True + Me.BarStaticItemStatus.Name = "BarStaticItemStatus" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemStatus) + resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") + ' + 'BarButtonItem2 + ' + 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" + ' 'frmDoc_Links ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.dgRecords) + Me.Controls.Add(Me.GridControlRecords) Me.Controls.Add(Me.StatusStrip1) - Me.Controls.Add(Me.ToolStrip1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.Icon = CType(resources.GetObject("frmDoc_Links.IconOptions.Icon"), System.Drawing.Icon) Me.Name = "frmDoc_Links" - Me.ToolStrip1.ResumeLayout(False) - Me.ToolStrip1.PerformLayout() - CType(Me.dgRecords, System.ComponentModel.ISupportInitialize).EndInit() + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents StatusStrip1 As StatusStrip - Friend WithEvents dgRecords As DevExpress.XtraGrid.GridControl + Friend WithEvents GridControlRecords As DevExpress.XtraGrid.GridControl Friend WithEvents grvwGrid As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents ToolStripButtonDelete As ToolStripButton - Friend WithEvents tslbl As ToolStripLabel + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarStaticItemStatus As DevExpress.XtraBars.BarStaticItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD-Record-Organizer/frmDoc_Links.resx b/app/DD-Record-Organizer/frmDoc_Links.resx index e5e75e4..73fdb48 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.resx +++ b/app/DD-Record-Organizer/frmDoc_Links.resx @@ -117,62 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - - Segoe UI, 9pt, style=Bold, Italic - - - 32, 22 - - - tslbl - - - Magenta - - - 167, 22 - - - ausgewählte Links löschen - - - 0, 0 - - - 800, 25 - - - - 0 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 124, 17 + - 0, 428 + 0, 404 800, 22 + 1 @@ -192,30 +147,126 @@ 1 - + Fill - - 0, 25 + + 0, 158 - - 800, 403 + + 800, 246 - + 16 - - dgRecords + + GridControlRecords - + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + $this - + 0 + + Ausgewählte Links löschen + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N + CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu + NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w + LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt + MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks + Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 + LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= + + + + Tahoma, 8.25pt, style=Bold + + + Export Excel + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2 + djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho + MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln + b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 0, 0 + + + Aktionen + + + Doc-Links + + + 800, 158 + + + 0, 426 + + + 800, 24 + + + RibbonStatusBar1 + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 2 + + + RibbonControl1 + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 3 + + + RibbonPage2 + True @@ -225,10 +276,7 @@ 800, 450 - - Tahoma, 8.25pt - - + AAABAAYAEBAQAAEABAAoAQAAZgAAABAQAAABAAgAaAUAAI4BAAAQEAAAAQAgAGgEAAD2BgAAICAQAAEA BADoAgAAXgsAACAgAAABAAgAqAgAAEYOAAAgIAAAAQAgAKgQAADuFgAAKAAAABAAAAAgAAAAAQAEAAAA @@ -404,28 +452,52 @@ Doc-Links - - tslbl - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripButtonDelete - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - grvwGrid DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarStaticItemStatus + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage2 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmDoc_Links - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmDoc_Links.vb b/app/DD-Record-Organizer/frmDoc_Links.vb index 6d88c26..33cfbc0 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.vb +++ b/app/DD-Record-Organizer/frmDoc_Links.vb @@ -2,12 +2,13 @@ Public Class frmDoc_Links Private Sub frmDoc_DocLinks_Load(sender As Object, e As EventArgs) Handles Me.Load Try + + Refresh_Grid_Data() If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then Me.Text = $"Document-Links for file: {ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")}" Else Me.Text = $"Document-Links for file: NODOC-ID" End If - Refresh_Grid_Data() Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDoc_DocLinks_Load", ex.Message, ex.StackTrace) End Try @@ -15,38 +16,51 @@ Public Class frmDoc_Links Sub Refresh_Grid_Data() Try Dim DT_RECORDS As DataTable - Dim oSql = $"select * FROM VWPMO_CUST_DOC_OBJECT_LINKS WHERE DOC_ID = {ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_ID")}" + Dim oSql = $"select * FROM VWPMO_CUST_DOC_OBJECT_LINKS WHERE DocID = {CURRENT_DOC_ID}" DT_RECORDS = clsDatabase.Return_Datatable(oSql) + If Not IsNothing(DT_RECORDS) Then + BarStaticItemStatus.Caption = $"{DT_RECORDS.Rows.Count} links for Document found!" + grvwGrid.Columns.Clear() + GridControlRecords.DataSource = DT_RECORDS + 'grvwGrid.Columns.Item("already linked").Fixed = True + Try + grvwGrid.Columns.Item("DocID").Visible = False + grvwGrid.Columns.Item("RecordID").Visible = False + grvwGrid.Columns.Item("FULL_FILENAME").Visible = False + Try + grvwGrid.Columns.Item("VALUE").Visible = False + Catch ex1 As Exception + LOGGER.Warn("Column VALUE not part of VWPMO_CUST_DOC_OBJECT_LINKS" & ex1.Message) + End Try + Catch ex As Exception + LOGGER.Error(ex) + End Try - tslbl.Text = $"{DT_RECORDS.Rows.Count} links for Document found!" - grvwGrid.Columns.Clear() - dgRecords.DataSource = DT_RECORDS - 'grvwGrid.Columns.Item("already linked").Fixed = True - Try - grvwGrid.Columns.Item("DOC_ID").Visible = False - grvwGrid.Columns.Item("RECORD_ID").Visible = False - grvwGrid.Columns.Item("VALUE").Visible = False - Catch ex As Exception + GridControlRecords.RefreshDataSource() + If DT_RECORDS.Rows.Count > 10000 Then + BarButtonItem2.Enabled = False + Else + BarButtonItem2.Enabled = True + End If + Else + MsgBox($"Please check Your link-object-relation: {oSql}", MsgBoxStyle.Exclamation) + End If - End Try - - dgRecords.RefreshDataSource() Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Sub Refresh_Grid_Data", ex.Message, ex.StackTrace) End Try End Sub - Private Sub ToolStripButtonDelete_Click(sender As Object, e As EventArgs) Handles ToolStripButtonDelete.Click - Dim selectedRows As Integer() = grvwGrid.GetSelectedRows() - Dim i As Integer = 0 - For Each rowhandle As Integer In selectedRows - Dim oDocID = grvwGrid.GetRowCellValue(rowhandle, "DOC_ID") - Dim oRECORD_ID = grvwGrid.GetRowCellValue(rowhandle, "RECORD_ID") - If IsNothing(oDocID) Then - Continue For - End If - LOGGER.Debug($"RecordLink will be removed Record: {oRECORD_ID} - DocID: {oDocID} ") + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + + + Dim oDocID = grvwGrid.GetRowCellValue(grvwGrid.FocusedRowHandle, "DocID") + Dim oRECORD_ID = grvwGrid.GetRowCellValue(grvwGrid.FocusedRowHandle, "RecordID") + If IsNothing(oDocID) Then + Exit Sub + End If + LOGGER.Debug($"RecordLink will be removed Record: {oRECORD_ID} - DocID: {oDocID} ") Try If ClassFileResult.Delete_ResultFile(oDocID, oRECORD_ID, 0) = True Then ClassHelper.InsertEssential_Log(oDocID, "DOC-ID", $"RECORD LINK {oRECORD_ID} REMOVED FROM DOC-SEARCH") @@ -54,7 +68,34 @@ Public Class frmDoc_Links Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Removing DocRecord-Link", ex.Message, ex.StackTrace) End Try - Next + Refresh_Grid_Data() End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Try + Dim saveFileDialogDocSearchResult As New SaveFileDialog + saveFileDialogDocSearchResult.Filter = "Excel File|*.xlsx" + saveFileDialogDocSearchResult.Title = "Export to Excel:" + saveFileDialogDocSearchResult.ShowDialog() + If saveFileDialogDocSearchResult.FileName <> "" Then + Cursor = Cursors.WaitCursor + GridControlRecords.MainView.ExportToXlsx(saveFileDialogDocSearchResult.FileName) + Dim result As MsgBoxResult + Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?") + + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("File was created. Do You want to open excel?") + End If + result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Process.Start(saveFileDialogDocSearchResult.FileName) + End If + End If + + Catch ex As Exception + MsgBox("Unexpected Error in ExportExcel: " & ex.Message, MsgBoxStyle.Critical) + End Try + Cursor = Cursors.Default + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb index e58593d..605b8b9 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class frmGlobalSearch - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ @@ -33,17 +33,15 @@ Partial Class frmGlobalSearch Me.ToolStripRecords = New System.Windows.Forms.ToolStrip() Me.tslblRecordsResult = New System.Windows.Forms.ToolStripLabel() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.tsbtnviewDetail = New System.Windows.Forms.ToolStripButton() Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView() Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip() Me.tslblDocView = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.ToolStripMain = New System.Windows.Forms.ToolStrip() Me.tsbtnRefresh = New System.Windows.Forms.ToolStripButton() Me.Label1 = New System.Windows.Forms.Label() @@ -55,7 +53,14 @@ Partial Class frmGlobalSearch Me.txtSearch = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit() @@ -69,6 +74,7 @@ Partial Class frmGlobalSearch Me.ToolStripMain.SuspendLayout() Me.Panel1.SuspendLayout() Me.GroupBox1.SuspendLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerMain @@ -130,7 +136,7 @@ Partial Class frmGlobalSearch ' 'ToolStripRecords ' - Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1, Me.ToolStripButton1, Me.tsbtnviewDetail}) + Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1}) resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords") Me.ToolStripRecords.Name = "ToolStripRecords" ' @@ -144,18 +150,6 @@ Partial Class frmGlobalSearch Me.ToolStripSeparator1.Name = "ToolStripSeparator1" resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") ' - 'ToolStripButton1 - ' - Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel - resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1") - Me.ToolStripButton1.Name = "ToolStripButton1" - ' - 'tsbtnviewDetail - ' - Me.tsbtnviewDetail.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_view_detail - resources.ApplyResources(Me.tsbtnviewDetail, "tsbtnviewDetail") - Me.tsbtnviewDetail.Name = "tsbtnviewDetail" - ' 'GridControlFiles ' Me.GridControlFiles.ContextMenuStrip = Me.ContextMenuStrip1 @@ -187,6 +181,12 @@ Partial Class frmGlobalSearch Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem") ' + 'VerknüpfungenAnzeigenToolStripMenuItem + ' + Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link + Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem" + resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem") + ' 'GridViewFiles ' Me.GridViewFiles.Appearance.EvenRow.BackColor = System.Drawing.Color.Orange @@ -209,7 +209,7 @@ Partial Class frmGlobalSearch ' Me.ToolStripDokumente.AllowDrop = True resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente") - Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocView, Me.ToolStripButton2}) + Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocView}) Me.ToolStripDokumente.Name = "ToolStripDokumente" ' 'tslblDocView @@ -217,13 +217,6 @@ Partial Class frmGlobalSearch resources.ApplyResources(Me.tslblDocView, "tslblDocView") Me.tslblDocView.Name = "tslblDocView" ' - 'ToolStripButton2 - ' - Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel - resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2") - Me.ToolStripButton2.Name = "ToolStripButton2" - ' 'ToolStripMain ' resources.ApplyResources(Me.ToolStripMain, "ToolStripMain") @@ -296,11 +289,62 @@ Partial Class frmGlobalSearch Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' - 'VerknüpfungenAnzeigenToolStripMenuItem + 'RibbonControl1 ' - Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link - Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem" - resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem") + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiInfo}) + resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") + Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 1 + 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 = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'bsiInfo + ' + Me.bsiInfo.Id = 3 + Me.bsiInfo.ItemAppearance.Normal.Font = CType(resources.GetObject("bsiInfo.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True + Me.bsiInfo.Name = "bsiInfo" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) + resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' 'frmGlobalSearch ' @@ -308,8 +352,13 @@ Partial Class frmGlobalSearch Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.SplitContainerMain) Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.Icon = CType(resources.GetObject("frmGlobalSearch.IconOptions.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.Name = "frmGlobalSearch" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerMain.ResumeLayout(False) CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit() @@ -328,7 +377,9 @@ Partial Class frmGlobalSearch Me.Panel1.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ToolStripMain As System.Windows.Forms.ToolStrip @@ -350,17 +401,22 @@ Partial Class frmGlobalSearch Friend WithEvents tslblDocView As System.Windows.Forms.ToolStripLabel Friend WithEvents GridControlFiles As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewFiles As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator Friend WithEvents cmsRecords As System.Windows.Forms.ContextMenuStrip Friend WithEvents ExportExcelToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ShowRecordToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents Panel1 As System.Windows.Forms.Panel - Friend WithEvents tsbtnviewDetail As System.Windows.Forms.ToolStripButton Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents DateiÖffnenToolStripMenuItem As ToolStripMenuItem Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem Friend WithEvents VerknüpfungenAnzeigenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD-Record-Organizer/frmGlobalSearch.resx b/app/DD-Record-Organizer/frmGlobalSearch.resx index 106728d..d47a42a 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.resx +++ b/app/DD-Record-Organizer/frmGlobalSearch.resx @@ -123,7 +123,7 @@ - 0, 117 + 0, 275 454, 17 @@ -156,7 +156,7 @@ 0, 25 - 751, 313 + 751, 131 @@ -186,24 +186,6 @@ 6, 25 - - Magenta - - - 61, 22 - - - Export - - - Magenta - - - 95, 22 - - - Detailansicht - 0, 0 @@ -259,7 +241,7 @@ Verknüpfungen anzeigen - 206, 114 + 206, 92 ContextMenuStrip1 @@ -274,7 +256,7 @@ 0, 25 - 408, 313 + 408, 131 4 @@ -306,15 +288,6 @@ Windream-Dokumente - - Magenta - - - 63, 22 - - - Export - 0, 0 @@ -343,7 +316,7 @@ Panel2 - 1169, 338 + 1169, 156 8 @@ -616,7 +589,7 @@ Top - 0, 0 + 0, 158 1169, 117 @@ -636,6 +609,111 @@ 3 + + Export Excel + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2 + djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho + MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln + b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + Detailansicht + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQFAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGV0YWlsZWQiPg0KICAgIDxwYXRo + IGQ9Ik04LDhINlY2aDJWOHogTTgsMTBINnYyaDJWMTB6IE04LDE0SDZ2MmgyVjE0eiBNOCwxOEg2djJo + MlYxOHogTTgsMjJINnYyaDJWMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8cGF0aCBkPSJNMiwyOFYy + aDIydjEyLjNjMC43LDAuMiwxLjQsMC41LDIsMC44VjFjMC0wLjUtMC41LTEtMS0xSDFDMC41LDAsMCww + LjUsMCwxdjI4YzAsMC41LDAuNSwxLDEsMWgyMSAgIGMtMiwwLTMuOS0wLjgtNS4zLTJIMnoiIGNsYXNz + PSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMzEuNiwyOS45TDI3LDI1LjNjMC42LTAuOSwxLTIuMSwx + LTMuM2MwLTMuMy0yLjctNi02LTZzLTYsMi43LTYsNnMyLjcsNiw2LDZjMS4yLDAsMi4zLTAuNCwzLjMt + MWw0LjYsNC42ICAgYzAuNSwwLjUsMS4zLDAuNSwxLjcsMEMzMi4xLDMxLjIsMzIuMSwzMC40LDMxLjYs + MjkuOXogTTIyLDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNC4yLDI2LDIy + LDI2eiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPGcgY2xhc3M9InN0MCI+DQogICAgICA8cGF0aCBkPSJN + MTYuNywxNkgxMHYtMmgxMHYwLjNDMTguOCwxNC42LDE3LjYsMTUuMiwxNi43LDE2eiBNMjAsNkgxMHYy + aDEwVjZ6IE0yMCwxMEgxMHYyaDEwVjEweiBNMTQsMjJoLTR2Mmg0LjMgICAgQzE0LjEsMjMuNCwxNCwy + Mi43LDE0LDIyeiBNMTUuMSwxOEgxMHYyaDQuM0MxNC40LDE5LjMsMTQuNywxOC42LDE1LjEsMTh6IiBj + bGFzcz0iQmxhY2siIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L + + + + Tahoma, 8.25pt, style=Bold, Italic + + + 0, 0 + + + Aktionen + + + Global Search + + + 1169, 158 + + + 0, 431 + + + 1169, 24 + + + RibbonStatusBar1 + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 4 + + + RibbonControl1 + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 5 + + + RibbonPage2 + True @@ -645,10 +723,7 @@ 1169, 455 - - Tahoma, 8.25pt - - + AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA @@ -733,18 +808,6 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripButton1 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsbtnviewDetail - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - DateiÖffnenToolStripMenuItem @@ -763,6 +826,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + VerknüpfungenAnzeigenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GridViewFiles @@ -775,28 +844,52 @@ System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripButton2 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsbtnRefresh System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - VerknüpfungenAnzeigenToolStripMenuItem + + BarButtonItem1 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + bsiInfo + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage2 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmGlobalSearch - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmGlobalSearch.vb b/app/DD-Record-Organizer/frmGlobalSearch.vb index 25b26f3..55bed05 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.vb @@ -5,7 +5,7 @@ Imports DevExpress.XtraGrid.Views.Grid Imports System.Runtime.InteropServices Public Class frmGlobalSearch - Inherits Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean End Function @@ -32,6 +32,7 @@ Public Class frmGlobalSearch Public Const SW_SHOW As Short = 5 Private _Helper As ClassHelper Dim sel_Records, sel_FT As String + Private SelectedGrid As DevExpress.XtraGrid.GridControl Private Sub tsbtnRefresh_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh.Click Refresh_Search() End Sub @@ -145,25 +146,25 @@ Public Class frmGlobalSearch End If End Function - Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click - Export_Excel(GridControlRecords) - End Sub - Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click - Export_Excel(GridControlFiles) - End Sub + + Private Sub ExportExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportExcelToolStripMenuItem.Click - Export_Excel(GridControlRecords) + Export_Excel() End Sub - Sub Export_Excel(Grid As DevExpress.XtraGrid.GridControl) + Sub Export_Excel() + If IsNothing(SelectedGrid) Then + MsgBox("Please choose a grid!", MsgBoxStyle.Exclamation) + Exit Sub + End If Dim saveFileDialog1 As New SaveFileDialog saveFileDialog1.Filter = "Excel File|*.xlsx" saveFileDialog1.Title = "Export to Excel:" saveFileDialog1.ShowDialog() If saveFileDialog1.FileName <> "" Then Cursor = Cursors.WaitCursor - Grid.MainView.ExportToXlsx(saveFileDialog1.FileName) + SelectedGrid.MainView.ExportToXlsx(saveFileDialog1.FileName) Dim result As MsgBoxResult Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?") @@ -203,9 +204,6 @@ Public Class frmGlobalSearch End If End Sub - Private Sub tsbtnviewDetail_Click(sender As Object, e As EventArgs) Handles tsbtnviewDetail.Click - Show_Detail_Record() - End Sub Private Sub GridControlFiles_DoubleClick(sender As Object, e As EventArgs) Handles GridControlFiles.DoubleClick File_open() @@ -346,6 +344,22 @@ Public Class frmGlobalSearch End Try End Sub + Private Sub GridControlRecords_Click(sender As Object, e As EventArgs) Handles GridControlRecords.Click + SelectedGrid = sender + End Sub + + Private Sub GridControlFiles_Click(sender As Object, e As EventArgs) Handles GridControlFiles.Click + SelectedGrid = sender + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Export_Excel() + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Show_Detail_Record() + End Sub + Sub File_open() Me.Cursor = Cursors.WaitCursor