JJ 27.04.2016

2016-04-27 13:21:24 +02:00 · 2016-04-27 13:21:24 +02:00 · f48daef141
commit f48daef141
parent 53c9add202
7 changed files with 54 additions and 3 deletions
--- a/app/DD-Record-Organiser/ClassControlCommands.vb
+++ b/app/DD-Record-Organiser/ClassControlCommands.vb
@ -183,6 +183,7 @@
            Dim CHANGED_WHO As String = Environment.UserName
            Dim COL_NAME As String
            Dim SQLCommand As String
+            Dim EnabledWhen As String
            Dim MULTILINE As Integer
            Dim MASTER_DATA_ID As Integer
            Dim DEFAULTVALUE As String
@ -268,6 +269,16 @@
                SQLCommand = String.Empty
            End If

+            If propExists(properties, "EnabledWhen") Then
+                Dim value As SQLValue = DirectCast(properties.EnabledWhen, SQLValue)
+                EnabledWhen = value.Value
+                If EnabledWhen.Contains("'") Then
+                    EnabledWhen = EnabledWhen.Replace("'", "''")
+                End If
+            Else
+                EnabledWhen = String.Empty
+            End If
+
            If propExists(properties, "StaticList") Then
                STATIC_LIST = properties.StaticList
            Else
@ -285,7 +296,11 @@
                CURRENT_CONTROL_ID = properties.ID
            End If

-            SQL = "UPDATE TBPMO_CONTROL SET REQUIRED = " & REQUIRED & ", READ_ONLY = " & READ_ONLY & ", SHOW_COLUMN = " & SHOW_COLUMN & ", FORMAT_TYPE = '" & FORMAT_TYPE & "', DEFAULT_VALUE = '" & DEFAULTVALUE & "', NAME = '" & NAME & "', SQL_COMMAND_1 = '" & SQLCommand & "', CHANGED_WHO = '" & CHANGED_WHO & "', COL_NAME = '" & COL_NAME & "', MULTILINE = " & MULTILINE & ", MASTER_DATA_ID = " & MASTER_DATA_ID & ", STATIC_LIST = '" & STATIC_LIST & "' WHERE GUID = " & CURRENT_CONTROL_ID
+            SQL = "UPDATE TBPMO_CONTROL SET REQUIRED = " & REQUIRED & ", READ_ONLY = " & READ_ONLY & ", SHOW_COLUMN = " & SHOW_COLUMN & _
+                ", FORMAT_TYPE = '" & FORMAT_TYPE & "', DEFAULT_VALUE = '" & DEFAULTVALUE & "', NAME = '" & NAME & "', SQL_COMMAND_1 = '" & SQLCommand & _
+                "', CHANGED_WHO = '" & CHANGED_WHO & "', COL_NAME = '" & COL_NAME & "', MULTILINE = " & MULTILINE & ", MASTER_DATA_ID = " & MASTER_DATA_ID & _
+                ", STATIC_LIST = '" & STATIC_LIST & "', SQL_COMMAND_2 = '" & EnabledWhen & _
+                "' WHERE GUID = " & CURRENT_CONTROL_ID

            If ClassDatabase.Execute_non_Query(SQL) = True Then
                Return UpdateControlScreen(control, properties)
--- a/app/DD-Record-Organiser/ClassControlProperties.vb
+++ b/app/DD-Record-Organiser/ClassControlProperties.vb
@ -123,6 +123,7 @@ Module ClassControlProperties
        Private _read_only As Boolean = False
        ' Database Configurations
        Private _sql_command As String = ""
+        Private _sql_command_2 As String = "" 'EnabledWhen
        ' Font Configurations
        Private _font As Font
        Private _font_color As Color
@ -170,6 +171,18 @@ Module ClassControlProperties
                _sql_command = value.Value
            End Set
        End Property
+
+        <LocalizedCategoryAttribute("category_database")>
+        <LocalizedDescriptionAttribute("desc_enabledwhen")>
+        Public Property EnabledWhen() As SQLValue
+            Get
+                Return New SQLValue(_sql_command_2)
+            End Get
+            Set(value As SQLValue)
+                _sql_command_2 = value.Value
+            End Set
+        End Property
+
        <LocalizedCategoryAttribute("category_font")>
        <LocalizedDescriptionAttribute("desc_fontstyle")>
        Public Property Font() As Font
--- a/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb
+++ b/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb
@ -190,6 +190,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gibt einen SQL Befehl an, der das Control abhängig vom Ergebnis (0 oder 1) aktiviert oder deaktiviert ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property desc_enabledwhen() As String
+            Get
+                Return ResourceManager.GetString("desc_enabledwhen", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Gibt die Schriftfarbe an. ähnelt.
        '''</summary>
@ -405,7 +414,7 @@ Namespace My.Resources
                Return ResourceManager.GetString("desc_todate", resourceCulture)
            End Get
        End Property
-
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Der Typ des Elements ähnelt.
        '''</summary>
--- a/app/DD-Record-Organiser/Strings/ControlProperties.en.resx
+++ b/app/DD-Record-Organiser/Strings/ControlProperties.en.resx
@ -159,6 +159,9 @@
  <data name="desc_description" xml:space="preserve">
    <value>The appointment's description. Dynamic values from other controls can be inserted with the syntax [%controlname].</value>
  </data>
+  <data name="desc_enabledwhen" xml:space="preserve">
+    <value>An SQL Query that enables or disables the Control depending on the result (0 or 1)</value>
+  </data>
  <data name="desc_fontcolor" xml:space="preserve">
    <value>The element's font color.</value>
  </data>
--- a/app/DD-Record-Organiser/Strings/ControlProperties.resx
+++ b/app/DD-Record-Organiser/Strings/ControlProperties.resx
@ -159,6 +159,9 @@
  <data name="desc_description" xml:space="preserve">
    <value>Gibt die Beschreibung des Termins an. Dynamische Werte aus anderen Controls können mit der Syntax [%controlname] eingefügt werden</value>
  </data>
+  <data name="desc_enabledwhen" xml:space="preserve">
+    <value>Gibt einen SQL Befehl an, der das Control abhängig vom Ergebnis (0 oder 1) aktiviert oder deaktiviert</value>
+  </data>
  <data name="desc_fontcolor" xml:space="preserve">
    <value>Gibt die Schriftfarbe an.</value>
  </data>
--- a/app/DD-Record-Organiser/frmLevel_Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.vb
@ -715,6 +715,7 @@
                    props.ShowColumn = NotNull(CBool(r.Item("CONTROL_SHOW_COLUMN")), True)
                    props.Multiline = r.Item("CONTROL_MULTILINE")
                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "Combobox"
                    props.ControlType = "ComboBox"
@ -733,6 +734,7 @@
                    props.TabIndex = r.Item("CTRLSCR_TAB_INDEX")
                    props.ShowColumn = NotNull(CBool(r.Item("CONTROL_SHOW_COLUMN")), True)
                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "Checkbox"
                    props.ControlType = "CheckBox"
@ -748,6 +750,7 @@
                    props.ShowColumn = NotNull(CBool(r.Item("CONTROL_SHOW_COLUMN")), True)
                    props.TabStop = r.Item("CTRLSCR_TAB_STOP")
                    props.TabIndex = r.Item("CTRLSCR_TAB_INDEX")
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "RadioButton"
                    props.ControlType = "RadioButton"
@ -759,6 +762,7 @@
                    props.Font = New Font(r.Item("CTRLSCR_FONT_FAMILY").ToString(),
                                          CType(r.Item("CTRLSCR_FONT_SIZE"), Single),
                                          CType(r.Item("CTRLSCR_FONT_STYLE"), FontStyle))
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "Datepicker"
                    props.ControlType = "DatePicker"
@ -775,6 +779,7 @@
                    props.TabStop = r.Item("CTRLSCR_TAB_STOP")
                    props.TabIndex = r.Item("CTRLSCR_TAB_INDEX")
                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "Datagridview"
                    props.ControlType = "DataGridView/Table"
@ -785,6 +790,7 @@
                    props.ColumnTitle = ClassConverter.ToStringOrDefault(r.Item("CONTROL_COL_NAME"), ctrl.Name)
                    props.ShowColumn = ClassConverter.ToBooleanOrDefault(r.Item("CONTROL_SHOW_COLUMN"), True)
                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
                    props.IsRequired = r.Item("CONTROL_REQUIRED")
                    props.IsReadOnly = r.Item("CONTROL_READ_ONLY")

@ -809,6 +815,7 @@
                                          CType(r.Item("CTRLSCR_FONT_STYLE"), FontStyle))
                    props.ColumnTitle = ClassConverter.ToStringOrDefault(r.Item("CONTROL_COL_NAME"), ctrl.Name)
                    props.ShowColumn = ClassConverter.ToBooleanOrDefault(r.Item("CONTROL_SHOW_COLUMN"), True)
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "CheckedListBox"
                    props.ControlType = "CheckedListBox"
@ -822,6 +829,7 @@
                    props.ColumnTitle = ClassConverter.ToStringOrDefault(r.Item("CONTROL_COL_NAME"), ctrl.Name)
                    props.ShowColumn = ClassConverter.ToBooleanOrDefault(r.Item("CONTROL_SHOW_COLUMN"), True)
                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())

                Case "F_AddAppointment"
                    props.ControlType = "Function.AddToCalendar"
--- a/app/DD-Record-Organiser/frmSQLEditor.vb
+++ b/app/DD-Record-Organiser/frmSQLEditor.vb
@ -197,7 +197,7 @@ Public Class frmSQLEditor
        EnableTables()
    End Sub

-    Private Sub GetColumns(tableName As String, ByRef combobox As CustomComboBox)
+    Private Sub GetColumns(tableName As String, ByRef combobox As ComboBox)
        Try
            Dim CS As String
            CS = ClassDatabase.GetConnectionString(cmbConnection.SelectedValue)