From c4e7e7e7db9868b5b43c85a5cf2afaf543faf975 Mon Sep 17 00:00:00 2001 From: aleksandr chegodaev Date: Mon, 17 Jun 2024 17:28:20 +0400 Subject: [PATCH 1/2] lab8 --- .gitignore | 5 + LawFirm/LawFirm/DataGridViewExtension.cs | 50 ++++++ LawFirm/LawFirm/FormClients.Designer.cs | 96 ++++++------ LawFirm/LawFirm/FormClients.cs | 10 +- LawFirm/LawFirm/FormComponents.cs | 27 ++-- LawFirm/LawFirm/FormDocument.cs | 47 +++--- LawFirm/LawFirm/FormDocuments.cs | 27 ++-- LawFirm/LawFirm/FormImplementers.Designer.cs | 144 +++++++++--------- LawFirm/LawFirm/FormImplementers.cs | 25 ++- LawFirm/LawFirm/FormMail.cs | 9 +- LawFirm/LawFirm/FormMain.Designer.cs | 40 +++-- LawFirm/LawFirm/FormMain.cs | 104 ++++++------- LawFirm/LawFirm/LawFirmView.csproj | 3 - LawFirm/LawFirm/Program.cs | 90 ++++++----- .../BusinessLogic/BackUpLogic.cs | 100 ++++++++++++ .../LawFirmClientApp/LawFirmClientApp.csproj | 16 -- .../Attributes/ColumnAttribute.cs | 26 ++++ .../Attributes/GridViewAutoSize.cs | 20 +++ .../BindingModels/BackUpSaveBinidngModel.cs | 13 ++ .../BindingModels/MessageInfoBindingModel.cs | 1 + .../BusinessLogicsContracts/IBackUpLogic.cs | 14 ++ .../LawFirmContracts/DI/DependencyManager.cs | 65 ++++++++ .../DI/IDependencyContainer.cs | 40 +++++ .../DI/IImplementationExtension.cs | 17 +++ .../DI/ServiceDependencyContainer.cs | 62 ++++++++ .../DI/ServiceProviderLoader.cs | 51 +++++++ .../DI/UnityDependencyContainer.cs | 43 ++++++ .../LawFirmContracts/LawFirmContracts.csproj | 6 + .../StoragesContracts/IBackUpInfo.cs | 14 ++ .../ViewModels/ClientViewModel.cs | 16 +- .../ViewModels/ComponentViewModel.cs | 12 +- .../ViewModels/DocumentViewModel.cs | 15 +- .../ViewModels/ImplementerViewModel.cs | 20 +-- .../ViewModels/MessageInfoViewModel.cs | 14 +- .../ViewModels/OrderViewModel.cs | 48 +++--- .../Models/IMessageInfoModel.cs | 2 +- .../DatabaseImplementationExtension.cs | 27 ++++ .../Implements/BackUpInfo.cs | 32 ++++ .../LawFirmDatabaseImplement.csproj | 4 + ... 20240617132711_InitialCreate.Designer.cs} | 2 +- ...ate.cs => 20240617132711_InitialCreate.cs} | 0 .../LawFirmDatabaseImplement/Models/Client.cs | 16 +- .../Models/Component.cs | 13 +- .../Models/Document.cs | 16 +- .../Models/Implementer.cs | 23 +-- .../Models/MessageInfo.cs | 9 ++ .../LawFirmDatabaseImplement/Models/Order.cs | 32 ++-- .../FileImplementationExtension.cs | 27 ++++ .../Implements/BackUpInfo.cs | 33 ++++ .../Implements/OrderStorage.cs | 38 +++-- .../LawFirmFileImplement.csproj | 4 + LawFirm/LawFirmFileImplement/Models/Client.cs | 19 ++- .../LawFirmFileImplement/Models/Component.cs | 13 +- .../LawFirmFileImplement/Models/Document.cs | 16 +- .../Models/Implementer.cs | 23 +-- .../Models/MessageInfo.cs | 14 +- LawFirm/LawFirmFileImplement/Models/Order.cs | 37 +++-- .../Implements/BackUpInfo.cs | 22 +++ .../Implements/OrderStorage.cs | 10 +- .../LawFirmListImplement.csproj | 4 + .../ListImplementationExtension.cs | 27 ++++ .../Models/MessageInfo.cs | 1 + LawFirm/LawFirmListImplement/Models/Order.cs | 6 +- 63 files changed, 1251 insertions(+), 509 deletions(-) create mode 100644 LawFirm/LawFirm/DataGridViewExtension.cs create mode 100644 LawFirm/LawFirmBusinessLogic/BusinessLogic/BackUpLogic.cs create mode 100644 LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs create mode 100644 LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs create mode 100644 LawFirm/LawFirmContracts/BindingModels/BackUpSaveBinidngModel.cs create mode 100644 LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 LawFirm/LawFirmContracts/DI/DependencyManager.cs create mode 100644 LawFirm/LawFirmContracts/DI/IDependencyContainer.cs create mode 100644 LawFirm/LawFirmContracts/DI/IImplementationExtension.cs create mode 100644 LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs create mode 100644 LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs create mode 100644 LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs create mode 100644 LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs create mode 100644 LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs rename LawFirm/LawFirmDatabaseImplement/Migrations/{20240616174259_InitialCreate.Designer.cs => 20240617132711_InitialCreate.Designer.cs} (99%) rename LawFirm/LawFirmDatabaseImplement/Migrations/{20240616174259_InitialCreate.cs => 20240617132711_InitialCreate.cs} (100%) create mode 100644 LawFirm/LawFirmFileImplement/FileImplementationExtension.cs create mode 100644 LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs create mode 100644 LawFirm/LawFirmListImplement/Implements/BackUpInfo.cs create mode 100644 LawFirm/LawFirmListImplement/ListImplementationExtension.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..b7955e9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + +/LawFirm/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/LawFirm/LawFirm/DataGridViewExtension.cs b/LawFirm/LawFirm/DataGridViewExtension.cs new file mode 100644 index 0000000..ccf9f27 --- /dev/null +++ b/LawFirm/LawFirm/DataGridViewExtension.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using LawFirmContracts.Attributes; + +namespace LawFirmView +{ + public static class DataGridViewExtension + { + public static void FillAndConfigGrid(this DataGridView grid, List? data) + { + if (data == null) + { + return; + } + grid.DataSource = data; + var type = typeof(T); + var properties = type.GetProperties(); + foreach (DataGridViewColumn column in grid.Columns) + { + var property = properties.FirstOrDefault(x => x.Name == column.Name); + if (property == null) + { + throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}"); + } + var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault(); + if (attribute == null) + { + throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}"); + } + // ищем нужный нам атрибут + if (attribute is ColumnAttribute columnAttr) + { + column.HeaderText = columnAttr.Title; + column.Visible = columnAttr.Visible; + if (columnAttr.IsUseAutoSize) + { + column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString()); + } + else + { + column.Width = columnAttr.Width; + } + } + } + } + } +} diff --git a/LawFirm/LawFirm/FormClients.Designer.cs b/LawFirm/LawFirm/FormClients.Designer.cs index ad6c558..0e11616 100644 --- a/LawFirm/LawFirm/FormClients.Designer.cs +++ b/LawFirm/LawFirm/FormClients.Designer.cs @@ -28,54 +28,54 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonDelete = new System.Windows.Forms.Button(); - this.buttonRefresh = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); - // - // dataGridView - // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(12, 12); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(354, 339); - this.dataGridView.TabIndex = 0; - // - // buttonDelete - // - this.buttonDelete.Location = new System.Drawing.Point(375, 12); - this.buttonDelete.Name = "buttonDelete"; - this.buttonDelete.Size = new System.Drawing.Size(75, 23); - this.buttonDelete.TabIndex = 1; - this.buttonDelete.Text = "Удалить"; - this.buttonDelete.UseVisualStyleBackColor = true; - this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); - // - // buttonRefresh - // - this.buttonRefresh.Location = new System.Drawing.Point(375, 328); - this.buttonRefresh.Name = "buttonRefresh"; - this.buttonRefresh.Size = new System.Drawing.Size(75, 23); - this.buttonRefresh.TabIndex = 2; - this.buttonRefresh.Text = "Обновить"; - this.buttonRefresh.UseVisualStyleBackColor = true; - this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click); - // - // FormClients - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(462, 393); - this.Controls.Add(this.buttonRefresh); - this.Controls.Add(this.buttonDelete); - this.Controls.Add(this.dataGridView); - this.Name = "FormClients"; - this.Text = "FormClients"; - this.Load += new System.EventHandler(this.FormClients_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(12, 12); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(463, 339); + this.dataGridView.TabIndex = 1; + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(499, 12); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(75, 23); + this.buttonDelete.TabIndex = 1; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); + // + // buttonRefresh + // + this.buttonRefresh.Location = new System.Drawing.Point(499, 328); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(75, 23); + this.buttonRefresh.TabIndex = 2; + this.buttonRefresh.Text = "Обновить"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click); + // + // FormClients + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(586, 393); + this.Controls.Add(this.buttonRefresh); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.dataGridView); + this.Name = "FormClients"; + this.Text = "FormClients"; + this.Load += new System.EventHandler(this.FormClients_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); } diff --git a/LawFirm/LawFirm/FormClients.cs b/LawFirm/LawFirm/FormClients.cs index ed7e21b..13eba29 100644 --- a/LawFirm/LawFirm/FormClients.cs +++ b/LawFirm/LawFirm/FormClients.cs @@ -32,14 +32,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка клиентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/LawFirm/LawFirm/FormComponents.cs b/LawFirm/LawFirm/FormComponents.cs index 8d63a50..405aeb8 100644 --- a/LawFirm/LawFirm/FormComponents.cs +++ b/LawFirm/LawFirm/FormComponents.cs @@ -1,5 +1,6 @@ using LawFirmContracts.BindingModels.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using Microsoft.Extensions.Logging; using Microsoft.VisualBasic.Logging; using System; @@ -33,15 +34,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка компонентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) { @@ -53,31 +47,28 @@ namespace LawFirmView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { LoadData(); } - } + } private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); } - } + } } diff --git a/LawFirm/LawFirm/FormDocument.cs b/LawFirm/LawFirm/FormDocument.cs index 30f3fef..2b51ac1 100644 --- a/LawFirm/LawFirm/FormDocument.cs +++ b/LawFirm/LawFirm/FormDocument.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using LawFirmContracts.DI; namespace LawFirmView { @@ -86,30 +87,28 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); private void buttonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); - if (service is FormDocumentComponent form) - { + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); - if (_documentComponents.ContainsKey(form.Id)) - { - _documentComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _documentComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); + return; } + _logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); + if (_documentComponents.ContainsKey(form.Id)) + { + _documentComponents[form.Id] = (form.ComponentModel, + form.Count); + } + else + { + _documentComponents.Add(form.Id, (form.ComponentModel, + form.Count)); + } + LoadData(); } + } @@ -117,10 +116,8 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); - if (service is FormDocumentComponent form) - { + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); form.Id = id; @@ -135,7 +132,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); _documentComponents[form.Id] = (form.ComponentModel,form.Count); LoadData(); } - } + } } diff --git a/LawFirm/LawFirm/FormDocuments.cs b/LawFirm/LawFirm/FormDocuments.cs index 6960e4f..7c08fe5 100644 --- a/LawFirm/LawFirm/FormDocuments.cs +++ b/LawFirm/LawFirm/FormDocuments.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using LawFirmContracts.DI; namespace LawFirmView { @@ -33,16 +34,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["DocumentName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["DocumentComponents"].Visible = false; - } - _logger.LogInformation("Загрузка пакетов документов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка пакетов документов"); } catch (Exception ex) { @@ -54,29 +47,27 @@ namespace LawFirmView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocument)); - if (service is FormDocument form) - { + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { LoadData(); } - } + } private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocument)); - if (service is FormDocument form) - { + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); } - } + } } diff --git a/LawFirm/LawFirm/FormImplementers.Designer.cs b/LawFirm/LawFirm/FormImplementers.Designer.cs index c36a4f5..c3c3f32 100644 --- a/LawFirm/LawFirm/FormImplementers.Designer.cs +++ b/LawFirm/LawFirm/FormImplementers.Designer.cs @@ -28,78 +28,78 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonUpdate = new System.Windows.Forms.Button(); - this.buttonDelete = new System.Windows.Forms.Button(); - this.buttonRef = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); - // - // dataGridView - // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(0, 0); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(419, 428); - this.dataGridView.TabIndex = 0; - // - // buttonCreate - // - this.buttonCreate.Location = new System.Drawing.Point(476, 12); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(75, 23); - this.buttonCreate.TabIndex = 1; - this.buttonCreate.Text = "Добавить"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); - // - // buttonUpdate - // - this.buttonUpdate.Location = new System.Drawing.Point(476, 58); - this.buttonUpdate.Name = "buttonUpdate"; - this.buttonUpdate.Size = new System.Drawing.Size(75, 23); - this.buttonUpdate.TabIndex = 2; - this.buttonUpdate.Text = "Изменить"; - this.buttonUpdate.UseVisualStyleBackColor = true; - this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click); - // - // buttonDelete - // - this.buttonDelete.Location = new System.Drawing.Point(476, 102); - this.buttonDelete.Name = "buttonDelete"; - this.buttonDelete.Size = new System.Drawing.Size(75, 23); - this.buttonDelete.TabIndex = 3; - this.buttonDelete.Text = "Удалить"; - this.buttonDelete.UseVisualStyleBackColor = true; - this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); - // - // buttonRef - // - this.buttonRef.Location = new System.Drawing.Point(476, 146); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(75, 23); - this.buttonRef.TabIndex = 4; - this.buttonRef.Text = "Обновить"; - this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); - // - // FormImplementers - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(596, 440); - this.Controls.Add(this.buttonRef); - this.Controls.Add(this.buttonDelete); - this.Controls.Add(this.buttonUpdate); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.dataGridView); - this.Name = "FormImplementers"; - this.Text = "FormImplementers"; - this.Load += new System.EventHandler(this.FormImplementers_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUpdate = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(528, 428); + this.dataGridView.TabIndex = 0; + // + // buttonCreate + // + this.buttonCreate.Location = new System.Drawing.Point(582, 12); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.TabIndex = 1; + this.buttonCreate.Text = "Добавить"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(582, 52); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(75, 23); + this.buttonUpdate.TabIndex = 2; + this.buttonUpdate.Text = "Изменить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(582, 97); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(75, 23); + this.buttonDelete.TabIndex = 3; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(582, 146); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(75, 23); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); + // + // FormImplementers + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(683, 440); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.buttonUpdate); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.dataGridView); + this.Name = "FormImplementers"; + this.Text = "FormImplementers"; + this.Load += new System.EventHandler(this.FormImplementers_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); } diff --git a/LawFirm/LawFirm/FormImplementers.cs b/LawFirm/LawFirm/FormImplementers.cs index c019e4a..e3f2de4 100644 --- a/LawFirm/LawFirm/FormImplementers.cs +++ b/LawFirm/LawFirm/FormImplementers.cs @@ -1,5 +1,6 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -32,14 +33,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка исполнителей"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) { @@ -51,29 +46,27 @@ namespace LawFirmView private void buttonCreate_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) - { + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { LoadData(); } - } + } private void buttonUpdate_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) - { + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); } - } + } } diff --git a/LawFirm/LawFirm/FormMail.cs b/LawFirm/LawFirm/FormMail.cs index f1c86df..c155831 100644 --- a/LawFirm/LawFirm/FormMail.cs +++ b/LawFirm/LawFirm/FormMail.cs @@ -31,14 +31,7 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Loading materials"); } catch (Exception ex) diff --git a/LawFirm/LawFirm/FormMain.Designer.cs b/LawFirm/LawFirm/FormMain.Designer.cs index 4ab84fa..393882c 100644 --- a/LawFirm/LawFirm/FormMain.Designer.cs +++ b/LawFirm/LawFirm/FormMain.Designer.cs @@ -39,11 +39,12 @@ this.компонентыПоПакетамДокументовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.почтаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.создатьБэкапToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonCreateOrder = new System.Windows.Forms.Button(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); this.buttonRef = new System.Windows.Forms.Button(); - this.почтаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -54,10 +55,11 @@ this.toolStripMenuItemCatalogs, this.отчётыToolStripMenuItem, this.запускРаботToolStripMenuItem, - this.почтаToolStripMenuItem}); + this.почтаToolStripMenuItem, + this.создатьБэкапToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1047, 24); + this.menuStrip1.Size = new System.Drawing.Size(1201, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "Справочники"; // @@ -138,6 +140,20 @@ this.запускРаботToolStripMenuItem.Text = "Запуск работ"; this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.запускРаботToolStripMenuItem_Click); // + // почтаToolStripMenuItem + // + this.почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + this.почтаToolStripMenuItem.Size = new System.Drawing.Size(53, 20); + this.почтаToolStripMenuItem.Text = "Почта"; + this.почтаToolStripMenuItem.Click += new System.EventHandler(this.почтаToolStripMenuItem_Click); + // + // создатьБэкапToolStripMenuItem + // + this.создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + this.создатьБэкапToolStripMenuItem.Size = new System.Drawing.Size(97, 20); + this.создатьБэкапToolStripMenuItem.Text = "Создать бэкап"; + this.создатьБэкапToolStripMenuItem.Click += new System.EventHandler(this.создатьБэкапToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; @@ -145,12 +161,12 @@ this.dataGridView.Location = new System.Drawing.Point(0, 27); this.dataGridView.Name = "dataGridView"; this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(873, 411); + this.dataGridView.Size = new System.Drawing.Size(1027, 411); this.dataGridView.TabIndex = 1; // // buttonCreateOrder // - this.buttonCreateOrder.Location = new System.Drawing.Point(879, 39); + this.buttonCreateOrder.Location = new System.Drawing.Point(1033, 39); this.buttonCreateOrder.Name = "buttonCreateOrder"; this.buttonCreateOrder.Size = new System.Drawing.Size(156, 26); this.buttonCreateOrder.TabIndex = 2; @@ -160,7 +176,7 @@ // // buttonIssuedOrder // - this.buttonIssuedOrder.Location = new System.Drawing.Point(879, 71); + this.buttonIssuedOrder.Location = new System.Drawing.Point(1033, 71); this.buttonIssuedOrder.Name = "buttonIssuedOrder"; this.buttonIssuedOrder.Size = new System.Drawing.Size(156, 23); this.buttonIssuedOrder.TabIndex = 5; @@ -170,7 +186,7 @@ // // buttonRef // - this.buttonRef.Location = new System.Drawing.Point(879, 100); + this.buttonRef.Location = new System.Drawing.Point(1033, 100); this.buttonRef.Name = "buttonRef"; this.buttonRef.Size = new System.Drawing.Size(156, 23); this.buttonRef.TabIndex = 6; @@ -178,18 +194,11 @@ this.buttonRef.UseVisualStyleBackColor = true; this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); // - // почтаToolStripMenuItem - // - this.почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; - this.почтаToolStripMenuItem.Size = new System.Drawing.Size(53, 20); - this.почтаToolStripMenuItem.Text = "Почта"; - this.почтаToolStripMenuItem.Click += new System.EventHandler(this.почтаToolStripMenuItem_Click); - // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1047, 477); + this.ClientSize = new System.Drawing.Size(1201, 477); this.Controls.Add(this.buttonRef); this.Controls.Add(this.buttonIssuedOrder); this.Controls.Add(this.buttonCreateOrder); @@ -225,5 +234,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem почтаToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } \ No newline at end of file diff --git a/LawFirm/LawFirm/FormMain.cs b/LawFirm/LawFirm/FormMain.cs index eef5f4f..650a799 100644 --- a/LawFirm/LawFirm/FormMain.cs +++ b/LawFirm/LawFirm/FormMain.cs @@ -1,7 +1,9 @@ using LawFirmBusinessLogic.BusinessLogic; using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using LawFirmDataModels.Enums; +using DocumentFormat.OpenXml.Spreadsheet; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -21,14 +23,16 @@ namespace LawFirmView private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + private readonly IBackUpLogic _backUpLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; - } + _backUpLogic = backUpLogic; + } private void FormMain_Load(object sender, EventArgs e) { @@ -39,16 +43,8 @@ namespace LawFirmView _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["DocumentId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - - } - _logger.LogInformation("Загрузка заказов"); + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) { @@ -59,31 +55,24 @@ namespace LawFirmView private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { + var form = DependencyManager.Instance.Resolve(); form.ShowDialog(); - } } private void пакетыДокументовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocuments)); - if (service is FormDocuments form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void buttonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); LoadData(); - } + } @@ -148,53 +137,66 @@ namespace LawFirmView private void компонентыПоПакетамДокументовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportDocumentComponents)); - if (service is FormReportDocumentComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void клиентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - if (service is FormImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); - MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void почтаToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMail)); - if (service is FormMail form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + + } + + private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Backup created", "Message", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/LawFirm/LawFirm/LawFirmView.csproj b/LawFirm/LawFirm/LawFirmView.csproj index 18bef26..359aa61 100644 --- a/LawFirm/LawFirm/LawFirmView.csproj +++ b/LawFirm/LawFirm/LawFirmView.csproj @@ -29,9 +29,6 @@ Always - - Always - \ No newline at end of file diff --git a/LawFirm/LawFirm/Program.cs b/LawFirm/LawFirm/Program.cs index 530622f..b03a235 100644 --- a/LawFirm/LawFirm/Program.cs +++ b/LawFirm/LawFirm/Program.cs @@ -11,6 +11,8 @@ using NLog.Extensions.Logging; using System; using LawFirmBusinessLogic.MailWorker; using LawFirmContracts.BindingModels; +using LawFirmContracts.DI; +using DocumentFormat.OpenXml.Spreadsheet; namespace LawFirmView { @@ -27,13 +29,10 @@ namespace LawFirmView // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); try { - var mailSender = - _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = @@ -61,47 +60,44 @@ namespace LawFirmView logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); - } - private static void ConfigureServices(ServiceCollection services) - { - services.AddLogging(option => - { - option.SetMinimumLevel(LogLevel.Information); - option.AddNLog("nlog.config"); - }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + Application.Run(DependencyManager.Instance.Resolve()); + } + private static void InitDependency() + { + DependencyManager.InitDependency(); + + DependencyManager.Instance.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogic/BackUpLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogic/BackUpLogic.cs new file mode 100644 index 0000000..c4d4890 --- /dev/null +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogic/BackUpLogic.cs @@ -0,0 +1,100 @@ +using LawFirmContracts.BindingModels; +using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.StoragesContracts; +using LawFirmDataModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization.Json; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmBusinessLogic.BusinessLogic +{ + public class BackUpLogic : IBackUpLogic + { + private readonly ILogger _logger; + private readonly IBackUpInfo _backUpInfo; + public BackUpLogic(ILogger logger, IBackUpInfo backUpInfo) + { + _logger = logger; + _backUpInfo = backUpInfo; + } + public void CreateBackUp(BackUpSaveBinidngModel model) + { + if (_backUpInfo == null) + { + return; + } + try + { + _logger.LogDebug("Clear folder"); + // зачистка папки и удаление старого архива + var dirInfo = new DirectoryInfo(model.FolderName); + if (dirInfo.Exists) + { + foreach (var file in dirInfo.GetFiles()) + { + file.Delete(); + } + } + _logger.LogDebug("Delete archive"); + string fileName = $"{model.FolderName}.zip"; + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + // берем метод для сохранения + _logger.LogDebug("Get assembly"); + var typeIId = typeof(IId); + var assembly = typeIId.Assembly; + if (assembly == null) + { + throw new ArgumentNullException("Сборка не найдена", nameof(assembly)); + } + var types = assembly.GetTypes(); + var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance); + _logger.LogDebug("Find {count} types", types.Length); + foreach (var type in types) + { + if (type.IsInterface && type.GetInterface(typeIId.Name) != null) + { + var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); + if (modelType == null) + { + throw new InvalidOperationException($"Не найденкласс - модель для {type.Name}"); + } + _logger.LogDebug("Call SaveToFile method for {name} type", type.Name); + // вызываем метод на выполнение + method?.MakeGenericMethod(modelType).Invoke(this, new + object[] { model.FolderName }); + } + } + _logger.LogDebug("Create zip and remove folder"); + // архивируем + ZipFile.CreateFromDirectory(model.FolderName, fileName); + // удаляем папку + dirInfo.Delete(true); + } + catch (Exception) + { + throw; + } + } + private void SaveToFile(string folderName) where T : class, new() + { + var records = _backUpInfo.GetList(); + if (records == null) + { + _logger.LogWarning("{type} type get null list", typeof(T).Name); + return; + } + var jsonFormatter = new DataContractJsonSerializer(typeof(List)); + using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate); + jsonFormatter.WriteObject(fs, records); + } + } +} diff --git a/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj b/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj index b11fc2c..b07e2d2 100644 --- a/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj +++ b/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj @@ -6,10 +6,6 @@ enable - - - - @@ -19,16 +15,4 @@ - - - - - - <_ContentIncludedByDefault Remove="Views\Home\Mails.cshtml" /> - - - - - - diff --git a/LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs b/LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..d48edb3 --- /dev/null +++ b/LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false) + { + Title = title; + Visible = visible; + Width = width; + GridViewAutoSize = gridViewAutoSize; + IsUseAutoSize = isUseAutoSize; + } + public string Title { get; private set; } + public bool Visible { get; private set; } + public int Width { get; private set; } + public GridViewAutoSize GridViewAutoSize { get; private set; } + public bool IsUseAutoSize { get; private set; } + } +} diff --git a/LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs b/LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..5d42c6b --- /dev/null +++ b/LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/LawFirm/LawFirmContracts/BindingModels/BackUpSaveBinidngModel.cs b/LawFirm/LawFirmContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..d0e193b --- /dev/null +++ b/LawFirm/LawFirmContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs b/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs index e0cb256..b4b7913 100644 --- a/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs +++ b/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs @@ -20,5 +20,6 @@ namespace LawFirmContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs b/LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..0b1925e --- /dev/null +++ b/LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using LawFirmContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/LawFirm/LawFirmContracts/DI/DependencyManager.cs b/LawFirm/LawFirmContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..7f92540 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/DependencyManager.cs @@ -0,0 +1,65 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + + private static DependencyManager? _manager; + + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new UnityDependencyContainer(); + } + + public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } } + + /// + /// Иницализация библиотек, в которых идут установки зависомстей + /// + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + // регистрируем зависимости + ext.RegisterServices(); + } + + /// + /// Регистрация логгера + /// + /// + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + + /// + /// Добавление зависимости + /// + /// + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + public T Resolve() => _dependencyManager.Resolve(); + } +} diff --git a/LawFirm/LawFirmContracts/DI/IDependencyContainer.cs b/LawFirm/LawFirmContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..02694fa --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/IDependencyContainer.cs @@ -0,0 +1,40 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.DI +{ + public interface IDependencyContainer + { + /// + /// Регистрация логгера + /// + /// + void AddLogging(Action configure); + + /// + /// Добавление зависимости + /// + /// + /// + /// + void RegisterType(bool isSingle) where U : class, T where T : class; + + /// + /// Добавление зависимости + /// + /// + /// + void RegisterType(bool isSingle) where T : class; + + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + T Resolve(); + } +} diff --git a/LawFirm/LawFirmContracts/DI/IImplementationExtension.cs b/LawFirm/LawFirmContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..375a47b --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/IImplementationExtension.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs b/LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..8b5cf13 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,62 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.DI +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + return _serviceProvider.GetService()!; + } + } +} diff --git a/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs b/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..fc89681 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Reflection; + +namespace LawFirmContracts.DI +{ + public class ServiceProviderLoader + { + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs b/LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..3e50f3f --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Unity; +using Unity.Microsoft.Logging; + +namespace LawFirmContracts.DI +{ + public class UnityDependencyContainer : IDependencyContainer + { + private readonly IUnityContainer _container; + + public UnityDependencyContainer() + { + _container = new UnityContainer(); + } + + public void AddLogging(Action configure) + { + var factory = LoggerFactory.Create(configure); + _container.AddExtension(new LoggingExtension(factory)); + } + + public void RegisterType(bool isSingle) where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + + } + + public T Resolve() + { + return _container.Resolve(); + } + + void IDependencyContainer.RegisterType(bool isSingle) + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + } +} diff --git a/LawFirm/LawFirmContracts/LawFirmContracts.csproj b/LawFirm/LawFirmContracts/LawFirmContracts.csproj index 0157c0d..2e22bd4 100644 --- a/LawFirm/LawFirmContracts/LawFirmContracts.csproj +++ b/LawFirm/LawFirmContracts/LawFirmContracts.csproj @@ -6,6 +6,12 @@ enable + + + + + + diff --git a/LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs b/LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..a027e7f --- /dev/null +++ b/LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs index 26b88ce..5577361 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,13 @@ namespace LawFirmContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "ФИО клиента", width: 150)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Логин (Эл.почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Email { get; set; } = string.Empty; + [Column(title: "Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs index ea638b0..3bedf3a 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,10 +11,11 @@ namespace LawFirmContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Cost { get; set; } } } diff --git a/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs index b1c6e52..72bcc35 100644 --- a/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs @@ -1,4 +1,5 @@ using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,14 @@ namespace LawFirmContracts.ViewModels { public class DocumentViewModel : IDocumentModel { - public int Id { get; set; } - [DisplayName("Название пакета документов")] - public string DocumentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary DocumentComponents + [Column(visible: false)] + public int Id { get; set; } + [Column("Название пакета документов", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string DocumentName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary DocumentComponents { get; set; diff --git a/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs index 0be3522..2a22628 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace LawFirmContracts.ViewModels { public class ImplementerViewModel :IImplementerModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } - [DisplayName("ФИО")] - public string ImplementerFIO { get; set; } = string.Empty; + [Column("ФИО", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column("Пароль", width: 110)] + public string Password { get; set; } = string.Empty; - [DisplayName("Трудовой стаж")] - public int WorkExperience { get; set; } + [Column("Трудовой стаж", width: 110)] + public int WorkExperience { get; set; } - [DisplayName("Квалификация")] - public int Qualification { get; set; } + [Column("Квалификация", width: 110)] + public int Qualification { get; set; } } } diff --git a/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs index c5283b5..c1db671 100644 --- a/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,16 +11,19 @@ namespace LawFirmContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; - + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Отправитель")] + [Column("Отправитель", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] + [Column("Дата письма", width: 100)] public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] + [Column("Заголовок", width: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + [Column("Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs index ba6e876..d67a161 100644 --- a/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using LawFirmDataModels.Enums; +using LawFirmContracts.Attributes; +using LawFirmDataModels.Enums; using LawFirmDataModels.Models; using System; using System.Collections.Generic; @@ -11,28 +12,31 @@ namespace LawFirmContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int DocumentId { get; set; } - [DisplayName("Пакет документов")] - public string DocumentName { get; set; } = string.Empty; - public int ClientId { get; set; } + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int DocumentId { get; set; } + [Column("Пакет документов", width: 110)] + public string DocumentName { get; set; } = string.Empty; + [Column(visible: false)] + public int ClientId { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - public int? ImplementerId { get; set; } - [DisplayName("ФИО исполнителя")] - public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Количество")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] + public int? ImplementerId { get; set; } + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + public int Count { get; set; } + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column("Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } } } diff --git a/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs b/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs index 91ba52c..213f92a 100644 --- a/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs +++ b/LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace LawFirmDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs b/LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..755a8e4 --- /dev/null +++ b/LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,27 @@ +using LawFirmContracts.DI; +using LawFirmContracts.StoragesContracts; +using LawFirmDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmDatabaseImplement +{ + public class DatabaseImplementationExtension : IImplementationExtension + { + public int Priority => 2; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs b/LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..b0f0d1c --- /dev/null +++ b/LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using LawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new LawFirmDatabase(); + return context.Set().ToList(); + } + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && + type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj b/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj index da591e9..a14cd85 100644 --- a/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj +++ b/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj @@ -22,4 +22,8 @@ + + + + diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20240616174259_InitialCreate.Designer.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20240617132711_InitialCreate.Designer.cs similarity index 99% rename from LawFirm/LawFirmDatabaseImplement/Migrations/20240616174259_InitialCreate.Designer.cs rename to LawFirm/LawFirmDatabaseImplement/Migrations/20240617132711_InitialCreate.Designer.cs index 7c59b32..fecfee3 100644 --- a/LawFirm/LawFirmDatabaseImplement/Migrations/20240616174259_InitialCreate.Designer.cs +++ b/LawFirm/LawFirmDatabaseImplement/Migrations/20240617132711_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace LawFirmDatabaseImplement.Migrations { [DbContext(typeof(LawFirmDatabase))] - [Migration("20240616174259_InitialCreate")] + [Migration("20240617132711_InitialCreate")] partial class InitialCreate { /// diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20240616174259_InitialCreate.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20240617132711_InitialCreate.cs similarity index 100% rename from LawFirm/LawFirmDatabaseImplement/Migrations/20240616174259_InitialCreate.cs rename to LawFirm/LawFirmDatabaseImplement/Migrations/20240617132711_InitialCreate.cs diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Client.cs b/LawFirm/LawFirmDatabaseImplement/Models/Client.cs index e6f2a28..8a8ae88 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Client.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Client.cs @@ -8,21 +8,27 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace LawFirmDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; [Required] - public string Email { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; [Required] - public string Password { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Component.cs b/LawFirm/LawFirmDatabaseImplement/Models/Component.cs index 7c4cd49..b50a4cd 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Component.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Component.cs @@ -9,16 +9,21 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace LawFirmDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public string ComponentName { get; private set; } = string.Empty; [Required] - public double Cost { get; set; } + [DataMember] + public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List DocumentComponents { get; set; } = new(); public static Component? Create(ComponentBindingModel model) diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Document.cs b/LawFirm/LawFirmDatabaseImplement/Models/Document.cs index 009bb29..2e0982d 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Document.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Document.cs @@ -8,20 +8,26 @@ using System.Text; using System.Threading.Tasks; using LawFirmContracts.BindingModels; using LawFirmContracts.ViewModels; +using System.Runtime.Serialization; namespace LawFirmDatabaseImplement.Models { - public class Document : IDocumentModel + [DataContract] + public class Document : IDocumentModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } [Required] - public string DocumentName { get; set; } = string.Empty; + [DataMember] + public string DocumentName { get; set; } = string.Empty; [Required] - public double Price { get; set; } + [DataMember] + public double Price { get; set; } private Dictionary? _documentComponents = null; [NotMapped] - public Dictionary DocumentComponents + [DataMember] + public Dictionary DocumentComponents { get { diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs b/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs index 7ba252c..7046418 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs @@ -6,22 +6,25 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace LawFirmDatabaseImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; + [DataMember] + public int WorkExperience { get; private set; } + [DataMember] + public int Qualification { get; private set; } [ForeignKey("ImplementerId")] public virtual List Orders { get; private set; } = new(); diff --git a/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs b/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs index 290f82b..4d02ae6 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs @@ -5,23 +5,31 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace LawFirmDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } [Required] + [DataMember] public string SenderName { get; private set; } = string.Empty; [Required] + [DataMember] public DateTime DateDelivery { get; private set; } [Required] + [DataMember] public string Subject { get; private set; } = string.Empty; [Required] + [DataMember] public string Body { get; private set; } = string.Empty; public virtual Client? Client { get; private set; } public static MessageInfo? Create(MessageInfoBindingModel model) @@ -50,5 +58,6 @@ namespace LawFirmDatabaseImplement.Models DateDelivery = DateDelivery, Subject = Subject, }; + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs index b80c4ac..344ee34 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs @@ -6,29 +6,39 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace LawFirmDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public int DocumentId { get; private set; } + [DataMember] + public int DocumentId { get; private set; } [Required] - public int ClientId { get; private set; } - public int? ImplementerId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] + public int? ImplementerId { get; private set; } [Required] - public int Count { get; private set; } + [DataMember] + public int Count { get; private set; } [Required] - public double Sum { get; private set; } + [DataMember] + public double Sum { get; private set; } [Required] - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; - - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public virtual Document Document { get; set; } public virtual Client Client { get; set; } public Implementer? Implementer { get; private set; } diff --git a/LawFirm/LawFirmFileImplement/FileImplementationExtension.cs b/LawFirm/LawFirmFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..86ae558 --- /dev/null +++ b/LawFirm/LawFirmFileImplement/FileImplementationExtension.cs @@ -0,0 +1,27 @@ +using LawFirmContracts.DI; +using LawFirmContracts.StoragesContracts; +using LawFirmFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmFileImplement +{ + public class FileImplementationExtension : IImplementationExtension + { + public int Priority => 1; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs b/LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..14f161a --- /dev/null +++ b/LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,33 @@ +using LawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + var source = DataFileSingleton.GetInstance(); + return (List?)source.GetType().GetProperties() + .FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T)) + ?.GetValue(source); + } + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs index bca9e9a..b6e61ea 100644 --- a/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs +++ b/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs @@ -26,7 +26,9 @@ namespace LawFirmFileImplement.Implements { return null; } - return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + if (model.ImplementerId.HasValue && model.Status != null) + return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Status.Equals(x.Status))?.GetViewModel; + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; } public List GetFilteredList(OrderSearchModel model) @@ -35,25 +37,14 @@ namespace LawFirmFileImplement.Implements { return new(); } - if (model.ClientId.HasValue) - { - return source.Orders - .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); - } - if (model.Status != null) - { - return source.Orders - .Where(x => model.Status.Equals(x.Status)) - .Select(x => x.GetViewModel) - .ToList(); - } - return source.Orders - .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) - .Select(x => x.GetViewModel) - .ToList(); - } + return source.Orders + .Where(x => x.Id == model.Id || + model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo || + x.ClientId == model.ClientId || + model.Status.Equals(x.Status)) + .Select(x => GetViewModel(x)) + .ToList(); + } public List GetFullList() { @@ -104,7 +95,12 @@ namespace LawFirmFileImplement.Implements { viewModel.DocumentName = document.DocumentName; } - return viewModel; + var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId); + if (client != null) + { + viewModel.ClientFIO = client.ClientFIO; + } + return viewModel; } } } diff --git a/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj b/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj index b1507a2..36d33ca 100644 --- a/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj +++ b/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/LawFirm/LawFirmFileImplement/Models/Client.cs b/LawFirm/LawFirmFileImplement/Models/Client.cs index 9019f87..142e85c 100644 --- a/LawFirm/LawFirmFileImplement/Models/Client.cs +++ b/LawFirm/LawFirmFileImplement/Models/Client.cs @@ -4,21 +4,24 @@ using LawFirmDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - - public string ClientFIO { get; private set; } = string.Empty; - - public string Email { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel model) { diff --git a/LawFirm/LawFirmFileImplement/Models/Component.cs b/LawFirm/LawFirmFileImplement/Models/Component.cs index a6786bf..594fd83 100644 --- a/LawFirm/LawFirmFileImplement/Models/Component.cs +++ b/LawFirm/LawFirmFileImplement/Models/Component.cs @@ -4,17 +4,22 @@ using LawFirmDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { if (model == null) diff --git a/LawFirm/LawFirmFileImplement/Models/Document.cs b/LawFirm/LawFirmFileImplement/Models/Document.cs index 2adad54..c9c9298 100644 --- a/LawFirm/LawFirmFileImplement/Models/Document.cs +++ b/LawFirm/LawFirmFileImplement/Models/Document.cs @@ -7,17 +7,23 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace LawFirmFileImplement.Models { - public class Document : IDocumentModel + [DataContract] + public class Document : IDocumentModel { - public int Id { get; private set; } - public string DocumentName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string DocumentName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _documentComponents = null; - public Dictionary DocumentComponents + [DataMember] + public Dictionary DocumentComponents { get { diff --git a/LawFirm/LawFirmFileImplement/Models/Implementer.cs b/LawFirm/LawFirmFileImplement/Models/Implementer.cs index 8d389d8..5a44da1 100644 --- a/LawFirm/LawFirmFileImplement/Models/Implementer.cs +++ b/LawFirm/LawFirmFileImplement/Models/Implementer.cs @@ -4,23 +4,26 @@ using LawFirmDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; + [DataMember] + public int WorkExperience { get; private set; } + [DataMember] + public int Qualification { get; private set; } public static Implementer? Create(XElement element) { diff --git a/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs b/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs index ba985b6..03933a0 100644 --- a/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs +++ b/LawFirm/LawFirmFileImplement/Models/MessageInfo.cs @@ -4,24 +4,27 @@ using LawFirmDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace LawFirmFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [DataMember] public string MessageId { get; set; } = string.Empty; - + [DataMember] public int? ClientId { get; set; } - + [DataMember] public string SenderName { get; set; } = string.Empty; - + [DataMember] public DateTime DateDelivery { get; set; } - + [DataMember] public string Subject { get; set; } = string.Empty; - + [DataMember] public string Body { get; set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel? model) @@ -76,5 +79,6 @@ namespace LawFirmFileImplement.Models new XElement("Subject", Subject), new XElement("Body", Body), new XElement("SenderName", SenderName)); + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmFileImplement/Models/Order.cs b/LawFirm/LawFirmFileImplement/Models/Order.cs index 9e3b82b..e9095d3 100644 --- a/LawFirm/LawFirmFileImplement/Models/Order.cs +++ b/LawFirm/LawFirmFileImplement/Models/Order.cs @@ -5,29 +5,34 @@ using LawFirmDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int DocumentId { get; private set; } - public int ClientId { get; set; } - public int? ImplementerId { get; set; } - - public int Count { get; private set; } - - public double Sum { get; private set; } - - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - - public DateTime DateCreate { get; private set; } = DateTime.Now; - - public DateTime? DateImplement { get; private set; } - - public int Id { get; private set; } + [DataMember] + public int DocumentId { get; private set; } + [DataMember] + public int ClientId { get; set; } + [DataMember] + public int? ImplementerId { get; set; } + [DataMember] + public int Count { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } + [DataMember] + public int Id { get; private set; } public static Order? Create(OrderBindingModel? model) { diff --git a/LawFirm/LawFirmListImplement/Implements/BackUpInfo.cs b/LawFirm/LawFirmListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..ce88908 --- /dev/null +++ b/LawFirm/LawFirmListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,22 @@ +using LawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmListImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} diff --git a/LawFirm/LawFirmListImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmListImplement/Implements/OrderStorage.cs index 1097b37..fbacae4 100644 --- a/LawFirm/LawFirmListImplement/Implements/OrderStorage.cs +++ b/LawFirm/LawFirmListImplement/Implements/OrderStorage.cs @@ -85,7 +85,15 @@ namespace LawFirmListImplement.Implements { return order.GetViewModel; } - } + else if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && model.Status.Equals(order.Status)) + { + return GetViewModel(order); + } + else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId) + { + return order.GetViewModel; + } + } return null; } public OrderViewModel? Insert(OrderBindingModel model) diff --git a/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj b/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj index dee898a..5fe6ff2 100644 --- a/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj +++ b/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/LawFirm/LawFirmListImplement/ListImplementationExtension.cs b/LawFirm/LawFirmListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..fb91948 --- /dev/null +++ b/LawFirm/LawFirmListImplement/ListImplementationExtension.cs @@ -0,0 +1,27 @@ +using LawFirmContracts.DI; +using LawFirmContracts.StoragesContracts; +using LawFirmListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmListImplement +{ + public class ListImplementationExtension : IImplementationExtension + { + public int Priority => 0; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/LawFirm/LawFirmListImplement/Models/MessageInfo.cs b/LawFirm/LawFirmListImplement/Models/MessageInfo.cs index b158bbd..0876ec8 100644 --- a/LawFirm/LawFirmListImplement/Models/MessageInfo.cs +++ b/LawFirm/LawFirmListImplement/Models/MessageInfo.cs @@ -47,5 +47,6 @@ namespace LawFirmListImplement.Models Subject = Subject, Body = Body }; + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmListImplement/Models/Order.cs b/LawFirm/LawFirmListImplement/Models/Order.cs index 4ab3a5a..24e1b49 100644 --- a/LawFirm/LawFirmListImplement/Models/Order.cs +++ b/LawFirm/LawFirmListImplement/Models/Order.cs @@ -18,9 +18,9 @@ namespace LawFirmListImplement.Models public int? ImplementerId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } - public OrderStatus Status { get; private set; } - public DateTime DateCreate { get; private set; } - public DateTime? DateImplement { get; private set; } + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) { if (model == null) -- 2.25.1 From c3636af3ab234336cfb24d9da1a5a50b848031b7 Mon Sep 17 00:00:00 2001 From: aleksandr chegodaev Date: Mon, 17 Jun 2024 17:31:44 +0400 Subject: [PATCH 2/2] ok --- LawFirm/LawFirm/LawFirmView.csproj | 3 +++ LawFirm/LawFirmClientApp/LawFirmClientApp.csproj | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/LawFirm/LawFirm/LawFirmView.csproj b/LawFirm/LawFirm/LawFirmView.csproj index 359aa61..18bef26 100644 --- a/LawFirm/LawFirm/LawFirmView.csproj +++ b/LawFirm/LawFirm/LawFirmView.csproj @@ -29,6 +29,9 @@ Always + + Always + \ No newline at end of file diff --git a/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj b/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj index b07e2d2..b11fc2c 100644 --- a/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj +++ b/LawFirm/LawFirmClientApp/LawFirmClientApp.csproj @@ -6,6 +6,10 @@ enable + + + + @@ -15,4 +19,16 @@ + + + + + + <_ContentIncludedByDefault Remove="Views\Home\Mails.cshtml" /> + + + + + + -- 2.25.1