fix(notdienst): resolve timezone offset mismatch in plan generation and fix linter warning in calendar modal
This commit is contained in:
@@ -70,6 +70,7 @@ export function AdminTerminModal({
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
if (existingTermin) {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect
|
||||
setFormState({
|
||||
title: existingTermin.title,
|
||||
description: existingTermin.description || "",
|
||||
|
||||
@@ -47,8 +47,8 @@ export async function generatePlanAction(year?: number, month?: number) {
|
||||
where: {
|
||||
kitaId,
|
||||
date: {
|
||||
gte: new Date(targetYear, targetMonth - 1, 1),
|
||||
lt: new Date(targetYear, targetMonth, 1),
|
||||
gte: new Date(Date.UTC(targetYear, targetMonth - 1, 1)),
|
||||
lt: new Date(Date.UTC(targetYear, targetMonth, 1)),
|
||||
},
|
||||
},
|
||||
include: { child: { select: { familyId: true } } },
|
||||
@@ -155,7 +155,8 @@ export async function updateAssignmentAction(
|
||||
const session = await requireRole([UserRole.ADMIN, UserRole.KOORDINATOR]);
|
||||
const kitaId = session.user.kitaId!;
|
||||
|
||||
const parsedDate = new Date(date);
|
||||
const [yr, mo, dy] = date.slice(0, 10).split("-").map(Number);
|
||||
const parsedDate = new Date(Date.UTC(yr, mo - 1, dy));
|
||||
|
||||
try {
|
||||
await prisma.$transaction(async (tx) => {
|
||||
|
||||
@@ -517,7 +517,8 @@ function PlanPreviewTable({
|
||||
</div>
|
||||
<div className="divide-y divide-[var(--hairline-soft)]">
|
||||
{days.map((day) => {
|
||||
const dateObj = new Date(day.date);
|
||||
const [yr, mo, dy] = day.date.slice(0, 10).split("-").map(Number);
|
||||
const dateObj = new Date(yr, mo - 1, dy);
|
||||
const assignedChild = allChildren.find(
|
||||
(child) => child.id === day.childId,
|
||||
);
|
||||
@@ -574,7 +575,8 @@ function ManualAssignmentTable({
|
||||
</div>
|
||||
<div className="divide-y divide-[var(--hairline-soft)]">
|
||||
{days.map((day) => {
|
||||
const dateObj = new Date(day.date);
|
||||
const [yr, mo, dy] = day.date.slice(0, 10).split("-").map(Number);
|
||||
const dateObj = new Date(yr, mo - 1, dy);
|
||||
const assignedChild = allChildren.find(
|
||||
(child) => child.id === day.childId,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user