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-11-23 16:20:10 +01:00
commit c1941a3230
6 changed files with 61 additions and 12 deletions
Show Stats 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)
If format = "Currency" Then
AddHandler control.TextChanged, AddressOf Textbox_Currency_Handler
AddHandler control.Leave, AddressOf Textbox_Currency_Handler
ElseIf format = "Decimal" Then
AddHandler control.TextChanged, AddressOf TextBox_Decimal_Handler
AddHandler control.Leave, AddressOf TextBox_Decimal_Handler
End If
End Sub
Private Sub AddComboHandler(control As ComboBox, format As String)
If format = "Currency" Then
AddHandler control.TextChanged, AddressOf Combo_Currency_Handler
AddHandler control.Leave, AddressOf Combo_Currency_Handler
ElseIf format = "Decimal" Then
AddHandler control.TextChanged, AddressOf Combo_Decimal_Handler
AddHandler control.Leave, AddressOf Combo_Decimal_Handler
End If
AddHandler control.KeyUp, AddressOf AutoCompleteCombo_KeyUp
End Sub
@ -317,9 +317,11 @@ Public Class ClassControlBuilder
Dim control As TextBox = DirectCast(sender, TextBox)
Dim value As Decimal
If Decimal.TryParse(control.Text.Trim(), value) Then
' control.Text = value.ToString("c")
'control.Text = value.ToString("c")
'control.SelectionStart = control.SelectionStart + 1
control.Text = FormatCurrency(control.Text)
'value = FormatNumber(value, -1, TriState.UseDefault, TriState.UseDefault, TriState.True)
'control.Text = value.ToString("n")
End If
End Sub
@ -337,6 +339,8 @@ Public Class ClassControlBuilder
If Decimal.TryParse(control.Text.Trim(), value) Then
control.Text = value.ToString("c")
control.SelectionStart = control.SelectionStart + 1
'value = FormatNumber(value, -1, TriState.UseDefault, TriState.UseDefault, TriState.True)
'control.Text = value.ToString("n")
End If
End Sub

40
app/DD-Record-Organiser/ClassControlValuesConverter.vb Normal file
View File

@ -0,0 +1,40 @@
Public Class ClassControlValuesConverter
Public Shared Function ToBooleanOrDefault(value As Object, Optional defaultValue As Boolean = False)
Try
If IsDBNull(value) OrElse value = "" Then
Return defaultValue
Else
Return Convert.ToBoolean(value)
End If
Catch ex As Exception
Return defaultValue
End Try
End Function
Public Shared Function ToStringOrDefault(value As Object, Optional defaultValue As String = "")
Try
If IsDBNull(value) OrElse String.IsNullOrEmpty(value) Then
Return defaultValue
Else
Return Convert.ToString(value)
End If
Catch ex As Exception
Return defaultValue
End Try
End Function
Public Shared Function ToIntOrDefault(value As Object, Optional defaultValue As Integer = 0)
Try
If IsDBNull(value) Then
Return defaultValue
Else
Return Convert.ToInt16(value)
End If
Catch ex As Exception
Return defaultValue
End Try
End Function
End Class

2
app/DD-Record-Organiser/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.0.0.0")>
<Assembly: AssemblyVersion("2.0.1.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

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

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

12
app/DD-Record-Organiser/frmTool_ControlProperties.vb
View File

@ -105,11 +105,13 @@
Case "RadioButton"
props = New RadioButtonProperties()
props.Caption = row.Item("CTRLSCR_CAPTION")
If Not IsDBNull(row.Item("CONTROL_DEF_VALUE")) Then
props.DefaultValue = row.Item("CONTROL_DEF_VALUE")
Else
props.DefaultValue = False
End If
props.DefaultValue = ClassControlValuesConverter.ToBooleanOrDefault(row.Item("CONTROL_DEF_VALUE"))
'If Not IsDBNull(row.Item("CONTROL_DEF_VALUE")) Then
' props.DefaultValue = row.Item("CONTROL_DEF_VALUE")
'Else
' props.DefaultValue = False
'End If
Case "F_AddAppointment"
props = New FunctionAddAppointment()
Case "F_AddFormData"

2
app/SetupWiX/Product.wxs
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="2.0.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="2.0.1.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
<Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
<!-- Nicht entfernen! -->