diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index 40d09f5..95e2e06 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -559,8 +559,8 @@ Public Class ClassControlCreator Dim oDataTable = oGridControlCreator.CreateGridColumns(DT_MY_COLUMNS) GridTables = oGridControlCreator.FillGridTables(DT_MY_COLUMNS, oControlId, oControl.Name) - oView.PopulateColumns(oDatatable) - oControl.DataSource = oDatatable + oView.PopulateColumns(oDataTable) + oControl.DataSource = oDataTable oControl.RefreshDataSource() oControl.ForceInitialize() @@ -824,7 +824,7 @@ Public Class ClassControlCreator If oMeta.Guid = oControlId AndAlso TypeOf oControl Is GridControl Then Dim oGrid As GridControl = DirectCast(oControl, GridControl) DirectCast(oGrid.FocusedView, GridView).FocusInvalidRow() - Logger.Info("Force-setting Editor for Grid [{0}]", oGrid.Name) + Logger.Debug("Force-setting Editor for Grid [{0}]", oGrid.Name) Exit For End If Catch ex As Exception diff --git a/app/TaskFlow/clsPatterns.vb b/app/TaskFlow/clsPatterns.vb index 2a96c94..b0f89d6 100644 --- a/app/TaskFlow/clsPatterns.vb +++ b/app/TaskFlow/clsPatterns.vb @@ -198,9 +198,10 @@ Public Class clsPatterns While ContainsPattern(oResult, PATTERN_CTRL) If oTryCounter > MAX_TRY_COUNT Then - LOGGER.Warn($"Max tries in ReplaceControlValues exceeded - Replacing with [0]") + LOGGER.Info($"Max tries in ReplaceControlValues exceeded - Replacing PATTERN_CTRL [{PATTERN_CTRL}] with [0]") + LOGGER.Info($"oResult so far is:{oResult}") oResult = ReplacePattern(oResult, PATTERN_CTRL, 0) - Throw New Exception($"Max tries in ReplaceControlValues exceeded - Result so far [{oResult}].") + Exit While End If Dim oControlName As String = GetNextPattern(oResult, PATTERN_CTRL).Value @@ -255,9 +256,8 @@ Public Class clsPatterns ElseIf oLookupControl3.Properties.SelectedValues.Count = 1 Then LOGGER.Debug($"LookupControl3 mit genau einem Value") oReplaceValue = oLookupControl3.Properties.SelectedValues(0) - Else - LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!") + ' LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!") oReplaceValue = ERROR_REPLACE_VALUE End If LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}") diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 1aa525c..72f9431 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -90,7 +90,6 @@ Partial Class frmValidator Me.barbtnitmExport = New DevExpress.XtraBars.BarButtonItem() Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem() Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem() - Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() Me.bbtnitmInfoWorkflow = New DevExpress.XtraBars.BarButtonItem() Me.bchkitmNotes = New DevExpress.XtraBars.BarCheckItem() Me.BarButtonGroup1 = New DevExpress.XtraBars.BarButtonGroup() @@ -515,7 +514,7 @@ Partial Class frmValidator 'RibbonControl1 ' 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.BarButtonItem6, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1}) + 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 = 38 Me.RibbonControl1.Name = "RibbonControl1" @@ -692,16 +691,6 @@ Partial Class frmValidator Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True Me.Attmnt_bbtnitm_LoadonClick.Name = "Attmnt_bbtnitm_LoadonClick" ' - 'BarButtonItem6 - ' - resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") - Me.BarButtonItem6.Id = 32 - Me.BarButtonItem6.ImageOptions.Image = CType(resources.GetObject("BarButtonItem6.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem6.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem6.Name = "BarButtonItem6" - Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large - Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - ' 'bbtnitmInfoWorkflow ' resources.ApplyResources(Me.bbtnitmInfoWorkflow, "bbtnitmInfoWorkflow") @@ -746,10 +735,10 @@ Partial Class frmValidator ' 'RbnPgGrpActions ' + Me.RbnPgGrpActions.AllowTextClipping = False Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniNext) Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniDelete) Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniAnnotation) - Me.RbnPgGrpActions.ItemLinks.Add(Me.BarButtonItem6) Me.RbnPgGrpActions.Name = "RbnPgGrpActions" resources.ApplyResources(Me.RbnPgGrpActions, "RbnPgGrpActions") Me.RbnPgGrpActions.Visible = False @@ -939,7 +928,6 @@ Partial Class frmValidator Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents Attmnt_bbtnitm_LoadonClick As DevExpress.XtraBars.BarCheckItem - Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem Friend WithEvents pnlMain As DevExpress.XtraEditors.PanelControl Friend WithEvents btnSave As DevExpress.XtraEditors.SimpleButton Friend WithEvents DESCRIPTIONLabel As DevExpress.XtraEditors.LabelControl diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index 9be6b41..1133dc4 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -619,7 +619,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 @@ -1179,38 +1179,6 @@ Tahoma, 8.25pt, style=Bold - - Beleg anzeigen - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAExSURB - VDhPpZKxSsRQFET3Nyy18wOExcYv8G/0B+TAgkXKgAhmyzQWgsViY7FFZItsFFJobyMuWggLJuHKPHzh - mSgavDBwM3dmktz3RmY2+g96xFD0CGAXOI3j2CaTiQPwIE6zrj40bgJX0+nUlsulrVYrq+vaQb04zaSR - 9ksAsAe8ZFlmqrd1Zdd3j3Z4duOew5JGWnlcALANvJZl2ZqPz29t/2jm8F1JK4+8CpgtFot2qDd7808B - KnnkVcC6qqp2oM/+S4A88v4aECLcSRhw4Zen6v5CCM18AQfyKmALeC6Kwg26S/QQp5lKWnnk9ce4E0WR - zefzNsQfo6Dem6UBnuTpXqSNNE0tSRLL89xdnqZpHNSLAzLgUtreTQyCxsAJcA+8f0K9uHFX3wsYih4x - FB8q0AjdQAvTBwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAJSSURB - VFhHxZY9i1NBFIZ3/RNbbG1nJf4Nuy232dY/IcpavRYLW22ZEAvLEEIkkJRiYZYQi7QmYiCYRTTICgmO - PNe5YXJmbj4WvR544XLmnPc8k/sxOXDOHfxPRYmyFSXKVpQoW1GibEWJshUlNknSI0kvJHUkfZb004tr - cqxRQ20k67cTgKR7kk4lfZDkdhS19NB7dwBJDyT1cuNqteq63a4bjUZuPp+7xWKRiWtyrFETgNCLx/4A - kp5IusWoVqu5fr/vdg1q6fEQeOAVzUgCSDrUn8gMWq3WmvmXb7eu/u6je/rqvTt92V1bs0Fv8GsQh3Ze - CuAibxoOh2uGw09f3fnra/f4+ZuVtgUeAcSFnWeHn+XFk8lkzYid2+G7ABB4BRBnSQBJx5J+UDQYDKxH - 9rPb4bsCEHh6AGYcpwCuKGg0GrY3C+65Hb4PAIG3h7hKAdywOJvNbF8WPHB2+L4AeHuAmxTAjMXpdGr7 - sigCSKno7cDbA7DLCOCSxXq9bvuyKLoFKVGbCrw9wGUK4EjSdwra7bbtLXwIU6LWBp5+ODOOIgAPcSLp - F4Xj8XjNoOg1tKKG2jDw8sPxPglnrgF4iPP8nbWf39SHyA6nJgw8cj+87bwIwEI0m023XC5XhvZTjLgm - F+6cHno3DS8E8BAcp9kzUalUXK/XW5lvC2rpCe45XtGMjQAe4r6kt/kuMO10OoXHMWvBYEQvHvsfxwEE - pyMP53VgvE3U0kNvNvzOAAbmoaRnG/6SsUbNauhfBfgXihJlK0qUrShRtqJE2YoSZes3UL0KST/PhM0A - AAAASUVORK5CYII= - - Anzeigen @@ -1861,12 +1829,6 @@ DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem6 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - bbtnitmInfoWorkflow diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 1ec5145..a092625 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -105,7 +105,7 @@ Public Class frmValidator Private ControlCreator As ClassControlCreator Private PerformanceLogger As Logger Private Validator As Validator - Private Const LOG_PERF = True + Private Const LOG_PERF = False Private ReadOnly MyValidationLogger As Logger Private Property OperationMode As OperationMode @@ -398,7 +398,7 @@ Public Class frmValidator 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 + If (oProfileNotResponsibleQuestion <> String.Empty Or oProfileNotResponsibleText <> String.Empty) And oProfile_NOT_RESP_SQL <> String.Empty Then If IDB_ACTIVE = True Then functBtnNR = True End If @@ -2482,7 +2482,7 @@ Public Class frmValidator End Try Try - Amount_Docs2Validate = oDT.Rows(0).Item(2) + Amount_Docs2Validate = CInt(oDT.Rows(0).Item(2)) MyValidationLogger.Debug($"Get_Next_GUID: Amount_Docs2Validate [{Amount_Docs2Validate}]...") Catch ex As Exception Amount_Docs2Validate = 0 @@ -2560,25 +2560,23 @@ Public Class frmValidator WMDocPathWindows = String.Empty If OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then + Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" + oResult = DatabaseFallback.GetScalarValueECM(oSQL) + MyValidationLogger.Debug($"First Checking file [{oResult}] exists?...") If File.Exists(oResult) = False Then - Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" - oResult = DatabaseFallback.GetScalarValueECM(oSQL) - MyValidationLogger.Debug($"Checking file 0 [{oResult}] exists?...") - DocPathWindows = oResult - MyValidationLogger.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...") + MyValidationLogger.Info($"Getting filepath with standard 1 ...") oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" - oResult = DatabaseFallback.GetScalarValueECM(oSQL) - - MyValidationLogger.Debug($"Checking file 1[{oResult}] exists?...") + MyValidationLogger.Debug($"Second Checking file [{oResult}] exists?...") If File.Exists(oResult) = False Then - MyValidationLogger.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!") + MyValidationLogger.Info($"Second FileExists also returned false [{oResult}]!") DocPathWindows = oResult MyValidationLogger.Warn($"GetDocPathWindows: File [{oResult}] not existing!") Return False End If - End If + DocPathWindows = oResult + Else oResult = ClassConstants.OpModeFS_ZF MyValidationLogger.Debug($"GetDocPathWindows: Filestore is {ClassConstants.OpModeFS_ZF}") @@ -2678,8 +2676,10 @@ Public Class frmValidator ' ############ Infos eintragen ################# - If Amount_Docs2Validate > 1 Then + If Amount_Docs2Validate >= 1 Then Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate) + bsiInformation.Caption = omsg + bsiInformation.Caption = omsg If RbnPgGrpActions.Visible = False Then RbnPgGrpActions.Visible = True @@ -2687,6 +2687,10 @@ Public Class frmValidator bbtniNext.Visibility = BarItemVisibility.Always Else bbtniNext.Visibility = BarItemVisibility.Never + If bbtniDelete.Visibility = BarItemVisibility.Never And bbtniAnnotation.Visibility = BarItemVisibility.Never Then + RbnPgGrpActions.Visible = False + End If + bsiInformation.Caption = "" End If bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID @@ -3377,7 +3381,6 @@ Public Class frmValidator MyValidationLogger.Warn($"Unexpected error in Set Backcolor [{oControl.Name}]: {ex.Message}") MyValidationLogger.Error(ex) End Try - ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER) Catch ex As Exception @@ -5953,8 +5956,14 @@ Public Class frmValidator Sub SetStatusLabel(infotext As String, Optional pColor As String = "") bsiInformation.Caption = infotext & " " & Now.ToString If pColor <> String.Empty Then - bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor) - bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor)) + Try + bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor) + bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor)) + Catch ex As Exception + bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent + bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black + End Try + Else bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black @@ -6254,8 +6263,7 @@ Public Class frmValidator End If Next - - oProfile_NOT_RESP_SQL = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True) + Override_SQLCommand = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True) Dim oCaption As String = "Bestätigung - " If USER_LANGUAGE <> "de-DE" Then oCaption = "Confirmation - " @@ -6289,7 +6297,6 @@ Public Class frmValidator End If OverrideAll = True - Override_SQLCommand = oProfile_NOT_RESP_SQL Override = True Finish_WFStep() End If