From 4e69a975821971cf6fd6b62c6528a975c9158f9f Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 9 Feb 2021 16:36:52 +0100 Subject: [PATCH] MS Adminsitration --- .../DD_DMSLiteDataSet.Designer.vb | 203 +++++------------ app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 8 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 70 +++--- app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 2 + .../My Project/Resources.Designer.vb | 20 ++ app/DD_PM_WINDREAM/My Project/Resources.resx | 62 +++--- .../Resources/Security_Lock.svg | 16 ++ .../Resources/Security_Unlock.svg | 16 ++ .../frmAdministration.Designer.vb | 117 ++++++---- app/DD_PM_WINDREAM/frmAdministration.resx | 208 +++++++++++------- app/DD_PM_WINDREAM/frmAdministration.vb | 99 ++++++--- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 2 +- app/DD_PM_WINDREAM/frmValidator.vb | 23 +- 13 files changed, 462 insertions(+), 384 deletions(-) create mode 100644 app/DD_PM_WINDREAM/Resources/Security_Lock.svg create mode 100644 app/DD_PM_WINDREAM/Resources/Security_Unlock.svg diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 4233328..7c211c6 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -73,8 +73,6 @@ Partial Public Class DD_DMSLiteDataSet Private relationFK_TBPM_PROFILE_CONTROLS_PROFILE As Global.System.Data.DataRelation - Private relationFK_TBPM_PROFILE_TYPE As Global.System.Data.DataRelation - Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ - Public Function FindByNAMETITLE(ByVal NAME As String, ByVal TITLE As String) As TBPM_PROFILERow - Return CType(Me.Rows.Find(New Object() {NAME, TITLE}),TBPM_PROFILERow) - End Function - _ Public Overrides Function Clone() As Global.System.Data.DataTable @@ -9375,12 +9361,11 @@ Partial Public Class DD_DMSLiteDataSet MyBase.Columns.Add(Me.columnDISPLAY_MODE) Me.columnSQL_BTN_FINISH = New Global.System.Data.DataColumn("SQL_BTN_FINISH", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnSQL_BTN_FINISH) - Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnNAME, Me.columnTITLE}, true)) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint2", New Global.System.Data.DataColumn() {Me.columnGUID}, false)) Me.columnGUID.AutoIncrement = true - Me.columnGUID.AutoIncrementSeed = -1 - Me.columnGUID.AutoIncrementStep = -1 Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true Me.columnNAME.AllowDBNull = false Me.columnNAME.MaxLength = 100 Me.columnTITLE.AllowDBNull = false @@ -10947,16 +10932,6 @@ Partial Public Class DD_DMSLiteDataSet Public Sub SetCHANGED_WHENNull() Me(Me.tableTBPM_TYPE.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub - - _ - Public Function GetTBPM_PROFILERows() As TBPM_PROFILERow() - If (Me.Table.ChildRelations("FK_TBPM_PROFILE_TYPE") Is Nothing) Then - Return New TBPM_PROFILERow(-1) {} - Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBPM_PROFILE_TYPE")),TBPM_PROFILERow()) - End If - End Function End Class ''' @@ -14905,17 +14880,6 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property - _ - Public Property TBPM_TYPERow() As TBPM_TYPERow - Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPM_PROFILE_TYPE")),TBPM_TYPERow) - End Get - Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPM_PROFILE_TYPE")) - End Set - End Property - _ Public Function IsDESCRIPTIONNull() As Boolean @@ -24686,61 +24650,6 @@ Namespace DD_DMSLiteDataSetTableAdapters End If End Try End Function - - _ - Public Overloads Overridable Function Update( _ - ByVal PRIORITY As Integer, _ - ByVal DESCRIPTION As String, _ - ByVal ACTIVE As Boolean, _ - ByVal WD_SEARCH As String, _ - ByVal NO_OF_DOCUMENTS As Integer, _ - ByVal ADDED_WHO As String, _ - ByVal ADDED_WHEN As Global.System.Nullable(Of Date), _ - ByVal CHANGED_WHO As String, _ - ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ - ByVal FINAL_PROFILE As Boolean, _ - ByVal FINAL_TEXT As String, _ - ByVal MOVE2FOLDER As String, _ - ByVal TYPE As Short, _ - ByVal WD_OBJECTTYPE As String, _ - ByVal SORT_BY_LATEST As Boolean, _ - ByVal PM_VEKTOR_INDEX As String, _ - ByVal LOG_INDEX As String, _ - ByVal SQL_VIEW As String, _ - ByVal ANNOTATE_ALL_WORK_HISTORY_ENTRIES As Boolean, _ - ByVal ANNOTATE_WORK_HISTORY_ENTRY As Boolean, _ - ByVal WORK_HISTORY_ENTRY As String, _ - ByVal DISPLAY_MODE As String, _ - ByVal SQL_BTN_FINISH As String, _ - ByVal Original_GUID As Integer, _ - ByVal Original_NAME As String, _ - ByVal Original_TITLE As String, _ - ByVal Original_PRIORITY As Integer, _ - ByVal Original_DESCRIPTION As String, _ - ByVal Original_ACTIVE As Boolean, _ - ByVal Original_NO_OF_DOCUMENTS As Integer, _ - ByVal Original_ADDED_WHO As String, _ - ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_CHANGED_WHO As String, _ - ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_FINAL_PROFILE As Boolean, _ - ByVal Original_FINAL_TEXT As String, _ - ByVal Original_MOVE2FOLDER As String, _ - ByVal Original_TYPE As Short, _ - ByVal Original_WD_OBJECTTYPE As String, _ - ByVal Original_SORT_BY_LATEST As Boolean, _ - ByVal Original_PM_VEKTOR_INDEX As String, _ - ByVal Original_LOG_INDEX As String, _ - ByVal Original_ANNOTATE_ALL_WORK_HISTORY_ENTRIES As Boolean, _ - ByVal Original_ANNOTATE_WORK_HISTORY_ENTRY As Boolean, _ - ByVal Original_WORK_HISTORY_ENTRY As String, _ - ByVal Original_DISPLAY_MODE As String, _ - ByVal GUID As Integer) As Integer - Return Me.Update(Original_NAME, Original_TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH, Original_GUID, Original_NAME, Original_TITLE, Original_PRIORITY, Original_DESCRIPTION, Original_ACTIVE, Original_NO_OF_DOCUMENTS, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_FINAL_PROFILE, Original_FINAL_TEXT, Original_MOVE2FOLDER, Original_TYPE, Original_WD_OBJECTTYPE, Original_SORT_BY_LATEST, Original_PM_VEKTOR_INDEX, Original_LOG_INDEX, Original_ANNOTATE_ALL_WORK_HISTORY_ENTRIES, Original_ANNOTATE_WORK_HISTORY_ENTRY, Original_WORK_HISTORY_ENTRY, Original_DISPLAY_MODE, GUID) - End Function End Class ''' @@ -25090,15 +24999,6 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As DD_DMSLiteDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBPM_TYPETableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_TYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPM_TYPETableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBPM_PROFILETableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -25117,12 +25017,12 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPM_TYPETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_TYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(updatedRows)) + result = (result + Me._tBPM_TYPETableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -25144,12 +25044,12 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(updatedRows)) + result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -25180,12 +25080,21 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(updatedRows)) + result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBDD_USERTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -25208,14 +25117,6 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As DD_DMSLiteDataSet, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBPM_TYPETableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_TYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_TYPETableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBPM_PROFILETableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -25232,11 +25133,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPM_TYPETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_TYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(addedRows)) + result = (result + Me._tBPM_TYPETableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -25256,11 +25157,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(addedRows)) + result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -25288,11 +25189,19 @@ Namespace DD_DMSLiteDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(addedRows)) + result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBDD_USERTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -25322,11 +25231,19 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(deletedRows)) + result = (result + Me._tBDD_USERTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -25354,11 +25271,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPM_CONTROL_TABLETableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_CONTROL_TABLE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(deletedRows)) + result = (result + Me._tBPM_CONTROL_TABLETableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -25378,11 +25295,11 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPM_ERROR_LOGTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_ERROR_LOG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPM_TYPETableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_TYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_ERROR_LOGTableAdapter.Update(deletedRows)) + result = (result + Me._tBPM_TYPETableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -25402,14 +25319,6 @@ Namespace DD_DMSLiteDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPM_TYPETableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPM_TYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPM_TYPETableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If Return result End Function diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index ee318fb..d34d97a 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -3139,7 +3139,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -3324,10 +3324,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + - - + @@ -3335,7 +3334,6 @@ 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 de53c2e..5f96306 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -6,30 +6,30 @@ --> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + 1249 @@ -41,7 +41,7 @@ - + 141 @@ -57,33 +57,17 @@ - + - 968 - 245 + 963 + 237 - 968 + 963 399 - - - - 158 - 113 - - - 158 - 19 - - - 863 - 19 - - - \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 4bfa452..2c821d9 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -890,6 +890,8 @@ + + diff --git a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb index edff0a7..fb62af3 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb @@ -940,6 +940,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property Security_Lock() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("Security_Lock", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property Security_Unlock() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("Security_Unlock", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_PM_WINDREAM/My Project/Resources.resx b/app/DD_PM_WINDREAM/My Project/Resources.resx index c3be2cb..106e0ca 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.resx +++ b/app/DD_PM_WINDREAM/My Project/Resources.resx @@ -124,6 +124,12 @@ ..\Resources\asterisk_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\flag_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\hide_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,8 +175,8 @@ ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\SendReply.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,6 +184,9 @@ ..\Resources\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Security_Lock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\application_form_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,15 +211,15 @@ ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\DeleteFilter_5563.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Hammer_Builder_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -241,20 +250,20 @@ ..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_green1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\flag_pink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Hammer_Builder_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DD_Icons_ICO_CBWATCHER_48px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_orange1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\resultset_next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,8 +304,8 @@ ..\Resources\Search(Go)_5718.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_orange1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -316,8 +325,8 @@ ..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_green1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bullet_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,8 +340,8 @@ ..\Resources\hide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Open_6296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -343,17 +352,14 @@ ..\Resources\ComboBox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ID_FILE_PAGE_SETUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\flag_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\flag_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -379,8 +385,8 @@ ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\flag_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\OpenFileDialog_692.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,7 +442,7 @@ ..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DD_Icons_ICO_CBWATCHER_48px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Security_Unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/Resources/Security_Lock.svg b/app/DD_PM_WINDREAM/Resources/Security_Lock.svg new file mode 100644 index 0000000..5fc2730 --- /dev/null +++ b/app/DD_PM_WINDREAM/Resources/Security_Lock.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/app/DD_PM_WINDREAM/Resources/Security_Unlock.svg b/app/DD_PM_WINDREAM/Resources/Security_Unlock.svg new file mode 100644 index 0000000..7bb4c49 --- /dev/null +++ b/app/DD_PM_WINDREAM/Resources/Security_Unlock.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index ad67175..3c8f1ec 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -100,6 +100,7 @@ Partial Class frmAdministration Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.pnlEdit = New System.Windows.Forms.Panel() Me.tabctrl_Profilkonfig = New System.Windows.Forms.TabControl() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.lblPriority = New System.Windows.Forms.Label() @@ -186,7 +187,7 @@ Partial Class frmAdministration Me.Label5 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridControlNavigation = New DevExpress.XtraGrid.GridControl() Me.GridViewProfile = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colProfilGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME = New DevExpress.XtraGrid.Columns.GridColumn() @@ -237,8 +238,11 @@ Partial Class frmAdministration Me.BarButtonItem23 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem24 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() + Me.BarToggleSwitchItemEdit = New DevExpress.XtraBars.BarToggleSwitchItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupProfile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -286,6 +290,7 @@ Partial Class frmAdministration CType(Me.PRIORITYNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.pnlEdit.SuspendLayout() Me.tabctrl_Profilkonfig.SuspendLayout() Me.TabPage5.SuspendLayout() Me.TabPageAfterIndex.SuspendLayout() @@ -309,7 +314,7 @@ Partial Class frmAdministration CType(Me.Series2Sequence, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Series1Sequence, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControlNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -840,19 +845,25 @@ Partial Class frmAdministration ' 'TabPage1 ' - Me.TabPage1.Controls.Add(Me.tabctrl_Profilkonfig) - Me.TabPage1.Controls.Add(GUIDLabel) - Me.TabPage1.Controls.Add(TITLELabel) - Me.TabPage1.Controls.Add(Me.TITLETextBox) - Me.TabPage1.Controls.Add(Me.PROFILGUIDTextBox) - Me.TabPage1.Controls.Add(Me.ACTIVECheckBox) - Me.TabPage1.Controls.Add(NAMELabel) - Me.TabPage1.Controls.Add(Me.SORT_BY_LATESTCheckBox) - Me.TabPage1.Controls.Add(Me.NAMETextBox) + Me.TabPage1.Controls.Add(Me.pnlEdit) resources.ApplyResources(Me.TabPage1, "TabPage1") Me.TabPage1.Name = "TabPage1" Me.TabPage1.UseVisualStyleBackColor = True ' + 'pnlEdit + ' + Me.pnlEdit.Controls.Add(Me.PROFILGUIDTextBox) + Me.pnlEdit.Controls.Add(Me.tabctrl_Profilkonfig) + Me.pnlEdit.Controls.Add(GUIDLabel) + Me.pnlEdit.Controls.Add(Me.ACTIVECheckBox) + Me.pnlEdit.Controls.Add(Me.SORT_BY_LATESTCheckBox) + Me.pnlEdit.Controls.Add(TITLELabel) + Me.pnlEdit.Controls.Add(NAMELabel) + Me.pnlEdit.Controls.Add(Me.TITLETextBox) + Me.pnlEdit.Controls.Add(Me.NAMETextBox) + resources.ApplyResources(Me.pnlEdit, "pnlEdit") + Me.pnlEdit.Name = "pnlEdit" + ' 'tabctrl_Profilkonfig ' resources.ApplyResources(Me.tabctrl_Profilkonfig, "tabctrl_Profilkonfig") @@ -1461,14 +1472,14 @@ Partial Class frmAdministration resources.ApplyResources(Me.Label1, "Label1") Me.Label1.Name = "Label1" ' - 'GridControl1 + 'GridControlNavigation ' - Me.GridControl1.DataSource = Me.TBPM_PROFILEBindingSource - resources.ApplyResources(Me.GridControl1, "GridControl1") - Me.GridControl1.MainView = Me.GridViewProfile - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.TabStop = False - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile}) + Me.GridControlNavigation.DataSource = Me.TBPM_PROFILEBindingSource + resources.ApplyResources(Me.GridControlNavigation, "GridControlNavigation") + Me.GridControlNavigation.MainView = Me.GridViewProfile + Me.GridControlNavigation.Name = "GridControlNavigation" + Me.GridControlNavigation.TabStop = False + Me.GridControlNavigation.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile}) ' 'GridViewProfile ' @@ -1478,7 +1489,7 @@ Partial Class frmAdministration Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colProfilGUID, Me.colNAME}) Me.GridViewProfile.DetailHeight = 295 - Me.GridViewProfile.GridControl = Me.GridControl1 + Me.GridViewProfile.GridControl = Me.GridControlNavigation Me.GridViewProfile.Name = "GridViewProfile" Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] @@ -1546,7 +1557,7 @@ Partial Class frmAdministration 'pnlMain ' Me.pnlMain.Controls.Add(Me.TabControl1) - Me.pnlMain.Controls.Add(Me.GridControl1) + Me.pnlMain.Controls.Add(Me.GridControlNavigation) resources.ApplyResources(Me.pnlMain, "pnlMain") Me.pnlMain.Name = "pnlMain" ' @@ -1590,9 +1601,9 @@ 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.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}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 28 + Me.RibbonControl1.MaxItemId = 30 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -1804,25 +1815,46 @@ Partial Class frmAdministration Me.BarButtonItem25.Id = 27 Me.BarButtonItem25.Name = "BarButtonItem25" ' + 'BarButtonItem26 + ' + resources.ApplyResources(Me.BarButtonItem26, "BarButtonItem26") + Me.BarButtonItem26.Id = 28 + Me.BarButtonItem26.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.Security_Lock + Me.BarButtonItem26.Name = "BarButtonItem26" + Me.BarButtonItem26.Tag = "Unlock" + ' + 'BarToggleSwitchItemEdit + ' + resources.ApplyResources(Me.BarToggleSwitchItemEdit, "BarToggleSwitchItemEdit") + Me.BarToggleSwitchItemEdit.Id = 29 + Me.BarToggleSwitchItemEdit.Name = "BarToggleSwitchItemEdit" + Me.BarToggleSwitchItemEdit.Tag = "Unlock" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup4}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroupProfile, Me.RibbonPageGroup2, Me.RibbonPageGroup4}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' - 'RibbonPageGroup1 + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem26) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") + ' + 'RibbonPageGroupProfile ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem8) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem7) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem5) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem6) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem21) - Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnItemFinishSQL) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem8) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem5) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem6) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem21) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.bbtnItemFinishSQL) + Me.RibbonPageGroupProfile.Name = "RibbonPageGroupProfile" + resources.ApplyResources(Me.RibbonPageGroupProfile, "RibbonPageGroupProfile") ' 'RibbonPageGroup2 ' @@ -1913,7 +1945,8 @@ Partial Class frmAdministration CType(Me.PRIORITYNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) - Me.TabPage1.PerformLayout() + Me.pnlEdit.ResumeLayout(False) + Me.pnlEdit.PerformLayout() Me.tabctrl_Profilkonfig.ResumeLayout(False) Me.TabPage5.ResumeLayout(False) Me.TabPage5.PerformLayout() @@ -1943,7 +1976,7 @@ Partial Class frmAdministration CType(Me.Series1Sequence, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControlNavigation, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -2007,7 +2040,7 @@ Partial Class frmAdministration Friend WithEvents TBPM_PROFILE_FILESTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter Friend WithEvents cmbLOGIndex As System.Windows.Forms.ComboBox Friend WithEvents DataGridViewCheckBoxColumn2 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridControlNavigation As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewProfile As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource @@ -2083,7 +2116,7 @@ Partial Class frmAdministration Friend WithEvents lblSearch As Label Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + 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 @@ -2169,4 +2202,8 @@ Partial Class frmAdministration Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents Label14 As Label + Friend WithEvents pnlEdit As Panel + Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarToggleSwitchItemEdit As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index c8de6ba..3aaeeee 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -126,7 +126,7 @@ - 7, 9 + 16, 16 25, 16 @@ -144,10 +144,10 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 1 + 2 @@ -163,7 +163,7 @@ True - 571, 56 + 17, 56 206, 17 @@ -334,7 +334,7 @@ True - 623, 173 + 159, 134 Fill @@ -532,7 +532,7 @@ True - 17, 173 + 1406, 95 Fill @@ -565,7 +565,7 @@ 58 - 1062, 198 + 1062, 199 3 @@ -655,7 +655,7 @@ True - 739, 134 + 984, 95 Fill @@ -688,7 +688,7 @@ 58 - 1062, 232 + 1062, 231 0 @@ -778,7 +778,7 @@ 1062, 484 - 223 + 224 1 @@ -802,7 +802,7 @@ True - 97, 9 + 106, 16 80, 16 @@ -820,7 +820,7 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit 6 @@ -997,7 +997,7 @@ True - 97, 36 + 106, 43 38, 16 @@ -1015,10 +1015,10 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 2 + 5 False @@ -1087,7 +1087,7 @@ 6 - 376, 56 + 1669, 17 368, 17 @@ -1294,7 +1294,7 @@ 20 - 183, 33 + 192, 40 511, 23 @@ -1309,13 +1309,13 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 3 + 7 - 38, 6 + 47, 13 53, 23 @@ -1330,13 +1330,13 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 4 + 0 - 183, 6 + 192, 13 511, 23 @@ -1351,7 +1351,7 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit 8 @@ -1405,7 +1405,7 @@ 14 - 703, 6 + 718, 13 65, 24 @@ -1423,10 +1423,10 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 5 + 3 Tahoma, 9.75pt @@ -1534,10 +1534,10 @@ windream-Suche wählen - 17, 56 + 1310, 17 - 205, 56 + 1498, 17 Top, Bottom, Left, Right @@ -1756,7 +1756,7 @@ 3, 3, 3, 3 - 976, 434 + 1060, 417 0 @@ -1783,10 +1783,10 @@ Top, Bottom, Left, Right - 471, 212 + 1273, 134 - 17, 212 + 819, 134 Fill @@ -1843,7 +1843,7 @@ 246 - 630, 385 + 714, 368 93 @@ -1867,10 +1867,10 @@ False - 630, 0 + 714, 0 - 323, 385 + 323, 368 91 @@ -1891,7 +1891,7 @@ 3, 23 - 953, 385 + 1037, 368 94 @@ -1948,7 +1948,7 @@ 3, 3, 3, 3 - 962, 399 + 1046, 382 0 @@ -2134,7 +2134,7 @@ 3, 3, 3, 3 - 962, 402 + 1046, 385 1 @@ -2164,7 +2164,7 @@ 3, 3 - 970, 428 + 1054, 411 92 @@ -2188,7 +2188,7 @@ 3, 3, 3, 3 - 976, 434 + 1060, 417 1 @@ -2209,10 +2209,10 @@ 1 - 6, 62 + 3, 70 - 984, 463 + 1068, 446 6 @@ -2224,16 +2224,16 @@ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 0 + 1 Tahoma, 9.75pt - 703, 33 + 718, 40 238, 24 @@ -2251,10 +2251,37 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage1 + pnlEdit - 7 + 4 + + + Fill + + + False + + + 3, 3 + + + 1076, 519 + + + 28 + + + pnlEdit + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 4, 25 @@ -3385,7 +3412,7 @@ 6, 89 - 1070, 344 + 180, 0 1 @@ -3569,10 +3596,10 @@ Top Kreditoren: 0 - + Left - + 0, 0 @@ -3590,35 +3617,35 @@ Top Kreditoren: 129 - + 276, 554 - + 84 - - GridControl1 + + GridControlNavigation - + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + pnlMain - + 1 - 1011, 56 + 457, 56 - 257, 134 + 502, 95 - 391, 95 + 1094, 56 - 274, 95 + 977, 56 20, 20 @@ -3651,13 +3678,13 @@ Top Kreditoren: 1 - 794, 56 + 240, 56 17, 17 - 17, 95 + 720, 56 Fill @@ -3684,34 +3711,34 @@ Top Kreditoren: 0 - 670, 95 + 1373, 56 - 943, 95 + 17, 95 - 17, 134 + 262, 95 - 501, 134 + 746, 95 - 953, 134 + 1198, 95 - 252, 173 + 1641, 95 - 481, 173 + 17, 134 - 956, 173 + 492, 134 - 166, 212 + 968, 134 - 781, 212 + 1583, 134 Aktualisieren @@ -4550,10 +4577,19 @@ Top Kreditoren: Connections + + Ent-/Sperren + + + Ent-/Sperren + 0, 0 - + + Bearbeitungs-Modus + + Profil-Verwaltung @@ -5269,16 +5305,34 @@ Top Kreditoren: DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem26 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarToggleSwitchItemEdit + + + DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup1 + + RibbonPageGroup3 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroupProfile - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, 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 658e8a1..971a5c2 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -74,6 +74,7 @@ Public Class frmAdministration End If ObjekttypenEintragen() Indexe_eintragen() + RibbonPageGroupProfile.Enabled = False End Sub Sub Indexe_eintragen() If cmbObjekttypen.Text <> "" Then @@ -428,12 +429,12 @@ Public Class frmAdministration Private Sub TabControl1_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles TabControl1.SelectedIndexChanged Select Case TabControl1.SelectedIndex Case 0 - GridControl1.Enabled = True - RibbonPageGroup1.Enabled = True + GridControlNavigation.Enabled = True + RibbonPageGroupProfile.Enabled = True Case 1 - GridControl1.Enabled = True - RibbonPageGroup1.Enabled = False + GridControlNavigation.Enabled = True + RibbonPageGroupProfile.Enabled = False RibbonPageGroup2.Enabled = False RibbonPageGroup4.Enabled = False If PROFILGUIDTextBox.Text = String.Empty Then @@ -442,10 +443,10 @@ Public Class frmAdministration FillProfile_Zuordnung(PROFILGUIDTextBox.Text) End If Case 2 - RibbonPageGroup1.Enabled = False + RibbonPageGroupProfile.Enabled = False RibbonPageGroup2.Enabled = False RibbonPageGroup4.Enabled = True - GridControl1.Enabled = False + GridControlNavigation.Enabled = False Load_Chart_Konfig() End Select End Sub @@ -1060,6 +1061,10 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + If BarButtonItem26.Tag = "Lock" Then + EditMode_Profile() + End If + Refresh_Profildaten() End Sub @@ -1121,14 +1126,17 @@ Public Class frmAdministration End Sub Sub Save_Profile() Try - Me.TBPM_PROFILEBindingSource.EndEdit() + If UNSAVED_CHANGES_PROFILE = False Then + Me.TBPM_PROFILEBindingSource.EndEdit() + End If + If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Or UNSAVED_CHANGES_PROFILE Then CHANGED_WHOTextBox.Text = USER_USERNAME Me.TBPM_PROFILEBindingSource.EndEdit() Me.TBPM_PROFILETableAdapter.Update(DD_DMSLiteDataSet.TBPM_PROFILE) - Refresh_Profildaten() - Dim pos As Integer = TBPM_PROFILEBindingSource.Find("GUID", CURRENT_ProfilGUID) - TBPM_PROFILEBindingSource.Position = pos + 'Refresh_Profildaten() + 'Dim pos As Integer = TBPM_PROFILEBindingSource.Find("GUID", CURRENT_ProfilGUID) + 'TBPM_PROFILEBindingSource.Position = pos tsbStaticInfo.Caption = $"ProfileData saved - {Now.ToLongTimeString}" UNSAVED_CHANGES_PROFILE = False Else @@ -1409,7 +1417,7 @@ Public Class frmAdministration End If ' TBPM_PROFILEBindingSource.Position = PROFILEBS_POS - 1 Else - Refresh_Profildaten() + UNSAVED_CHANGES_PROFILE = False End If End If End Sub @@ -1485,16 +1493,16 @@ Public Class frmAdministration End If ' End Sub - Private Sub TBPM_PROFILEBindingSource_ListChanged(sender As Object, e As ListChangedEventArgs) Handles TBPM_PROFILEBindingSource.ListChanged - If formloaded = False Then - Exit Sub - End If - Me.TBPM_PROFILEBindingSource.EndEdit() - If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Then - UNSAVED_CHANGES_PROFILE = True - CHECK_QUESTION_CHANGES() - End If - End Sub + 'Private Sub TBPM_PROFILEBindingSource_ListChanged(sender As Object, e As ListChangedEventArgs) Handles TBPM_PROFILEBindingSource.ListChanged + ' If formloaded = False Then + ' Exit Sub + ' End If + ' 'Me.TBPM_PROFILEBindingSource.EndEdit() + ' 'If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Then + ' ' UNSAVED_CHANGES_PROFILE = True + ' ' CHECK_QUESTION_CHANGES() + ' 'End If + 'End Sub 'Private Sub TBPM_PROFILEBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentChanged ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then ' Exit Sub @@ -1502,16 +1510,16 @@ Public Class frmAdministration ' ' change_BindingSource = True ' ' Check_Changes() 'End Sub - Private Sub TBPM_PROFILEBindingSource_CurrentItemChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentItemChanged + 'Private Sub TBPM_PROFILEBindingSource_CurrentItemChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentItemChanged - End Sub + 'End Sub Private Sub TBPM_PROFILEBindingSource_PositionChanged(sender As System.Object, e As System.EventArgs) Handles TBPM_PROFILEBindingSource.PositionChanged If formloaded = False Then Exit Sub End If - If UNSAVED_CHANGES_PROFILE Then - CHECK_QUESTION_CHANGES() - End If + 'If UNSAVED_CHANGES_PROFILE Then + ' CHECK_QUESTION_CHANGES() + 'End If 'change_BindingSource = False @@ -1737,13 +1745,38 @@ Public Class frmAdministration ' End If 'End Sub - Private Sub TBPM_PROFILEBindingSource_DataError(sender As Object, e As BindingManagerDataErrorEventArgs) Handles TBPM_PROFILEBindingSource.DataError - - End Sub - - Private Sub TBPM_PROFILETableAdapter_Disposed(sender As Object, e As EventArgs) Handles TBPM_PROFILETableAdapter.Disposed - + Private Sub BarButtonItem26_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem26.ItemClick + 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 + Me.TBPM_PROFILEBindingSource.EndEdit() + If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Or UNSAVED_CHANGES_FI = True Then + UNSAVED_CHANGES_PROFILE = True + CHECK_QUESTION_CHANGES() + End If + With BarButtonItem26 + .Tag = "Unlock" + .ImageOptions.SvgImage = My.Resources.Security_Lock + .ItemAppearance.Normal.BackColor = Nothing + End With + + GridControlNavigation.Enabled = True + RibbonPageGroupProfile.Enabled = False + pnlEdit.Enabled = False + End If End Sub - End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 851d2c6..ea3a077 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" Then + If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Or CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" 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 162ae7b..86489af 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -3931,20 +3931,23 @@ Public Class frmValidator oErrorOcurred = True ItemWorked = False Else - LOGGER.Warn($"FinalIndexResult from SQL is DBNull - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") + LOGGER.Warn($"FinalIndexResult from SQL is DBNull - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, Continuing with next Attribute and Replacing with empty String") + oResultfromSQL = "" Continue For End If End If - If Len(oResultfromSQL) = 0 And oContinueOnIndifferentState = False Then - errormessage = "Result from SQL is EmptyValue - Check the SQL and the log" - My.Settings.Save() - frmError.ShowDialog() - oErrorOcurred = True - ItemWorked = False - Else - LOGGER.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") - Continue For + If Len(oResultfromSQL) = 0 Then + If oContinueOnIndifferentState = False Then + errormessage = "Result from SQL is EmptyValue - Check the SQL and the log" + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + ItemWorked = False + Else + LOGGER.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") + Continue For + End If End If oValue = oResultfromSQL Else