Compare commits

..

No commits in common. "082856170a1c934cbcbe89855c1235c7e1142086" and "0dd1fe2ec2798a843425b3a9e2bdcd912513b153" have entirely different histories.

View File

@ -104,26 +104,31 @@ export function Header({
} }
}; };
const changeSinceYear = (delta: number) => { const nextFromYearHandler = () => {
if (!currentYear) return; if (currentYear && (currentYear.since ?? 0) < (currentYear.until ?? 0)) {
const data = {
const newSince = (currentYear.since ?? 0) + delta; ...currentYear,
since: currentYear.since! + 1,
if (newSince > (currentYear.until ?? Infinity) || newSince < 0) return; };
setCurrentYear(data);
const updatedYear = { ...currentYear, since: newSince }; EventBus.emit("dateSelected", {
setCurrentYear(updatedYear); ...selectedDate,
start: `${data.since}/${selectedDate.start?.split("/").slice(1).join("/")}`,
const updatedDate = { });
...selectedDate, }
start: `${newSince}/${selectedDate.start?.split("/").slice(1).join("/")}`,
};
setSelectedDate(updatedDate);
EventBus.emit("dateSelected", updatedDate);
}; };
const nextFromYearHandler = () => changeSinceYear(1); const prevFromYearHandler = () => {
const prevFromYearHandler = () => changeSinceYear(-1); const data = {
...currentYear,
since: currentYear.since! - 1,
};
setCurrentYear(data);
EventBus.emit("dateSelected", {
...selectedDate,
start: `${data.since}/${selectedDate.start?.split("/").slice(1).join("/")}`,
});
};
const selectFromDateHandler = (val: MonthItem) => { const selectFromDateHandler = (val: MonthItem) => {
const data = { const data = {
@ -135,26 +140,31 @@ export function Header({
EventBus.emit("dateSelected", data); EventBus.emit("dateSelected", data);
}; };
const changeUntilYear = (delta: number) => { const nextUntilYearHandler = () => {
if (!currentYear) return; const data = {
...currentYear,
const newUntil = (currentYear.until ?? 0) + delta; until: currentYear.until! + 1,
if (newUntil < (currentYear.since ?? 0)) return;
const updatedYear = { ...currentYear, until: newUntil };
setCurrentYear(updatedYear);
const updatedDate = {
...selectedDate,
end: `${newUntil}/${selectedDate.end?.split("/").slice(1).join("/")}`,
}; };
setSelectedDate(updatedDate); setCurrentYear(data);
EventBus.emit("dateSelected", updatedDate); EventBus.emit("dateSelected", {
...selectedDate,
end: `${data.until}/${selectedDate?.end?.split("/").slice(1).join("/")}`,
});
}; };
const nextUntilYearHandler = () => changeUntilYear(1); const prevUntilYearHandler = () => {
const prevUntilYearHandler = () => changeUntilYear(-1); if (currentYear && (currentYear.since ?? 0) < (currentYear.until ?? 0)) {
const data = {
...currentYear,
until: currentYear.until! - 1,
};
setCurrentYear(data);
EventBus.emit("dateSelected", {
...selectedDate,
end: `${data.until}/${selectedDate.end?.split("/").slice(1).join("/")}`,
});
}
};
const selectUntilDateHandler = (val: MonthItem) => { const selectUntilDateHandler = (val: MonthItem) => {
const data = { const data = {