From c582f5f5c7a52efe661e7a041cbd70e7ef4f4185 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Fri, 5 Apr 2024 19:36:26 -0600
Subject: [PATCH 1/4] Moved template modal outside of add modal.

---
 Views/Vehicle/_PlanRecordModal.cshtml | 4 ----
 Views/Vehicle/_PlanRecords.cshtml     | 4 +++-
 wwwroot/js/planrecord.js              | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Views/Vehicle/_PlanRecordModal.cshtml b/Views/Vehicle/_PlanRecordModal.cshtml
index 3f3a72b..0663f43 100644
--- a/Views/Vehicle/_PlanRecordModal.cshtml
+++ b/Views/Vehicle/_PlanRecordModal.cshtml
@@ -101,10 +101,6 @@
             </button>
             <ul class="dropdown-menu">
                 <li><a class="dropdown-item" href="#" onclick="savePlanRecordTemplate()">@translator.Translate(userLanguage, "Save as Template")</a></li>
-                @if (!Model.CreatedFromReminder)
-                {
-                    <li><a class="dropdown-item" href="#" onclick="showPlanRecordTemplatesModal()">@translator.Translate(userLanguage, "View Templates")</a></li>
-                }
             </ul>
         </div>
     }
diff --git a/Views/Vehicle/_PlanRecords.cshtml b/Views/Vehicle/_PlanRecords.cshtml
index b01cba8..2e52c2d 100644
--- a/Views/Vehicle/_PlanRecords.cshtml
+++ b/Views/Vehicle/_PlanRecords.cshtml
@@ -28,6 +28,8 @@
                     <ul class="dropdown-menu">
                         <li><a class="dropdown-item" href="#" onclick="showBulkImportModal('PlanRecord')">@translator.Translate(userLanguage,"Import via CSV")</a></li>
                         <li><a class="dropdown-item" href="#" onclick="exportVehicleData('PlanRecord')">@translator.Translate(userLanguage,"Export to CSV")</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="#" onclick="showPlanRecordTemplatesModal()">@translator.Translate(userLanguage, "View Templates")</a></li>
                     </ul>
                 </div>
             }
@@ -102,7 +104,7 @@
     </div>
 </div>
 
-<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+<div class="modal fade" data-bs-focus="false" id="planRecordTemplateModal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content" id="planRecordTemplateModalContent">
         </div>
diff --git a/wwwroot/js/planrecord.js b/wwwroot/js/planrecord.js
index 2cdf3d2..7e09e03 100644
--- a/wwwroot/js/planrecord.js
+++ b/wwwroot/js/planrecord.js
@@ -98,22 +98,19 @@ function showPlanRecordTemplatesModal() {
     $.get(`/Vehicle/GetPlanRecordTemplatesForVehicleId?vehicleId=${vehicleId}`, function (data) {
         if (data) {
             $("#planRecordTemplateModalContent").html(data);
-            hideAddPlanRecordModal();
             $('#planRecordTemplateModal').modal('show');
         }
     });
 }
 function hidePlanRecordTemplatesModal() {
     $('#planRecordTemplateModal').modal('hide');
-    $('#planRecordModal').modal('show');
 }
 function usePlannerRecordTemplate(planRecordTemplateId) {
     $.post(`/Vehicle/ConvertPlanRecordTemplateToPlanRecord?planRecordTemplateId=${planRecordTemplateId}`, function (data) {
         if (data.success) {
             var vehicleId = GetVehicleId().vehicleId;
             successToast(data.message);
-            $('#planRecordTemplateModal').modal('hide');
-            hideAddPlanRecordModal();
+            hidePlanRecordTemplatesModal();
             saveScrollPosition();
             getVehiclePlanRecords(vehicleId);
         } else {

From d7d9ab505eeeb90a9ae44276bd2584128d86019c Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Sun, 7 Apr 2024 08:31:17 -0600
Subject: [PATCH 2/4] Add functionality to let users edit plan record templates

---
 Controllers/VehicleController.cs              |  33 ++++-
 Models/Supply/SupplyUsageViewModel.cs         |   8 ++
 .../_PlanRecordTemplateEditModal.cshtml       | 127 ++++++++++++++++++
 Views/Vehicle/_SupplyStore.cshtml             |  28 ++--
 Views/Vehicle/_SupplyUsage.cshtml             |  13 +-
 wwwroot/js/planrecord.js                      |   3 +
 6 files changed, 197 insertions(+), 15 deletions(-)
 create mode 100644 Models/Supply/SupplyUsageViewModel.cs
 create mode 100644 Views/Vehicle/_PlanRecordTemplateEditModal.cshtml

diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index bd656de..102535f 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -1913,6 +1913,33 @@ namespace CarCareTracker.Controllers
             }
             return PartialView("_SupplyRecords", result);
         }
+        [HttpGet]
+        public IActionResult GetSupplyRecordsForPlanRecordTemplate(int planRecordTemplateId)
+        {
+            var viewModel = new SupplyUsageViewModel();
+            var planRecordTemplate = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
+            if (planRecordTemplate != default && planRecordTemplate.VehicleId != default)
+            {
+                var supplies = _supplyRecordDataAccess.GetSupplyRecordsByVehicleId(planRecordTemplate.VehicleId);
+                if (_config.GetServerEnableShopSupplies())
+                {
+                    supplies.AddRange(_supplyRecordDataAccess.GetSupplyRecordsByVehicleId(0)); // add shop supplies
+                }
+                supplies.RemoveAll(x => x.Quantity <= 0);
+                bool _useDescending = _config.GetUserConfig(User).UseDescending;
+                if (_useDescending)
+                {
+                    supplies = supplies.OrderByDescending(x => x.Date).ToList();
+                }
+                else
+                {
+                    supplies = supplies.OrderBy(x => x.Date).ToList();
+                }
+                viewModel.Supplies = supplies;
+                viewModel.Usage = planRecordTemplate.Supplies;
+            }
+            return PartialView("_SupplyUsage", viewModel);
+        }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
         public IActionResult GetSupplyRecordsForRecordsByVehicleId(int vehicleId)
@@ -1932,7 +1959,11 @@ namespace CarCareTracker.Controllers
             {
                 result = result.OrderBy(x => x.Date).ToList();
             }
-            return PartialView("_SupplyUsage", result);
+            var viewModel = new SupplyUsageViewModel
+            {
+                Supplies = result
+            };
+            return PartialView("_SupplyUsage", viewModel);
         }
         [HttpPost]
         public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
diff --git a/Models/Supply/SupplyUsageViewModel.cs b/Models/Supply/SupplyUsageViewModel.cs
new file mode 100644
index 0000000..4b951f2
--- /dev/null
+++ b/Models/Supply/SupplyUsageViewModel.cs
@@ -0,0 +1,8 @@
+namespace CarCareTracker.Models
+{
+    public class SupplyUsageViewModel
+    {
+        public List<SupplyRecord> Supplies { get; set; } = new List<SupplyRecord>();
+        public List<SupplyUsage> Usage { get; set; } = new List<SupplyUsage>();
+    }
+}
diff --git a/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml b/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
new file mode 100644
index 0000000..d58f461
--- /dev/null
+++ b/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
@@ -0,0 +1,127 @@
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@inject ITranslationHelper translator
+@model PlanRecordInput
+@{
+    var isNew = Model.Id == 0;
+    var userConfig = config.GetUserConfig(User);
+    var userLanguage = userConfig.UserLanguage;
+}
+<div class="modal-header">
+    <h5 class="modal-title">@translator.Translate(userLanguage, "Edit Plan Record Template")<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditPlanRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
+    <button type="button" class="btn-close" onclick="hideAddPlanRecordModal()" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-md-6 col-12">
+                    <input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
+                    <label for="planRecordDescription">@translator.Translate(userLanguage, "Description")</label>
+                    <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
+                    <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
+                    <input type="text" inputmode="decimal" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
+                    @if (isNew)
+                    {
+                        @await Html.PartialAsync("_SupplyStore", "PlanRecordTemplate")
+                    }
+                    <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
+                    <select class="form-select" id="planRecordType">
+                        <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
+                        <!option value="RepairRecord" @(Model.ImportMode == ImportMode.RepairRecord ? "selected" : "")>@translator.Translate(userLanguage, "Repair")</!option>
+                        <!option value="UpgradeRecord" @(Model.ImportMode == ImportMode.UpgradeRecord ? "selected" : "")>@translator.Translate(userLanguage, "Upgrade")</!option>
+                    </select>
+                    <label for="planRecordPriority">@translator.Translate(userLanguage, "Priority")</label>
+                    <select class="form-select" id="planRecordPriority">
+                        <!option value="Critical" @(Model.Priority == PlanPriority.Critical ? "selected" : "")>@translator.Translate(userLanguage, "Critical")</!option>
+                        <!option value="Normal" @(Model.Priority == PlanPriority.Normal || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Normal")</!option>
+                        <!option value="Low" @(Model.Priority == PlanPriority.Low ? "selected" : "")>@translator.Translate(userLanguage, "Low")</!option>
+                    </select>
+                    <label for="planRecordProgress">@translator.Translate(userLanguage, "Current Stage")</label>
+                    <select class="form-select" id="planRecordProgress">
+                        <!option value = "Backlog" @(Model.Progress == PlanProgress.Backlog || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Planned")</!option>
+                        <!option value="InProgress" @(Model.Progress == PlanProgress.InProgress ? "selected" : "")>@translator.Translate(userLanguage, "Doing")</!option>
+                        <!option value = "Testing" @(Model.Progress == PlanProgress.Testing ? "selected" : "")>@translator.Translate(userLanguage, "Testing")</!option>
+                    </select>
+                    @foreach (ExtraField field in Model.ExtraFields)
+                    {
+                        var elementId = Guid.NewGuid();
+                        <div class="extra-field">
+                            <label for="@elementId">@field.Name</label>
+                            <input type="text" id="@elementId" class="form-control @(field.IsRequired ? "extra-field-required" : "")" placeholder="@field.Name" value="@field.Value">
+                        </div>
+                    }
+                </div>
+                <div class="col-md-6 col-12">
+                    <label for="planRecordNotes">@translator.Translate(userLanguage, "Notes(optional)")<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
+                    <textarea id="planRecordNotes" class="form-control" rows="5">@Model.Notes</textarea>
+                    @if (Model.Files.Any())
+                    {
+                        <div>
+                            @await Html.PartialAsync("_UploadedFiles", Model.Files)
+                            <label for="planRecordFiles">@translator.Translate(userLanguage, "Upload more documents")</label>
+                            <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
+                            <br /><small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                        </div>
+                    }
+                    else
+                    {
+                        <label for="planRecordFiles">@translator.Translate(userLanguage, "Upload documents(optional)")</label>
+                        <input onChange="uploadVehicleFilesAsync(this)" type="file" multiple accept="@config.GetAllowedFileUploadExtensions()" class="form-control-file" id="planRecordFiles">
+                        <br />
+
+                        <small class="text-body-secondary">@translator.Translate(userLanguage, "Max File Size: 28.6MB")</small>
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    @if (!isNew)
+    {
+        @if (Model.RequisitionHistory.Any())
+        {
+            <button type="button" class="btn btn-warning" onclick="toggleSupplyUsageHistory()"><i class="bi bi-shop"></i></button>
+        }
+        <button type="button" class="btn btn-danger" onclick="deletePlanRecord(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage, "Delete")</button>
+    }
+    <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
+    @if (isNew)
+    {
+        <div class="btn-group">
+            <button onclick="savePlanRecordToVehicle()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add New Plan Record")</button>
+            <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                <span class="visually-hidden">Toggle Dropdown</span>
+            </button>
+            <ul class="dropdown-menu">
+                <li><a class="dropdown-item" href="#" onclick="savePlanRecordTemplate()">@translator.Translate(userLanguage, "Save as Template")</a></li>
+            </ul>
+        </div>
+    }
+    else if (!isNew)
+    {
+        <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Plan Record")</button>
+    }
+</div>
+@await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
+<script>
+    var uploadedFiles = [];
+    var selectedSupplies = [];
+    var copySuppliesAttachments = false;
+    getUploadedFilesFromModel();
+    function getUploadedFilesFromModel() {
+    @foreach (UploadedFiles filesUploaded in Model.Files)
+    {
+        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+    }
+            }
+    function getPlanRecordModelData() {
+        return {
+            id: @Model.Id,
+            dateCreated: decodeHTMLEntities('@(Model.DateCreated)'),
+            reminderRecordId: decodeHTMLEntities('@Model.ReminderRecordId'),
+            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower()
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/Views/Vehicle/_SupplyStore.cshtml b/Views/Vehicle/_SupplyStore.cshtml
index 226c3df..af7db46 100644
--- a/Views/Vehicle/_SupplyStore.cshtml
+++ b/Views/Vehicle/_SupplyStore.cshtml
@@ -83,14 +83,26 @@
         }
     }
     function getSupplies() {
-        var vehicleId = GetVehicleId().vehicleId;
-        $.get(`/Vehicle/GetSupplyRecordsForRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
-            if (data) {
-                hideParentModal();
-                $("#inputSuppliesModalContent").html(data);
-                $('#inputSuppliesModal').modal('show');
-            }
-        })
+        var caller = GetCaller().tab;
+        if (caller == 'PlanRecordTemplate') {
+            var planRecordTemplateId = getPlanRecordModelData().id;
+            $.get(`/Vehicle/GetSupplyRecordsForPlanRecordTemplate?planRecordTemplateId=${planRecordTemplateId}`, function (data) {
+                if (data) {
+                    hideParentModal();
+                    $("#inputSuppliesModalContent").html(data);
+                    $('#inputSuppliesModal').modal('show');
+                }
+            });
+        } else {
+            var vehicleId = GetVehicleId().vehicleId;
+            $.get(`/Vehicle/GetSupplyRecordsForRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) {
+                if (data) {
+                    hideParentModal();
+                    $("#inputSuppliesModalContent").html(data);
+                    $('#inputSuppliesModal').modal('show');
+                }
+            })
+        }
     }
     function hideSuppliesModal() {
         $('#inputSuppliesModal').modal('hide');
diff --git a/Views/Vehicle/_SupplyUsage.cshtml b/Views/Vehicle/_SupplyUsage.cshtml
index d3b5de0..63eb1fa 100644
--- a/Views/Vehicle/_SupplyUsage.cshtml
+++ b/Views/Vehicle/_SupplyUsage.cshtml
@@ -4,15 +4,15 @@
 @{
     var userConfig = config.GetUserConfig(User);
     var userLanguage = userConfig.UserLanguage;
-    var recordTags = Model.SelectMany(x => x.Tags).Distinct();
+    var recordTags = Model.Supplies.SelectMany(x => x.Tags).Distinct();
 }
-@model List<SupplyRecord>
+@model SupplyUsageViewModel
 <div class="modal-header">
     <h5 class="modal-title">@translator.Translate(userLanguage,"Select Supplies")</h5>
     <button type="button" class="btn-close" onclick="hideSuppliesModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">
-    @if (Model.Any())
+    @if (Model.Supplies.Any())
     {
         <div class="row">
             <div class="col-12" style="max-height:50vh; overflow-y:auto;" id="supplies-table">
@@ -37,11 +37,12 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (SupplyRecord supplyRecord in Model)
+                        @foreach (SupplyRecord supplyRecord in Model.Supplies)
                         {
+                            var supplyUsage = Model.Usage.Where(x => x.SupplyId == supplyRecord.Id).SingleOrDefault();
                             <tr class="d-flex" id="supplyRows" data-tags='@string.Join(" ", supplyRecord.Tags)'>
-                                <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id"></td>
-                                <td class="col-2"><input type="text" inputmode="decimal" disabled onchange="recalculateTotal()" class="form-control"></td>
+                                <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id" @(supplyUsage == default ? "" : "checked")></td>
+                                <td class="col-2"><input type="text" inputmode="decimal" @(supplyUsage == default ? "disabled" : $"value='{supplyUsage.Quantity}'") onchange="recalculateTotal()" class="form-control"></td>
                                 <td class="col-2 supplyquantity">@supplyRecord.Quantity</td>
                                 <td class="col-2 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.PartNumber)</td>
                                 <td class="col-3 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.Description)</td>
diff --git a/wwwroot/js/planrecord.js b/wwwroot/js/planrecord.js
index 7e09e03..6178fb1 100644
--- a/wwwroot/js/planrecord.js
+++ b/wwwroot/js/planrecord.js
@@ -35,6 +35,9 @@ function showEditPlanRecordModal(planRecordId, nocache) {
             });
         }
     });
+}
+function showEditPlanRecordTemplateModal(planRecordTemplateId, nocache) {
+
 }
 function hideAddPlanRecordModal() {
     $('#planRecordModal').modal('hide');

From c84a4029ec846a9089d7d68d3cac8cf21c124a00 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Sun, 7 Apr 2024 11:09:05 -0600
Subject: [PATCH 3/4] basic functionality to edit templates

---
 Controllers/VehicleController.cs              | 16 ++++---
 Views/Vehicle/_PlanRecordModal.cshtml         |  3 +-
 .../_PlanRecordTemplateEditModal.cshtml       | 44 +++++++------------
 Views/Vehicle/_PlanRecordTemplateModal.cshtml |  4 +-
 Views/Vehicle/_SupplyStore.cshtml             |  6 ++-
 Views/Vehicle/_SupplyUsage.cshtml             |  2 +-
 wwwroot/js/planrecord.js                      | 43 ++++++++++++++++--
 7 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index 102535f..dcc0b9d 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -2055,15 +2055,11 @@ namespace CarCareTracker.Controllers
         {
             //check if template name already taken.
             var existingRecord = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(planRecord.VehicleId).Where(x => x.Description == planRecord.Description).Any();
-            if (existingRecord)
+            if (planRecord.Id == default && existingRecord)
             {
                 return Json(new OperationResponse { Success = false, Message = "A template with that description already exists for this vehicle" });
             }
             planRecord.Files = planRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
-            if (planRecord.Supplies.Any() && planRecord.CopySuppliesAttachment)
-            {
-                planRecord.Files.AddRange(GetSuppliesAttachments(planRecord.Supplies));
-            }
             var result = _planRecordTemplateDataAccess.SavePlanRecordTemplateToVehicle(planRecord);
             return Json(new OperationResponse { Success = result, Message = result ? "Template Added" : StaticHelper.GenericErrorMessage });
         }
@@ -2113,6 +2109,10 @@ namespace CarCareTracker.Controllers
             if (existingRecord.Supplies.Any())
             {
                 existingRecord.RequisitionHistory = RequisitionSupplyRecordsByUsage(existingRecord.Supplies, DateTime.Parse(existingRecord.DateCreated), existingRecord.Description);
+                if (existingRecord.CopySuppliesAttachment)
+                {
+                    existingRecord.Files.AddRange(GetSuppliesAttachments(existingRecord.Supplies));
+                }
             }
             var result = _planRecordDataAccess.SavePlanRecordToVehicle(existingRecord.ToPlanRecord());
             return Json(new OperationResponse { Success = result, Message = result ? "Plan Record Added" : StaticHelper.GenericErrorMessage });
@@ -2210,6 +2210,12 @@ namespace CarCareTracker.Controllers
             return Json(result);
         }
         [HttpGet]
+        public IActionResult GetPlanRecordTemplateForEditById(int planRecordTemplateId)
+        {
+            var result = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
+            return PartialView("_PlanRecordTemplateEditModal", result);
+        }
+        [HttpGet]
         public IActionResult GetPlanRecordForEditById(int planRecordId)
         {
             var result = _planRecordDataAccess.GetPlanRecordById(planRecordId);
diff --git a/Views/Vehicle/_PlanRecordModal.cshtml b/Views/Vehicle/_PlanRecordModal.cshtml
index 0663f43..a4e4269 100644
--- a/Views/Vehicle/_PlanRecordModal.cshtml
+++ b/Views/Vehicle/_PlanRecordModal.cshtml
@@ -126,7 +126,8 @@
             id: @Model.Id,
             dateCreated: decodeHTMLEntities('@(Model.DateCreated)'),
             reminderRecordId: decodeHTMLEntities('@Model.ReminderRecordId'),
-            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower()
+            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower(),
+            isTemplate: false
         }
     }
 </script>
\ No newline at end of file
diff --git a/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml b/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
index d58f461..5fdce1c 100644
--- a/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
+++ b/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
@@ -21,10 +21,7 @@
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @if (isNew)
-                    {
-                        @await Html.PartialAsync("_SupplyStore", "PlanRecordTemplate")
-                    }
+                    @await Html.PartialAsync("_SupplyStore", "PlanRecordTemplate")
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -84,44 +81,37 @@
         {
             <button type="button" class="btn btn-warning" onclick="toggleSupplyUsageHistory()"><i class="bi bi-shop"></i></button>
         }
-        <button type="button" class="btn btn-danger" onclick="deletePlanRecord(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage, "Delete")</button>
+        <button type="button" class="btn btn-danger" onclick="deletePlannerRecordTemplate(@Model.Id)" style="margin-right:auto;">@translator.Translate(userLanguage, "Delete")</button>
     }
     <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
-    @if (isNew)
-    {
-        <div class="btn-group">
-            <button onclick="savePlanRecordToVehicle()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>@translator.Translate(userLanguage, "Add New Plan Record")</button>
-            <button type="button" class="btn btn-md btn-primary btn-md mt-1 mb-1 dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
-                <span class="visually-hidden">Toggle Dropdown</span>
-            </button>
-            <ul class="dropdown-menu">
-                <li><a class="dropdown-item" href="#" onclick="savePlanRecordTemplate()">@translator.Translate(userLanguage, "Save as Template")</a></li>
-            </ul>
-        </div>
-    }
-    else if (!isNew)
-    {
-        <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Plan Record")</button>
-    }
+    <button type="button" class="btn btn-primary" onclick="savePlanRecordTemplate(true)">@translator.Translate(userLanguage, "Edit Plan Record Template")</button>
 </div>
 @await Html.PartialAsync("_SupplyRequisitionHistory", Model.RequisitionHistory)
 <script>
     var uploadedFiles = [];
     var selectedSupplies = [];
-    var copySuppliesAttachments = false;
+    var copySuppliesAttachments = @Model.CopySuppliesAttachment.ToString().ToLower();
     getUploadedFilesFromModel();
+    getSelectedSuppliesFromModel();
     function getUploadedFilesFromModel() {
-    @foreach (UploadedFiles filesUploaded in Model.Files)
-    {
-        @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+        @foreach (UploadedFiles filesUploaded in Model.Files)
+        {
+            @:uploadedFiles.push({ name: "@filesUploaded.Name", location: "@filesUploaded.Location" });
+        }
+    }
+    function getSelectedSuppliesFromModel() {
+        @foreach(SupplyUsage supplyUsage in Model.Supplies)
+        {
+        @:selectedSupplies.push({supplyId: @supplyUsage.SupplyId, quantity: @supplyUsage.Quantity})
+        }
     }
-            }
     function getPlanRecordModelData() {
         return {
             id: @Model.Id,
             dateCreated: decodeHTMLEntities('@(Model.DateCreated)'),
             reminderRecordId: decodeHTMLEntities('@Model.ReminderRecordId'),
-            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower()
+            createdFromReminder: @Model.CreatedFromReminder.ToString().ToLower(),
+            isTemplate: true
         }
     }
 </script>
\ No newline at end of file
diff --git a/Views/Vehicle/_PlanRecordTemplateModal.cshtml b/Views/Vehicle/_PlanRecordTemplateModal.cshtml
index 600639f..b0ca4fc 100644
--- a/Views/Vehicle/_PlanRecordTemplateModal.cshtml
+++ b/Views/Vehicle/_PlanRecordTemplateModal.cshtml
@@ -20,7 +20,7 @@
                         <tr class="d-flex">
                             <th scope="col" class="col-8">@translator.Translate(userLanguage,"Description")</th>
                             <th scope="col" class="col-2">@translator.Translate(userLanguage, "Use")</th>
-                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Delete")</th>
+                            <th scope="col" class="col-2">@translator.Translate(userLanguage, "Edit")</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -67,7 +67,7 @@
                                     }
                                 </td>
                                 <td class="col-2"><button type="button" class="btn btn-primary" onclick="usePlannerRecordTemplate(@planRecordTemplate.Id)"><i class="bi bi-plus-square"></i></button></td>
-                                <td class="col-2"><button type="button" class="btn btn-danger" onclick="deletePlannerRecordTemplate(@planRecordTemplate.Id)"><i class="bi bi-trash"></i></button></td>
+                                <td class="col-2"><button type="button" class="btn btn-warning" onclick="showEditPlanRecordTemplateModal(@planRecordTemplate.Id)"><i class="bi bi-pencil-square"></i></button></td>
                             </tr>
                         }
                     </tbody>
diff --git a/Views/Vehicle/_SupplyStore.cshtml b/Views/Vehicle/_SupplyStore.cshtml
index af7db46..5662e9c 100644
--- a/Views/Vehicle/_SupplyStore.cshtml
+++ b/Views/Vehicle/_SupplyStore.cshtml
@@ -33,6 +33,7 @@
                 $('#upgradeRecordCost').val(selectedSupplyResult.totalSum);
                 break;
             case "PlanRecord":
+            case "PlanRecordTemplate":
                 $('#planRecordCost').val(selectedSupplyResult.totalSum);
                 break;
         }
@@ -53,6 +54,7 @@
                 $('#upgradeRecordModal').modal('hide');
                 break;
             case "PlanRecord":
+            case "PlanRecordTemplate":
                 $('#planRecordModal').modal('hide');
                 break;
         }
@@ -70,6 +72,7 @@
                 $('#upgradeRecordModal').modal('show');
                 break;
             case "PlanRecord":
+            case "PlanRecordTemplate":
                 $('#planRecordModal').modal('show');
                 break;
         }
@@ -91,6 +94,7 @@
                     hideParentModal();
                     $("#inputSuppliesModalContent").html(data);
                     $('#inputSuppliesModal').modal('show');
+                    recalculateTotal();
                 }
             });
         } else {
@@ -101,7 +105,7 @@
                     $("#inputSuppliesModalContent").html(data);
                     $('#inputSuppliesModal').modal('show');
                 }
-            })
+            });
         }
     }
     function hideSuppliesModal() {
diff --git a/Views/Vehicle/_SupplyUsage.cshtml b/Views/Vehicle/_SupplyUsage.cshtml
index 63eb1fa..0538eb1 100644
--- a/Views/Vehicle/_SupplyUsage.cshtml
+++ b/Views/Vehicle/_SupplyUsage.cshtml
@@ -42,7 +42,7 @@
                             var supplyUsage = Model.Usage.Where(x => x.SupplyId == supplyRecord.Id).SingleOrDefault();
                             <tr class="d-flex" id="supplyRows" data-tags='@string.Join(" ", supplyRecord.Tags)'>
                                 <td class="col-1"><input class="form-check-input" type="checkbox" onchange="toggleQuantityFieldDisabled(this)" value="@supplyRecord.Id" @(supplyUsage == default ? "" : "checked")></td>
-                                <td class="col-2"><input type="text" inputmode="decimal" @(supplyUsage == default ? "disabled" : $"value='{supplyUsage.Quantity}'") onchange="recalculateTotal()" class="form-control"></td>
+                                <td class="col-2"><input type="text" inputmode="decimal" @(supplyUsage == default ? "disabled" : "") value="@(supplyUsage == default ? "" : supplyUsage.Quantity)" onchange="recalculateTotal()" class="form-control"></td>
                                 <td class="col-2 supplyquantity">@supplyRecord.Quantity</td>
                                 <td class="col-2 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.PartNumber)</td>
                                 <td class="col-3 text-truncate">@StaticHelper.TruncateStrings(supplyRecord.Description)</td>
diff --git a/wwwroot/js/planrecord.js b/wwwroot/js/planrecord.js
index 6178fb1..5303858 100644
--- a/wwwroot/js/planrecord.js
+++ b/wwwroot/js/planrecord.js
@@ -14,7 +14,8 @@ function showEditPlanRecordModal(planRecordId, nocache) {
         if (existingContent.trim() != '') {
             //check if id is same.
             var existingId = getPlanRecordModelData().id;
-            if (existingId == planRecordId && $('[data-changed=true]').length > 0) {
+            var isNotTemplate = !getPlanRecordModelData().isTemplate;
+            if (existingId == planRecordId && isNotTemplate && $('[data-changed=true]').length > 0) {
                 $('#planRecordModal').modal('show');
                 $('.cached-banner').show();
                 return;
@@ -37,7 +38,34 @@ function showEditPlanRecordModal(planRecordId, nocache) {
     });
 }
 function showEditPlanRecordTemplateModal(planRecordTemplateId, nocache) {
-
+    hidePlanRecordTemplatesModal();
+    if (!nocache) {
+        var existingContent = $("#planRecordModalContent").html();
+        if (existingContent.trim() != '') {
+            //check if id is same.
+            var existingId = getPlanRecordModelData().id;
+            var isTemplate = getPlanRecordModelData().isTemplate;
+            if (existingId == planRecordTemplateId && isTemplate && $('[data-changed=true]').length > 0) {
+                $('#planRecordModal').modal('show');
+                $('.cached-banner').show();
+                return;
+            }
+        }
+    }
+    $.get(`/Vehicle/GetPlanRecordTemplateForEditById?planRecordTemplateId=${planRecordTemplateId}`, function (data) {
+        if (data) {
+            $("#planRecordModalContent").html(data);
+            //initiate datepicker
+            initDatePicker($('#planRecordDate'));
+            $('#planRecordModal').modal('show');
+            bindModalInputChanges('planRecordModal');
+            $('#planRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("planRecordNotes");
+                }
+            });
+        }
+    });
 }
 function hideAddPlanRecordModal() {
     $('#planRecordModal').modal('hide');
@@ -136,6 +164,7 @@ function deletePlannerRecordTemplate(planRecordTemplateId) {
                 $("#workAroundInput").hide();
                 if (data) {
                     successToast("Template Deleted");
+                    hideAddPlanRecordModal();
                     hidePlanRecordTemplatesModal();
                 } else {
                     errorToast(genericErrorMessage());
@@ -146,7 +175,7 @@ function deletePlannerRecordTemplate(planRecordTemplateId) {
         }
     });
 }
-function savePlanRecordTemplate() {
+function savePlanRecordTemplate(isEdit) {
     //get values
     var formValues = getAndValidatePlanRecordValues();
     //validate
@@ -157,7 +186,13 @@ function savePlanRecordTemplate() {
     //save to db.
     $.post('/Vehicle/SavePlanRecordTemplateToVehicleId', { planRecord: formValues }, function (data) {
         if (data.success) {
-            successToast(data.message);
+            if (isEdit) {
+                hideAddPlanRecordModal();
+                showPlanRecordTemplatesModal();
+                successToast('Plan Template Updated');
+            } else {
+                successToast('Plan Template Added');
+            }
         } else {
             errorToast(data.message);
         }

From 4472a67ec0fe9b33da7cbb98c672e725d0dc1feb Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Sun, 7 Apr 2024 11:19:52 -0600
Subject: [PATCH 4/4] fixed label function

---
 Views/Vehicle/_PlanRecordTemplateEditModal.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml b/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
index 5fdce1c..acd1d7e 100644
--- a/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
+++ b/Views/Vehicle/_PlanRecordTemplateEditModal.cshtml
@@ -8,7 +8,7 @@
     var userLanguage = userConfig.UserLanguage;
 }
 <div class="modal-header">
-    <h5 class="modal-title">@translator.Translate(userLanguage, "Edit Plan Record Template")<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditPlanRecordModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
+    <h5 class="modal-title">@translator.Translate(userLanguage, "Edit Plan Record Template")<small style="display:none; @(isNew ? "" : "cursor:pointer;")" class="cached-banner ms-2 text-warning" onclick='@(isNew ? "" : $"showEditPlanRecordTemplateModal({Model.Id}, true)" )'>@translator.Translate(userLanguage, "Unsaved Changes")</small></h5>
     <button type="button" class="btn-close" onclick="hideAddPlanRecordModal()" aria-label="Close"></button>
 </div>
 <div class="modal-body">