diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb index 0fb3cb7..377a35d 100644 --- a/app/TaskFlow/ClassInit.vb +++ b/app/TaskFlow/ClassInit.vb @@ -19,6 +19,8 @@ Public Class ClassInit My.Settings.UserConfig_Prefix, My.Application.Info.CompanyName, My.Application.Info.ProductName) + + LOGGER = LOGCONFIG.GetLogger("taskFLOW") LOGGER.Info("## taskFLOW started - {0}", Now) @@ -43,6 +45,9 @@ Public Class ClassInit Public Sub InitUserConfig() Try Dim oUserAppDataPath As String = Application.UserAppDataPath + If My.Settings.UserConfig_Prefix <> String.Empty Then + oUserAppDataPath += "\" + My.Settings.UserConfig_Prefix + End If Dim oCommonAppDataPath = Application.CommonAppDataPath Dim oStartupPath = Application.StartupPath diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 9f33497..3f6fab7 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAZgBCgGYAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAaABCgGgAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1508,36 +1508,9 @@ 0, 0 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Workflow - - - Funktionen/App Start - - - Ad Hoc Workflows - Start - - Funktionen - - - Workflow Tabelle - Tabelle @@ -1595,24 +1568,6 @@ 0 - - True - - - Tahoma, 9.75pt, style=Bold - - - 3, 3 - - - 127, 16 - - - 0 - - - Choose a profile ... - lblCaptionMainGrid @@ -1704,12 +1659,6 @@ 863, 17 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -1890,6 +1839,69 @@ 2 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Workflow + + + Funktionen/App Start + + + Ad Hoc Workflows + + + Funktionen + + + Workflow Tabelle + + + True + + + Tahoma, 9.75pt, style=Bold + + + 3, 3 + + + 127, 16 + + + 0 + + + Choose a profile ... + + + lblCaptionMainGrid + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel2 + + + 0 + + + 219, 26 + + + Starte Validierung für Profil + 17, 56 @@ -1899,29 +1911,8 @@ 250, 56 - - 290, 30 - - - Popup Erinnerung deaktivieren - - - 287, 6 - - - 290, 30 - - - In den Vordergrund - - - 290, 30 - - - Out of Range - Fenster wiederherstellen - - 291, 122 + 291, 100 ContextMenuNotifyIcon @@ -2015,6 +2006,27 @@ True + + 290, 30 + + + Popup Erinnerung deaktivieren + + + 287, 6 + + + 290, 30 + + + In den Vordergrund + + + 290, 30 + + + Out of Range - Fenster wiederherstellen + 605, 17 @@ -3436,6 +3448,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -3448,9 +3463,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 50b8458..cd434bd 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -66,6 +66,7 @@ Public Class frmMain Private Const FA_NONE = "NONE" Public Const NAVBAR_CLICKED = "NAVBAR LINK CLICKED" + Private Class S Inherits My.Resources.frmMain_Strings End Class @@ -997,6 +998,7 @@ Public Class frmMain GridControlWorkflows.DataSource = Nothing Else NO_WORKFLOWITEMS = False + lblCaptionMainGrid.Text = CURRENT_CLICKED_PROFILE_TITLE End If Create_Basic_View() @@ -2795,13 +2797,14 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ End If If Ev_Filter_Panel_Closed = False Then - Dim objectCount_Descr As String = S.Filter_aktiv - - lblCaptionMainGrid.Text += $"|{objectCount_Descr}" - Else - Ev_Filter_Panel_Closed = False - End If - If GridViewWorkflows.ActiveFilterEnabled Then + Dim oTermFilterActive As String = S.Filter_aktiv + If GridViewWorkflows.ActiveFilterString <> String.Empty Then + If Not lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then + lblCaptionMainGrid.Text += $"|{oTermFilterActive}" + Else + Ev_Filter_Panel_Closed = False + End If + End If End If GridLayout_Changed("ColumnFilterChanged") @@ -3293,4 +3296,14 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ LOGGER.Info("User clicked reset layout") Await GridLayout_Reset() End Sub + + Private Sub GridViewWorkflows_KeyUp(sender As Object, e As KeyEventArgs) Handles GridViewWorkflows.KeyUp + If GridViewWorkflows.ActiveFilterEnabled = False Then + If DetailLinkActive Then + lblCaptionMainGrid.Text = CURRENT_CLICKED_PROFILE_TITLE + Else + Create_View_Caption() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index d3908ce..f12430a 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -126,7 +126,7 @@ - 5, 607 + 5, 708 Fill @@ -465,7 +465,7 @@ Fill - 0, 158 + 0, 70 Top, Bottom, Left, Right @@ -477,7 +477,7 @@ 2, 2 - 664, 514 + 664, 615 3 @@ -498,7 +498,7 @@ 5, 85 - 668, 518 + 668, 619 44 @@ -589,7 +589,7 @@ 0, 0 - 678, 668 + 678, 769 25 @@ -628,7 +628,7 @@ 3, 4, 3, 4 - 533, 668 + 534, 769 0 @@ -658,7 +658,7 @@ 1 - 1215, 668 + 1216, 769 678 @@ -691,7 +691,7 @@ 0, 0 - 1215, 0 + 1216, 0 barDockControlTop @@ -709,10 +709,10 @@ Bottom - 0, 848 + 0, 849 - 1215, 0 + 1216, 0 barDockControlBottom @@ -733,7 +733,7 @@ 0, 0 - 0, 848 + 0, 849 barDockControlLeft @@ -751,10 +751,10 @@ Right - 1215, 0 + 1216, 0 - 0, 848 + 0, 849 barDockControlRight @@ -778,7 +778,7 @@ 7, 17 - 1215, 848 + 1824, 1273 Tahoma, 8.25pt, style=Bold @@ -1325,13 +1325,13 @@ Combo - 1215, 158 + 1216, 105 - 0, 826 + 0, 834 - 1215, 22 + 1216, 15 RibbonStatusBar1 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index c4d3277..172937e 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -358,24 +358,30 @@ Public Class frmValidator Logger.Debug($"oProfileNotResponsibleText: " + oProfileNotResponsibleText) Logger.Debug($"oProfile_NOT_RESP_SQL: " + oProfile_NOT_RESP_SQL) Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) - If (oProfileRejectionText = String.Empty And oProfileNotResponsibleText = String.Empty) Or - (oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS = String.Empty) Or - (oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL = String.Empty) Then - Logger.Debug($"Keine Ablehnung und Nicht zuständig Funktion konfiguriert") + Dim functBtnReject As Boolean = False + Dim functBtnNR As Boolean = False + If oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS <> String.Empty Then + functBtnReject = True + End If + If oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL <> String.Empty Then + functBtnNR = True + End If + If functBtnReject = False And functBtnNR = False Then + Logger.Debug($"!Keine Ablehnung und Nicht zuständig Funktion konfiguriert!") SplitContainerReject_NotResp.Visible = False SplitContainerButtons.CollapsePanel = SplitCollapsePanel.None SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Panel2 Else SplitContainerButtons.CollapsePanel = SplitCollapsePanel.Panel1 SplitContainerReject_NotResp.Visible = True - If oProfileRejectionText <> String.Empty And oProfileNotResponsibleText <> String.Empty Then + If functBtnReject = True And functBtnNR = True Then Logger.Debug($"Nicht zuständig und Ablehnungs-Buttons werden eingeblendet!") SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.None SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Both btnReject.Text = oProfileRejectionText btnNotResponsible.Text = oProfileNotResponsibleText Else - If oProfileNotResponsibleText <> String.Empty Then + If functBtnNR = True Then Logger.Debug($"Nicht zuständig Button wird eingeblendet!") SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel1 SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel2