Skip to content

Commit a194bef

Browse files
committed
fix: copy audio sequence as well, and correctly handle default as null, closes #25
1 parent dffb5f7 commit a194bef

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

app/routes/days.add.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,22 @@ export const action = async ({request}: ActionFunctionArgs) => {
6262

6363
if (copyFrom !== '-') {
6464
const schedules = await prisma.schedule.findMany({
65-
where: {dayTypeId: copyFrom === '_' ? undefined : copyFrom}
65+
where: {dayTypeId: copyFrom === '_' ? null : copyFrom}
6666
})
6767

6868
await prisma.schedule.createMany({
69-
data: schedules.map(({time, weekDays, zoneId, audioId}) => {
70-
return {dayTypeId: dayType.id, time, weekDays, zoneId, audioId}
71-
})
69+
data: schedules.map(
70+
({time, weekDays, zoneId, audioId, audioSequence}) => {
71+
return {
72+
dayTypeId: dayType.id,
73+
time,
74+
weekDays,
75+
zoneId,
76+
audioId,
77+
audioSequence
78+
}
79+
}
80+
)
7281
})
7382
}
7483

app/routes/schedule._index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const loader = async ({request}: LoaderFunctionArgs) => {
3030

3131
const schedules = await prisma.schedule.findMany({
3232
orderBy: {time: 'asc'},
33-
include: {zone: true, audio: true}
33+
include: {zone: true}
3434
})
3535

3636
const days = await prisma.dayType.findMany({
@@ -116,7 +116,9 @@ const Schedule = () => {
116116
</td>
117117
<td className="text-center">{zone.name}</td>
118118
<td className="text-center">
119-
{(JSON.parse(audioSequence) as string[]).length}
119+
{audioSequence === ''
120+
? 0
121+
: (JSON.parse(audioSequence) as string[]).length}
120122
</td>
121123
<td className="text-center">
122124
<form method="post" action={`/schedule/${id}/delete`}>

0 commit comments

Comments
 (0)