AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support NULL for date index defaultvalue

Browse Source
This commit is contained in:
Jonathan Jenne 2020-06-08 15:34:27 +02:00
parent db96da42ed
commit 782093fd79
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Global_Indexer/ClassControls.vb
View File

@ -363,7 +363,7 @@ Public Class ClassControls
End Sub End Sub
Public Function AddDateTimePicker(indexname As String, y As Integer, DataType As String) As DevExpress.XtraEditors.DateEdit Public Function AddDateTimePicker(indexname As String, y As Integer, DataType As String, Vorgabe As String) As DevExpress.XtraEditors.DateEdit
Dim oPicker As New DevExpress.XtraEditors.DateEdit With { Dim oPicker As New DevExpress.XtraEditors.DateEdit With {
.Name = "dtp" & indexname, .Name = "dtp" & indexname,
.Size = New Size(260, 27), .Size = New Size(260, 27),
@ -373,6 +373,11 @@ Public Class ClassControls
.IndexType = DataType .IndexType = DataType
} }
} }
If Vorgabe = "NULL" Then
oPicker.EditValue = Nothing
End If
oPicker.Properties.AppearanceFocused.BackColor = Color.Lime oPicker.Properties.AppearanceFocused.BackColor = Color.Lime
Return oPicker Return oPicker

4
Global_Indexer/frmAdministration.resx
View File

@ -2892,13 +2892,13 @@ der Datei</value>
<value>3, 162</value> <value>3, 162</value>
</data> </data>
<data name="DEFAULT_VALUELabel.Size" type="System.Drawing.Size, System.Drawing"> <data name="DEFAULT_VALUELabel.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 13</value> <value>355, 13</value>
</data> </data>
<data name="DEFAULT_VALUELabel.TabIndex" type="System.Int32, mscorlib"> <data name="DEFAULT_VALUELabel.TabIndex" type="System.Int32, mscorlib">
<value>12</value> <value>12</value>
</data> </data>
<data name="DEFAULT_VALUELabel.Text" xml:space="preserve"> <data name="DEFAULT_VALUELabel.Text" xml:space="preserve">
<value>Default-Wert:</value> <value>Default-Wert: (NULL für Date-Index, um Default Wert zu überschreiben)</value>
</data> </data>
<data name="&gt;&gt;DEFAULT_VALUELabel.Name" xml:space="preserve"> <data name="&gt;&gt;DEFAULT_VALUELabel.Name" xml:space="preserve">
<value>DEFAULT_VALUELabel</value> <value>DEFAULT_VALUELabel</value>

3
Global_Indexer/frmIndex.vb
View File

@ -1694,7 +1694,7 @@ Public Class frmIndex
End If End If
End If End If
Case "DATE" Case "DATE"
Dim oPicker = oControls.AddDateTimePicker(oControlName, oControlPosition, oDataType) Dim oPicker = oControls.AddDateTimePicker(oControlName, oControlPosition, oDataType, DefaultValue)
pnlIndex.Controls.Add(oPicker) pnlIndex.Controls.Add(oPicker)
Case Else Case Else
@ -2181,6 +2181,7 @@ Public Class frmIndex
If oIsOptional = True Then If oIsOptional = True Then
_Logger.Info("Optionaler Indexwert ist NICHT gefüllt") _Logger.Info("Optionaler Indexwert ist NICHT gefüllt")
DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, String.Empty)
Else Else
_Logger.Info(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!") _Logger.Info(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!")
Return True Return True