tietokonepaja/lootakalenteri-frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow unpicking box, fix calendar render

Browse Source
This commit is contained in:
Veikko Lintujärvi
2025-06-17 18:15:36 +03:00
parent cb06c560f8
commit 7a3a9a63d4
3 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/components/Calendar.tsx
View File

@@ -4,7 +4,7 @@ import { getMonthName, daysInMonth } from "../utils/dateUtils";
import { customerState } from "../store";
import { Box } from "../types";
import { useAtom } from "jotai";
import { markBoxPickedUp } from "../api";
import { markBoxDelivered, markBoxPickedUp } from "../api";
export default function Calendar() {
const [customerData, setCustomerData] = useAtom(customerState);
@@ -15,7 +15,7 @@ export default function Calendar() {
useEffect(() => {
setCalendarCells(generateCalendarCells(selectedMonth, customerData.boxes));
setFirstWeekPadding(generateFirstWeekPadding(selectedMonth));
}, [selectedMonth]);
}, [selectedMonth, customerData.boxes]);
const generateFirstWeekPadding = (month: number) => {
const firstDay = new Date(new Date().getFullYear(), month, 1).getDay();
@@ -44,20 +44,33 @@ export default function Calendar() {
key={index}
className={`${styles.calendarCell} ${matchingBox.pickup_date ? styles.pickedUpCell : styles.deliveredCell}`}
onClick={() => {
console.log(`Box picked up for date: ${date.toLocaleDateString("fi-FI")}`);
markBoxPickedUp(matchingBox.id).then((updatedBox) => {
console.log(`Box with ID ${updatedBox.id} marked as picked up.`);
setCustomerData((prev) => ({
...prev,
boxes: prev.boxes.map(box =>
box.id === updatedBox.id ? { ...box, pickup_date: updatedBox.pickup_date } : box
),
}));
if (matchingBox.pickup_date) {
// If the box is already picked up, mark it as delivered
markBoxDelivered(matchingBox.id).then((updatedBox) => {
setCustomerData((prev) => ({
...prev,
boxes: prev.boxes.map(box =>
box.id === updatedBox.id ? { ...box, pickup_date: null } : box
),
}));
}
).catch((error) => {
console.error("Error marking box as delivered:", error);
});
return;
} else {
markBoxPickedUp(matchingBox.id).then((updatedBox) => {
setCustomerData((prev) => ({
...prev,
boxes: prev.boxes.map(box =>
box.id === updatedBox.id ? { ...box, pickup_date: updatedBox.pickup_date } : box
),
}));
}
).catch((error) => {
console.error("Error marking box as picked up:", error);
})
}
).catch((error) => {
console.error("Error marking box as picked up:", error);
})
}}>
{date.toLocaleDateString("fi-FI", {
day: "2-digit",