From 196df07a24f8d785821f32ca98ce53945c9618b9 Mon Sep 17 00:00:00 2001 From: Eric Gullickson <16152721+ericgullickson@users.noreply.github.com> Date: Sun, 20 Jul 2025 15:07:26 -0500 Subject: [PATCH] Added Simplied Fuel Entry --- Controllers/Vehicle/GasController.cs | 8 ++ Helper/ConfigHelper.cs | 1 + Helper/StaticHelper.cs | 2 +- Models/UserConfig.cs | 1 + Views/Vehicle/Gas/_GasModal.cshtml | 129 +++++++++++++++++---------- wwwroot/js/gasrecord.js | 114 ++++++++++++++++++++++- 6 files changed, 207 insertions(+), 48 deletions(-) diff --git a/Controllers/Vehicle/GasController.cs b/Controllers/Vehicle/GasController.cs index 163127a..3d3aca1 100644 --- a/Controllers/Vehicle/GasController.cs +++ b/Controllers/Vehicle/GasController.cs @@ -133,6 +133,14 @@ namespace MotoVaultPro.Controllers return Json(result); } [HttpPost] + public IActionResult SaveSimpleFuelEntryPreference(bool useSimpleFuelEntry) + { + var currentConfig = _config.GetUserConfig(User); + currentConfig.UseSimpleFuelEntry = useSimpleFuelEntry; + var result = _config.SaveUserConfig(User, currentConfig); + return Json(result); + } + [HttpPost] public IActionResult GetGasRecordsEditModal(List recordIds) { var extraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields; diff --git a/Helper/ConfigHelper.cs b/Helper/ConfigHelper.cs index 8bcb1ed..ebaff68 100644 --- a/Helper/ConfigHelper.cs +++ b/Helper/ConfigHelper.cs @@ -337,6 +337,7 @@ namespace MotoVaultPro.Helper PreferredGasMileageUnit = CheckString(nameof(UserConfig.PreferredGasMileageUnit)), PreferredGasUnit = CheckString(nameof(UserConfig.PreferredGasUnit)), UseUnitForFuelCost = CheckBool(CheckString(nameof(UserConfig.UseUnitForFuelCost))), + UseSimpleFuelEntry = CheckBool(CheckString(nameof(UserConfig.UseSimpleFuelEntry))), UserLanguage = CheckString(nameof(UserConfig.UserLanguage), "en_US"), HideSoldVehicles = CheckBool(CheckString(nameof(UserConfig.HideSoldVehicles))), EnableShopSupplies = CheckBool(CheckString(nameof(UserConfig.EnableShopSupplies))), diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs index b775157..6e0324f 100644 --- a/Helper/StaticHelper.cs +++ b/Helper/StaticHelper.cs @@ -12,7 +12,7 @@ namespace MotoVaultPro.Helper /// public static class StaticHelper { - public const string VersionNumber = "1.4.9"; + public const string VersionNumber = "1.0.0"; public const string DbName = "data/cartracker.db"; public const string UserConfigPath = "data/config/userConfig.json"; public const string ServerConfigPath = "data/config/serverConfig.json"; diff --git a/Models/UserConfig.cs b/Models/UserConfig.cs index ee90dff..74704c1 100644 --- a/Models/UserConfig.cs +++ b/Models/UserConfig.cs @@ -22,6 +22,7 @@ public string PreferredGasUnit { get; set; } = string.Empty; public string PreferredGasMileageUnit { get; set; } = string.Empty; public bool UseUnitForFuelCost { get; set; } + public bool UseSimpleFuelEntry { get; set; } public bool ShowCalendar { get; set; } public bool ShowVehicleThumbnail { get; set; } public List UserColumnPreferences { get; set; } = new List(); diff --git a/Views/Vehicle/Gas/_GasModal.cshtml b/Views/Vehicle/Gas/_GasModal.cshtml index dce064d..d28e2d0 100644 --- a/Views/Vehicle/Gas/_GasModal.cshtml +++ b/Views/Vehicle/Gas/_GasModal.cshtml @@ -13,6 +13,7 @@ var useHours = Model.UseHours; var isNew = Model.GasRecord.Id == 0; var useUnitFuelCost = userConfig.UseUnitForFuelCost; + var useSimpleFuelEntry = userConfig.UseSimpleFuelEntry; string consumptionUnit; string distanceUnit; if (useKwh) @@ -40,8 +41,16 @@ } }
-
@(isNew ? translator.Translate(userLanguage, "Add New Gas Record") : translator.Translate(userLanguage, "Edit Gas Record"))
- +
+
@(isNew ? translator.Translate(userLanguage, "Add New Gas Record") : translator.Translate(userLanguage, "Edit Gas Record"))
+
+
+ + +
+ +
+
@@ -49,57 +58,85 @@
- -
- - + +
+ +
+ + @if (isNew) + { +
+ +
+ } +
+ + + + + + + + + + + +
- -
- + +
+ +
+ + +
+ +
+ + @if (isNew) + { +
+ +
+ } +
+ + +
+ + +
+
+ + +
+ @if (isNew) { -
- +
+ +
+ +
- } -
- - -
- - -
-
- - -
- - @if (isNew) - { -
- -
- -
-
- } else - { - - } - - } - - @await Html.PartialAsync("_ExtraField", Model.GasRecord.ExtraFields) + + + @await Html.PartialAsync("_ExtraField", Model.GasRecord.ExtraFields) +
-
+
diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js index de32145..44677f7 100644 --- a/wwwroot/js/gasrecord.js +++ b/wwwroot/js/gasrecord.js @@ -68,7 +68,15 @@ function deleteGasRecord(gasRecordId) { } function saveGasRecordToVehicle(isEdit) { //get values - var formValues = getAndValidateGasRecordValues(); + var isSimpleMode = $("#fuelEntryModeToggle").is(":checked"); + var formValues; + + if (isSimpleMode) { + formValues = getAndValidateGasRecordValuesSimple(); + } else { + formValues = getAndValidateGasRecordValues(); + } + //validate if (formValues.hasError) { errorToast("Please check the form data"); @@ -495,4 +503,108 @@ function saveMultipleGasRecordsToVehicle() { errorToast(genericErrorMessage()); } }) +} + +// Simple/Advanced fuel entry mode toggle functions +function toggleFuelEntryMode(useSimpleMode) { + if (useSimpleMode) { + // Switch to simple mode + $("#simpleModeFields").show(); + $("#advancedModeFields").hide(); + $("#secondColumnFields").hide(); + + // Initialize simple mode values if editing existing record + var existingCost = $("#gasRecordCost").val(); + var existingGallons = $("#gasRecordGallons").val(); + if (existingCost && existingGallons && globalParseFloat(existingGallons) > 0) { + var unitCost = globalParseFloat(existingCost) / globalParseFloat(existingGallons); + $("#gasRecordUnitCost").val(globalFloatToString(unitCost.toFixed(3))); + } + } else { + // Switch to advanced mode + $("#simpleModeFields").hide(); + $("#advancedModeFields").show(); + $("#secondColumnFields").show(); + } + + // Save user preference + $.post('/Vehicle/SaveSimpleFuelEntryPreference', { useSimpleFuelEntry: useSimpleMode }, function (data) { + if (!data) { + errorToast("Error saving preference"); + } + }); +} + +// Auto-calculate total cost based on unit cost and gallons +function calculateTotalCost() { + var unitCost = globalParseFloat($("#gasRecordUnitCost").val()); + var gallons = globalParseFloat($("#gasRecordGallons").val()); + + if (!isNaN(unitCost) && !isNaN(gallons) && unitCost > 0 && gallons > 0) { + var totalCost = unitCost * gallons; + var decimalPoints = getGlobalConfig().useThreeDecimals ? 3 : 2; + $("#gasRecordCost").val(globalFloatToString(totalCost.toFixed(decimalPoints))); + } else { + $("#gasRecordCost").val(""); + } +} + +// Simple mode validation function +function getAndValidateGasRecordValuesSimple() { + var gasDate = $("#simpleGasRecordDate").val(); + var gasMileage = parseInt(globalParseFloat($("#gasRecordMileage").val())).toString(); + var gasGallons = $("#gasRecordGallons").val(); + var gasCost = $("#gasRecordCost").val(); + var gasIsFillToFull = $("#simpleGasIsFillToFull").val() === "true"; + var gasIsMissed = $("#simpleGasIsMissed").val() === "true"; + var gasNotes = $("#simpleGasRecordNotes").val(); + var gasTags = $("#simpleGasRecordTag").val() ? [$("#simpleGasRecordTag").val()] : []; + var vehicleId = GetVehicleId().vehicleId; + var gasRecordId = getGasRecordModelData().id; + + //Odometer Adjustments + if (isNaN(gasMileage) && GetVehicleId().odometerOptional) { + gasMileage = '0'; + } + gasMileage = GetAdjustedOdometer(gasRecordId, gasMileage); + + // Validation for simple mode + var hasError = false; + + if (gasMileage.trim() == '' || isNaN(gasMileage) || parseInt(gasMileage) < 0) { + hasError = true; + $("#gasRecordMileage").addClass("is-invalid"); + } else { + $("#gasRecordMileage").removeClass("is-invalid"); + } + + if (gasGallons.trim() == '' || globalParseFloat(gasGallons) <= 0) { + hasError = true; + $("#gasRecordGallons").addClass("is-invalid"); + } else { + $("#gasRecordGallons").removeClass("is-invalid"); + } + + if (gasCost.trim() == '' || !isValidMoney(gasCost)) { + hasError = true; + $("#gasRecordCost").addClass("is-invalid"); + } else { + $("#gasRecordCost").removeClass("is-invalid"); + } + + return { + id: gasRecordId, + hasError: hasError, + vehicleId: vehicleId, + date: gasDate, + mileage: gasMileage, + gallons: gasGallons, + cost: gasCost, + files: [], // Simple mode doesn't support file uploads + tags: gasTags, + isFillToFull: gasIsFillToFull, + missedFuelUp: gasIsMissed, + notes: gasNotes, + extraFields: [] // Simple mode doesn't use extra fields + }; } \ No newline at end of file