AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jj: tweak final index table, fix sql command

Browse Source
This commit is contained in:
Jonathan Jenne 2018-09-18 16:44:12 +02:00
parent 55a7c99417
commit 35c46987e9
3 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/DD_PM_WINDREAM/frmAdministration.Designer.vb generated
View File

@ -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,42 +1303,36 @@ Partial Class frmAdministration
Me.colVALUE.FieldName = "VALUE"
Me.colVALUE.Name = "colVALUE"
'
'colADDED_WHO
'
Me.colADDED_WHO.FieldName = "ADDED_WHO"
Me.colADDED_WHO.Name = "colADDED_WHO"
resources.ApplyResources(Me.colADDED_WHO, "colADDED_WHO")
'
'colADDED_WHEN
'
Me.colADDED_WHEN.FieldName = "ADDED_WHEN"
Me.colADDED_WHEN.Name = "colADDED_WHEN"
resources.ApplyResources(Me.colADDED_WHEN, "colADDED_WHEN")
'
'colCHANGED_WHO
'
Me.colCHANGED_WHO.FieldName = "CHANGED_WHO"
Me.colCHANGED_WHO.Name = "colCHANGED_WHO"
resources.ApplyResources(Me.colCHANGED_WHO, "colCHANGED_WHO")
'
'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"
'
'colADDED_WHO
'
resources.ApplyResources(Me.colADDED_WHO, "colADDED_WHO")
Me.colADDED_WHO.FieldName = "ADDED_WHO"
Me.colADDED_WHO.Name = "colADDED_WHO"
'
'colADDED_WHEN
'
resources.ApplyResources(Me.colADDED_WHEN, "colADDED_WHEN")
Me.colADDED_WHEN.FieldName = "ADDED_WHEN"
Me.colADDED_WHEN.Name = "colADDED_WHEN"
'
'colCHANGED_WHO
'
resources.ApplyResources(Me.colCHANGED_WHO, "colCHANGED_WHO")
Me.colCHANGED_WHO.FieldName = "CHANGED_WHO"
Me.colCHANGED_WHO.Name = "colCHANGED_WHO"
'
'colCHANGED_WHEN
'
resources.ApplyResources(Me.colCHANGED_WHEN, "colCHANGED_WHEN")
Me.colCHANGED_WHEN.FieldName = "CHANGED_WHEN"
Me.colCHANGED_WHEN.Name = "colCHANGED_WHEN"
'
'PropertyGrid1
'
resources.ApplyResources(Me.PropertyGrid1, "PropertyGrid1")

56
app/DD_PM_WINDREAM/frmAdministration.resx
View File

@ -2568,12 +2568,6 @@ der Wertänderungen nutzen wollen:</value>
<data name="colGUID.Caption" xml:space="preserve">
<value>Id</value>
</data>
<data name="colGUID.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="colGUID.VisibleIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="colINDEXNAME.Caption" xml:space="preserve">
<value>Windream Index</value>
</data>
@ -2599,31 +2593,43 @@ der Wertänderungen nutzen wollen:</value>
<value>True</value>
</data>
<data name="colSQL_COMMAND.VisibleIndex" type="System.Int32, mscorlib">
<value>7</value>
<value>2</value>
</data>
<data name="colADDED_WHO.Caption" xml:space="preserve">
<value>Hinzugefügt Wer</value>
</data>
<data name="colADDED_WHO.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="colADDED_WHO.VisibleIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>3</value>
</data>
<data name="colADDED_WHEN.Caption" xml:space="preserve">
<value>Hinzugefügt Wann</value>
</data>
<data name="colADDED_WHEN.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="colADDED_WHEN.VisibleIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>4</value>
</data>
<data name="colCHANGED_WHO.Caption" xml:space="preserve">
<value>Geändert Wer</value>
</data>
<data name="colCHANGED_WHO.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="colCHANGED_WHO.VisibleIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>5</value>
</data>
<data name="colCHANGED_WHEN.Caption" xml:space="preserve">
<value>Geändert Wann</value>
</data>
<data name="colCHANGED_WHEN.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="colCHANGED_WHEN.VisibleIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>6</value>
</data>
<data name="gridFinalIndex.Size" type="System.Drawing.Size, System.Drawing">
<value>906, 269</value>
@ -3116,7 +3122,7 @@ der Wertänderungen nutzen wollen:</value>
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage12.Size" type="System.Drawing.Size, System.Drawing">
<value>1235, 448</value>
<value>1235, 445</value>
</data>
<data name="TabPage12.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -4428,7 +4434,7 @@ der Wertänderungen nutzen wollen:</value>
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>270</value>
<value>185</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>7, 16</value>
@ -4864,6 +4870,12 @@ der Wertänderungen nutzen wollen:</value>
<data name="&gt;&gt;viewFinalIndex.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colGUID.Name" xml:space="preserve">
<value>colGUID</value>
</data>
<data name="&gt;&gt;colGUID.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colINDEXNAME.Name" xml:space="preserve">
<value>colINDEXNAME</value>
</data>
@ -4876,6 +4888,12 @@ der Wertänderungen nutzen wollen:</value>
<data name="&gt;&gt;colVALUE.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colSQL_COMMAND.Name" xml:space="preserve">
<value>colSQL_COMMAND</value>
</data>
<data name="&gt;&gt;colSQL_COMMAND.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
<value>colADDED_WHO</value>
</data>
@ -4900,18 +4918,6 @@ der Wertänderungen nutzen wollen:</value>
<data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colGUID.Name" xml:space="preserve">
<value>colGUID</value>
</data>
<data name="&gt;&gt;colGUID.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colSQL_COMMAND.Name" xml:space="preserve">
<value>colSQL_COMMAND</value>
</data>
<data name="&gt;&gt;colSQL_COMMAND.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
<value>BindingNavigatorAddNewItem</value>
</data>

11
app/DD_PM_WINDREAM/frmAdministration.vb
View File

@ -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()