From 35c46987e9327b18d8996d64d865fd74f45b5e77 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 18 Sep 2018 16:44:12 +0200 Subject: [PATCH] jj: tweak final index table, fix sql command --- .../frmAdministration.Designer.vb | 36 ++++++------ app/DD_PM_WINDREAM/frmAdministration.resx | 56 ++++++++++--------- app/DD_PM_WINDREAM/frmAdministration.vb | 11 +++- 3 files changed, 58 insertions(+), 45 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index bad09d9..053388c 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -159,14 +159,14 @@ Partial Class frmAdministration Me.gridFinalIndex = New DevExpress.XtraGrid.GridControl() Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.viewFinalIndex = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colINDEXNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colVALUE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colSQL_COMMAND = New DevExpress.XtraGrid.Columns.GridColumn() Me.colADDED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCHANGED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCHANGED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colSQL_COMMAND = New DevExpress.XtraGrid.Columns.GridColumn() Me.PropertyGrid1 = New System.Windows.Forms.PropertyGrid() Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() @@ -1285,6 +1285,12 @@ Partial Class frmAdministration Me.viewFinalIndex.OptionsBehavior.ReadOnly = True Me.viewFinalIndex.OptionsView.ShowGroupPanel = False ' + 'colGUID + ' + resources.ApplyResources(Me.colGUID, "colGUID") + Me.colGUID.FieldName = "GUID" + Me.colGUID.Name = "colGUID" + ' 'colINDEXNAME ' resources.ApplyResources(Me.colINDEXNAME, "colINDEXNAME") @@ -1297,41 +1303,35 @@ Partial Class frmAdministration Me.colVALUE.FieldName = "VALUE" Me.colVALUE.Name = "colVALUE" ' + 'colSQL_COMMAND + ' + resources.ApplyResources(Me.colSQL_COMMAND, "colSQL_COMMAND") + Me.colSQL_COMMAND.FieldName = "SQL_COMMAND" + Me.colSQL_COMMAND.Name = "colSQL_COMMAND" + ' 'colADDED_WHO ' + resources.ApplyResources(Me.colADDED_WHO, "colADDED_WHO") Me.colADDED_WHO.FieldName = "ADDED_WHO" Me.colADDED_WHO.Name = "colADDED_WHO" - resources.ApplyResources(Me.colADDED_WHO, "colADDED_WHO") ' 'colADDED_WHEN ' + resources.ApplyResources(Me.colADDED_WHEN, "colADDED_WHEN") Me.colADDED_WHEN.FieldName = "ADDED_WHEN" Me.colADDED_WHEN.Name = "colADDED_WHEN" - resources.ApplyResources(Me.colADDED_WHEN, "colADDED_WHEN") ' 'colCHANGED_WHO ' + resources.ApplyResources(Me.colCHANGED_WHO, "colCHANGED_WHO") Me.colCHANGED_WHO.FieldName = "CHANGED_WHO" Me.colCHANGED_WHO.Name = "colCHANGED_WHO" - resources.ApplyResources(Me.colCHANGED_WHO, "colCHANGED_WHO") ' 'colCHANGED_WHEN ' + resources.ApplyResources(Me.colCHANGED_WHEN, "colCHANGED_WHEN") Me.colCHANGED_WHEN.FieldName = "CHANGED_WHEN" Me.colCHANGED_WHEN.Name = "colCHANGED_WHEN" - resources.ApplyResources(Me.colCHANGED_WHEN, "colCHANGED_WHEN") - ' - 'colGUID - ' - resources.ApplyResources(Me.colGUID, "colGUID") - Me.colGUID.FieldName = "GUID" - Me.colGUID.Name = "colGUID" - ' - 'colSQL_COMMAND - ' - resources.ApplyResources(Me.colSQL_COMMAND, "colSQL_COMMAND") - Me.colSQL_COMMAND.FieldName = "SQL_COMMAND" - Me.colSQL_COMMAND.Name = "colSQL_COMMAND" ' 'PropertyGrid1 ' diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index e034373..6181b0a 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -2568,12 +2568,6 @@ der Wertänderungen nutzen wollen: Id - - True - - - 6 - Windream Index @@ -2599,31 +2593,43 @@ der Wertänderungen nutzen wollen: True - 7 + 2 + + + Hinzugefügt Wer True - 2 + 3 + + + Hinzugefügt Wann True - 3 + 4 + + + Geändert Wer True - 4 + 5 + + + Geändert Wann True - 5 + 6 906, 269 @@ -3116,7 +3122,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1235, 448 + 1235, 445 1 @@ -4428,7 +4434,7 @@ der Wertänderungen nutzen wollen: True - 270 + 185 7, 16 @@ -4864,6 +4870,12 @@ der Wertänderungen nutzen wollen: DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colGUID + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colINDEXNAME @@ -4876,6 +4888,12 @@ der Wertänderungen nutzen wollen: DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colSQL_COMMAND + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colADDED_WHO @@ -4900,18 +4918,6 @@ der Wertänderungen nutzen wollen: DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colGUID - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colSQL_COMMAND - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - BindingNavigatorAddNewItem diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 0fee886..dd851b9 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -1016,7 +1016,14 @@ Public Class frmAdministration If Not IsNothing(obj) Then - Dim value = ClassFinalIndex.GetValue(obj, obj.IndexName, Windream_Indicies, Windream_Indicies_Types, obj.VectorIndex) + Dim value + + If obj.SQLCommand.Value <> String.Empty Then + value = "SQL-Command" + Else + value = ClassFinalIndex.GetValue(obj, obj.IndexName, Windream_Indicies, Windream_Indicies_Types, obj.VectorIndex) + End If + Dim guid = obj.GUID Dim profileId As Integer = PROFILGUIDTextBox.Text Dim connectionId As Integer = obj.ConnectionId @@ -1080,7 +1087,7 @@ Public Class frmAdministration If value.Value <> String.Empty Then obj.ConnectionId = CURRENT_SQL_CON - obj = ClassFinalIndex.SetValue("", obj, obj.IndexName, Windream_Indicies, Windream_Indicies_Types) + obj.StringValue = "SQL-Command" End If propertyGrid.Refresh()