diff --git a/apps/dispatch-server/routes/mission.ts b/apps/dispatch-server/routes/mission.ts index 3775b449..f1599890 100644 --- a/apps/dispatch-server/routes/mission.ts +++ b/apps/dispatch-server/routes/mission.ts @@ -122,11 +122,15 @@ router.post("/:id/send-alert", async (req, res) => { res.status(404).json({ error: "Mission not found" }); return; } + + // connectedAircrafts the alert is sent to const connectedAircrafts = await prisma.connectedAircraft.findMany({ where: { - stationId: { - in: mission.missionStationIds, - }, + stationId: stationId + ? stationId + : { + in: mission.missionStationIds, + }, logoutTime: null, }, include: { @@ -135,7 +139,6 @@ router.post("/:id/send-alert", async (req, res) => { }); for (const aircraft of connectedAircrafts) { - if (stationId && stationId !== aircraft.stationId) continue; console.log(`Sending mission to: station:${aircraft.stationId}`); io.to(`station:${aircraft.stationId}`).emit("mission-alert", { ...mission, diff --git a/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx b/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx index a1edd61c..6ec9ed21 100644 --- a/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx +++ b/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx @@ -47,17 +47,6 @@ export const MissionForm = () => { }); }, }); - const sendAlertMutation = useMutation({ - mutationKey: ["missions"], - mutationFn: (id: number) => sendMissionAPI(id, {}), - onError: (error) => { - console.error(error); - toast.error("Fehler beim Alarmieren"); - }, - onSuccess: (data) => { - toast.success(data.message); - }, - }); const editMissionMutation = useMutation({ mutationFn: ({ @@ -77,7 +66,7 @@ export const MissionForm = () => { const sendAlertMutation = useMutation({ mutationKey: ["missions"], - mutationFn: sendMissionAPI, + mutationFn: (id: number) => sendMissionAPI(id, {}), onError: (error) => { console.error(error); toast.error("Fehler beim Alarmieren"); diff --git a/grafana/grafana.db b/grafana/grafana.db index 7d13ed8a..6435de4e 100644 Binary files a/grafana/grafana.db and b/grafana/grafana.db differ