Artyom_Yashin/PIbd-23_Yashin_A_A_ComputersShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

День 1942. По иронии судьбы, чем ближе предполагаемый финал, тем тяжелее идти. Тайные ошибки незнакомых конструкций не давали мне покоя, ломая фунционал и без того криво работающей пародии на приложение. Моё ментальное здоровье ухудшалось в геометрической прогрессии, а желание сменить вижлу на стим обратно-пропорционально увеличивалось. Единственным, что отделяло меня от воплощения моих желаний, было обещание самому себе, данное в прошлом семестре перед сессий. Обещание приступить к выполнению лабораторных с самого начала. И чем дольше я стараюсь его выполнять, тем больше желание от него отречься...

Browse Source
This commit is contained in:
Artyom_Yashin 2024-02-10 20:17:10 +04:00
parent 70ba0350c6
commit 1906ad7dbf
9 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ComputersShop/ComputersShop/ComputersShop.csproj
View File

@ -12,6 +12,12 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj" />
<ProjectReference Include="..\ComputersShopListImplement\ComputersShopListImplement.csproj" />

3
ComputersShop/ComputersShop/FormComponents.cs
View File

@ -40,8 +40,7 @@ namespace ComputersShop
}
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service =
Program.ServiceProvider?.GetService(typeof(FormComponent));
var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
if (service is FormComponent form)
{
if (form.ShowDialog() == DialogResult.OK)

6
ComputersShop/ComputersShop/FormComputers.Designer.cs generated
View File

@ -5,7 +5,7 @@
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
private System.ComponentModel.IContainer computers = null;
/// <summary>
/// Clean up any resources being used.
@ -13,9 +13,9 @@
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
if (disposing && (computers != null))
{
components.Dispose();
computers.Dispose();
}
base.Dispose(disposing);
}

4
ComputersShop/ComputersShop/FormComputers.cs
View File

@ -33,11 +33,11 @@ namespace ComputersShop
dataGridView.Columns["ComputerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["ComputerComponents"].Visible = false;
}
_logger.LogInformation("Загрузка мороженого");
_logger.LogInformation("Загрузка компьютеров");
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки мороженого");
_logger.LogError(ex, "Ошибка загрузки компьютеров");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

2
ComputersShop/ComputersShop/FormCreateOrder.Designer.cs generated
View File

@ -57,9 +57,9 @@
//
// textBoxSum
//
textBoxSum.Enabled = false;
textBoxSum.Location = new Point(130, 113);
textBoxSum.Name = "textBoxSum";
textBoxSum.ReadOnly = true;
textBoxSum.Size = new Size(353, 27);
textBoxSum.TabIndex = 2;
textBoxSum.TextChanged += SumTextBox_TextChanged;

32
ComputersShop/ComputersShop/FormMain.Designer.cs generated
View File

@ -62,14 +62,16 @@
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(184, 26);
компонентыToolStripMenuItem.Size = new Size(224, 26);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += ComponentsStripMenuItem_Click;
//
// компьютерыToolStripMenuItem
//
компьютерыToolStripMenuItem.Name = "компьютерыToolStripMenuItem";
компьютерыToolStripMenuItem.Size = new Size(184, 26);
компьютерыToolStripMenuItem.Size = new Size(224, 26);
компьютерыToolStripMenuItem.Text = "Компьютеры";
компьютерыToolStripMenuItem.Click += ComputersStripMenuItem_Click;
//
// dataGridView
//
@ -83,48 +85,53 @@
//
// buttonCreateOrder
//
buttonCreateOrder.Location = new Point(872, 52);
buttonCreateOrder.Location = new Point(875, 52);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(187, 24);
buttonCreateOrder.Size = new Size(187, 37);
buttonCreateOrder.TabIndex = 2;
buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true;
buttonCreateOrder.Click += CreateOrderButton_Click;
//
// buttonTakeOrderInWork
//
buttonTakeOrderInWork.Location = new Point(872, 129);
buttonTakeOrderInWork.Location = new Point(875, 129);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(187, 24);
buttonTakeOrderInWork.Size = new Size(187, 37);
buttonTakeOrderInWork.TabIndex = 3;
buttonTakeOrderInWork.Text = "Отдать на выполнение";
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
buttonTakeOrderInWork.Click += TakeInWorkButton_Click;
//
// buttonOrderReady
//
buttonOrderReady.Location = new Point(872, 202);
buttonOrderReady.Location = new Point(875, 202);
buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(187, 24);
buttonOrderReady.Size = new Size(187, 37);
buttonOrderReady.TabIndex = 4;
buttonOrderReady.Text = "Заказ готов";
buttonOrderReady.UseVisualStyleBackColor = true;
buttonOrderReady.Click += ReadyButton_Click;
//
// buttonIssuedOrder
//
buttonIssuedOrder.Location = new Point(872, 273);
buttonIssuedOrder.Location = new Point(875, 273);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(187, 24);
buttonIssuedOrder.Size = new Size(187, 37);
buttonIssuedOrder.TabIndex = 5;
buttonIssuedOrder.Text = "Заказ выдан";
buttonIssuedOrder.UseVisualStyleBackColor = true;
buttonIssuedOrder.Click += IssuedButton_Click;
//
// buttonRefresh
//
buttonRefresh.Location = new Point(872, 339);
buttonRefresh.Location = new Point(875, 339);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(187, 24);
buttonRefresh.Size = new Size(187, 37);
buttonRefresh.TabIndex = 6;
buttonRefresh.Text = "Обновить список";
buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += RefreshButton_Click;
//
// FormMain
//
@ -141,6 +148,7 @@
MainMenuStrip = menuStrip;
Name = "FormMain";
Text = "Магазин компьютеров";
Load += FormMain_Load;
menuStrip.ResumeLayout(false);
menuStrip.PerformLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

13
ComputersShop/ComputersShop/FormMain.cs
View File

@ -25,14 +25,13 @@ namespace ComputersShop
_orderLogic = orderLogic;
}
private void КомпонентыStripMenuItem_Click(object sender, EventArgs e)
private void ComponentsStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormComputers));
if (service is FormComputers form)
var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
if (service is FormComponents form)
{
form.ShowDialog();
}
}
private void FormMain_Load(object sender, EventArgs e)
@ -61,10 +60,10 @@ namespace ComputersShop
}
}
private void КомпьютерыStripMenuItem_Click(object sender, EventArgs e)
private void ComputersStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(ComputersForm));
if (service is ComputersForm form)
var service = Program.ServiceProvider?.GetService(typeof(FormComputers));
if (service is FormComputers form)
{
form.ShowDialog();
}

12
ComputersShop/ComputersShop/Program.cs
View File

@ -37,17 +37,17 @@ namespace ComputersShop
});
services.AddTransient<IComponentStorage, ComponentStorage>();
services.AddTransient<IOrderStorage, OrderStorage>();
services.AddTransient<IProductStorage, ProductStorage>();
services.AddTransient<IComputerStorage, ComputerStorage>();
services.AddTransient<IComponentLogic, ComponentLogic>();
services.AddTransient<IOrderLogic, OrderLogic>();
services.AddTransient<IProductLogic, ProductLogic>();
services.AddTransient<IComputerLogic, ComputerLogic>();
services.AddTransient<FormMain>();
services.AddTransient<FormComponent>();
services.AddTransient<FormComputers>();
services.AddTransient<FormComponents>();
services.AddTransient<FormCreateOrder>();
services.AddTransient<FormProduct>();
services.AddTransient<FormProductComponent>();
services.AddTransient<FormProducts>();
services.AddTransient<FormComputer>();
services.AddTransient<FormComputerComponent>();
services.AddTransient<FormComputers>();
}
}

2
ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComponentLogic.cs
View File

@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging;
namespace ComputersShopBusinessLogic.BusinessLogics
{
internal class ComponentLogic : IComponentLogic
public class ComponentLogic : IComponentLogic
{
private readonly ILogger _logger;
private readonly IComponentStorage _componentStorage;