diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 7f1f817..721c7a3 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -102,7 +102,8 @@ - + @@ -229,7 +230,7 @@ 0, 0 - 513 + 346 Normal diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index 900a027..86ef9f5 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -541,7 +541,7 @@ Public Class ClassControlCreator Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode) Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid Dim oView As GridView - + Dim oControlName = oControl.Name oControl.ForceInitialize() diff --git a/app/TaskFlow/ControlCreator/GridControl.vb b/app/TaskFlow/ControlCreator/GridControl.vb index 4016618..3b8a0bb 100644 --- a/app/TaskFlow/ControlCreator/GridControl.vb +++ b/app/TaskFlow/ControlCreator/GridControl.vb @@ -169,6 +169,18 @@ Namespace ControlCreator Dim oSequence As Integer = oColumnData.Item("SEQUENCE") oCol.VisibleIndex = oSequence + ' READ_ONLY Eigenschaft verarbeiten + Dim oIsReadOnly As Boolean = False + Dim oReadOnlyValue = ObjectEx.NotNull(oColumnData.Item("READ_ONLY"), False) + + If TypeOf oReadOnlyValue Is Boolean Then + oIsReadOnly = CBool(oReadOnlyValue) + Else + Dim oReadOnlyInt As Integer + oIsReadOnly = Integer.TryParse(oReadOnlyValue.ToString(), oReadOnlyInt) AndAlso oReadOnlyInt = 1 + End If + oCol.OptionsColumn.AllowEdit = Not oIsReadOnly + Dim oColumnType As String = oColumnData.Item("TYPE_COLUMN") Select Case oColumnType diff --git a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb index a3bfe9f..32254ea 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb +++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb @@ -21527,12 +21527,12 @@ Namespace DD_DMSLiteDataSetTableAdapters "ESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQU"& _ "ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _ "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT"& _ - "_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = 'INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"@LU_CAPTION'"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WH"& _ - "ERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SP"& _ - "ALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND"& _ - ", READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, R"& _ - "EGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCE"& _ - "D_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)" + "_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = @LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID "& _ + "= @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SP"& _ + "ALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOA"& _ + "D_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGE"& _ + "X_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TB"& _ + "PM_CONTROL_TABLE WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21556,6 +21556,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADVANCED_LOOKUP", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ADVANCED_LOOKUP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.[Variant], 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -21839,6 +21840,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal ADVANCED_LOOKUP As Boolean, _ ByVal SAVE_CHANGE_ON_ENABLED As Object, _ ByVal INHERIT_VALUE As Boolean, _ + ByVal LU_CAPTION As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONTROL_ID,Integer) @@ -21915,8 +21917,13 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.UpdateCommand.Parameters(20).Value = CType(SAVE_CHANGE_ON_ENABLED,Object) End If Me.Adapter.UpdateCommand.Parameters(21).Value = CType(INHERIT_VALUE,Boolean) - Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(GUID,Integer) + If (LU_CAPTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("LU_CAPTION") + Else + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(LU_CAPTION,String) + End If + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xsd b/app/TaskFlow/DD_DMSLiteDataSet.xsd index fb574e7..fa42b74 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xsd +++ b/app/TaskFlow/DD_DMSLiteDataSet.xsd @@ -1333,9 +1333,8 @@ SET CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT_VALUE, - LU_CAPTION = 'INHERIT_VALUE -@LU_CAPTION' -WHERE (GUID = @Original_GUID); + LU_CAPTION = @LU_CAPTION +WHERE (GUID = @Original_GUID); SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) @@ -1360,6 +1359,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -3392,9 +3392,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ No newline at end of file diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xss b/app/TaskFlow/DD_DMSLiteDataSet.xss index 4f3aba6..f6c615a 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xss +++ b/app/TaskFlow/DD_DMSLiteDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 24e3408..72aeabb 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/My Project/Settings.Designer.vb b/app/TaskFlow/My Project/Settings.Designer.vb index ae5e8b7..12ad0fa 100644 --- a/app/TaskFlow/My Project/Settings.Designer.vb +++ b/app/TaskFlow/My Project/Settings.Designer.vb @@ -156,7 +156,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("346")> _ Public Property frmValSearchSplitterDistance() As Integer Get Return CType(Me("frmValSearchSplitterDistance"),Integer) diff --git a/app/TaskFlow/My Project/Settings.settings b/app/TaskFlow/My Project/Settings.settings index 9801874..3cfe9af 100644 --- a/app/TaskFlow/My Project/Settings.settings +++ b/app/TaskFlow/My Project/Settings.settings @@ -27,7 +27,7 @@ 0, 0 - 513 + 346 Normal diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 12fafb7..e3b8c89 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -1078,7 +1078,6 @@ FinalIndexDataSet.xsd - MyApplicationCodeGenerator diff --git a/app/TaskFlow/clsPatterns.vb b/app/TaskFlow/clsPatterns.vb index e780ad7..9ba88a0 100644 --- a/app/TaskFlow/clsPatterns.vb +++ b/app/TaskFlow/clsPatterns.vb @@ -51,7 +51,7 @@ Public Class clsPatterns Public Const INT_VALUE_WMDocID = "WMDocID" Public Const INT_VALUE_IDBID = "IDBObjID" - Public Const MAX_TRY_COUNT = 20 + Public Const MAX_TRY_COUNT = 5 ''' ''' This value will be valid as any datatype, @@ -64,6 +64,15 @@ Public Class clsPatterns Private Shared ReadOnly complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA} Private Shared ReadOnly simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT} + Private Shared _ControlLookupCache As Dictionary(Of String, Control) + ''' + ''' Clears the control lookup cache. Call when controls are dynamically added/removed. + ''' + Public Shared Sub ClearControlCache() + _ControlLookupCache = Nothing + LOGGER.Debug("Control cache cleared") + End Sub + ''' ''' Wraps a pattern-type and -value in the common format: {#type#value} ''' @@ -189,9 +198,22 @@ Public Class clsPatterns End Try End Function + Private Shared Sub RecursiveAddToCache(ctrl As Control, cache As Dictionary(Of String, Control)) + cache(ctrl.Name) = ctrl + For Each child As Control In ctrl.Controls + RecursiveAddToCache(child, cache) + Next + End Sub Public Shared Function ReplaceControlValues(pInput As String, oPanel As DevExpress.XtraEditors.XtraScrollableControl, oIsSQL As Boolean) As String Dim oResult = pInput - + ' Cache beim ersten Aufruf erstellen: + If _ControlLookupCache Is Nothing Then + _ControlLookupCache = New Dictionary(Of String, Control)() + For Each ctrl As Control In oPanel.Controls + RecursiveAddToCache(ctrl, _ControlLookupCache) + Next + LOGGER.Debug($"Control cache initialized with {_ControlLookupCache.Count} controls") + End If Try Dim oTryCounter = 0 @@ -214,15 +236,25 @@ Public Class clsPatterns End If LOGGER.Debug("Found placeholder for control [{0}].", oControlName) + Dim oControl As Control = Nothing + If Not _ControlLookupCache.TryGetValue(oControlName, oControl) Then + LOGGER.Warn($"Control [{oControlName}] not found in cache!") + ' Fallback: Rekursive Suche als letzte Maßnahme + oControl = oPanel.Controls.Find(oControlName, True).FirstOrDefault() + If oControl IsNot Nothing Then + LOGGER.Info($"Control [{oControlName}] found via fallback search. Adding to cache.") + _ControlLookupCache(oControlName) = oControl + End If + End If - Dim oControl As Control = oPanel.Controls.Find(oControlName, False).FirstOrDefault() If oControl IsNot Nothing Then Dim oReplaceValue As String + LOGGER.Debug("oControl.GetType [{0}].", oControl.GetType.ToString) Select Case oControl.GetType Case GetType(TextBox) oReplaceValue = oControl.Text - + LOGGER.Debug("TextBox- oReplaceValue will be [{0}].", oReplaceValue) Case GetType(TextEdit) Try oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, TextEdit).EditValue, String.Empty) @@ -230,6 +262,7 @@ Public Class clsPatterns LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}") oReplaceValue = "" End Try + LOGGER.Debug("TextEdit- oReplaceValue will be [{0}].", oReplaceValue) Case GetType(MemoEdit) Try oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, MemoEdit).EditValue, String.Empty) @@ -237,6 +270,7 @@ Public Class clsPatterns LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}") oReplaceValue = "" End Try + LOGGER.Debug("MemoEdit- oReplaceValue will be [{0}].", oReplaceValue) Case GetType(LookupControl3) Dim oLookupControl3 As LookupControl3 = oControl @@ -298,6 +332,8 @@ Public Class clsPatterns oReplaceValue = oReplaceValue.Replace("'", "''") End If oResult = ReplacePattern(oResult, PATTERN_CTRL, oReplaceValue) + Else + LOGGER.Warn("Could not get a Control for [{0}].", oControlName) End If oTryCounter += 1 diff --git a/app/TaskFlow/frmColumn_Detail.Designer.vb b/app/TaskFlow/frmColumn_Detail.Designer.vb index d4dbcd6..655b262 100644 --- a/app/TaskFlow/frmColumn_Detail.Designer.vb +++ b/app/TaskFlow/frmColumn_Detail.Designer.vb @@ -370,7 +370,7 @@ Partial Class frmColumn_Detail ' 'READ_ONLYCheckBox ' - Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True)) + Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "READ_ONLY", True)) resources.ApplyResources(Me.READ_ONLYCheckBox, "READ_ONLYCheckBox") Me.READ_ONLYCheckBox.MenuManager = Me.RibbonControl1 Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox" diff --git a/app/TaskFlow/frmColumn_Detail.vb b/app/TaskFlow/frmColumn_Detail.vb index a64c51d..9ee2dad 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -64,6 +64,17 @@ Public Class frmColumn_Detail End Try End Function + Private Sub READ_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles READ_ONLYCheckBox.CheckedChanged + Console.WriteLine($"READ_ONLY changed to: {READ_ONLYCheckBox.Checked}") + Console.WriteLine($"CheckEditInheritValue is now: {CheckEditInheritValue.Checked}") + End Sub + + Private Sub CheckEditInheritValue_CheckedChanged(sender As Object, e As EventArgs) Handles CheckEditInheritValue.CheckedChanged + Console.WriteLine($"CheckEditInheritValue changed to: {CheckEditInheritValue.Checked}") + Dim stackTrace As New StackTrace() + Console.WriteLine($"Called from: {stackTrace}") + End Sub + Sub Save_Data() Try TBPM_CONTROL_TABLEBindingSource.EndEdit() @@ -92,7 +103,7 @@ Public Class frmColumn_Detail ) tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always tslblAenderungen.Caption = "Änderungen gespeichert - " & Now - FillData(GUIDTextBox.Text) + ' FillData(GUIDTextBox.Text) Else tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index f3ba934..1040c5b 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -446,7 +446,7 @@ Public Class frmMain BarButtonItemFileLink.Visibility = DevExpress.XtraBars.BarItemVisibility.Never SOURCE_INIT = Init_IDB() If SOURCE_INIT = True Then - Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" + Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WITH (NOLOCK) WHERE TITLE = 'PM_IDB_DOC_DATA'" Dim DTIDB_DOC_DATA_SQL = DatabaseFallback.GetDatatable("TBDD_SQL_COMMANDS", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = "TITLE = 'PM_IDB_DOC_DATA'" @@ -1474,9 +1474,6 @@ Public Class frmMain CURRENT_ProfilGUID = pProfilID WM_AHWF_docPath = String.Empty - - - ' Dim th As System.Threading.Thread If Not Application.OpenForms().OfType(Of frmValidator).Any Then If TimerRefresh.Enabled Then TimerRefresh.Enabled = False @@ -1501,17 +1498,23 @@ Public Class frmMain MsgBox("Could not get a Profile - Check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) Exit Sub End If - + oExpression = $"PROFILE_ID = {CURRENT_ProfilGUID} " DT_FILTERED_PROFILE_SEARCHES_DOC = Nothing - DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Copy - DT_FILTERED_PROFILE_SEARCHES_DOC.Clear() - oExpression = $"PROFILE_ID = {CURRENT_ProfilGUID}" - BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX").CopyToDataTable(DT_FILTERED_PROFILE_SEARCHES_DOC, LoadOption.PreserveChanges) + Dim rows = BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX") + If rows.Length > 0 Then + DT_FILTERED_PROFILE_SEARCHES_DOC = rows.CopyToDataTable() + Else + DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone() + End If BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing - BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Copy - BASEDATA_DT_PROFILE_SEARCHES_SQL.Clear() - BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges) + rows = BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX") + If rows.Length > 0 Then + BASEDATA_DT_PROFILE_SEARCHES_SQL = rows.CopyToDataTable() + Else + BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone() + End If + Try Dim oEnvironment = GetEnvironment() @@ -1564,9 +1567,6 @@ Public Class frmMain MsgBox("Unexpected error in Load_Profil_from_Grid: " & ex.Message & vbNewLine & ADDITIONAL_TITLE & " will try to reload the overview - Please try again!", MsgBoxStyle.Information, ADDITIONAL_TITLE) Dim task = Decide_Load(False, True) End Try - 'Me.Visible = True - 'Decide_Load() - End Sub 'Public Sub Task_A() @@ -1574,6 +1574,7 @@ Public Class frmMain ' Application.Run(frmA) 'End Sub Private Sub Item_Scope(startedFrom As String) + Dim showLoadingPanel As Boolean = False Try LOGGER.Info("Starting Profile Loading") @@ -1585,6 +1586,11 @@ Public Class frmMain bsiMessage.ItemAppearance.Normal.ForeColor = Color.Black Exit Sub End If + ' ========== LOADING PANEL AKTIVIEREN (FRÜH) ========== + GridViewWorkflows.ShowLoadingPanel() + showLoadingPanel = True + Me.UseWaitCursor = True + Dim hitInfo As GridHitInfo = GridViewWorkflows.CalcHitInfo(GridCursorLocation) bsiMessage.Caption = "" bsiMessage.ItemAppearance.Normal.BackColor = Color.Transparent @@ -1838,7 +1844,14 @@ Public Class frmMain bsiMessage.Caption = "Warning in Item_Scope: " & ex.Message bsiMessage.ItemAppearance.Normal.BackColor = Color.Red bsiMessage.ItemAppearance.Normal.ForeColor = Color.Black - + Finally + ' ========== LOADING PANEL DEAKTIVIEREN ========== + If showLoadingPanel Then + GridViewWorkflows.HideLoadingPanel() + End If + Me.UseWaitCursor = False + bsiMessage.Caption = "" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Transparent End Try End Sub Private Async Sub ValidatorClosed(sender As Object, e As FormClosedEventArgs) @@ -2395,7 +2408,7 @@ Public Class frmMain End If End Sub Sub LoadCURRENT_DT_PROFILES() - Dim oSQL = $"select * from TBPM_PROFILE WITH (NOLOCK)where ACTIVE = 1" + Dim oSQL = $"select * from TBPM_PROFILE WITH (NOLOCK) where ACTIVE = 1" CURRENT_DT_PROFILES = DatabaseFallback.GetDatatable("TBPM_PROFILE", New GetDatatableOptions(oSQL, DatabaseType.ECM)) oSQL = $"select * from TBDD_GUI_LANGUAGE_PHRASE WITH (NOLOCK) where LANGUAGE = '{USER_LANGUAGE}' AND MODULE = 'PM' AND TITLE LIKE 'PROFILE_%'" CURRENT_DT_PROFILE_LANGUAGE = DatabaseFallback.GetDatatable("TBPMPROFILE_LANGUAGE_TERMS", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { @@ -2427,7 +2440,7 @@ Public Class frmMain LOGGER.Debug($"VWPM_PROFILE_ACTIVE-SELECT used from DD-SQL-Config..") Else oSQL = $"SELECT [dbo].[FNDD_LANGUAGE_PHRASE] ('PROFILE_TITLE' + CONVERT(VARCHAR(4),T.GUID),'{USER_LANGUAGE}','PM') as GROUP_TEXT_LANG, T.* -FROM VWPM_PROFILE_ACTIVE T WITH (NOLOCk) WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({USER_ID}))" +FROM VWPM_PROFILE_ACTIVE T WITH (NOLOCK) WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({USER_ID}))" End If @@ -2512,7 +2525,6 @@ FROM VWPM_PROFILE_ACTIVE T WITH (NOLOCk) WHERE T.GUID IN (SELECT PROFILE_ID FROM Me.Text = ADDITIONAL_TITLE CurrNavBarGroup = NavBarControl1.Groups(1) - FormShown = True Timer_Inactivity_Reset_Disable("Decide_Load") LOGGER.Debug("FormShown..Now Decide_Load...") @@ -3138,7 +3150,7 @@ FROM VWPM_PROFILE_ACTIVE T WITH (NOLOCk) WHERE T.GUID IN (SELECT PROFILE_ID FROM If SOURCE_INIT = True Then CURRENT_ProfilGUID = oProfileId - Dim oSQL = $"select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY [SEQUENCE]" + Dim oSQL = $"select * from TBPM_PROFILE_FINAL_INDEXING WITH (NOLOCK) where PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY [SEQUENCE]" 'CURRENT_DT_FINAL_INDEXING = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") CURRENT_DT_FINAL_INDEXING = DatabaseFallback.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { @@ -3327,7 +3339,6 @@ FROM VWPM_PROFILE_ACTIVE T WITH (NOLOCk) WHERE T.GUID IN (SELECT PROFILE_ID FROM Try Dim oEnvironment = GetEnvironment() - _FormValidator = New frmValidator(oEnvironment) AddHandler _FormValidator.FormClosed, AddressOf ValidatorClosed _FormValidator.Show() diff --git a/app/TaskFlow/frmMonitor.vb b/app/TaskFlow/frmMonitor.vb index 13461a0..5b948d3 100644 --- a/app/TaskFlow/frmMonitor.vb +++ b/app/TaskFlow/frmMonitor.vb @@ -174,7 +174,7 @@ Public Class frmMonitor '_frmDocView.LoadFile(oDocPath) If File.Exists(oDocPath) Then - DocumentViewerMonitor.LoadFile(oDocPath) + DocumentViewerMonitor.LoadFile_FromPath(oDocPath) BarStaticItemInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never DocumentViewerMonitor.Visible = True ' DocumentViewerMonitor.RightOnlyView(USER_RIGHT_VIEW_ONLY) @@ -523,7 +523,7 @@ Public Class frmMonitor LOGGER.Warn($"Error getting DocPath in Monitor: {ex.Message}") Exit Sub End Try - DocumentViewerMonitor?.LoadFile(oDocPath) + DocumentViewerMonitor?.LoadFile_FromPath(oDocPath) 'If oDocPath <> "" Then ' If Not Application.OpenForms().OfType(Of frmValidator).Any Then diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 4cbbe4e..c106513 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -152,7 +152,7 @@ Partial Class frmValidator ' Me.SplitContainerButtons.Panel2.Controls.Add(Me.btnSave) resources.ApplyResources(Me.SplitContainerButtons.Panel2, "SplitContainerButtons.Panel2") - Me.SplitContainerButtons.SplitterPosition = 390 + Me.SplitContainerButtons.SplitterPosition = 303 ' 'SplitContainerReject_NotResp ' @@ -167,7 +167,7 @@ Partial Class frmValidator 'SplitContainerReject_NotResp.Panel2 ' Me.SplitContainerReject_NotResp.Panel2.Controls.Add(Me.btnNotResponsible) - Me.SplitContainerReject_NotResp.SplitterPosition = 197 + Me.SplitContainerReject_NotResp.SplitterPosition = 153 ' 'btnReject ' @@ -515,11 +515,13 @@ Partial Class frmValidator ' 'RibbonControl1 ' + Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(23, 24, 23, 24) Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 39 Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.OptionsMenuMinWidth = 257 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemComboBox2, Me.RepositoryItemComboBox3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index e6f2a60..3240c8e 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -126,10 +126,7 @@ - 2, 358 - - - 4, 4, 4, 4 + 2, 289 Fill @@ -137,9 +134,6 @@ 0, 0 - - 4, 4, 4, 4 - Segoe UI, 9.75pt @@ -194,11 +188,8 @@ 0, 0 - - 4, 4, 4, 4 - - 197, 62 + 153, 50 @@ -292,11 +283,8 @@ 0, 0 - - 4, 4, 4, 4 - - 181, 62 + 140, 50 0 @@ -329,7 +317,7 @@ 1 - 390, 62 + 303, 50 46 @@ -422,11 +410,8 @@ 0, 0 - - 4, 4, 4, 4 - - 432, 62 + 334, 50 2 @@ -462,7 +447,7 @@ 1 - 834, 62 + 647, 50 45 @@ -483,10 +468,7 @@ Fill - 0, 194 - - - 4, 4, 4, 4 + 0, 158 Top, Bottom, Left, Right @@ -495,13 +477,10 @@ Segoe UI, 8.25pt - 8, 72 - - - 4, 4, 4, 4 + 6, 58 - 823, 279 + 639, 225 3 @@ -529,13 +508,10 @@ None - 8, 41 - - - 4, 4, 4, 4 + 6, 33 - 824, 32 + 640, 26 1 @@ -565,13 +541,10 @@ None - 6, 6 - - - 4, 4, 4, 4 + 5, 5 - 824, 35 + 640, 28 1 @@ -597,11 +570,8 @@ 0, 0 - - 4, 4, 4, 4 - - 838, 422 + 651, 341 25 @@ -636,11 +606,8 @@ 0, 0 - - 4, 4, 4, 4 - - 669, 422 + 521, 341 0 @@ -670,13 +637,10 @@ 1 - 1512, 422 + 1176, 341 - 838 - - - 5 + 651 37 @@ -705,11 +669,8 @@ 0, 0 - - 4, 4, 4, 4 - - 1512, 0 + 1176, 0 barDockControlTop @@ -727,13 +688,10 @@ Bottom - 0, 644 - - - 4, 4, 4, 4 + 0, 521 - 1512, 0 + 1176, 0 barDockControlBottom @@ -753,11 +711,8 @@ 0, 0 - - 4, 4, 4, 4 - - 0, 644 + 0, 521 barDockControlLeft @@ -775,13 +730,10 @@ Right - 1512, 0 - - - 4, 4, 4, 4 + 1176, 0 - 0, 644 + 0, 521 barDockControlRight @@ -802,10 +754,10 @@ 82 - 9, 21 + 7, 17 - 1512, 644 + 1176, 521 Tahoma, 8.25pt, style=Bold @@ -1279,9 +1231,6 @@ 0, 0 - - 4, 4, 4, 4 - Datei @@ -1338,16 +1287,13 @@ Combo - 1512, 194 + 1176, 158 - 0, 616 - - - 4, 4, 4, 4 + 0, 499 - 1512, 28 + 1176, 22 RibbonStatusBar1 @@ -1575,7 +1521,7 @@ - 4, 5, 4, 5 + 3, 4, 3, 4 frmValidator @@ -2004,11 +1950,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAABDDlmZmbmVuIChTdHJnK08pBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s + AAAAAAAAPAEAAAAGDAAAABDDlmZmbmVuIChTdHJnK08pBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAAb + dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAAb w5ZmZm5lbiBTaWUgZWluZSBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRl bUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4 E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNz @@ -2040,11 +1986,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAABZTcGVpY2hlcm4gYWxzIChTdHJnK1MpBQgAAAAcRGV2RXhwcmVzcy5VdGls + AAAAAAAAPAEAAAAGDAAAABZTcGVpY2hlcm4gYWxzIChTdHJnK1MpBQgAAAAcRGV2RXhwcmVzcy5VdGls cy5Ub29sVGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50 CE1heFdpZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRl ZmF1bHRCb29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRv - b2xUaXBJdGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAA + b2xUaXBJdGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAA Bg8AAAAYU3BlaWNoZXJuIGRlciBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw SXRlbUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUlu ZGV4E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHBy @@ -2076,11 +2022,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAABBEcnVja2VuIChTdHJnK1ApBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s + AAAAAAAAPAEAAAAGDAAAABBEcnVja2VuIChTdHJnK1ApBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAAN + dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAAN RGF0ZWkgZHJ1Y2tlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMF AAAACEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERp c3RhbmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw @@ -2112,11 +2058,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAAAlWb3JoZXJpZ2UFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt + AAAAAAAAPAEAAAAGDAAAAAlWb3JoZXJpZ2UFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt BwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lkdGgST3du ZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4D AAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFn - ZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAiwEAAAAGDwAAABlWb3JoZXJp + ZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAPAEAAAAGDwAAABlWb3JoZXJp Z2UgU2VpdGUgYW56ZWlnZW4uBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0 aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9U ZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRv @@ -2148,11 +2094,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAAAhOw6RjaHN0ZQUIAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0H + AAAAAAAAPAEAAAAGDAAAAAhOw6RjaHN0ZQUIAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0H AAAADUFsbG93SHRtbFRleHQESWNvbgxJbWFnZU9wdGlvbnMKTGVmdEluZGVudAhNYXhXaWR0aBJPd25l ckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMA AAATU3lzdGVtLkRyYXdpbmcuSWNvbgkAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdl - T3B0aW9ucwIAAAAICAECAAAAAfP////8////AgAAAAoJDgAAAAAAAACLAQAAAAYPAAAAF07DpGNoc3Rl + T3B0aW9ucwIAAAAICAECAAAAAfP////8////AgAAAAoJDgAAAAAAAAA8AQAAAAYPAAAAF07DpGNoc3Rl IFNlaXRlIGFuemVpZ2VuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9u cwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9UZXh0 RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRvb2xU @@ -2184,11 +2130,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAAA9GaW5kZW4gKFN0cmcrRikFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xU + AAAAAAAAPAEAAAAGDAAAAA9GaW5kZW4gKFN0cmcrRikFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xU aXBJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lk dGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJv b2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0 - ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAiwEAAAAGDwAAAAtU + ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAPAEAAAAGDwAAAAtU ZXh0IHN1Y2hlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMFAAAA CEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERpc3Rh bmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSW1h @@ -2268,11 +2214,11 @@ CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAiwEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAApw4RuZGVybiBkZXIg + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl diff --git a/app/TaskFlow/frmValidator.v b/app/TaskFlow/frmValidator.v deleted file mode 100644 index e69de29..0000000 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 1e5d431..f3fb8f5 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -1154,44 +1154,35 @@ Public Class frmValidator MyLookupControl.Properties.PreventDuplicates = oControlRow.Item("VKT_PREVENT_MULTIPLE_VALUES") 'MyLookupControl.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM") MyLookupControl.Properties.MultiSelect = oMultiselect - - Dim oCONID As Integer + Dim oCommandSQL_UBPF Try - oCONID = PreventNulletc(oControlRow.Item("CONNECTION_ID"), "Integer") + oCommandSQL_UBPF = oControlRow.Item("SQL_UEBERPRUEFUNG") + oCommandSQL_UBPF = oControlRow.Item("SQL_UEBERPRUEFUNG") Catch ex As Exception - oCONID = 0 + oCommandSQL_UBPF = "" End Try - - If oCONID > 0 Then - Dim oCommandSQL_UBPF + If oCommandSQL_UBPF <> String.Empty Then Try - oCommandSQL_UBPF = oControlRow.Item("SQL_UEBERPRUEFUNG") - oCommandSQL_UBPF = oControlRow.Item("SQL_UEBERPRUEFUNG") - Catch ex As Exception - oCommandSQL_UBPF = "" - End Try - If oCommandSQL_UBPF <> String.Empty Then - Try - oSQL = PreventNulletc(oControlRow.Item("SQL_UEBERPRUEFUNG"), "String") + oSQL = PreventNulletc(oControlRow.Item("SQL_UEBERPRUEFUNG"), "String") - If clsPatterns.HasOnlySimplePatterns(oSQL) Then - oSQL = clsPatterns.ReplaceInternalValues(oSQL) - oSQL = clsPatterns.ReplaceControlValues(oSQL, PanelValidatorControl, True) + If clsPatterns.HasOnlySimplePatterns(oSQL) Then + oSQL = clsPatterns.ReplaceInternalValues(oSQL) + oSQL = clsPatterns.ReplaceControlValues(oSQL, PanelValidatorControl, True) - Dim oDT As DataTable = GetCachedDatatable(oSQL, oCONID) + Dim oDT As DataTable = GetCachedDatatable(oSQL, 1) - MyLookupControl.Properties.DataSource = Nothing - If Not IsNothing(oDT) AndAlso oDT.Rows.Count > 0 Then - MyLookupControl.Properties.DataSource = oDT - MyLookupControl.Properties.ValueMember = oDT.Columns.Item(0).ColumnName - MyLookupControl.Properties.DisplayMember = oDT.Columns.Item(0).ColumnName - End If + MyLookupControl.Properties.DataSource = Nothing + If Not IsNothing(oDT) AndAlso oDT.Rows.Count > 0 Then + MyLookupControl.Properties.DataSource = oDT + MyLookupControl.Properties.ValueMember = oDT.Columns.Item(0).ColumnName + MyLookupControl.Properties.DisplayMember = oDT.Columns.Item(0).ColumnName End If - Catch ex As Exception - MyValidationLogger.Warn($"Unexpected error in LOOKUP GetValues SQL - Error: {ex.Message}") - End Try + End If + Catch ex As Exception + MyValidationLogger.Warn($"Unexpected error in LOOKUP GetValues SQL - Error: {ex.Message}") + End Try End If - End If + If ObjectEx.NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then MyLookupControl.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")} @@ -2916,12 +2907,14 @@ Public Class frmValidator Sub Load_Next_Document(first As Boolean) + clsPatterns.ClearControlCache() ' Cache-Invalidierung + Dim perfStart As DateTime = DateTime.MinValue Dim perfLastCheck As DateTime = DateTime.MinValue If LOG_HOTSPOTS Then perfStart = DateTime.Now perfLastCheck = perfStart - MyValidationLogger.Info("[PERF] Load_Next_Document START") + MyValidationLogger.Info("[PERF LND] Load_Next_Document START") End If _SqlDataCache.Clear() @@ -2961,7 +2954,7 @@ Public Class frmValidator End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach Get_Next_GUID: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach Get_Next_GUID: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -2972,7 +2965,7 @@ Public Class frmValidator End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach GetDocPathWindows: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach GetDocPathWindows: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -2982,6 +2975,10 @@ Public Class frmValidator End If Else Load_IDB_DOC_DATA() + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF LND] Nach Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If If IsNothing(IDB_DT_DOC_DATA) Then MyValidationLogger.Warn("ATTENTION: IDB-Data is nothing. Check the IDB_DOC_DATA_SQL Variable Source") Exit Sub @@ -2993,7 +2990,7 @@ Public Class frmValidator End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach CreateWMObject/Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach CreateWMObject/Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -3001,7 +2998,7 @@ Public Class frmValidator DatabaseFallback.ExecuteNonQueryECM(sql) If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach IN_WORK-UPDATE: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach IN_WORK-UPDATE: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -3029,7 +3026,7 @@ Public Class frmValidator End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach Windream_get_Doc_info: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach Windream_get_Doc_info: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -3062,14 +3059,14 @@ Public Class frmValidator End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach LoadDocument_DDViewer: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach LoadDocument_DDViewer: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If FillIndexValues(first) If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach FillIndexValues: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach FillIndexValues: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -3096,7 +3093,7 @@ Public Class frmValidator End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach LoadSQLData-Loop: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach LoadSQLData-Loop: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -3175,7 +3172,7 @@ Public Class frmValidator End Try If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach Currency-Format: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach Currency-Format: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") perfLastCheck = DateTime.Now End If @@ -3184,10 +3181,15 @@ Public Class frmValidator Catch ex As Exception MyValidationLogger.Error(ex) End Try + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF LND] Nach Show_WF_Messages: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If Controls2B_EnDisabled() If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Nach Show_WF_Messages + Controls2B_EnDisabled: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Nach Controls2B_EnDisabled: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now End If MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!") @@ -3202,7 +3204,7 @@ Public Class frmValidator PanelValidatorControl.ResumeLayout() End If If LOG_HOTSPOTS Then - MyValidationLogger.Info($"[PERF] Load_Next_Document GESAMT: {(DateTime.Now - perfStart).TotalMilliseconds}ms") + MyValidationLogger.Info($"[PERF LND] Load_Next_Document GESAMT: {(DateTime.Now - perfStart).TotalMilliseconds}ms") End If End Try End Sub @@ -3279,7 +3281,7 @@ Public Class frmValidator Dim oFileName = $"{CURRENT_DOC_ID}.{Current_Document.Extension}" If Not IsNothing(DocumentViewer1) Then If (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then - DocumentViewer1.LoadFile(Current_Document.FullPath) + DocumentViewer1.LoadFile_FromPath(Current_Document.FullPath) 'Erstmal auskommentiert 'DocumentViewer1.LoadFile(oFileName, New MemoryStream(Current_Document.Contents)) Else diff --git a/app/TaskFlow/frmValidatorSearch.Designer.vb b/app/TaskFlow/frmValidatorSearch.Designer.vb index b5e6a1a..259cee8 100644 --- a/app/TaskFlow/frmValidatorSearch.Designer.vb +++ b/app/TaskFlow/frmValidatorSearch.Designer.vb @@ -150,7 +150,7 @@ Partial Class frmValidatorSearch ' Me.SplitContainerControlDoc.Panel2.Controls.Add(Me.DocumentViewer1) resources.ApplyResources(Me.SplitContainerControlDoc.Panel2, "SplitContainerControlDoc.Panel2") - Me.SplitContainerControlDoc.SplitterPosition = 468 + Me.SplitContainerControlDoc.SplitterPosition = 351 ' 'XtraTabControlDocs ' @@ -162,13 +162,12 @@ Partial Class frmValidatorSearch 'XtraTabPageDoc1 ' Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1) - resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1") Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1" + resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1") ' 'GridControlDocSearch1 ' resources.ApplyResources(Me.GridControlDocSearch1, "GridControlDocSearch1") - Me.GridControlDocSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode1.RelationName = "Level1" Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1 @@ -181,7 +180,6 @@ Partial Class frmValidatorSearch Me.GridViewDocSearch1.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch1.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewDocSearch1.DetailHeight = 458 Me.GridViewDocSearch1.GridControl = Me.GridControlDocSearch1 Me.GridViewDocSearch1.Name = "GridViewDocSearch1" Me.GridViewDocSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -196,13 +194,12 @@ Partial Class frmValidatorSearch 'XtraTabPageDoc2 ' Me.XtraTabPageDoc2.Controls.Add(Me.GridControlDocSearch2) - resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2") Me.XtraTabPageDoc2.Name = "XtraTabPageDoc2" + resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2") ' 'GridControlDocSearch2 ' resources.ApplyResources(Me.GridControlDocSearch2, "GridControlDocSearch2") - Me.GridControlDocSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlDocSearch2.MainView = Me.GridViewDocSearch2 Me.GridControlDocSearch2.Name = "GridControlDocSearch2" Me.GridControlDocSearch2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch2}) @@ -213,7 +210,6 @@ Partial Class frmValidatorSearch Me.GridViewDocSearch2.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch2.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewDocSearch2.DetailHeight = 458 Me.GridViewDocSearch2.GridControl = Me.GridControlDocSearch2 Me.GridViewDocSearch2.Name = "GridViewDocSearch2" Me.GridViewDocSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -228,13 +224,12 @@ Partial Class frmValidatorSearch 'XtraTabPageDoc3 ' Me.XtraTabPageDoc3.Controls.Add(Me.GridControlDocSearch3) - resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3") Me.XtraTabPageDoc3.Name = "XtraTabPageDoc3" + resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3") ' 'GridControlDocSearch3 ' resources.ApplyResources(Me.GridControlDocSearch3, "GridControlDocSearch3") - Me.GridControlDocSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlDocSearch3.MainView = Me.GridViewDocSearch3 Me.GridControlDocSearch3.Name = "GridControlDocSearch3" Me.GridControlDocSearch3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch3}) @@ -245,7 +240,6 @@ Partial Class frmValidatorSearch Me.GridViewDocSearch3.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch3.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewDocSearch3.DetailHeight = 458 Me.GridViewDocSearch3.GridControl = Me.GridControlDocSearch3 Me.GridViewDocSearch3.Name = "GridViewDocSearch3" Me.GridViewDocSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -260,13 +254,12 @@ Partial Class frmValidatorSearch 'XtraTabPageDoc4 ' Me.XtraTabPageDoc4.Controls.Add(Me.GridControlDocSearch4) - resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4") Me.XtraTabPageDoc4.Name = "XtraTabPageDoc4" + resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4") ' 'GridControlDocSearch4 ' resources.ApplyResources(Me.GridControlDocSearch4, "GridControlDocSearch4") - Me.GridControlDocSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlDocSearch4.MainView = Me.GridViewDocSearch4 Me.GridControlDocSearch4.Name = "GridControlDocSearch4" Me.GridControlDocSearch4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch4}) @@ -277,7 +270,6 @@ Partial Class frmValidatorSearch Me.GridViewDocSearch4.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch4.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewDocSearch4.DetailHeight = 458 Me.GridViewDocSearch4.GridControl = Me.GridControlDocSearch4 Me.GridViewDocSearch4.Name = "GridViewDocSearch4" Me.GridViewDocSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -292,13 +284,12 @@ Partial Class frmValidatorSearch 'XtraTabPageDoc5 ' Me.XtraTabPageDoc5.Controls.Add(Me.GridControlDocSearch5) - resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5") Me.XtraTabPageDoc5.Name = "XtraTabPageDoc5" + resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5") ' 'GridControlDocSearch5 ' resources.ApplyResources(Me.GridControlDocSearch5, "GridControlDocSearch5") - Me.GridControlDocSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlDocSearch5.MainView = Me.GridViewDocSearch5 Me.GridControlDocSearch5.Name = "GridControlDocSearch5" Me.GridControlDocSearch5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch5}) @@ -309,7 +300,6 @@ Partial Class frmValidatorSearch Me.GridViewDocSearch5.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch5.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewDocSearch5.DetailHeight = 458 Me.GridViewDocSearch5.GridControl = Me.GridControlDocSearch5 Me.GridViewDocSearch5.Name = "GridViewDocSearch5" Me.GridViewDocSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -356,13 +346,12 @@ Partial Class frmValidatorSearch 'XtraTabPageSearch1 ' Me.XtraTabPageSearch1.Controls.Add(Me.GridControlSearch1) - resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1") Me.XtraTabPageSearch1.Name = "XtraTabPageSearch1" + resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1") ' 'GridControlSearch1 ' resources.ApplyResources(Me.GridControlSearch1, "GridControlSearch1") - Me.GridControlSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode2.RelationName = "Level1" Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) Me.GridControlSearch1.MainView = Me.GridViewSearch1 @@ -375,7 +364,6 @@ Partial Class frmValidatorSearch Me.GridViewSearch1.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch1.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewSearch1.DetailHeight = 458 Me.GridViewSearch1.GridControl = Me.GridControlSearch1 Me.GridViewSearch1.Name = "GridViewSearch1" Me.GridViewSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -390,13 +378,12 @@ Partial Class frmValidatorSearch 'XtraTabPageSearch2 ' Me.XtraTabPageSearch2.Controls.Add(Me.GridControlSearch2) - resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2") Me.XtraTabPageSearch2.Name = "XtraTabPageSearch2" + resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2") ' 'GridControlSearch2 ' resources.ApplyResources(Me.GridControlSearch2, "GridControlSearch2") - Me.GridControlSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode3.RelationName = "Level1" Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3}) Me.GridControlSearch2.MainView = Me.GridViewSearch2 @@ -409,7 +396,6 @@ Partial Class frmValidatorSearch Me.GridViewSearch2.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch2.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewSearch2.DetailHeight = 458 Me.GridViewSearch2.GridControl = Me.GridControlSearch2 Me.GridViewSearch2.Name = "GridViewSearch2" Me.GridViewSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -424,13 +410,12 @@ Partial Class frmValidatorSearch 'XtraTabPageSearch3 ' Me.XtraTabPageSearch3.Controls.Add(Me.GridControlSearch3) - resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3") Me.XtraTabPageSearch3.Name = "XtraTabPageSearch3" + resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3") ' 'GridControlSearch3 ' resources.ApplyResources(Me.GridControlSearch3, "GridControlSearch3") - Me.GridControlSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode4.RelationName = "Level1" Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4}) Me.GridControlSearch3.MainView = Me.GridViewSearch3 @@ -443,7 +428,6 @@ Partial Class frmValidatorSearch Me.GridViewSearch3.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch3.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewSearch3.DetailHeight = 458 Me.GridViewSearch3.GridControl = Me.GridControlSearch3 Me.GridViewSearch3.Name = "GridViewSearch3" Me.GridViewSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -458,13 +442,12 @@ Partial Class frmValidatorSearch 'XtraTabPageSearch4 ' Me.XtraTabPageSearch4.Controls.Add(Me.GridControlSearch4) - resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4") Me.XtraTabPageSearch4.Name = "XtraTabPageSearch4" + resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4") ' 'GridControlSearch4 ' resources.ApplyResources(Me.GridControlSearch4, "GridControlSearch4") - Me.GridControlSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode5.RelationName = "Level1" Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5}) Me.GridControlSearch4.MainView = Me.GridViewSearch4 @@ -477,7 +460,6 @@ Partial Class frmValidatorSearch Me.GridViewSearch4.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch4.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewSearch4.DetailHeight = 458 Me.GridViewSearch4.GridControl = Me.GridControlSearch4 Me.GridViewSearch4.Name = "GridViewSearch4" Me.GridViewSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] @@ -492,13 +474,12 @@ Partial Class frmValidatorSearch 'XtraTabPageSearch5 ' Me.XtraTabPageSearch5.Controls.Add(Me.GridControlSearch5) - resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5") Me.XtraTabPageSearch5.Name = "XtraTabPageSearch5" + resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5") ' 'GridControlSearch5 ' resources.ApplyResources(Me.GridControlSearch5, "GridControlSearch5") - Me.GridControlSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) GridLevelNode6.RelationName = "Level1" Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode6}) Me.GridControlSearch5.MainView = Me.GridViewSearch5 @@ -511,7 +492,6 @@ Partial Class frmValidatorSearch Me.GridViewSearch5.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch5.Appearance.SelectedRow.Options.UseBackColor = True - Me.GridViewSearch5.DetailHeight = 458 Me.GridViewSearch5.GridControl = Me.GridControlSearch5 Me.GridViewSearch5.Name = "GridViewSearch5" Me.GridViewSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] diff --git a/app/TaskFlow/frmValidatorSearch.resx b/app/TaskFlow/frmValidatorSearch.resx index 8668086..7b1fad1 100644 --- a/app/TaskFlow/frmValidatorSearch.resx +++ b/app/TaskFlow/frmValidatorSearch.resx @@ -125,32 +125,20 @@ 0, 0 - - 4, 4, 4, 4 - Fill 0, 0 - - 4, 4, 4, 4 - Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 583, 933 + 349, 557 @@ -168,11 +156,8 @@ 0 - - 5, 5, 5, 5 - - 466, 746 + 349, 557 XtraTabPage1 @@ -190,7 +175,7 @@ 0 - 468, 764 + 351, 580 4 @@ -198,17 +183,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 583, 920 + 349, 557 1 @@ -225,11 +204,8 @@ 0 - - 5, 5, 5, 5 - - 466, 736 + 349, 557 XtraTabPage2 @@ -249,17 +225,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 583, 916 + 349, 557 1 @@ -276,11 +246,8 @@ 0 - - 5, 5, 5, 5 - - 466, 733 + 349, 557 XtraTabPage1 @@ -300,17 +267,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 583, 916 + 349, 557 1 @@ -327,11 +288,8 @@ 0 - - 5, 5, 5, 5 - - 466, 733 + 349, 557 XtraTabPage2 @@ -351,17 +309,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 583, 916 + 349, 557 1 @@ -378,11 +330,8 @@ 0 - - 5, 5, 5, 5 - - 466, 733 + 349, 557 XtraTabPage3 @@ -433,10 +382,10 @@ 0, 0 - 5, 5, 5, 5 + 4, 4, 4, 4 - 621, 764 + 503, 580 0 @@ -445,7 +394,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null SplitContainerControlDoc.Panel2 @@ -469,7 +418,7 @@ 1 - 1101, 764 + 864, 580 6 @@ -490,10 +439,7 @@ Fill - 0, 31 - - - 4, 4, 4, 4 + 0, 27 Fill @@ -501,23 +447,14 @@ 0, 0 - - 4, 4, 4, 4 - Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 639, 926 + 344, 560 1 @@ -534,11 +471,8 @@ 0 - - 5, 5, 5, 5 - - 511, 741 + 344, 560 Search1 @@ -556,7 +490,7 @@ 0 - 513, 769 + 346, 583 4 @@ -564,17 +498,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 639, 915 + 511, 560 2 @@ -591,11 +519,8 @@ 0 - - 4, 4, 4, 4 - - 511, 732 + 511, 560 Search2 @@ -615,17 +540,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 639, 915 + 511, 560 2 @@ -642,11 +561,8 @@ 0 - - 4, 4, 4, 4 - - 511, 732 + 511, 560 XtraTabPage1 @@ -666,17 +582,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 639, 915 + 511, 560 2 @@ -693,11 +603,8 @@ 0 - - 4, 4, 4, 4 - - 511, 732 + 511, 560 XtraTabPage2 @@ -717,17 +624,11 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 4, 4, 4, 4 - - 639, 915 + 511, 560 2 @@ -744,11 +645,8 @@ 0 - - 4, 4, 4, 4 - - 511, 732 + 511, 560 XtraTabPage3 @@ -781,22 +679,19 @@ 595, 17 - 115, 20 + 91, 17 No action so far - 0, 20 + 0, 17 - 0, 769 - - - 1, 0, 19, 0 + 0, 583 - 513, 26 + 346, 22 5 @@ -835,22 +730,22 @@ Bottom - 79, 28 + 61, 22 tslblDocID - 115, 28 + 91, 22 No action so far - 0, 764 + 0, 580 - 1101, 31 + 864, 25 3 @@ -883,10 +778,7 @@ 1 - 1619, 795 - - - 5 + 1214, 605 3 @@ -907,13 +799,13 @@ 17, 17 - 184, 26 + 148, 22 Öffnen - 184, 26 + 148, 22 Eigenschaften @@ -922,7 +814,7 @@ Magenta - 79, 28 + 67, 24 Datei @@ -931,7 +823,7 @@ Magenta - 162, 28 + 135, 24 Aktualisiere Ansicht @@ -940,7 +832,7 @@ 0, 0 - 1619, 31 + 1214, 27 0 @@ -981,7 +873,7 @@ - 218, 30 + 189, 30 Eigenschaften Datei @@ -1044,28 +936,28 @@ - 218, 30 + 189, 30 Datei öffnen - 215, 6 + 186, 6 - 218, 30 + 189, 30 Aktualisieren - 218, 30 + 189, 30 Layout zurücksetzen - 219, 130 + 190, 130 ContextMenuStripWMFile @@ -1077,16 +969,16 @@ 423, 17 - 168, 6 + 147, 6 - 171, 30 + 150, 30 Aktualisieren - 172, 40 + 151, 40 ContextMenuStripSQL @@ -1101,10 +993,10 @@ 81 - 8, 17 + 6, 13 - 1619, 826 + 1214, 632 Tahoma, 8.25pt @@ -1142,9 +1034,6 @@ AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAP//AAA= - - 4, 4, 4, 4 - Zusätzliche Suchen diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb index 22ca51c..5b58514 100644 --- a/app/TaskFlow/frmValidatorSearch.vb +++ b/app/TaskFlow/frmValidatorSearch.vb @@ -542,7 +542,7 @@ Public Class frmValidatorSearch If Not IsNothing(DocumentViewer1) Then Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}" If Not IsNothing(oDocument.Contents) Then - DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) + DocumentViewer1.LoadFile_FromPath(clsWMDocGrid.SELECTED_DOC_PATH) ',oFileName, New MemoryStream(oDocument.Contents)) LastDocID = clsWMDocGrid.SELECTED_DOC_ID DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY) If USER_RIGHT_VIEW_ONLY = True Then