Дополненная лаба

This commit is contained in:
Павел Ладягин 2024-11-20 12:53:50 +04:00
parent 93b8827935
commit 69131f48a9
24 changed files with 408 additions and 233 deletions

View File

@ -11,9 +11,9 @@ public class Trip
public float Fuel_Consumption { get; private set; } public float Fuel_Consumption { get; private set; }
public int Car_ID { get; private set; } public int Car_ID { get; private set; }
public int Driver_ID { get; private set; } public int Driver_ID { get; private set; }
public int Route_ID { get; private set; } public IEnumerable<Route> Routes { get; private set; } = [];
public static Trip CreateOperation(int trip_id, DateTime start_date, DateTime end_date, Shift shift, float consumption, int car_id, int driver_id, int route_id) public static Trip CreateOperation(int trip_id, DateTime start_date, DateTime end_date, Shift shift, float consumption, int car_id, int driver_id, IEnumerable<Route> routes)
{ {
return new Trip return new Trip
{ {
@ -24,7 +24,7 @@ public class Trip
Fuel_Consumption = consumption, Fuel_Consumption = consumption,
Car_ID = car_id, Car_ID = car_id,
Driver_ID = driver_id, Driver_ID = driver_id,
Route_ID = route_id Routes = routes
}; };
} }
} }

View File

@ -45,17 +45,21 @@
// //
// checkedListBoxDriverLicense // checkedListBoxDriverLicense
// //
checkedListBoxDriverLicense.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
checkedListBoxDriverLicense.FormattingEnabled = true; checkedListBoxDriverLicense.FormattingEnabled = true;
checkedListBoxDriverLicense.Location = new Point(107, 97); checkedListBoxDriverLicense.Location = new Point(122, 129);
checkedListBoxDriverLicense.Margin = new Padding(3, 4, 3, 4);
checkedListBoxDriverLicense.Name = "checkedListBoxDriverLicense"; checkedListBoxDriverLicense.Name = "checkedListBoxDriverLicense";
checkedListBoxDriverLicense.Size = new Size(140, 94); checkedListBoxDriverLicense.Size = new Size(159, 114);
checkedListBoxDriverLicense.TabIndex = 17; checkedListBoxDriverLicense.TabIndex = 17;
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(172, 232); buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonCancel.Location = new Point(197, 309);
buttonCancel.Margin = new Padding(3, 4, 3, 4);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(75, 23); buttonCancel.Size = new Size(86, 31);
buttonCancel.TabIndex = 16; buttonCancel.TabIndex = 16;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -63,9 +67,11 @@
// //
// buttonCarSave // buttonCarSave
// //
buttonCarSave.Location = new Point(9, 232); buttonCarSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonCarSave.Location = new Point(10, 309);
buttonCarSave.Margin = new Padding(3, 4, 3, 4);
buttonCarSave.Name = "buttonCarSave"; buttonCarSave.Name = "buttonCarSave";
buttonCarSave.Size = new Size(75, 23); buttonCarSave.Size = new Size(86, 31);
buttonCarSave.TabIndex = 15; buttonCarSave.TabIndex = 15;
buttonCarSave.Text = "Сохранить"; buttonCarSave.Text = "Сохранить";
buttonCarSave.UseVisualStyleBackColor = true; buttonCarSave.UseVisualStyleBackColor = true;
@ -74,86 +80,94 @@
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Location = new Point(9, 97); label3.Location = new Point(10, 129);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new Size(92, 15); label3.Size = new Size(119, 20);
label3.TabIndex = 14; label3.TabIndex = 14;
label3.Text = "Категория прав"; label3.Text = "Категория прав";
// //
// textBoxCarModel // textBoxCarModel
// //
textBoxCarModel.Location = new Point(107, 39); textBoxCarModel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBoxCarModel.Location = new Point(122, 52);
textBoxCarModel.Margin = new Padding(3, 4, 3, 4);
textBoxCarModel.Name = "textBoxCarModel"; textBoxCarModel.Name = "textBoxCarModel";
textBoxCarModel.Size = new Size(140, 23); textBoxCarModel.Size = new Size(159, 27);
textBoxCarModel.TabIndex = 13; textBoxCarModel.TabIndex = 13;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(9, 42); label2.Location = new Point(10, 56);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(50, 15); label2.Size = new Size(63, 20);
label2.TabIndex = 12; label2.TabIndex = 12;
label2.Text = "Модель"; label2.Text = "Модель";
// //
// textBoxCarMark // textBoxCarMark
// //
textBoxCarMark.Location = new Point(107, 10); textBoxCarMark.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBoxCarMark.Location = new Point(122, 13);
textBoxCarMark.Margin = new Padding(3, 4, 3, 4);
textBoxCarMark.Name = "textBoxCarMark"; textBoxCarMark.Name = "textBoxCarMark";
textBoxCarMark.Size = new Size(140, 23); textBoxCarMark.Size = new Size(159, 27);
textBoxCarMark.TabIndex = 11; textBoxCarMark.TabIndex = 11;
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(9, 13); label1.Location = new Point(10, 17);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(43, 15); label1.Size = new Size(54, 20);
label1.TabIndex = 10; label1.TabIndex = 10;
label1.Text = "Марка"; label1.Text = "Марка";
// //
// comboBoxCarType // comboBoxCarType
// //
comboBoxCarType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxCarType.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxCarType.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxCarType.FormattingEnabled = true; comboBoxCarType.FormattingEnabled = true;
comboBoxCarType.Location = new Point(107, 68); comboBoxCarType.Location = new Point(122, 91);
comboBoxCarType.Margin = new Padding(3, 4, 3, 4);
comboBoxCarType.Name = "comboBoxCarType"; comboBoxCarType.Name = "comboBoxCarType";
comboBoxCarType.Size = new Size(140, 23); comboBoxCarType.Size = new Size(159, 28);
comboBoxCarType.TabIndex = 18; comboBoxCarType.TabIndex = 18;
// //
// label4 // label4
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.Location = new Point(9, 71); label4.Location = new Point(10, 95);
label4.Name = "label4"; label4.Name = "label4";
label4.Size = new Size(79, 15); label4.Size = new Size(99, 20);
label4.TabIndex = 19; label4.TabIndex = 19;
label4.Text = "Тип машины"; label4.Text = "Тип машины";
// //
// numericUpDownConsumptionRate // numericUpDownConsumptionRate
// //
numericUpDownConsumptionRate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
numericUpDownConsumptionRate.DecimalPlaces = 2; numericUpDownConsumptionRate.DecimalPlaces = 2;
numericUpDownConsumptionRate.Location = new Point(107, 197); numericUpDownConsumptionRate.Location = new Point(122, 263);
numericUpDownConsumptionRate.Margin = new Padding(3, 4, 3, 4);
numericUpDownConsumptionRate.Minimum = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownConsumptionRate.Minimum = new decimal(new int[] { 1, 0, 0, 131072 });
numericUpDownConsumptionRate.Name = "numericUpDownConsumptionRate"; numericUpDownConsumptionRate.Name = "numericUpDownConsumptionRate";
numericUpDownConsumptionRate.Size = new Size(140, 23); numericUpDownConsumptionRate.Size = new Size(160, 27);
numericUpDownConsumptionRate.TabIndex = 20; numericUpDownConsumptionRate.TabIndex = 20;
numericUpDownConsumptionRate.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownConsumptionRate.Value = new decimal(new int[] { 1, 0, 0, 131072 });
// //
// label5 // label5
// //
label5.AutoSize = true; label5.AutoSize = true;
label5.Location = new Point(9, 199); label5.Location = new Point(10, 265);
label5.Name = "label5"; label5.Name = "label5";
label5.Size = new Size(93, 15); label5.Size = new Size(117, 20);
label5.TabIndex = 21; label5.TabIndex = 21;
label5.Text = "Расход топлива"; label5.Text = "Расход топлива";
// //
// FormCar // FormCar
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(262, 266); ClientSize = new Size(299, 355);
Controls.Add(label5); Controls.Add(label5);
Controls.Add(numericUpDownConsumptionRate); Controls.Add(numericUpDownConsumptionRate);
Controls.Add(label4); Controls.Add(label4);
@ -166,7 +180,9 @@
Controls.Add(label2); Controls.Add(label2);
Controls.Add(textBoxCarMark); Controls.Add(textBoxCarMark);
Controls.Add(label1); Controls.Add(label1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormCar"; Name = "FormCar";
StartPosition = FormStartPosition.CenterParent;
Text = "FormCar"; Text = "FormCar";
((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).EndInit();
ResumeLayout(false); ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -43,18 +43,20 @@
panel1.Controls.Add(buttonUpd); panel1.Controls.Add(buttonUpd);
panel1.Controls.Add(buttonAdd); panel1.Controls.Add(buttonAdd);
panel1.Dock = DockStyle.Right; panel1.Dock = DockStyle.Right;
panel1.Location = new Point(681, 0); panel1.Location = new Point(778, 0);
panel1.Margin = new Padding(3, 4, 3, 4);
panel1.Name = "panel1"; panel1.Name = "panel1";
panel1.Size = new Size(99, 259); panel1.Size = new Size(113, 345);
panel1.TabIndex = 0; panel1.TabIndex = 0;
// //
// buttonDel // buttonDel
// //
buttonDel.BackgroundImage = Properties.Resources.Удалить; buttonDel.BackgroundImage = Properties.Resources.Удалить;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch; buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(12, 174); buttonDel.Location = new Point(14, 232);
buttonDel.Margin = new Padding(3, 4, 3, 4);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(75, 75); buttonDel.Size = new Size(86, 100);
buttonDel.TabIndex = 5; buttonDel.TabIndex = 5;
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += ButtonDel_Click; buttonDel.Click += ButtonDel_Click;
@ -63,9 +65,10 @@
// //
buttonUpd.BackgroundImage = Properties.Resources.Редактировать; buttonUpd.BackgroundImage = Properties.Resources.Редактировать;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch; buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(12, 93); buttonUpd.Location = new Point(14, 124);
buttonUpd.Margin = new Padding(3, 4, 3, 4);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(75, 75); buttonUpd.Size = new Size(86, 100);
buttonUpd.TabIndex = 4; buttonUpd.TabIndex = 4;
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += ButtonUpd_Click; buttonUpd.Click += ButtonUpd_Click;
@ -74,9 +77,10 @@
// //
buttonAdd.BackgroundImage = Properties.Resources.Добавить; buttonAdd.BackgroundImage = Properties.Resources.Добавить;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(12, 12); buttonAdd.Location = new Point(14, 16);
buttonAdd.Margin = new Padding(3, 4, 3, 4);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(75, 75); buttonAdd.Size = new Size(86, 100);
buttonAdd.TabIndex = 3; buttonAdd.TabIndex = 3;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
@ -91,22 +95,26 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 4, 3, 4);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(681, 259); dataGridView.Size = new Size(778, 345);
dataGridView.TabIndex = 2; dataGridView.TabIndex = 2;
// //
// FormCars // FormCars
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(780, 259); ClientSize = new Size(891, 345);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panel1); Controls.Add(panel1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormCars"; Name = "FormCars";
StartPosition = FormStartPosition.CenterParent;
Text = "Машины"; Text = "Машины";
Load += FormCars_Load; Load += FormCars_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -41,49 +41,55 @@
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(13, 18); label1.Location = new Point(15, 24);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(31, 15); label1.Size = new Size(39, 20);
label1.TabIndex = 0; label1.TabIndex = 0;
label1.Text = "Имя"; label1.Text = "Имя";
// //
// textBoxDriverFirstname // textBoxDriverFirstname
// //
textBoxDriverFirstname.Location = new Point(111, 15); textBoxDriverFirstname.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBoxDriverFirstname.Location = new Point(127, 20);
textBoxDriverFirstname.Margin = new Padding(3, 4, 3, 4);
textBoxDriverFirstname.Name = "textBoxDriverFirstname"; textBoxDriverFirstname.Name = "textBoxDriverFirstname";
textBoxDriverFirstname.Size = new Size(140, 23); textBoxDriverFirstname.Size = new Size(159, 27);
textBoxDriverFirstname.TabIndex = 1; textBoxDriverFirstname.TabIndex = 1;
// //
// textBoxDriverSecondname // textBoxDriverSecondname
// //
textBoxDriverSecondname.Location = new Point(111, 44); textBoxDriverSecondname.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBoxDriverSecondname.Location = new Point(127, 59);
textBoxDriverSecondname.Margin = new Padding(3, 4, 3, 4);
textBoxDriverSecondname.Name = "textBoxDriverSecondname"; textBoxDriverSecondname.Name = "textBoxDriverSecondname";
textBoxDriverSecondname.Size = new Size(140, 23); textBoxDriverSecondname.Size = new Size(159, 27);
textBoxDriverSecondname.TabIndex = 3; textBoxDriverSecondname.TabIndex = 3;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(13, 47); label2.Location = new Point(15, 63);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(58, 15); label2.Size = new Size(73, 20);
label2.TabIndex = 2; label2.TabIndex = 2;
label2.Text = "Фамилия"; label2.Text = "Фамилия";
// //
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Location = new Point(13, 76); label3.Location = new Point(15, 101);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new Size(92, 15); label3.Size = new Size(119, 20);
label3.TabIndex = 4; label3.TabIndex = 4;
label3.Text = "Категория прав"; label3.Text = "Категория прав";
// //
// buttonDriverSave // buttonDriverSave
// //
buttonDriverSave.Location = new Point(13, 176); buttonDriverSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonDriverSave.Location = new Point(15, 235);
buttonDriverSave.Margin = new Padding(3, 4, 3, 4);
buttonDriverSave.Name = "buttonDriverSave"; buttonDriverSave.Name = "buttonDriverSave";
buttonDriverSave.Size = new Size(75, 23); buttonDriverSave.Size = new Size(86, 31);
buttonDriverSave.TabIndex = 6; buttonDriverSave.TabIndex = 6;
buttonDriverSave.Text = "Сохранить"; buttonDriverSave.Text = "Сохранить";
buttonDriverSave.UseVisualStyleBackColor = true; buttonDriverSave.UseVisualStyleBackColor = true;
@ -91,9 +97,11 @@
// //
// buttonDriverCancel // buttonDriverCancel
// //
buttonDriverCancel.Location = new Point(176, 176); buttonDriverCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonDriverCancel.Location = new Point(201, 235);
buttonDriverCancel.Margin = new Padding(3, 4, 3, 4);
buttonDriverCancel.Name = "buttonDriverCancel"; buttonDriverCancel.Name = "buttonDriverCancel";
buttonDriverCancel.Size = new Size(75, 23); buttonDriverCancel.Size = new Size(86, 31);
buttonDriverCancel.TabIndex = 7; buttonDriverCancel.TabIndex = 7;
buttonDriverCancel.Text = "Отмена"; buttonDriverCancel.Text = "Отмена";
buttonDriverCancel.UseVisualStyleBackColor = true; buttonDriverCancel.UseVisualStyleBackColor = true;
@ -101,17 +109,19 @@
// //
// checkedListBoxDriverLicense // checkedListBoxDriverLicense
// //
checkedListBoxDriverLicense.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
checkedListBoxDriverLicense.FormattingEnabled = true; checkedListBoxDriverLicense.FormattingEnabled = true;
checkedListBoxDriverLicense.Location = new Point(111, 76); checkedListBoxDriverLicense.Location = new Point(127, 101);
checkedListBoxDriverLicense.Margin = new Padding(3, 4, 3, 4);
checkedListBoxDriverLicense.Name = "checkedListBoxDriverLicense"; checkedListBoxDriverLicense.Name = "checkedListBoxDriverLicense";
checkedListBoxDriverLicense.Size = new Size(140, 94); checkedListBoxDriverLicense.Size = new Size(159, 114);
checkedListBoxDriverLicense.TabIndex = 9; checkedListBoxDriverLicense.TabIndex = 9;
// //
// FormDriver // FormDriver
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(264, 211); ClientSize = new Size(302, 281);
Controls.Add(checkedListBoxDriverLicense); Controls.Add(checkedListBoxDriverLicense);
Controls.Add(buttonDriverCancel); Controls.Add(buttonDriverCancel);
Controls.Add(buttonDriverSave); Controls.Add(buttonDriverSave);
@ -120,6 +130,7 @@
Controls.Add(label2); Controls.Add(label2);
Controls.Add(textBoxDriverFirstname); Controls.Add(textBoxDriverFirstname);
Controls.Add(label1); Controls.Add(label1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormDriver"; Name = "FormDriver";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "Водитель"; Text = "Водитель";

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -43,27 +43,31 @@
// label5 // label5
// //
label5.AutoSize = true; label5.AutoSize = true;
label5.Location = new Point(7, 40); label5.Location = new Point(8, 53);
label5.Name = "label5"; label5.Name = "label5";
label5.Size = new Size(78, 15); label5.Size = new Size(100, 20);
label5.TabIndex = 33; label5.TabIndex = 33;
label5.Text = "Цена за литр"; label5.Text = "Цена за литр";
// //
// numericUpDownPrice // numericUpDownPrice
// //
numericUpDownPrice.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
numericUpDownPrice.DecimalPlaces = 2; numericUpDownPrice.DecimalPlaces = 2;
numericUpDownPrice.Location = new Point(105, 38); numericUpDownPrice.Location = new Point(120, 51);
numericUpDownPrice.Margin = new Padding(3, 4, 3, 4);
numericUpDownPrice.Minimum = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownPrice.Minimum = new decimal(new int[] { 1, 0, 0, 131072 });
numericUpDownPrice.Name = "numericUpDownPrice"; numericUpDownPrice.Name = "numericUpDownPrice";
numericUpDownPrice.Size = new Size(140, 23); numericUpDownPrice.Size = new Size(160, 27);
numericUpDownPrice.TabIndex = 32; numericUpDownPrice.TabIndex = 32;
numericUpDownPrice.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownPrice.Value = new decimal(new int[] { 1, 0, 0, 131072 });
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(170, 106); buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonCancel.Location = new Point(194, 141);
buttonCancel.Margin = new Padding(3, 4, 3, 4);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(75, 23); buttonCancel.Size = new Size(86, 31);
buttonCancel.TabIndex = 28; buttonCancel.TabIndex = 28;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -71,9 +75,11 @@
// //
// buttonFuelSave // buttonFuelSave
// //
buttonFuelSave.Location = new Point(7, 106); buttonFuelSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonFuelSave.Location = new Point(8, 141);
buttonFuelSave.Margin = new Padding(3, 4, 3, 4);
buttonFuelSave.Name = "buttonFuelSave"; buttonFuelSave.Name = "buttonFuelSave";
buttonFuelSave.Size = new Size(75, 23); buttonFuelSave.Size = new Size(86, 31);
buttonFuelSave.TabIndex = 27; buttonFuelSave.TabIndex = 27;
buttonFuelSave.Text = "Сохранить"; buttonFuelSave.Text = "Сохранить";
buttonFuelSave.UseVisualStyleBackColor = true; buttonFuelSave.UseVisualStyleBackColor = true;
@ -82,45 +88,49 @@
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(7, 12); label1.Location = new Point(8, 16);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(75, 15); label1.Size = new Size(96, 20);
label1.TabIndex = 35; label1.TabIndex = 35;
label1.Text = "Тип топлива"; label1.Text = "Тип топлива";
// //
// comboBoxFuelType // comboBoxFuelType
// //
comboBoxFuelType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxFuelType.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxFuelType.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxFuelType.FormattingEnabled = true; comboBoxFuelType.FormattingEnabled = true;
comboBoxFuelType.Location = new Point(105, 9); comboBoxFuelType.Location = new Point(120, 12);
comboBoxFuelType.Margin = new Padding(3, 4, 3, 4);
comboBoxFuelType.Name = "comboBoxFuelType"; comboBoxFuelType.Name = "comboBoxFuelType";
comboBoxFuelType.Size = new Size(140, 23); comboBoxFuelType.Size = new Size(159, 28);
comboBoxFuelType.TabIndex = 34; comboBoxFuelType.TabIndex = 34;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(7, 69); label2.Location = new Point(8, 92);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(72, 15); label2.Size = new Size(90, 20);
label2.TabIndex = 37; label2.TabIndex = 37;
label2.Text = "Количество"; label2.Text = "Количество";
// //
// numericUpDownAmount // numericUpDownAmount
// //
numericUpDownAmount.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
numericUpDownAmount.DecimalPlaces = 2; numericUpDownAmount.DecimalPlaces = 2;
numericUpDownAmount.Location = new Point(105, 67); numericUpDownAmount.Location = new Point(120, 89);
numericUpDownAmount.Margin = new Padding(3, 4, 3, 4);
numericUpDownAmount.Minimum = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownAmount.Minimum = new decimal(new int[] { 1, 0, 0, 131072 });
numericUpDownAmount.Name = "numericUpDownAmount"; numericUpDownAmount.Name = "numericUpDownAmount";
numericUpDownAmount.Size = new Size(140, 23); numericUpDownAmount.Size = new Size(160, 27);
numericUpDownAmount.TabIndex = 36; numericUpDownAmount.TabIndex = 36;
numericUpDownAmount.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownAmount.Value = new decimal(new int[] { 1, 0, 0, 131072 });
// //
// FormFuel // FormFuel
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(256, 136); ClientSize = new Size(293, 181);
Controls.Add(label2); Controls.Add(label2);
Controls.Add(numericUpDownAmount); Controls.Add(numericUpDownAmount);
Controls.Add(label1); Controls.Add(label1);
@ -129,7 +139,9 @@
Controls.Add(numericUpDownPrice); Controls.Add(numericUpDownPrice);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonFuelSave); Controls.Add(buttonFuelSave);
Margin = new Padding(3, 4, 3, 4);
Name = "FormFuel"; Name = "FormFuel";
StartPosition = FormStartPosition.CenterParent;
Text = "FormFuel"; Text = "FormFuel";
((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDownAmount).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownAmount).EndInit();

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -43,18 +43,20 @@
panel1.Controls.Add(buttonUpd); panel1.Controls.Add(buttonUpd);
panel1.Controls.Add(buttonAdd); panel1.Controls.Add(buttonAdd);
panel1.Dock = DockStyle.Right; panel1.Dock = DockStyle.Right;
panel1.Location = new Point(531, 0); panel1.Location = new Point(607, 0);
panel1.Margin = new Padding(3, 4, 3, 4);
panel1.Name = "panel1"; panel1.Name = "panel1";
panel1.Size = new Size(101, 261); panel1.Size = new Size(115, 348);
panel1.TabIndex = 0; panel1.TabIndex = 0;
// //
// buttonDel // buttonDel
// //
buttonDel.BackgroundImage = Properties.Resources.Удалить; buttonDel.BackgroundImage = Properties.Resources.Удалить;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch; buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(13, 174); buttonDel.Location = new Point(15, 232);
buttonDel.Margin = new Padding(3, 4, 3, 4);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(75, 75); buttonDel.Size = new Size(86, 100);
buttonDel.TabIndex = 8; buttonDel.TabIndex = 8;
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += ButtonDel_Click; buttonDel.Click += ButtonDel_Click;
@ -63,9 +65,10 @@
// //
buttonUpd.BackgroundImage = Properties.Resources.Редактировать; buttonUpd.BackgroundImage = Properties.Resources.Редактировать;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch; buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(13, 93); buttonUpd.Location = new Point(15, 124);
buttonUpd.Margin = new Padding(3, 4, 3, 4);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(75, 75); buttonUpd.Size = new Size(86, 100);
buttonUpd.TabIndex = 7; buttonUpd.TabIndex = 7;
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += ButtonUpd_Click; buttonUpd.Click += ButtonUpd_Click;
@ -74,9 +77,10 @@
// //
buttonAdd.BackgroundImage = Properties.Resources.Добавить; buttonAdd.BackgroundImage = Properties.Resources.Добавить;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(13, 12); buttonAdd.Location = new Point(15, 16);
buttonAdd.Margin = new Padding(3, 4, 3, 4);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(75, 75); buttonAdd.Size = new Size(86, 100);
buttonAdd.TabIndex = 6; buttonAdd.TabIndex = 6;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
@ -91,22 +95,26 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 4, 3, 4);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(531, 261); dataGridView.Size = new Size(607, 348);
dataGridView.TabIndex = 3; dataGridView.TabIndex = 3;
// //
// FormFuels // FormFuels
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(632, 261); ClientSize = new Size(722, 348);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panel1); Controls.Add(panel1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormFuels"; Name = "FormFuels";
StartPosition = FormStartPosition.CenterParent;
Text = "Топлива"; Text = "Топлива";
Load += FormFuels_Load; Load += FormFuels_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -44,17 +44,19 @@
// label4 // label4
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.Location = new Point(11, 70); label4.Location = new Point(13, 93);
label4.Name = "label4"; label4.Name = "label4";
label4.Size = new Size(54, 15); label4.Size = new Size(69, 20);
label4.TabIndex = 31; label4.TabIndex = 31;
label4.Text = "Топливо"; label4.Text = "Топливо";
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(174, 135); buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonCancel.Location = new Point(199, 180);
buttonCancel.Margin = new Padding(3, 4, 3, 4);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(75, 23); buttonCancel.Size = new Size(86, 31);
buttonCancel.TabIndex = 28; buttonCancel.TabIndex = 28;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -62,9 +64,11 @@
// //
// buttonRefillSave // buttonRefillSave
// //
buttonRefillSave.Location = new Point(11, 135); buttonRefillSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonRefillSave.Location = new Point(13, 180);
buttonRefillSave.Margin = new Padding(3, 4, 3, 4);
buttonRefillSave.Name = "buttonRefillSave"; buttonRefillSave.Name = "buttonRefillSave";
buttonRefillSave.Size = new Size(75, 23); buttonRefillSave.Size = new Size(86, 31);
buttonRefillSave.TabIndex = 27; buttonRefillSave.TabIndex = 27;
buttonRefillSave.Text = "Сохранить"; buttonRefillSave.Text = "Сохранить";
buttonRefillSave.UseVisualStyleBackColor = true; buttonRefillSave.UseVisualStyleBackColor = true;
@ -73,70 +77,78 @@
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(11, 41); label2.Location = new Point(13, 55);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(72, 15); label2.Size = new Size(90, 20);
label2.TabIndex = 24; label2.TabIndex = 24;
label2.Text = "Количество"; label2.Text = "Количество";
// //
// dateTimePickerRefillDate // dateTimePickerRefillDate
// //
dateTimePickerRefillDate.Location = new Point(109, 9); dateTimePickerRefillDate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
dateTimePickerRefillDate.Location = new Point(125, 12);
dateTimePickerRefillDate.Margin = new Padding(3, 4, 3, 4);
dateTimePickerRefillDate.Name = "dateTimePickerRefillDate"; dateTimePickerRefillDate.Name = "dateTimePickerRefillDate";
dateTimePickerRefillDate.Size = new Size(140, 23); dateTimePickerRefillDate.Size = new Size(159, 27);
dateTimePickerRefillDate.TabIndex = 34; dateTimePickerRefillDate.TabIndex = 34;
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(11, 15); label1.Location = new Point(13, 20);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(85, 15); label1.Size = new Size(110, 20);
label1.TabIndex = 35; label1.TabIndex = 35;
label1.Text = "Дата заправки"; label1.Text = "Дата заправки";
// //
// numericUpDownRefillAmount // numericUpDownRefillAmount
// //
numericUpDownRefillAmount.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
numericUpDownRefillAmount.DecimalPlaces = 2; numericUpDownRefillAmount.DecimalPlaces = 2;
numericUpDownRefillAmount.Location = new Point(109, 39); numericUpDownRefillAmount.Location = new Point(125, 52);
numericUpDownRefillAmount.Margin = new Padding(3, 4, 3, 4);
numericUpDownRefillAmount.Minimum = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownRefillAmount.Minimum = new decimal(new int[] { 1, 0, 0, 131072 });
numericUpDownRefillAmount.Name = "numericUpDownRefillAmount"; numericUpDownRefillAmount.Name = "numericUpDownRefillAmount";
numericUpDownRefillAmount.Size = new Size(140, 23); numericUpDownRefillAmount.Size = new Size(160, 27);
numericUpDownRefillAmount.TabIndex = 36; numericUpDownRefillAmount.TabIndex = 36;
numericUpDownRefillAmount.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownRefillAmount.Value = new decimal(new int[] { 1, 0, 0, 131072 });
// //
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Location = new Point(11, 99); label3.Location = new Point(13, 132);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new Size(55, 15); label3.Size = new Size(68, 20);
label3.TabIndex = 38; label3.TabIndex = 38;
label3.Text = "Машина"; label3.Text = "Машина";
// //
// comboBoxCarID // comboBoxCarID
// //
comboBoxCarID.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxCarID.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxCarID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxCarID.FormattingEnabled = true; comboBoxCarID.FormattingEnabled = true;
comboBoxCarID.Location = new Point(109, 96); comboBoxCarID.Location = new Point(125, 128);
comboBoxCarID.Margin = new Padding(3, 4, 3, 4);
comboBoxCarID.Name = "comboBoxCarID"; comboBoxCarID.Name = "comboBoxCarID";
comboBoxCarID.Size = new Size(140, 23); comboBoxCarID.Size = new Size(159, 28);
comboBoxCarID.TabIndex = 37; comboBoxCarID.TabIndex = 37;
// //
// comboBoxFuelID // comboBoxFuelID
// //
comboBoxFuelID.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxFuelID.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxFuelID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxFuelID.FormattingEnabled = true; comboBoxFuelID.FormattingEnabled = true;
comboBoxFuelID.Location = new Point(109, 67); comboBoxFuelID.Location = new Point(125, 89);
comboBoxFuelID.Margin = new Padding(3, 4, 3, 4);
comboBoxFuelID.Name = "comboBoxFuelID"; comboBoxFuelID.Name = "comboBoxFuelID";
comboBoxFuelID.Size = new Size(140, 23); comboBoxFuelID.Size = new Size(159, 28);
comboBoxFuelID.TabIndex = 39; comboBoxFuelID.TabIndex = 39;
// //
// FormRefill // FormRefill
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(257, 165); ClientSize = new Size(294, 220);
Controls.Add(comboBoxFuelID); Controls.Add(comboBoxFuelID);
Controls.Add(label3); Controls.Add(label3);
Controls.Add(comboBoxCarID); Controls.Add(comboBoxCarID);
@ -147,7 +159,9 @@
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonRefillSave); Controls.Add(buttonRefillSave);
Controls.Add(label2); Controls.Add(label2);
Margin = new Padding(3, 4, 3, 4);
Name = "FormRefill"; Name = "FormRefill";
StartPosition = FormStartPosition.CenterParent;
Text = "FormRefill"; Text = "FormRefill";
((System.ComponentModel.ISupportInitialize)numericUpDownRefillAmount).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownRefillAmount).EndInit();
ResumeLayout(false); ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -39,18 +39,20 @@
// //
panel1.Controls.Add(buttonAdd); panel1.Controls.Add(buttonAdd);
panel1.Dock = DockStyle.Right; panel1.Dock = DockStyle.Right;
panel1.Location = new Point(692, 0); panel1.Location = new Point(791, 0);
panel1.Margin = new Padding(3, 4, 3, 4);
panel1.Name = "panel1"; panel1.Name = "panel1";
panel1.Size = new Size(98, 279); panel1.Size = new Size(112, 372);
panel1.TabIndex = 0; panel1.TabIndex = 0;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.BackgroundImage = Properties.Resources.Добавить; buttonAdd.BackgroundImage = Properties.Resources.Добавить;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(13, 12); buttonAdd.Location = new Point(15, 16);
buttonAdd.Margin = new Padding(3, 4, 3, 4);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(75, 75); buttonAdd.Size = new Size(86, 100);
buttonAdd.TabIndex = 4; buttonAdd.TabIndex = 4;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
@ -65,22 +67,26 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 4, 3, 4);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(692, 279); dataGridView.Size = new Size(791, 372);
dataGridView.TabIndex = 3; dataGridView.TabIndex = 3;
// //
// FormRefills // FormRefills
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(790, 279); ClientSize = new Size(903, 372);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panel1); Controls.Add(panel1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormRefills"; Name = "FormRefills";
StartPosition = FormStartPosition.CenterParent;
Text = "Заправки"; Text = "Заправки";
Load += FormRefills_Load; Load += FormRefills_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -42,27 +42,31 @@
// label5 // label5
// //
label5.AutoSize = true; label5.AutoSize = true;
label5.Location = new Point(10, 70); label5.Location = new Point(11, 93);
label5.Name = "label5"; label5.Name = "label5";
label5.Size = new Size(102, 15); label5.Size = new Size(127, 20);
label5.TabIndex = 33; label5.TabIndex = 33;
label5.Text = "Длина маршрута"; label5.Text = "Длина маршрута";
// //
// numericUpDownLength // numericUpDownLength
// //
numericUpDownLength.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
numericUpDownLength.DecimalPlaces = 2; numericUpDownLength.DecimalPlaces = 2;
numericUpDownLength.Location = new Point(117, 68); numericUpDownLength.Location = new Point(134, 91);
numericUpDownLength.Margin = new Padding(3, 4, 3, 4);
numericUpDownLength.Minimum = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownLength.Minimum = new decimal(new int[] { 1, 0, 0, 131072 });
numericUpDownLength.Name = "numericUpDownLength"; numericUpDownLength.Name = "numericUpDownLength";
numericUpDownLength.Size = new Size(140, 23); numericUpDownLength.Size = new Size(160, 27);
numericUpDownLength.TabIndex = 32; numericUpDownLength.TabIndex = 32;
numericUpDownLength.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownLength.Value = new decimal(new int[] { 1, 0, 0, 131072 });
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(182, 102); buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonCancel.Location = new Point(208, 136);
buttonCancel.Margin = new Padding(3, 4, 3, 4);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(75, 23); buttonCancel.Size = new Size(86, 31);
buttonCancel.TabIndex = 28; buttonCancel.TabIndex = 28;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -70,9 +74,11 @@
// //
// buttonRouteSave // buttonRouteSave
// //
buttonRouteSave.Location = new Point(10, 102); buttonRouteSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonRouteSave.Location = new Point(11, 136);
buttonRouteSave.Margin = new Padding(3, 4, 3, 4);
buttonRouteSave.Name = "buttonRouteSave"; buttonRouteSave.Name = "buttonRouteSave";
buttonRouteSave.Size = new Size(75, 23); buttonRouteSave.Size = new Size(86, 31);
buttonRouteSave.TabIndex = 27; buttonRouteSave.TabIndex = 27;
buttonRouteSave.Text = "Сохранить"; buttonRouteSave.Text = "Сохранить";
buttonRouteSave.UseVisualStyleBackColor = true; buttonRouteSave.UseVisualStyleBackColor = true;
@ -80,41 +86,45 @@
// //
// textBoxEndPoint // textBoxEndPoint
// //
textBoxEndPoint.Location = new Point(117, 39); textBoxEndPoint.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBoxEndPoint.Location = new Point(134, 52);
textBoxEndPoint.Margin = new Padding(3, 4, 3, 4);
textBoxEndPoint.Name = "textBoxEndPoint"; textBoxEndPoint.Name = "textBoxEndPoint";
textBoxEndPoint.Size = new Size(140, 23); textBoxEndPoint.Size = new Size(159, 27);
textBoxEndPoint.TabIndex = 25; textBoxEndPoint.TabIndex = 25;
// //
// label2 // label2
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Location = new Point(10, 42); label2.Location = new Point(11, 56);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new Size(94, 15); label2.Size = new Size(119, 20);
label2.TabIndex = 24; label2.TabIndex = 24;
label2.Text = "Конечная точка"; label2.Text = "Конечная точка";
// //
// textBoxStartPoint // textBoxStartPoint
// //
textBoxStartPoint.Location = new Point(117, 10); textBoxStartPoint.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
textBoxStartPoint.Location = new Point(134, 13);
textBoxStartPoint.Margin = new Padding(3, 4, 3, 4);
textBoxStartPoint.Name = "textBoxStartPoint"; textBoxStartPoint.Name = "textBoxStartPoint";
textBoxStartPoint.Size = new Size(140, 23); textBoxStartPoint.Size = new Size(159, 27);
textBoxStartPoint.TabIndex = 23; textBoxStartPoint.TabIndex = 23;
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(10, 13); label1.Location = new Point(11, 17);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(101, 15); label1.Size = new Size(127, 20);
label1.TabIndex = 22; label1.TabIndex = 22;
label1.Text = "Начальная точка"; label1.Text = "Начальная точка";
// //
// FormRoute // FormRoute
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(267, 134); ClientSize = new Size(305, 179);
Controls.Add(label5); Controls.Add(label5);
Controls.Add(numericUpDownLength); Controls.Add(numericUpDownLength);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
@ -123,7 +133,9 @@
Controls.Add(label2); Controls.Add(label2);
Controls.Add(textBoxStartPoint); Controls.Add(textBoxStartPoint);
Controls.Add(label1); Controls.Add(label1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormRoute"; Name = "FormRoute";
StartPosition = FormStartPosition.CenterParent;
Text = "FormRoute"; Text = "FormRoute";
((System.ComponentModel.ISupportInitialize)numericUpDownLength).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownLength).EndInit();
ResumeLayout(false); ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -43,18 +43,20 @@
panel1.Controls.Add(buttonUpd); panel1.Controls.Add(buttonUpd);
panel1.Controls.Add(buttonAdd); panel1.Controls.Add(buttonAdd);
panel1.Dock = DockStyle.Right; panel1.Dock = DockStyle.Right;
panel1.Location = new Point(681, 0); panel1.Location = new Point(778, 0);
panel1.Margin = new Padding(3, 4, 3, 4);
panel1.Name = "panel1"; panel1.Name = "panel1";
panel1.Size = new Size(99, 260); panel1.Size = new Size(113, 347);
panel1.TabIndex = 0; panel1.TabIndex = 0;
// //
// buttonDel // buttonDel
// //
buttonDel.BackgroundImage = Properties.Resources.Удалить; buttonDel.BackgroundImage = Properties.Resources.Удалить;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch; buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(12, 174); buttonDel.Location = new Point(14, 232);
buttonDel.Margin = new Padding(3, 4, 3, 4);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(75, 75); buttonDel.Size = new Size(86, 100);
buttonDel.TabIndex = 8; buttonDel.TabIndex = 8;
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += ButtonDel_Click; buttonDel.Click += ButtonDel_Click;
@ -63,9 +65,10 @@
// //
buttonUpd.BackgroundImage = Properties.Resources.Редактировать; buttonUpd.BackgroundImage = Properties.Resources.Редактировать;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch; buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(12, 93); buttonUpd.Location = new Point(14, 124);
buttonUpd.Margin = new Padding(3, 4, 3, 4);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(75, 75); buttonUpd.Size = new Size(86, 100);
buttonUpd.TabIndex = 7; buttonUpd.TabIndex = 7;
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += ButtonUpd_Click; buttonUpd.Click += ButtonUpd_Click;
@ -74,9 +77,10 @@
// //
buttonAdd.BackgroundImage = Properties.Resources.Добавить; buttonAdd.BackgroundImage = Properties.Resources.Добавить;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(12, 12); buttonAdd.Location = new Point(14, 16);
buttonAdd.Margin = new Padding(3, 4, 3, 4);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(75, 75); buttonAdd.Size = new Size(86, 100);
buttonAdd.TabIndex = 6; buttonAdd.TabIndex = 6;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
@ -91,22 +95,26 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 4, 3, 4);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(681, 260); dataGridView.Size = new Size(778, 347);
dataGridView.TabIndex = 3; dataGridView.TabIndex = 3;
// //
// FormRoutes // FormRoutes
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(780, 260); ClientSize = new Size(891, 347);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panel1); Controls.Add(panel1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormRoutes"; Name = "FormRoutes";
StartPosition = FormStartPosition.CenterParent;
Text = "FormRoutes"; Text = "FormRoutes";
Load += FormRoutes_Load; Load += FormRoutes_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

View File

@ -41,55 +41,65 @@
label3 = new Label(); label3 = new Label();
comboBoxCarID = new ComboBox(); comboBoxCarID = new ComboBox();
comboBoxDriverID = new ComboBox(); comboBoxDriverID = new ComboBox();
label2 = new Label();
comboBoxRouteID = new ComboBox();
label7 = new Label(); label7 = new Label();
groupBox = new GroupBox();
dataGridViewRoutes = new DataGridView();
ColumnRoute = new DataGridViewComboBoxColumn();
ColumnEndPoint = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).BeginInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).BeginInit();
groupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// label5 // label5
// //
label5.AutoSize = true; label5.AutoSize = true;
label5.Location = new Point(9, 100); label5.Location = new Point(10, 133);
label5.Name = "label5"; label5.Name = "label5";
label5.Size = new Size(93, 15); label5.Size = new Size(117, 20);
label5.TabIndex = 33; label5.TabIndex = 33;
label5.Text = "Расход топлива"; label5.Text = "Расход топлива";
// //
// numericUpDownConsumptionRate // numericUpDownConsumptionRate
// //
numericUpDownConsumptionRate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
numericUpDownConsumptionRate.DecimalPlaces = 2; numericUpDownConsumptionRate.DecimalPlaces = 2;
numericUpDownConsumptionRate.Location = new Point(107, 98); numericUpDownConsumptionRate.Location = new Point(122, 131);
numericUpDownConsumptionRate.Margin = new Padding(3, 4, 3, 4);
numericUpDownConsumptionRate.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); numericUpDownConsumptionRate.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
numericUpDownConsumptionRate.Minimum = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownConsumptionRate.Minimum = new decimal(new int[] { 1, 0, 0, 131072 });
numericUpDownConsumptionRate.Name = "numericUpDownConsumptionRate"; numericUpDownConsumptionRate.Name = "numericUpDownConsumptionRate";
numericUpDownConsumptionRate.Size = new Size(140, 23); numericUpDownConsumptionRate.Size = new Size(160, 27);
numericUpDownConsumptionRate.TabIndex = 32; numericUpDownConsumptionRate.TabIndex = 32;
numericUpDownConsumptionRate.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDownConsumptionRate.Value = new decimal(new int[] { 1, 0, 0, 131072 });
// //
// label4 // label4
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.Location = new Point(9, 73); label4.Location = new Point(10, 97);
label4.Name = "label4"; label4.Name = "label4";
label4.Size = new Size(43, 15); label4.Size = new Size(54, 20);
label4.TabIndex = 31; label4.TabIndex = 31;
label4.Text = "Смена"; label4.Text = "Смена";
// //
// comboBoxShift // comboBoxShift
// //
comboBoxShift.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxShift.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxShift.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxShift.FormattingEnabled = true; comboBoxShift.FormattingEnabled = true;
comboBoxShift.Location = new Point(107, 70); comboBoxShift.Location = new Point(122, 93);
comboBoxShift.Margin = new Padding(3, 4, 3, 4);
comboBoxShift.Name = "comboBoxShift"; comboBoxShift.Name = "comboBoxShift";
comboBoxShift.Size = new Size(140, 23); comboBoxShift.Size = new Size(159, 28);
comboBoxShift.TabIndex = 30; comboBoxShift.TabIndex = 30;
// //
// buttonCancel // buttonCancel
// //
buttonCancel.Location = new Point(172, 226); buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonCancel.Location = new Point(196, 427);
buttonCancel.Margin = new Padding(3, 4, 3, 4);
buttonCancel.Name = "buttonCancel"; buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(75, 23); buttonCancel.Size = new Size(86, 31);
buttonCancel.TabIndex = 28; buttonCancel.TabIndex = 28;
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
@ -97,9 +107,11 @@
// //
// buttonTripSave // buttonTripSave
// //
buttonTripSave.Location = new Point(9, 226); buttonTripSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonTripSave.Location = new Point(9, 427);
buttonTripSave.Margin = new Padding(3, 4, 3, 4);
buttonTripSave.Name = "buttonTripSave"; buttonTripSave.Name = "buttonTripSave";
buttonTripSave.Size = new Size(75, 23); buttonTripSave.Size = new Size(86, 31);
buttonTripSave.TabIndex = 27; buttonTripSave.TabIndex = 27;
buttonTripSave.Text = "Сохранить"; buttonTripSave.Text = "Сохранить";
buttonTripSave.UseVisualStyleBackColor = true; buttonTripSave.UseVisualStyleBackColor = true;
@ -108,97 +120,127 @@
// label6 // label6
// //
label6.AutoSize = true; label6.AutoSize = true;
label6.Location = new Point(9, 18); label6.Location = new Point(10, 24);
label6.Name = "label6"; label6.Name = "label6";
label6.Size = new Size(74, 15); label6.Size = new Size(94, 20);
label6.TabIndex = 37; label6.TabIndex = 37;
label6.Text = "Дата начала"; label6.Text = "Дата начала";
// //
// dateTimePickerStartDate // dateTimePickerStartDate
// //
dateTimePickerStartDate.Location = new Point(107, 12); dateTimePickerStartDate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
dateTimePickerStartDate.Location = new Point(122, 16);
dateTimePickerStartDate.Margin = new Padding(3, 4, 3, 4);
dateTimePickerStartDate.Name = "dateTimePickerStartDate"; dateTimePickerStartDate.Name = "dateTimePickerStartDate";
dateTimePickerStartDate.Size = new Size(140, 23); dateTimePickerStartDate.Size = new Size(159, 27);
dateTimePickerStartDate.TabIndex = 36; dateTimePickerStartDate.TabIndex = 36;
// //
// label1 // label1
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Location = new Point(9, 47); label1.Location = new Point(10, 63);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new Size(68, 15); label1.Size = new Size(87, 20);
label1.TabIndex = 39; label1.TabIndex = 39;
label1.Text = "Дата конца"; label1.Text = "Дата конца";
// //
// dateTimePickerEndDate // dateTimePickerEndDate
// //
dateTimePickerEndDate.Location = new Point(107, 41); dateTimePickerEndDate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
dateTimePickerEndDate.Location = new Point(122, 55);
dateTimePickerEndDate.Margin = new Padding(3, 4, 3, 4);
dateTimePickerEndDate.Name = "dateTimePickerEndDate"; dateTimePickerEndDate.Name = "dateTimePickerEndDate";
dateTimePickerEndDate.Size = new Size(140, 23); dateTimePickerEndDate.Size = new Size(159, 27);
dateTimePickerEndDate.TabIndex = 38; dateTimePickerEndDate.TabIndex = 38;
// //
// label3 // label3
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Location = new Point(9, 130); label3.Location = new Point(10, 173);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new Size(55, 15); label3.Size = new Size(68, 20);
label3.TabIndex = 42; label3.TabIndex = 42;
label3.Text = "Машина"; label3.Text = "Машина";
// //
// comboBoxCarID // comboBoxCarID
// //
comboBoxCarID.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxCarID.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxCarID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxCarID.FormattingEnabled = true; comboBoxCarID.FormattingEnabled = true;
comboBoxCarID.Location = new Point(107, 127); comboBoxCarID.Location = new Point(122, 169);
comboBoxCarID.Margin = new Padding(3, 4, 3, 4);
comboBoxCarID.Name = "comboBoxCarID"; comboBoxCarID.Name = "comboBoxCarID";
comboBoxCarID.Size = new Size(140, 23); comboBoxCarID.Size = new Size(159, 28);
comboBoxCarID.TabIndex = 41; comboBoxCarID.TabIndex = 41;
// //
// comboBoxDriverID // comboBoxDriverID
// //
comboBoxDriverID.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxDriverID.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxDriverID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxDriverID.FormattingEnabled = true; comboBoxDriverID.FormattingEnabled = true;
comboBoxDriverID.Location = new Point(107, 157); comboBoxDriverID.Location = new Point(122, 209);
comboBoxDriverID.Margin = new Padding(3, 4, 3, 4);
comboBoxDriverID.Name = "comboBoxDriverID"; comboBoxDriverID.Name = "comboBoxDriverID";
comboBoxDriverID.Size = new Size(140, 23); comboBoxDriverID.Size = new Size(159, 28);
comboBoxDriverID.TabIndex = 46; comboBoxDriverID.TabIndex = 46;
// //
// label2
//
label2.AutoSize = true;
label2.Location = new Point(9, 189);
label2.Name = "label2";
label2.Size = new Size(60, 15);
label2.TabIndex = 45;
label2.Text = "Маршрут";
//
// comboBoxRouteID
//
comboBoxRouteID.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxRouteID.FormattingEnabled = true;
comboBoxRouteID.Location = new Point(107, 186);
comboBoxRouteID.Name = "comboBoxRouteID";
comboBoxRouteID.Size = new Size(140, 23);
comboBoxRouteID.TabIndex = 44;
//
// label7 // label7
// //
label7.AutoSize = true; label7.AutoSize = true;
label7.Location = new Point(9, 160); label7.Location = new Point(10, 213);
label7.Name = "label7"; label7.Name = "label7";
label7.Size = new Size(58, 15); label7.Size = new Size(74, 20);
label7.TabIndex = 43; label7.TabIndex = 43;
label7.Text = "Водитель"; label7.Text = "Водитель";
// //
// groupBox
//
groupBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
groupBox.Controls.Add(dataGridViewRoutes);
groupBox.Location = new Point(10, 254);
groupBox.Name = "groupBox";
groupBox.Size = new Size(272, 166);
groupBox.TabIndex = 47;
groupBox.TabStop = false;
groupBox.Text = "Маршруты";
//
// dataGridViewRoutes
//
dataGridViewRoutes.AllowUserToResizeColumns = false;
dataGridViewRoutes.AllowUserToResizeRows = false;
dataGridViewRoutes.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewRoutes.Columns.AddRange(new DataGridViewColumn[] { ColumnRoute, ColumnEndPoint });
dataGridViewRoutes.Dock = DockStyle.Fill;
dataGridViewRoutes.Location = new Point(3, 23);
dataGridViewRoutes.MultiSelect = false;
dataGridViewRoutes.Name = "dataGridViewRoutes";
dataGridViewRoutes.RowHeadersVisible = false;
dataGridViewRoutes.RowHeadersWidth = 51;
dataGridViewRoutes.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridViewRoutes.Size = new Size(266, 140);
dataGridViewRoutes.TabIndex = 0;
//
// ColumnRoute
//
ColumnRoute.HeaderText = "Маршрут";
ColumnRoute.MinimumWidth = 6;
ColumnRoute.Name = "ColumnRoute";
ColumnRoute.Width = 125;
//
// ColumnEndPoint
//
ColumnEndPoint.HeaderText = "Конечная точка";
ColumnEndPoint.MinimumWidth = 6;
ColumnEndPoint.Name = "ColumnEndPoint";
ColumnEndPoint.Width = 125;
//
// FormTrip // FormTrip
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(259, 266); ClientSize = new Size(289, 468);
Controls.Add(groupBox);
Controls.Add(comboBoxDriverID); Controls.Add(comboBoxDriverID);
Controls.Add(label2);
Controls.Add(comboBoxRouteID);
Controls.Add(label7); Controls.Add(label7);
Controls.Add(label3); Controls.Add(label3);
Controls.Add(comboBoxCarID); Controls.Add(comboBoxCarID);
@ -212,9 +254,13 @@
Controls.Add(comboBoxShift); Controls.Add(comboBoxShift);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonTripSave); Controls.Add(buttonTripSave);
Margin = new Padding(3, 4, 3, 4);
Name = "FormTrip"; Name = "FormTrip";
StartPosition = FormStartPosition.CenterParent;
Text = "FormTrip"; Text = "FormTrip";
((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).EndInit();
groupBox.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).EndInit();
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }
@ -234,8 +280,10 @@
private Label label3; private Label label3;
private ComboBox comboBoxCarID; private ComboBox comboBoxCarID;
private ComboBox comboBoxDriverID; private ComboBox comboBoxDriverID;
private Label label2;
private ComboBox comboBoxRouteID;
private Label label7; private Label label7;
private GroupBox groupBox;
private DataGridView dataGridViewRoutes;
private DataGridViewComboBoxColumn ColumnRoute;
private DataGridViewTextBoxColumn ColumnEndPoint;
} }
} }

View File

@ -23,18 +23,18 @@ namespace FuelAndLubricants.Forms
comboBoxDriverID.DisplayMember = "Firstname"; comboBoxDriverID.DisplayMember = "Firstname";
comboBoxDriverID.ValueMember = "Driver_ID"; comboBoxDriverID.ValueMember = "Driver_ID";
comboBoxRouteID.DataSource = tripRepository.ReadTrips(); ColumnRoute.DataSource = routeRepository.ReadRoutes();
comboBoxRouteID.DisplayMember = "Route_Length"; ColumnRoute.DisplayMember = "Start_Point";
comboBoxRouteID.ValueMember = "Route_ID"; ColumnRoute.ValueMember = "Route_ID";
} }
private void ButtonSave_Click(object sender, EventArgs e) private void ButtonSave_Click(object sender, EventArgs e)
{ {
try try
{ {
if (comboBoxCarID.SelectedIndex < 0 || comboBoxDriverID.SelectedIndex < 0 || comboBoxRouteID.SelectedIndex < 0) if (comboBoxCarID.SelectedIndex < 0 || comboBoxDriverID.SelectedIndex < 0 || dataGridViewRoutes.RowCount < 0)
throw new Exception("Имеются незаполненные поля"); throw new Exception("Имеются незаполненные поля");
_tripRepository.CreateTrip(Trip.CreateOperation(0, dateTimePickerStartDate.Value, dateTimePickerEndDate.Value, (Shift)comboBoxShift.SelectedItem!, (float)numericUpDownConsumptionRate.Value, (int)comboBoxCarID.SelectedValue!, (int)comboBoxDriverID.SelectedValue!, (int)comboBoxRouteID.SelectedValue!)); _tripRepository.CreateTrip(Trip.CreateOperation(0, dateTimePickerStartDate.Value, dateTimePickerEndDate.Value, (Shift)comboBoxShift.SelectedItem!, (float)numericUpDownConsumptionRate.Value, (int)comboBoxCarID.SelectedValue!, (int)comboBoxDriverID.SelectedValue!, CreateListDriversFromDataGrid()));
Close(); Close();
} }
catch (Exception ex) catch (Exception ex)
@ -44,5 +44,19 @@ namespace FuelAndLubricants.Forms
} }
} }
private void ButtonCancel_Click(object sender, EventArgs e) => Close(); private void ButtonCancel_Click(object sender, EventArgs e) => Close();
private List<Route> CreateListDriversFromDataGrid()
{
var list = new List<Route>();
foreach (DataGridViewRow row in dataGridViewRoutes.Rows)
{
if (row.Cells["ColumnRoute"].Value == null || row.Cells["ColumnEndPoint"].Value == null)
continue;
list.Add(Route.CreateEntity(0, (string)row.Cells["ColumnRoute"].Value, (string)row.Cells["ColumnEndPoint"].Value, 0));
}
return list;
}
} }
} }

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@ -117,4 +117,16 @@
<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="ColumnRoute.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnEndPoint.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnRoute.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnEndPoint.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

View File

@ -39,18 +39,20 @@
// //
panel1.Controls.Add(buttonAdd); panel1.Controls.Add(buttonAdd);
panel1.Dock = DockStyle.Right; panel1.Dock = DockStyle.Right;
panel1.Location = new Point(689, 0); panel1.Location = new Point(787, 0);
panel1.Margin = new Padding(3, 4, 3, 4);
panel1.Name = "panel1"; panel1.Name = "panel1";
panel1.Size = new Size(98, 291); panel1.Size = new Size(112, 388);
panel1.TabIndex = 0; panel1.TabIndex = 0;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.BackgroundImage = Properties.Resources.Добавить; buttonAdd.BackgroundImage = Properties.Resources.Добавить;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(11, 12); buttonAdd.Location = new Point(13, 16);
buttonAdd.Margin = new Padding(3, 4, 3, 4);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(75, 75); buttonAdd.Size = new Size(86, 100);
buttonAdd.TabIndex = 5; buttonAdd.TabIndex = 5;
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
@ -65,22 +67,26 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Fill; dataGridView.Dock = DockStyle.Fill;
dataGridView.Location = new Point(0, 0); dataGridView.Location = new Point(0, 0);
dataGridView.Margin = new Padding(3, 4, 3, 4);
dataGridView.MultiSelect = false; dataGridView.MultiSelect = false;
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.ReadOnly = true; dataGridView.ReadOnly = true;
dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(689, 291); dataGridView.Size = new Size(787, 388);
dataGridView.TabIndex = 4; dataGridView.TabIndex = 4;
// //
// FormTrips // FormTrips
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(787, 291); ClientSize = new Size(899, 388);
Controls.Add(dataGridView); Controls.Add(dataGridView);
Controls.Add(panel1); Controls.Add(panel1);
Margin = new Padding(3, 4, 3, 4);
Name = "FormTrips"; Name = "FormTrips";
StartPosition = FormStartPosition.CenterParent;
Text = "Поездки"; Text = "Поездки";
Load += FormTrips_Load; Load += FormTrips_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
@ -48,7 +48,7 @@
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter