diff --git a/Pizzeria/Pizzeria/FormMain.Designer.cs b/Pizzeria/Pizzeria/FormMain.Designer.cs index bbf91c6..d306428 100644 --- a/Pizzeria/Pizzeria/FormMain.Designer.cs +++ b/Pizzeria/Pizzeria/FormMain.Designer.cs @@ -48,10 +48,12 @@ // // menuStrip // + menuStrip.ImageScalingSize = new Size(20, 20); menuStrip.Items.AddRange(new ToolStripItem[] { справочкиниToolStripMenuItem, отчётыToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(999, 24); + menuStrip.Padding = new Padding(7, 3, 0, 3); + menuStrip.Size = new Size(1142, 30); menuStrip.TabIndex = 0; menuStrip.Text = "Справочники:"; // @@ -59,20 +61,20 @@ // справочкиниToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem }); справочкиниToolStripMenuItem.Name = "справочкиниToolStripMenuItem"; - справочкиниToolStripMenuItem.Size = new Size(97, 20); + справочкиниToolStripMenuItem.Size = new Size(120, 24); справочкиниToolStripMenuItem.Text = "Справочники:"; // // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(148, 22); + компонентыToolStripMenuItem.Size = new Size(186, 26); компонентыToolStripMenuItem.Text = "Ингредиенты"; компонентыToolStripMenuItem.Click += ИнгредиентыToolStripMenuItem_Click; // // изделияToolStripMenuItem // изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(148, 22); + изделияToolStripMenuItem.Size = new Size(186, 26); изделияToolStripMenuItem.Text = "Пиццы"; изделияToolStripMenuItem.Click += ПиццыToolStripMenuItem_Click; // @@ -80,28 +82,28 @@ // отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокИзделийToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; - отчётыToolStripMenuItem.Size = new Size(60, 20); + отчётыToolStripMenuItem.Size = new Size(73, 24); отчётыToolStripMenuItem.Text = "Отчёты"; // // списокИзделийToolStripMenuItem // списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem"; - списокИзделийToolStripMenuItem.Size = new Size(218, 22); + списокИзделийToolStripMenuItem.Size = new Size(276, 26); списокИзделийToolStripMenuItem.Text = "Список изделий"; списокИзделийToolStripMenuItem.Click += списокИзделийToolStripMenuItem_Click; // // компонентыПоИзделиямToolStripMenuItem // компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(218, 22); + компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; компонентыПоИзделиямToolStripMenuItem.Click += компонентыПоИзделиямToolStripMenuItem_Click; // // списокЗаказовToolStripMenuItem // списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(218, 22); - списокЗаказовToolStripMenuItem.Text = "«Список заказов"; + списокЗаказовToolStripMenuItem.Size = new Size(276, 26); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; // // dataGridView @@ -111,23 +113,24 @@ dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.BackgroundColor = SystemColors.ControlLightLight; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(0, 27); + dataGridView.Location = new Point(0, 36); + dataGridView.Margin = new Padding(3, 4, 3, 4); dataGridView.MultiSelect = false; dataGridView.Name = "dataGridView"; dataGridView.ReadOnly = true; dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 25; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(773, 362); + dataGridView.Size = new Size(883, 483); dataGridView.TabIndex = 0; // // ButtonIssuedOrder // ButtonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonIssuedOrder.Location = new Point(799, 185); - ButtonIssuedOrder.Margin = new Padding(3, 2, 3, 2); + ButtonIssuedOrder.Location = new Point(913, 247); ButtonIssuedOrder.Name = "ButtonIssuedOrder"; - ButtonIssuedOrder.Size = new Size(179, 32); + ButtonIssuedOrder.Size = new Size(205, 43); ButtonIssuedOrder.TabIndex = 8; ButtonIssuedOrder.Text = "Заказ выдан"; ButtonIssuedOrder.UseVisualStyleBackColor = true; @@ -136,10 +139,9 @@ // ButtonOrderReady // ButtonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonOrderReady.Location = new Point(799, 139); - ButtonOrderReady.Margin = new Padding(3, 2, 3, 2); + ButtonOrderReady.Location = new Point(913, 185); ButtonOrderReady.Name = "ButtonOrderReady"; - ButtonOrderReady.Size = new Size(179, 32); + ButtonOrderReady.Size = new Size(205, 43); ButtonOrderReady.TabIndex = 7; ButtonOrderReady.Text = "Заказ готов"; ButtonOrderReady.UseVisualStyleBackColor = true; @@ -148,10 +150,9 @@ // ButtonnTakeOrderInWork // ButtonnTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonnTakeOrderInWork.Location = new Point(799, 93); - ButtonnTakeOrderInWork.Margin = new Padding(3, 2, 3, 2); + ButtonnTakeOrderInWork.Location = new Point(913, 124); ButtonnTakeOrderInWork.Name = "ButtonnTakeOrderInWork"; - ButtonnTakeOrderInWork.Size = new Size(179, 32); + ButtonnTakeOrderInWork.Size = new Size(205, 43); ButtonnTakeOrderInWork.TabIndex = 6; ButtonnTakeOrderInWork.Text = "Отдать на выполнение"; ButtonnTakeOrderInWork.UseVisualStyleBackColor = true; @@ -160,10 +161,9 @@ // ButtonCreateOrder // ButtonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonCreateOrder.Location = new Point(799, 47); - ButtonCreateOrder.Margin = new Padding(3, 2, 3, 2); + ButtonCreateOrder.Location = new Point(913, 63); ButtonCreateOrder.Name = "ButtonCreateOrder"; - ButtonCreateOrder.Size = new Size(179, 32); + ButtonCreateOrder.Size = new Size(205, 43); ButtonCreateOrder.TabIndex = 5; ButtonCreateOrder.Text = "Создать заказ"; ButtonCreateOrder.UseVisualStyleBackColor = true; @@ -172,10 +172,9 @@ // buttonRef_Click // buttonRef_Click.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonRef_Click.Location = new Point(799, 231); - buttonRef_Click.Margin = new Padding(3, 2, 3, 2); + buttonRef_Click.Location = new Point(913, 308); buttonRef_Click.Name = "buttonRef_Click"; - buttonRef_Click.Size = new Size(179, 32); + buttonRef_Click.Size = new Size(205, 43); buttonRef_Click.TabIndex = 8; buttonRef_Click.Text = "Обновить список"; buttonRef_Click.UseVisualStyleBackColor = true; @@ -183,9 +182,9 @@ // // FormMain // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(999, 390); + ClientSize = new Size(1142, 520); Controls.Add(buttonRef_Click); Controls.Add(ButtonIssuedOrder); Controls.Add(ButtonOrderReady); @@ -194,6 +193,7 @@ Controls.Add(dataGridView); Controls.Add(menuStrip); MainMenuStrip = menuStrip; + Margin = new Padding(3, 4, 3, 4); Name = "FormMain"; Text = "Пиццерия"; Load += FormMain_Load; diff --git a/Pizzeria/Pizzeria/FormReportOrders.Designer.cs b/Pizzeria/Pizzeria/FormReportOrders.Designer.cs index 9cb034b..4a31c4f 100644 --- a/Pizzeria/Pizzeria/FormReportOrders.Designer.cs +++ b/Pizzeria/Pizzeria/FormReportOrders.Designer.cs @@ -31,7 +31,6 @@ panel = new Panel(); buttonPdf = new Button(); buttonCreateReport = new Button(); - buttonToPdf = new Button(); dateTimePickerTo = new DateTimePicker(); labelTo = new Label(); dateTimePickerFrom = new DateTimePicker(); @@ -43,25 +42,24 @@ // panel.Controls.Add(buttonPdf); panel.Controls.Add(buttonCreateReport); - panel.Controls.Add(buttonToPdf); panel.Controls.Add(dateTimePickerTo); panel.Controls.Add(labelTo); panel.Controls.Add(dateTimePickerFrom); panel.Controls.Add(labelFrom); panel.Dock = DockStyle.Top; panel.Location = new Point(0, 0); - panel.Margin = new Padding(4, 3, 4, 3); + panel.Margin = new Padding(5, 4, 5, 4); panel.Name = "panel"; - panel.Size = new Size(800, 40); + panel.Size = new Size(921, 53); panel.TabIndex = 1; // // buttonPdf // buttonPdf.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonPdf.Location = new Point(648, 6); - buttonPdf.Margin = new Padding(4, 3, 4, 3); + buttonPdf.Location = new Point(748, 8); + buttonPdf.Margin = new Padding(5, 4, 5, 4); buttonPdf.Name = "buttonPdf"; - buttonPdf.Size = new Size(139, 27); + buttonPdf.Size = new Size(159, 36); buttonPdf.TabIndex = 7; buttonPdf.Text = "В Pdf"; buttonPdf.UseVisualStyleBackColor = true; @@ -69,68 +67,58 @@ // // buttonCreateReport // - buttonCreateReport.Location = new Point(501, 6); - buttonCreateReport.Margin = new Padding(4, 3, 4, 3); + buttonCreateReport.Location = new Point(573, 8); + buttonCreateReport.Margin = new Padding(5, 4, 5, 4); buttonCreateReport.Name = "buttonCreateReport"; - buttonCreateReport.Size = new Size(139, 27); + buttonCreateReport.Size = new Size(159, 36); buttonCreateReport.TabIndex = 6; buttonCreateReport.Text = "Сформировать"; buttonCreateReport.UseVisualStyleBackColor = true; buttonCreateReport.Click += ButtonCreateReport_Click; // - // buttonToPdf - // - buttonToPdf.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonToPdf.Location = new Point(1248, 8); - buttonToPdf.Margin = new Padding(4, 3, 4, 3); - buttonToPdf.Name = "buttonToPdf"; - buttonToPdf.Size = new Size(139, 27); - buttonToPdf.TabIndex = 5; - buttonToPdf.Text = "В Pdf"; - buttonToPdf.UseVisualStyleBackColor = true; - // // dateTimePickerTo // - dateTimePickerTo.Location = new Point(237, 10); - dateTimePickerTo.Margin = new Padding(4, 3, 4, 3); + dateTimePickerTo.Location = new Point(271, 13); + dateTimePickerTo.Margin = new Padding(5, 4, 5, 4); dateTimePickerTo.Name = "dateTimePickerTo"; - dateTimePickerTo.Size = new Size(163, 23); + dateTimePickerTo.Size = new Size(186, 27); dateTimePickerTo.TabIndex = 3; // // labelTo // labelTo.AutoSize = true; - labelTo.Location = new Point(208, 13); - labelTo.Margin = new Padding(4, 0, 4, 0); + labelTo.Location = new Point(238, 17); + labelTo.Margin = new Padding(5, 0, 5, 0); labelTo.Name = "labelTo"; - labelTo.Size = new Size(21, 15); + labelTo.Size = new Size(27, 20); labelTo.TabIndex = 2; labelTo.Text = "по"; // // dateTimePickerFrom // - dateTimePickerFrom.Location = new Point(37, 10); - dateTimePickerFrom.Margin = new Padding(4, 3, 4, 3); + dateTimePickerFrom.Location = new Point(42, 13); + dateTimePickerFrom.Margin = new Padding(5, 4, 5, 4); dateTimePickerFrom.Name = "dateTimePickerFrom"; - dateTimePickerFrom.Size = new Size(163, 23); + dateTimePickerFrom.Size = new Size(186, 27); dateTimePickerFrom.TabIndex = 1; // // labelFrom // labelFrom.AutoSize = true; - labelFrom.Location = new Point(14, 13); - labelFrom.Margin = new Padding(4, 0, 4, 0); + labelFrom.Location = new Point(16, 17); + labelFrom.Margin = new Padding(5, 0, 5, 0); labelFrom.Name = "labelFrom"; - labelFrom.Size = new Size(15, 15); + labelFrom.Size = new Size(18, 20); labelFrom.TabIndex = 0; labelFrom.Text = "С"; // // FormReportOrders // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(921, 600); Controls.Add(panel); + Margin = new Padding(3, 4, 3, 4); Name = "FormReportOrders"; Text = "Заказы"; panel.ResumeLayout(false); @@ -143,7 +131,6 @@ private Panel panel; private Button buttonPdf; private Button buttonCreateReport; - private Button buttonToPdf; private DateTimePicker dateTimePickerTo; private Label labelTo; private DateTimePicker dateTimePickerFrom; diff --git a/Pizzeria/Pizzeria/FormReportOrders.cs b/Pizzeria/Pizzeria/FormReportOrders.cs index 6f00812..9f90e70 100644 --- a/Pizzeria/Pizzeria/FormReportOrders.cs +++ b/Pizzeria/Pizzeria/FormReportOrders.cs @@ -2,15 +2,6 @@ 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 Pizzeria { diff --git a/Pizzeria/Pizzeria/Pizzeria.csproj b/Pizzeria/Pizzeria/Pizzeria.csproj index 18dd871..10b3744 100644 --- a/Pizzeria/Pizzeria/Pizzeria.csproj +++ b/Pizzeria/Pizzeria/Pizzeria.csproj @@ -42,4 +42,10 @@ + + + Always + + + \ No newline at end of file diff --git a/Pizzeria/Pizzeria/ReportOrders.rdlc b/Pizzeria/Pizzeria/ReportOrders.rdlc new file mode 100644 index 0000000..7170bf1 --- /dev/null +++ b/Pizzeria/Pizzeria/ReportOrders.rdlc @@ -0,0 +1,598 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 47cb53f0-7dde-4717-ba03-866a0bc4f4dd + + + + + + PizzeriaContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + PizzaName + System.String + + + Sum + System.Decimal + + + OrderStatus + PizzeriaDataModels.OrderStatus + + + + PizzeriaContracts.ViewModels + ReportOrderViewModel + PizzeriaContracts.ViewModels.ReportOrderViewModel, PizzeriaContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + + + + ReportParameterPeriod + 1cm + 1cm + 21cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Заказы + + + + + + + 1cm + 21cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.5cm + + + 3.21438cm + + + 8.23317cm + + + 2.5cm + + + 2.5cm + + + + + 0.6cm + + + + + true + true + + + + + Номер + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Дата создания + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Изделие + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Статус Заказа + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!PizzaName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!OrderStatus.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.48391cm + 0.55245cm + 1.2cm + 18.94755cm + 2 + + + + + + true + true + + + + + Итого: + + + + + + + 4cm + 12cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + + + + + 4cm + 14.5cm + 0.6cm + 2.5cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + 5.72875cm +