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

Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/record_organizer

Browse Source
This commit is contained in:
SchreiberM
2015-10-20 09:52:19 +02:00
parent bebebbe982 a90237f7a1
commit a4341dd477
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organiser/ClassControlBuilder.vb
View File

@@ -901,6 +901,8 @@ Public Class ClassControlBuilder
control.TabIndex = tabindex control.TabIndex = tabindex
control.TabStop = tabstop control.TabStop = tabstop
control.Parent = _master_panel control.Parent = _master_panel
control.Properties.NullDate = DateTime.MinValue
control.Properties.NullText = String.Empty
If _new And IsNothing(parent) Then If _new And IsNothing(parent) Then
control.Location = Me.GetCursorPosition() control.Location = Me.GetCursorPosition()

10
app/DD-Record-Organiser/ClassControlValues.vb
View File

@@ -76,11 +76,13 @@ Public Class ClassControlValues
Dim combobox As ComboBox = DirectCast(control, ComboBox) Dim combobox As ComboBox = DirectCast(control, ComboBox)
combobox.SelectedIndex = combobox.FindStringExact(result) combobox.SelectedIndex = combobox.FindStringExact(result)
Case 4 'DateTimePicker Case 4 'DateTimePicker
If result = "" Then
result = Now
End If
Dim datepicker As DevExpress.XtraEditors.DateEdit = DirectCast(control, DevExpress.XtraEditors.DateEdit) Dim datepicker As DevExpress.XtraEditors.DateEdit = DirectCast(control, DevExpress.XtraEditors.DateEdit)
datepicker.DateTime = Date.Parse(result)
If result = "" Or result = "00:00:00" Then
datepicker.DateTime = DateTime.MinValue
Else
datepicker.DateTime = Date.Parse(result)
End If
Case 13 ' Listbox Case 13 ' Listbox
Dim listbox As DevExpress.XtraEditors.ListBoxControl = DirectCast(control, DevExpress.XtraEditors.ListBoxControl) Dim listbox As DevExpress.XtraEditors.ListBoxControl = DirectCast(control, DevExpress.XtraEditors.ListBoxControl)
listbox.SelectedIndex = listbox.FindStringExact(result) listbox.SelectedIndex = listbox.FindStringExact(result)