From cb191301197d055c4393acdea640a3a10b4f2646 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Mon, 28 Oct 2024 15:52:40 -0600 Subject: [PATCH] Fix bug where extra fields causes columns to be misaligned. --- Views/Vehicle/_CollisionRecords.cshtml | 20 ++++++++-------- Views/Vehicle/_Gas.cshtml | 32 +++++++++++++------------- Views/Vehicle/_OdometerRecords.cshtml | 20 ++++++++-------- Views/Vehicle/_ReminderRecords.cshtml | 16 ++++++------- Views/Vehicle/_ServiceRecords.cshtml | 20 ++++++++-------- Views/Vehicle/_SupplyRecords.cshtml | 28 +++++++++++----------- Views/Vehicle/_TaxRecords.cshtml | 16 ++++++------- Views/Vehicle/_UpgradeRecords.cshtml | 20 ++++++++-------- 8 files changed, 86 insertions(+), 86 deletions(-) diff --git a/Views/Vehicle/_CollisionRecords.cshtml b/Views/Vehicle/_CollisionRecords.cshtml index 18e66d4..ee1f0d6 100644 --- a/Views/Vehicle/_CollisionRecords.cshtml +++ b/Views/Vehicle/_CollisionRecords.cshtml @@ -107,14 +107,14 @@ - - - - - + + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -122,10 +122,10 @@ @foreach (CollisionRecord collisionRecord in Model) { - - - - + + + + @foreach (string extraFieldColumn in extraFields) { diff --git a/Views/Vehicle/_Gas.cshtml b/Views/Vehicle/_Gas.cshtml index 0c0e0e3..3e21499 100644 --- a/Views/Vehicle/_Gas.cshtml +++ b/Views/Vehicle/_Gas.cshtml @@ -171,17 +171,17 @@
@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")
@collisionRecord.Date.ToShortDateString()@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())@collisionRecord.Description@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C"))@collisionRecord.Date.ToShortDateString()@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())@collisionRecord.Description@((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C")) @CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes)
- - - - - - - - + + + + + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -189,13 +189,13 @@ @foreach (GasRecordViewModel gasRecord in Model.GasRecords) { - - - - - - - + + + + + + + @foreach (string extraFieldColumn in extraFields) { diff --git a/Views/Vehicle/_OdometerRecords.cshtml b/Views/Vehicle/_OdometerRecords.cshtml index 3e9302e..9cea8c3 100644 --- a/Views/Vehicle/_OdometerRecords.cshtml +++ b/Views/Vehicle/_OdometerRecords.cshtml @@ -107,14 +107,14 @@
@translator.Translate(userLanguage, "Date Refueled")@($"{translator.Translate(userLanguage, "Odometer")}({distanceUnit})")@($"Δ({distanceUnit})")@($"{translator.Translate(userLanguage, "Consumption")}({consumptionUnit})")@($"{@translator.Translate(userLanguage, "Fuel Economy")}({fuelEconomyUnit})")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Unit Cost")@translator.Translate(userLanguage, "Date Refueled")@($"{translator.Translate(userLanguage, "Odometer")}({distanceUnit})")@($"Δ({distanceUnit})")@($"{translator.Translate(userLanguage, "Consumption")}({consumptionUnit})")@($"{@translator.Translate(userLanguage, "Fuel Economy")}({fuelEconomyUnit})")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Unit Cost")
@gasRecord.Date@(gasRecord.Mileage == default ? "---" : gasRecord.Mileage.ToString())@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)@gasRecord.Gallons.ToString("F")@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))@gasRecord.Date@(gasRecord.Mileage == default ? "---" : gasRecord.Mileage.ToString())@(gasRecord.DeltaMileage == default ? "---" : gasRecord.DeltaMileage)@gasRecord.Gallons.ToString("F")@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))
- - - - - + + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -122,10 +122,10 @@ @foreach (OdometerRecord odometerRecord in Model) { - - - - + + + + @foreach (string extraFieldColumn in extraFields) { diff --git a/Views/Vehicle/_ReminderRecords.cshtml b/Views/Vehicle/_ReminderRecords.cshtml index a260855..a485e11 100644 --- a/Views/Vehicle/_ReminderRecords.cshtml +++ b/Views/Vehicle/_ReminderRecords.cshtml @@ -42,15 +42,15 @@
@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Initial Odometer")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Distance")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Initial Odometer")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Distance")@translator.Translate(userLanguage, "Notes")
@odometerRecord.Date.ToShortDateString()@odometerRecord.InitialMileage@odometerRecord.Mileage@(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled)@odometerRecord.Date.ToShortDateString()@odometerRecord.InitialMileage@odometerRecord.Mileage@(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled) @CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75)
- - - - + + + + @if (hasRefresh) { - + } - + @@ -73,7 +73,7 @@ { } - - + @if (hasRefresh) { diff --git a/Views/Vehicle/_ServiceRecords.cshtml b/Views/Vehicle/_ServiceRecords.cshtml index fab3af9..26a7a25 100644 --- a/Views/Vehicle/_ServiceRecords.cshtml +++ b/Views/Vehicle/_ServiceRecords.cshtml @@ -107,14 +107,14 @@
@translator.Translate(userLanguage, "Urgency")@translator.Translate(userLanguage, "Metric")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Urgency")@translator.Translate(userLanguage, "Metric")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Done")@translator.Translate(userLanguage, "Done")@translator.Translate(userLanguage, "Delete")@translator.Translate(userLanguage, "Delete")
@translator.Translate(userLanguage, "Not Urgent") + {reminderRecord.Date.ToShortDateString()}{reminderRecord.Mileage}")"> @if (reminderRecord.Metric == ReminderMetric.Date) { @@ -89,7 +89,7 @@ } @reminderRecord.Description@reminderRecord.Description @CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes)
- - - - - + + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -122,10 +122,10 @@ @foreach (ServiceRecord serviceRecord in Model) { - - - - + + + + @foreach (string extraFieldColumn in extraFields) { diff --git a/Views/Vehicle/_SupplyRecords.cshtml b/Views/Vehicle/_SupplyRecords.cshtml index 0f47cdc..62d027b 100644 --- a/Views/Vehicle/_SupplyRecords.cshtml +++ b/Views/Vehicle/_SupplyRecords.cshtml @@ -119,16 +119,16 @@
@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")
@serviceRecord.Date.ToShortDateString()@(serviceRecord.Mileage == default ? "---" : serviceRecord.Mileage.ToString())@serviceRecord.Description@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C"))@serviceRecord.Date.ToShortDateString()@(serviceRecord.Mileage == default ? "---" : serviceRecord.Mileage.ToString())@serviceRecord.Description@((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C")) @CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes)
- - - - - - - + + + + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -136,12 +136,12 @@ @foreach (SupplyRecord supplyRecord in Model) { - - - - - - + + + + + + @foreach (string extraFieldColumn in extraFields) { diff --git a/Views/Vehicle/_TaxRecords.cshtml b/Views/Vehicle/_TaxRecords.cshtml index 1cab09a..8331499 100644 --- a/Views/Vehicle/_TaxRecords.cshtml +++ b/Views/Vehicle/_TaxRecords.cshtml @@ -101,13 +101,13 @@
@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Part #")@translator.Translate(userLanguage, "Supplier")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Quantity")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Part #")@translator.Translate(userLanguage, "Supplier")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Quantity")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")
@supplyRecord.Date.ToShortDateString()@supplyRecord.PartNumber@supplyRecord.PartSupplier@supplyRecord.Description@supplyRecord.Quantity@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C"))@supplyRecord.Date.ToShortDateString()@supplyRecord.PartNumber@supplyRecord.PartSupplier@supplyRecord.Description@supplyRecord.Quantity@((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C")) @CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes)
- - - - + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -115,9 +115,9 @@ @foreach (TaxRecord taxRecord in Model) { - - - + + + @foreach (string extraFieldColumn in extraFields) { diff --git a/Views/Vehicle/_UpgradeRecords.cshtml b/Views/Vehicle/_UpgradeRecords.cshtml index 147c319..721c8ee 100644 --- a/Views/Vehicle/_UpgradeRecords.cshtml +++ b/Views/Vehicle/_UpgradeRecords.cshtml @@ -107,14 +107,14 @@
@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")
@taxRecord.Date.ToShortDateString()@taxRecord.Description@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C"))@taxRecord.Date.ToShortDateString()@taxRecord.Description@((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C")) @CarCareTracker.Helper.StaticHelper.TruncateStrings(taxRecord.Notes)
- - - - - + + + + + @foreach (string extraFieldColumn in extraFields) { - + } @@ -122,10 +122,10 @@ @foreach (UpgradeRecord upgradeRecord in Model) { - - - - + + + + @foreach (string extraFieldColumn in extraFields) {
@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")
@upgradeRecord.Date.ToShortDateString()@(upgradeRecord.Mileage == default ? "---" : upgradeRecord.Mileage.ToString())@upgradeRecord.Description@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C"))@upgradeRecord.Date.ToShortDateString()@(upgradeRecord.Mileage == default ? "---" : upgradeRecord.Mileage.ToString())@upgradeRecord.Description@((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C")) @CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes)