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

Add fuel type dropdown and diesel fuel type.

Browse Source
This commit is contained in:
DESKTOP-T0O5CDB\DESK-555BD
2024-08-19 12:09:50 -06:00
parent 897b4f2efe
commit fe76f32778
7 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Controllers/HomeController.cs
View File

@@ -69,6 +69,7 @@ namespace CarCareTracker.Controllers
LicensePlate = x.LicensePlate, LicensePlate = x.LicensePlate,
SoldDate = x.SoldDate, SoldDate = x.SoldDate,
IsElectric = x.IsElectric, IsElectric = x.IsElectric,
IsDiesel = x.IsDiesel,
UseHours = x.UseHours, UseHours = x.UseHours,
ExtraFields = x.ExtraFields, ExtraFields = x.ExtraFields,
Tags = x.Tags, Tags = x.Tags,

1
Models/Vehicle.cs
View File

@@ -13,6 +13,7 @@
public decimal PurchasePrice { get; set; } public decimal PurchasePrice { get; set; }
public decimal SoldPrice { get; set; } public decimal SoldPrice { get; set; }
public bool IsElectric { get; set; } = false; public bool IsElectric { get; set; } = false;
public bool IsDiesel { get; set; } = false;
public bool UseHours { get; set; } = false; public bool UseHours { get; set; } = false;
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>(); public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();

1
Models/VehicleViewModel.cs
View File

@@ -10,6 +10,7 @@
public string LicensePlate { get; set; } public string LicensePlate { get; set; }
public string SoldDate { get; set; } public string SoldDate { get; set; }
public bool IsElectric { get; set; } = false; public bool IsElectric { get; set; } = false;
public bool IsDiesel { get; set; } = false;
public bool UseHours { get; set; } = false; public bool UseHours { get; set; } = false;
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>(); public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
public List<string> Tags { get; set; } = new List<string>(); public List<string> Tags { get; set; } = new List<string>();

4
Views/Vehicle/_VehicleHistory.cshtml
View File

@@ -31,6 +31,10 @@
{ {
<span><i class="bi bi-ev-station me-2"></i>@translator.Translate(userLanguage, "Electric")</span> <span><i class="bi bi-ev-station me-2"></i>@translator.Translate(userLanguage, "Electric")</span>
} }
else if (Model.VehicleData.IsDiesel)
{
<span><i class="bi bi-fuel-pump-diesel me-2"></i>@translator.Translate(userLanguage, "Diesel")</span>
}
else else
{ {
<span><i class="bi bi-fuel-pump me-2"></i>@translator.Translate(userLanguage, "Gasoline")</span> <span><i class="bi bi-fuel-pump me-2"></i>@translator.Translate(userLanguage, "Gasoline")</span>

10
Views/Vehicle/_VehicleModal.cshtml
View File

@@ -46,10 +46,12 @@
} }
</div> </div>
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
<div class="form-check form-switch"> <label for="inputFuelType">@translator.Translate(userLanguage, "Fuel Type")</label>
<input class="form-check-input" type="checkbox" role="switch" id="inputIsElectric" checked="@Model.IsElectric"> <select class="form-select" onchange="checkCustomMonthInterval()" id="inputFuelType")>
<label class="form-check-label" for="inputIsElectric">@translator.Translate(userLanguage, "Electric Vehicle")</label> <!option value="Gasoline" @(!Model.IsDiesel && !Model.IsElectric ? "selected" : "")>@translator.Translate(userLanguage, "Gasoline")</!option>
</div> <!option value="Diesel" @(Model.IsDiesel ? "selected" : "")>@translator.Translate(userLanguage, "Diesel")</!option>
<!option value="Electric" @(Model.IsElectric ? "selected" : "")>@translator.Translate(userLanguage, "Electric")</!option>
</select>
<div class="form-check form-switch"> <div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="inputUseHours" checked="@Model.UseHours"> <input class="form-check-input" type="checkbox" role="switch" id="inputUseHours" checked="@Model.UseHours">
<label class="form-check-label" for="inputUseHours">@translator.Translate(userLanguage, "Use Engine Hours")</label> <label class="form-check-label" for="inputUseHours">@translator.Translate(userLanguage, "Use Engine Hours")</label>

2
wwwroot/defaults/en_US.json
View File

File diff suppressed because one or more lines are too long

4
wwwroot/js/shared.js
View File

@@ -40,7 +40,8 @@ function saveVehicle(isEdit) {
var vehiclePurchaseDate = $("#inputPurchaseDate").val(); var vehiclePurchaseDate = $("#inputPurchaseDate").val();
var vehicleSoldDate = $("#inputSoldDate").val(); var vehicleSoldDate = $("#inputSoldDate").val();
var vehicleLicensePlate = $("#inputLicensePlate").val(); var vehicleLicensePlate = $("#inputLicensePlate").val();
var vehicleIsElectric = $("#inputIsElectric").is(":checked"); var vehicleIsElectric = $("#inputFuelType").val() == 'Electric';
var vehicleIsDiesel = $("#inputFuelType").val() == 'Diesel';
var vehicleUseHours = $("#inputUseHours").is(":checked"); var vehicleUseHours = $("#inputUseHours").is(":checked");
var vehicleHasOdometerAdjustment = $("#inputHasOdometerAdjustment").is(':checked'); var vehicleHasOdometerAdjustment = $("#inputHasOdometerAdjustment").is(':checked');
var vehicleOdometerMultiplier = $("#inputOdometerMultiplier").val(); var vehicleOdometerMultiplier = $("#inputOdometerMultiplier").val();
@@ -119,6 +120,7 @@ function saveVehicle(isEdit) {
model: vehicleModel, model: vehicleModel,
licensePlate: vehicleLicensePlate, licensePlate: vehicleLicensePlate,
isElectric: vehicleIsElectric, isElectric: vehicleIsElectric,
isDiesel: vehicleIsDiesel,
tags: vehicleTags, tags: vehicleTags,
useHours: vehicleUseHours, useHours: vehicleUseHours,
extraFields: extraFields.extraFields, extraFields: extraFields.extraFields,