added ability to select reminders from tax modal.
This commit is contained in:
@@ -927,6 +927,11 @@ namespace CarCareTracker.Controllers
|
|||||||
{
|
{
|
||||||
//move files from temp.
|
//move files from temp.
|
||||||
taxRecord.Files = taxRecord.Files.Select(x => { return new UploadedFiles { Name = x.Name, Location = _fileHelper.MoveFileFromTemp(x.Location, "documents/") }; }).ToList();
|
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());
|
var result = _taxRecordDataAccess.SaveTaxRecordToVehicle(taxRecord.ToTaxRecord());
|
||||||
return Json(result);
|
return Json(result);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
{
|
{
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public int VehicleId { get; set; }
|
public int VehicleId { get; set; }
|
||||||
|
public int ReminderRecordId { get; set; }
|
||||||
public string Date { get; set; } = DateTime.Now.ToShortDateString();
|
public string Date { get; set; } = DateTime.Now.ToShortDateString();
|
||||||
public string Description { get; set; }
|
public string Description { get; set; }
|
||||||
public decimal Cost { get; set; }
|
public decimal Cost { get; set; }
|
||||||
|
|||||||
@@ -24,6 +24,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<label for="taxRecordDescription">@translator.Translate(userLanguage,"Description")</label>
|
<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">
|
<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>
|
<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)">
|
<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>
|
<label for="taxRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
|
||||||
@@ -107,6 +115,7 @@
|
|||||||
<script>
|
<script>
|
||||||
var uploadedFiles = [];
|
var uploadedFiles = [];
|
||||||
var customMonthInterval = @Model.CustomMonthInterval;
|
var customMonthInterval = @Model.CustomMonthInterval;
|
||||||
|
var recurringReminderRecordId = 0;
|
||||||
getUploadedFilesFromModel();
|
getUploadedFilesFromModel();
|
||||||
function getUploadedFilesFromModel() {
|
function getUploadedFilesFromModel() {
|
||||||
@foreach (UploadedFiles filesUploaded in Model.Files)
|
@foreach (UploadedFiles filesUploaded in Model.Files)
|
||||||
|
|||||||
@@ -131,6 +131,6 @@ function getAndValidateCollisionRecordValues() {
|
|||||||
addReminderRecord: addReminderRecord,
|
addReminderRecord: addReminderRecord,
|
||||||
extraFields: extraFields.extraFields,
|
extraFields: extraFields.extraFields,
|
||||||
requisitionHistory: supplyUsageHistory,
|
requisitionHistory: supplyUsageHistory,
|
||||||
recurringReminderId: recurringReminderRecordId
|
reminderRecordId: recurringReminderRecordId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -131,6 +131,6 @@ function getAndValidateServiceRecordValues() {
|
|||||||
addReminderRecord: addReminderRecord,
|
addReminderRecord: addReminderRecord,
|
||||||
extraFields: extraFields.extraFields,
|
extraFields: extraFields.extraFields,
|
||||||
requisitionHistory: supplyUsageHistory,
|
requisitionHistory: supplyUsageHistory,
|
||||||
recurringReminderId: recurringReminderRecordId
|
reminderRecordId: recurringReminderRecordId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -162,6 +162,7 @@ function getAndValidateTaxRecordValues() {
|
|||||||
tags: taxTags,
|
tags: taxTags,
|
||||||
files: uploadedFiles,
|
files: uploadedFiles,
|
||||||
addReminderRecord: addReminderRecord,
|
addReminderRecord: addReminderRecord,
|
||||||
extraFields: extraFields.extraFields
|
extraFields: extraFields.extraFields,
|
||||||
|
reminderRecordId: recurringReminderRecordId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -131,6 +131,6 @@ function getAndValidateUpgradeRecordValues() {
|
|||||||
addReminderRecord: addReminderRecord,
|
addReminderRecord: addReminderRecord,
|
||||||
extraFields: extraFields.extraFields,
|
extraFields: extraFields.extraFields,
|
||||||
requisitionHistory: supplyUsageHistory,
|
requisitionHistory: supplyUsageHistory,
|
||||||
recurringReminderId: recurringReminderRecordId
|
reminderRecordId: recurringReminderRecordId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user