From 8c76b53273869429eec645967ad0172e8bac6eb3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 9 Aug 2022 09:46:12 +0200 Subject: [PATCH] reorganize form designer & final index properties --- app/DD_PM_WINDREAM/ClassConstants.vb | 7 ++ app/DD_PM_WINDREAM/ModuleControlProperties.vb | 117 +++++++++++++----- .../ModuleFinalIndexProperties.vb | 48 ++++--- 3 files changed, 120 insertions(+), 52 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassConstants.vb b/app/DD_PM_WINDREAM/ClassConstants.vb index 183a83c..655bdf3 100644 --- a/app/DD_PM_WINDREAM/ClassConstants.vb +++ b/app/DD_PM_WINDREAM/ClassConstants.vb @@ -2,4 +2,11 @@ Public Const OpModeFS_PWM = "PURE_WM" Public Const OpModeFS_IDBWM = "IDB_WM" Public Const OpModeFS_ZF = "ZOOFLOW" + + Public Const CAT_INFORMATION = "Information" + Public Const CAT_GENERAL = "Allgemein" + Public Const CAT_DISPLAY = "Anzeige" + Public Const CAT_BEHAVIOUR = "Verhalten" + Public Const CAT_DATA = "Daten" + Public Const CAT_VALIDATION = "Validierung" End Class diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb index 79af777..e81b4c0 100644 --- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb @@ -5,6 +5,7 @@ Imports System.Globalization Imports DigitalData.Modules.Language.Utils Public Module ModuleControlProperties + Public Enum IndexTypes SimpleIndex = 0 VectorIndex = 1 @@ -14,27 +15,28 @@ Public Module ModuleControlProperties Private _size As Size Private _font As Font - - + + <[ReadOnly](True)> Public Property ChangedAt As Date - + + <[ReadOnly](True)> Public Property ChangedWho As String - + <[ReadOnly](True)> Public Property ID() As Integer - + Public Property Name() As String - + Public Property Location() As Point - + Public Property Size() As Size Get Return _size @@ -52,7 +54,7 @@ Public Module ModuleControlProperties End Set End Property - + Public Overridable Property Font As Font Get @@ -63,7 +65,8 @@ Public Module ModuleControlProperties End Set End Property - + + Public Property TextColor As Color Class FontConverter @@ -84,16 +87,24 @@ Public Module ModuleControlProperties Private _Override_SQL As String Private _Enable_SQL As String Private _Enable_SQL_ONLOAD As String - Private _default_value - Public Property Active() As Boolean + + Public Property Active() As Boolean + + Public Property Required() As Boolean - + + + Public Property [ReadOnly]() As Boolean + + + Public Property [SaveChangeOnReadOnly]() As Boolean + - + Public Property IndexType() As IndexTypes ''' ''' Diese Eigenschaft enthält die auswählbaren Indicies, die für das Control verfügbar sind. Wird nicht direkt angezeigt. @@ -103,10 +114,12 @@ Public Module ModuleControlProperties ''' ''' Diese Eigenschaft enthält des ausgewählten Index ''' - + Public Property Index() As String - + + + Public Property SQLCommand() As SQLValue Get Return New SQLValue(NotNull(_sql_command, "")) @@ -115,6 +128,9 @@ Public Module ModuleControlProperties _sql_command = value.Value End Set End Property + + + Public Property Override_SQL() As SQLValue Get Return New SQLValue(NotNull(_Override_SQL, "")) @@ -123,6 +139,9 @@ Public Module ModuleControlProperties _Override_SQL = value.Value End Set End Property + + + Public Property Enable_SQL() As SQLValue Get Return New SQLValue(NotNull(_Enable_SQL, "")) @@ -131,6 +150,9 @@ Public Module ModuleControlProperties _Enable_SQL = value.Value End Set End Property + + + Public Property Enable_SQL_OnLoad() As SQLValue Get Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) @@ -140,7 +162,8 @@ Public Module ModuleControlProperties End Set End Property - + + Public Property DefaultValue() As String Get Return _default_value @@ -153,13 +176,18 @@ Public Module ModuleControlProperties Public Class TextboxProperties Inherits InputProperties - + + + Public Property SetControlData As SQLValue - + + + Public Property Regex As String - + + Public Property RegexMessage As String End Class @@ -167,34 +195,41 @@ Public Module ModuleControlProperties Public Class LabelProperties Inherits BaseProperties - + Public Property Text() As String End Class Public Class CheckboxProperties Inherits InputProperties - + Public Property Text() As String - + + + Public Property SetControlData As SQLValue End Class Public Class ComboboxProperties Inherits InputProperties - + Public Property Text() As String - + + + Public Property SetControlData As SQLValue Public Property ChoiceLists() As List(Of String) - + + Public Property ChoiceList() As String - + + + Public Property DisplayAsLookUpControl As Boolean Public Class ChoiceListConverter @@ -231,7 +266,8 @@ Public Module ModuleControlProperties Public Class GridControlProperties Inherits InputProperties - + + Public Property AllowAddNewValues As Boolean End Class Public Class ButtonProperties @@ -240,10 +276,11 @@ Public Module ModuleControlProperties Private _image_Value As String - + Public Property Text() As String - + + Public Property CtrlImage() As ImageValue Get Return New ImageValue(NotNull(_image_Value, "")) @@ -256,16 +293,28 @@ Public Module ModuleControlProperties Public Class LookupControlProperties Inherits InputProperties - + + Public Property MultiSelect As Boolean - + + + Public Property AllowAddNewValues As Boolean - + + + Public Property PreventDuplicates As Boolean + + + Public Property ChoiceList() As String - + + + Public Property DisplayAsComboBox As Boolean - + + + Public Property SetControlData As SQLValue End Class diff --git a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb index b0e90ec..f0c8e8e 100644 --- a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb @@ -6,73 +6,85 @@ Imports FormsUtils Module ModuleFinalIndexProperties Public Class FinalIndexProperties - + + <[ReadOnly](True)> Public Property GUID As Integer - + + + <[ReadOnly](True)> Public Property ConnectionId As Integer - + Public Property Description As String - + + Public Property Active As Boolean - + + Public Property Sequence As Integer = 0 - + + + Public Property ContinueOnIndifferentState As Boolean + ''' ''' Eigenschaft, die den SQL Editor anzeigt ''' - + + Public Property SQLCommand As SQLValue ' Eigenschaften für die verschiedenen Index-Typen - + Public Property StringValue As String - + Public Property BoolValue As Boolean - + Public Property FloatValue As Double - + Public Property DateValue As Date - + Public Property IntegerValue As Integer - + + Public Property IndexName As String - + + <[ReadOnly](True)> Public Property VectorIndex As Boolean - + Public Property AllowAddNewValues As Boolean - - + + Public Property VectorBehaviour As String - + + Public Property PreventDuplicates As Boolean