diff --git a/ProjectCompRepair/ProjectCompRepair/Entities/AccessoiresOrder.cs b/ProjectCompRepair/ProjectCompRepair/Entities/AccessoiresOrder.cs index c5ac8dc..bac8c0c 100644 --- a/ProjectCompRepair/ProjectCompRepair/Entities/AccessoiresOrder.cs +++ b/ProjectCompRepair/ProjectCompRepair/Entities/AccessoiresOrder.cs @@ -18,6 +18,6 @@ public class AccessoiresOrder public static AccessoiresOrder CreateElement(int orderId, int count, int accessoriesId) { - return new AccessoiresOrder { OrderId = orderId, Count = count, AccessoriesId = accessoriesId}; + return new AccessoiresOrder { OrderId = orderId, Count = count, AccessoriesId = accessoriesId }; } } diff --git a/ProjectCompRepair/ProjectCompRepair/Form1.Designer.cs b/ProjectCompRepair/ProjectCompRepair/Form1.Designer.cs index 30d66c2..6a80ac9 100644 --- a/ProjectCompRepair/ProjectCompRepair/Form1.Designer.cs +++ b/ProjectCompRepair/ProjectCompRepair/Form1.Designer.cs @@ -38,6 +38,7 @@ отчетыToolStripMenuItem = new ToolStripMenuItem(); документСоСправочникамиToolStripMenuItem = new ToolStripMenuItem(); excelToolStripMenuItem = new ToolStripMenuItem(); + TypeOfAccessoriesToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); SuspendLayout(); // @@ -96,7 +97,7 @@ // // отчетыToolStripMenuItem // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { документСоСправочникамиToolStripMenuItem, excelToolStripMenuItem }); + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { документСоСправочникамиToolStripMenuItem, excelToolStripMenuItem, TypeOfAccessoriesToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; отчетыToolStripMenuItem.Size = new Size(73, 24); отчетыToolStripMenuItem.Text = "Отчеты"; @@ -104,17 +105,24 @@ // документСоСправочникамиToolStripMenuItem // документСоСправочникамиToolStripMenuItem.Name = "документСоСправочникамиToolStripMenuItem"; - документСоСправочникамиToolStripMenuItem.Size = new Size(294, 26); + документСоСправочникамиToolStripMenuItem.Size = new Size(348, 26); документСоСправочникамиToolStripMenuItem.Text = "Документ со справочниками"; документСоСправочникамиToolStripMenuItem.Click += DirecotryReportToolStripMenuItem_Click; // // excelToolStripMenuItem // excelToolStripMenuItem.Name = "excelToolStripMenuItem"; - excelToolStripMenuItem.Size = new Size(294, 26); + excelToolStripMenuItem.Size = new Size(348, 26); excelToolStripMenuItem.Text = "Поток комплектующих"; excelToolStripMenuItem.Click += excelToolStripMenuItem_Click; // + // TypeOfAccessoriesToolStripMenuItem + // + TypeOfAccessoriesToolStripMenuItem.Name = "TypeOfAccessoriesToolStripMenuItem"; + TypeOfAccessoriesToolStripMenuItem.Size = new Size(348, 26); + TypeOfAccessoriesToolStripMenuItem.Text = "Отчет о потраченых комплектующих"; + TypeOfAccessoriesToolStripMenuItem.Click += TypeOfAccessoriesToolStripMenuItem_Click_1; + // // FormCompRepair // AutoScaleDimensions = new SizeF(8F, 20F); @@ -146,5 +154,6 @@ private ToolStripMenuItem ServiceToolStripMenuItem; private ToolStripMenuItem документСоСправочникамиToolStripMenuItem; private ToolStripMenuItem excelToolStripMenuItem; + private ToolStripMenuItem TypeOfAccessoriesToolStripMenuItem; } } diff --git a/ProjectCompRepair/ProjectCompRepair/Form1.cs b/ProjectCompRepair/ProjectCompRepair/Form1.cs index 87dab1d..ee83177 100644 --- a/ProjectCompRepair/ProjectCompRepair/Form1.cs +++ b/ProjectCompRepair/ProjectCompRepair/Form1.cs @@ -85,5 +85,18 @@ namespace ProjectCompRepair MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + + private void TypeOfAccessoriesToolStripMenuItem_Click_1(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.Designer.cs b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.Designer.cs index a743453..3cdd20a 100644 --- a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.Designer.cs +++ b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.Designer.cs @@ -45,6 +45,7 @@ buttonSelectFileName.TabIndex = 0; buttonSelectFileName.Text = "Выбрать"; buttonSelectFileName.UseVisualStyleBackColor = true; + buttonSelectFileName.Click += ButtonSelectFileName_Click; // // labelFileName // @@ -73,12 +74,13 @@ // // buttonCreate // - buttonCreate.Location = new Point(136, 178); + buttonCreate.Location = new Point(178, 178); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(94, 29); + buttonCreate.Size = new Size(198, 29); buttonCreate.TabIndex = 4; buttonCreate.Text = "Сформировать"; buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreate_Click; // // comboBoxAccessories // diff --git a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.cs b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.cs index 7679bd6..ccebd9f 100644 --- a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.cs +++ b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesOrderReport.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using ProjectCompRepair.Entities.Enums; +using ProjectCompRepair.Entities; using ProjectCompRepair.Reports; using ProjectCompRepair.Repositories; using Unity; @@ -25,8 +25,10 @@ namespace ProjectCompRepair.Forms InitializeComponent(); _container = container ?? throw new ArgumentNullException(nameof(container)); - comboBoxAccessories.DataSource = Enum.GetValues(typeof(AccessoriesType)); - + comboBoxAccessories.DataSource = accessoriesRepository.ReadAccessories(); + comboBoxAccessories.ValueMember = "Id"; + comboBoxAccessories.DisplayMember = "AccessoriesType"; + } private void ButtonSelectFileName_Click(object sender, EventArgs e) @@ -53,7 +55,7 @@ namespace ProjectCompRepair.Forms } if - (_container.Resolve().CreateChart(_fileName, dateTimePicker.Value, (int)comboBoxAccessories.SelectedIndex!)) + (_container.Resolve().CreateChart(_fileName, dateTimePicker.Value, (int)comboBoxAccessories.SelectedValue!)) { MessageBox.Show("Документ сформирован", "Формирование документа", diff --git a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.Designer.cs b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.Designer.cs index 13aa86a..4ec2026 100644 --- a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.Designer.cs +++ b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.Designer.cs @@ -33,10 +33,10 @@ textBoxFilePath = new TextBox(); buttonSelectFilePath = new Button(); comboBoxAccessories = new ComboBox(); - label1 = new Label(); - label2 = new Label(); - label3 = new Label(); - label4 = new Label(); + labelFile = new Label(); + labelNameAccessories = new Label(); + labelBeginTime = new Label(); + labelEndTime = new Label(); buttonMakeReport = new Button(); SuspendLayout(); // @@ -71,7 +71,7 @@ buttonSelectFilePath.Name = "buttonSelectFilePath"; buttonSelectFilePath.Size = new Size(30, 31); buttonSelectFilePath.TabIndex = 3; - buttonSelectFilePath.Text = "button1"; + buttonSelectFilePath.Text = "..."; buttonSelectFilePath.UseVisualStyleBackColor = true; buttonSelectFilePath.Click += ButtonSelectFilePath_Click; // @@ -84,50 +84,50 @@ comboBoxAccessories.Size = new Size(228, 28); comboBoxAccessories.TabIndex = 4; // - // label1 + // labelFile // - label1.AutoSize = true; - label1.Location = new Point(69, 112); - label1.Name = "label1"; - label1.Size = new Size(50, 20); - label1.TabIndex = 5; - label1.Text = "label1"; + labelFile.AutoSize = true; + labelFile.Location = new Point(69, 112); + labelFile.Name = "labelFile"; + labelFile.Size = new Size(41, 20); + labelFile.TabIndex = 5; + labelFile.Text = "Путь"; // - // label2 + // labelNameAccessories // - label2.AutoSize = true; - label2.Location = new Point(69, 188); - label2.Name = "label2"; - label2.Size = new Size(50, 20); - label2.TabIndex = 6; - label2.Text = "label2"; + labelNameAccessories.AutoSize = true; + labelNameAccessories.Location = new Point(47, 187); + labelNameAccessories.Name = "labelNameAccessories"; + labelNameAccessories.Size = new Size(145, 20); + labelNameAccessories.TabIndex = 6; + labelNameAccessories.Text = "id комплектующего"; // - // label3 + // labelBeginTime // - label3.AutoSize = true; - label3.Location = new Point(69, 264); - label3.Name = "label3"; - label3.Size = new Size(50, 20); - label3.TabIndex = 7; - label3.Text = "label3"; + labelBeginTime.AutoSize = true; + labelBeginTime.Location = new Point(47, 261); + labelBeginTime.Name = "labelBeginTime"; + labelBeginTime.Size = new Size(134, 20); + labelBeginTime.TabIndex = 7; + labelBeginTime.Text = "Начальное время"; // - // label4 + // labelEndTime // - label4.AutoSize = true; - label4.Location = new Point(69, 317); - label4.Name = "label4"; - label4.Size = new Size(50, 20); - label4.TabIndex = 8; - label4.Text = "label4"; + labelEndTime.AutoSize = true; + labelEndTime.Location = new Point(47, 314); + labelEndTime.Name = "labelEndTime"; + labelEndTime.Size = new Size(126, 20); + labelEndTime.TabIndex = 8; + labelEndTime.Text = "Конечное время"; // // buttonMakeReport // buttonMakeReport.Location = new Point(175, 423); buttonMakeReport.Margin = new Padding(3, 4, 3, 4); buttonMakeReport.Name = "buttonMakeReport"; - buttonMakeReport.Size = new Size(86, 31); + buttonMakeReport.Size = new Size(134, 31); buttonMakeReport.TabIndex = 9; - buttonMakeReport.Text = "button2"; + buttonMakeReport.Text = "Сформировать"; buttonMakeReport.UseVisualStyleBackColor = true; buttonMakeReport.Click += ButtonMakeReport_Click; // @@ -137,10 +137,10 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(535, 600); Controls.Add(buttonMakeReport); - Controls.Add(label4); - Controls.Add(label3); - Controls.Add(label2); - Controls.Add(label1); + Controls.Add(labelEndTime); + Controls.Add(labelBeginTime); + Controls.Add(labelNameAccessories); + Controls.Add(labelFile); Controls.Add(comboBoxAccessories); Controls.Add(buttonSelectFilePath); Controls.Add(textBoxFilePath); @@ -160,10 +160,10 @@ private TextBox textBoxFilePath; private Button buttonSelectFilePath; private ComboBox comboBoxAccessories; - private Label label1; - private Label label2; - private Label label3; - private Label label4; + private Label labelFile; + private Label labelNameAccessories; + private Label labelBeginTime; + private Label labelEndTime; private Button buttonMakeReport; } } \ No newline at end of file diff --git a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.resx b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.resx index af32865..8b2ff64 100644 --- a/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.resx +++ b/ProjectCompRepair/ProjectCompRepair/Forms/FormAccessoriesReport.resx @@ -1,7 +1,7 @@