From 2a5ff7a911fd46609617a0e355964070f7ce2adf Mon Sep 17 00:00:00 2001
From: "DESKTOP-GENO133\\IvanPlex" <ivancheahkf@gmail.com>
Date: Wed, 21 Feb 2024 10:32:25 -0700
Subject: [PATCH] added ability to select reminders from tax modal.

---
 Controllers/VehicleController.cs     | 5 +++++
 Models/TaxRecord/TaxRecordInput.cs   | 1 +
 Views/Vehicle/_TaxRecordModal.cshtml | 9 +++++++++
 wwwroot/js/collisionrecord.js        | 2 +-
 wwwroot/js/servicerecord.js          | 2 +-
 wwwroot/js/taxrecord.js              | 3 ++-
 wwwroot/js/upgraderecord.js          | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index 9b4e9d7..62bdeb8 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -927,6 +927,11 @@ namespace CarCareTracker.Controllers
         {
             //move files from temp.
             taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
+            //push back any reminders
+            if (taxRecord.ReminderRecordId != default)
+            {
+                PushbackRecurringReminderRecordWithChecks(taxRecord.ReminderRecordId);
+            }
             var result = _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord.ToTaxRecord());
             return Json(result);
         }
diff --git a/Models/TaxRecord/TaxRecordInput.cs b/Models/TaxRecord/TaxRecordInput.cs
index 723623d..4ad9c2f 100644
--- a/Models/TaxRecord/TaxRecordInput.cs
+++ b/Models/TaxRecord/TaxRecordInput.cs
@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public int VehicleId { get; set; }
+        public int ReminderRecordId { get; set; }
         public string Date { get; set; } = DateTime.Now.ToShortDateString();
         public string Description { get; set; }
         public decimal Cost { get; set; }
diff --git a/Views/Vehicle/_TaxRecordModal.cshtml b/Views/Vehicle/_TaxRecordModal.cshtml
index 38f4f58..56cec53 100644
--- a/Views/Vehicle/_TaxRecordModal.cshtml
+++ b/Views/Vehicle/_TaxRecordModal.cshtml
@@ -24,6 +24,14 @@
                     </div>
                     <label for="taxRecordDescription">@translator.Translate(userLanguage,"Description")</label>
                     <input type="text" id="taxRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage,"Description of tax paid(i.e. Registration)")" value="@Model.Description">
+                    @if (isNew)
+                    {
+                        <div class="row">
+                            <div class="col-12">
+                                <a onclick="showRecurringReminderSelector('taxRecordDescription')" class="btn btn-link">@translator.Translate(userLanguage, "Select Reminder")</a>
+                            </div>
+                        </div>
+                    }
                     <label for="taxRecordCost">@translator.Translate(userLanguage,"Cost")</label>
                     <input type="text" inputmode="decimal" id="taxRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of tax paid")" value="@(isNew? "" : Model.Cost)">
                     <label for="taxRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
@@ -107,6 +115,7 @@
 <script>
     var uploadedFiles = [];
     var customMonthInterval = @Model.CustomMonthInterval;
+    var recurringReminderRecordId = 0;
     getUploadedFilesFromModel();
     function getUploadedFilesFromModel() {
     @foreach (UploadedFiles filesUploaded in Model.Files)
diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js
index 93cc799..e44ac18 100644
--- a/wwwroot/js/collisionrecord.js
+++ b/wwwroot/js/collisionrecord.js
@@ -131,6 +131,6 @@ function getAndValidateCollisionRecordValues() {
         addReminderRecord: addReminderRecord,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
-        recurringReminderId: recurringReminderRecordId
+        reminderRecordId: recurringReminderRecordId
     }
 }
\ No newline at end of file
diff --git a/wwwroot/js/servicerecord.js b/wwwroot/js/servicerecord.js
index 9485491..f634722 100644
--- a/wwwroot/js/servicerecord.js
+++ b/wwwroot/js/servicerecord.js
@@ -131,6 +131,6 @@ function getAndValidateServiceRecordValues() {
         addReminderRecord: addReminderRecord,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
-        recurringReminderId: recurringReminderRecordId
+        reminderRecordId: recurringReminderRecordId
     }
 }
\ No newline at end of file
diff --git a/wwwroot/js/taxrecord.js b/wwwroot/js/taxrecord.js
index d08d338..d6eae7a 100644
--- a/wwwroot/js/taxrecord.js
+++ b/wwwroot/js/taxrecord.js
@@ -162,6 +162,7 @@ function getAndValidateTaxRecordValues() {
         tags: taxTags,
         files: uploadedFiles,
         addReminderRecord: addReminderRecord,
-        extraFields: extraFields.extraFields
+        extraFields: extraFields.extraFields,
+        reminderRecordId: recurringReminderRecordId
     }
 }
\ No newline at end of file
diff --git a/wwwroot/js/upgraderecord.js b/wwwroot/js/upgraderecord.js
index 77ef5b7..87a5d70 100644
--- a/wwwroot/js/upgraderecord.js
+++ b/wwwroot/js/upgraderecord.js
@@ -131,6 +131,6 @@ function getAndValidateUpgradeRecordValues() {
         addReminderRecord: addReminderRecord,
         extraFields: extraFields.extraFields,
         requisitionHistory: supplyUsageHistory,
-        recurringReminderId: recurringReminderRecordId
+        reminderRecordId: recurringReminderRecordId
     }
 }
\ No newline at end of file