Arnike/duty-teller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

fix: correct duty list scrolling behavior and simplify current duty check
All checks were successful
CI / lint-and-test (push) Successful in 25s
Details

Browse Source 
- Removed unnecessary condition for determining if a duty is current, streamlining the logic.
- Refactored the scrolling functionality to ensure the view correctly focuses on the current duty or today's block.
- Improved code clarity by consolidating the scroll target logic into a reusable function.
This commit is contained in:
Nikolay Tatarinov
2026-02-21 01:08:48 +03:00
parent 15f80ee46b
commit a81103e90d
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webapp/js/dutyList.js
View File

@@ -136,7 +136,7 @@ export function renderDutyList(duties) {
dayDuties.forEach((d) => { dayDuties.forEach((d) => {
const start = new Date(d.start_at); const start = new Date(d.start_at);
const end = new Date(d.end_at); const end = new Date(d.end_at);
const isCurrent = isToday && start <= now && now < end; const isCurrent = start <= now && now < end;
dayHtml += dayHtml +=
'<div class="duty-timeline-row">' + '<div class="duty-timeline-row">' +
dateCellHtml + dateCellHtml +
@@ -160,18 +160,25 @@ export function renderDutyList(duties) {
"</div>"; "</div>";
}); });
dutyListEl.innerHTML = fullHtml; dutyListEl.innerHTML = fullHtml;
const scrollTarget = dutyListEl.querySelector(".duty-timeline-day--today"); const calendarSticky = document.getElementById("calendarSticky");
if (scrollTarget) { const scrollToEl = (el) => {
const calendarSticky = document.getElementById("calendarSticky"); if (!el) return;
if (calendarSticky) { if (calendarSticky) {
requestAnimationFrame(() => { requestAnimationFrame(() => {
const calendarHeight = calendarSticky.offsetHeight; const calendarHeight = calendarSticky.offsetHeight;
const todayTop = scrollTarget.getBoundingClientRect().top + window.scrollY; const top = el.getBoundingClientRect().top + window.scrollY;
const scrollTop = Math.max(0, todayTop - calendarHeight); const scrollTop = Math.max(0, top - calendarHeight);
window.scrollTo({ top: scrollTop, behavior: "auto" }); window.scrollTo({ top: scrollTop, behavior: "auto" });
}); });
} else { } else {
scrollTarget.scrollIntoView({ behavior: "auto", block: "start" }); el.scrollIntoView({ behavior: "auto", block: "start" });
} }
};
const currentDutyCard = dutyListEl.querySelector(".duty-item--current");
const todayBlock = dutyListEl.querySelector(".duty-timeline-day--today");
if (currentDutyCard) {
scrollToEl(currentDutyCard);
} else if (todayBlock) {
scrollToEl(todayBlock);
} }
} }