From b542bd54fbe287dc410c208001e5653f6283d576 Mon Sep 17 00:00:00 2001 From: "DESKTOP-T0O5CDB\\DESK-555BD" Date: Mon, 22 Jan 2024 12:04:33 -0700 Subject: [PATCH] adding requisiton functionality to upgrades and repairs. --- Controllers/VehicleController.cs | 10 +++++++++- Models/Collision/CollisionRecordInput.cs | 1 + Models/UpgradeRecord/UpgradeReportInput.cs | 1 + Views/Vehicle/_CollisionRecordModal.cshtml | 5 +++++ Views/Vehicle/_SupplyStore.cshtml | 20 +++++++++++++++++++- Views/Vehicle/_UpgradeRecordModal.cshtml | 5 +++++ wwwroot/js/collisionrecord.js | 1 + wwwroot/js/upgraderecord.js | 1 + 8 files changed, 42 insertions(+), 2 deletions(-) diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs index e896f6e..7e37373 100644 --- a/Controllers/VehicleController.cs +++ b/Controllers/VehicleController.cs @@ -615,7 +615,7 @@ namespace CarCareTracker.Controllers //move files from temp. serviceRecord.Files = serviceRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord()); - if (result) + if (result && serviceRecord.Supplies.Any()) { RequisitionSupplyRecordsByUsage(serviceRecord.Supplies); } @@ -674,6 +674,10 @@ namespace CarCareTracker.Controllers //move files from temp. collisionRecord.Files = collisionRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord()); + if (result && collisionRecord.Supplies.Any()) + { + RequisitionSupplyRecordsByUsage(collisionRecord.Supplies); + } return Json(result); } [HttpGet] @@ -1176,6 +1180,10 @@ namespace CarCareTracker.Controllers //move files from temp. upgradeRecord.Files = upgradeRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList(); var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord()); + if (result && upgradeRecord.Supplies.Any()) + { + RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies); + } return Json(result); } [HttpGet] diff --git a/Models/Collision/CollisionRecordInput.cs b/Models/Collision/CollisionRecordInput.cs index a07cb17..c8b336e 100644 --- a/Models/Collision/CollisionRecordInput.cs +++ b/Models/Collision/CollisionRecordInput.cs @@ -10,6 +10,7 @@ public decimal Cost { get; set; } public string Notes { get; set; } public List Files { get; set; } = new List(); + public List Supplies { get; set; } = new List(); public CollisionRecord ToCollisionRecord() { return new CollisionRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; } } } diff --git a/Models/UpgradeRecord/UpgradeReportInput.cs b/Models/UpgradeRecord/UpgradeReportInput.cs index b3e11b3..62353b9 100644 --- a/Models/UpgradeRecord/UpgradeReportInput.cs +++ b/Models/UpgradeRecord/UpgradeReportInput.cs @@ -10,6 +10,7 @@ public decimal Cost { get; set; } public string Notes { get; set; } public List Files { get; set; } = new List(); + public List Supplies { get; set; } = new List(); public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files }; } } } diff --git a/Views/Vehicle/_CollisionRecordModal.cshtml b/Views/Vehicle/_CollisionRecordModal.cshtml index 6953672..ae4e4df 100644 --- a/Views/Vehicle/_CollisionRecordModal.cshtml +++ b/Views/Vehicle/_CollisionRecordModal.cshtml @@ -23,6 +23,10 @@ + @if (isNew) + { + @await Html.PartialAsync("_SupplyStore", "RepairRecord") + }
@@ -71,6 +75,7 @@