hargata/lubelog
1
0
Fork 0
mirror of https://github.com/hargata/lubelog.git synced 2025-12-10 00:46:08 -06:00
Code Issues Packages Projects Releases 51 Wiki Activity

Merge pull request #123 from hargata/Hargata/gas.enhancement

Browse Source 
Gas Enhancements
This commit is contained in:
Hargata Softworks 2024-01-19 09:56:14 -07:00 committed by GitHub
commit b05ded67a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Controllers/APIController.cs
View File

@ -118,7 +118,8 @@ namespace CarCareTracker.Controllers
FuelConsumed = x.Gallons.ToString(),
FuelEconomy = x.MilesPerGallon.ToString(),
IsFillToFull = x.IsFillToFull.ToString(),
MissedFuelUp = x.MissedFuelUp.ToString()
MissedFuelUp = x.MissedFuelUp.ToString(),
Notes = x.Notes
});
return Json(result);
}

9
Controllers/VehicleController.cs
View File

@ -271,7 +271,8 @@ namespace CarCareTracker.Controllers
FuelEconomy = x.MilesPerGallon.ToString(),
Odometer = x.Mileage.ToString(),
IsFillToFull = x.IsFillToFull.ToString(),
MissedFuelUp = x.MissedFuelUp.ToString()
MissedFuelUp = x.MissedFuelUp.ToString(),
Notes = x.Notes
});
using (var writer = new StreamWriter(fullExportFilePath))
{
@ -321,7 +322,8 @@ namespace CarCareTracker.Controllers
VehicleId = vehicleId,
Date = DateTime.Parse(importModel.Date),
Mileage = int.Parse(importModel.Odometer, NumberStyles.Any),
Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any)
Gallons = decimal.Parse(importModel.FuelConsumed, NumberStyles.Any),
Notes = string.IsNullOrWhiteSpace(importModel.Notes) ? "" : importModel.Notes
};
if (string.IsNullOrWhiteSpace(importModel.Cost) && !string.IsNullOrWhiteSpace(importModel.Price))
{
@ -487,7 +489,8 @@ namespace CarCareTracker.Controllers
Files = result.Files,
Gallons = result.Gallons,
IsFillToFull = result.IsFillToFull,
MissedFuelUp = result.MissedFuelUp
MissedFuelUp = result.MissedFuelUp,
Notes = result.Notes
};
var vehicleIsElectric = _dataAccess.GetVehicleById(convertedResult.VehicleId).IsElectric;
var viewModel = new GasRecordInputContainer()

6
Helper/GasHelper.cs
View File

@ -44,7 +44,8 @@ namespace CarCareTracker.Helper
DeltaMileage = deltaMileage,
CostPerGallon = convertedConsumption > 0.00M ? currentObject.Cost / convertedConsumption : 0,
IsFillToFull = currentObject.IsFillToFull,
MissedFuelUp = currentObject.MissedFuelUp
MissedFuelUp = currentObject.MissedFuelUp,
Notes = currentObject.Notes
};
if (currentObject.MissedFuelUp)
{
@ -88,7 +89,8 @@ namespace CarCareTracker.Helper
MilesPerGallon = 0,
CostPerGallon = convertedConsumption > 0.00M ? currentObject.Cost / convertedConsumption : 0,
IsFillToFull = currentObject.IsFillToFull,
MissedFuelUp = currentObject.MissedFuelUp
MissedFuelUp = currentObject.MissedFuelUp,
Notes = currentObject.Notes
});
}
previousMileage = currentObject.Mileage;

1
Models/GasRecord/GasRecord.cs
View File

@ -16,6 +16,7 @@
public decimal Cost { get; set; }
public bool IsFillToFull { get; set; } = true;
public bool MissedFuelUp { get; set; } = false;
public string Notes { get; set; }
public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
}
}

4
Models/GasRecord/GasRecordInput.cs
View File

@ -16,6 +16,7 @@
public decimal Cost { get; set; }
public bool IsFillToFull { get; set; } = true;
public bool MissedFuelUp { get; set; } = false;
public string Notes { get; set; }
public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
public GasRecord ToGasRecord() { return new GasRecord {
Id = Id,
@ -26,7 +27,8 @@
VehicleId = VehicleId,
Files = Files,
IsFillToFull = IsFillToFull,
MissedFuelUp = MissedFuelUp
MissedFuelUp = MissedFuelUp,
Notes = Notes
}; }
}
}

1
Models/GasRecord/GasRecordViewModel.cs
View File

@ -20,5 +20,6 @@
public decimal CostPerGallon { get; set; }
public bool IsFillToFull { get; set; }
public bool MissedFuelUp { get; set; }
public string Notes { get; set; }
}
}

1
Models/ImportModel.cs
View File

@ -56,6 +56,7 @@
public string FuelEconomy { get; set; }
public string IsFillToFull { get; set; }
public string MissedFuelUp { get; set; }
public string Notes { get; set; }
}
public class ReminderExportModel
{

18
Views/Vehicle/_GasModal.cshtml
View File

@ -56,9 +56,25 @@
<label class="form-check-label" for="gasIsMissed">Missed Fuel Up(Skip MPG Calculation)</label>
</div>
<label for="GasRecordCost">Cost</label>
<input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
@if (isNew)
{
<div class="input-group">
<input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
<div class="input-group-text">
<select class="form-select form-select-sm" id="gasCostType">
<option value="total">Total</option>
<option value="unit">Unit</option>
</select>
</div>
</div>
} else
{
<input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
}
</div>
<div class="col-md-6 col-12">
<label for="gasRecordNotes">Notes(optional)</label>
<textarea id="gasRecordNotes" class="form-control" rows="5">@Model.GasRecord.Notes</textarea>
@if (Model.GasRecord.Files.Any())
{
<div>

6
wwwroot/defaults/gassample.csv
View File

@ -1,3 +1,3 @@
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
Date,Odometer,FuelConsumed,Cost,IsFillToFull,MissedFuelUp,Notes
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 Notes
2 5/8/2020 204836 8.331 16.24 True False
3 5/30/2020 205056 11.913 25.72 True False

16
wwwroot/js/gasrecord.js
View File

@ -71,8 +71,10 @@ function getAndValidateGasRecordValues() {
var gasMileage = $("#gasRecordMileage").val();
var gasGallons = $("#gasRecordGallons").val();
var gasCost = $("#gasRecordCost").val();
var gasCostType = $("#gasCostType").val();
var gasIsFillToFull = $("#gasIsFillToFull").is(":checked");
var gasIsMissed = $("#gasIsMissed").is(":checked");
var gasNotes = $("#gasRecordNotes").val();
var vehicleId = GetVehicleId().vehicleId;
var gasRecordId = getGasRecordModelData().id;
//validation
@ -95,6 +97,17 @@ function getAndValidateGasRecordValues() {
} else {
$("#gasRecordGallons").removeClass("is-invalid");
}
if (gasCostType != undefined && gasCostType == 'unit') {
var convertedGasCost = parseFloat(gasCost) * parseFloat(gasGallons);
gasCost = convertedGasCost.toFixed(2).toString();
if (isNaN(gasCost))
{
hasError = true;
$("#gasRecordCost").addClass("is-invalid");
} else {
$("#gasRecordCost").removeClass("is-invalid");
}
}
if (gasCost.trim() == '' || !isValidMoney(gasCost)) {
hasError = true;
$("#gasRecordCost").addClass("is-invalid");
@ -111,6 +124,7 @@ function getAndValidateGasRecordValues() {
cost: gasCost,
files: uploadedFiles,
isFillToFull: gasIsFillToFull,
missedFuelUp: gasIsMissed
missedFuelUp: gasIsMissed,
notes: gasNotes
}
}