mirror of
https://github.com/hargata/lubelog.git
synced 2025-12-10 00:46:08 -06:00
Merge pull request #1126 from hargata/Hargata/fix.reminder.bug
fix UI bug when creating reminder record from other records.
This commit is contained in:
commit
2ab822af8f
@ -42,5 +42,6 @@
|
||||
Tags = Tags
|
||||
};
|
||||
}
|
||||
public bool CreatedFromRecord { get; set; } = false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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()')
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -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());
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user