added supply usage history

Controllers/VehicleController.cs

@@ -703,7 +703,7 @@ namespace CarCareTracker.Controllers
             var result = _serviceRecordDataAccess.SaveServiceRecordToVehicle(serviceRecord.ToServiceRecord());
             if (result && serviceRecord.Supplies.Any())
             {
-                RequisitionSupplyRecordsByUsage(serviceRecord.Supplies);
+                RequisitionSupplyRecordsByUsage(serviceRecord.Supplies, DateTime.Parse(serviceRecord.Date), serviceRecord.Description);
             }
             return Json(result);
         }
@@ -774,7 +774,7 @@ namespace CarCareTracker.Controllers
             var result = _collisionRecordDataAccess.SaveCollisionRecordToVehicle(collisionRecord.ToCollisionRecord());
             if (result && collisionRecord.Supplies.Any())
             {
-                RequisitionSupplyRecordsByUsage(collisionRecord.Supplies);
+                RequisitionSupplyRecordsByUsage(collisionRecord.Supplies, DateTime.Parse(collisionRecord.Date), collisionRecord.Description);
             }
             return Json(result);
         }
@@ -1455,7 +1455,7 @@ namespace CarCareTracker.Controllers
             var result = _upgradeRecordDataAccess.SaveUpgradeRecordToVehicle(upgradeRecord.ToUpgradeRecord());
             if (result && upgradeRecord.Supplies.Any())
             {
-                RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies);
+                RequisitionSupplyRecordsByUsage(upgradeRecord.Supplies, DateTime.Parse(upgradeRecord.Date), upgradeRecord.Description);
             }
             return Json(result);
         }
@@ -1552,7 +1552,7 @@ namespace CarCareTracker.Controllers
             }
             return result;
         }
-        private void RequisitionSupplyRecordsByUsage(List<SupplyUsage> supplyUsage)
+        private void RequisitionSupplyRecordsByUsage(List<SupplyUsage> supplyUsage, DateTime dateRequisitioned, string usageDescription)
         {
             foreach(SupplyUsage supply in supplyUsage)
             {
@@ -1563,6 +1563,12 @@ namespace CarCareTracker.Controllers
                 result.Quantity -= supply.Quantity;
                 //deduct cost.
                 result.Cost -= (supply.Quantity * unitCost);
+                result.UsageHistory.Add(new SupplyUsageHistory { 
+                    Date = dateRequisitioned, 
+                    Description = usageDescription, 
+                    Quantity = supply.Quantity, 
+                    Cost = (supply.Quantity * unitCost) 
+                });
                 //save
                 _supplyRecordDataAccess.SaveSupplyRecordToVehicle(result);
             }
@@ -1635,6 +1641,7 @@ namespace CarCareTracker.Controllers
                 VehicleId = result.VehicleId,
                 Files = result.Files,
                 Tags = result.Tags,
+                UsageHistory = result.UsageHistory,
                 ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields)
             };
             return PartialView("_SupplyRecordModal", convertedResult);
@@ -1668,7 +1675,7 @@ namespace CarCareTracker.Controllers
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(planRecord.ToPlanRecord());
             if (result && planRecord.Supplies.Any())
             {
-                RequisitionSupplyRecordsByUsage(planRecord.Supplies);
+                RequisitionSupplyRecordsByUsage(planRecord.Supplies, DateTime.Parse(planRecord.DateCreated), planRecord.Description);
             }
             return Json(result);
         }
@@ -1722,7 +1729,7 @@ namespace CarCareTracker.Controllers
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord.ToPlanRecord());
             if (result && existingRecord.Supplies.Any())
             {
-                RequisitionSupplyRecordsByUsage(existingRecord.Supplies);
+                RequisitionSupplyRecordsByUsage(existingRecord.Supplies, DateTime.Parse(existingRecord.DateCreated), existingRecord.Description);
             }
             return Json(new OperationResponse { Success = result, Message = result ? "Plan Record Added" : StaticHelper.GenericErrorMessage });
         }

Models/Supply/SupplyRecord.cs

@@ -35,5 +35,6 @@
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> UsageHistory { get; set; } = new List<SupplyUsageHistory>();
     }
 }

Models/Supply/SupplyRecordInput.cs

@@ -14,6 +14,7 @@
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
         public List<string> Tags { get; set; } = new List<string>();
         public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
+        public List<SupplyUsageHistory> UsageHistory { get; set; } = new List<SupplyUsageHistory>();
         public SupplyRecord ToSupplyRecord() { return new SupplyRecord { 
             Id = Id, 
             VehicleId = VehicleId, 
@@ -26,7 +27,8 @@
             Notes = Notes, 
             Files = Files,
             Tags = Tags,
-            ExtraFields = ExtraFields
+            ExtraFields = ExtraFields,
+            UsageHistory = UsageHistory
         }; }
     }
 }

Models/Supply/SupplyUsageHistory.cs

@@ -0,0 +1,9 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyUsageHistory {
+        public DateTime Date { get; set; }
+        public string Description { get; set; }
+        public decimal Quantity { get; set; }
+        public decimal Cost { get; set; }
+    }
+}

Views/Vehicle/_SupplyRecordModal.cshtml

@@ -80,6 +80,10 @@
 <div class="modal-footer">
     @if (!isNew)
     {
+        @if (Model.UsageHistory.Any())
+        {
+            <button type="button" class="btn btn-warning" onclick="showSupplyUsageHistory()"><i class="bi bi-clock-history"></i></button>
+        }
         <button type="button" class="btn btn-danger" onclick="deleteSupplyRecord(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage,"Delete")</button>
     }
     <button type="button" class="btn btn-secondary" onclick="hideAddSupplyRecordModal()">@translator.Translate(userLanguage,"Cancel")</button>
@@ -94,13 +98,18 @@
 </div>
 <script>
     var uploadedFiles = [];
+    var supplyUsageHistory = [];
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
-    @foreach (UploadedFiles filesUploaded in Model.Files)
+        @foreach (UploadedFiles filesUploaded in Model.Files)
-    {
+        {
-        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+            @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
-    }
         }
+    }
+    @foreach(SupplyUsageHistory usageHistory in Model.UsageHistory)
+    {
+        @:supplyUsageHistory.push({date: decodeHTMLEntities("@usageHistory.Date.ToShortDateString()"), description: decodeHTMLEntities("@usageHistory.Description"), quantity: decodeHTMLEntities("@usageHistory.Quantity.ToString("F")"), cost: decodeHTMLEntities("@usageHistory.Cost.ToString("C2")")})
+    }
     function getSupplyRecordModelData() {
         return { id: @Model.Id}
     }

wwwroot/js/supplyrecord.js

@@ -130,6 +130,7 @@ function getAndValidateSupplyRecordValues() {
         quantity: supplyQuantity,
         files: uploadedFiles,
         tags: supplyTags,
-        extraFields: extraFields.extraFields
+        extraFields: extraFields.extraFields,
+        usageHistory: supplyUsageHistory
     }
 }