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

JJ_23_11

Browse Source
This commit is contained in:
JenneJ
2015-11-23 15:24:55 +01:00
parent 9b795bdc69
commit 9868b7d19b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,17 +298,17 @@ Public Class ClassControlBuilder
' ========================= ' =========================
Private Sub AddTextHandler(control As TextBox, format As String) Private Sub AddTextHandler(control As TextBox, format As String)
If format = "Currency" Then If format = "Currency" Then
AddHandler control.TextChanged, AddressOf Textbox_Currency_Handler AddHandler control.Leave, AddressOf Textbox_Currency_Handler
ElseIf format = "Decimal" Then ElseIf format = "Decimal" Then
AddHandler control.TextChanged, AddressOf TextBox_Decimal_Handler AddHandler control.Leave, AddressOf TextBox_Decimal_Handler
End If End If
End Sub End Sub
Private Sub AddComboHandler(control As ComboBox, format As String) Private Sub AddComboHandler(control As ComboBox, format As String)
If format = "Currency" Then If format = "Currency" Then
AddHandler control.TextChanged, AddressOf Combo_Currency_Handler AddHandler control.Leave, AddressOf Combo_Currency_Handler
ElseIf format = "Decimal" Then ElseIf format = "Decimal" Then
AddHandler control.TextChanged, AddressOf Combo_Decimal_Handler AddHandler control.Leave, AddressOf Combo_Decimal_Handler
End If End If
AddHandler control.KeyUp, AddressOf AutoCompleteCombo_KeyUp AddHandler control.KeyUp, AddressOf AutoCompleteCombo_KeyUp
End Sub End Sub
@@ -317,9 +317,11 @@ Public Class ClassControlBuilder
Dim control As TextBox = DirectCast(sender, TextBox) Dim control As TextBox = DirectCast(sender, TextBox)
Dim value As Decimal Dim value As Decimal
If Decimal.TryParse(control.Text.Trim(), value) Then If Decimal.TryParse(control.Text.Trim(), value) Then
' control.Text = value.ToString("c") 'control.Text = value.ToString("c")
'control.SelectionStart = control.SelectionStart + 1 'control.SelectionStart = control.SelectionStart + 1
control.Text = FormatCurrency(control.Text) control.Text = FormatCurrency(control.Text)
'value = FormatNumber(value, -1, TriState.UseDefault, TriState.UseDefault, TriState.True)
'control.Text = value.ToString("n")
End If End If
End Sub End Sub
@@ -337,6 +339,8 @@ Public Class ClassControlBuilder
If Decimal.TryParse(control.Text.Trim(), value) Then If Decimal.TryParse(control.Text.Trim(), value) Then
control.Text = value.ToString("c") control.Text = value.ToString("c")
control.SelectionStart = control.SelectionStart + 1 control.SelectionStart = control.SelectionStart + 1
'value = FormatNumber(value, -1, TriState.UseDefault, TriState.UseDefault, TriState.True)
'control.Text = value.ToString("n")
End If End If
End Sub End Sub

3
app/DD-Record-Organiser/frmForm_Constructor.vb
View File

@@ -1120,6 +1120,7 @@ Public Class frmForm_Constructor
Search_RowHandle(CURRENT_RECORD_ID) Search_RowHandle(CURRENT_RECORD_ID)
'Die Daten auf dem Panel laden 'Die Daten auf dem Panel laden
ClassControlValues.LoadControlValues(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) ClassControlValues.LoadControlValues(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls)
ClassControlValues.LoadControlValuesList(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls)
pnlDetails.Enabled = True pnlDetails.Enabled = True
End If End If
Catch ex As Exception Catch ex As Exception
@@ -1645,6 +1646,7 @@ Public Class frmForm_Constructor
'TabPageDetails.Text = "Detaileingabe zu '" & ACT_EBENE_STRING & "' - Record(" & SelectedRecordID & ")" 'TabPageDetails.Text = "Detaileingabe zu '" & ACT_EBENE_STRING & "' - Record(" & SelectedRecordID & ")"
'Die Daten auf dem Panel laden 'Die Daten auf dem Panel laden
ClassControlValues.LoadControlValues(SelectedRecordID, CURRENT_FORM_ID, CtrlBuilder.AllControls) ClassControlValues.LoadControlValues(SelectedRecordID, CURRENT_FORM_ID, CtrlBuilder.AllControls)
ClassControlValues.LoadControlValuesList(SelectedRecordID, CURRENT_FORM_ID, CtrlBuilder.AllControls)
'Load_Control_Values(CtrlBuilder.AllControls) 'Load_Control_Values(CtrlBuilder.AllControls)
'Refresh_Treeview_SelectedData() 'Refresh_Treeview_SelectedData()
RECORD_CHANGED = False RECORD_CHANGED = False
@@ -2359,6 +2361,7 @@ Public Class frmForm_Constructor
Case 0 Case 0
If RECORD_NEEDS_REFRESH = True Then If RECORD_NEEDS_REFRESH = True Then
ClassControlValues.LoadControlValues(SelectedRecordID, CURRENT_FORM_ID, CtrlBuilder.AllControls) ClassControlValues.LoadControlValues(SelectedRecordID, CURRENT_FORM_ID, CtrlBuilder.AllControls)
ClassControlValues.LoadControlValuesList(SelectedRecordID, CURRENT_FORM_ID, CtrlBuilder.AllControls)
UpdRECORD_NEEDS_REFRESH(False) UpdRECORD_NEEDS_REFRESH(False)
End If End If