From a92d4229726c966113552c8d9ab979baf6cb9337 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GENO133\\IvanPlex" Date: Wed, 27 Mar 2024 08:21:02 -0600 Subject: [PATCH] add purchase and sold price --- Controllers/VehicleController.cs | 15 ++++++++++----- Models/Vehicle.cs | 2 ++ Views/Vehicle/_VehicleModal.cshtml | 23 +++++++++++++++++++---- wwwroot/css/site.css | 4 ++++ wwwroot/defaults/en_US.json | 2 +- wwwroot/js/shared.js | 20 +++++++++++++++++++- 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs index 297b1e6..4406a29 100644 --- a/Controllers/VehicleController.cs +++ b/Controllers/VehicleController.cs @@ -1568,9 +1568,7 @@ namespace CarCareTracker.Controllers List results = _reminderHelper.GetReminderRecordViewModels(reminders, currentMileage, dateCompare); return results; } - [TypeFilter(typeof(CollaboratorFilter))] - [HttpGet] - public IActionResult GetVehicleHaveUrgentOrPastDueReminders(int vehicleId) + private bool GetAndUpdateVehicleUrgentOrPastDueReminders(int vehicleId) { var result = GetRemindersAndUrgency(vehicleId, DateTime.Now); //check if user wants auto-refresh past-due reminders @@ -1597,9 +1595,16 @@ namespace CarCareTracker.Controllers var pastDueAndUrgentReminders = result.Where(x => x.Urgency == ReminderUrgency.VeryUrgent || x.Urgency == ReminderUrgency.PastDue); if (pastDueAndUrgentReminders.Any()) { - return Json(true); + return true; } - return Json(false); + return false; + } + [TypeFilter(typeof(CollaboratorFilter))] + [HttpGet] + public IActionResult GetVehicleHaveUrgentOrPastDueReminders(int vehicleId) + { + var result = GetAndUpdateVehicleUrgentOrPastDueReminders(vehicleId); + return Json(result); } [TypeFilter(typeof(CollaboratorFilter))] [HttpGet] diff --git a/Models/Vehicle.cs b/Models/Vehicle.cs index 79e23d2..a64f62d 100644 --- a/Models/Vehicle.cs +++ b/Models/Vehicle.cs @@ -10,6 +10,8 @@ public string LicensePlate { get; set; } public string PurchaseDate { get; set; } public string SoldDate { get; set; } + public decimal PurchasePrice { get; set; } + public decimal SoldPrice { get; set; } public bool IsElectric { get; set; } = false; public bool UseHours { get; set; } = false; public List ExtraFields { get; set; } = new List(); diff --git a/Views/Vehicle/_VehicleModal.cshtml b/Views/Vehicle/_VehicleModal.cshtml index c4e930c..7d1d8d8 100644 --- a/Views/Vehicle/_VehicleModal.cshtml +++ b/Views/Vehicle/_VehicleModal.cshtml @@ -46,10 +46,6 @@ }
- - - -
@@ -70,6 +66,25 @@
+
+
+
+ +
+
+ + + + + + + + +
+
+