diff --git a/Pizzeria/Pizzeria/FormMain.Designer.cs b/Pizzeria/Pizzeria/FormMain.Designer.cs
index 8ff49c8..a933606 100644
--- a/Pizzeria/Pizzeria/FormMain.Designer.cs
+++ b/Pizzeria/Pizzeria/FormMain.Designer.cs
@@ -32,20 +32,26 @@
this.bookToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ingridientsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pizzasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.отчётыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.componentsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.componentPizzaToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.shopsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.operationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.transactionToolStripMenuItem = 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.пиццаСИнгридиентами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.заказыToolStripMenuItem1 = 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.buttonTakeOrderInWork = new System.Windows.Forms.Button();
this.buttonOrderReady = 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();
@@ -55,8 +61,7 @@
this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bookToolStripMenuItem,
- this.operationToolStripMenuItem});
- this.bookToolStripMenuItem,
+ this.operationToolStripMenuItem,
this.отчётыToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
@@ -108,40 +113,95 @@
// transactionToolStripMenuItem
//
this.transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
- this.transactionToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.transactionToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.transactionToolStripMenuItem.Text = "Поставка";
this.transactionToolStripMenuItem.Click += new System.EventHandler(this.transactionToolStripMenuItem_Click);
//
+ // продажаToolStripMenuItem
+ //
+ this.продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
+ this.продажаToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+ this.продажаToolStripMenuItem.Text = "Продажа";
+ this.продажаToolStripMenuItem.Click += new System.EventHandler(this.SellToolStripMenuItem_Click);
+ //
// отчётыToolStripMenuItem
//
this.отчётыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.componentsToolStripMenuItem1,
- this.componentPizzaToolStripMenuItem1,
- this.ordersToolStripMenuItem});
+ this.изделияToolStripMenuItem,
+ this.магазинToolStripMenuItem,
+ this.заказыToolStripMenuItem});
this.отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
this.отчётыToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
this.отчётыToolStripMenuItem.Text = "Отчёты";
//
- // componentsToolStripMenuItem1
+ // изделияToolStripMenuItem
//
- this.componentsToolStripMenuItem1.Name = "componentsToolStripMenuItem1";
- this.componentsToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
- this.componentsToolStripMenuItem1.Text = "Пиццы";
- this.componentsToolStripMenuItem1.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
+ this.изделияToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.списокИзделийToolStripMenuItem,
+ this.пиццаСИнгридиентамиToolStripMenuItem});
+ this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
+ this.изделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.изделияToolStripMenuItem.Text = "Пицца";
//
- // componentPizzaToolStripMenuItem1
+ // списокИзделийToolStripMenuItem
//
- this.componentPizzaToolStripMenuItem1.Name = "componentPizzaToolStripMenuItem1";
- this.componentPizzaToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
- this.componentPizzaToolStripMenuItem1.Text = "Пицца с компонентами";
- this.componentPizzaToolStripMenuItem1.Click += new System.EventHandler(this.ComponentPizzaToolStripMenuItem_Click);
+ this.списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem";
+ this.списокИзделийToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+ this.списокИзделийToolStripMenuItem.Text = "Список пицц";
+ this.списокИзделийToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
//
- // ordersToolStripMenuItem
+ // пиццаСИнгридиентамиToolStripMenuItem
//
- this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
- this.ordersToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
- this.ordersToolStripMenuItem.Text = "Заказы";
- this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+ this.пиццаСИнгридиентамиToolStripMenuItem.Name = "пиццаСИнгридиентамиToolStripMenuItem";
+ this.пиццаСИнгридиентамиToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+ this.пиццаСИнгридиентамиToolStripMenuItem.Text = "Пицца с ингридиентами";
+ this.пиццаСИнгридиентамиToolStripMenuItem.Click += new System.EventHandler(this.ComponentPizzaToolStripMenuItem_Click);
+ //
+ // магазинToolStripMenuItem
+ //
+ this.магазинToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.информацияToolStripMenuItem,
+ this.загруженностьToolStripMenuItem});
+ this.магазинToolStripMenuItem.Name = "магазинToolStripMenuItem";
+ this.магазинToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.магазинToolStripMenuItem.Text = "Магазин";
+ //
+ // информацияToolStripMenuItem
+ //
+ this.информацияToolStripMenuItem.Name = "информацияToolStripMenuItem";
+ this.информацияToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.информацияToolStripMenuItem.Text = "Информация";
+ this.информацияToolStripMenuItem.Click += new System.EventHandler(this.InfoToolStripMenuItem_Click);
+ //
+ // загруженностьToolStripMenuItem
+ //
+ this.загруженностьToolStripMenuItem.Name = "загруженностьToolStripMenuItem";
+ this.загруженностьToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.загруженностьToolStripMenuItem.Text = "Загруженность";
+ this.загруженностьToolStripMenuItem.Click += new System.EventHandler(this.BusyShopsToolStripMenuItem_Click);
+ //
+ // заказыToolStripMenuItem
+ //
+ this.заказыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.заказыToolStripMenuItem1,
+ this.заказыПоГруппамToolStripMenuItem});
+ this.заказыToolStripMenuItem.Name = "заказыToolStripMenuItem";
+ this.заказыToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.заказыToolStripMenuItem.Text = "Заказы";
+ //
+ // заказыToolStripMenuItem1
+ //
+ this.заказыToolStripMenuItem1.Name = "заказыToolStripMenuItem1";
+ this.заказыToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
+ this.заказыToolStripMenuItem1.Text = "Заказы";
+ this.заказыToolStripMenuItem1.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+ //
+ // заказыПоГруппамToolStripMenuItem
+ //
+ this.заказыПоГруппамToolStripMenuItem.Name = "заказыПоГруппамToolStripMenuItem";
+ this.заказыПоГруппамToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.заказыПоГруппамToolStripMenuItem.Text = "Заказы по группам";
+ this.заказыПоГруппамToolStripMenuItem.Click += new System.EventHandler(this.GroupOrdersToolStripMenuItem_Click);
//
// dataGridView
//
@@ -212,13 +272,6 @@
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(180, 22);
- this.продажаToolStripMenuItem.Text = "Продажа";
- this.продажаToolStripMenuItem.Click += new System.EventHandler(this.SellToolStripMenuItem_Click);
- //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -257,12 +310,18 @@
private Button buttonIssuedOrder;
private Button buttonRef;
private ToolStripMenuItem отчётыToolStripMenuItem;
- private ToolStripMenuItem componentsToolStripMenuItem1;
- private ToolStripMenuItem componentPizzaToolStripMenuItem1;
- private ToolStripMenuItem ordersToolStripMenuItem;
private ToolStripMenuItem shopsToolStripMenuItem;
private ToolStripMenuItem operationToolStripMenuItem;
private ToolStripMenuItem transactionToolStripMenuItem;
private ToolStripMenuItem продажаToolStripMenuItem;
+ private ToolStripMenuItem изделияToolStripMenuItem;
+ private ToolStripMenuItem списокИзделийToolStripMenuItem;
+ private ToolStripMenuItem пиццаСИнгридиентамиToolStripMenuItem;
+ private ToolStripMenuItem магазинToolStripMenuItem;
+ private ToolStripMenuItem информацияToolStripMenuItem;
+ private ToolStripMenuItem загруженностьToolStripMenuItem;
+ private ToolStripMenuItem заказыToolStripMenuItem;
+ private ToolStripMenuItem заказыToolStripMenuItem1;
+ private ToolStripMenuItem заказыПоГруппамToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/Pizzeria/Pizzeria/FormMain.cs b/Pizzeria/Pizzeria/FormMain.cs
index 0fbe6d5..789c2a2 100644
--- a/Pizzeria/Pizzeria/FormMain.cs
+++ b/Pizzeria/Pizzeria/FormMain.cs
@@ -202,6 +202,34 @@ namespace PizzeriaView
form.ShowDialog();
}
}
+
+ private void InfoToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+
+ private void BusyShopsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportShop));
+ if (service is FormReportShop form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
+ if (service is FormReportGroupedOrders form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
-}
+
diff --git a/Pizzeria/Pizzeria/FormReportGroupedOrders.Designer.cs b/Pizzeria/Pizzeria/FormReportGroupedOrders.Designer.cs
new file mode 100644
index 0000000..ab3b828
--- /dev/null
+++ b/Pizzeria/Pizzeria/FormReportGroupedOrders.Designer.cs
@@ -0,0 +1,131 @@
+namespace PizzeriaView
+{
+ partial class FormReportGroupedOrders
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.panel = new System.Windows.Forms.Panel();
+ this.buttonToPDF = new System.Windows.Forms.Button();
+ this.buttonMake = new System.Windows.Forms.Button();
+ this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
+ this.labelTo = new System.Windows.Forms.Label();
+ this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
+ this.labelFrom = new System.Windows.Forms.Label();
+ this.panel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panel
+ //
+ this.panel.Controls.Add(this.buttonToPDF);
+ this.panel.Controls.Add(this.buttonMake);
+ this.panel.Controls.Add(this.dateTimePickerTo);
+ this.panel.Controls.Add(this.labelTo);
+ this.panel.Controls.Add(this.dateTimePickerFrom);
+ this.panel.Controls.Add(this.labelFrom);
+ this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel.Location = new System.Drawing.Point(0, 0);
+ this.panel.Name = "panel";
+ this.panel.Size = new System.Drawing.Size(970, 52);
+ this.panel.TabIndex = 1;
+ //
+ // buttonToPDF
+ //
+ this.buttonToPDF.Location = new System.Drawing.Point(781, 9);
+ this.buttonToPDF.Name = "buttonToPDF";
+ this.buttonToPDF.Size = new System.Drawing.Size(165, 29);
+ this.buttonToPDF.TabIndex = 5;
+ this.buttonToPDF.Text = "В PDF";
+ this.buttonToPDF.UseVisualStyleBackColor = true;
+ this.buttonToPDF.Click += new System.EventHandler(this.buttonToPDF_Click);
+ //
+ // buttonMake
+ //
+ this.buttonMake.Location = new System.Drawing.Point(542, 10);
+ this.buttonMake.Name = "buttonMake";
+ this.buttonMake.Size = new System.Drawing.Size(165, 29);
+ this.buttonMake.TabIndex = 4;
+ this.buttonMake.Text = "Сформировать";
+ this.buttonMake.UseVisualStyleBackColor = true;
+ this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+ //
+ // dateTimePickerTo
+ //
+ this.dateTimePickerTo.Location = new System.Drawing.Point(300, 9);
+ this.dateTimePickerTo.Name = "dateTimePickerTo";
+ this.dateTimePickerTo.Size = new System.Drawing.Size(199, 27);
+ this.dateTimePickerTo.TabIndex = 3;
+ //
+ // labelTo
+ //
+ this.labelTo.AutoSize = true;
+ this.labelTo.Location = new System.Drawing.Point(254, 14);
+ this.labelTo.Name = "labelTo";
+ this.labelTo.Size = new System.Drawing.Size(27, 20);
+ this.labelTo.TabIndex = 2;
+ this.labelTo.Text = "по";
+ //
+ // dateTimePickerFrom
+ //
+ this.dateTimePickerFrom.Location = new System.Drawing.Point(36, 9);
+ this.dateTimePickerFrom.Name = "dateTimePickerFrom";
+ this.dateTimePickerFrom.Size = new System.Drawing.Size(199, 27);
+ this.dateTimePickerFrom.TabIndex = 1;
+ //
+ // labelFrom
+ //
+ this.labelFrom.AutoSize = true;
+ this.labelFrom.Location = new System.Drawing.Point(12, 14);
+ this.labelFrom.Name = "labelFrom";
+ this.labelFrom.Size = new System.Drawing.Size(18, 20);
+ this.labelFrom.TabIndex = 0;
+ this.labelFrom.Text = "C";
+ //
+ // FormReportGroupedOrders
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(970, 450);
+ this.Controls.Add(this.panel);
+ this.Name = "FormReportGroupedOrders";
+ this.Text = "Отчёт по группированным заказам ";
+ this.panel.ResumeLayout(false);
+ this.panel.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Panel panel;
+ private Button buttonToPDF;
+ private Button buttonMake;
+ private DateTimePicker dateTimePickerTo;
+ private Label labelTo;
+ private DateTimePicker dateTimePickerFrom;
+ private Label labelFrom;
+ }
+}
\ No newline at end of file
diff --git a/Pizzeria/Pizzeria/FormReportGroupedOrders.cs b/Pizzeria/Pizzeria/FormReportGroupedOrders.cs
new file mode 100644
index 0000000..5f5cc96
--- /dev/null
+++ b/Pizzeria/Pizzeria/FormReportGroupedOrders.cs
@@ -0,0 +1,97 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.BusinessLogicsContracts;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace PizzeriaView
+{
+ public partial class FormReportGroupedOrders : Form
+ {
+ private readonly ReportViewer reportViewer;
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+
+ public FormReportGroupedOrders(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ reportViewer = new ReportViewer
+ {
+ Dock = DockStyle.Fill
+ };
+ reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportGroupedOrders.rdlc", FileMode.Open));
+ Controls.Clear();
+ Controls.Add(reportViewer);
+ Controls.Add(panel);
+ }
+ private void ButtonMake_Click(object sender, EventArgs e)
+ {
+ if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+ {
+ MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ try
+ {
+ var dataSource = _logic.GetGroupedOrders(new ReportBindingModel
+ {
+ DateFrom = dateTimePickerFrom.Value,
+ DateTo = dateTimePickerTo.Value
+ });
+ var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
+ reportViewer.LocalReport.DataSources.Clear();
+ reportViewer.LocalReport.DataSources.Add(source);
+ var parameters = new[] { new ReportParameter("ReportParameterPeriod",
+ $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
+ reportViewer.LocalReport.SetParameters(parameters);
+
+ reportViewer.RefreshReport();
+ _logger.LogInformation("Загрузка списка группированных заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка группированных заказов на период");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void buttonToPDF_Click(object sender, EventArgs e)
+ {
+ if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+ {
+ MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ try
+ {
+ _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
+ {
+ FileName = dialog.FileName,
+ DateFrom = dateTimePickerFrom.Value,
+ DateTo = dateTimePickerTo.Value
+ });
+ _logger.LogInformation("Сохранение списка группированных заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка сохранения списка группированных заказов на период");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+}
diff --git a/Pizzeria/Pizzeria/FormReportGroupedOrders.resx b/Pizzeria/Pizzeria/FormReportGroupedOrders.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/Pizzeria/Pizzeria/FormReportGroupedOrders.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Pizzeria/Pizzeria/FormReportShop.Designer.cs b/Pizzeria/Pizzeria/FormReportShop.Designer.cs
new file mode 100644
index 0000000..a31aa59
--- /dev/null
+++ b/Pizzeria/Pizzeria/FormReportShop.Designer.cs
@@ -0,0 +1,116 @@
+namespace PizzeriaView
+{
+ partial class FormReportShop
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.buttonSaveToExcel = new System.Windows.Forms.Button();
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnReinforced = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // buttonSaveToExcel
+ //
+ this.buttonSaveToExcel.Location = new System.Drawing.Point(0, 6);
+ this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+ this.buttonSaveToExcel.Size = new System.Drawing.Size(223, 29);
+ this.buttonSaveToExcel.TabIndex = 3;
+ this.buttonSaveToExcel.Text = "Сохранить в Excel";
+ this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+ this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+ //
+ // dataGridView
+ //
+ this.dataGridView.AllowUserToAddRows = false;
+ this.dataGridView.AllowUserToDeleteRows = false;
+ this.dataGridView.AllowUserToOrderColumns = true;
+ this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ColumnShop,
+ this.ColumnReinforced,
+ this.ColumnCount});
+ this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.dataGridView.Location = new System.Drawing.Point(0, 47);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.ReadOnly = true;
+ this.dataGridView.RowHeadersWidth = 51;
+ this.dataGridView.RowTemplate.Height = 29;
+ this.dataGridView.Size = new System.Drawing.Size(598, 403);
+ this.dataGridView.TabIndex = 2;
+ //
+ // ColumnShop
+ //
+ this.ColumnShop.FillWeight = 130F;
+ this.ColumnShop.HeaderText = "Магазин";
+ this.ColumnShop.MinimumWidth = 6;
+ this.ColumnShop.Name = "ColumnShop";
+ this.ColumnShop.ReadOnly = true;
+ //
+ // ColumnReinforced
+ //
+ this.ColumnReinforced.FillWeight = 140F;
+ this.ColumnReinforced.HeaderText = "Изделие";
+ this.ColumnReinforced.MinimumWidth = 6;
+ this.ColumnReinforced.Name = "ColumnReinforced";
+ this.ColumnReinforced.ReadOnly = true;
+ //
+ // ColumnCount
+ //
+ this.ColumnCount.FillWeight = 90F;
+ this.ColumnCount.HeaderText = "Количество";
+ this.ColumnCount.MinimumWidth = 6;
+ this.ColumnCount.Name = "ColumnCount";
+ this.ColumnCount.ReadOnly = true;
+ //
+ // FormReportShopReinforcedes
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(598, 450);
+ this.Controls.Add(this.buttonSaveToExcel);
+ this.Controls.Add(this.dataGridView);
+ this.Name = "FormReportShopReinforcedes";
+ this.Text = "Наполненость магазинов";
+ this.Load += new System.EventHandler(this.FormReportShop_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Button buttonSaveToExcel;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn ColumnShop;
+ private DataGridViewTextBoxColumn ColumnReinforced;
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/Pizzeria/Pizzeria/FormReportShop.cs b/Pizzeria/Pizzeria/FormReportShop.cs
new file mode 100644
index 0000000..1287e6f
--- /dev/null
+++ b/Pizzeria/Pizzeria/FormReportShop.cs
@@ -0,0 +1,76 @@
+using Microsoft.Extensions.Logging;
+using PizzeriaContracts.BindingModels;
+using PizzeriaContracts.BusinessLogicsContracts;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace PizzeriaView
+{
+ public partial class FormReportShop : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+
+ public FormReportShop(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+ private void FormReportShop_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetShops();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
+ foreach (var listElem in elem.Pizzas)
+ {
+ dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+ }
+ dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+ dataGridView.Rows.Add(Array.Empty