From 903e5e5c8115e4cb63e1283bc1fd6a33d3f55b3c Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 17 Feb 2021 09:23:52 +0100 Subject: [PATCH] MS Anpassung final indices --- app/DD_PM_WINDREAM/ClassFinalIndex.vb | 13 ++- .../DD_DMSLiteDataSet.Designer.vb | 2 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb | 4 + app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 50 ++++---- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 20 ++-- .../frmAdministration.Designer.vb | 20 ++-- app/DD_PM_WINDREAM/frmAdministration.resx | 15 +-- app/DD_PM_WINDREAM/frmAdministration.vb | 109 +++++++++--------- app/DD_PM_WINDREAM/frmMain.vb | 16 +-- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 2 +- app/DD_PM_WINDREAM/frmValidator.vb | 2 +- 11 files changed, 131 insertions(+), 122 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassFinalIndex.vb b/app/DD_PM_WINDREAM/ClassFinalIndex.vb index 0a049b8..65a5974 100644 --- a/app/DD_PM_WINDREAM/ClassFinalIndex.vb +++ b/app/DD_PM_WINDREAM/ClassFinalIndex.vb @@ -133,13 +133,18 @@ End Try ElseIf type = INDEX_TYPE_FLOAT Then - value = NotNull(Of Double)(value, 0) - - If value = String.Empty Then + If value = "SQL-Command" Then props.FloatValue = 0 Else - props.FloatValue = Double.Parse(value) + value = NotNull(Of Double)(value, 0) + + If value = String.Empty Then + props.FloatValue = 0 + Else + props.FloatValue = Double.Parse(value) + End If End If + ElseIf type = INDEX_TYPE_BOOLEAN Or type = INDEX_TYPE_VECTOR_BOOLEAN Then value = NotNull(value, "False") diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 7c211c6..befb2ec 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -5710,7 +5710,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnSPALTENBREITE.AllowDBNull = false Me.columnVALIDATION.AllowDBNull = false Me.columnCHOICE_LIST.MaxLength = 50 - Me.columnSQL_COMMAND.MaxLength = 2000 + Me.columnSQL_COMMAND.MaxLength = 20000 Me.columnREAD_ONLY.AllowDBNull = false Me.columnREAD_ONLY.DefaultValue = CType(false,Boolean) Me.columnLOAD_IDX_VALUE.AllowDBNull = false diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb index 034ad6a..cd35f97 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb @@ -9,6 +9,10 @@ Partial Public Class DD_DMSLiteDataSet End Sub + Private Sub TBPM_PROFILEDataTable_TBPM_PROFILERowChanging(sender As Object, e As TBPM_PROFILERowChangeEvent) Handles Me.TBPM_PROFILERowChanging + + End Sub + End Class Partial Class TBPM_PROFILE_CONTROLSDataTable diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index d34d97a..61445a1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1993,7 +1993,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2055,7 +2055,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2151,7 +2151,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2216,7 +2216,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2246,7 +2246,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2269,7 +2269,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2343,7 +2343,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2392,7 +2392,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2407,7 +2407,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2480,7 +2480,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2531,7 +2531,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2678,7 +2678,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2710,7 +2710,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2756,7 +2756,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2797,7 +2797,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2835,7 +2835,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2892,7 +2892,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2950,7 +2950,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3051,7 +3051,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3104,7 +3104,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3120,7 +3120,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3136,7 +3136,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3331,9 +3331,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 5f96306..d7c680f 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -11,21 +11,21 @@ - + - + - + - - - - - - + + + + + + @@ -57,7 +57,7 @@ - + 963 diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 3c8f1ec..307c76e 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -211,7 +211,7 @@ Partial Class frmAdministration Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_ProcessManager.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemRefreshProfileData = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() @@ -1601,7 +1601,7 @@ Partial Class frmAdministration 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 30 Me.RibbonControl1.Name = "RibbonControl1" @@ -1612,12 +1612,12 @@ Partial Class frmAdministration Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' - 'BarButtonItem1 + 'BarButtonItemRefreshProfileData ' - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + resources.ApplyResources(Me.BarButtonItemRefreshProfileData, "BarButtonItemRefreshProfileData") + Me.BarButtonItemRefreshProfileData.Id = 1 + Me.BarButtonItemRefreshProfileData.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemRefreshProfileData.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemRefreshProfileData.Name = "BarButtonItemRefreshProfileData" ' 'BarButtonItem2 ' @@ -1822,6 +1822,7 @@ Partial Class frmAdministration Me.BarButtonItem26.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.Security_Lock Me.BarButtonItem26.Name = "BarButtonItem26" Me.BarButtonItem26.Tag = "Unlock" + Me.BarButtonItem26.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'BarToggleSwitchItemEdit ' @@ -1839,14 +1840,15 @@ Partial Class frmAdministration 'RibbonPageGroup3 ' Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem26) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") + Me.RibbonPageGroup3.Visible = False ' 'RibbonPageGroupProfile ' Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItemRefreshProfileData) Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem5) @@ -2119,7 +2121,7 @@ Partial Class frmAdministration Friend WithEvents RibbonPageGroupProfile As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItemRefreshProfileData As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 3aaeeee..61df3b9 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -2259,9 +2259,6 @@ Fill - - False - 3, 3 @@ -3740,11 +3737,11 @@ Top Kreditoren: 1583, 134 - + Aktualisieren - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -4647,7 +4644,7 @@ Top Kreditoren: True - 92 + 180 7, 16 @@ -5143,10 +5140,10 @@ Top Kreditoren: System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BarButtonItem1 + + BarButtonItemRefreshProfileData - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 971a5c2..ee25879 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -13,6 +13,7 @@ Public Class frmAdministration Public profile_guid As Integer = 0 Dim formloaded As Boolean Dim change_BindingSource As Boolean = False + Dim FinalIndexChanging As Boolean = False Private INSERT_ACTIVE As Boolean = False Dim DT_CHART_CONFIG As DataTable Dim DT2Compare As DataTable @@ -74,7 +75,7 @@ Public Class frmAdministration End If ObjekttypenEintragen() Indexe_eintragen() - RibbonPageGroupProfile.Enabled = False + ' RibbonPageGroupProfile.Enabled = False End Sub Sub Indexe_eintragen() If cmbObjekttypen.Text <> "" Then @@ -168,7 +169,7 @@ Public Class frmAdministration End If - + DD_DMSLiteDataSet.AcceptChanges() End If @@ -397,6 +398,7 @@ Public Class frmAdministration formloaded = True RibbonPageGroup2.Enabled = False RibbonPageGroup4.Enabled = False + EditMode_Profile("Unlock") End Sub @@ -892,7 +894,7 @@ Public Class frmAdministration 'End Sub Private Sub frmProfileDesigner_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing - If UNSAVED_CHANGES_PROFILE Or UNSAVED_CHANGES_FI = True Then + If UNSAVED_CHANGES_PROFILE Or UNSAVED_CHANGES_FI Then Dim oQuestion As String If USER_LANGUAGE <> "de-DE" Then oQuestion = "You have unsaved changes! Do You want to save them now?" @@ -905,7 +907,7 @@ Public Class frmAdministration If UNSAVED_CHANGES_PROFILE Then Save_Profile() End If - If UNSAVED_CHANGES_FI = True Then + If UNSAVED_CHANGES_FI Then Save_FI() End If e.Cancel = True @@ -1008,6 +1010,8 @@ Public Class frmAdministration If value.Value <> String.Empty Then obj.ConnectionId = CURRENT_SQL_CON obj.StringValue = "SQL-Command" + 'obj.FloatValue = 0 + ' obj.IntegerValue = 0 End If propertyGrid.Refresh() @@ -1025,7 +1029,11 @@ Public Class frmAdministration End If propertyGrid.Refresh() End If - UNSAVED_CHANGES_FI = True + If FinalIndexChanging = False Then + UNSAVED_CHANGES_FI = True + End If + + End Sub @@ -1060,9 +1068,9 @@ Public Class frmAdministration End If End Sub - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemRefreshProfileData.ItemClick If BarButtonItem26.Tag = "Lock" Then - EditMode_Profile() + EditMode_Profile("") End If Refresh_Profildaten() @@ -1246,7 +1254,7 @@ Public Class frmAdministration value = NotNull(value, String.Empty) Dim guid = obj.GUID - Dim profileId As Integer = PROFILGUIDTextBox.Text + Dim oProfileId As Integer = PROFILGUIDTextBox.Text Dim connectionId As Integer = obj.ConnectionId Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''") Dim indexName As String = NotNull(obj.IndexName, String.Empty) @@ -1279,13 +1287,13 @@ Public Class frmAdministration If INSERT_ACTIVE = True Then Dim pSequence As String If oSequence = 0 Then - pSequence = $"(SELECT MAX(SEQUENCE) + 1 FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {profileId})" + pSequence = $"(SELECT COALESCE(MAX(SEQUENCE),0) + 1 FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {oProfileId})" Else pSequence = oSequence End If Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO,IF_VEKTOR_BEHAVIOUR,DESCRIPTION,SEQUENCE,CONTINUE_INDETERMINED) - VALUES ({profileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})" + VALUES ({oProfileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})" If ClassDatabase.Execute_non_Query(sql, True) Then tsbStaticInfo.Caption = $"Final index added - {Now.ToLongTimeString}" @@ -1399,7 +1407,7 @@ Public Class frmAdministration If formloaded = False Then Exit Sub End If - If UNSAVED_CHANGES_PROFILE Or UNSAVED_CHANGES_FI = True Then + If UNSAVED_CHANGES_PROFILE Or UNSAVED_CHANGES_FI Then Dim oQuestion As String If USER_LANGUAGE <> "de-DE" Then oQuestion = "You have unsaved changes! Do You want to save them now?" @@ -1412,12 +1420,14 @@ Public Class frmAdministration If UNSAVED_CHANGES_PROFILE Then Save_Profile() End If - If UNSAVED_CHANGES_FI = True Then + If UNSAVED_CHANGES_FI Then Save_FI() End If ' TBPM_PROFILEBindingSource.Position = PROFILEBS_POS - 1 Else - UNSAVED_CHANGES_PROFILE = False + Refresh_Profildaten() + DD_DMSLiteDataSet.RejectChanges() + 'UNSAVED_CHANGES_PROFILE = False End If End If End Sub @@ -1452,29 +1462,6 @@ Public Class frmAdministration ' End If 'End Sub - 'Private Sub cmbObjekttypen_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.SelectedIndexChanged, DISPLAY_MODEComboBox.SelectedIndexChanged, cmbObjekttypen.SelectedIndexChanged, cmbLOGIndex.SelectedIndexChanged - ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - ' Exit Sub - ' End If - ' Dim ocmb As ComboBox = sender - ' Dim oSelectedValue = ocmb.SelectedValue - ' If CURR_COMBOBOX_CONTROL_CONTENT <> oSelectedValue Then - ' ' UNSAVED_CHANGES_PROFILE = True - ' End If - 'End Sub - 'Private Sub PM_VEKTOR_INDEXComboBox_Click(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.Click - ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - ' Exit Sub - ' End If - ' Dim ocmb As ComboBox = sender - ' If ocmb.SelectedIndex <> -1 Then - ' Dim oSelectedValue = ocmb.SelectedValue - ' If CURR_COMBOBOX_CONTROL_CONTENT <> oSelectedValue Then - ' CURR_COMBOBOX_CONTROL_CONTENT = oSelectedValue - ' End If - ' End If - 'End Sub - Private Sub GridView1_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewProfile.FocusedRowChanged If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then Exit Sub @@ -1746,24 +1733,12 @@ Public Class frmAdministration 'End Sub Private Sub BarButtonItem26_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem26.ItemClick - EditMode_Profile() + EditMode_Profile("") End Sub - Sub EditMode_Profile() - If BarButtonItem26.Tag = "Unlock" Then - Dim ocolor As New Color - ocolor = Color.FromArgb(0, 192, 0) - With BarButtonItem26 - .Tag = "Lock" - .ImageOptions.SvgImage = My.Resources.Security_Unlock - .ItemAppearance.Normal.BackColor = ocolor - End With - - GridControlNavigation.Enabled = False - RibbonPageGroupProfile.Enabled = True - pnlEdit.Enabled = True - Else + Sub EditMode_Profile(pMode As String) + If BarButtonItem26.Tag = "Lock" Then Me.TBPM_PROFILEBindingSource.EndEdit() - If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Or UNSAVED_CHANGES_FI = True Then + If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Or UNSAVED_CHANGES_FI Then UNSAVED_CHANGES_PROFILE = True CHECK_QUESTION_CHANGES() End If @@ -1773,10 +1748,34 @@ Public Class frmAdministration .ItemAppearance.Normal.BackColor = Nothing End With - GridControlNavigation.Enabled = True - RibbonPageGroupProfile.Enabled = False - pnlEdit.Enabled = False + 'GridControlNavigation.Enabled = True + ' RibbonPageGroupProfile.Enabled = False + 'pnlEdit.Enabled = False + End If + If pMode = "Unlock" Or BarButtonItem26.Tag = "Unlock" Then + Dim ocolor As New Color + ocolor = Color.FromArgb(0, 192, 0) + With BarButtonItem26 + .Tag = "Lock" + .ImageOptions.SvgImage = My.Resources.Security_Unlock + .ItemAppearance.Normal.BackColor = ocolor + End With + + ' GridControlNavigation.Enabled = False + ' RibbonPageGroupProfile.Enabled = True + ' pnlEdit.Enabled = True End If End Sub + Private Sub gridFinalIndex_Click(sender As Object, e As EventArgs) Handles gridFinalIndex.Click + FinalIndexChanging = False + End Sub + + Private Sub TBPM_PROFILE_FINAL_INDEXINGBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILE_FINAL_INDEXINGBindingSource.CurrentChanged + FinalIndexChanging = True + End Sub + + Private Sub GridViewProfile_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles GridViewProfile.BeforeLeaveRow + EditMode_Profile("Unlock") + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 7e7c983..9012635 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1342,6 +1342,8 @@ Public Class frmMain End Sub Private Sub Item_Scope(startedFrom As String) Try + CURRENT_CLICKED_PROFILE_TITLE = Nothing + CURRENT_CLICKED_PROFILE_ID = Nothing If Application.OpenForms().OfType(Of frmValidator).Any Then bsiMessage.Caption = "There is already an active workflow!" LOGGER.Info("Item Scope - Workflow open! - Exit") @@ -1415,19 +1417,19 @@ Public Class frmMain CURRENT_CLICKED_PROFILE_TITLE = PROFIL_TITLE End If If Len(oHitProfilID) > 0 Then - CURRENT_CLICKED_PROFILE_ID = CURRENT_CLICKED_PROFILE_ID + CURRENT_CLICKED_PROFILE_ID = oHitProfilID End If - If Not IsNothing(oHitProfilID) And IsNumeric(oHitProfilID) Then + If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) And IsNumeric(CURRENT_CLICKED_PROFILE_ID) Then LOGGER.Debug($"Item_Scope: Not IsNothing(PROFIL_ID) And IsNumeric(PROFIL_ID)") Dim expression As String - expression = "PROFILE_ID = " & oHitProfilID + expression = "PROFILE_ID = " & CURRENT_CLICKED_PROFILE_ID If hitInfo.InGroupRow Or (startedFrom = "CMGROUP" And hitInfo.InDataRow) Then CURRENT_JUMP_DOC_GUID = 0 CURRENT_DOC_GUID = 0 - CURRENT_ProfilGUID = oHitProfilID - LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...oHitProfilID [{oHitProfilID}]") - Load_Profil_from_Grid(oHitProfilID) + CURRENT_ProfilGUID = CURRENT_CLICKED_PROFILE_ID + LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...oHitProfilID [{CURRENT_CLICKED_PROFILE_ID}]") + Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) ElseIf hitInfo.InDataRow Then LOGGER.Debug($"Item_Scope: hitInfo.InDataRow...") @@ -1471,7 +1473,7 @@ Public Class frmMain Dim oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING_READ, $"Item_Scope-FNPM_CHECK_DocGUID_Valid") Try If CBool(oResult) = True Then - Load_Profil_from_Grid(oHitProfilID) + Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) Else Dim omsg As String = "Achtung: der gewählte Beleg ist durch einen anderen Benutzer bereits in Bearbeitung oder anderweitig gesperrt" Dim otitle = "Achtung:" diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index ea3a077..851d2c6 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -41,7 +41,7 @@ Public Class frmSQL_DESIGNER ElseIf CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_CONTROL_TABLE T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") End If - If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Or CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then + If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Then cmbConnection.Enabled = False btnShowConnections.Enabled = False Else diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 86489af..fa4fac6 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -3899,7 +3899,7 @@ Public Class frmValidator LOGGER.Debug("FINAL INDEXING STARTING...") For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString - + Dim oFinalIndex = oFinalIndexRow.Item("INDEXNAME") Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED")) Dim oIndexType = 0 If IDB_ACTIVE = False Then