diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index f6030ec..89a8ac4 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -175,14 +175,13 @@ Public Class frmAdministration Sub Refresh_Profildaten() Try change_BindingSource = True + CHANGES_FORM_DESIGN = True + UNSAVED_CHANGES_PROFILE = False + CURR_TEXT_CONTROL_CONTENT = String.Empty TBPM_PROFILETableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE) TBPM_TYPETableAdapter.Fill(DD_DMSLiteDataSet.TBPM_TYPE) TBPM_KONFIGURATIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_KONFIGURATION) - 'Me.TBPM_USERTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_USER) - - 'TBDD_GROUPSTableAdapter.FillByProfileId_NotAssigned(DD_DMSLiteDataSet.TBDD_GROUPS, PROFILGUIDTextBox.Text) - If tabctrl_Profilkonfig.SelectedIndex = 1 Then CURRENT_OBJECTTYPE = cmbObjekttypen.Text If TabControl2.SelectedIndex = 1 Then @@ -1120,11 +1119,10 @@ Public Class frmAdministration CHANGED_WHOTextBox.Text = USER_USERNAME Me.TBPM_PROFILEBindingSource.EndEdit() Me.TBPM_PROFILETableAdapter.Update(DD_DMSLiteDataSet.TBPM_PROFILE) + Refresh_Profildaten() + Dim pos As Integer = TBPM_PROFILEBindingSource.Find("GUID", CURRENT_ProfilGUID) + TBPM_PROFILEBindingSource.Position = pos tsbStaticInfo.Caption = $"ProfileData saved - {Now.ToLongTimeString}" - CHANGES_FORM_DESIGN = True - UNSAVED_CHANGES_PROFILE = False - CURR_TEXT_CONTROL_CONTENT = String.Empty - DD_DMSLiteDataSet.AcceptChanges() Else tsbStaticInfo.Caption = "" End If diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index cb994eb..3c2e338 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -415,6 +415,7 @@ Partial Class frmMain Me.NavBarItemOverview.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[False] Me.NavBarItemOverview.ImageOptions.LargeImage = CType(resources.GetObject("NavBarItemOverview.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarItemOverview.Name = "NavBarItemOverview" + Me.NavBarItemOverview.Tag = "OVERVIEW" ' 'NotifyIcon1 ' diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 9f517b8..c512c91 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAVgBBwFYAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAWABBwFgAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -172,114 +172,10 @@ 179, 17 - - 138, 56 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - NavBarControl1 - - - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 2 - - - - Fill - - - - Tahoma, 9pt - - - 0, 146 - - - 1347, 360 - - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 863, 17 - - 270, 256 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 233, 25 - - - 1114, 335 - - - 8 - - - False - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - + 269, 26 @@ -308,6 +204,7 @@ Metadaten Datei anzeigen + False @@ -363,24 +260,61 @@ 266, 6 - - 269, 26 - - - Aktionen Datei - 200, 22 Datei als Link versenden + + 269, 26 + + + Aktionen Datei + 269, 26 Exportieren + + 270, 256 + + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Fill + + + 233, 25 + + + 1114, 335 + + + 8 + + + False + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + 138, 56 @@ -484,6 +418,12 @@ 17, 56 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -637,11 +577,32 @@ 2 - - 219, 26 + + Fill - - Starte Validierung für Profil + + Tahoma, 9pt + + + 0, 146 + + + 1347, 360 + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 490, 17 @@ -649,6 +610,27 @@ 640, 56 + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 235, 76 @@ -830,27 +812,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 605, 17 @@ -1416,6 +1377,21 @@ 0, 0 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Funktionen/App Start + Start @@ -1452,21 +1428,6 @@ 5 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Funktionen/App Start - Top @@ -2757,9 +2718,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -2772,6 +2730,9 @@ Bars + + &Hintergrund + PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 695b62e..f9d33a6 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -39,6 +39,7 @@ Public Class frmMain Private FormOpenClose As Boolean = False Private FormShown As Boolean = False Private GridIsLoaded As Boolean = False + Private OverviewOrDEtail As String = "OVERVIEW" Private allgFunk As New ClassAllgemeineFunktionen Private _Init As New ClassInit @@ -287,6 +288,7 @@ Public Class frmMain MsgBox("Unexpected Error in LoadForm - Step 4: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") End Try LoadNavBar() + AddHandler NavBarControl1.LinkClicked, AddressOf navBar_LinkClicked Try If SHOW_CHARTS = True Then @@ -475,6 +477,8 @@ Public Class frmMain If NO_WORKFLOWITEMS = True Then Exit Sub End If + + Try Dim xml As String = GetXML_OverviewLayoutName() GridView_Docs.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout) @@ -635,7 +639,7 @@ Public Class frmMain NavBarControl1.Groups(1).ItemLinks.Add(item1) - AddHandler NavBarControl1.LinkClicked, AddressOf navBar_LinkClicked + End If Next If oCountItems > 0 Then @@ -668,16 +672,15 @@ Public Class frmMain oStopWatch.Done() End Sub Private Async Sub navBar_LinkClicked(ByVal sender As Object, ByVal e As NavBarLinkEventArgs) - ' Das aktuelle Layout speichern, bevor das neue geladen wird - ' und GRID_LOAD_TYPE gesetzt wird. - SaveGridLayout() - Dim _tag = e.Link.Item.Tag If Not IsNothing(_tag) Then + 'Speichern Overview + SaveGridLayout() If _tag.ToString.Contains("itmProfile#") Then _tag = _tag.ToString.Replace("itmProfile#", "") If IsNumeric(_tag) Then If CURRENT_CLICKED_PROFILE_ID <> _tag Then + OverviewOrDEtail = "DETAIL" CURRENT_CLICKED_PROFILE_ID = _tag CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption GRID_LOAD_TYPE = "PROFILE#" & CURRENT_CLICKED_PROFILE_ID.ToString @@ -690,10 +693,25 @@ Public Class frmMain End If End If + ElseIf _tag = "OVERVIEW" Then + OverviewOrDEtail = "OVERVIEW" + GRID_LOAD_TYPE = "OVERVIEW" + GridView_Docs.ShowLoadingPanel() + TimerRefresh.Stop() + Dim oForce As Boolean = False + If DetailLinkActive = True Then + oForce = True + DetailLinkActive = False + OVERVIEW_ADDED_WHEN = "" + End If + Await Load_Grid_Overview(oForce) + GridView_Docs.HideLoadingPanel() + TimerRefresh.Start() + RefreshHelper.LoadViewInfo() End If - End If + End Sub Function Load_Profiles_for_User() As Boolean Try @@ -1611,24 +1629,6 @@ Public Class frmMain Item_Scope("CMGROUP") End Sub - Private Async Sub NavBarItemOverview_LinkClicked(sender As Object, e As NavBarLinkEventArgs) Handles NavBarItemOverview.LinkClicked - ' Das aktuelle Layout speichern, bevor das neue geladen wird - ' und GRID_LOAD_TYPE gesetzt wird. - SaveGridLayout() - - GridView_Docs.ShowLoadingPanel() - TimerRefresh.Stop() - Dim oForce As Boolean = False - If DetailLinkActive = True Then - oForce = True - DetailLinkActive = False - OVERVIEW_ADDED_WHEN = "" - End If - Await Load_Grid_Overview(oForce) - GridView_Docs.HideLoadingPanel() - TimerRefresh.Start() - RefreshHelper.LoadViewInfo() - End Sub Async Function Load_Grid_Overview(FormLoad As Boolean, Optional ForceReload As Boolean = False) As Tasks.Task Dim oStopWatch As New RefreshHelper.SW("Load_Grid_Overview(LGO)") Layout_Single_Profile() @@ -1823,7 +1823,12 @@ Public Class frmMain If Not IsNothing(BASEDATA_DTGRID_GROUPS) Then For Each oGridGroup As DataRow In BASEDATA_DTGRID_GROUPS.Rows LOGGER.Debug($"Addig group [{oGridGroup.Item("GROUPNAME")}] for Grid...") - GridView_Docs.Columns.Item(oGridGroup.Item("GROUPNAME")).GroupIndex = oindex + Try + GridView_Docs.Columns.Item(oGridGroup.Item("GROUPNAME")).GroupIndex = oindex + Catch ex As Exception + + End Try + oindex += 1 Next End If @@ -1849,6 +1854,7 @@ Public Class frmMain Catch ex As Exception End Try + GridView_Docs.CollapseAllGroups() If TL_ICON = True Then Try @@ -1879,7 +1885,7 @@ Public Class frmMain 'GridView_Docs.OptionsView.ShowIndicator = False - LOGGER.Debug(" GridView_Docs.Columns loaded...") + LOGGER.Debug("GridView_Docs.Columns loaded...") Try Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "") oReducedColName = oReducedColName.Replace("]", "") @@ -1938,8 +1944,11 @@ Public Class frmMain Private Async Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click + Check_Timer_Inactivity() Await Reset_GridLayout(False) Await Decide_Load(False, True) + SaveGridLayout() + If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() End Sub Async Function Reset_GridLayout(FormLoad As Boolean) As Tasks.Task @@ -2057,10 +2066,18 @@ Public Class frmMain End Sub Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged + If FormShown = False Then + Exit Sub + End If + Check_Timer_Inactivity() SaveGridLayout() End Sub + Private Sub GridView_Docs_EndSorting(sender As Object, e As EventArgs) Handles GridView_Docs.EndSorting + ' SaveGridLayout() + End Sub Private Sub LayoutSpeichernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LayoutSpeichernToolStripMenuItem.Click + Check_Timer_Inactivity() SaveGridLayout() End Sub @@ -2191,6 +2208,8 @@ Public Class frmMain End Sub Private Sub LöscheAlleFilterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LöscheAlleFilterToolStripMenuItem.Click + Check_Timer_Inactivity() + Try GridView_Docs.ClearFindFilter() GridView_Docs.ClearColumnsFilter() @@ -2460,7 +2479,12 @@ Public Class frmMain End Sub Private Sub GridView_Docs_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridView_Docs.ColumnFilterChanged + Try + If FormShown = False Then + Exit Sub + End If + Check_Timer_Inactivity() Dim objectCount_Descr = GridView_Docs.RowCount.ToString If USER_LANGUAGE <> "de-DE" Then objectCount_Descr &= " objects (filtered)" @@ -2469,6 +2493,7 @@ Public Class frmMain End If tslblObjectCount.Text = objectCount_Descr tslblObjectCount.ForeColor = Color.DarkOrange + SaveGridLayout() Catch ex As Exception LOGGER.Error(ex.Message) End Try @@ -2544,10 +2569,6 @@ Public Class frmMain End Try - End Sub - - Private Sub GridView_Docs_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles GridView_Docs.SelectionChanged - End Sub Private Sub bbtniCW_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniCW.ItemClick @@ -2566,4 +2587,6 @@ Public Class frmMain LOGGER.Error(ex.Message) End Try End Sub + + End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 97d1e99..e3ed4ee 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -5218,6 +5218,7 @@ Public Class frmValidator End Try Thread.Sleep(500) Application.DoEvents() + FreeFile() 'Aus der Tabelle löschen Dim oDelete = $"DELETE FROM TBPM_PROFILE_FILES WHERE (GUID = {CURRENT_DOC_GUID})" If ClassDatabase.Execute_non_Query(oDelete) = True Then @@ -5255,6 +5256,14 @@ Public Class frmValidator Catch ex As Exception LOGGER.Warn($"Could not delete via windream-function - ERROR: [{ex.Message}] {vbNewLine} Trying system.io...") Try + Try + CURRENT_WMFILE.unlock() + Catch exul As Exception + LOGGER.Warn($"Could not unlock WMFile - ERROR: [{exul.Message}] - now teh system.io.Delete...") + End Try + WMDocPathWindows = "" + CURRENT_DOC_PATH = "" + CURRENT_WMFILE = Nothing File.Delete(WMDocPathWindows) LOGGER.Info("Deleting of file via system.io [" & WMDocPathWindows & "] successfull!") Return True