Skip to content

Commit 2ab822a

Browse files
authored
Merge pull request #1126 from hargata/Hargata/fix.reminder.bug
fix UI bug when creating reminder record from other records.
2 parents 9ef2124 + 0cef3c9 commit 2ab822a

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

Models/Reminder/ReminderRecordInput.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ public ReminderRecord ToReminderRecord()
4242
Tags = Tags
4343
};
4444
}
45+
public bool CreatedFromRecord { get; set; } = false;
4546
}
4647
}

Views/Vehicle/Reminder/_ReminderRecordModal.cshtml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
var customMonthInterval = @Model.CustomMonthInterval;
145145
var customMonthIntervalUnit = decodeHTMLEntities('@Model.CustomMonthIntervalUnit');
146146
function getReminderRecordModelData() {
147-
return { id: @Model.Id, mileageInterval: decodeHTMLEntities('@Model.ReminderMileageInterval.ToString()'), monthInterval: decodeHTMLEntities('@Model.ReminderMonthInterval.ToString()')}
147+
return {
148+
id: @Model.Id,
149+
createdFromRecord: @Model.CreatedFromRecord.ToString().ToLower(),
150+
mileageInterval: decodeHTMLEntities('@Model.ReminderMileageInterval.ToString()'),
151+
monthInterval: decodeHTMLEntities('@Model.ReminderMonthInterval.ToString()')
152+
}
148153
}
149154
</script>

wwwroot/js/reminderrecord.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,12 @@ function saveReminderRecordToVehicle(isEdit) {
129129
if (data) {
130130
successToast(isEdit ? "Reminder Updated" : "Reminder Added.");
131131
hideAddReminderRecordModal();
132-
saveScrollPosition();
133-
getVehicleReminders(formValues.vehicleId);
132+
if (!getReminderRecordModelData().createdFromRecord) {
133+
saveScrollPosition();
134+
getVehicleReminders(formValues.vehicleId);
135+
} else {
136+
getVehicleHaveImportantReminders(formValues.vehicleId);
137+
}
134138
} else {
135139
errorToast(genericErrorMessage());
136140
}

wwwroot/js/vehicle.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ function deleteVehicle(vehicleId) {
228228
}
229229
function showAddReminderModal(reminderModalInput) {
230230
if (reminderModalInput != undefined) {
231+
reminderModalInput['createdFromRecord'] = true;
231232
$.post('/Vehicle/GetAddReminderRecordPartialView', { reminderModel: reminderModalInput }, function (data) {
232233
$("#reminderRecordModalContent").html(data);
233234
initDatePicker($('#reminderDate'), true);

0 commit comments

Comments
 (0)