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/SearchModels/OrderSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs index 07f22cd..26fb864 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs @@ -12,6 +12,7 @@ namespace FurnitureAssemblyContracts.SearchModels // для поиска по идентификатору public int? Id { get; set; } + // Два поля для возможности производить выборку public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs index 52c9aa9..1832c6e 100644 --- a/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs @@ -31,8 +31,7 @@ namespace FurnitureAssemblyFileImplement.Implements if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) { return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) - .Select(x => GetViewModel(x)) - .ToList(); + .Select(x => GetViewModel(x)).ToList(); } return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList(); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs b/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs index 3f4d9b6..dcb09a7 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs @@ -35,7 +35,7 @@ namespace FurnitureAssemblyView Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("E:\\TP\\Hard\\Lab4\\FurnitureAssembly\\FurnitureAssemblyView\\ReportOrders.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs index c86e8d4..531cab9 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.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(); @@ -69,16 +69,16 @@ buttonDelete.UseVisualStyleBackColor = true; buttonDelete.Click += ButtonDelete_Click; // - // buttonRef + // buttonRefresh // - buttonRef.Location = new Point(561, 197); - buttonRef.Margin = new Padding(3, 2, 3, 2); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(100, 34); - buttonRef.TabIndex = 3; - buttonRef.Text = "Обновить"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; + buttonRefresh.Location = new Point(561, 197); + buttonRefresh.Margin = new Padding(3, 2, 3, 2); + buttonRefresh.Name = "buttonRef"; + buttonRefresh.Size = new Size(100, 34); + buttonRefresh.TabIndex = 3; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; // // dataGridView // @@ -97,7 +97,7 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(683, 338); Controls.Add(dataGridView); - Controls.Add(buttonRef); + Controls.Add(buttonRefresh); Controls.Add(buttonDelete); Controls.Add(buttonUpdate); Controls.Add(buttonAdd); @@ -114,7 +114,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/FormWorkPieces.cs b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs index 86bf4b4..6fedeeb 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs @@ -40,7 +40,7 @@ namespace FurnitureAssemblyView var list = _logic.ReadList(null); // Растягиваем колонку Название на всю ширину, колонку Id скрываем - if(list != null) + if (list != null) { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; @@ -49,7 +49,7 @@ namespace FurnitureAssemblyView _logger.LogInformation("Загрузка заготовок"); } - catch(Exception ex) + catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки заготовок"); @@ -120,7 +120,7 @@ namespace FurnitureAssemblyView } } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { LoadData(); } diff --git a/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj b/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj index ea7a307..42e1c03 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj +++ b/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj @@ -27,4 +27,10 @@ + + + Always + + + \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyView/Program.cs b/FurnitureAssembly/FurnitureAssemblyView/Program.cs index a69521f..814144c 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/Program.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/Program.cs @@ -31,6 +31,7 @@ namespace FurnitureAssemblyView _serviceProvider = services.BuildServiceProvider(); Application.Run(_serviceProvider.GetRequiredService()); } + private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option =>