From 968435c3f7612041b2c21e4840d844542c78ec96 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 22 Mar 2019 16:26:15 +0100 Subject: [PATCH] First Pass of new control loader add BaseClass that provides Logger --- EDMI_ClientSuite/Base/BaseClass.vb | 13 ++ .../{FormDefaults => Base}/BaseForm.vb | 0 .../{FormDefaults => Base}/BaseRibbonForm.vb | 0 EDMI_ClientSuite/ClassControlLoader.vb | 57 +++++++++ EDMI_ClientSuite/ClassService.vb | 16 +-- EDMI_ClientSuite/ClassTimer.vb | 16 +-- EDMI_ClientSuite/ClientSuite.vbproj | 23 +++- .../frmFormDesigner.Designer.vb | 13 +- .../FormEntityDesigner/frmFormDesigner.vb | 66 ++-------- .../FormUserManager/frmUserManager.vb | 10 +- .../FormWorkflow/frmWorkflowStep.Designer.vb | 108 ++++++++++++++++ .../FormWorkflow/frmWorkflowStep.resx | 120 ++++++++++++++++++ .../FormWorkflow/frmWorkflowStep.vb | 3 + EDMI_ClientSuite/My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 10 ++ EDMI_ClientSuite/My Project/Resources.resx | 7 +- EDMI_ClientSuite/Resources/CheckBox.png | Bin 0 -> 229 bytes EDMI_ClientSuite/_TEST/frmDocTest.vb | 7 +- 18 files changed, 378 insertions(+), 93 deletions(-) create mode 100644 EDMI_ClientSuite/Base/BaseClass.vb rename EDMI_ClientSuite/{FormDefaults => Base}/BaseForm.vb (100%) rename EDMI_ClientSuite/{FormDefaults => Base}/BaseRibbonForm.vb (100%) create mode 100644 EDMI_ClientSuite/ClassControlLoader.vb create mode 100644 EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb create mode 100644 EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.resx create mode 100644 EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb create mode 100644 EDMI_ClientSuite/Resources/CheckBox.png diff --git a/EDMI_ClientSuite/Base/BaseClass.vb b/EDMI_ClientSuite/Base/BaseClass.vb new file mode 100644 index 00000000..c26058a1 --- /dev/null +++ b/EDMI_ClientSuite/Base/BaseClass.vb @@ -0,0 +1,13 @@ +Imports DigitalData.Modules.Logging + +Public Class BaseClass + Protected LogConfig As LogConfig + Protected Logger As Logger + + Public Sub New(LogConfig As LogConfig) + Dim oClassName = Me.GetType().Name + + Me.LogConfig = LogConfig + Me.Logger = LogConfig.GetLogger(oClassName) + End Sub +End Class diff --git a/EDMI_ClientSuite/FormDefaults/BaseForm.vb b/EDMI_ClientSuite/Base/BaseForm.vb similarity index 100% rename from EDMI_ClientSuite/FormDefaults/BaseForm.vb rename to EDMI_ClientSuite/Base/BaseForm.vb diff --git a/EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb b/EDMI_ClientSuite/Base/BaseRibbonForm.vb similarity index 100% rename from EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb rename to EDMI_ClientSuite/Base/BaseRibbonForm.vb diff --git a/EDMI_ClientSuite/ClassControlLoader.vb b/EDMI_ClientSuite/ClassControlLoader.vb new file mode 100644 index 00000000..bbb02219 --- /dev/null +++ b/EDMI_ClientSuite/ClassControlLoader.vb @@ -0,0 +1,57 @@ +Imports DevExpress.XtraEditors +Imports DevExpress.XtraLayout +Imports DigitalData.Controls.LookupGrid +Imports DigitalData.Modules.Logging + +Public Class ClassControlLoader + Inherits BaseClass + + Public Sub New(LogConfig As LogConfig) + MyBase.New(LogConfig) + End Sub + + Public Sub LoadControls(Datatable As DataTable, LayoutControlGroup As LayoutControlGroup) + For Each oRow As DataRow In Datatable.Rows + Dim oCaption As String = oRow.Item("COLNAME") + Dim oControlType As String = oRow.Item("CTRLTYPE") + Dim oControlId As String = oRow.Item("RECORD_ID").ToString + Dim oEditor As BaseEdit = CreateLayoutControl(oControlType, oControlId) + + If oEditor Is Nothing Then + Continue For + End If + + LayoutControlGroup.AddItem(oCaption, oEditor) + Next + + LayoutControlGroup.AddItem(New EmptySpaceItem()) + End Sub + + Public Function CreateLayoutControl(Type As String, Name As String) + Dim oEditor As BaseEdit = Nothing + + Logger.Debug("Create new Control of type {0} with name {1}", Type, Name) + + Select Case Type + Case ClassConstants.CONTROL_TEXTEDIT + Dim oTextEdit As New TextEdit() With {.Name = Name} + oEditor = oTextEdit + Case ClassConstants.CONTROL_MEMOEDIT + Dim oMemoEdit As New MemoEdit() With {.Name = Name} + oEditor = oMemoEdit + Case ClassConstants.CONTROL_DATEEDIT + Dim oDateEdit As New DateEdit() With {.Name = Name} + oEditor = oDateEdit + Case ClassConstants.CONTROL_CHECKEDIT + Dim oCheckEdit As New CheckEdit() With {.Name = Name} + oEditor = oCheckEdit + Case ClassConstants.CONTROL_COMBOEDIT + Dim oComboEdit As New LookupControl2() With {.Name = Name} + oEditor = oComboEdit + Case Else + oEditor = Nothing + End Select + + Return oEditor + End Function +End Class diff --git a/EDMI_ClientSuite/ClassService.vb b/EDMI_ClientSuite/ClassService.vb index b6214241..68764999 100644 --- a/EDMI_ClientSuite/ClassService.vb +++ b/EDMI_ClientSuite/ClassService.vb @@ -4,8 +4,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference Public Class ClassService - Private ReadOnly _LogConfig As LogConfig - Private ReadOnly _Logger As Logger + Inherits BaseClass Public Enum ConnectionTestResult Successful @@ -15,8 +14,7 @@ Public Class ClassService End Enum Public Sub New(LogConfig As LogConfig) - _LogConfig = LogConfig - _Logger = _LogConfig.GetLogger() + MyBase.New(LogConfig) End Sub Public Function TestConnection() As ConnectionTestResult @@ -33,10 +31,10 @@ Public Class ClassService Return ConnectionTestResult.Successful Catch ex As EndpointNotFoundException - _Logger.Error(ex) + Logger.Error(ex) Return ConnectionTestResult.NotFound Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) Return ConnectionTestResult.Unknown End Try End Function @@ -56,13 +54,13 @@ Public Class ClassService Return ConnectionTestResult.Successful Catch ex As EndpointNotFoundException - _Logger.Error(ex) + Logger.Error(ex) Return ConnectionTestResult.NotFound Catch ex As UriFormatException - _Logger.Error(ex) + Logger.Error(ex) Return ConnectionTestResult.EmptyURI Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) Return ConnectionTestResult.Unknown End Try End Function) diff --git a/EDMI_ClientSuite/ClassTimer.vb b/EDMI_ClientSuite/ClassTimer.vb index 7862b158..7a02f880 100644 --- a/EDMI_ClientSuite/ClassTimer.vb +++ b/EDMI_ClientSuite/ClassTimer.vb @@ -5,6 +5,8 @@ Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference Imports DigitalData.Modules.Logging Public Class ClassTimer + Inherits BaseClass + Private _Callback As TimerCallback Private _LogConfig As LogConfig Private _Logger As Logger @@ -15,10 +17,9 @@ Public Class ClassTimer Public Delegate Sub OnlineChangedEventHandler(sender As Object, Online As Boolean) Public Sub New(LogConfig As LogConfig, SynchronizingObject As frmMain, HeartbeatInterval As Integer) - Try - _LogConfig = LogConfig - _Logger = LogConfig.GetLogger() + MyBase.New(LogConfig) + Try _Channel = My.ChannelFactory.CreateChannel() _Channel.Open() @@ -29,13 +30,13 @@ Public Class ClassTimer AddHandler _Timer.Elapsed, AddressOf Callback Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) End Try End Sub Public Async Sub Callback(sender As Object, e As ElapsedEventArgs) Try - _Logger.Debug("Checking if Service is up...") + Logger.Debug("Checking if Service is up...") If _Channel.State = ServiceModel.CommunicationState.Faulted Then _Channel = My.ChannelFactory.CreateChannel() @@ -44,12 +45,11 @@ Public Class ClassTimer ' Connect to service and send hearbeat request Dim oResult = Await _Channel.HeartbeatAsync() - - _Logger.Debug("Service is online") + Logger.Debug("Service is online") SetOnlineState(True) Catch ex As Exception - _Logger.Debug("Service is offline!") + Logger.Debug("Service is offline!") SetOnlineState(False) Finally diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj index 73b9b4f0..6c6e2082 100644 --- a/EDMI_ClientSuite/ClientSuite.vbproj +++ b/EDMI_ClientSuite/ClientSuite.vbproj @@ -127,9 +127,12 @@ - + + + + @@ -139,6 +142,7 @@ + @@ -147,6 +151,12 @@ Form + + frmWorkflowStep.vb + + + Form + frmSearch.vb @@ -206,10 +216,10 @@ Form - + Form - + Form @@ -311,6 +321,9 @@ frmFormDesigner.vb + + frmWorkflowStep.vb + frmSearch.vb @@ -467,5 +480,9 @@ + + + + \ No newline at end of file diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb index 03f929b7..759e552e 100644 --- a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb @@ -31,6 +31,7 @@ Partial Class frmFormDesigner Me.ToolboxItemMemoedit = New DevExpress.XtraToolbox.ToolboxItem() Me.ToolboxItemDatepicker = New DevExpress.XtraToolbox.ToolboxItem() Me.ToolboxItemCombobox = New DevExpress.XtraToolbox.ToolboxItem() + Me.ToolboxItemCheckbox = New DevExpress.XtraToolbox.ToolboxItem() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageControls = New DevExpress.XtraTab.XtraTabPage() @@ -105,7 +106,6 @@ Partial Class frmFormDesigner Me.ToolboxControlMain.Name = "ToolboxControlMain" Me.ToolboxControlMain.OptionsMinimizing.AllowMinimizing = False Me.ToolboxControlMain.OptionsView.ShowMenuButton = False - Me.ToolboxControlMain.OptionsView.ShowToolboxCaption = True Me.ToolboxControlMain.SelectedGroup = Me.ToolboxGroupMain Me.ToolboxControlMain.SelectedGroupIndex = 0 Me.ToolboxControlMain.Size = New System.Drawing.Size(232, 337) @@ -120,6 +120,7 @@ Partial Class frmFormDesigner Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemMemoedit) Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemDatepicker) Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemCombobox) + Me.ToolboxGroupMain.Items.Add(Me.ToolboxItemCheckbox) Me.ToolboxGroupMain.Name = "ToolboxGroupMain" ' 'ToolboxItemTextbox @@ -154,6 +155,14 @@ Partial Class frmFormDesigner Me.ToolboxItemCombobox.Name = "ToolboxItemCombobox" Me.ToolboxItemCombobox.Tag = "Combobox" ' + 'ToolboxItemCheckbox + ' + Me.ToolboxItemCheckbox.BeginGroupCaption = Nothing + Me.ToolboxItemCheckbox.Caption = "Checkbox" + Me.ToolboxItemCheckbox.ImageOptions.Image = Global.DigitalData.GUIs.ClientSuite.My.Resources.Resources.CheckBox + Me.ToolboxItemCheckbox.Name = "ToolboxItemCheckbox" + Me.ToolboxItemCheckbox.Tag = "Checkbox" + ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.Name = "RibbonPageGroup1" @@ -162,6 +171,7 @@ Partial Class frmFormDesigner 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageControls @@ -250,4 +260,5 @@ Partial Class frmFormDesigner Friend WithEvents PropertyGridControl1 As DevExpress.XtraVerticalGrid.PropertyGridControl Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents ToolboxItemCombobox As DevExpress.XtraToolbox.ToolboxItem + Friend WithEvents ToolboxItemCheckbox As DevExpress.XtraToolbox.ToolboxItem End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb index d0428835..833a63ac 100644 --- a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb @@ -7,6 +7,9 @@ Imports DevExpress.XtraLayout.HitInfo Imports DigitalData.Controls.LookupGrid Public Class frmFormDesigner + Private _FormId As Int64 + Private _ControlLoader As ClassControlLoader + #Region "Drag Helper" Private _DragItem As BaseLayoutItem Private _Window As DragFrameWindow @@ -42,7 +45,7 @@ Public Class frmFormDesigner Dim oHitInfo As BaseLayoutItemHitInfo = LayoutControlMain.CalcHitInfo(oPosition) Dim oLayoutControl As LayoutControlItem = DirectCast(_DragItem, LayoutControlItem) Dim oControlName As String = oLayoutControl.Tag & ClassUtils.ShortGUID() - Dim oControl As Control = GetControl(oLayoutControl.Tag, oControlName) + Dim oControl As Control = _ControlLoader.CreateLayoutControl(oLayoutControl.Tag, oControlName) If oLayoutControl IsNot Nothing Then HideDragHelper() @@ -84,7 +87,7 @@ Public Class frmFormDesigner End Sub #End Region - Private _FormId As Int64 + Public Sub New() ' Dieser Aufruf ist für den Designer erforderlich. @@ -100,69 +103,18 @@ Public Class frmFormDesigner _FormId = FormId End Sub - Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles MyBase.Load - My.Channel.CreateDatabaseRequest("Load Controls", True) + Private Async Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles MyBase.Load + _ControlLoader = New ClassControlLoader(My.LogConfig) - Dim oSQL As String = $"SELECT * FROM VWICM_FORMCONTROL WHERE FORMID = {_FormId}" - Dim oResult = My.Channel.ReturnDatatable(oSQL) - Dim oTable = oResult.Table + Dim oTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId) - If Not oResult.OK Then - ShowErrorMessage(New ApplicationException(oResult.ErrorMessage)) - End If - - My.Channel.CloseDatabaseRequest() - - LoadControls(oTable) + _ControlLoader.LoadControls(oTable, LayoutControlGroupMain) End Sub - Private Function GetControl(Type As String, Name As String) - Dim oEditor As BaseEdit = Nothing - - Select Case Type - Case ClassConstants.CONTROL_TEXTEDIT - Dim oTextEdit As New TextEdit() With {.Name = Name} - oEditor = oTextEdit - Case ClassConstants.CONTROL_MEMOEDIT - Dim oMemoEdit As New MemoEdit() With {.Name = Name} - oEditor = oMemoEdit - Case ClassConstants.CONTROL_DATEEDIT - Dim oDateEdit As New DateEdit() With {.Name = Name} - oEditor = oDateEdit - Case ClassConstants.CONTROL_CHECKEDIT - Dim oCheckEdit As New CheckEdit() With {.Name = Name} - oEditor = oCheckEdit - Case ClassConstants.CONTROL_COMBOEDIT - Dim oComboEdit As New LookupControl2() With {.Name = Name} - oEditor = oComboEdit - Case Else - oEditor = Nothing - End Select - - Return oEditor - End Function - Private Function CreateLayoutControlItem(Id As String) As LayoutControlItem Return New LayoutControlItem() With {.Tag = Id} End Function - Private Sub LoadControls(Datatable As DataTable) - For Each oRow As DataRow In Datatable.Rows - Dim oCaption As String = oRow.Item("COLNAME") - Dim oControlType As String = oRow.Item("CTRLTYPE") - Dim oControlId As String = oRow.Item("RECORD_ID").ToString - Dim oEditor As BaseEdit = GetControl(oControlType, oControlId) - - If oEditor Is Nothing Then - Continue For - End If - - LayoutControlGroupMain.AddItem(oCaption, oEditor) - Next - - LayoutControlGroupMain.AddItem(New EmptySpaceItem()) - End Sub - Private Sub LayoutControlMain_ItemSelectionChanged(sender As Object, e As EventArgs) Handles LayoutControlMain.ItemSelectionChanged ' TODO: Load Property Grid for selected item End Sub diff --git a/EDMI_ClientSuite/FormUserManager/frmUserManager.vb b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb index 6c5d732d..325823d1 100644 --- a/EDMI_ClientSuite/FormUserManager/frmUserManager.vb +++ b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb @@ -2,7 +2,6 @@ Public Class frmUserManager Private _Logger As Logger - Private _CommonCommands As ClassCommonCommands Private _UserTable As DataTable Private _GroupTable As DataTable @@ -18,7 +17,6 @@ Public Class frmUserManager ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. _Logger = My.LogConfig.GetLogger() - _CommonCommands = New ClassCommonCommands(My.LogConfig) End Sub Private Async Sub frmUserManager_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -98,25 +96,25 @@ Public Class frmUserManager End Function Private Async Sub HandleUserAddedToGroup(GroupId As Integer, UserId As Integer, RelationRecordId As Integer) - Dim oRecordId = Await _CommonCommands.FNICM_RADM_NEW_USER2GROUP(UserId, GroupId) + Dim oRecordId = Await My.Common.Commands.FNICM_RADM_NEW_USER2GROUP(UserId, GroupId) Await UpdateDataAsync() End Sub Private Async Sub HandleUserRemovedFromGroup(GroupId As Integer, UserId As Integer, RelationRecordId As Integer) - Dim oResult = Await _CommonCommands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId) + Dim oResult = Await My.Common.Commands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId) Await UpdateDataAsync() End Sub Private Async Sub HandleGroupAddedToGroup(ParentGroupId As Integer, GroupId As Integer, RelationRecordId As Integer) - Dim oRecordId = Await _CommonCommands.FNICM_RADM_NEW_GROUP2GROUP(GroupId, ParentGroupId) + Dim oRecordId = Await My.Common.Commands.FNICM_RADM_NEW_GROUP2GROUP(GroupId, ParentGroupId) Await UpdateDataAsync() End Sub Private Async Sub HandleGroupRemovedFromGroup(ParentGroupId As Integer, GroupId As Integer, RelationRecordId As Integer) - Dim oResult = Await _CommonCommands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId) + Dim oResult = Await My.Common.Commands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId) Await UpdateDataAsync() End Sub diff --git a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb new file mode 100644 index 00000000..a81230a0 --- /dev/null +++ b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb @@ -0,0 +1,108 @@ + _ +Partial Class frmWorkflowStep + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl + ' + Me.RibbonControl.ExpandCollapseItem.Id = 0 + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem}) + Me.RibbonControl.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl.MaxItemId = 1 + Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.Size = New System.Drawing.Size(991, 146) + Me.RibbonControl.StatusBar = Me.RibbonStatusBar + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar + ' + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 494) + Me.RibbonStatusBar.Name = "RibbonStatusBar" + Me.RibbonStatusBar.Ribbon = Me.RibbonControl + Me.RibbonStatusBar.Size = New System.Drawing.Size(991, 21) + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 146) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.LayoutControlGroup1 + Me.LayoutControl1.Size = New System.Drawing.Size(991, 348) + Me.LayoutControl1.TabIndex = 2 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(991, 348) + Me.LayoutControlGroup1.TextVisible = False + ' + 'frmWorkflowStep + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(991, 515) + Me.Controls.Add(Me.LayoutControl1) + Me.Controls.Add(Me.RibbonStatusBar) + Me.Controls.Add(Me.RibbonControl) + Me.Name = "frmWorkflowStep" + Me.Ribbon = Me.RibbonControl + Me.StatusBar = Me.RibbonStatusBar + Me.Text = "frmWorkflowStep" + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + +End Class diff --git a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.resx b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb new file mode 100644 index 00000000..16ec780b --- /dev/null +++ b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb @@ -0,0 +1,3 @@ +Public Class frmWorkflowStep + +End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/My Project/AssemblyInfo.vb b/EDMI_ClientSuite/My Project/AssemblyInfo.vb index 62b1fa6b..92efcbed 100644 --- a/EDMI_ClientSuite/My Project/AssemblyInfo.vb +++ b/EDMI_ClientSuite/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + diff --git a/EDMI_ClientSuite/My Project/Resources.Designer.vb b/EDMI_ClientSuite/My Project/Resources.Designer.vb index 6b5f1bee..ae8e333e 100644 --- a/EDMI_ClientSuite/My Project/Resources.Designer.vb +++ b/EDMI_ClientSuite/My Project/Resources.Designer.vb @@ -60,6 +60,16 @@ Namespace My.Resources End Set End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property CheckBox() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("CheckBox", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/EDMI_ClientSuite/My Project/Resources.resx b/EDMI_ClientSuite/My Project/Resources.resx index b7e38bfa..c89d87db 100644 --- a/EDMI_ClientSuite/My Project/Resources.resx +++ b/EDMI_ClientSuite/My Project/Resources.resx @@ -127,10 +127,13 @@ ..\Resources\DatePicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ComboBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ComboBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CheckBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/EDMI_ClientSuite/Resources/CheckBox.png b/EDMI_ClientSuite/Resources/CheckBox.png new file mode 100644 index 0000000000000000000000000000000000000000..d7cb93f410080b2cabd65a8484f8229f78e1a244 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!75J|#}Etuu0$e#AnZrJ|H$BhrvVHL->TkBwmN@b5ocv;lxVoy| z*?A*JJ%eGBTFy3M6NV)W%LFZ-Oib=b&^Zv(DDz20(m})UVF}~P%BHHy#z}8@7@n+o UzRoW-736LPPgg&ebxsLQ0IeBLApigX literal 0 HcmV?d00001 diff --git a/EDMI_ClientSuite/_TEST/frmDocTest.vb b/EDMI_ClientSuite/_TEST/frmDocTest.vb index cd000db4..e2fb3014 100644 --- a/EDMI_ClientSuite/_TEST/frmDocTest.vb +++ b/EDMI_ClientSuite/_TEST/frmDocTest.vb @@ -1,8 +1,6 @@ Imports DevExpress.XtraGrid Public Class frmDocTest - Private _CommonCommands As ClassCommonCommands - Private Sub DocTest_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try Dim oControlPatcher = New ClassControlPatcher(Of GridControl)(Me) @@ -10,8 +8,6 @@ Public Class frmDocTest ProcessContainer(AddressOf GridControlDefaults.DefaultGridSettings). ProcessContainer(AddressOf GridControlDefaults.ReadOnlyGridSettings) - _CommonCommands = New ClassCommonCommands(My.LogConfig) - Dim oSQL = "SELECT * FROM VWICM_DOC_METADATA_DE" My.Channel.CreateDatabaseRequest("Load Doc Values", True) @@ -26,7 +22,6 @@ Public Class frmDocTest Dim oDatatable As DataTable = oResult.Table - txtDoctype.DataBindings.Add(New Binding("Text", oDatatable, "DOCTYPE")) txtDocId.DataBindings.Add(New Binding("Text", oDatatable, "DOC_ID")) @@ -40,7 +35,7 @@ Public Class frmDocTest Dim oDocId As Int64 = Int64.Parse(txtDocId.Text) Dim oValue As String = txtDoctype.Text Dim oSyskey As String = "001-DOCTYPE" - Dim oResult = Await _CommonCommands.FNICM_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue) + Dim oResult = Await My.Common.Commands.FNICM_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue) If Not oResult.OK Then MsgBox(oResult.ErrorMessage)