added ability to select reminders from tax modal.

This commit is contained in:
DESKTOP-GENO133\IvanPlex
2024-02-21 10:32:25 -07:00
parent 0590f991d2
commit 2a5ff7a911
7 changed files with 20 additions and 4 deletions

View File

@@ -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);
}

View File

@@ -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; }

View File

@@ -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)

View File

@@ -131,6 +131,6 @@ function getAndValidateCollisionRecordValues() {
addReminderRecord: addReminderRecord,
extraFields: extraFields.extraFields,
requisitionHistory: supplyUsageHistory,
recurringReminderId: recurringReminderRecordId
reminderRecordId: recurringReminderRecordId
}
}

View File

@@ -131,6 +131,6 @@ function getAndValidateServiceRecordValues() {
addReminderRecord: addReminderRecord,
extraFields: extraFields.extraFields,
requisitionHistory: supplyUsageHistory,
recurringReminderId: recurringReminderRecordId
reminderRecordId: recurringReminderRecordId
}
}

View File

@@ -162,6 +162,7 @@ function getAndValidateTaxRecordValues() {
tags: taxTags,
files: uploadedFiles,
addReminderRecord: addReminderRecord,
extraFields: extraFields.extraFields
extraFields: extraFields.extraFields,
reminderRecordId: recurringReminderRecordId
}
}

View File

@@ -131,6 +131,6 @@ function getAndValidateUpgradeRecordValues() {
addReminderRecord: addReminderRecord,
extraFields: extraFields.extraFields,
requisitionHistory: supplyUsageHistory,
recurringReminderId: recurringReminderRecordId
reminderRecordId: recurringReminderRecordId
}
}