diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormCar.Designer.cs b/FuelAndLubricants/FuelAndLubricants/Forms/FormCar.Designer.cs index a17b551..855f7e4 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormCar.Designer.cs +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormCar.Designer.cs @@ -148,6 +148,7 @@ numericUpDownConsumptionRate.DecimalPlaces = 2; numericUpDownConsumptionRate.Location = new Point(122, 263); 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.Name = "numericUpDownConsumptionRate"; numericUpDownConsumptionRate.Size = new Size(160, 27); diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormFuel.Designer.cs b/FuelAndLubricants/FuelAndLubricants/Forms/FormFuel.Designer.cs index 68ec4b5..35f1d4d 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormFuel.Designer.cs +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormFuel.Designer.cs @@ -55,6 +55,7 @@ numericUpDownPrice.DecimalPlaces = 2; numericUpDownPrice.Location = new Point(120, 51); 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.Name = "numericUpDownPrice"; numericUpDownPrice.Size = new Size(160, 27); diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormRefill.Designer.cs b/FuelAndLubricants/FuelAndLubricants/Forms/FormRefill.Designer.cs index 2ba153e..f2169a1 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormRefill.Designer.cs +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormRefill.Designer.cs @@ -107,6 +107,7 @@ numericUpDownRefillAmount.DecimalPlaces = 2; numericUpDownRefillAmount.Location = new Point(125, 52); 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.Name = "numericUpDownRefillAmount"; numericUpDownRefillAmount.Size = new Size(160, 27); diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormRoute.Designer.cs b/FuelAndLubricants/FuelAndLubricants/Forms/FormRoute.Designer.cs index ac63bb4..0b38288 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormRoute.Designer.cs +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormRoute.Designer.cs @@ -54,6 +54,7 @@ numericUpDownLength.DecimalPlaces = 2; numericUpDownLength.Location = new Point(134, 91); 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.Name = "numericUpDownLength"; numericUpDownLength.Size = new Size(160, 27); diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.Designer.cs b/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.Designer.cs index 2851a7c..b2bc027 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.Designer.cs +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.Designer.cs @@ -45,7 +45,6 @@ groupBox = new GroupBox(); dataGridViewRoutes = new DataGridView(); ColumnRoute = new DataGridViewComboBoxColumn(); - ColumnRouteLength = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)numericUpDownConsumptionRate).BeginInit(); groupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).BeginInit(); @@ -209,7 +208,7 @@ dataGridViewRoutes.AllowUserToResizeColumns = false; dataGridViewRoutes.AllowUserToResizeRows = false; dataGridViewRoutes.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewRoutes.Columns.AddRange(new DataGridViewColumn[] { ColumnRoute, ColumnRouteLength }); + dataGridViewRoutes.Columns.AddRange(new DataGridViewColumn[] { ColumnRoute }); dataGridViewRoutes.Dock = DockStyle.Fill; dataGridViewRoutes.Location = new Point(3, 23); dataGridViewRoutes.MultiSelect = false; @@ -227,13 +226,6 @@ ColumnRoute.Name = "ColumnRoute"; ColumnRoute.Width = 125; // - // ColumnRouteLength - // - ColumnRouteLength.HeaderText = "Длина"; - ColumnRouteLength.MinimumWidth = 6; - ColumnRouteLength.Name = "ColumnRouteLength"; - ColumnRouteLength.Width = 125; - // // FormTrip // AutoScaleDimensions = new SizeF(8F, 20F); @@ -284,6 +276,5 @@ private GroupBox groupBox; private DataGridView dataGridViewRoutes; private DataGridViewComboBoxColumn ColumnRoute; - private DataGridViewTextBoxColumn ColumnRouteLength; } } \ No newline at end of file diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.cs b/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.cs index bacd894..562f87d 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.cs +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.cs @@ -52,7 +52,7 @@ namespace FuelAndLubricants.Forms var list = new List(); foreach (DataGridViewRow row in dataGridViewRoutes.Rows) { - if (row.Cells["ColumnRoute"].Value == null || row.Cells["ColumnRouteLength"].Value == null) + if (row.Cells["ColumnRoute"].Value == null) continue; //string columnFullRoute = ""; diff --git a/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.resx b/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.resx index c487f49..411cc3c 100644 --- a/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.resx +++ b/FuelAndLubricants/FuelAndLubricants/Forms/FormTrip.resx @@ -120,7 +120,4 @@ True - - True - \ No newline at end of file