diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index bc7df42..6052688 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -122,7 +122,6 @@ Public Class ClassControlCreator oReadOnly = True End If - Return New ControlDBProps() With { .Guid = oGuid, .Name = oControlName, diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 1252b82..8c84bad 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/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 98994dc..d9c5340 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -77,6 +77,12 @@ My Project\app.manifest + + + + + + ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index 6680520..b253692 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -255,7 +255,6 @@ Partial Class frmMain 'GridControlWorkflows ' resources.ApplyResources(Me.GridControlWorkflows, "GridControlWorkflows") - Me.GridControlWorkflows.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlWorkflows.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlWorkflows.MainView = Me.GridViewWorkflows Me.GridControlWorkflows.MenuManager = Me.RibbonControl1 Me.GridControlWorkflows.Name = "GridControlWorkflows" @@ -271,7 +270,6 @@ Partial Class frmMain Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseForeColor = True Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseTextOptions = True Me.GridViewWorkflows.Appearance.ViewCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near - Me.GridViewWorkflows.DetailHeight = 442 Me.GridViewWorkflows.GridControl = Me.GridControlWorkflows Me.GridViewWorkflows.Name = "GridViewWorkflows" Me.GridViewWorkflows.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] @@ -291,13 +289,11 @@ Partial Class frmMain ' 'RibbonControl1 ' - Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(37, 38, 37, 38) Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles, Me.bsitmCount}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 57 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.OptionsMenuMinWidth = 403 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize}) Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 79dc8de..a9a6a92 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAWgBCwFoAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXABCwFwAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -176,19 +176,13 @@ Fill - - 4, 4, 4, 4 - - 285, 30 + 233, 24 Segoe UI, 12pt - - 4, 4, 4, 4 - Aktualisieren @@ -1499,12 +1493,36 @@ 0, 0 - - 4, 4, 4, 4 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Workflow + + + Funktionen/App Start + + + Ad Hoc Workflows Start + + Funktionen + + + Workflow Tabelle + Tabelle @@ -1512,16 +1530,13 @@ Aktionen - 1440, 194 + 1178, 158 - 0, 841 - - - 4, 4, 4, 4 + 0, 666 - 1440, 28 + 1178, 22 RibbonStatusBar1 @@ -1548,7 +1563,7 @@ 4 - 1155, 617 + 945, 484 10 @@ -1565,6 +1580,24 @@ 0 + + True + + + Tahoma, 9.75pt, style=Bold + + + 3, 3 + + + 127, 16 + + + 0 + + + Choose a profile ... + lblCaptionMainGrid @@ -1581,13 +1614,10 @@ Top - 285, 0 - - - 4, 4, 4, 4 + 233, 0 - 1155, 30 + 945, 24 9 @@ -1659,8 +1689,14 @@ 863, 17 + + 219, 26 + + + Starte Validierung für Profil + - 262, 30 + 220, 30 cmsNavPane @@ -1790,14 +1826,11 @@ 0, 0 - - 4, 4, 4, 4 - - 285 + 233 - 285, 647 + 233, 508 5 @@ -1824,13 +1857,10 @@ Tahoma, 9pt - 0, 194 - - - 4, 4, 4, 4 + 0, 158 - 1440, 647 + 1178, 508 4 @@ -1847,72 +1877,6 @@ 2 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Workflow - - - Funktionen/App Start - - - Ad Hoc Workflows - - - Funktionen - - - Workflow Tabelle - - - True - - - Tahoma, 9.75pt, style=Bold - - - 4, 4 - - - 4, 0, 4, 0 - - - 169, 21 - - - 0 - - - Choose a profile ... - - - lblCaptionMainGrid - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel2 - - - 0 - - - 261, 26 - - - Starte Validierung für Profil - 17, 56 @@ -1922,8 +1886,29 @@ 250, 56 + + 290, 30 + + + Popup Erinnerung deaktivieren + + + 287, 6 + + + 290, 30 + + + In den Vordergrund + + + 290, 30 + + + Out of Range - Fenster wiederherstellen + - 349, 100 + 291, 100 ContextMenuNotifyIcon @@ -2017,27 +2002,6 @@ True - - 348, 30 - - - Popup Erinnerung deaktivieren - - - 345, 6 - - - 348, 30 - - - In den Vordergrund - - - 348, 30 - - - Out of Range - Fenster wiederherstellen - 605, 17 @@ -2063,13 +2027,10 @@ Bottom - 0, 869 - - - 4, 4, 4, 4 + 0, 688 - 1440, 0 + 1178, 0 barDockControlBottom @@ -2089,11 +2050,8 @@ 0, 0 - - 4, 4, 4, 4 - - 0, 869 + 0, 688 barDockControlLeft @@ -2111,13 +2069,10 @@ Right - 1440, 0 - - - 4, 4, 4, 4 + 1178, 0 - 0, 869 + 0, 688 barDockControlRight @@ -2138,10 +2093,10 @@ 147 - 11, 24 + 9, 19 - 1440, 869 + 1178, 688 Tahoma, 12pt @@ -2313,7 +2268,7 @@ - 5, 6, 5, 6 + 4, 5, 4, 5 Manual @@ -3474,9 +3429,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -3489,6 +3441,9 @@ Bars + + &Hintergrund + PDF Dokument @@ -3603,11 +3558,8 @@ Graphisches Dokument - - 4, 4, 4, 4 - - 1440, 0 + 1178, 0 barDockControlTop diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index bb881d0..4c3f61c 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -1633,7 +1633,7 @@ Public Class frmValidator Dim oControlname2Set = oRow.Item("NAME") MyValidationLogger.Debug($"Workin on SetControLValue for {oControlname2Set} ...") - Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", -1) + Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", 0) Dim oControlDataSql = oRow.ItemEx("SET_CONTROL_DATA", String.Empty) If oConnectionId = -1 Or oControlDataSql = String.Empty Then @@ -3317,7 +3317,9 @@ Public Class frmValidator oIndexName = oSourceIndexName oControName = oControl.Name Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE") - + If oIndexName = "@@DISPLAY_ONLY" Then + oLoadIndex = False + End If MyValidationLogger.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString) @@ -3377,7 +3379,7 @@ Public Class frmValidator MyValidationLogger.Debug("Value from Source: [{0}]", oValueFromSource) Try - 'Dim oFormatString As String = oControlRow.ItemEx("CTRL_FORMAT_STRING", "") + Dim oFormatString As String = oControlRow.ItemEx("CTRL_FORMAT_STRING", "") 'oFormattedValue = ClassFormat.GetFormattedValue(oControl.Name, oValueFromSource, oFormatString) 'If Not IsNothing(oFormattedValue) And oFormattedValue <> String.Empty Then @@ -5012,7 +5014,6 @@ Public Class frmValidator oMissing = True oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'" - MyValidationLogger.Warn(oErrMsgMissingInput) If oRegexMessage <> String.Empty Then oErrMsgMissingInput &= ":" & vbCrLf & oRegexMessage @@ -6301,7 +6302,9 @@ Public Class frmValidator End If End If Next - + Dim oIncludeFI As Boolean = False + OverrideAll = True + Override = True Override_SQLCommand = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True) Dim oCaption As String = "Bestätigung - " If USER_LANGUAGE <> "de-DE" Then @@ -6311,6 +6314,30 @@ Public Class frmValidator frmDialog.ShowDialog() ' result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) If frmDialog.DialogResult = DialogResult.OK Then + Dim oOverrideDT As DataTable = DatabaseFallback.GetDatatableECM(Override_SQLCommand) + If Not IsNothing(oOverrideDT) Then + If oOverrideDT.Rows.Count = 1 Then + Try + OverrideAll = oOverrideDT?.Rows(0).Item("OverrideAll") + Catch ex As Exception + MyValidationLogger.Warn($"Could not set OverrideAll {ex.Message}") + End Try + Try + oIncludeFI = oOverrideDT?.Rows(0).Item("IncludeFI") + Catch ex As Exception + MyValidationLogger.Warn($"Could not set oIncludeFI {ex.Message}") + End Try + Else + MyValidationLogger.Info(String.Format("Result of oProfile_NOT_RESP_SQL did not delivered a Datatable - OverrideAll = True")) + End If + Else + MyValidationLogger.Warn(String.Format("oProfile_NOT_RESP_SQL returned Nothing - OverrideAll = True")) + End If + + If OverrideAll = True Then + MyValidationLogger.Info($"CURRENT_DOC_ID: {CURRENT_DOC_ID} - OverrideAll will be in Action!") + End If + 'For Each oControl As Control In PanelValidatorControl.Controls ' If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Attribute = PROFIL_NOT_RESP_COMMENT_ATTR Then @@ -6335,8 +6362,7 @@ Public Class frmValidator End If - OverrideAll = True - Override = True + Finish_WFStep() End If End Sub diff --git a/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll new file mode 100644 index 0000000..b9ba4a3 Binary files /dev/null and b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll differ diff --git a/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.filters.64.dll b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.filters.64.dll new file mode 100644 index 0000000..0f3e367 Binary files /dev/null and b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.filters.64.dll differ diff --git a/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.image.gdimgplug.64.dll b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.image.gdimgplug.64.dll new file mode 100644 index 0000000..80b0cf9 Binary files /dev/null and b/app/TaskFlow/lib/GdPicture14/GdPicture.NET.14.image.gdimgplug.64.dll differ