popov/mwitnessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'acc5983c5f1ff8da73a9d756d39565103ea1b962'

Browse Source
This commit is contained in:
Dobromir Popov
2024-03-06 10:01:28 +02:00
parent 2baf0ae3bf acc5983c5f
commit 1784ee3e99
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pages/api/schedule.ts
View File

@ -95,6 +95,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
lt: toDate, lt: toDate,
}, },
}, },
orderBy: {
startTime: 'asc',
},
include: { include: {
assignments: { assignments: {
where: {}, where: {},
@ -147,7 +150,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
.join(", "), .join(", "),
}; };
groupedShifts[day][time].push(shiftSchedule); if (shiftSchedule.names.length > 0) {
groupedShifts[day][time].push(shiftSchedule);
}
} }
} catch (err) { } catch (err) {
console.log(err + " " + JSON.stringify(shifts[i])); console.log(err + " " + JSON.stringify(shifts[i]));
@ -188,8 +193,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
dayEvent.shifts.push(...groupedShifts[day][time]); dayEvent.shifts.push(...groupedShifts[day][time]);
} }
if (dayEvent) {
monthlySchedule.events.push(dayEvent); monthlySchedule.events.push(dayEvent);
}
} }
const outputPath = path.join(process.cwd(), 'public', 'content', 'output'); const outputPath = path.join(process.cwd(), 'public', 'content', 'output');