Работает ЛР2

This commit is contained in:
Павел Ладягин 2024-12-04 14:53:47 +04:00
parent bdd0edb412
commit d315bb4ef8
7 changed files with 6 additions and 14 deletions

View File

@ -148,6 +148,7 @@
numericUpDownConsumptionRate.DecimalPlaces = 2; numericUpDownConsumptionRate.DecimalPlaces = 2;
numericUpDownConsumptionRate.Location = new Point(122, 263); numericUpDownConsumptionRate.Location = new Point(122, 263);
numericUpDownConsumptionRate.Margin = new Padding(3, 4, 3, 4); numericUpDownConsumptionRate.Margin = new Padding(3, 4, 3, 4);
numericUpDownConsumptionRate.Maximum = new decimal(new int[] { 1000, 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(160, 27); numericUpDownConsumptionRate.Size = new Size(160, 27);

View File

@ -55,6 +55,7 @@
numericUpDownPrice.DecimalPlaces = 2; numericUpDownPrice.DecimalPlaces = 2;
numericUpDownPrice.Location = new Point(120, 51); numericUpDownPrice.Location = new Point(120, 51);
numericUpDownPrice.Margin = new Padding(3, 4, 3, 4); numericUpDownPrice.Margin = new Padding(3, 4, 3, 4);
numericUpDownPrice.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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(160, 27); numericUpDownPrice.Size = new Size(160, 27);

View File

@ -107,6 +107,7 @@
numericUpDownRefillAmount.DecimalPlaces = 2; numericUpDownRefillAmount.DecimalPlaces = 2;
numericUpDownRefillAmount.Location = new Point(125, 52); numericUpDownRefillAmount.Location = new Point(125, 52);
numericUpDownRefillAmount.Margin = new Padding(3, 4, 3, 4); numericUpDownRefillAmount.Margin = new Padding(3, 4, 3, 4);
numericUpDownRefillAmount.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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(160, 27); numericUpDownRefillAmount.Size = new Size(160, 27);

View File

@ -54,6 +54,7 @@
numericUpDownLength.DecimalPlaces = 2; numericUpDownLength.DecimalPlaces = 2;
numericUpDownLength.Location = new Point(134, 91); numericUpDownLength.Location = new Point(134, 91);
numericUpDownLength.Margin = new Padding(3, 4, 3, 4); numericUpDownLength.Margin = new Padding(3, 4, 3, 4);
numericUpDownLength.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
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(160, 27); numericUpDownLength.Size = new Size(160, 27);

View File

@ -45,7 +45,6 @@
groupBox = new GroupBox(); groupBox = new GroupBox();
dataGridViewRoutes = new DataGridView(); dataGridViewRoutes = new DataGridView();
ColumnRoute = new DataGridViewComboBoxColumn(); ColumnRoute = new DataGridViewComboBoxColumn();
ColumnRouteLength = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).BeginInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).BeginInit();
groupBox.SuspendLayout(); groupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).BeginInit();
@ -209,7 +208,7 @@
dataGridViewRoutes.AllowUserToResizeColumns = false; dataGridViewRoutes.AllowUserToResizeColumns = false;
dataGridViewRoutes.AllowUserToResizeRows = false; dataGridViewRoutes.AllowUserToResizeRows = false;
dataGridViewRoutes.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewRoutes.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewRoutes.Columns.AddRange(new DataGridViewColumn[] { ColumnRoute, ColumnRouteLength }); dataGridViewRoutes.Columns.AddRange(new DataGridViewColumn[] { ColumnRoute });
dataGridViewRoutes.Dock = DockStyle.Fill; dataGridViewRoutes.Dock = DockStyle.Fill;
dataGridViewRoutes.Location = new Point(3, 23); dataGridViewRoutes.Location = new Point(3, 23);
dataGridViewRoutes.MultiSelect = false; dataGridViewRoutes.MultiSelect = false;
@ -227,13 +226,6 @@
ColumnRoute.Name = "ColumnRoute"; ColumnRoute.Name = "ColumnRoute";
ColumnRoute.Width = 125; ColumnRoute.Width = 125;
// //
// ColumnRouteLength
//
ColumnRouteLength.HeaderText = "Длина";
ColumnRouteLength.MinimumWidth = 6;
ColumnRouteLength.Name = "ColumnRouteLength";
ColumnRouteLength.Width = 125;
//
// FormTrip // FormTrip
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
@ -284,6 +276,5 @@
private GroupBox groupBox; private GroupBox groupBox;
private DataGridView dataGridViewRoutes; private DataGridView dataGridViewRoutes;
private DataGridViewComboBoxColumn ColumnRoute; private DataGridViewComboBoxColumn ColumnRoute;
private DataGridViewTextBoxColumn ColumnRouteLength;
} }
} }

View File

@ -52,7 +52,7 @@ namespace FuelAndLubricants.Forms
var list = new List<Trip_Route>(); var list = new List<Trip_Route>();
foreach (DataGridViewRow row in dataGridViewRoutes.Rows) foreach (DataGridViewRow row in dataGridViewRoutes.Rows)
{ {
if (row.Cells["ColumnRoute"].Value == null || row.Cells["ColumnRouteLength"].Value == null) if (row.Cells["ColumnRoute"].Value == null)
continue; continue;
//string columnFullRoute = ""; //string columnFullRoute = "";

View File

@ -120,7 +120,4 @@
<metadata name="ColumnRoute.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="ColumnRoute.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="ColumnRouteLength.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>