MS - Updateverhalten PRoxyserver

2017-04-25 16:48:42 +02:00
parent 5a00b63de1
commit 1d18370ec0
6 changed files with 659 additions and 920 deletions
--- a/app/DD-Record-Organizer/ClassControlCommands.vb
+++ b/app/DD-Record-Organizer/ClassControlCommands.vb
@@ -196,9 +196,9 @@
    End Function

    Public Shared Function UpdateControl(control As Control, properties As Object)
-        Try
-            ' Nach Typ den Update Befehl anpassen
-            Dim type As String = control.GetType.Name
+        ' Try
+        ' Nach Typ den Update Befehl anpassen
+        Dim type As String = control.GetType.Name

            Dim SQL As String
            Dim NAME As String
@@ -355,11 +355,11 @@
            Else
                Throw New Exception()
            End If
-        Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in UpdateControl: " & ex.Message, True)
-            MsgBox("Unexpected Error in UpdateControl:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
-            Return False
-        End Try
+        'Catch ex As Exception
+        '    ClassLogger.Add("Unexpected Error in UpdateControl: " & ex.Message, True)
+        '    MsgBox("Unexpected Error in UpdateControl:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
+        '    Return False
+        'End Try
    End Function

    Public Shared Function UpdateControlScreen(control As Control, properties As Object)
--- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb
@@ -1,6 +1,6 @@
 Imports DD_Record_Organizer.ClassDatabase
 Imports DD_Record_Organizer.ClassControlBuilder
-
+Imports DD_LIB_Standards


 Public Class ClassControlCommandsUI
@@ -823,8 +823,15 @@ Public Class ClassControlCommandsUI
            Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value)
            If Not IsNothing(converted_value) Then
                Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, converted_value, AddedWho)
-                ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
-                Return ClassDatabase.Execute_non_Query(ins)
+                If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
+                    If ClassDatabase.Execute_non_Query(ins) = True Then
+                        Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
+                    Else
+                        Return False
+                    End If
+                Else
+                    Return ClassDatabase.Execute_non_Query(ins)
+                End If
            Else
                Return False
            End If
@@ -839,13 +846,20 @@ Public Class ClassControlCommandsUI
        Try
            Dim CHANGED_WHO = USER_USERNAME
            Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value)
-
            Dim def = "SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID
-
            Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}', CHANGE_STEP = {2} WHERE CONTROL_ID = {3} AND RECORD_ID = {4}",
                                    converted_value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID)
-            ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
-            Return ClassDatabase.Execute_non_Query(upd)
+            If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
+                If ClassDatabase.Execute_non_Query(upd) = True Then
+                    Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
+                Else
+                    Return False
+                End If
+            Else
+                Return ClassDatabase.Execute_non_Query(upd)
+            End If
+
+

        Catch ex As Exception
            ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True)
--- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
@@ -24,9 +24,9 @@ Partial Class frmConstructor_Main
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
-        Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
-        Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
@@ -414,12 +414,12 @@ Partial Class frmConstructor_Main
        Me.GridControlMain.AllowDrop = True
        Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid
        resources.ApplyResources(Me.GridControlMain, "GridControlMain")
-        GridLevelNode4.LevelTemplate = Me.grvwGrid
-        GridLevelNode4.RelationName = "Level1"
-        GridLevelNode5.LevelTemplate = Me.grvwCarousel
-        GridLevelNode5.RelationName = "Level2"
-        GridLevelNode6.RelationName = "Level3"
-        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4, GridLevelNode5, GridLevelNode6})
+        GridLevelNode1.LevelTemplate = Me.grvwGrid
+        GridLevelNode1.RelationName = "Level1"
+        GridLevelNode2.LevelTemplate = Me.grvwCarousel
+        GridLevelNode2.RelationName = "Level2"
+        GridLevelNode3.RelationName = "Level3"
+        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3})
        Me.GridControlMain.MainView = Me.grvwTiles
        Me.GridControlMain.Name = "GridControlMain"
        Me.GridControlMain.TabStop = False
@@ -830,6 +830,8 @@ Partial Class frmConstructor_Main
        '
        Me.grvwGridPos.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.EvenRow.BackColor"), System.Drawing.Color)
        Me.grvwGridPos.Appearance.EvenRow.Options.UseBackColor = True
+        Me.grvwGridPos.Appearance.FilterPanel.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.FilterPanel.BackColor"), System.Drawing.Color)
+        Me.grvwGridPos.Appearance.FilterPanel.Options.UseBackColor = True
        Me.grvwGridPos.GridControl = Me.GridControlPos
        Me.grvwGridPos.Name = "grvwGridPos"
        Me.grvwGridPos.OptionsView.EnableAppearanceEvenRow = True
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -1734,6 +1734,9 @@ Public Class frmConstructor_Main
                Me.Cursor = Cursors.Default
                Return False
            Else
+                If RECORD_CHANGED = True Then
+                    RECORD_CHANGED = False
+                End If
                If CtrlCommandUI.IsInsert Then
                    ActivateAllTabs()
                    DisableEditMode()
@@ -4651,7 +4654,6 @@ Public Class frmConstructor_Main
                            If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, POS_RECORD_ID, "POS_LINK for Entity " & POS_ENTITY.ToString) = True Then
                                ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, POS_RECORD_ID)
                            End If
-                            Load_Pos_Data()
                        Else
                            MsgBox("Unexpected Error in Creating POS", MsgBoxStyle.Exclamation)
                        End If
@@ -4701,11 +4703,15 @@ Public Class frmConstructor_Main
    End Sub

    Private Sub grvwGridPos_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGridPos.RowStyle
+        If e.RowHandle = -1 Then
+            Exit Sub
+        End If
        If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then
            e.Appearance.BackColor = Color.Orange 'LemonChiffon
        End If
    End Sub

+
    Private Sub grvwGrid_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGrid.RowStyle
        If e.RowHandle = -1 Then
            Exit Sub
@@ -6547,4 +6553,6 @@ Public Class frmConstructor_Main
            Save_Record()
        End If
    End Sub
+
+
 End Class
--- a/app/DD-Record-Organizer/frmMain.vb
+++ b/app/DD-Record-Organizer/frmMain.vb
@@ -150,8 +150,11 @@ Public Class frmMain
            Else
                itemRefreshProxy.Visibility = BarItemVisibility.Never
            End If
-
-            LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
+            Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
+            If USER_LANGUAGE <> "de-DE" Then
+                msg = "#User logged in: " & USERS_LOGGED_IN.ToString()
+            End If
+            LabelLoggedIn.Caption = msg

            'LoadMenuItems()
            LoadMenuItems2()