diff --git a/app/DD-Record-Organizer/ClassControlCommands.vb b/app/DD-Record-Organizer/ClassControlCommands.vb index ac2c954..ce6be79 100644 --- 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) diff --git a/app/DD-Record-Organizer/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/ClassControlCommandsUI.vb index 499b7bf..3335021 100644 --- 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) diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 9bd7e12..13a5f82 100644 --- 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 diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index aca834e..c4e2589 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -134,453 +134,6 @@ 1222, 56 - - 195, 160 - - - cmsTreeView - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - Segoe UI, 9.75pt - - - 0, 0 - - - 283, 237 - - - - 0 - - - TreeViewMain - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerTop.Panel1 - - - 0 - - - Panel1 - - - 295, 17 - - - 252, 270 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - Tahoma, 9pt - - - Aqua - - - Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu lassen - - - 0, 25 - - - 988, 212 - - - 2 - - - GridControlMain - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerTop.Panel2 - - - 0 - - - 395, 95 - - - 0, 0 - - - 988, 25 - - - 1 - - - ToolStrip1 - - - ToolStripRecords - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerTop.Panel2 - - - 1 - - - Panel2 - - - 1276, 237 - - - 0 - - - SplitContainerControl1 - - - SplitContainerTop - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel1 - - - 0 - - - Panel1 - - - Fuchsia - - - 255, 192, 255 - - - Tahoma, 8.25pt, style=Bold, Italic - - - Fill - - - 0, 0 - - - 591, 17 - - - SplitContainerDetails - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabDetails - - - 0 - - - ToolStripEdit - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabDetails - - - 1 - - - 1270, 372 - - - Detailansicht - - - TabDetails - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 0 - - - 1276, 403 - - - 3 - - - 225, 95 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPos - - - 0 - - - BindingNavigatorPOS - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPos - - - 1 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa - SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY - wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= - - - - 1270, 372 - - - Positionen - - - TabPos - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 1 - - - 975, 17 - - - GridControlDocSearch - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabWindream - - - 0 - - - ToolStripDokumente - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabWindream - - - 1 - - - 1270, 372 - - - Dateien - - - TabWindream - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 2 - - - ListViewFollowUps - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabFollowUp - - - 0 - - - grpbxFU_Profile - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabFollowUp - - - 1 - - - Label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabFollowUp - - - 2 - - - 1270, 372 - - - Wiedervorlage - - - TabFollowUp - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 3 - - - 657, 95 - - - Crimson - - - Tahoma, 8.25pt, style=Bold, Italic - - - Black - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPageVariant - - - 0 - - - tsVariants - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageVariant - - - 1 - - - 1270, 372 - - - Vorgängervarianten - - - TabPageVariant - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 4 - - - TCDetails - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel2 - - - 0 - - - Panel2 - - - 1276, 645 - - - 2 - - - SplitContainerControl1 - - - SplitContainerMain - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerFORM.Panel2 - - - 0 - 194, 22 @@ -614,33 +167,13 @@ Auswertung anzeigen - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIISURBVDhPY/jx4wdFGKsgFDMBsQMQpwFxAhBbAjGG - OgwBKHb5+v3HtkW3X5+vPPv0fv35Z3dW3X1zFijeBMTmSOqwGuB0/dWn/aFbbr03W37lPzJO3Hnn1dMP - X3YB1RjD1KNrZvr67fu2yKVX3llOOfs/etnVd4tPP70w58Tjy0ELL38CiaWtuf4CqK4OpgfdALvlp56c - s+w5+T9y3sV3IMOAYk5A7P3649cd3tPOfgXJnbn/9hBQTAGkB92AlPp1N+5Zthz9P+/gg0tAvhuSXFzr - ppu30eWQNYNwQvOaa3csaw78n7L99lUgPxxJLq1mxZX7ILnFB+9fAPJBLsMwQHf3uafHLUt3//eoP/D9 - 0cuPu4Fi+UBcfPHumwMOVXv/2JTv+Xv32fu9QDFhkB50A+JOXnt+2LZg2x/L3C3/HYu3/y6ZcfJRwdQT - T2Bik9ZduQZUB0obYD2omq88PeyUs/6XRerq/8FV2z6CaBi2zVj7Z9Kq8yDNWUDMBtMH13z8wsPDtvHz - fhmHz/yf1rjp+dev37fdf/xmz6b9105tP3zzxIvXH3YC1aUAMVwzCIMIpaNnbx82Der4pe3Z9D+hbCFQ - 8zdQ9OkDsSAQgxINiM0NxHCNMAwiQhv7VtxQssr4H5ndi6wZQzE2DCJAJmdNmbnw3JcvX0nSDMLIHDsg - BuVAZDEC+AcDADVk7WUUiqKZAAAAAElFTkSuQmCC - - - - 194, 22 - - - Dateisuchen - 313, 22 Entitätssuche - diesem Knoten untergeordnet + False @@ -719,26 +252,33 @@ Volltextsuche + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIISURBVDhPY/jx4wdFGKsgFDMBsQMQpwFxAhBbAjGG + OgwBKHb5+v3HtkW3X5+vPPv0fv35Z3dW3X1zFijeBMTmSOqwGuB0/dWn/aFbbr03W37lPzJO3Hnn1dMP + X3YB1RjD1KNrZvr67fu2yKVX3llOOfs/etnVd4tPP70w58Tjy0ELL38CiaWtuf4CqK4OpgfdALvlp56c + s+w5+T9y3sV3IMOAYk5A7P3649cd3tPOfgXJnbn/9hBQTAGkB92AlPp1N+5Zthz9P+/gg0tAvhuSXFzr + ppu30eWQNYNwQvOaa3csaw78n7L99lUgPxxJLq1mxZX7ILnFB+9fAPJBLsMwQHf3uafHLUt3//eoP/D9 + 0cuPu4Fi+UBcfPHumwMOVXv/2JTv+Xv32fu9QDFhkB50A+JOXnt+2LZg2x/L3C3/HYu3/y6ZcfJRwdQT + T2Bik9ZduQZUB0obYD2omq88PeyUs/6XRerq/8FV2z6CaBi2zVj7Z9Kq8yDNWUDMBtMH13z8wsPDtvHz + fhmHz/yf1rjp+dev37fdf/xmz6b9105tP3zzxIvXH3YC1aUAMVwzCIMIpaNnbx82Der4pe3Z9D+hbCFQ + 8zdQ9OkDsSAQgxINiM0NxHCNMAwiQhv7VtxQssr4H5ndi6wZQzE2DCJAJmdNmbnw3JcvX0nSDMLIHDsg + BuVAZDEC+AcDADVk7WUUiqKZAAAAAElFTkSuQmCC + + + + 194, 22 + + + Dateisuchen + 191, 6 191, 6 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - 194, 22 - - - Neuer Knoten - 212, 22 @@ -780,6 +320,20 @@ Unterhalb + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF + TkSuQmCC + + + + 194, 22 + + + Neuer Knoten + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -805,6 +359,48 @@ False + + 195, 160 + + + cmsTreeView + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Segoe UI, 9.75pt + + + 0, 0 + + + 283, 237 + + + 0 + + + TreeViewMain + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerTop.Panel1 + + + 0 + + + Panel1 + + + 295, 17 + Segoe UI, 9pt, style=Bold @@ -817,12 +413,6 @@ 248, 6 - - 251, 22 - - - Ansicht umschalten - 182, 22 @@ -841,6 +431,12 @@ Detail View + + 251, 22 + + + Ansicht umschalten + 251, 22 @@ -904,6 +500,51 @@ Detail-Ansicht Datensatz + + 252, 270 + + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Tahoma, 9pt + + + Aqua + + + Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu lassen + + + 0, 25 + + + 988, 212 + + + 2 + + + GridControlMain + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerTop.Panel2 + + + 0 + + + 395, 95 + Segoe UI Semibold, 9pt, style=Bold, Italic @@ -913,15 +554,6 @@ tslbldisplayRecords - - Magenta - - - 122, 22 - - - Record-Funktionen - False @@ -999,6 +631,15 @@ Anwendungscache freigeben + + Magenta + + + 122, 22 + + + Record-Funktionen + 6, 25 @@ -1023,6 +664,72 @@ Geodaten + + 0, 0 + + + 988, 25 + + + 1 + + + ToolStrip1 + + + ToolStripRecords + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerTop.Panel2 + + + 1 + + + Panel2 + + + 1276, 237 + + + 0 + + + SplitContainerControl1 + + + SplitContainerTop + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel1 + + + 0 + + + Panel1 + + + Fuchsia + + + 255, 192, 255 + + + Tahoma, 8.25pt, style=Bold, Italic + + + Fill + + + 0, 0 + ControlLight @@ -1095,6 +802,32 @@ 539, 95 + + 46, 19 + + + DocID: + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGwSURBVDhPlZO7S8NwFIULioMPBEEcHH3sdpD6QEUo + KPhHCK7t3EFQCwGrVbrUQukgCIKg+Bi6FAylpoUabW3AB9SqFBcFH7U6KRzvDUmatB10+Pgl5577JUNi + A6ASiUTMdBILhEJAO+eJDsLSNQTBYFBnLhQKIZlMolgsolQqqackSeCc5rOmbkVwvNho8/v93YFAAIVC + AalUCuFwGJTxGyCdTiOfz4Pn3OM+YxF4vV4hFotBFEXQ9Q4xquVOYj8ej4Pn3Ksr8Hg8d7lcDoIggK7H + 9ZI2c/p8PvCce3puEbhcrnI2mwWfekGHsga32w1FUXj+o+dmQYjAP+C+RYDv14M/o0msgq+bmT9TT/BT + vprC5/W0we1uL+T1FvU054y41MSCBrPg8eVsHOVLp4G83mxgzt8yE7z8XP0Gm/dRO8rKpAV1uSp7iA6w + YKtaMJjwteH1dBgfF2MG8lozCns9xv372Qik1XYWDFULGEHe6CSJA6XsSA1vsgOZcBcvr2r9GgGznFim + px724Slhx/v5EJ5O7Lg76oe00mpZZuoJmEFik8gTvMSf7jah/hsVGm2/4uVvpN0vK3IAAAAASUVORK5C + YII= + + + + 312, 19 + + + Ansicht eingeschränkt - Klick Bearbeiten für Entsperren + 0, 319 @@ -1167,59 +900,9 @@ 0 - - 46, 19 - - - DocID: - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGwSURBVDhPlZO7S8NwFIULioMPBEEcHH3sdpD6QEUo - KPhHCK7t3EFQCwGrVbrUQukgCIKg+Bi6FAylpoUabW3AB9SqFBcFH7U6KRzvDUmatB10+Pgl5577JUNi - A6ASiUTMdBILhEJAO+eJDsLSNQTBYFBnLhQKIZlMolgsolQqqackSeCc5rOmbkVwvNho8/v93YFAAIVC - AalUCuFwGJTxGyCdTiOfz4Pn3OM+YxF4vV4hFotBFEXQ9Q4xquVOYj8ej4Pn3Ksr8Hg8d7lcDoIggK7H - 9ZI2c/p8PvCce3puEbhcrnI2mwWfekGHsga32w1FUXj+o+dmQYjAP+C+RYDv14M/o0msgq+bmT9TT/BT - vprC5/W0we1uL+T1FvU054y41MSCBrPg8eVsHOVLp4G83mxgzt8yE7z8XP0Gm/dRO8rKpAV1uSp7iA6w - YKtaMJjwteH1dBgfF2MG8lozCns9xv372Qik1XYWDFULGEHe6CSJA6XsSA1vsgOZcBcvr2r9GgGznFim - px724Slhx/v5EJ5O7Lg76oe00mpZZuoJmEFik8gTvMSf7jah/hsVGm2/4uVvpN0vK3IAAAAASUVORK5C - YII= - - - - 312, 19 - - - Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 591, 17 - - 0, 0 - - - 1270, 25 - - - 0 - - - ToolStrip1 - - - ToolStripEdit - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabDetails - - - 1 - False @@ -1348,6 +1031,72 @@ False + + 0, 0 + + + 1270, 25 + + + 0 + + + ToolStrip1 + + + ToolStripEdit + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabDetails + + + 1 + + + 1270, 372 + + + Detailansicht + + + TabDetails + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 0 + + + 1276, 403 + + + 3 + + + Fill + + + 0, 0 + + + Cyan + + + 255, 128, 0 + + + 1270, 347 + + + 0 + GridControlPos @@ -1384,33 +1133,6 @@ 0 - - Fill - - - 0, 0 - - - Cyan - - - 1270, 347 - - - 0 - - - GridControlPos - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - 225, 95 @@ -1639,9 +1361,55 @@ 1 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa + SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY + wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= + + + + 1270, 372 + + + Positionen + + + TabPos + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 1 + 17, 134 + + 148, 22 + + + Datei öffnen + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAHlJREFUOE+VkUEKwDAIBH1b/v+XtpdcWxbcoBKrEaYi6iSksos559tFV3ygMcYo + KQX39aS0BTzNciTIaAuQCesjQcYS4NPFSp2ARZV/b2Cbkd2ME6CwzUj7BhTFzBnUliXgYAaHdxy9gf5l + H2jwhCrrig80uuiKCZEPDBGoa/9+56EAAAAASUVORK5CYII= + + + + 148, 22 + + + Eigenschaften + 149, 48 @@ -1681,56 +1449,12 @@ 0 - - 148, 22 - - - Datei öffnen - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAHlJREFUOE+VkUEKwDAIBH1b/v+XtpdcWxbcoBKrEaYi6iSksos559tFV3ygMcYo - KQX39aS0BTzNciTIaAuQCesjQcYS4NPFSp2ARZV/b2Cbkd2ME6CwzUj7BhTFzBnUliXgYAaHdxy9gf5l - H2jwhCrrig80uuiKCZEPDBGoa/9+56EAAAAASUVORK5CYII= - - - - 148, 22 - - - Eigenschaften - 975, 17 Tahoma, 9pt - - 0, 0 - - - 1270, 25 - - - 2 - - - ToolStrip2 - - - ToolStripDokumente - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabWindream - - - 1 - Segoe UI, 8.25pt, style=Bold, Italic @@ -1785,9 +1509,63 @@ Volltextsuche + + 0, 0 + + + 1270, 25 + + + 2 + + + ToolStrip2 + + + ToolStripDokumente + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabWindream + + + 1 + + + 1270, 372 + + + Dateien + + + TabWindream + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 2 + Top, Bottom, Left + + ID + + + 40 + + + Title + + + 200 + 14, 36 @@ -1809,204 +1587,12 @@ 0 - - ID - - - 40 - - - Title - - - 200 - Top, Bottom, Left - - GroupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 0 - - - lblFollowUp_save - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 1 - - - chkFollowUp - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 2 - - - dtpFollowUp - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 3 - - - lblWiedervorlage_Control - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 4 - - - 283, 28 - - - 774, 273 - - - 4 - - - grpbxFU_Profile - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabFollowUp - - - 1 - Top, Bottom, Left - - btnRemoveUser_FollowUp - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 0 - - - btnAddUser_FollowUp - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 1 - - - cmbFollowUpUser - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 2 - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 3 - - - ListBoxUser2Profile - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 4 - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 5 - - - Segoe UI, 8.25pt, style=Bold - - - 177, 20 - - - 594, 247 - - - 4 - - - Individuelle Empfänger für diesen Datensatz: - - - GroupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 0 - Segoe UI, 8.25pt @@ -2195,6 +1781,33 @@ 5 + + Segoe UI, 8.25pt, style=Bold + + + 177, 20 + + + 594, 247 + + + 4 + + + Individuelle Empfänger für diesen Datensatz: + + + GroupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 0 + True @@ -2303,6 +1916,27 @@ 4 + + 283, 28 + + + 774, 273 + + + 4 + + + grpbxFU_Profile + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabFollowUp + + + 1 + True @@ -2330,6 +1964,33 @@ 2 + + 1270, 372 + + + Wiedervorlage + + + TabFollowUp + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 3 + + + Crimson + + + Tahoma, 8.25pt, style=Bold, Italic + + + Black + 762, 95 @@ -2432,36 +2093,9 @@ 0 - - 1140, 17 - 657, 95 - - 0, 0 - - - 1270, 25 - - - 1 - - - ToolStrip1 - - - tsVariants - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageVariant - - - 1 - Segoe UI Semibold, 9pt, style=Bold, Italic @@ -2489,6 +2123,84 @@ Detail View + + 0, 0 + + + 1270, 25 + + + 1 + + + ToolStrip1 + + + tsVariants + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageVariant + + + 1 + + + 1270, 372 + + + Vorgängervarianten + + + TabPageVariant + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 4 + + + TCDetails + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel2 + + + 0 + + + Panel2 + + + 1276, 645 + + + 2 + + + SplitContainerControl1 + + + SplitContainerMain + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerFORM.Panel2 + + + 0 + Fill @@ -2525,15 +2237,6 @@ 17, 95 - - 252, 370 - - - ContextMenuStripResultFiles - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 251, 22 @@ -2579,11 +2282,11 @@ 248, 6 - - 251, 22 + + 152, 23 - - Umbenennen + + Filename 216, 22 @@ -2591,11 +2294,11 @@ Dateinamen umbenennen - + 152, 23 - - Filename + + Diplayname 216, 22 @@ -2603,11 +2306,11 @@ Displayname umbenennen - - 152, 23 + + 251, 22 - - Diplayname + + Umbenennen 251, 22 @@ -2621,12 +2324,6 @@ Datei mit Datensatz verknüpfen - - 251, 22 - - - windream - iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -2646,6 +2343,12 @@ Dokumentart ändern + + 251, 22 + + + windream + 248, 6 @@ -2741,6 +2444,15 @@ Ansicht zurücksetzen + + 252, 370 + + + ContextMenuStripResultFiles + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -2798,30 +2510,6 @@ 17, 17 - - 0, 685 - - - 1276, 24 - - - 1 - - - StatusStrip1 - - - StatusStrip_Main - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - 57, 19 @@ -2858,6 +2546,30 @@ Loading Record Data.. + + 0, 685 + + + 1276, 24 + + + 1 + + + StatusStrip1 + + + StatusStrip_Main + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + 160, 17 @@ -2890,6 +2602,12 @@ 1313, 95 + + 172, 22 + + + Change Hidepanel + 173, 26 @@ -2899,12 +2617,6 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 172, 22 - - - Change Hidepanel - 17, 56 diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 113deab..7fccbdf 100644 --- 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 \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 9a1fbf2..e303fa0 100644 --- 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()