MS_09.05.2016

2016-05-09 13:55:58 +02:00 · 2016-05-09 13:55:58 +02:00 · 756d96d1d3
commit 756d96d1d3
parent 4c53286626
5 changed files with 164 additions and 140 deletions
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@ -230,9 +230,9 @@ Public Class ClassControlBuilder
            End If


-            If CURRENT_RECORD_ID = 0 Then
-                Exit Sub
-            End If
+            'If CURRENT_RECORD_ID = 0 Then
+            '    Exit Sub
+            'End If
            If IsNothing(value) Then 'Kein Value also abhängige Controls auf "Leer" setzen
                For Each row As DataRow In TableResult.Rows

@ -276,8 +276,11 @@ Public Class ClassControlBuilder
                        Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, CONTROL_ID, CURRENT_RECORD_ID)
                        ' ClassDatabase.Execute_non_Query(upd1)
                    Else
+                        If CURRENT_RECORD_ID <> 0 Then
                            Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName)
                            'If ClassDatabase.Execute_non_Query(ins) = True Then
+                        End If
+                       
                        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
                        'End If
                    End If
@ -371,7 +374,7 @@ Public Class ClassControlBuilder

                                    End If
                                Catch ex As Exception
-                                    ClassLogger.Add("Unexpectet Error in OnComboBoxValueChanged - TextBox: " & ex.Message, True)
+                                    ClassLogger.Add("Unexpected Error in OnComboBoxValueChanged - TextBox: " & ex.Message, True)
                                End Try
                            Else
                                ClassLogger.Add(" >> Attention: RowCount for depending control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
@ -452,7 +455,9 @@ Public Class ClassControlBuilder
            Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
            'SQL für enable control
            Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
-
+            'If CtrlCommandUI.IsInsert = True Then
+            '    CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID)
+            'End If

            Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)

@ -470,6 +475,7 @@ Public Class ClassControlBuilder
            If IsNothing(CONTROL_VALUE) Then
                Exit Sub
            End If
+
            Enable_Controls(control, datatable1, CONTROL_VALUE)
            Dim values = New List(Of Object)(CONTROL_VALUE.Split(";").ToArray())
            'Jetzt noch die checked Items setzen
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.4.5.1")> 
+<Assembly: AssemblyVersion("2.4.5.2")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

 <Assembly: NeutralResourcesLanguageAttribute("")> 
--- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
@ -22,6 +22,7 @@ Partial Class frmConstructor_Main
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
@ -29,12 +30,12 @@ Partial Class frmConstructor_Main
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
-        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip()
+        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -58,7 +59,7 @@ Partial Class frmConstructor_Main
        Me.pnlDetails = New System.Windows.Forms.Panel()
        Me.TabWindream = New DevExpress.XtraTab.XtraTabPage()
        Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
        Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -93,7 +94,7 @@ Partial Class frmConstructor_Main
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.GridControlPos = New DevExpress.XtraGrid.GridControl()
        Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator()
+        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@ -129,7 +130,7 @@ Partial Class frmConstructor_Main
        Me.GridControlParent = New DevExpress.XtraGrid.GridControl()
        Me.GridViewParent = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.btnRelinkParentID = New System.Windows.Forms.Button()
-        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource()
+        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components)
        Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane()
        Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton()
        Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton()
@ -138,18 +139,18 @@ Partial Class frmConstructor_Main
        Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel()
        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
-        Me.ttToolTip = New System.Windows.Forms.ToolTip()
-        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip()
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
+        Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
-        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
        Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter()
-        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
-        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource()
-        Me.ToolTipController = New DevExpress.Utils.ToolTipController()
+        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@ -298,7 +298,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>788, 248</value>
+    <value>795, 248</value>
  </data>
  <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -373,7 +373,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 334</value>
+    <value>1072, 338</value>
  </data>
  <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -391,7 +391,7 @@
    <value>0</value>
  </data>
  <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 334</value>
+    <value>1072, 338</value>
  </data>
  <data name="TabDetails.Text" xml:space="preserve">
    <value>Detailansicht</value>
@ -409,7 +409,7 @@
    <value>0</value>
  </data>
  <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1071, 362</value>
+    <value>1078, 369</value>
  </data>
  <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -469,7 +469,7 @@
    <value>192, 255, 192</value>
  </data>
  <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 309</value>
+    <value>1072, 313</value>
  </data>
  <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@ -565,7 +565,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 25</value>
+    <value>1072, 25</value>
  </data>
  <data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@ -586,7 +586,7 @@
    <value>2</value>
  </data>
  <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 334</value>
+    <value>1072, 338</value>
  </data>
  <data name="TabWindream.Text" xml:space="preserve">
    <value>windream-Dateien</value>
@ -1017,7 +1017,7 @@
    <value>2</value>
  </data>
  <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 334</value>
+    <value>1072, 338</value>
  </data>
  <data name="TabFollowUp.Text" xml:space="preserve">
    <value>Wiedervorlage</value>
@ -1044,7 +1044,7 @@
    <value>Cyan</value>
  </data>
  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 309</value>
+    <value>1072, 313</value>
  </data>
  <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -1068,7 +1068,7 @@
    <value>0, 25</value>
  </data>
  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 309</value>
+    <value>1072, 313</value>
  </data>
  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@ -1243,7 +1243,7 @@
    <value>0, 0</value>
  </data>
  <data name="BindingNavigatorPOS.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 25</value>
+    <value>1072, 25</value>
  </data>
  <data name="BindingNavigatorPOS.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -1272,7 +1272,7 @@
 </value>
  </data>
  <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1069, 334</value>
+    <value>1072, 338</value>
  </data>
  <data name="TabPos.Text" xml:space="preserve">
    <value>Positionen</value>
@ -1472,7 +1472,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStripEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1071, 25</value>
+    <value>1078, 25</value>
  </data>
  <data name="ToolStripEdit.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -1577,7 +1577,7 @@
    <value>Panel2</value>
  </data>
  <data name="SplitContainerBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1083, 387</value>
+    <value>1083, 394</value>
  </data>
  <data name="SplitContainerBottom.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@ -752,6 +752,43 @@ Public Class frmConstructor_Main
                ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, Grid_RecordID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
                Show_Selected_Record_Data(Grid_RecordID, False)

+                Check_Rights()
+
+                If TCDetails.SelectedTabPage Is Nothing Then
+                    Exit Sub
+                End If
+                If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Text.StartsWith("Posi") Then
+                    Clear_GridPos_View()
+                    Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID")
+                    'If Not IsNothing(POS_GRID_RECORD) Then
+                    '    If POS_GRID_RECORD <> POS_RECORD_ID Then
+
+                    '    End If
+                    'Else
+                    '    Load_Pos_Data()
+                    '    Load_POSGrid_Layout()
+                    'End If
+                    Load_Pos_Data()
+                    Load_POSGrid_Layout()
+
+                End If
+
+                If RECORD_ID > 0 Then
+                    If RIGHT_ONLY_READ = False Then
+                        tsButtonEdit.Enabled = True
+                    End If
+                    Get_RecordCounts_Nodes()
+                End If
+            End If
+        End If
+
+
+
+
+    End Sub
+
+    Sub Check_Rights()
+        Try
            RIGHT_ONLY_READ = False
            RIGHT_WINDREAM_FORBIDDEN = False
            tsmi_RecordDelete.Enabled = True
@ -762,9 +799,12 @@ Public Class frmConstructor_Main
            tslblLocked.Visible = False
            tslblFileslocked.Visible = False
            TabFollowUp.PageEnabled = True
-
+            TabPos.PageEnabled = True
            TabWindream.PageEnabled = True
            WindreamsucheNeuLadenToolStripMenuItem.Enabled = True
+            WorkflowTasksNeuErstellenToolStripMenuItem.Enabled = True
+            tsButtonShowWorkflowTasks.Enabled = True
+            VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True
            Dim tempsql
            If SQL_RIGHT_READ_AND_VIEW_ONLY <> "" Then
                Try
@ -808,6 +848,10 @@ Public Class frmConstructor_Main
                        tslblLocked.Visible = True
                        RecordKopierenToolStripMenuItem.Enabled = False
                        TabFollowUp.PageEnabled = False
+                        TabPos.PageEnabled = False
+                        tsButtonShowWorkflowTasks.Enabled = False
+                        WorkflowTasksNeuErstellenToolStripMenuItem.Enabled = False
+                        VerknüpfungenAnzeigenToolStripMenuItem.Enabled = False
                    End If

                Catch ex As Exception
@ -858,40 +902,10 @@ Public Class frmConstructor_Main
                    ClassLogger.Add("TempSQL so far: " & tempsql)
                End Try
            End If
-
-                If TCDetails.SelectedTabPage Is Nothing Then
-                    Exit Sub
-                End If
-                If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Text.StartsWith("Posi") Then
-                    Clear_GridPos_View()
-                    Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID")
-                    'If Not IsNothing(POS_GRID_RECORD) Then
-                    '    If POS_GRID_RECORD <> POS_RECORD_ID Then
-
-                    '    End If
-                    'Else
-                    '    Load_Pos_Data()
-                    '    Load_POSGrid_Layout()
-                    'End If
-                    Load_Pos_Data()
-                    Load_POSGrid_Layout()
-
-                End If
-
-                If RECORD_ID > 0 Then
-                    If RIGHT_ONLY_READ = False Then
-                        tsButtonEdit.Enabled = True
-                    End If
-                    Get_RecordCounts_Nodes()
-                End If
-            End If
-        End If
-
-
-
-
+        Catch ex As Exception
+            MsgBox("unexpected Error in Check_Rights:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
    End Sub
-
 #End Region

 #Region "TreeView"
@ -1018,6 +1032,7 @@ Public Class frmConstructor_Main
        If SelectedNode IsNot Nothing Then
            ENTITY_LOADED = False
            ENTITY_ID = SelectedNode.Tag
+            CURRENT_FORM_ID = ENTITY_ID
            Dim parentNode As TreeNode = TryCast(SelectedNode.Parent, TreeNode)

            ACT_EBENE = 2
@ -1279,6 +1294,7 @@ Public Class frmConstructor_Main
                tsButtonShowWorkflowTasks.Enabled = True
                CURRENT_PARENT_ID = PARENT_ID
                ClassControlValues.LoadDefaultValues(ENTITY_ID, SELECTED_RECORD_ID, pnlDetails.Controls, CURRENT_PARENT_ID, ENTITY_ID)
+                dff()
                ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden
                tsButtonSave.Enabled = True
                ' Muss aktiviert werden, sonst funktionieren die Combobox Abhängigkeits Events nicht
@ -2029,6 +2045,7 @@ Public Class frmConstructor_Main
                        ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden!
                        RECORD_CHANGED = False
                        Update_Record_Label(Grid_RecordID)
+                        Check_Rights()
                End Select
            End If
        Catch ex As Exception