From 0ae28d436bf0a17749fe3f459a694b910ffb3eb4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GENO133\\IvanPlex" Date: Mon, 8 Jan 2024 18:33:21 -0700 Subject: [PATCH] added upgrade tab functionality. --- Controllers/VehicleController.cs | 11 +- Models/Report/CostMakeUpForVehicle.cs | 1 + Views/Vehicle/Index.cshtml | 5 + Views/Vehicle/_CostMakeUpReport.cshtml | 12 ++- Views/Vehicle/_UpgradeRecordModal.cshtml | 84 +++++++++++++++ Views/Vehicle/_UpgradeRecords.cshtml | 66 ++++++++++++ wwwroot/js/upgraderecord.js | 124 +++++++++++++++++++++++ wwwroot/js/vehicle.js | 16 ++- 8 files changed, 312 insertions(+), 7 deletions(-) create mode 100644 Views/Vehicle/_UpgradeRecordModal.cshtml create mode 100644 Views/Vehicle/_UpgradeRecords.cshtml create mode 100644 wwwroot/js/upgraderecord.js diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs index ed503c2..a02e82f 100644 --- a/Controllers/VehicleController.cs +++ b/Controllers/VehicleController.cs @@ -99,6 +99,7 @@ namespace CarCareTracker.Controllers _taxRecordDataAccess.DeleteAllTaxRecordsByVehicleId(vehicleId) && _noteDataAccess.DeleteNoteByVehicleId(vehicleId) && _reminderRecordDataAccess.DeleteAllReminderRecordsByVehicleId(vehicleId) && + _upgradeRecordDataAccess.DeleteAllUpgradeRecordsByVehicleId(vehicleId) && _dataAccess.DeleteVehicle(vehicleId); return Json(result); } @@ -544,19 +545,22 @@ namespace CarCareTracker.Controllers var gasRecords = _gasRecordDataAccess.GetGasRecordsByVehicleId(vehicleId); var collisionRecords = _collisionRecordDataAccess.GetCollisionRecordsByVehicleId(vehicleId); var taxRecords = _taxRecordDataAccess.GetTaxRecordsByVehicleId(vehicleId); + var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId); if (year != default) { serviceRecords.RemoveAll(x => x.Date.Year != year); gasRecords.RemoveAll(x => x.Date.Year != year); collisionRecords.RemoveAll(x => x.Date.Year != year); taxRecords.RemoveAll(x => x.Date.Year != year); + upgradeRecords.RemoveAll(x => x.Date.Year != year); } var viewModel = new CostMakeUpForVehicle { ServiceRecordSum = serviceRecords.Sum(x => x.Cost), GasRecordSum = gasRecords.Sum(x => x.Cost), CollisionRecordSum = collisionRecords.Sum(x => x.Cost), - TaxRecordSum = taxRecords.Sum(x => x.Cost) + TaxRecordSum = taxRecords.Sum(x => x.Cost), + UpgradeRecordSum = upgradeRecords.Sum(x=>x.Cost) }; return PartialView("_CostMakeUpReport", viewModel); } @@ -594,6 +598,11 @@ namespace CarCareTracker.Controllers { numbersArray.Add(gasRecords.Max(x => x.Mileage)); } + var upgradeRecords = _upgradeRecordDataAccess.GetUpgradeRecordsByVehicleId(vehicleId); + if (upgradeRecords.Any()) + { + numbersArray.Add(upgradeRecords.Max(x => x.Mileage)); + } return numbersArray.Any() ? numbersArray.Max() : 0; } private List GetRemindersAndUrgency(int vehicleId) diff --git a/Models/Report/CostMakeUpForVehicle.cs b/Models/Report/CostMakeUpForVehicle.cs index 898bfc2..a7846f0 100644 --- a/Models/Report/CostMakeUpForVehicle.cs +++ b/Models/Report/CostMakeUpForVehicle.cs @@ -6,5 +6,6 @@ public decimal GasRecordSum { get; set; } public decimal TaxRecordSum { get; set; } public decimal CollisionRecordSum { get; set; } + public decimal UpgradeRecordSum { get; set; } } } diff --git a/Views/Vehicle/Index.cshtml b/Views/Vehicle/Index.cshtml index d298908..cb81220 100644 --- a/Views/Vehicle/Index.cshtml +++ b/Views/Vehicle/Index.cshtml @@ -9,6 +9,7 @@ + }
@@ -27,6 +28,9 @@ + @@ -71,6 +75,7 @@
+