diff --git a/FoodOrders/FoodOrders/FoodOrdersView.csproj b/FoodOrders/FoodOrders/FoodOrdersView.csproj
index 2f16657..1766eee 100644
--- a/FoodOrders/FoodOrders/FoodOrdersView.csproj
+++ b/FoodOrders/FoodOrders/FoodOrdersView.csproj
@@ -26,6 +26,7 @@
+
@@ -36,4 +37,13 @@
+
+
+ Always
+
+
+ Always
+
+
+
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormMain.Designer.cs b/FoodOrders/FoodOrders/FormMain.Designer.cs
index feb5d2d..bee8345 100644
--- a/FoodOrders/FoodOrders/FormMain.Designer.cs
+++ b/FoodOrders/FoodOrders/FormMain.Designer.cs
@@ -32,6 +32,14 @@
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.dishesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.componentDishesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.ordersToolStripMenuItem = 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.buttonUpdate = new System.Windows.Forms.Button();
this.buttonSetToFinish = new System.Windows.Forms.Button();
this.buttonSetToDone = new System.Windows.Forms.Button();
@@ -39,7 +47,6 @@
this.buttonCreateOrder = new System.Windows.Forms.Button();
this.dataGridView = new System.Windows.Forms.DataGridView();
this.button1 = new System.Windows.Forms.Button();
- this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
@@ -47,7 +54,8 @@
// menuStrip
//
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.справочникиToolStripMenuItem});
+ this.справочникиToolStripMenuItem,
+ this.отчётыToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(975, 24);
@@ -67,17 +75,79 @@
// БлюдаToolStripMenuItem
//
this.БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
- this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.БлюдаToolStripMenuItem.Text = "Блюда";
this.БлюдаToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
//
// наборблюдToolStripMenuItem
//
this.наборблюдToolStripMenuItem.Name = "наборблюдToolStripMenuItem";
- this.наборблюдToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.наборблюдToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.наборблюдToolStripMenuItem.Text = "Набор блюд";
this.наборблюдToolStripMenuItem.Click += new System.EventHandler(this.DishToolStripMenuItem_Click);
//
+ // магазиныToolStripMenuItem
+ //
+ this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+ this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.магазиныToolStripMenuItem.Text = "Магазины";
+ this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.ShopsToolStripMenuItem_Click);
+ //
+ // отчётыToolStripMenuItem
+ //
+ this.отчётыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dishesToolStripMenuItem,
+ this.componentDishesToolStripMenuItem,
+ this.ordersToolStripMenuItem,
+ this.списокМагазиновToolStripMenuItem,
+ this.магазинСБлюдамиToolStripMenuItem,
+ this.списокЗаказовСгрупированныхПоДатамToolStripMenuItem});
+ this.отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
+ this.отчётыToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
+ this.отчётыToolStripMenuItem.Text = "Отчёты";
+ //
+ // dishesToolStripMenuItem
+ //
+ this.dishesToolStripMenuItem.Name = "dishesToolStripMenuItem";
+ this.dishesToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+ this.dishesToolStripMenuItem.Text = "Список Блюд";
+ this.dishesToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
+ //
+ // componentDishesToolStripMenuItem
+ //
+ this.componentDishesToolStripMenuItem.Name = "componentDishesToolStripMenuItem";
+ this.componentDishesToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+ this.componentDishesToolStripMenuItem.Text = "Компоненты по блюдам";
+ this.componentDishesToolStripMenuItem.Click += new System.EventHandler(this.ComponentDishesToolStripMenuItem_Click);
+ //
+ // ordersToolStripMenuItem
+ //
+ this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+ this.ordersToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+ this.ordersToolStripMenuItem.Text = "Список заказов";
+ this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+ //
+ // списокМагазиновToolStripMenuItem
+ //
+ this.списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem";
+ this.списокМагазиновToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+ this.списокМагазиновToolStripMenuItem.Text = "Список магазинов";
+ this.списокМагазиновToolStripMenuItem.Click += new System.EventHandler(this.ShopsReportToolStripMenuItem_Click);
+ //
+ // магазинСБлюдамиToolStripMenuItem
+ //
+ this.магазинСБлюдамиToolStripMenuItem.Name = "магазинСБлюдамиToolStripMenuItem";
+ this.магазинСБлюдамиToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+ this.магазинСБлюдамиToolStripMenuItem.Text = "Магазин с блюдами";
+ this.магазинСБлюдамиToolStripMenuItem.Click += new System.EventHandler(this.ShopDishToolStripMenuItem_Click);
+ //
+ // списокЗаказовСгрупированныхПоДатамToolStripMenuItem
+ //
+ this.списокЗаказовСгрупированныхПоДатамToolStripMenuItem.Name = "списокЗаказовСгрупированныхПоДатамToolStripMenuItem";
+ this.списокЗаказовСгрупированныхПоДатамToolStripMenuItem.Size = new System.Drawing.Size(310, 22);
+ this.списокЗаказовСгрупированныхПоДатамToolStripMenuItem.Text = "Список заказов, сгрупированных по датам";
+ this.списокЗаказовСгрупированныхПоДатамToolStripMenuItem.Click += new System.EventHandler(this.OrdersGroupedByDateToolStripMenuItem_Click);
+ //
// buttonUpdate
//
this.buttonUpdate.Location = new System.Drawing.Point(780, 314);
@@ -156,13 +226,6 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.ButtonDeliveryDish_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.ShopsToolStripMenuItem_Click);
- //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -200,7 +263,14 @@
private Button buttonSetToWork;
private Button buttonCreateOrder;
private DataGridView dataGridView;
+ private ToolStripMenuItem отчётыToolStripMenuItem;
+ private ToolStripMenuItem dishesToolStripMenuItem;
+ private ToolStripMenuItem componentDishesToolStripMenuItem;
+ private ToolStripMenuItem ordersToolStripMenuItem;
private Button button1;
private ToolStripMenuItem магазиныToolStripMenuItem;
+ private ToolStripMenuItem списокМагазиновToolStripMenuItem;
+ private ToolStripMenuItem магазинСБлюдамиToolStripMenuItem;
+ private ToolStripMenuItem списокЗаказовСгрупированныхПоДатамToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormMain.cs b/FoodOrders/FoodOrders/FormMain.cs
index 67a9189..9037ebb 100644
--- a/FoodOrders/FoodOrders/FormMain.cs
+++ b/FoodOrders/FoodOrders/FormMain.cs
@@ -1,4 +1,5 @@
-using FoodOrdersContracts.BindingModels;
+using FoodOrdersBusinessLogic.BusinessLogics;
+using FoodOrdersContracts.BindingModels;
using FoodOrdersContracts.BusinessLogicsContracts;
using FoodOrdersDataModels.Enums;
using Microsoft.Extensions.Logging;
@@ -9,11 +10,14 @@ namespace FoodOrdersView
{
private readonly ILogger _logger;
private readonly IOrderLogic _logicO;
- public FormMain(ILogger logger, IOrderLogic orderLogic)
+
+ private readonly IReportLogic _logicR;
+ public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic)
{
InitializeComponent();
_logger = logger;
_logicO = orderLogic;
+ _logicR = reportLogic;
}
private void FormMain_Load(object sender, EventArgs e)
{
@@ -160,5 +164,61 @@ namespace FoodOrdersView
form.ShowDialog();
}
}
+
+ private void ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _logicR.SaveDishesToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+
+ private void ComponentDishesToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportDishComponents));
+ if (service is FormReportDishComponents form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+ if (service is FormReportOrders form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void ShopsReportToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _logicR.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+
+ private void ShopDishToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportShopListDish));
+ if (service is FormReportShopListDish form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void OrdersGroupedByDateToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportOrdersGroupedByDate));
+ if (service is FormReportOrdersGroupedByDate form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormReportDishComponents.cs b/FoodOrders/FoodOrders/FormReportDishComponents.cs
new file mode 100644
index 0000000..ce38181
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormReportDishComponents.cs
@@ -0,0 +1,70 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+
+namespace FoodOrdersView
+{
+ public partial class FormReportDishComponents : Form
+ {
+ private readonly ILogger _logger;
+
+ private readonly IReportLogic _logic;
+
+ public FormReportDishComponents(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormReportDishComponents_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetDishComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.DishName, "", "" });
+ foreach (var listElem in elem.Components)
+ {
+ dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+ }
+ dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+ dataGridView.Rows.Add(Array.Empty