devil_1nc/PIbd-23_Dolgov_D.A._SoftwareInstallation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: devil_1nc:cbd936027a6e8345d00c4c17e6ee6b94cc102772
Branches Tags
devil_1nc:main
devil_1nc:LabWork08
devil_1nc:LabWork07
devil_1nc:LabWork06
devil_1nc:LabWork05
devil_1nc:LabWork04
devil_1nc:LabWork03
devil_1nc:LabWork02
devil_1nc:LabWork01
..
compare: devil_1nc:3bab2a00a6e550702253351235564031b0f97bb9
Branches Tags
devil_1nc:LabWork08
devil_1nc:LabWork07
devil_1nc:LabWork06
devil_1nc:LabWork05
devil_1nc:LabWork04
devil_1nc:LabWork03
devil_1nc:LabWork02
devil_1nc:LabWork01
devil_1nc:main

No commits in common. "cbd936027a6e8345d00c4c17e6ee6b94cc102772" and "3bab2a00a6e550702253351235564031b0f97bb9" have entirely different histories.
cbd936027a ... 3bab2a00a6

14 changed files with 59 additions and 75 deletions
Show Stats Expand all files Collapse all files

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

@ -26,7 +26,7 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.comboBoxPackage = new System.Windows.Forms.ComboBox();
this.textBoxCount = new System.Windows.Forms.TextBox();

2
SoftwareInstallation/SoftwareInstallation/FormCreateOrder.cs
View File

@ -12,7 +12,7 @@ namespace SoftwareInstallationView
private readonly IOrderLogic _logicO;
public FormCreateOrder(ILogger<FormCreateOrder> logger, IPackageLogic logicP, IOrderLogic logicO)
{
InitializeComponent();
InitializeSoftware();
_logger = logger;
_logicP = logicP;
_logicO = logicO;

108
SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs generated
View File

@ -28,25 +28,26 @@ namespace SoftwareInstallationView
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.dataGridView = new System.Windows.Forms.DataGridView();
this.buttonCreateOrder = new System.Windows.Forms.Button();
this.buttonTakeOrderInWork = new System.Windows.Forms.Button();
this.buttonOrderReady = new System.Windows.Forms.Button();
this.buttonIssuedOrder = new System.Windows.Forms.Button();
this.buttonRef = new System.Windows.Forms.Button();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.guideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.packageToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.storageToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.clientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.implementerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.storageToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.packagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.packageSoftwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.packageSoftwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.startWorksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.buttonOrderReady = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
@ -71,13 +72,6 @@ namespace SoftwareInstallationView
this.buttonCreateOrder.UseVisualStyleBackColor = true;
this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
//
// buttonTakeOrderInWork
//
this.buttonTakeOrderInWork.Location = new System.Drawing.Point(628, 121);
this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
this.buttonTakeOrderInWork.Size = new System.Drawing.Size(75, 23);
this.buttonTakeOrderInWork.TabIndex = 8;
//
// buttonIssuedOrder
//
this.buttonIssuedOrder.Location = new System.Drawing.Point(628, 171);
@ -101,9 +95,9 @@ namespace SoftwareInstallationView
// menuStrip1
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.guideToolStripMenuItem,
this.reportsToolStripMenuItem,
this.guideToolStripMenuItem, this.reportsToolStripMenuItem,
this.startWorksToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(803, 24);
@ -114,41 +108,11 @@ namespace SoftwareInstallationView
//
this.guideToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.packageToolStripMenuItem2,
this.storageToolStripMenuItem3,
this.clientToolStripMenuItem,
this.implementerToolStripMenuItem});
this.storageToolStripMenuItem3, this.clientToolStripMenuItem, this.implementerToolStripMenuItem});
this.guideToolStripMenuItem.Name = "guideToolStripMenuItem";
this.guideToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
this.guideToolStripMenuItem.Text = "Справочники";
//
// packageToolStripMenuItem2
//
this.packageToolStripMenuItem2.Name = "packageToolStripMenuItem2";
this.packageToolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
this.packageToolStripMenuItem2.Text = "Пакеты";
this.packageToolStripMenuItem2.Click += new System.EventHandler(this.packageToolStripMenuItem_Click);
//
// storageToolStripMenuItem3
//
this.storageToolStripMenuItem3.Name = "storageToolStripMenuItem3";
this.storageToolStripMenuItem3.Size = new System.Drawing.Size(148, 22);
this.storageToolStripMenuItem3.Text = "ПО";
this.storageToolStripMenuItem3.Click += new System.EventHandler(this.softwareToolStripMenuItem_Click);
//
// clientToolStripMenuItem
//
this.clientToolStripMenuItem.Name = "clientToolStripMenuItem";
this.clientToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.clientToolStripMenuItem.Text = "Клиенты";
this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click);
//
// implementerToolStripMenuItem
//
this.implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
this.implementerToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.implementerToolStripMenuItem.Text = "Исполнитель";
this.implementerToolStripMenuItem.Click += new System.EventHandler(this.implementerToolStripMenuItem_Click);
//
// reportsToolStripMenuItem
//
this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -156,43 +120,64 @@ namespace SoftwareInstallationView
this.packageSoftwaresToolStripMenuItem,
this.ordersToolStripMenuItem});
this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
this.reportsToolStripMenuItem.Size = new System.Drawing.Size(60, 20);
this.reportsToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
this.reportsToolStripMenuItem.Text = "Отчеты";
//
// startWorksToolStripMenuItem
//
this.startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
this.startWorksToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
this.startWorksToolStripMenuItem.Text = "Запуск работ";
this.startWorksToolStripMenuItem.Click += new System.EventHandler(this.startWorksToolStripMenuItem_Click);
//
// packagesToolStripMenuItem
//
this.packagesToolStripMenuItem.Name = "packagesToolStripMenuItem";
this.packagesToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
this.packagesToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
this.packagesToolStripMenuItem.Text = "Список пакетов";
this.packagesToolStripMenuItem.Click += new System.EventHandler(this.packagesToolStripMenuItem_Click);
//
// packageSoftwaresToolStripMenuItem
//
this.packageSoftwaresToolStripMenuItem.Name = "packageSoftwaresToolStripMenuItem";
this.packageSoftwaresToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
this.packageSoftwaresToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
this.packageSoftwaresToolStripMenuItem.Text = "ПО по пакетам";
this.packageSoftwaresToolStripMenuItem.Click += new System.EventHandler(this.packageSoftwaresToolStripMenuItem_Click);
//
// ordersToolStripMenuItem
//
this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
this.ordersToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
this.ordersToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
this.ordersToolStripMenuItem.Text = "Список заказов";
this.ordersToolStripMenuItem.Click += new System.EventHandler(this.ordersToolStripMenuItem_Click);
//
// startWorksToolStripMenuItem
// packageToolStripMenuItem2
//
this.startWorksToolStripMenuItem.Name = "startWorksToolStripMenuItem";
this.startWorksToolStripMenuItem.Size = new System.Drawing.Size(92, 20);
this.startWorksToolStripMenuItem.Text = "Запуск работ";
this.startWorksToolStripMenuItem.Click += new System.EventHandler(this.startWorksToolStripMenuItem_Click);
this.packageToolStripMenuItem2.Name = "packageToolStripMenuItem2";
this.packageToolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
this.packageToolStripMenuItem2.Text = "Пакеты";
this.packageToolStripMenuItem2.Click += new System.EventHandler(this.packageToolStripMenuItem_Click);
//
// buttonOrderReady
// clientToolStripMenuItem
//
this.buttonOrderReady.Location = new System.Drawing.Point(628, 76);
this.buttonOrderReady.Name = "buttonOrderReady";
this.buttonOrderReady.Size = new System.Drawing.Size(75, 23);
this.buttonOrderReady.TabIndex = 7;
this.clientToolStripMenuItem.Name = "clientToolStripMenuItem";
this.clientToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.clientToolStripMenuItem.Text = "Клиенты";
this.clientToolStripMenuItem.Click += new System.EventHandler(this.clientToolStripMenuItem_Click);
//
// implementerToolStripMenuItem
//
this.implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
this.implementerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.implementerToolStripMenuItem.Text = "Исполнитель";
this.implementerToolStripMenuItem.Click += new System.EventHandler(this.implementerToolStripMenuItem_Click);
//
// storageToolStripMenuItem3
//
this.storageToolStripMenuItem3.Name = "storageToolStripMenuItem3";
this.storageToolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
this.storageToolStripMenuItem3.Text = "ПО";
this.storageToolStripMenuItem3.Click += new System.EventHandler(this.softwareToolStripMenuItem_Click);
//
// FormMain
//
@ -209,13 +194,12 @@ namespace SoftwareInstallationView
this.MainMenuStrip = this.menuStrip1;
this.Name = "FormMain";
this.Text = "Магазин программного обеспечения";
this.Load += new System.EventHandler(this.FormMain_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
this.Load += new System.EventHandler(this.FormMain_Load);
}
#endregion
@ -223,6 +207,7 @@ namespace SoftwareInstallationView
private DataGridView dataGridView;
private Button buttonCreateOrder;
private Button buttonTakeOrderInWork;
private Button buttonOrderReady;
private Button buttonIssuedOrder;
private Button buttonRef;
private MenuStrip menuStrip1;
@ -236,6 +221,5 @@ namespace SoftwareInstallationView
private ToolStripMenuItem ordersToolStripMenuItem;
private ToolStripMenuItem implementerToolStripMenuItem;
private ToolStripMenuItem startWorksToolStripMenuItem;
private Button buttonOrderReady;
}
}

2
SoftwareInstallation/SoftwareInstallation/FormMain.cs
View File

@ -22,7 +22,7 @@ namespace SoftwareInstallationView
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic , IReportLogic reportLogic)
{
InitializeComponent();
InitializeSoftware();
_logger = logger;
_orderLogic = orderLogic;
_reportLogic = reportLogic;

2
SoftwareInstallation/SoftwareInstallation/FormPackage.Designer.cs generated
View File

@ -26,7 +26,7 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.textBoxName = new System.Windows.Forms.TextBox();
this.textBoxPrice = new System.Windows.Forms.TextBox();

2
SoftwareInstallation/SoftwareInstallation/FormPackage.cs
View File

@ -17,7 +17,7 @@ namespace SoftwareInstallationView
public FormPackage(ILogger<FormPackage> logger, IPackageLogic logic)
{
InitializeComponent();
InitializeSoftware();
_logger = logger;
_logic = logic;
_packageSoftwares = new Dictionary<int, (ISoftwareModel, int)>();

2
SoftwareInstallation/SoftwareInstallation/FormPackageSoftware.Designer.cs generated
View File

@ -26,7 +26,7 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.textBox1 = new System.Windows.Forms.TextBox();
this.comboBoxSoftware = new System.Windows.Forms.ComboBox();

2
SoftwareInstallation/SoftwareInstallation/FormPackageSoftware.cs
View File

@ -46,7 +46,7 @@ namespace SoftwareInstallationView
public FormPackageSoftware(ISoftwareLogic logic)
{
InitializeComponent();
InitializeSoftware();
_list = logic.ReadList(null);
if (_list != null)
{

2
SoftwareInstallation/SoftwareInstallation/FormPackages.Designer.cs generated
View File

@ -26,7 +26,7 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.dataGridView = new System.Windows.Forms.DataGridView();
this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn();

2
SoftwareInstallation/SoftwareInstallation/FormPackages.cs
View File

@ -11,7 +11,7 @@ namespace SoftwareInstallationView
private readonly IPackageLogic _logic;
public FormPackages(ILogger<FormPackages> logger, IPackageLogic logic)
{
InitializeComponent();
InitializeSoftware();
_logger = logger;
_logic = logic;
LoadData();

2
SoftwareInstallation/SoftwareInstallation/FormSoftware.Designer.cs generated
View File

@ -26,7 +26,7 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.textBoxName = new System.Windows.Forms.TextBox();
this.textBoxCost = new System.Windows.Forms.TextBox();

2
SoftwareInstallation/SoftwareInstallation/FormSoftware.cs
View File

@ -13,7 +13,7 @@ namespace SoftwareInstallation
public int Id { set { _id = value; } }
public FormSoftware(ILogger<FormSoftware> logger, ISoftwareLogic logic)
{
InitializeComponent();
InitializeSoftware();
_logger = logger;
_logic = logic;
}

2
SoftwareInstallation/SoftwareInstallation/FormSoftwares.Designer.cs generated
View File

@ -26,7 +26,7 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
private void InitializeSoftware()
{
this.buttonAdd = new System.Windows.Forms.Button();
this.buttonEdit = new System.Windows.Forms.Button();

2
SoftwareInstallation/SoftwareInstallation/FormSoftwares.cs
View File

@ -9,7 +9,7 @@ namespace SoftwareInstallationView
{
public FormSoftwares(ILogger<FormSoftwares> logger, ISoftwareLogic logic)
{
InitializeComponent();
InitializeSoftware();
_logger = logger;
_logic = logic;
LoadData();