Сдано

This commit is contained in:
ityurner02@mail.ru 2023-02-07 14:12:20 +04:00
parent 8a06a50ce7
commit f7eb3ff8ab
10 changed files with 137 additions and 239 deletions

View File

@ -41,59 +41,63 @@
// WorkNameLabel // WorkNameLabel
// //
this.WorkNameLabel.AutoSize = true; this.WorkNameLabel.AutoSize = true;
this.WorkNameLabel.Location = new System.Drawing.Point(12, 9); this.WorkNameLabel.Location = new System.Drawing.Point(14, 12);
this.WorkNameLabel.Name = "PackageNameLabel"; this.WorkNameLabel.Name = "WorkNameLabel";
this.WorkNameLabel.Size = new System.Drawing.Size(59, 15); this.WorkNameLabel.Size = new System.Drawing.Size(75, 20);
this.WorkNameLabel.TabIndex = 0; this.WorkNameLabel.TabIndex = 0;
this.WorkNameLabel.Text = "Изделие: "; this.WorkNameLabel.Text = "Изделие: ";
// //
// CountLabel // CountLabel
// //
this.CountLabel.AutoSize = true; this.CountLabel.AutoSize = true;
this.CountLabel.Location = new System.Drawing.Point(12, 40); this.CountLabel.Location = new System.Drawing.Point(14, 53);
this.CountLabel.Name = "CountLabel"; this.CountLabel.Name = "CountLabel";
this.CountLabel.Size = new System.Drawing.Size(78, 15); this.CountLabel.Size = new System.Drawing.Size(97, 20);
this.CountLabel.TabIndex = 1; this.CountLabel.TabIndex = 1;
this.CountLabel.Text = "Количество: "; this.CountLabel.Text = "Количество: ";
// //
// SumLabel // SumLabel
// //
this.SumLabel.AutoSize = true; this.SumLabel.AutoSize = true;
this.SumLabel.Location = new System.Drawing.Point(12, 72); this.SumLabel.Location = new System.Drawing.Point(14, 96);
this.SumLabel.Name = "SumLabel"; this.SumLabel.Name = "SumLabel";
this.SumLabel.Size = new System.Drawing.Size(51, 15); this.SumLabel.Size = new System.Drawing.Size(62, 20);
this.SumLabel.TabIndex = 2; this.SumLabel.TabIndex = 2;
this.SumLabel.Text = "Сумма: "; this.SumLabel.Text = "Сумма: ";
// //
// WorkComboBox // WorkComboBox
// //
this.WorkComboBox.FormattingEnabled = true; this.WorkComboBox.FormattingEnabled = true;
this.WorkComboBox.Location = new System.Drawing.Point(93, 6); this.WorkComboBox.Location = new System.Drawing.Point(106, 8);
this.WorkComboBox.Name = "PackageComboBox"; this.WorkComboBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.WorkComboBox.Size = new System.Drawing.Size(201, 23); this.WorkComboBox.Name = "WorkComboBox";
this.WorkComboBox.Size = new System.Drawing.Size(229, 28);
this.WorkComboBox.TabIndex = 3; this.WorkComboBox.TabIndex = 3;
this.WorkComboBox.SelectedIndexChanged += new System.EventHandler(this.WorkComboBox_SelectedIndexChanged); this.WorkComboBox.SelectedIndexChanged += new System.EventHandler(this.WorkComboBox_SelectedIndexChanged);
// //
// CountTextBox // CountTextBox
// //
this.CountTextBox.Location = new System.Drawing.Point(93, 37); this.CountTextBox.Location = new System.Drawing.Point(106, 49);
this.CountTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.CountTextBox.Name = "CountTextBox"; this.CountTextBox.Name = "CountTextBox";
this.CountTextBox.Size = new System.Drawing.Size(201, 23); this.CountTextBox.Size = new System.Drawing.Size(229, 27);
this.CountTextBox.TabIndex = 4; this.CountTextBox.TabIndex = 4;
this.CountTextBox.TextChanged += new System.EventHandler(this.CountTextBox_TextChanged); this.CountTextBox.TextChanged += new System.EventHandler(this.CountTextBox_TextChanged);
// //
// SumTextBox // SumTextBox
// //
this.SumTextBox.Location = new System.Drawing.Point(93, 69); this.SumTextBox.Location = new System.Drawing.Point(106, 92);
this.SumTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.SumTextBox.Name = "SumTextBox"; this.SumTextBox.Name = "SumTextBox";
this.SumTextBox.Size = new System.Drawing.Size(201, 23); this.SumTextBox.Size = new System.Drawing.Size(229, 27);
this.SumTextBox.TabIndex = 5; this.SumTextBox.TabIndex = 5;
// //
// ButtonCancel // ButtonCancel
// //
this.ButtonCancel.Location = new System.Drawing.Point(219, 113); this.ButtonCancel.Location = new System.Drawing.Point(250, 151);
this.ButtonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ButtonCancel.Name = "ButtonCancel"; this.ButtonCancel.Name = "ButtonCancel";
this.ButtonCancel.Size = new System.Drawing.Size(75, 23); this.ButtonCancel.Size = new System.Drawing.Size(86, 31);
this.ButtonCancel.TabIndex = 6; this.ButtonCancel.TabIndex = 6;
this.ButtonCancel.Text = "Отменить"; this.ButtonCancel.Text = "Отменить";
this.ButtonCancel.UseVisualStyleBackColor = true; this.ButtonCancel.UseVisualStyleBackColor = true;
@ -101,9 +105,10 @@
// //
// SaveButton // SaveButton
// //
this.SaveButton.Location = new System.Drawing.Point(138, 113); this.SaveButton.Location = new System.Drawing.Point(147, 151);
this.SaveButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.SaveButton.Name = "SaveButton"; this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(75, 23); this.SaveButton.Size = new System.Drawing.Size(97, 31);
this.SaveButton.TabIndex = 7; this.SaveButton.TabIndex = 7;
this.SaveButton.Text = "Сохранить"; this.SaveButton.Text = "Сохранить";
this.SaveButton.UseVisualStyleBackColor = true; this.SaveButton.UseVisualStyleBackColor = true;
@ -111,9 +116,9 @@
// //
// FormCreateOrder // FormCreateOrder
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(309, 153); this.ClientSize = new System.Drawing.Size(353, 204);
this.Controls.Add(this.SaveButton); this.Controls.Add(this.SaveButton);
this.Controls.Add(this.ButtonCancel); this.Controls.Add(this.ButtonCancel);
this.Controls.Add(this.SumTextBox); this.Controls.Add(this.SumTextBox);
@ -122,6 +127,7 @@
this.Controls.Add(this.SumLabel); this.Controls.Add(this.SumLabel);
this.Controls.Add(this.CountLabel); this.Controls.Add(this.CountLabel);
this.Controls.Add(this.WorkNameLabel); this.Controls.Add(this.WorkNameLabel);
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormCreateOrder"; this.Name = "FormCreateOrder";
this.Text = "Заказ"; this.Text = "Заказ";
this.ResumeLayout(false); this.ResumeLayout(false);

View File

@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

View File

@ -44,11 +44,13 @@
// //
// MenuStrip // MenuStrip
// //
this.MenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.СправочникиToolStripMenuItem}); this.СправочникиToolStripMenuItem});
this.MenuStrip.Location = new System.Drawing.Point(0, 0); this.MenuStrip.Location = new System.Drawing.Point(0, 0);
this.MenuStrip.Name = "MenuStrip"; this.MenuStrip.Name = "MenuStrip";
this.MenuStrip.Size = new System.Drawing.Size(865, 24); this.MenuStrip.Padding = new System.Windows.Forms.Padding(7, 3, 0, 3);
this.MenuStrip.Size = new System.Drawing.Size(989, 30);
this.MenuStrip.TabIndex = 0; this.MenuStrip.TabIndex = 0;
this.MenuStrip.Text = "menuStrip1"; this.MenuStrip.Text = "menuStrip1";
// //
@ -58,37 +60,40 @@
this.ИзделияToolStripMenuItem, this.ИзделияToolStripMenuItem,
this.КомпонентыToolStripMenuItem}); this.КомпонентыToolStripMenuItem});
this.СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; this.СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem";
this.СправочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20); this.СправочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
this.СправочникиToolStripMenuItem.Text = "Cправочники"; this.СправочникиToolStripMenuItem.Text = "Cправочники";
// //
// ИзделияToolStripMenuItem // ИзделияToolStripMenuItem
// //
this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem"; this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
this.ИзделияToolStripMenuItem.Text = "Изделия"; this.ИзделияToolStripMenuItem.Text = "Изделия";
this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click);
// //
// КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem
// //
this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
this.КомпонентыToolStripMenuItem.Text = "Компоненты"; this.КомпонентыToolStripMenuItem.Text = "Компоненты";
this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
// //
// DataGridView // DataGridView
// //
this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.DataGridView.Location = new System.Drawing.Point(0, 27); this.DataGridView.Location = new System.Drawing.Point(0, 36);
this.DataGridView.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.DataGridView.Name = "DataGridView"; this.DataGridView.Name = "DataGridView";
this.DataGridView.RowHeadersWidth = 51;
this.DataGridView.RowTemplate.Height = 25; this.DataGridView.RowTemplate.Height = 25;
this.DataGridView.Size = new System.Drawing.Size(722, 421); this.DataGridView.Size = new System.Drawing.Size(825, 561);
this.DataGridView.TabIndex = 1; this.DataGridView.TabIndex = 1;
// //
// CreateOrderButton // CreateOrderButton
// //
this.CreateOrderButton.Location = new System.Drawing.Point(728, 28); this.CreateOrderButton.Location = new System.Drawing.Point(832, 37);
this.CreateOrderButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.CreateOrderButton.Name = "CreateOrderButton"; this.CreateOrderButton.Name = "CreateOrderButton";
this.CreateOrderButton.Size = new System.Drawing.Size(125, 33); this.CreateOrderButton.Size = new System.Drawing.Size(143, 44);
this.CreateOrderButton.TabIndex = 2; this.CreateOrderButton.TabIndex = 2;
this.CreateOrderButton.Text = "Создать заказ"; this.CreateOrderButton.Text = "Создать заказ";
this.CreateOrderButton.UseVisualStyleBackColor = true; this.CreateOrderButton.UseVisualStyleBackColor = true;
@ -96,9 +101,10 @@
// //
// TakeOrderInWorkButton // TakeOrderInWorkButton
// //
this.TakeOrderInWorkButton.Location = new System.Drawing.Point(728, 83); this.TakeOrderInWorkButton.Location = new System.Drawing.Point(832, 111);
this.TakeOrderInWorkButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.TakeOrderInWorkButton.Name = "TakeOrderInWorkButton"; this.TakeOrderInWorkButton.Name = "TakeOrderInWorkButton";
this.TakeOrderInWorkButton.Size = new System.Drawing.Size(125, 39); this.TakeOrderInWorkButton.Size = new System.Drawing.Size(143, 52);
this.TakeOrderInWorkButton.TabIndex = 3; this.TakeOrderInWorkButton.TabIndex = 3;
this.TakeOrderInWorkButton.Text = "Отдать на выполнение"; this.TakeOrderInWorkButton.Text = "Отдать на выполнение";
this.TakeOrderInWorkButton.UseVisualStyleBackColor = true; this.TakeOrderInWorkButton.UseVisualStyleBackColor = true;
@ -106,9 +112,10 @@
// //
// OrderReadyButton // OrderReadyButton
// //
this.OrderReadyButton.Location = new System.Drawing.Point(728, 146); this.OrderReadyButton.Location = new System.Drawing.Point(832, 195);
this.OrderReadyButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.OrderReadyButton.Name = "OrderReadyButton"; this.OrderReadyButton.Name = "OrderReadyButton";
this.OrderReadyButton.Size = new System.Drawing.Size(125, 33); this.OrderReadyButton.Size = new System.Drawing.Size(143, 44);
this.OrderReadyButton.TabIndex = 4; this.OrderReadyButton.TabIndex = 4;
this.OrderReadyButton.Text = "Заказ готов"; this.OrderReadyButton.Text = "Заказ готов";
this.OrderReadyButton.UseVisualStyleBackColor = true; this.OrderReadyButton.UseVisualStyleBackColor = true;
@ -116,9 +123,10 @@
// //
// IssuedOrderButton // IssuedOrderButton
// //
this.IssuedOrderButton.Location = new System.Drawing.Point(728, 204); this.IssuedOrderButton.Location = new System.Drawing.Point(832, 272);
this.IssuedOrderButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.IssuedOrderButton.Name = "IssuedOrderButton"; this.IssuedOrderButton.Name = "IssuedOrderButton";
this.IssuedOrderButton.Size = new System.Drawing.Size(125, 33); this.IssuedOrderButton.Size = new System.Drawing.Size(143, 44);
this.IssuedOrderButton.TabIndex = 5; this.IssuedOrderButton.TabIndex = 5;
this.IssuedOrderButton.Text = "Заказ выдан"; this.IssuedOrderButton.Text = "Заказ выдан";
this.IssuedOrderButton.UseVisualStyleBackColor = true; this.IssuedOrderButton.UseVisualStyleBackColor = true;
@ -126,9 +134,10 @@
// //
// UpdateListButton // UpdateListButton
// //
this.UpdateListButton.Location = new System.Drawing.Point(728, 262); this.UpdateListButton.Location = new System.Drawing.Point(832, 349);
this.UpdateListButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.UpdateListButton.Name = "UpdateListButton"; this.UpdateListButton.Name = "UpdateListButton";
this.UpdateListButton.Size = new System.Drawing.Size(125, 33); this.UpdateListButton.Size = new System.Drawing.Size(143, 44);
this.UpdateListButton.TabIndex = 6; this.UpdateListButton.TabIndex = 6;
this.UpdateListButton.Text = "Обновить список"; this.UpdateListButton.Text = "Обновить список";
this.UpdateListButton.UseVisualStyleBackColor = true; this.UpdateListButton.UseVisualStyleBackColor = true;
@ -136,9 +145,9 @@
// //
// FormMain // FormMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(865, 450); this.ClientSize = new System.Drawing.Size(989, 600);
this.Controls.Add(this.UpdateListButton); this.Controls.Add(this.UpdateListButton);
this.Controls.Add(this.IssuedOrderButton); this.Controls.Add(this.IssuedOrderButton);
this.Controls.Add(this.OrderReadyButton); this.Controls.Add(this.OrderReadyButton);
@ -147,8 +156,9 @@
this.Controls.Add(this.DataGridView); this.Controls.Add(this.DataGridView);
this.Controls.Add(this.MenuStrip); this.Controls.Add(this.MenuStrip);
this.MainMenuStrip = this.MenuStrip; this.MainMenuStrip = this.MenuStrip;
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormMain"; this.Name = "FormMain";
this.Text = "Установка ПО"; this.Text = "Ремонт сантехники";
this.MenuStrip.ResumeLayout(false); this.MenuStrip.ResumeLayout(false);
this.MenuStrip.PerformLayout(); this.MenuStrip.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit();

View File

@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
@ -117,4 +57,7 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root> </root>

View File

@ -39,41 +39,44 @@
// ComponentSelectLabel // ComponentSelectLabel
// //
this.ComponentSelectLabel.AutoSize = true; this.ComponentSelectLabel.AutoSize = true;
this.ComponentSelectLabel.Location = new System.Drawing.Point(26, 20); this.ComponentSelectLabel.Location = new System.Drawing.Point(30, 27);
this.ComponentSelectLabel.Name = "ComponentSelectLabel"; this.ComponentSelectLabel.Name = "ComponentSelectLabel";
this.ComponentSelectLabel.Size = new System.Drawing.Size(75, 15); this.ComponentSelectLabel.Size = new System.Drawing.Size(95, 20);
this.ComponentSelectLabel.TabIndex = 0; this.ComponentSelectLabel.TabIndex = 0;
this.ComponentSelectLabel.Text = "Компонент: "; this.ComponentSelectLabel.Text = "Компонент: ";
// //
// CountLabel // CountLabel
// //
this.CountLabel.AutoSize = true; this.CountLabel.AutoSize = true;
this.CountLabel.Location = new System.Drawing.Point(26, 56); this.CountLabel.Location = new System.Drawing.Point(30, 75);
this.CountLabel.Name = "CountLabel"; this.CountLabel.Name = "CountLabel";
this.CountLabel.Size = new System.Drawing.Size(78, 15); this.CountLabel.Size = new System.Drawing.Size(97, 20);
this.CountLabel.TabIndex = 1; this.CountLabel.TabIndex = 1;
this.CountLabel.Text = "Количество: "; this.CountLabel.Text = "Количество: ";
// //
// ComponentComboBox // ComponentComboBox
// //
this.ComponentComboBox.FormattingEnabled = true; this.ComponentComboBox.FormattingEnabled = true;
this.ComponentComboBox.Location = new System.Drawing.Point(107, 17); this.ComponentComboBox.Location = new System.Drawing.Point(122, 23);
this.ComponentComboBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ComponentComboBox.Name = "ComponentComboBox"; this.ComponentComboBox.Name = "ComponentComboBox";
this.ComponentComboBox.Size = new System.Drawing.Size(190, 23); this.ComponentComboBox.Size = new System.Drawing.Size(217, 28);
this.ComponentComboBox.TabIndex = 2; this.ComponentComboBox.TabIndex = 2;
// //
// CountTextBox // CountTextBox
// //
this.CountTextBox.Location = new System.Drawing.Point(107, 53); this.CountTextBox.Location = new System.Drawing.Point(122, 71);
this.CountTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.CountTextBox.Name = "CountTextBox"; this.CountTextBox.Name = "CountTextBox";
this.CountTextBox.Size = new System.Drawing.Size(190, 23); this.CountTextBox.Size = new System.Drawing.Size(217, 27);
this.CountTextBox.TabIndex = 3; this.CountTextBox.TabIndex = 3;
// //
// SaveButton // SaveButton
// //
this.SaveButton.Location = new System.Drawing.Point(141, 98); this.SaveButton.Location = new System.Drawing.Point(152, 131);
this.SaveButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.SaveButton.Name = "SaveButton"; this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(75, 23); this.SaveButton.Size = new System.Drawing.Size(95, 31);
this.SaveButton.TabIndex = 4; this.SaveButton.TabIndex = 4;
this.SaveButton.Text = "Сохранить"; this.SaveButton.Text = "Сохранить";
this.SaveButton.UseVisualStyleBackColor = true; this.SaveButton.UseVisualStyleBackColor = true;
@ -81,9 +84,10 @@
// //
// ButtonCancel // ButtonCancel
// //
this.ButtonCancel.Location = new System.Drawing.Point(222, 98); this.ButtonCancel.Location = new System.Drawing.Point(254, 131);
this.ButtonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ButtonCancel.Name = "ButtonCancel"; this.ButtonCancel.Name = "ButtonCancel";
this.ButtonCancel.Size = new System.Drawing.Size(75, 23); this.ButtonCancel.Size = new System.Drawing.Size(86, 31);
this.ButtonCancel.TabIndex = 5; this.ButtonCancel.TabIndex = 5;
this.ButtonCancel.Text = "Отмена"; this.ButtonCancel.Text = "Отмена";
this.ButtonCancel.UseVisualStyleBackColor = true; this.ButtonCancel.UseVisualStyleBackColor = true;
@ -91,15 +95,16 @@
// //
// FormWorkComponent // FormWorkComponent
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(337, 141); this.ClientSize = new System.Drawing.Size(385, 188);
this.Controls.Add(this.ButtonCancel); this.Controls.Add(this.ButtonCancel);
this.Controls.Add(this.SaveButton); this.Controls.Add(this.SaveButton);
this.Controls.Add(this.CountTextBox); this.Controls.Add(this.CountTextBox);
this.Controls.Add(this.ComponentComboBox); this.Controls.Add(this.ComponentComboBox);
this.Controls.Add(this.CountLabel); this.Controls.Add(this.CountLabel);
this.Controls.Add(this.ComponentSelectLabel); this.Controls.Add(this.ComponentSelectLabel);
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormWorkComponent"; this.Name = "FormWorkComponent";
this.Text = "Компонент изделия"; this.Text = "Компонент изделия";
this.ResumeLayout(false); this.ResumeLayout(false);

View File

@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

View File

@ -8,6 +8,10 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\PlumbingRepairBusinessLogic\PlumbingRepairBusinessLogic.csproj" /> <ProjectReference Include="..\PlumbingRepairBusinessLogic\PlumbingRepairBusinessLogic.csproj" />
<ProjectReference Include="..\PlumbingRepairListImplement\PlumbingRepairListImplement.csproj" /> <ProjectReference Include="..\PlumbingRepairListImplement\PlumbingRepairListImplement.csproj" />

View File

@ -1,9 +1,20 @@
using PlumbingRepairContracts.BusinessLogicsContracts;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairListImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using PlumbingRepairBusinessLogic.BusinessLogic;
namespace PlumbingRepair namespace PlumbingRepair
{ {
internal static class Program internal static class Program
{ {
private static ServiceProvider? _serviceProvider;
public static ServiceProvider? ServiceProvider => _serviceProvider;
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
/// </summary> /// </summary>
[STAThread] [STAThread]
static void Main() static void Main()
@ -11,7 +22,31 @@ namespace PlumbingRepair
// To customize application configuration such as set high DPI settings or default font, // To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration. // see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize(); ApplicationConfiguration.Initialize();
Application.Run(new FormComponent()); var services = new ServiceCollection();
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
Application.Run(_serviceProvider.GetRequiredService<FormMain>());
}
private static void ConfigureServices(ServiceCollection services)
{
services.AddLogging(option =>
{
option.SetMinimumLevel(LogLevel.Information);
option.AddNLog("nlog.config");
});
services.AddTransient<IComponentStorage, ComponentStorage>();
services.AddTransient<IOrderStorage, OrderStorage>();
services.AddTransient<IWorkStorage, WorkStorage>();
services.AddTransient<IComponentLogic, ComponentLogic>();
services.AddTransient<IOrderLogic, OrderLogic>();
services.AddTransient<IWorkLogic, WorkLogic>();
services.AddTransient<FormMain>();
services.AddTransient<FormComponent>();
services.AddTransient<FormComponents>();
services.AddTransient<FormCreateOrder>();
services.AddTransient<FormWork>();
services.AddTransient<FormWorkComponent>();
services.AddTransient<FormWorks>();
} }
} }
} }

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
autoReload="true" internalLogLevel="Info">
<targets>
<target xsi:type="File" name="tofile" fileName="${basedir}/carlog-${shortdate}.log" />
</targets>
<rules>
<logger name="*" minlevel="Debug" writeTo="tofile" />
</rules>
</nlog>
</configuration>

View File

@ -8,7 +8,7 @@ using PlumbingRepairDataModels.Enums;
namespace PlumbingRepairBusinessLogic.BusinessLogic namespace PlumbingRepairBusinessLogic.BusinessLogic
{ {
public class OrderLogic public class OrderLogic : IOrderLogic
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage; private readonly IOrderStorage _orderStorage;