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

Merge pull request #105 from hargata/Hargata/qol

Browse Source 
Quality of Life Improvements.
This commit is contained in:
Hargata Softworks
2024-01-15 10:10:01 -07:00
committed by GitHub
parent 4ccfcd6be7 d2686949c5
commit b03460d6bb
21 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Controllers/APIController.cs
View File

@@ -107,7 +107,16 @@ namespace CarCareTracker.Controllers
public IActionResult GasRecords(int vehicleId, bool useMPG, bool useUKMPG)
{
var vehicleRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId);
var result = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG).Select(x => new GasRecordExportModel { Date = x.Date, Odometer = x.Mileage.ToString(), Cost = x.Cost.ToString(), FuelConsumed = x.Gallons.ToString(), FuelEconomy = x.MilesPerGallon.ToString()});
var result = _gasHelper.GetGasRecordViewModels(vehicleRecords, useMPG, useUKMPG)
.Select(x => new GasRecordExportModel {
Date = x.Date,
Odometer = x.Mileage.ToString(),
Cost = x.Cost.ToString(),
FuelConsumed = x.Gallons.ToString(),
FuelEconomy = x.MilesPerGallon.ToString(),
IsFillToFull = x.IsFillToFull.ToString(),
MissedFuelUp = x.MissedFuelUp.ToString()
});
return Json(result);
}
[TypeFilter(typeof(CollaboratorFilter))]

17
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.
@@ -634,7 +644,6 @@ namespace CarCareTracker.Controllers
allCosts.AddRange(_reportHelper.GetServiceRecordSum(serviceRecords, 0));
allCosts.AddRange(_reportHelper.GetRepairRecordSum(collisionRecords, 0));
allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
allCosts.AddRange(_reportHelper.GetUpgradeRecordSum(upgradeRecords, 0));
allCosts.AddRange(_reportHelper.GetGasRecordSum(gasRecords, 0));
allCosts.AddRange(_reportHelper.GetTaxRecordSum(taxRecords, 0));
viewModel.CostForVehicleByMonth = allCosts.GroupBy(x => new { x.MonthName, x.MonthId }).OrderBy(x => x.Key.MonthId).Select(x => new CostForVehicleByMonth

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/Collision/CollisionRecordInput.cs
View File

@@ -4,7 +4,7 @@
{
public int Id { get; set; }
public int VehicleId { get; set; }
public string Date { get; set; }
public string Date { get; set; } = DateTime.Now.ToShortDateString();
public int Mileage { get; set; }
public string Description { get; set; }
public decimal Cost { get; set; }

2
Models/GasRecord/GasRecordInput.cs
View File

@@ -4,7 +4,7 @@
{
public int Id { get; set; }
public int VehicleId { get; set; }
public string Date { get; set; }
public string Date { get; set; } = DateTime.Now.ToShortDateString();
/// <summary>
/// American moment
/// </summary>

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
{

2
Models/ServiceRecord/ServiceRecordInput.cs
View File

@@ -4,7 +4,7 @@
{
public int Id { get; set; }
public int VehicleId { get; set; }
public string Date { get; set; }
public string Date { get; set; } = DateTime.Now.ToShortDateString();
public int Mileage { get; set; }
public string Description { get; set; }
public decimal Cost { get; set; }

2
Models/TaxRecord/TaxRecordInput.cs
View File

@@ -4,7 +4,7 @@
{
public int Id { get; set; }
public int VehicleId { get; set; }
public string Date { get; set; }
public string Date { get; set; } = DateTime.Now.ToShortDateString();
public string Description { get; set; }
public decimal Cost { get; set; }
public string Notes { get; set; }

2
Models/Upgrades/UpgradeReportInput.cs
View File

@@ -4,7 +4,7 @@
{
public int Id { get; set; }
public int VehicleId { get; set; }
public string Date { get; set; }
public string Date { get; set; } = DateTime.Now.ToShortDateString();
public int Mileage { get; set; }
public string Description { get; set; }
public decimal Cost { get; set; }

4
Views/Admin/Index.cshtml
View File

@@ -37,7 +37,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-4">Token</th>
<th scope="col" class="col-6">Issued To</th>
@@ -62,7 +62,7 @@
<span class="lead">Users</span>
<hr />
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-4">Username</th>
<th scope="col" class="col-4">Email</th>

2
Views/Vehicle/_CollisionRecords.cshtml
View File

@@ -40,7 +40,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-1">Date</th>
<th scope="col" class="col-2">Odometer</th>

2
Views/Vehicle/_Gas.cshtml
View File

@@ -69,7 +69,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-2">Date Refueled</th>
<th scope="col" class="col-2">Odometer(@(distanceUnit))</th>

2
Views/Vehicle/_Notes.cshtml
View File

@@ -17,7 +17,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-3">Description</th>
<th scope="col" class="col-9">Note</th>

2
Views/Vehicle/_ReminderRecords.cshtml
View File

@@ -21,7 +21,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-1">Urgency</th>
<th scope="col" class="col-2">Metric</th>

2
Views/Vehicle/_ServiceRecords.cshtml
View File

@@ -40,7 +40,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-1">Date</th>
<th scope="col" class="col-2">Odometer</th>

2
Views/Vehicle/_TaxRecords.cshtml
View File

@@ -40,7 +40,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-1">Date</th>
<th scope="col" class="col-6">Description</th>

2
Views/Vehicle/_UpgradeRecords.cshtml
View File

@@ -40,7 +40,7 @@
</div>
</div>
<table class="table table-hover">
<thead>
<thead class="sticky-top">
<tr class="d-flex">
<th scope="col" class="col-1">Date</th>
<th scope="col" class="col-2">Odometer</th>

4
wwwroot/css/site.css
View File

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

6
wwwroot/defaults/gassample.csv
View File

@@ -1,3 +1,3 @@
Date,Odometer,FuelConsumed,Cost
5/8/2020,204836,8.331,16.24
5/30/2020,205056,11.913,25.72
Date,Odometer,FuelConsumed,Cost,IsFillToFull,MissedFuelUp
5/8/2020,204836,8.331,16.24,True,False
5/30/2020,205056,11.913,25.72,True,False
1 Date Odometer FuelConsumed Cost IsFillToFull MissedFuelUp
2 5/8/2020 204836 8.331 16.24 True False
3 5/30/2020 205056 11.913 25.72 True False