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/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM 2016-06-10 08:50:11 +02:00
commit 621a7f0fff
4 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -983,13 +983,22 @@ Public Class ClassControlBuilder
Private Sub Textbox_Currency_Handler(sender As Object, e As EventArgs) Private Sub Textbox_Currency_Handler(sender As Object, e As EventArgs)
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 Dim currencyRegex = New System.Text.RegularExpressions.Regex("[0-9,\.]*")
'control.Text = value.ToString("c") Dim match = currencyRegex.Match(control.Text)
'control.SelectionStart = control.SelectionStart + 1
control.Text = FormatCurrency(control.Text) If Not match.Success Then
'value = FormatNumber(value, -1, TriState.UseDefault, TriState.UseDefault, TriState.True) hier currency prüfen
'control.Text = value.ToString("n")
End If End If
'If Decimal.TryParse(control.Text.Trim(), value) Then
' '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 End Sub
Private Sub TextBox_Decimal_Handler(sender As Object, e As EventArgs) Private Sub TextBox_Decimal_Handler(sender As Object, e As EventArgs)

1
app/DD-Record-Organiser/frmConstructor_Main.Designer.vb generated
View File

@ -492,6 +492,7 @@ Partial Class frmConstructor_Main
Me.GridViewDoc_Search.OptionsBehavior.Editable = False Me.GridViewDoc_Search.OptionsBehavior.Editable = False
Me.GridViewDoc_Search.OptionsBehavior.ReadOnly = True Me.GridViewDoc_Search.OptionsBehavior.ReadOnly = True
Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False
Me.GridViewDoc_Search.OptionsView.ColumnAutoWidth = False
Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
Me.GridViewDoc_Search.OptionsView.ShowIndicator = False Me.GridViewDoc_Search.OptionsView.ShowIndicator = False
' '

24
app/DD-Record-Organiser/frmConstructor_Main.resx
View File

@ -310,7 +310,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>788, 248</value> <value>795, 248</value>
</data> </data>
<data name="GridControlMain.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -379,7 +379,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing"> <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 334</value> <value>1077, 338</value>
</data> </data>
<data name="pnlDetails.TabIndex" type="System.Int32, mscorlib"> <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -397,7 +397,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 334</value> <value>1077, 338</value>
</data> </data>
<data name="TabDetails.Text" xml:space="preserve"> <data name="TabDetails.Text" xml:space="preserve">
<value>Detailansicht</value> <value>Detailansicht</value>
@ -415,7 +415,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing"> <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 362</value> <value>1083, 369</value>
</data> </data>
<data name="TCDetails.TabIndex" type="System.Int32, mscorlib"> <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -475,7 +475,7 @@
<value>192, 255, 192</value> <value>192, 255, 192</value>
</data> </data>
<data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 309</value> <value>1077, 313</value>
</data> </data>
<data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
<value>7</value> <value>7</value>
@ -536,7 +536,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 25</value> <value>1077, 25</value>
</data> </data>
<data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib"> <data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -557,7 +557,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 334</value> <value>1077, 338</value>
</data> </data>
<data name="TabWindream.Text" xml:space="preserve"> <data name="TabWindream.Text" xml:space="preserve">
<value>windream-Dateien</value> <value>windream-Dateien</value>
@ -988,7 +988,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 334</value> <value>1077, 338</value>
</data> </data>
<data name="TabFollowUp.Text" xml:space="preserve"> <data name="TabFollowUp.Text" xml:space="preserve">
<value>Wiedervorlage</value> <value>Wiedervorlage</value>
@ -1015,7 +1015,7 @@
<value>Cyan</value> <value>Cyan</value>
</data> </data>
<data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 309</value> <value>1077, 313</value>
</data> </data>
<data name="GridControlPos.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -1039,7 +1039,7 @@
<value>0, 25</value> <value>0, 25</value>
</data> </data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 309</value> <value>1077, 313</value>
</data> </data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib"> <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -1214,7 +1214,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="BindingNavigatorPOS.Size" type="System.Drawing.Size, System.Drawing"> <data name="BindingNavigatorPOS.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 25</value> <value>1077, 25</value>
</data> </data>
<data name="BindingNavigatorPOS.TabIndex" type="System.Int32, mscorlib"> <data name="BindingNavigatorPOS.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -1243,7 +1243,7 @@
</value> </value>
</data> </data>
<data name="TabPos.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
<value>1081, 334</value> <value>1077, 338</value>
</data> </data>
<data name="TabPos.Text" xml:space="preserve"> <data name="TabPos.Text" xml:space="preserve">
<value>Positionen</value> <value>Positionen</value>

22
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@ -3815,8 +3815,10 @@ Public Class frmConstructor_Main
End If End If
Dim Width = DT_WINDREAM_RESULTLIST.Rows(0).Item(String.Format("{0}_WIDTH", col.ColumnName)) Dim Width = DT_WINDREAM_RESULTLIST.Rows(0).Item(String.Format("{0}_WIDTH", col.ColumnName))
If Not IsNothing(Width) And Not IsDBNull(Width) Then If Not IsNothing(Width) And Not IsDBNull(Width) Then
' GridViewDoc_Search.Columns.Item(rowvalue). = Width Dim column = DirectCast(GridViewDoc_Search.Columns.Item(rowvalue), DevExpress.XtraGrid.Columns.GridColumn)
column.Width = Width
Console.WriteLine("ColumnWidth {0} set to {1}", column.FieldName, Width)
Console.WriteLine("ColumnWidth {0} really set to {1}", column.FieldName, column.VisibleWidth)
End If End If
Next Next
End If End If
@ -5365,13 +5367,6 @@ Public Class frmConstructor_Main
Column_Row_Handler() Column_Row_Handler()
End Sub End Sub
Private Sub pnlDetails_MouseHover(sender As Object, e As EventArgs) Handles pnlDetails.MouseHover
If pnlDetails.Focus = False Then
pnlDetails.Focus()
Console.WriteLine("Focus panel")
End If
End Sub
Private Sub tsbtnRedo_Click(sender As Object, e As EventArgs) Handles tsbtnRedo.Click Private Sub tsbtnRedo_Click(sender As Object, e As EventArgs) Handles tsbtnRedo.Click
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID) Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID)
@ -5570,12 +5565,19 @@ Public Class frmConstructor_Main
Continue For Continue For
End If End If
If rowvalue = colNameGrid Then If rowvalue = colNameGrid Then
Dim update = String.Format("UPDATE TBPMO_USER_WINDREAM_RESULTLIST_CONFIG SET {0}_WIDTH = {1} WHERE GUID = {2}", col.ColumnName, e.Column.Width, USER_RESULTLIST_CONFIG_GUID) Dim update = String.Format("UPDATE TBPMO_USER_WINDREAM_RESULTLIST_CONFIG SET {0}_WIDTH = {1} WHERE GUID = {2}", col.ColumnName, e.Column.VisibleWidth, USER_RESULTLIST_CONFIG_GUID)
ClassDatabase.Execute_non_Query(update) ClassDatabase.Execute_non_Query(update)
Exit For Exit For
End If End If
Next Next
If USER_RESULTLIST_CONFIG_GUID > 0 Then
'DT_WINDREAM_RESULTLIST zu USER NEU LADEN
Dim sql_ResultList = "select * from TBPMO_USER_WINDREAM_RESULTLIST_CONFIG where USER_ID = " & USER_GUID & " AND CONSTRUCTOR_DETAIL_ID = " & CONSTRUCTOR_DETAIL_ID
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET USER_RESULTLIST KONFIG")
DT_WINDREAM_RESULTLIST = DT
End If
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(">> Unexpected Error in ColumnWidth-Change DocResult: " & ex.Message, False) ClassLogger.Add(">> Unexpected Error in ColumnWidth-Change DocResult: " & ex.Message, False)
End Try End Try