diff --git a/SushiBar/SushiBar/FormMain.Designer.cs b/SushiBar/SushiBar/FormMain.Designer.cs index 4fcac13..640f7fd 100644 --- a/SushiBar/SushiBar/FormMain.Designer.cs +++ b/SushiBar/SushiBar/FormMain.Designer.cs @@ -45,6 +45,9 @@ this.buttonReload = new System.Windows.Forms.Button(); this.buttonSell = new System.Windows.Forms.Button(); this.buttonSupply = new System.Windows.Forms.Button(); + this.storeListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.storeWorkloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.orderListWithGroupByToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -82,21 +85,21 @@ // componentsToolStripMenuItem // this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; - this.componentsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.componentsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.componentsToolStripMenuItem.Text = "Components"; this.componentsToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); // // sushiToolStripMenuItem // this.sushiToolStripMenuItem.Name = "sushiToolStripMenuItem"; - this.sushiToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.sushiToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.sushiToolStripMenuItem.Text = "Sushi"; this.sushiToolStripMenuItem.Click += new System.EventHandler(this.SushiToolStripMenuItem_Click); // // storesToolStripMenuItem // this.storesToolStripMenuItem.Name = "storesToolStripMenuItem"; - this.storesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.storesToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.storesToolStripMenuItem.Text = "Stores"; this.storesToolStripMenuItem.Click += new System.EventHandler(this.StoreToolStripMenuItem_Click); // @@ -105,7 +108,10 @@ this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.listComponentsToolStripMenuItem, this.componentsOnSushiToolStripMenuItem, - this.orderListToolStripMenuItem}); + this.orderListToolStripMenuItem, + this.storeListToolStripMenuItem, + this.storeWorkloadToolStripMenuItem, + this.orderListWithGroupByToolStripMenuItem}); this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem"; this.reportsToolStripMenuItem.Size = new System.Drawing.Size(59, 20); this.reportsToolStripMenuItem.Text = "Reports"; @@ -113,21 +119,21 @@ // listComponentsToolStripMenuItem // this.listComponentsToolStripMenuItem.Name = "listComponentsToolStripMenuItem"; - this.listComponentsToolStripMenuItem.Size = new System.Drawing.Size(190, 22); + this.listComponentsToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.listComponentsToolStripMenuItem.Text = "List components"; this.listComponentsToolStripMenuItem.Click += new System.EventHandler(this.ListComponentsToolStripMenuItem_Click); // // componentsOnSushiToolStripMenuItem // this.componentsOnSushiToolStripMenuItem.Name = "componentsOnSushiToolStripMenuItem"; - this.componentsOnSushiToolStripMenuItem.Size = new System.Drawing.Size(190, 22); + this.componentsOnSushiToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.componentsOnSushiToolStripMenuItem.Text = "Components on sushi"; this.componentsOnSushiToolStripMenuItem.Click += new System.EventHandler(this.ComponentsOnSushiToolStripMenuItem_Click); // // orderListToolStripMenuItem // this.orderListToolStripMenuItem.Name = "orderListToolStripMenuItem"; - this.orderListToolStripMenuItem.Size = new System.Drawing.Size(190, 22); + this.orderListToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.orderListToolStripMenuItem.Text = "Order list"; this.orderListToolStripMenuItem.Click += new System.EventHandler(this.ListOrdersToolStripMenuItem_Click); // @@ -201,6 +207,27 @@ this.buttonSupply.UseVisualStyleBackColor = true; this.buttonSupply.Click += new System.EventHandler(this.ButtonReplenishment_Click); // + // storeListToolStripMenuItem + // + this.storeListToolStripMenuItem.Name = "storeListToolStripMenuItem"; + this.storeListToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.storeListToolStripMenuItem.Text = "Store list"; + this.storeListToolStripMenuItem.Click += new System.EventHandler(this.StoreListToolStripMenuItem_Click); + // + // storeWorkloadToolStripMenuItem + // + this.storeWorkloadToolStripMenuItem.Name = "storeWorkloadToolStripMenuItem"; + this.storeWorkloadToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.storeWorkloadToolStripMenuItem.Text = "Store workload"; + this.storeWorkloadToolStripMenuItem.Click += new System.EventHandler(this.StoreWorkloadToolStripMenuItem_Click); + // + // orderListWithGroupByToolStripMenuItem + // + this.orderListWithGroupByToolStripMenuItem.Name = "orderListWithGroupByToolStripMenuItem"; + this.orderListWithGroupByToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.orderListWithGroupByToolStripMenuItem.Text = "Order list with group by"; + this.orderListWithGroupByToolStripMenuItem.Click += new System.EventHandler(this.OrderListWithGroupByToolStripMenuItem_Click); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -246,5 +273,8 @@ private ToolStripMenuItem orderListToolStripMenuItem; private Button buttonSell; private Button buttonSupply; + private ToolStripMenuItem storeListToolStripMenuItem; + private ToolStripMenuItem storeWorkloadToolStripMenuItem; + private ToolStripMenuItem orderListWithGroupByToolStripMenuItem; } } \ No newline at end of file diff --git a/SushiBar/SushiBar/FormMain.cs b/SushiBar/SushiBar/FormMain.cs index 17478cd..0e674e4 100644 --- a/SushiBar/SushiBar/FormMain.cs +++ b/SushiBar/SushiBar/FormMain.cs @@ -178,7 +178,7 @@ namespace SushiBar { using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; if (dialog.ShowDialog() != DialogResult.OK) return; - _reportLogic.SaveStoresToWordFile(new ReportBindingModel + _reportLogic.SaveSushiToWordFile(new ReportBindingModel { FileName = dialog.FileName }); @@ -234,5 +234,36 @@ namespace SushiBar form.ShowDialog(); } } + + private void StoreListToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() != DialogResult.OK) return; + _reportLogic.SaveStoresToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Complete", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void StoreWorkloadToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormStoreWorkload)); + + if (service is FormStoreWorkload form) + { + form.ShowDialog(); + } + } + + private void OrderListWithGroupByToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrdersGroupByDate)); + + if (service is FormReportOrdersGroupByDate form) + { + form.ShowDialog(); + } + } } } diff --git a/SushiBar/SushiBar/FormReportOrders.cs b/SushiBar/SushiBar/FormReportOrders.cs index af06e89..b84211b 100644 --- a/SushiBar/SushiBar/FormReportOrders.cs +++ b/SushiBar/SushiBar/FormReportOrders.cs @@ -60,7 +60,6 @@ namespace SushiBar _logger.LogError(ex, "Ошибка загрузки списка заказов на период"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } - } private void ButtonSave_Click(object sender, EventArgs e) @@ -94,7 +93,6 @@ namespace SushiBar MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - } } } diff --git a/SushiBar/SushiBar/FormSushiOnComponents.cs b/SushiBar/SushiBar/FormSushiOnComponents.cs index c00e8b3..fa23e7b 100644 --- a/SushiBar/SushiBar/FormSushiOnComponents.cs +++ b/SushiBar/SushiBar/FormSushiOnComponents.cs @@ -42,7 +42,6 @@ namespace SushiBar MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - } private void FormComponentsOnSushi_Load(object sender, EventArgs e) diff --git a/SushiBar/SushiBar/Program.cs b/SushiBar/SushiBar/Program.cs index 8d3dac5..a78777e 100644 --- a/SushiBar/SushiBar/Program.cs +++ b/SushiBar/SushiBar/Program.cs @@ -56,6 +56,8 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/SushiBar/SushiBar/Report.rdlc b/SushiBar/SushiBar/Report.rdlc deleted file mode 100644 index 5c19f05..0000000 --- a/SushiBar/SushiBar/Report.rdlc +++ /dev/null @@ -1,588 +0,0 @@ - - - 0 - - - - System.Data.DataSet - /* Local Connection */ - - bf577a27-98a7-43b2-8beb-1a37d37ce5cd - - - - - - SushiBarContractsViewModel - /* Local Query */ - - - - Count - System.Int32 - - - DateCreate - System.DateTime - - - IceCreamName - System.String - - - Status - System.String - - - Sum - System.Decimal - - - - SushiBarContracts.ViewModels - ReportOrderViewModel - SushiBarContracts.ViewModels.ReportOrderViewModel, IceCreamShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - - - - - - - true - true - - - - - Orders - - - - - - - Textbox1 - 0.99688cm - 21.51cm - - - 2pt - 2pt - 2pt - 2pt - - - - - - - 5.26521cm - - - 5.26521cm - - - 5.26521cm - - - 2.26188cm - - - 2.26188cm - - - - - 2.22236cm - - - - - true - true - - - - - Id - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Date Create - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Sushi Name - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Status - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Sum - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 2.22236cm - - - - - true - true - - - - - =Fields!Count.Value - - - 2pt - 2pt - 2pt - 2pt - - - true - - - - - - true - true - - - - - =Fields!DateCreate.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!SushiName.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Status.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Sum.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - - - After - - - - - - - DataSetOrders - 2.4609cm - 0.60854cm - 4.44472cm - 20.31939cm - 1 - - - - - - true - true - - - - - =Parameters!ReportParameterPeriod.Value - - - - - - - Textbox12 - 1.42557cm - 0.65292cm - 21.51cm - 2 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Total - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Sum(Fields!Sum.Value, "DataSetOrders") - - - 2pt - 2pt - 2pt - 2pt - - - - 3.22917in -