diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs index 9cae36e..e64f5b1 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs @@ -144,7 +144,7 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password)); } - if (!Regex.IsMatch(model.Email, @"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", RegexOptions.IgnoreCase)) + if (!Regex.IsMatch(model.Email, @"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", RegexOptions.IgnoreCase)) { throw new ArgumentException("Некорректная почта", nameof(model.Email)); } diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/MailWorker/MailKitWorker.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/MailWorker/MailKitWorker.cs index c0f5dea..cb12907 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/MailWorker/MailKitWorker.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/MailWorker/MailKitWorker.cs @@ -1,15 +1,15 @@ using FurnitureAssemblyContracts.BindingModels; using FurnitureAssemblyContracts.BusinessLogicsContracts; +using MailKit.Net.Pop3; +using MailKit.Security; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; -using System.Net.Mail; using System.Net; +using System.Net.Mail; using System.Text; using System.Threading.Tasks; -using MailKit.Security; -using MailKit.Net.Pop3; namespace FurnitureAssemblyBusinessLogic.MailWorker { diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 7ea4319..3dc42a9 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -31,19 +31,19 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage uint rowIndex = 2; - foreach (var mwp in info.FurnitureWorkPieces) + foreach (var fwp in info.FurnitureWorkPieces) { InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "A", RowIndex = rowIndex, - Text = mwp.FurnitureName, + Text = fwp.FurnitureName, StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; - foreach (var (WorkPiece, Count) in mwp.WorkPieces) + foreach (var (WorkPiece, Count) in fwp.WorkPieces) { InsertCellInWorksheet(new ExcelCellParameters { @@ -76,7 +76,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage { ColumnName = "C", RowIndex = rowIndex, - Text = mwp.TotalCount.ToString(), + Text = fwp.TotalCount.ToString(), StyleInfo = ExcelStyleInfoType.Text }); diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs index 03820a4..9e469a1 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -9,10 +9,10 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels // Модель параграфов, которые есть в тексте public class WordParagraph { - //набор текстов в абзаце (для случая, если в абзаце текст разных стилей) + // Набор текстов в абзаце (для случая, если в абзаце текст разных стилей) public List<(string, WordTextProperties)> Texts { get; set; } = new(); - //свойства параграфа, если они есть + // Свойства параграфа, если они есть public WordTextProperties? TextProperties { get; set; } public List> RowTexts { get; set; } = new(); diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs index 2166c20..1e38296 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -310,7 +310,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.Implements else { // Все ячейки должны быть последовательно друг за другом расположены - // нужно определить, после какой вставлять + // Нужно определить, после какой вставлять Cell? refCell = null; foreach (Cell rowCell in row.Elements()) @@ -385,7 +385,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.Implements } _spreadsheetDocument.WorkbookPart!.Workbook.Save(); - _spreadsheetDocument.Close(); + _spreadsheetDocument.Dispose(); } } } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/MailSendInfoBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/MailSendInfoBindingModel.cs index e3e400b..11de646 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/MailSendInfoBindingModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/MailSendInfoBindingModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.BindingModels { - // Класс для обмена информацией по почте + // Класс для обмена информацией по почте. Сущность "Отправка на почту" public class MailSendInfoBindingModel { public string MailAddress { get; set; } = string.Empty; diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs index dfb7bf3..cd08fdf 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs @@ -12,12 +12,12 @@ namespace FurnitureAssemblyContracts.BindingModels { public int Id { get; set; } - public int FurnitureId { get; set; } - public int ClientId { get; set; } public int? ImplementerId { get; set; } + public int FurnitureId { get; set; } + public int Count { get; set; } public double Sum { get; set; } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs index cbb9af9..3afb378 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.BindingModels { + // Реализация сущности "Отчёт" public class ReportBindingModel { public string FileName { get; set; } = string.Empty; diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IClientLogic.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IClientLogic.cs index 02354ad..9e59045 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IClientLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IClientLogic.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.BusinessLogicsContracts { + // Бизнес-логика для клиентов public interface IClientLogic { List ReadList(ClientSearchModel? model); diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IImplementerLogic.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IImplementerLogic.cs index 98bb4d3..e1a6421 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IImplementerLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IImplementerLogic.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.BusinessLogicsContracts { + // Бизнес-логика для исполнителей public interface IImplementerLogic { List? ReadList(ImplementerSearchModel? model); diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs index 05c8df1..f21c518 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IMessageInfoLogic.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.BusinessLogicsContracts { + // Бизнес-логика для сообщений public interface IMessageInfoLogic { List? ReadList(MessageInfoSearchModel? model); diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs index 99ce6de..2fddaab 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs @@ -11,10 +11,10 @@ namespace FurnitureAssemblyContracts.SearchModels { public int? Id { get; set; } - public string? ClientFIO { get; set; } - public string? Email { get; set; } + public string? ClientFIO { get; set; } + public string? Password { get; set; } } } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/MessageInfoSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/MessageInfoSearchModel.cs index ee93061..515f578 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/MessageInfoSearchModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/MessageInfoSearchModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.SearchModels { - // Модель для поиска сообщений + // Модель для поиска сущности "Сообщение" public class MessageInfoSearchModel { public string? MessageId { get; set; } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs index 3ec423b..74973e7 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs @@ -16,13 +16,15 @@ namespace FurnitureAssemblyContracts.SearchModels // для поиска по клиенту public int? ClientId { get; set; } - // для поиска по исполнителю + // Для поиска по исполнителю public int? ImplementerId { get; set; } + // Два поля для возможности производить выборку public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } + // Для статуса заказа public OrderStatus? Status { get; set; } } } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ClientViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ClientViewModel.cs index e8e0270..68687de 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ClientViewModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ClientViewModel.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.ViewModels { + // Класс для отображения информации о клиентах public class ClientViewModel : IClientModel { public int Id { get; set; } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ImplementerViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ImplementerViewModel.cs index 8f65069..a5b9a9a 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ImplementerViewModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/ImplementerViewModel.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.ViewModels { + // Класс для отображения информации об исполнителях public class ImplementerViewModel : IImplementerModel { public int Id { get; set; } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/MessageInfoViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/MessageInfoViewModel.cs index 2b1780b..75a0adc 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/MessageInfoViewModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/MessageInfoViewModel.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.ViewModels { + // Класс для отображения пользователю информации о сообщениях public class MessageInfoViewModel : IMessageInfoModel { public string MessageId { get; set; } = string.Empty; diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs index fb4a9bf..637df08 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs @@ -15,11 +15,6 @@ namespace FurnitureAssemblyContracts.ViewModels [DisplayName("Номер")] public int Id { get; set; } - public int FurnitureId { get; set; } - - [DisplayName("Изделие")] - public string FurnitureName { get; set; } = string.Empty; - public int ClientId { get; set; } [DisplayName("ФИО клиента")] @@ -30,6 +25,11 @@ namespace FurnitureAssemblyContracts.ViewModels [DisplayName("ФИО исполнителя")] public string ImplementerFIO { get; set; } = string.Empty; + public int FurnitureId { get; set; } + + [DisplayName("Изделие")] + public string FurnitureName { get; set; } = string.Empty; + [DisplayName("Количество")] public int Count { get; set; } diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs index 7706635..b20edc0 100644 --- a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyDataModels.Models { - // Модель исполнителя + // Интерфейс, отвечающий за исполнителя public interface IImplementerModel : IId { string ImplementerFIO { get; } diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IMessageInfoModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IMessageInfoModel.cs index 70951fe..a202c64 100644 --- a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IMessageInfoModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IMessageInfoModel.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyDataModels.Models { + // Интерфейс, отвечающий за сообщения public interface IMessageInfoModel { string MessageId { get; } diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ClientStorage.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ClientStorage.cs index d77388e..346febc 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ClientStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/ClientStorage.cs @@ -16,7 +16,6 @@ namespace FurnitureAssemblyDatabaseImplement.Implements { public ClientViewModel? GetElement(ClientSearchModel model) { - using var context = new FurnitureAssemblyDatabase(); if (model.Id.HasValue) diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs index f9d5968..6c2e16c 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs @@ -101,13 +101,13 @@ namespace FurnitureAssemblyDatabaseImplement.Models var furniture = context.Furnitures.First(x => x.Id == Id); - foreach(var mwp in model.FurnitureWorkPieces) + foreach(var fwp in model.FurnitureWorkPieces) { context.FurnitureWorkPieces.Add(new FurnitureWorkPiece { Furniture = furniture, - WorkPiece = context.WorkPieces.First(x => x.Id == mwp.Key), - Count = mwp.Value.Item2 + WorkPiece = context.WorkPieces.First(x => x.Id == fwp.Key), + Count = fwp.Value.Item2 }); context.SaveChanges(); diff --git a/FurnitureAssembly/FurnitureAssemblyView/App.config b/FurnitureAssembly/FurnitureAssemblyView/App.config index 7d2cf39..c2e478c 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/App.config +++ b/FurnitureAssembly/FurnitureAssemblyView/App.config @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs index ba1eb37..831a6e9 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs @@ -25,14 +25,14 @@ namespace FurnitureAssemblyView { get { - if(_list == null) + if (_list == null) { return null; } - foreach(var elem in _list) + foreach (var elem in _list) { - if(elem.Id == Id) + if (elem.Id == Id) { return elem; } @@ -51,7 +51,7 @@ namespace FurnitureAssemblyView _list = logic.ReadList(null); - if(_list != null) + if (_list != null) { comboBoxWorkPiece.DisplayMember = "WorkPieceName"; comboBoxWorkPiece.ValueMember = "Id"; diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs index dcb756c..ec3abe8 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs @@ -31,7 +31,7 @@ buttonAdd = new Button(); buttonUpdate = new Button(); buttonDelete = new Button(); - buttonRef = new Button(); + buttonRefresh = new Button(); dataGridView = new DataGridView(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -66,15 +66,15 @@ buttonDelete.UseVisualStyleBackColor = true; buttonDelete.Click += ButtonDelete_Click; // - // buttonRef + // buttonRefresh // - buttonRef.Location = new Point(640, 245); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(116, 50); - buttonRef.TabIndex = 3; - buttonRef.Text = "Обновить"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; + buttonRefresh.Location = new Point(640, 245); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(116, 50); + buttonRefresh.TabIndex = 3; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; // // dataGridView // @@ -92,7 +92,7 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(781, 450); Controls.Add(dataGridView); - Controls.Add(buttonRef); + Controls.Add(buttonRefresh); Controls.Add(buttonDelete); Controls.Add(buttonUpdate); Controls.Add(buttonAdd); @@ -108,7 +108,7 @@ private Button buttonAdd; private Button buttonUpdate; private Button buttonDelete; - private Button buttonRef; + private Button buttonRefresh; private DataGridView dataGridView; } } \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs index 4bfd6b9..1e8b461 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs @@ -118,7 +118,7 @@ namespace FurnitureAssemblyView } } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { LoadData(); }