diff --git a/Models/Reminder/ReminderRecordInput.cs b/Models/Reminder/ReminderRecordInput.cs index 42576c7..1107feb 100644 --- a/Models/Reminder/ReminderRecordInput.cs +++ b/Models/Reminder/ReminderRecordInput.cs @@ -42,5 +42,6 @@ Tags = Tags }; } + public bool CreatedFromRecord { get; set; } = false; } } diff --git a/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml b/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml index d26884d..347bc8a 100644 --- a/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml +++ b/Views/Vehicle/Reminder/_ReminderRecordModal.cshtml @@ -144,6 +144,11 @@ var customMonthInterval = @Model.CustomMonthInterval; var customMonthIntervalUnit = decodeHTMLEntities('@Model.CustomMonthIntervalUnit'); function getReminderRecordModelData() { - return { id: @Model.Id, mileageInterval: decodeHTMLEntities('@Model.ReminderMileageInterval.ToString()'), monthInterval: decodeHTMLEntities('@Model.ReminderMonthInterval.ToString()')} + return { + id: @Model.Id, + createdFromRecord: @Model.CreatedFromRecord.ToString().ToLower(), + mileageInterval: decodeHTMLEntities('@Model.ReminderMileageInterval.ToString()'), + monthInterval: decodeHTMLEntities('@Model.ReminderMonthInterval.ToString()') + } } \ No newline at end of file diff --git a/wwwroot/js/reminderrecord.js b/wwwroot/js/reminderrecord.js index a29698e..b75120c 100644 --- a/wwwroot/js/reminderrecord.js +++ b/wwwroot/js/reminderrecord.js @@ -129,8 +129,12 @@ function saveReminderRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Reminder Updated" : "Reminder Added."); hideAddReminderRecordModal(); - saveScrollPosition(); - getVehicleReminders(formValues.vehicleId); + if (!getReminderRecordModelData().createdFromRecord) { + saveScrollPosition(); + getVehicleReminders(formValues.vehicleId); + } else { + getVehicleHaveImportantReminders(formValues.vehicleId); + } } else { errorToast(genericErrorMessage()); } diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js index 757636e..22993fc 100644 --- a/wwwroot/js/vehicle.js +++ b/wwwroot/js/vehicle.js @@ -228,6 +228,7 @@ function deleteVehicle(vehicleId) { } function showAddReminderModal(reminderModalInput) { if (reminderModalInput != undefined) { + reminderModalInput['createdFromRecord'] = true; $.post('/Vehicle/GetAddReminderRecordPartialView', { reminderModel: reminderModalInput }, function (data) { $("#reminderRecordModalContent").html(data); initDatePicker($('#reminderDate'), true);