From 70bf27497148e6b9619954793476bbf6ce832826 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Thu, 9 Jun 2016 15:52:25 +0200 Subject: [PATCH 1/2] jj 09.06 --- .../frmConstructor_Main.Designer.vb | 1 + .../frmConstructor_Main.resx | 24 +++++++-------- .../frmConstructor_Main.vb | 30 ++++++++++--------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 6d55e60..f67b7d3 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -492,6 +492,7 @@ Partial Class frmConstructor_Main Me.GridViewDoc_Search.OptionsBehavior.Editable = False Me.GridViewDoc_Search.OptionsBehavior.ReadOnly = True 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.ShowIndicator = False ' diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index da43d89..e0f3868 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -310,7 +310,7 @@ 0, 0 - 788, 248 + 795, 248 0 @@ -379,7 +379,7 @@ 0, 0 - 1081, 334 + 1077, 338 0 @@ -397,7 +397,7 @@ 0 - 1081, 334 + 1077, 338 Detailansicht @@ -415,7 +415,7 @@ 0 - 1083, 362 + 1083, 369 1 @@ -475,7 +475,7 @@ 192, 255, 192 - 1081, 309 + 1077, 313 7 @@ -536,7 +536,7 @@ 0, 0 - 1081, 25 + 1077, 25 2 @@ -557,7 +557,7 @@ 1 - 1081, 334 + 1077, 338 windream-Dateien @@ -988,7 +988,7 @@ 2 - 1081, 334 + 1077, 338 Wiedervorlage @@ -1015,7 +1015,7 @@ Cyan - 1081, 309 + 1077, 313 0 @@ -1039,7 +1039,7 @@ 0, 25 - 1081, 309 + 1077, 313 2 @@ -1214,7 +1214,7 @@ 0, 0 - 1081, 25 + 1077, 25 1 @@ -1243,7 +1243,7 @@ - 1081, 334 + 1077, 338 Positionen diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 3addfe3..ee357bc 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -1157,7 +1157,7 @@ Public Class frmConstructor_Main Catch ex As Exception MsgBox("Unexpected Error in Load_Tree_View_Data:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) End Try - + End Sub Sub Get_RecordCounts_Nodes() @@ -3125,7 +3125,7 @@ Public Class frmConstructor_Main #Region "WindreamSuche" Private Function Check_windream_Show(FORM_VIEW_ID As Integer) Try - + 'Dim sql = "SELECT * FROM TBPMO_FORM_VIEW WHERE WINDREAM_SEARCH <> '' AND GUID = " & FORM_VIEW_ID 'Dim DTWD As DataTable = ClassDatabase.Return_Datatable(sql) Dim wdsearch = DT_TBPMO_FORM_VIEW.Rows(0).Item("WINDREAM_SEARCH") @@ -3689,7 +3689,7 @@ Public Class frmConstructor_Main colPath.Caption = "Fullpath" DTGrid.Columns.Add(colPath) - + If Not DT_WINDREAM_RESULTLIST Is Nothing And DT_WINDREAM_RESULTLIST.Rows.Count = 1 Then Dim ColCount As Integer = 1 For Each Column As DataColumn In DT_WINDREAM_RESULTLIST.Columns @@ -3815,8 +3815,10 @@ Public Class frmConstructor_Main End If Dim Width = DT_WINDREAM_RESULTLIST.Rows(0).Item(String.Format("{0}_WIDTH", col.ColumnName)) 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 Next End If @@ -5365,13 +5367,6 @@ Public Class frmConstructor_Main Column_Row_Handler() 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 Me.Cursor = Cursors.WaitCursor Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID) @@ -5570,12 +5565,19 @@ Public Class frmConstructor_Main Continue For End If 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) Exit For End If 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 ClassLogger.Add(">> Unexpected Error in ColumnWidth-Change DocResult: " & ex.Message, False) End Try From 0beed4541d1e10167bdaa7a748968886711e4e48 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Thu, 9 Jun 2016 17:06:11 +0200 Subject: [PATCH 2/2] jj 09.06 2 --- .../ClassControlBuilder.vb | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index 3d19be6..200ecf1 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -983,13 +983,22 @@ Public Class ClassControlBuilder Private Sub Textbox_Currency_Handler(sender As Object, e As EventArgs) 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.SelectionStart = control.SelectionStart + 1 - control.Text = FormatCurrency(control.Text) - 'value = FormatNumber(value, -1, TriState.UseDefault, TriState.UseDefault, TriState.True) - 'control.Text = value.ToString("n") + Dim currencyRegex = New System.Text.RegularExpressions.Regex("[0-9,\.]*") + Dim match = currencyRegex.Match(control.Text) + + If Not match.Success Then + hier currency prüfen 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 Private Sub TextBox_Decimal_Handler(sender As Object, e As EventArgs)