From 2d1d789bdc87d13570c634d8f2ab7559d443bfba Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 9 Nov 2016 11:06:41 +0100 Subject: [PATCH] MS0911 --- app/DD-Record-Organiser/ClassDOC_SEARCH.vb | 8 +- .../frmConstructorDesigner.Designer.vb | 3 +- .../frmConstructorDesigner.resx | 744 +++++---- .../frmConstructor_Main.resx | 2 +- .../frmConstructor_Main.vb | 29 +- .../frmUserKonfig.Designer.vb | 3 +- app/DD-Record-Organiser/frmUserKonfig.resx | 1343 ++++++++++++----- 7 files changed, 1457 insertions(+), 675 deletions(-) diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index 719e873..ddc205a 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -160,6 +160,12 @@ Public Class ClassDOC_SEARCH Return Nothing End Try End Function + Public Shared Function Get_DOCRESULTS(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, vType As String, Optional ftString As String = "", Optional BG As Boolean = False) + ENTITY_ID = ENT_ID + DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS + DT_RESULTLIST_SEL_VALUES = vDT_RESULTLIST_SELVALUES + Return GET_DOCSEARCH_DATATABLE(vType, ftString, BG) + End Function Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, vType As String, Optional ftString As String = "", Optional BG As Boolean = False, Optional Preload As Boolean = False) Dim COL_ARRAY_RESULTLIST As List(Of String) ENTITY_ID = ENT_ID @@ -207,7 +213,7 @@ Public Class ClassDOC_SEARCH colOtype.Caption = "Objecttype" DTGrid.Columns.Add(colOtype) Dim colDocID As New System.Data.DataColumn() - colDocID.DataType = GetType(String) + colDocID.DataType = GetType(Int32) colDocID.ColumnName = "DocID" colDocID.Caption = "DocID" DTGrid.Columns.Add(colDocID) diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index abe3726..ee5491e 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -443,7 +443,7 @@ Partial Class frmConstructorDesigner Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.BindingSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.CountItem = Me.BindingNavigatorCountItem Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.CountItemFormat = "from {0} Constructor-Sichten" - Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem + Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.DeleteItem = Nothing Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem}) resources.ApplyResources(Me.TBPMO_FORM_CONSTRUCTORBindingNavigator, "TBPMO_FORM_CONSTRUCTORBindingNavigator") Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem @@ -1481,6 +1481,7 @@ Partial Class frmConstructorDesigner Me.TableAdapterManager2.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_RECORDTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_RIGHT_GROUPTableAdapter = Nothing + Me.TableAdapterManager2.TBPMO_RIGHT_USERTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index 60f74b1..8152c75 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -906,27 +906,6 @@ Die Gesamtanzahl der Elemente. - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - True - - - 23, 22 - - - Löschen - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1027,6 +1006,27 @@ 6, 25 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Löschen + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1093,7 +1093,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAVwBDAFcAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAWQBDAFkAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1142,7 +1142,7 @@ 1 - 292, 349 + 292, 352 1 @@ -1402,6 +1402,84 @@ 15, 305 + + 914, 95 + + + 807, 95 + + + XtraTabControl2 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 0 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 2 + + + 1388, 352 + + + Entitäten-Übersicht + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 1390, 377 + + + 40 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 14 + Fill @@ -1411,21 +1489,6 @@ True - - Consolas, 8.25pt - - - 72, 207 - - - True - - - 757, 69 - - - 57 - SQL_RIGHT_WINDREAM_VIEWTextBox @@ -1438,21 +1501,6 @@ 1 - - Consolas, 8.25pt - - - 72, 108 - - - True - - - 757, 77 - - - 56 - SQL_RIGHT_READ_AND_VIEW_ONLYTextBox @@ -1465,15 +1513,6 @@ 3 - - 475, 68 - - - 57, 21 - - - 55 - CONTROL_DOCTYPE_MATCHTextBox @@ -1486,18 +1525,6 @@ 4 - - 701, 25 - - - 128, 24 - - - 52 - - - Ersten Record laden - LOAD_DIRECTCheckBox @@ -1510,24 +1537,6 @@ 6 - - True - - - Segoe UI, 8.25pt, style=Italic - - - 189, 52 - - - 236, 13 - - - 51 - - - Dient zur Anzeige der Selektion von Datensätzen - Label4 @@ -1540,15 +1549,6 @@ 7 - - 72, 68 - - - 247, 21 - - - 49 - COLUMN_NAME1ComboBox @@ -1561,24 +1561,6 @@ 9 - - True - - - Segoe UI, 8.25pt, style=Italic - - - 189, 30 - - - 319, 13 - - - 48 - - - Kann man für diese Entität auf der ersten Ebene Daten selektieren? - Label2 @@ -1591,18 +1573,6 @@ 10 - - Tahoma, 8.25pt, style=Italic - - - 574, 309 - - - 160, 21 - - - 47 - CHANGED_WHENTextBox1 @@ -1615,18 +1585,6 @@ 12 - - Tahoma, 8.25pt, style=Italic - - - 408, 309 - - - 160, 21 - - - 46 - CHANGED_WHOTextBox1 @@ -1639,18 +1597,6 @@ 14 - - Tahoma, 8.25pt, style=Italic - - - 242, 309 - - - 160, 21 - - - 45 - ADDED_WHENTextBox1 @@ -1663,18 +1609,6 @@ 16 - - Tahoma, 8.25pt, style=Italic - - - 76, 309 - - - 160, 21 - - - 44 - ADDED_WHOTextBox1 @@ -1688,7 +1622,7 @@ 19 - 1086, 274 + 1094, 280 Allgemein @@ -1706,7 +1640,7 @@ 1 - 1092, 302 + 1096, 305 35 @@ -1883,7 +1817,7 @@ 13 - 1086, 274 + 1090, 277 Quick View Konfiguration @@ -1940,7 +1874,7 @@ 2 - 1086, 274 + 1090, 277 Konfiguration ECM-Zugriff @@ -1970,7 +1904,7 @@ 0 - 1086, 274 + 1090, 277 Einschränkungen Datensätze User @@ -2020,164 +1954,350 @@ XtraTabPage6 - - 2 + + 2 + + + btnsaddUser2Client + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage6 + + + 3 + + + Label18 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage6 + + + 4 + + + chklbxClient + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage6 + + + 5 + + + 1090, 277 + + + Zuordnung Entität-Client + + + XtraTabPage6 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl2 + + + 4 + + + XtraTabControl2 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 0 + + + Consolas, 8.25pt + + + 72, 207 + + + True + + + 757, 69 + + + 57 + + + SQL_RIGHT_WINDREAM_VIEWTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 1 + + + Consolas, 8.25pt + + + 72, 108 + + + True + + + 757, 77 + + + 56 + + + SQL_RIGHT_READ_AND_VIEW_ONLYTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 3 + + + 475, 68 + + + 57, 21 + + + 55 + + + CONTROL_DOCTYPE_MATCHTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 4 + + + 701, 25 + + + 128, 24 + + + 52 + + + Ersten Record laden + + + LOAD_DIRECTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 6 + + + True + + + Segoe UI, 8.25pt, style=Italic + + + 189, 52 + + + 236, 13 + + + 51 + + + Dient zur Anzeige der Selektion von Datensätzen + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 - - btnsaddUser2Client + + 7 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 72, 68 - - XtraTabPage6 + + 247, 21 - - 3 + + 49 - - Label18 + + COLUMN_NAME1ComboBox - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - XtraTabPage6 + + XtraTabPage3 - - 4 + + 9 - - chklbxClient + + True - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI, 8.25pt, style=Italic - - XtraTabPage6 + + 189, 30 - - 5 + + 319, 13 - - 1086, 274 + + 48 - - Zuordnung Entität-Client + + Kann man für diese Entität auf der ersten Ebene Daten selektieren? - - XtraTabPage6 + + Label2 - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - XtraTabControl2 + + XtraTabPage3 - - 4 + + 10 - - XtraTabControl2 + + Tahoma, 8.25pt, style=Italic - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 574, 309 - - XtraTabPage1 + + 160, 21 - - 0 + + 47 - - 914, 95 - - - 292, 327 + + CHANGED_WHENTextBox1 - - 1092, 22 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 35 + + XtraTabPage3 - - StatusStrip1 + + 12 - - StatusStrip1 + + Tahoma, 8.25pt, style=Italic - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 408, 309 - - XtraTabPage1 + + 160, 21 - - 1 + + 46 - - 807, 95 - - - 292, 0 + + CHANGED_WHOTextBox1 - - 1092, 25 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 34 + + XtraTabPage3 - - ToolStrip1 + + 14 - - ToolStrip1 + + Tahoma, 8.25pt, style=Italic - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 242, 309 - - XtraTabPage1 + + 160, 21 - - 2 + + 45 - - 1384, 349 + + ADDED_WHENTextBox1 - - Entitäten-Übersicht + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - XtraTabPage1 + + XtraTabPage3 - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 16 - - XtraTabControl1 + + Tahoma, 8.25pt, style=Italic - - 0 + + 76, 309 - - 1390, 377 + + 160, 21 - - 40 + + 44 - - XtraTabControl1 + + ADDED_WHOTextBox1 - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + XtraTabPage3 - - 14 + + 19 @@ -2736,7 +2856,7 @@ 8 - 950, 257 + 954, 260 Supervisor @@ -2844,7 +2964,7 @@ 6 - 950, 257 + 954, 260 Supervisor-Controls: @@ -2961,7 +3081,7 @@ 190 - 393, 221 + 393, 224 99 @@ -3159,7 +3279,7 @@ 167 - 377, 221 + 377, 224 98 @@ -3596,7 +3716,7 @@ 0, 0 - 1086, 274 + 1090, 277 0 @@ -4511,6 +4631,33 @@ Mandanten hinzu 5 + + 914, 95 + + + 292, 330 + + + 1096, 22 + + + 35 + + + StatusStrip1 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 1 + 191, 17 @@ -4520,6 +4667,33 @@ Mandanten hinzu False + + 807, 95 + + + 292, 0 + + + 1096, 25 + + + 34 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 2 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 7763993..04512c1 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -565,7 +565,7 @@ Eigenschaften - 252, 342 + 252, 320 ContextMenuStripResultFiles diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 858708a..3340a8f 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -1946,6 +1946,10 @@ Public Class frmConstructor_Main Dim result As MsgBoxResult result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then + Dim DT_DOC_RESULT As DataTable = ClassDOC_SEARCH.Get_DOCRESULTS(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, "RECORD") + If IsNothing(DT_DOC_RESULT) Then + clsLogger.Add(">> DT_DOC_RESULT is nothing!", True) + End If If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then RECORD_CHANGED = False EDIT_STATE = EditState.None @@ -1958,7 +1962,7 @@ Public Class frmConstructor_Main End If Update_Status_Label(True, msg, EditState.Update) - WD_DELETE_DOCS() + WD_DELETE_DOCS(DT_DOC_RESULT) @@ -3562,16 +3566,15 @@ Public Class frmConstructor_Main End Sub - Private Sub WD_DELETE_DOCS() + Private Sub WD_DELETE_DOCS(DT_RESULT As Datatable) Dim sw As New Stopwatch sw.Start() Dim elapsed As Double ' Dim Basesearch As String Try - Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "RECORD") - If IsNothing(DT_RESULT) Then - Exit Sub - Else + If Not IsNothing(DT_RESULT) Then + + If DT_RESULT.Rows.Count > 0 Then 'Es gibt Suchergebnisse Dim msg As String msg = "Wollen Sie die zugehörigen Dateien (" & DT_RESULT.Rows.Count.ToString & ") ebenfalls löschen?" @@ -3583,7 +3586,12 @@ Public Class frmConstructor_Main If result1 = MsgBoxResult.Yes Then For Each row As DataRow In DT_RESULT.Rows Dim DOC_ID = row.Item("DocID") - Dim path = row.Item("FULLPATH") + Dim path + Try + path = row.Item("FULL_FILENAME") + Catch ex As Exception + path = row.Item(1) + End Try If Not IsNothing(path) Then Dim Count As Integer = ClassDatabase.Execute_Scalar("SELECT COUNT(GUID) FROM TBPMO_DOC_RECORD_LINK WHERE DOC_ID = " & DOC_ID) If Count > 1 Then @@ -3593,7 +3601,7 @@ Public Class frmConstructor_Main End If MsgBox(msg, MsgBoxStyle.Information) If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 0) = False Then - ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE LINK DELETED BY USER") + ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE LINK DELETED BY USER") End If Else If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 1) = False Then @@ -3604,7 +3612,7 @@ Public Class frmConstructor_Main MsgBox(msg, MsgBoxStyle.Critical, "Attention:") Else If ClassWindream.Delete_WDFile(path) Then - ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE DELETED BY USER") + ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER") End If End If End If @@ -3612,8 +3620,9 @@ Public Class frmConstructor_Main End If Next End If - End If + Else + clsLogger.Add(">> No files 2 delete - after deleting record!", False) End If Cursor = Cursors.Default Catch ex As Exception diff --git a/app/DD-Record-Organiser/frmUserKonfig.Designer.vb b/app/DD-Record-Organiser/frmUserKonfig.Designer.vb index 32f4d67..053b04c 100644 --- a/app/DD-Record-Organiser/frmUserKonfig.Designer.vb +++ b/app/DD-Record-Organiser/frmUserKonfig.Designer.vb @@ -479,6 +479,7 @@ Partial Class frmUserKonfig Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RIGHT_GROUPTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_RIGHT_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing @@ -499,7 +500,7 @@ Partial Class frmUserKonfig Me.TBDD_USERBindingNavigator.BindingSource = Me.TBDD_USERBindingSource Me.TBDD_USERBindingNavigator.CountItem = Me.BindingNavigatorCountItem Me.TBDD_USERBindingNavigator.CountItemFormat = "von {0} Usern" - Me.TBDD_USERBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem + Me.TBDD_USERBindingNavigator.DeleteItem = Nothing Me.TBDD_USERBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBDD_USERBindingNavigatorSaveItem, Me.tbRefreshUsers, Me.tsAddUser}) resources.ApplyResources(Me.TBDD_USERBindingNavigator, "TBDD_USERBindingNavigator") Me.TBDD_USERBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem diff --git a/app/DD-Record-Organiser/frmUserKonfig.resx b/app/DD-Record-Organiser/frmUserKonfig.resx index f5b6a9e..d2ffd96 100644 --- a/app/DD-Record-Organiser/frmUserKonfig.resx +++ b/app/DD-Record-Organiser/frmUserKonfig.resx @@ -1137,27 +1137,6 @@ Die Gesamtanzahl der Elemente. - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - True - - - 23, 22 - - - Löschen - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1258,6 +1237,27 @@ 6, 25 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Löschen + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1625,192 +1625,648 @@ True - - True - - - 6, 13 - - - 109, 13 - - - 2 - - - Verfügbare Gruppen: - - - Label1 + + TabControl1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage1 + + XtraTabPage1 - + 0 - - MiddleLeft - - - 382, 37 + + 1109, 322 - - 321, 23 + + User-/Gruppenzuordnung - - 5 + + XtraTabPage1 - - Benutzer aus Gruppe entfernen + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - btnRemoveUserFromGroup + + XtraTabControl1 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - TabPage1 + + 1111, 347 - - 1 + + 30 - - 929, 17 + + 793, 56 - - 140, 10 + + GridControl2 - - 236, 21 + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + + TabGruppendefinition + + 0 - - cmbGroup + + COMMENTTextBox - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage1 + + TabGruppendefinition - + 2 - - True + + GUIDTextBox1 - - 6, 40 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 118, 13 + + TabGruppendefinition - + 4 - - Zugewiesene Gruppen: - - - Label2 + + NAMETextBox1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage1 + + TabGruppendefinition - - 3 + + 6 - - MiddleLeft + + ADDED_WHOTextBox1 - - 382, 8 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 321, 23 + + TabGruppendefinition - - 1 + + 8 - - Ausgewählten Benutzer zu Gruppe hinzufügen + + ADDED_WHENTextBox1 - - btnAddUserToGroup + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TabGruppendefinition - - TabPage1 + + 10 - - 4 + + CHANGED_WHOTextBox1 - - Top, Bottom, Left + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 140, 40 + + TabGruppendefinition - - 236, 225 + + 12 - - 3 + + CHANGED_WHENTextBox1 - - lbGroups + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TabGruppendefinition - - TabPage1 + + 14 - - 5 + + BindingNavigator1 - - 4, 22 + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 3, 3, 3 + + TabGruppendefinition - - 1097, 293 + + 15 - - 0 + + 1109, 322 - - User zu Gruppe + + Gruppendefinition + + + TabGruppendefinition + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + True + + + TabControl3 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage2 + + + 0 + + + 1109, 322 + + + Mandantendefinition + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 2 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 13 + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 0 + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + Fill + + + 0, 0 + + + 1109, 322 + + + 6 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 0 + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + btnRemoveUserFromGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + cmbGroup + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + btnAddUserToGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + lbGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + 4, 22 + + + 3, 3, 3, 3 + + + 1101, 296 + + + 0 + + + User zu Gruppe TabPage1 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 0 + + + True + + + 6, 13 + + + 109, 13 + + + 2 + + + Verfügbare Gruppen: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + MiddleLeft + + + 382, 37 + + + 321, 23 + + + 5 + + + Benutzer aus Gruppe entfernen + + + btnRemoveUserFromGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + 929, 17 + + + 140, 10 + + + 236, 21 + + + 0 + + + cmbGroup + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + 929, 17 + + + True + + + 6, 40 + + + 118, 13 + + + 4 + + + Zugewiesene Gruppen: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + MiddleLeft + + + 382, 8 + + + 321, 23 + + + 1 + + + Ausgewählten Benutzer zu Gruppe hinzufügen + + + btnAddUserToGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 - - TabControl1 + + Top, Bottom, Left - - 0 + + 140, 40 + + + 236, 225 + + + 3 + + + lbGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 True + + GridControlWH_Users1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage2 + + + 0 + + + GridControlUsers2Group + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage2 + + + 1 + + + btndeleteUserfromGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 2 + + + lblUserforGroup + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 3 + + + btnaddSelectedUser2Group + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 4 + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 5 + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 6 + + + cmbGroups_Group2User + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 1097, 293 + + + 1 + + + Gruppe zu Usern + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + Top, Bottom, Left @@ -1877,6 +2333,9 @@ 0 + + 822, 95 + Top, Bottom, Left @@ -2062,136 +2521,61 @@ matchen System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage2 - - - 5 - - - True - - - NoControl - - - 7, 3 - - - 109, 13 - - - 4 - - - Verfügbare Gruppen: - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 6 - - - 10, 19 - - - 213, 21 - - - 3 - - - cmbGroups_Group2User - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 7 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1097, 293 - - - 1 - - - Gruppe zu Usern - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TabPage2 - - TabControl1 + + 5 - - 1 + + True - - Fill + + NoControl - - 0, 0 + + 7, 3 - - 1105, 319 + + 109, 13 - - 6 + + 4 - - TabControl1 + + Verfügbare Gruppen: - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label3 - - XtraTabPage1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + TabPage2 - - 1105, 319 + + 6 - - User-/Gruppenzuordnung + + 10, 19 - - XtraTabPage1 + + 213, 21 - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 3 - - XtraTabControl1 + + cmbGroups_Group2User - - 0 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1111, 347 + + TabPage2 - - 30 + + 7 Top, Bottom, Left @@ -2565,7 +2949,7 @@ matchen 0, 0 - 1105, 25 + 1109, 25 1 @@ -2573,38 +2957,227 @@ matchen BindingNavigator1 - - BindingNavigator1 + + BindingNavigator1 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabGruppendefinition + + + 15 + + + TabPage5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl3 + + + 0 + + + TabPage6 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl3 + + + 1 + + + Fill + + + 0, 0 + + + 1109, 322 + + + 38 + + + TabControl3 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage2 + + + 0 + + + 668, 95 + + + BindingNavigator2 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 0 + + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 1 + + + GUIDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 2 + + + CLIENT_NAMETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 4 + + + ListBox2 + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 5 + + + SHORTNAMETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 8 + + + CHANGED_WHENTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 9 + + + COMMENTTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 12 + + + CHANGED_WHOTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 13 + + + ADDED_WHOTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 16 + + + ADDED_WHENTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TabPage5 - - TabGruppendefinition + + 18 - - 15 + + 4, 22 - - 1105, 319 + + 3, 3, 3, 3 - - Gruppendefinition + + 1093, 280 - - TabGruppendefinition + + 0 - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Mandantendefinition - - XtraTabControl1 + + TabPage5 - - 1 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + TabControl3 + + + 0 668, 95 @@ -2866,6 +3439,9 @@ matchen 2 + + 264, 95 + 74, 53 @@ -3049,35 +3625,131 @@ matchen 18 - + + True + + + GridControlUsersinClient + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage6 + + + 0 + + + GridControlUser2Mandanten + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage6 + + + 1 + + + btndeleteUserfromClient + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 2 + + + lblUser2Client + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 3 + + + btnsaddUser2Client + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 4 + + + Label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 5 + + + Label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 6 + + + cmbClientsforUser + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage6 + + + 7 + + 4, 22 - + 3, 3, 3, 3 - + 1093, 280 - - 0 + + 1 - - Mandantendefinition + + User zu Mandant hinzufügen - - TabPage5 + + TabPage6 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabControl3 - - 0 - - - True + + 1 Top, Bottom, Left @@ -3380,87 +4052,6 @@ Mandant hinzufügen 7 - - 4, 22 - - - 3, 3, 3, 3 - - - 1093, 280 - - - 1 - - - User zu Mandant hinzufügen - - - TabPage6 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl3 - - - 1 - - - Fill - - - 0, 0 - - - 1105, 319 - - - 38 - - - TabControl3 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 0 - - - 1105, 319 - - - Mandantendefinition - - - XtraTabPage2 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 2 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 13 - 259, 56