diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js index 96542eb..22f29f4 100644 --- a/wwwroot/js/collisionrecord.js +++ b/wwwroot/js/collisionrecord.js @@ -59,6 +59,7 @@ function saveCollisionRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Repair Record Updated" : "Repair Record Added."); hideAddCollisionRecordModal(); + saveScrollPosition(); getVehicleCollisionRecords(formValues.vehicleId); if (formValues.addReminderRecord) { setTimeout(function () { showAddReminderModal(formValues); }, 500); diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js index 178d41b..13d7534 100644 --- a/wwwroot/js/gasrecord.js +++ b/wwwroot/js/gasrecord.js @@ -59,6 +59,7 @@ function saveGasRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Gas Record Updated" : "Gas Record Added."); hideAddGasRecordModal(); + saveScrollPosition(); getVehicleGasRecords(formValues.vehicleId); } else { errorToast("An error has occurred, please try again later."); diff --git a/wwwroot/js/note.js b/wwwroot/js/note.js index 1f02528..f44b31f 100644 --- a/wwwroot/js/note.js +++ b/wwwroot/js/note.js @@ -55,6 +55,7 @@ function saveNoteToVehicle(isEdit) { if (data) { successToast(isEdit ? "Note Updated" : "Note Added."); hideAddNoteModal(); + saveScrollPosition(); getVehicleNotes(formValues.vehicleId); } else { errorToast("An error has occurred, please try again later."); diff --git a/wwwroot/js/reminderrecord.js b/wwwroot/js/reminderrecord.js index 4a0375f..1bca595 100644 --- a/wwwroot/js/reminderrecord.js +++ b/wwwroot/js/reminderrecord.js @@ -51,6 +51,7 @@ function saveReminderRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Reminder Updated" : "Reminder Added."); hideAddReminderRecordModal(); + saveScrollPosition(); getVehicleReminders(formValues.vehicleId); } else { errorToast("An error has occurred, please try again later."); diff --git a/wwwroot/js/servicerecord.js b/wwwroot/js/servicerecord.js index 3c99676..22640a8 100644 --- a/wwwroot/js/servicerecord.js +++ b/wwwroot/js/servicerecord.js @@ -59,6 +59,7 @@ function saveServiceRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Service Record Updated" : "Service Record Added."); hideAddServiceRecordModal(); + saveScrollPosition(); getVehicleServiceRecords(formValues.vehicleId); if (formValues.addReminderRecord) { setTimeout(function () { showAddReminderModal(formValues); }, 500); diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js index d0ea891..b36c904 100644 --- a/wwwroot/js/shared.js +++ b/wwwroot/js/shared.js @@ -128,7 +128,7 @@ function initDatePicker(input, futureOnly) { endDate: "+0d", format: getShortDatePattern().pattern, autoclose: true - }); + }).datepicker("setDate", "0"); //default to today for backward looking datepickers but not forward looking ones, this is intentional. ReminderModal's date is set in ReminderInput.cs } } diff --git a/wwwroot/js/taxrecord.js b/wwwroot/js/taxrecord.js index 39252ff..1c40232 100644 --- a/wwwroot/js/taxrecord.js +++ b/wwwroot/js/taxrecord.js @@ -59,6 +59,7 @@ function saveTaxRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Tax Record Updated" : "Tax Record Added."); hideAddTaxRecordModal(); + saveScrollPosition(); getVehicleTaxRecords(formValues.vehicleId); if (formValues.addReminderRecord) { setTimeout(function () { showAddReminderModal(formValues); }, 500); diff --git a/wwwroot/js/upgraderecord.js b/wwwroot/js/upgraderecord.js index 51fe434..f1dfced 100644 --- a/wwwroot/js/upgraderecord.js +++ b/wwwroot/js/upgraderecord.js @@ -59,6 +59,7 @@ function saveUpgradeRecordToVehicle(isEdit) { if (data) { successToast(isEdit ? "Upgrade Record Updated" : "Upgrade Record Added."); hideAddUpgradeRecordModal(); + saveScrollPosition(); getVehicleUpgradeRecords(formValues.vehicleId); if (formValues.addReminderRecord) { setTimeout(function () { showAddReminderModal(formValues); }, 500); diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js index a104a78..8bf8cb9 100644 --- a/wwwroot/js/vehicle.js +++ b/wwwroot/js/vehicle.js @@ -65,6 +65,7 @@ function getVehicleNotes(vehicleId) { $.get(`/Vehicle/GetNotesByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#notes-tab-pane").html(data); + restoreScrollPosition(); } }); } @@ -72,6 +73,7 @@ function getVehicleServiceRecords(vehicleId) { $.get(`/Vehicle/GetServiceRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#servicerecord-tab-pane").html(data); + restoreScrollPosition(); getVehicleHaveImportantReminders(vehicleId); } }); @@ -80,6 +82,7 @@ function getVehicleUpgradeRecords(vehicleId) { $.get(`/Vehicle/GetUpgradeRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#upgrade-tab-pane").html(data); + restoreScrollPosition(); getVehicleHaveImportantReminders(vehicleId); } }); @@ -88,6 +91,7 @@ function getVehicleGasRecords(vehicleId) { $.get(`/Vehicle/GetGasRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#gas-tab-pane").html(data); + restoreScrollPosition(); getVehicleHaveImportantReminders(vehicleId); } }); @@ -96,6 +100,7 @@ function getVehicleCollisionRecords(vehicleId) { $.get(`/Vehicle/GetCollisionRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#accident-tab-pane").html(data); + restoreScrollPosition(); getVehicleHaveImportantReminders(vehicleId); } }); @@ -104,6 +109,7 @@ function getVehicleTaxRecords(vehicleId) { $.get(`/Vehicle/GetTaxRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#tax-tab-pane").html(data); + restoreScrollPosition(); } }); } @@ -111,6 +117,7 @@ function getVehicleReminders(vehicleId) { $.get(`/Vehicle/GetReminderRecordsByVehicleId?vehicleId=${vehicleId}`, function (data) { if (data) { $("#reminder-tab-pane").html(data); + restoreScrollPosition(); getVehicleHaveImportantReminders(vehicleId); } }); @@ -253,4 +260,12 @@ function editFileName(fileLocation, event) { uploadedFiles[editFileIndex].name = result.value.newFileName; } }); +} +var scrollPosition = 0; +function saveScrollPosition() { + scrollPosition = $(".vehicleDetailTabContainer").scrollTop(); +} +function restoreScrollPosition() { + $(".vehicleDetailTabContainer").scrollTop(scrollPosition); + scrollPosition = 0; } \ No newline at end of file