Compare commits

..

2 Commits
main ... dev

2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{ {
"name": "equip-reserve-frontend", "name": "equip-reserve-frontend",
"private": true, "private": true,
"version": "1.0.0", "version": "1.0.1",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View File

@ -64,16 +64,16 @@ export default function DeviceDetailModal({ visiable, device, onclose }) {
if (!current) return false; if (!current) return false;
const today = dayjs().startOf("day"); const today = dayjs().startOf("day");
const currentDay = current.startOf("day"); const currentDay = current.startOf("day");
if (currentDay.isBefore(today)) { const isPastDate = current.isBefore(today);
return true;
}
dayjs.extend(isBetween); dayjs.extend(isBetween);
return unavailableTimes.some(({ startTime, endTime }) => { const isUnavailable = unavailableTimes.some(({ startTime, endTime }) => {
const start = dayjs(startTime).startOf("day"); const start = dayjs(startTime).startOf("day");
const end = dayjs(endTime).endOf("day"); const end = dayjs(endTime).endOf("day");
return currentDay.isBetween(start, end, null, "[]"); return currentDay.isBetween(start, end, null, "[]");
}); });
return isPastDate || isUnavailable;
}; };
const handleOK = async () => { const handleOK = async () => {