diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index e534380..f3421cd 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -598,6 +598,9 @@ frmConnections.vb + + frmConstructorDesigner.vb + frmConstructorDesigner.vb diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb index 05d0a6f..d2ac864 100644 --- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index c138257..e56bad7 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -129,6 +129,7 @@ Partial Class frmConstructorDesigner Me.SEARCH_PATTERN1ComboBox = New System.Windows.Forms.ComboBox() Me.SEARCH_PATTERN3ComboBox = New System.Windows.Forms.ComboBox() Me.SEARCH_PATTERN2ComboBox = New System.Windows.Forms.ComboBox() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() @@ -145,6 +146,15 @@ Partial Class frmConstructorDesigner Me.TBTEMP_QUICKDISPLAYTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBTEMP_QUICKDISPLAYTableAdapter() Me.TableAdapterManager2 = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) + Me.btndeleteUserConstructorRel = New System.Windows.Forms.Button() + Me.btnAddUser2ConstructorREL = New System.Windows.Forms.Button() + Me.ListBoxUsersFORConstructor = New System.Windows.Forms.ListBox() + Me.lblConfiguredUsers = New System.Windows.Forms.Label() + Me.lblUsers = New System.Windows.Forms.Label() + Me.ListBoxUserConstructor = New System.Windows.Forms.ListBox() + Me.Label16 = New System.Windows.Forms.Label() + Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() GUIDLabel = New System.Windows.Forms.Label() FORM_TITLELabel = New System.Windows.Forms.Label() SEQUENCE_MENULabel = New System.Windows.Forms.Label() @@ -188,6 +198,7 @@ Partial Class frmConstructorDesigner CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.cmstrpEntity.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel @@ -326,6 +337,7 @@ Partial Class frmConstructorDesigner Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.BindingSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.CountItem = Me.BindingNavigatorCountItem + Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.CountItemFormat = "from {0}" Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem 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") @@ -411,6 +423,7 @@ Partial Class frmConstructorDesigner 'TreeViewDetails ' Me.TreeViewDetails.AllowDrop = True + Me.TreeViewDetails.ContextMenuStrip = Me.cmstrpEntity resources.ApplyResources(Me.TreeViewDetails, "TreeViewDetails") Me.TreeViewDetails.ImageList = Me.ImageList1 Me.TreeViewDetails.Name = "TreeViewDetails" @@ -523,7 +536,7 @@ Partial Class frmConstructorDesigner resources.ApplyResources(Me.XtraTabControl2, "XtraTabControl2") Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 - Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage5, Me.XtraTabPage3, Me.XtraTabPage4}) + Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage5, Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage2}) ' 'XtraTabPage3 ' @@ -639,7 +652,6 @@ Partial Class frmConstructorDesigner ' 'Button2 ' - Me.Button2.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete resources.ApplyResources(Me.Button2, "Button2") Me.Button2.Name = "Button2" Me.Button2.UseVisualStyleBackColor = True @@ -652,7 +664,6 @@ Partial Class frmConstructorDesigner ' 'btnSetQuickViewPicture ' - Me.btnSetQuickViewPicture.Image = Global.DD_Record_Organiser.My.Resources.Resources.arrow_Forward_16xLG resources.ApplyResources(Me.btnSetQuickViewPicture, "btnSetQuickViewPicture") Me.btnSetQuickViewPicture.Name = "btnSetQuickViewPicture" Me.btnSetQuickViewPicture.UseVisualStyleBackColor = True @@ -682,14 +693,12 @@ Partial Class frmConstructorDesigner ' 'btndeleteControl ' - Me.btndeleteControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete resources.ApplyResources(Me.btndeleteControl, "btndeleteControl") Me.btndeleteControl.Name = "btndeleteControl" Me.btndeleteControl.UseVisualStyleBackColor = True ' 'btnAddControl ' - Me.btnAddControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.arrow_Forward_16xLG resources.ApplyResources(Me.btnAddControl, "btnAddControl") Me.btnAddControl.Name = "btnAddControl" Me.btnAddControl.UseVisualStyleBackColor = True @@ -893,6 +902,11 @@ Partial Class frmConstructorDesigner resources.ApplyResources(Me.SEARCH_PATTERN2ComboBox, "SEARCH_PATTERN2ComboBox") Me.SEARCH_PATTERN2ComboBox.Name = "SEARCH_PATTERN2ComboBox" ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Name = "XtraTabPage2" + resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2") + ' 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblSaveDetail}) @@ -913,7 +927,6 @@ Partial Class frmConstructorDesigner ' 'tsbtnSave ' - Me.tsbtnSave.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG resources.ApplyResources(Me.tsbtnSave, "tsbtnSave") Me.tsbtnSave.Name = "tsbtnSave" ' @@ -989,6 +1002,7 @@ Partial Class frmConstructorDesigner Me.TableAdapterManager2.TBPMO_FORM_VIEWTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_FORMTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_KONFIGURATIONTableAdapter = Nothing + Me.TableAdapterManager2.TBPMO_LANGUAGE_OBJECTTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_RECORDTableAdapter = Nothing Me.TableAdapterManager2.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing @@ -1010,10 +1024,67 @@ Partial Class frmConstructorDesigner Me.ImageCollection1.Images.SetKeyName(2, "tesla_black.jpg") Me.ImageCollection1.Images.SetKeyName(3, "whitejeep.jpg") ' + 'btndeleteUserConstructorRel + ' + resources.ApplyResources(Me.btndeleteUserConstructorRel, "btndeleteUserConstructorRel") + Me.btndeleteUserConstructorRel.Name = "btndeleteUserConstructorRel" + Me.btndeleteUserConstructorRel.UseVisualStyleBackColor = True + ' + 'btnAddUser2ConstructorREL + ' + resources.ApplyResources(Me.btnAddUser2ConstructorREL, "btnAddUser2ConstructorREL") + Me.btnAddUser2ConstructorREL.Name = "btnAddUser2ConstructorREL" + Me.btnAddUser2ConstructorREL.UseVisualStyleBackColor = True + ' + 'ListBoxUsersFORConstructor + ' + resources.ApplyResources(Me.ListBoxUsersFORConstructor, "ListBoxUsersFORConstructor") + Me.ListBoxUsersFORConstructor.FormattingEnabled = True + Me.ListBoxUsersFORConstructor.Name = "ListBoxUsersFORConstructor" + ' + 'lblConfiguredUsers + ' + resources.ApplyResources(Me.lblConfiguredUsers, "lblConfiguredUsers") + Me.lblConfiguredUsers.Name = "lblConfiguredUsers" + ' + 'lblUsers + ' + resources.ApplyResources(Me.lblUsers, "lblUsers") + Me.lblUsers.Name = "lblUsers" + ' + 'ListBoxUserConstructor + ' + resources.ApplyResources(Me.ListBoxUserConstructor, "ListBoxUserConstructor") + Me.ListBoxUserConstructor.FormattingEnabled = True + Me.ListBoxUserConstructor.Name = "ListBoxUserConstructor" + ' + 'Label16 + ' + resources.ApplyResources(Me.Label16, "Label16") + Me.Label16.Name = "Label16" + ' + 'cmstrpEntity + ' + Me.cmstrpEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FormDesignerToolStripMenuItem}) + Me.cmstrpEntity.Name = "cmstrpEntity" + resources.ApplyResources(Me.cmstrpEntity, "cmstrpEntity") + ' + 'FormDesignerToolStripMenuItem + ' + Me.FormDesignerToolStripMenuItem.Name = "FormDesignerToolStripMenuItem" + resources.ApplyResources(Me.FormDesignerToolStripMenuItem, "FormDesignerToolStripMenuItem") + ' 'frmConstructorDesigner ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btndeleteUserConstructorRel) + Me.Controls.Add(Me.btnAddUser2ConstructorREL) + Me.Controls.Add(Me.ListBoxUsersFORConstructor) + Me.Controls.Add(Me.lblConfiguredUsers) + Me.Controls.Add(Me.lblUsers) + Me.Controls.Add(Me.ListBoxUserConstructor) + Me.Controls.Add(Me.Label16) Me.Controls.Add(Me.lblSave) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ListBox1) @@ -1067,6 +1138,7 @@ Partial Class frmConstructorDesigner CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + Me.cmstrpEntity.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -1171,4 +1243,14 @@ Partial Class frmConstructorDesigner Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents ImageCollection1 As DevExpress.Utils.ImageCollection Friend WithEvents LOAD_DIRECTCheckBox As System.Windows.Forms.CheckBox + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents btndeleteUserConstructorRel As System.Windows.Forms.Button + Friend WithEvents btnAddUser2ConstructorREL As System.Windows.Forms.Button + Friend WithEvents ListBoxUsersFORConstructor As System.Windows.Forms.ListBox + Friend WithEvents lblConfiguredUsers As System.Windows.Forms.Label + Friend WithEvents lblUsers As System.Windows.Forms.Label + Friend WithEvents ListBoxUserConstructor As System.Windows.Forms.ListBox + Friend WithEvents Label16 As System.Windows.Forms.Label + Friend WithEvents cmstrpEntity As System.Windows.Forms.ContextMenuStrip + Friend WithEvents FormDesignerToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index bb02ae6..053d7f6 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -147,7 +147,7 @@ $this - 18 + 26 False @@ -177,7 +177,7 @@ $this - 16 + 24 False @@ -207,7 +207,7 @@ $this - 14 + 22 False @@ -237,7 +237,7 @@ $this - 12 + 20 False @@ -267,7 +267,7 @@ $this - 10 + 18 False @@ -297,7 +297,7 @@ $this - 8 + 16 False @@ -327,7 +327,7 @@ $this - 6 + 14 False @@ -357,7 +357,7 @@ $this - 4 + 12 False @@ -762,7 +762,7 @@ 757, 17 - 17, 56 + 362, 56 930, 17 @@ -789,10 +789,10 @@ Neu hinzufügen - 44, 22 + 50, 22 - von {0} + from {0} Die Gesamtanzahl der Elemente. @@ -953,11 +953,29 @@ $this - 20 + 28 - 1248, 17 + 17, 56 + + 862, 103 + + + 153, 22 + + + Form-Designer + + + 154, 26 + + + cmstrpEntity + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Left @@ -966,14 +984,14 @@ 0 - 356, 56 + 701, 56 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAegBCQHoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAWwBCgFsAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1022,7 +1040,7 @@ 1 - 292, 414 + 292, 417 1 @@ -1058,7 +1076,7 @@ $this - 19 + 27 250, 85 @@ -1079,7 +1097,7 @@ $this - 17 + 25 250, 129 @@ -1100,7 +1118,7 @@ $this - 15 + 23 416, 128 @@ -1121,7 +1139,7 @@ $this - 13 + 21 251, 170 @@ -1142,7 +1160,7 @@ $this - 11 + 19 417, 170 @@ -1163,7 +1181,7 @@ $this - 9 + 17 251, 211 @@ -1184,7 +1202,7 @@ $this - 7 + 15 416, 211 @@ -1205,7 +1223,7 @@ $this - 5 + 13 15, 27 @@ -1526,7 +1544,7 @@ 17 - 1002, 339 + 1010, 345 Allgemein @@ -1544,7 +1562,7 @@ 1 - 1008, 367 + 1012, 370 35 @@ -1552,6 +1570,23 @@ True + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJpSURBVDhPpZP7S1NhGMf9W/SHKEGiGyFhFBTmvMyd + tTa3eTvL9LjFIpam7AzTDGoYuvCHcJbaVSt/yTSxUV4ycnYdWh4rL+3URq3pObumfNsmbS5HEL3weeE8 + PJ/vy3nOeZMA/BcbCgsaTco8Van/QJUzsyqSm1GVcO9JJTNFyvW2UmnKn/1xD4tqDfGJotjvpib4RywI + vLUiMDEK/n43FrRleF1IsC+UQmK9EyfPVVD88t1urM6+Q3DwHoJdzQiaL+Dn7TasjA/CUauFVZ7NP5dm + RkMi27xanRyS7dzNLqwyNgQvn4O72YClphr4LxkQaKHhN56C/8EtLB4nMX7kgH1Msi85GhCSaWe9Hiu2 + yciJPhMN13kdvA3qOLjTJPy91/AqLwPD4gw6GvCROsZ4eq8j2GOG21iFb0XihCxXkeCb6uAwVOMxkc5E + A5gKlTfwsBdBkwHus9pQKfFyyHLgogqxZG6FJW+XN1RaC5ghi7y+ng74G7XwnimPNCda4QBnmQJLba0Y + Em6LBUyXKhiXsQ6+ZhrcSWWkMSHyPLjra7FQq8OgIC32CrZiKc1IBPD2dMKtksBVJtogs9JssAUieLqu + YFS4AwNZW2JDfFMkTn5ZQtgXK0vgudMRGZhTIVwTZblgJSFZIgTf2Y6pYnFYtvcJNsc+Y5jJghxiQnaI + nzuqgOdGB3400nCQcnxRyuBq0IO/2o5pZT76s1L5kBz/I/3mmfQg8fTwftYq2oOvNTq4Wi5G+Fx9Ak9y + todldr0cJi4gzIh4b8qwMF1vIXYzj/J3ckOCrdxAbhrTn52q78vc9PfL9O8g6Rcd0s65aUjWSwAAAABJ + RU5ErkJggg== + + MiddleRight @@ -1615,6 +1650,15 @@ 1 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m + m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 + M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= + + MiddleRight @@ -1756,6 +1800,23 @@ 6 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJpSURBVDhPpZP7S1NhGMf9W/SHKEGiGyFhFBTmvMyd + tTa3eTvL9LjFIpam7AzTDGoYuvCHcJbaVSt/yTSxUV4ycnYdWh4rL+3URq3pObumfNsmbS5HEL3weeE8 + PJ/vy3nOeZMA/BcbCgsaTco8Van/QJUzsyqSm1GVcO9JJTNFyvW2UmnKn/1xD4tqDfGJotjvpib4RywI + vLUiMDEK/n43FrRleF1IsC+UQmK9EyfPVVD88t1urM6+Q3DwHoJdzQiaL+Dn7TasjA/CUauFVZ7NP5dm + RkMi27xanRyS7dzNLqwyNgQvn4O72YClphr4LxkQaKHhN56C/8EtLB4nMX7kgH1Msi85GhCSaWe9Hiu2 + yciJPhMN13kdvA3qOLjTJPy91/AqLwPD4gw6GvCROsZ4eq8j2GOG21iFb0XihCxXkeCb6uAwVOMxkc5E + A5gKlTfwsBdBkwHus9pQKfFyyHLgogqxZG6FJW+XN1RaC5ghi7y+ng74G7XwnimPNCda4QBnmQJLba0Y + Em6LBUyXKhiXsQ6+ZhrcSWWkMSHyPLjra7FQq8OgIC32CrZiKc1IBPD2dMKtksBVJtogs9JssAUieLqu + YFS4AwNZW2JDfFMkTn5ZQtgXK0vgudMRGZhTIVwTZblgJSFZIgTf2Y6pYnFYtvcJNsc+Y5jJghxiQnaI + nzuqgOdGB3400nCQcnxRyuBq0IO/2o5pZT76s1L5kBz/I/3mmfQg8fTwftYq2oOvNTq4Wi5G+Fx9Ak9y + todldr0cJi4gzIh4b8qwMF1vIXYzj/J3ckOCrdxAbhrTn52q78vc9PfL9O8g6Rcd0s65aUjWSwAAAABJ + RU5ErkJggg== + + MiddleRight @@ -1786,6 +1847,15 @@ 7 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m + m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 + M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= + + MiddleRight @@ -1943,7 +2013,7 @@ 13 - 1006, 342 + 1010, 345 Quick View Konfiguration @@ -2609,7 +2679,7 @@ 2 - 1006, 342 + 1010, 345 windream-Suche Konfiguration @@ -2626,6 +2696,24 @@ 2 + + 1010, 345 + + + Userzuordnung + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl2 + + + 3 + XtraTabControl2 @@ -2639,7 +2727,7 @@ 0 - 304, 95 + 606, 95 191, 17 @@ -2651,10 +2739,10 @@ False - 292, 392 + 292, 395 - 1008, 22 + 1012, 22 35 @@ -2675,8 +2763,16 @@ 1 - 197, 95 + 499, 95 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 + /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK + lQAAAABJRU5ErkJggg== + + Magenta @@ -2690,7 +2786,7 @@ 292, 0 - 1008, 25 + 1012, 25 34 @@ -2711,7 +2807,7 @@ 2 - 1300, 414 + 1304, 417 Entitäten-Übersicht @@ -2744,13 +2840,13 @@ $this - 3 + 11 - 727, 95 + 17, 134 - 584, 95 + 886, 95 15, 44 @@ -2771,7 +2867,7 @@ $this - 2 + 10 True @@ -2798,16 +2894,16 @@ $this - 1 + 9 - 969, 56 + 811, 56 - 1277, 56 + 17, 95 - 17, 95 + 319, 95 True @@ -2816,7 +2912,7 @@ Segoe UI, 8.25pt, style=Bold - 575, 214 + 432, 47 129, 13 @@ -2837,10 +2933,10 @@ $this - 0 + 8 - 421, 95 + 723, 95 windream-Suche|*.wdf|Alle Dateien|*.* @@ -2849,13 +2945,13 @@ windream-Suche wählen - 989, 95 + 279, 134 - 1245, 95 + 535, 134 - 1425, 95 + 715, 134 320, 240 @@ -7904,6 +8000,230 @@ YxnLk0v+7/v/HwTSd2NvxWDZAAAAAElFTkSuQmCCCw== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJpSURBVDhPpZP7S1NhGMf9W/SHKEGiGyFhFBTmvMyd + tTa3eTvL9LjFIpam7AzTDGoYuvCHcJbaVSt/yTSxUV4ycnYdWh4rL+3URq3pObumfNsmbS5HEL3weeE8 + PJ/vy3nOeZMA/BcbCgsaTco8Van/QJUzsyqSm1GVcO9JJTNFyvW2UmnKn/1xD4tqDfGJotjvpib4RywI + vLUiMDEK/n43FrRleF1IsC+UQmK9EyfPVVD88t1urM6+Q3DwHoJdzQiaL+Dn7TasjA/CUauFVZ7NP5dm + RkMi27xanRyS7dzNLqwyNgQvn4O72YClphr4LxkQaKHhN56C/8EtLB4nMX7kgH1Msi85GhCSaWe9Hiu2 + yciJPhMN13kdvA3qOLjTJPy91/AqLwPD4gw6GvCROsZ4eq8j2GOG21iFb0XihCxXkeCb6uAwVOMxkc5E + A5gKlTfwsBdBkwHus9pQKfFyyHLgogqxZG6FJW+XN1RaC5ghi7y+ng74G7XwnimPNCda4QBnmQJLba0Y + Em6LBUyXKhiXsQ6+ZhrcSWWkMSHyPLjra7FQq8OgIC32CrZiKc1IBPD2dMKtksBVJtogs9JssAUieLqu + YFS4AwNZW2JDfFMkTn5ZQtgXK0vgudMRGZhTIVwTZblgJSFZIgTf2Y6pYnFYtvcJNsc+Y5jJghxiQnaI + nzuqgOdGB3400nCQcnxRyuBq0IO/2o5pZT76s1L5kBz/I/3mmfQg8fTwftYq2oOvNTq4Wi5G+Fx9Ak9y + todldr0cJi4gzIh4b8qwMF1vIXYzj/J3ckOCrdxAbhrTn52q78vc9PfL9O8g6Rcd0s65aUjWSwAAAABJ + RU5ErkJggg== + + + + MiddleRight + + + NoControl + + + 738, 99 + + + 92, 23 + + + 58 + + + Delete user + + + MiddleLeft + + + btndeleteUserConstructorRel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m + m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 + M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= + + + + MiddleRight + + + NoControl + + + 738, 70 + + + 93, 23 + + + 57 + + + Add user + + + MiddleLeft + + + btnAddUser2ConstructorREL + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Bottom, Left + + + 837, 70 + + + 175, 173 + + + 56 + + + ListBoxUsersFORConstructor + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + NoControl + + + 834, 52 + + + 178, 17 + + + 53 + + + Freigegebene User: + + + lblConfiguredUsers + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + NoControl + + + 576, 50 + + + 100, 17 + + + 52 + + + Userauswahl: + + + lblUsers + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Top, Bottom, Left + + + 579, 70 + + + 153, 173 + + + 55 + + + ListBoxUserConstructor + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + NoControl + + + 576, 28 + + + 229, 13 + + + 54 + + + Bitte konfigurieren Sie die Userzuordnung. + + + Label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + True @@ -8113,6 +8433,12 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + FormDesignerToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ImageList1 diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.vb b/app/DD-Record-Organiser/frmConstructorDesigner.vb index aae7adb..115a633 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb @@ -105,6 +105,24 @@ Public Class frmConstructorDesigner MsgBox("Error Load_QuickDisplay:" & vbNewLine & ex.Message) End Try End Sub + Public Sub Load_ConstructorUser() + Try + Dim Sql = String.Format("SELECT GUID,USERNAME FROM TBDD_USER WHERE MODULE_RECORD_ORG = 1 AND GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0})", CONSTRUCTOR_IDTextBox.Text) + Dim DT_USER = ClassDatabase.Return_Datatable(Sql) + Sql = String.Format("SELECT T1.GUID, T.USERNAME FROM TBDD_USER T, TBPMO_CONSTRUCTOR_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CONSTRUCT_ID = {0}", CONSTRUCTOR_IDTextBox.Text) + Dim DT_USER_CONSTR As DataTable = ClassDatabase.Return_Datatable(Sql, "LOAD USERS FOR CONSTRUCT") + ListBoxUserConstructor.DataSource = DT_USER + ListBoxUserConstructor.DisplayMember = DT_USER.Columns(1).ColumnName + ListBoxUserConstructor.ValueMember = DT_USER.Columns(0).ColumnName + + ListBoxUsersFORConstructor.DataSource = DT_USER_CONSTR + ListBoxUsersFORConstructor.DisplayMember = DT_USER_CONSTR.Columns(1).ColumnName + ListBoxUsersFORConstructor.ValueMember = DT_USER_CONSTR.Columns(0).ColumnName + + Catch ex As Exception + MsgBox("UnexpectedError Load_ConstructorUser:" & vbNewLine & ex.Message) + End Try + End Sub Public Sub RecordSearch_Config() Try 'Zurücksetzen @@ -184,6 +202,7 @@ Public Class frmConstructorDesigner Private Sub frmConstructorDesigner_Shown(sender As Object, e As EventArgs) Handles Me.Shown formloaded = True Load_TreeViewEbene() + Load_ConstructorUser() End Sub Sub Load_TreeViewEbene() Try @@ -242,6 +261,7 @@ Public Class frmConstructorDesigner Try If CONSTRUCTOR_IDTextBox.Text <> "" Then Load_TreeViewEbene() + Load_ConstructorUser() End If Catch ex As Exception MsgBox("Error Loading Construct-Data:" & vbNewLine & ex.Message) @@ -396,6 +416,8 @@ Public Class frmConstructorDesigner Load_QuickDisplay() Case 2 RecordSearch_Config() + Case 3 + 'Load_ConstructorUser() End Select End Sub @@ -511,4 +533,48 @@ Public Class frmConstructorDesigner Private Sub LOAD_DIRECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOAD_DIRECTCheckBox.CheckedChanged End Sub + + Private Sub btnAddUser2ConstructorREL_Click(sender As Object, e As EventArgs) Handles btnAddUser2ConstructorREL.Click + Try + Dim i = ListBoxUserConstructor.SelectedValue + If Not IsNothing(i) Then + Dim insert = "INSERT INTO TBPMO_CONSTRUCTOR_USER (CONSTRUCT_ID, USER_ID,ADDED_WHO) VALUES (" & CONSTRUCTOR_IDTextBox.Text & ", " & i & ",'" & Environment.UserName & "')" + If ClassDatabase.Execute_non_Query(insert, True) Then + Load_ConstructorUser() + End If + End If + Catch ex As Exception + MsgBox("Error while adding user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub btndeleteUserConstructorRel_Click(sender As Object, e As EventArgs) Handles btndeleteUserConstructorRel.Click + Try + Dim i = ListBoxUsersFORConstructor.SelectedValue + If Not IsNothing(i) Then + Dim delete = "DELETE FROM TBPMO_CONSTRUCTOR_USER WHERE GUID = " & i + If ClassDatabase.Execute_non_Query(delete, True) Then + Load_ConstructorUser() + End If + End If + Catch ex As Exception + MsgBox("Error while deleting user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub FormDesignerToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FormDesignerToolStripMenuItem.Click + Try + Dim SelectedNode As TreeNode = TryCast(TreeViewDetails.SelectedNode, TreeNode) + If SelectedNode IsNot Nothing Then + Dim sql = String.Format("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = {0}", SelectedNode.Tag) + Dim FormId As Integer = ClassDatabase.Execute_Scalar(sql) + If FormId > 0 Then + CURRENT_FORM_ID = FormId + OpenFormLevelDesigner() + End If + End If + Catch ex As Exception + MsgBox("Unexpected Error in Open Designer: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb index f3a54b5..6ed2a42 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -498,7 +498,6 @@ Partial Class frmForm_Constructor_Main_2 'btnRemoveUser_FollowUp ' resources.ApplyResources(Me.btnRemoveUser_FollowUp, "btnRemoveUser_FollowUp") - Me.btnRemoveUser_FollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete Me.btnRemoveUser_FollowUp.Name = "btnRemoveUser_FollowUp" Me.btnRemoveUser_FollowUp.UseVisualStyleBackColor = True ' @@ -682,7 +681,6 @@ Partial Class frmForm_Constructor_Main_2 'tsButtonSave ' resources.ApplyResources(Me.tsButtonSave, "tsButtonSave") - Me.tsButtonSave.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG Me.tsButtonSave.Name = "tsButtonSave" ' 'tsButtonDelete diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx index 33c9d26..61001e5 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx @@ -153,7 +153,7 @@ Form-Designer - 195, 70 + 195, 92 CMSEntity @@ -289,7 +289,7 @@ 0, 0 - 795, 270 + 788, 270 0 @@ -361,7 +361,7 @@ 0, 0 - 1072, 316 + 1069, 312 0 @@ -379,7 +379,7 @@ 0 - 1072, 316 + 1069, 312 Detailansicht @@ -397,7 +397,7 @@ 0 - 1078, 347 + 1071, 340 1 @@ -420,7 +420,7 @@ - 1072, 291 + 1069, 287 6 @@ -481,7 +481,7 @@ 0, 0 - 1072, 25 + 1069, 25 2 @@ -502,7 +502,7 @@ 1 - 1072, 316 + 1069, 312 windream-Dateien @@ -564,6 +564,23 @@ Segoe UI, 8.25pt + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJpSURBVDhPpZP7S1NhGMf9W/SHKEGiGyFhFBTmvMyd + tTa3eTvL9LjFIpam7AzTDGoYuvCHcJbaVSt/yTSxUV4ycnYdWh4rL+3URq3pObumfNsmbS5HEL3weeE8 + PJ/vy3nOeZMA/BcbCgsaTco8Van/QJUzsyqSm1GVcO9JJTNFyvW2UmnKn/1xD4tqDfGJotjvpib4RywI + vLUiMDEK/n43FrRleF1IsC+UQmK9EyfPVVD88t1urM6+Q3DwHoJdzQiaL+Dn7TasjA/CUauFVZ7NP5dm + RkMi27xanRyS7dzNLqwyNgQvn4O72YClphr4LxkQaKHhN56C/8EtLB4nMX7kgH1Msi85GhCSaWe9Hiu2 + yciJPhMN13kdvA3qOLjTJPy91/AqLwPD4gw6GvCROsZ4eq8j2GOG21iFb0XihCxXkeCb6uAwVOMxkc5E + A5gKlTfwsBdBkwHus9pQKfFyyHLgogqxZG6FJW+XN1RaC5ghi7y+ng74G7XwnimPNCda4QBnmQJLba0Y + Em6LBUyXKhiXsQ6+ZhrcSWWkMSHyPLjra7FQq8OgIC32CrZiKc1IBPD2dMKtksBVJtogs9JssAUieLqu + YFS4AwNZW2JDfFMkTn5ZQtgXK0vgudMRGZhTIVwTZblgJSFZIgTf2Y6pYnFYtvcJNsc+Y5jJghxiQnaI + nzuqgOdGB3400nCQcnxRyuBq0IO/2o5pZT76s1L5kBz/I/3mmfQg8fTwftYq2oOvNTq4Wi5G+Fx9Ak9y + todldr0cJi4gzIh4b8qwMF1vIXYzj/J3ckOCrdxAbhrTn52q78vc9PfL9O8g6Rcd0s65aUjWSwAAAABJ + RU5ErkJggg== + + MiddleLeft @@ -916,7 +933,7 @@ 2 - 1072, 316 + 1069, 312 Wiedervorlage @@ -943,7 +960,7 @@ Cyan - 1072, 291 + 1069, 287 0 @@ -967,7 +984,7 @@ 0, 25 - 1072, 291 + 1069, 287 2 @@ -1142,7 +1159,7 @@ 0, 0 - 1072, 25 + 1069, 25 1 @@ -1171,7 +1188,7 @@ - 1072, 316 + 1069, 312 Positionen @@ -1218,6 +1235,14 @@ False + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 + /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK + lQAAAABJRU5ErkJggg== + + Magenta @@ -1342,7 +1367,7 @@ 0, 0 - 1078, 25 + 1071, 25 0 @@ -1447,7 +1472,7 @@ Panel2 - 1083, 372 + 1083, 365 0 diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 587e707..db62f6a 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -2024,7 +2024,7 @@ Public Class frmForm_Constructor_Main_2 PARENT_ID = PARENT_RECORD1 End If Case 2 - linkedRecord = linkedRecord(Rec_ID, FORM_ID) + linkedRecord = GET_LINKED_RECORD(Rec_ID, FORM_ID) If linkedRecord > 0 Then EBENE1_RECID = Rec_ID PARENT_RECORDID = EBENE1_RECID diff --git a/app/DD-Record-Organiser/frmMain.resx b/app/DD-Record-Organiser/frmMain.resx index 15fd480..08173ef 100644 --- a/app/DD-Record-Organiser/frmMain.resx +++ b/app/DD-Record-Organiser/frmMain.resx @@ -1902,6 +1902,9 @@ Konfiguration 1365, 17 + + en-US + True diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index da581f8..ef07896 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -199,7 +199,7 @@ Public Class frmMain Try Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & _ "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & _ - "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID) + "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2) Dim image2 As Bitmap = LoadNoImage() @@ -593,7 +593,13 @@ Public Class frmMain Public Sub New() Dim splash As New frmSplash() splash.ShowDialog() - Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE) + Dim cultureInfo As System.Globalization.CultureInfo + cultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE) + + Thread.CurrentThread.CurrentCulture = cultureInfo + Thread.CurrentThread.CurrentUICulture = cultureInfo + cultureInfo.DefaultThreadCurrentCulture = cultureInfo + cultureInfo.DefaultThreadCurrentUICulture = cultureInfo ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent()