From a5ac4947d07724244325c7b935e8fa60ebf31db3 Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Thu, 8 Apr 2021 10:37:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=B0=20=D0=BA=20=D1=8D=D0=BB=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IGenericControlEntityElement.cs | 10 ++++- .../GenericControlEntityElement.cs | 23 +++++++++- .../MainControlViewEntityElement.Designer.cs | 42 +++++++++++++++---- .../MainControlViewEntityElement.resx | 10 +++++ .../ControlViewEntityElementConfiguration.cs | 16 +++++++ .../ControlViewEntityListConfiguration.cs | 2 +- .../ControlAcademicPlanElement.cs | 3 ++ .../ControlAcademicPlanRecordElement.cs | 3 ++ ...olAcademicPlanRecordTimeNormHourElement.cs | 3 ++ ...emicPlanRecordTimeNormHourList.Designer.cs | 5 --- .../Classroom/ControlClassroomElement.cs | 3 ++ .../Discipline/ControlDisciplineElement.cs | 3 ++ .../ControlDisciplineBlockElement.cs | 3 ++ .../ControlEducationDirectionElement.cs | 3 ++ .../Employee/ControlEmployeeElement.cs | 3 ++ .../ControlEmployeePostElement.cs | 3 ++ .../Lecturer/ControlLecturerElement.cs | 3 ++ .../ControlLecturerAcademicDegreeElement.cs | 3 ++ .../ControlLecturerAcademicRankElement.cs | 3 ++ .../ControlLecturerPostElement.cs | 3 ++ .../EntityControls/Post/ControlPostElement.cs | 3 ++ .../TimeNorm/ControlTimeNormElement.cs | 3 ++ .../Access/ControlAccessElement.cs | 3 ++ .../ControlEnviromentSettingElement.cs | 3 ++ .../EntityControls/Role/ControlRoleElement.cs | 3 ++ .../EntityControls/User/ControlUserElement.cs | 3 ++ .../UserRole/ControlUserRoleElement.cs | 3 ++ 27 files changed, 151 insertions(+), 17 deletions(-) create mode 100644 DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs b/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs index 4f92374..0b07057 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs +++ b/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs @@ -1,4 +1,6 @@ -namespace DesktopTools.Interfaces +using DesktopTools.Models; + +namespace DesktopTools.Interfaces { /// /// Работа с generic-контролом элемента @@ -10,5 +12,11 @@ /// /// IControl GetInstanceGenericControl(); + + /// + /// Получение настроек + /// + /// + ControlViewEntityElementConfiguration GetConfigControl(); } } \ No newline at end of file diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs index 40428af..dafd845 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs @@ -130,7 +130,7 @@ namespace DesktopTools.Controls { try { - Configurate(); + Configurate(GetConfig()); } catch (Exception ex) { @@ -192,8 +192,25 @@ namespace DesktopTools.Controls }; } - private void Configurate() + private void Configurate(ControlViewEntityElementConfiguration config) { + // Загрузка подпунктов в контекстное меню и в пункт меню "Действие" + if (config.ControlOnMoveElem != null) + { + foreach (var elem in config.ControlOnMoveElem) + { + ToolStripMenuItem item = new() { Text = elem.Value.Title, Name = elem.Key }; + item.Click += elem.Value.Event; + toolStripSplitButtonActions.DropDownItems.Add(item); + contextMenuStripElement.Items.Add(item); + } + } + // либо скрытие пункта, если не предусмотренно подпунктов + else + { + toolStripSplitButtonActions.Visible = false; + toolStripSeparator1.Visible = false; + } var attributeClass = typeof(E).GetCustomAttribute(); if (attributeClass == null) { @@ -368,5 +385,7 @@ namespace DesktopTools.Controls return false; } + + private ControlViewEntityElementConfiguration GetConfig() => _genericControlViewEntityElement?.GetConfigControl(); } } diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs index ddb0f52..069be42 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs +++ b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs @@ -3,10 +3,6 @@ namespace DesktopTools.Controls { partial class MainControlViewEntityElement { - /// - /// Обязательная переменная конструктора. - /// - protected System.ComponentModel.IContainer components = null; /// /// Освободить все используемые ресурсы. @@ -29,13 +25,18 @@ namespace DesktopTools.Controls /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainControlViewEntityElement)); this.toolStripActions = new System.Windows.Forms.ToolStrip(); this.toolStripButtonSave = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonReload = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonClose = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSplitButtonActions = new System.Windows.Forms.ToolStripSplitButton(); this.panelContainer = new System.Windows.Forms.Panel(); this.tabControl = new System.Windows.Forms.TabControl(); this.tabPageMain = new System.Windows.Forms.TabPage(); + this.contextMenuStripElement = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripActions.SuspendLayout(); this.tabControl.SuspendLayout(); this.SuspendLayout(); @@ -45,7 +46,9 @@ namespace DesktopTools.Controls this.toolStripActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButtonSave, this.toolStripButtonReload, - this.toolStripButtonClose}); + this.toolStripButtonClose, + this.toolStripSeparator1, + this.toolStripSplitButtonActions}); this.toolStripActions.Location = new System.Drawing.Point(0, 0); this.toolStripActions.Name = "toolStripActions"; this.toolStripActions.Size = new System.Drawing.Size(594, 25); @@ -80,6 +83,20 @@ namespace DesktopTools.Controls this.toolStripButtonClose.Size = new System.Drawing.Size(23, 22); this.toolStripButtonClose.Text = "Закрыть"; // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripSplitButtonActions + // + this.toolStripSplitButtonActions.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripSplitButtonActions.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButtonActions.Image"))); + this.toolStripSplitButtonActions.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripSplitButtonActions.Name = "toolStripSplitButtonActions"; + this.toolStripSplitButtonActions.Size = new System.Drawing.Size(74, 22); + this.toolStripSplitButtonActions.Text = "Действия"; + // // panelContainer // this.panelContainer.AutoScroll = true; @@ -93,22 +110,27 @@ namespace DesktopTools.Controls // this.tabControl.Controls.Add(this.tabPageMain); this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl.Location = new System.Drawing.Point(218, 141); + this.tabControl.Location = new System.Drawing.Point(0, 25); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(130, 127); + this.tabControl.Size = new System.Drawing.Size(594, 485); this.tabControl.TabIndex = 0; // // tabPageMain // + this.tabPageMain.ContextMenuStrip = this.contextMenuStripElement; this.tabPageMain.Location = new System.Drawing.Point(4, 24); this.tabPageMain.Name = "tabPageMain"; this.tabPageMain.Padding = new System.Windows.Forms.Padding(3); - this.tabPageMain.Size = new System.Drawing.Size(122, 99); + this.tabPageMain.Size = new System.Drawing.Size(586, 457); this.tabPageMain.TabIndex = 0; this.tabPageMain.Text = "Свойства элемента"; this.tabPageMain.UseVisualStyleBackColor = true; // + // contextMenuStripElement + // + this.contextMenuStripElement.Name = "contextMenuStripElement"; + // // MainControlViewEntityElement // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -135,5 +157,9 @@ namespace DesktopTools.Controls protected System.Windows.Forms.Panel panelContainer; protected System.Windows.Forms.TabControl tabControl; protected System.Windows.Forms.TabPage tabPageMain; + protected System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + protected System.Windows.Forms.ToolStripSplitButton toolStripSplitButtonActions; + protected System.Windows.Forms.ContextMenuStrip contextMenuStripElement; + protected System.ComponentModel.IContainer components; } } diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.resx b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.resx index f298a7b..ee499e1 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.resx +++ b/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.resx @@ -57,4 +57,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACRSURBVDhPY/j27dt/SjDYACcnJ7IwigEf3n8kCZNswPNb + J/+f6DYF0yA+yQac6Db5f6hWCmwIiE+mC0wIu2DS2Vf/F1x6DefjwlgNyNr34r/0wkdgTMgQDAOQNRNj + CIoBOg0rMTTDMLIhIHbriZeYBmDTiIxBGkEYxge5liQDsGGQqykyAISpZwAlmIEywMAAAAc1/Jwvt6sN + AAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs b/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs new file mode 100644 index 0000000..9520b1d --- /dev/null +++ b/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +namespace DesktopTools.Models +{ + /// + /// Настройки для контрола вывода элемента сущности + /// + public class ControlViewEntityElementConfiguration + { + /// + /// Перечень действий для контектснго меню и выпадающего в верхнем меню пункта "Действия" + /// + public Dictionary ControlOnMoveElem { get; set; } = null; + } +} \ No newline at end of file diff --git a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs b/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs index e4632bb..3f7d403 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs +++ b/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace DesktopTools.Models { /// - /// Настройки для таблицы вывода списка записей сущности + /// Настройки для контрола вывода списка записей сущности /// public class ControlViewEntityListConfiguration { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs index da81eee..8424118 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlAcademicPlanElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs index aa04dd5..e5fd3a8 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlAcademicPlanRecordElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs index 9ff327f..cf0bad3 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlAcademicPlanRecordTimeNormHourElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.Designer.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.Designer.cs index 6dbd92c..61c2cce 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.Designer.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.Designer.cs @@ -3,11 +3,6 @@ namespace DepartmentWindowsDesktop.EntityControls { partial class ControlAcademicPlanRecordTimeNormHourList { - /// - /// Обязательная переменная конструктора. - /// - private System.ComponentModel.IContainer components = null; - /// /// Освободить все используемые ресурсы. /// diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs index a3e9de7..409d66e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlClassroomElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs index b5afe4f..d2aacdb 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlDisciplineElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs index fa582f8..60452b2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlDisciplineBlockElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs index f31435d..b59ba9c 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlEducationDirectionElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs index ac34b61..a72e8d0 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlEmployeeElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs index d324c87..ab79f25 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlEmployeePostElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs index aa233f3..cfa04a2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -20,5 +21,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlLecturerElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs index 990512e..429d1ad 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlLecturerAcademicDegreeElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs index 2f8e354..bd03a74 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlLecturerAcademicRankElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs index 4cf35c2..d8c6468 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlLecturerPostElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs index 36ba485..45b10fc 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlPostElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs index c8cbe2d..7bc6393 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs @@ -3,6 +3,7 @@ using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using System; namespace DepartmentWindowsDesktop.EntityControls @@ -23,5 +24,7 @@ namespace DepartmentWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlTimeNormElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs index e8d9d9c..3e74245 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs @@ -1,5 +1,6 @@ using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; @@ -23,5 +24,7 @@ namespace SecurityWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlAccessElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs index e598d28..ad83182 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs @@ -1,5 +1,6 @@ using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; @@ -23,5 +24,7 @@ namespace SecurityWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlEnviromentSettingElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs index fb113a2..51dabd6 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs @@ -1,5 +1,6 @@ using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; @@ -23,5 +24,7 @@ namespace SecurityWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlRoleElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs index 74624cb..ae7cf2d 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs @@ -1,5 +1,6 @@ using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; @@ -23,5 +24,7 @@ namespace SecurityWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlUserElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs index ea64e93..f8efc6e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs @@ -1,5 +1,6 @@ using DesktopTools.Controls; using DesktopTools.Interfaces; +using DesktopTools.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; @@ -23,5 +24,7 @@ namespace SecurityWindowsDesktop.EntityControls } public IControl GetInstanceGenericControl() => new ControlUserRoleElement() { ControlId = Guid.NewGuid() }; + + public ControlViewEntityElementConfiguration GetConfigControl() => new(); } } \ No newline at end of file