cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added missedfuelup and partialfuelup to csv export and import.

Browse Source
This commit is contained in:
DESKTOP-GENO133\IvanPlex
2024-01-15 09:54:05 -07:00
parent 6ffa856795
commit bd3b821226
6 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Controllers/VehicleController.cs
View File

@@ -235,7 +235,15 @@ namespace CarCareTracker.Controllers
bool useUKMPG = _config.GetUserConfig(User).UseUKMPG;
vehicleRecords = vehicleRecords.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
var convertedRecords = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG);
var exportData = convertedRecords.Select(x => new GasRecordExportModel { Date = x.Date.ToString(), Cost = x.Cost.ToString(), FuelConsumed = x.Gallons.ToString(), FuelEconomy = x.MilesPerGallon.ToString(), Odometer = x.Mileage.ToString() });
var exportData = convertedRecords.Select(x => new GasRecordExportModel {
Date = x.Date.ToString(),
Cost = x.Cost.ToString(),
FuelConsumed = x.Gallons.ToString(),
FuelEconomy = x.MilesPerGallon.ToString(),
Odometer = x.Mileage.ToString(),
IsFillToFull = x.IsFillToFull.ToString(),
MissedFuelUp = x.MissedFuelUp.ToString()
});
using (var writer = new StreamWriter(fullExportFilePath))
{
using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
@@ -302,12 +310,14 @@ namespace CarCareTracker.Controllers
convertedRecord.IsFillToFull = !parsedBool;
} else if (!string.IsNullOrWhiteSpace(importModel.IsFillToFull))
{
var parsedBool = importModel.IsFillToFull.Trim() == "1" || importModel.IsFillToFull.Trim() == "Full";
var possibleFillToFullValues = new List<string> { "1", "true", "full" };
var parsedBool = possibleFillToFullValues.Contains(importModel.IsFillToFull.Trim().ToLower());
convertedRecord.IsFillToFull = parsedBool;
}
if (!string.IsNullOrWhiteSpace(importModel.MissedFuelUp))
{
var parsedBool = importModel.MissedFuelUp.Trim() == "1";
var possibleMissedFuelUpValues = new List<string> { "1", "true" };
var parsedBool = possibleMissedFuelUpValues.Contains(importModel.MissedFuelUp.Trim().ToLower());
convertedRecord.MissedFuelUp = parsedBool;
}
//insert record into db, check to make sure fuelconsumed is not zero so we don't get a divide by zero error.

8
Helper/GasHelper.cs
View File

@@ -42,7 +42,9 @@ namespace CarCareTracker.Helper
Gallons = convertedConsumption,
Cost = currentObject.Cost,
DeltaMileage = deltaMileage,
CostPerGallon = currentObject.Cost / convertedConsumption
CostPerGallon = currentObject.Cost / convertedConsumption,
IsFillToFull = currentObject.IsFillToFull,
MissedFuelUp = currentObject.MissedFuelUp
};
if (currentObject.MissedFuelUp)
{
@@ -81,7 +83,9 @@ namespace CarCareTracker.Helper
Cost = currentObject.Cost,
DeltaMileage = 0,
MilesPerGallon = 0,
CostPerGallon = currentObject.Cost / convertedConsumption
CostPerGallon = currentObject.Cost / convertedConsumption,
IsFillToFull = currentObject.IsFillToFull,
MissedFuelUp = currentObject.MissedFuelUp
});
}
previousMileage = currentObject.Mileage;

2
MapProfile/FuellyMappers.cs
View File

@@ -16,7 +16,7 @@ namespace CarCareTracker.MapProfile
Map(m => m.PartialFuelUp).Name(["partial_fuelup"]);
Map(m => m.IsFillToFull).Name(["isfilltofull", "filled up"]);
Map(m => m.Description).Name(["description"]);
Map(m => m.MissedFuelUp).Name(["missed_fuelup"]);
Map(m => m.MissedFuelUp).Name(["missed_fuelup", "missedfuelup"]);
}
}
}

2
Models/GasRecord/GasRecordViewModel.cs
View File

@@ -18,5 +18,7 @@
public int DeltaMileage { get; set; }
public decimal MilesPerGallon { get; set; }
public decimal CostPerGallon { get; set; }
public bool IsFillToFull { get; set; }
public bool MissedFuelUp { get; set; }
}
}

2
Models/ImportModel.cs
View File

@@ -40,6 +40,8 @@
public string FuelConsumed { get; set; }
public string Cost { get; set; }
public string FuelEconomy { get; set; }
public string IsFillToFull { get; set; }
public string MissedFuelUp { get; set; }
}
public class ReminderExportModel
{

4
wwwroot/css/site.css
View File

@@ -231,3 +231,7 @@ html {
display: none;
}
}
.dropdown-menu.show{
z-index: 1030;
}