Merge commit 'acc5983c5f1ff8da73a9d756d39565103ea1b962'

pages/api/schedule.ts

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