@@ -162,10 +155,18 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
toast.error("Keine Flugzeug-ID gefunden");
return;
}
- await changeAircraftMutation.mutateAsync({
- id: event.data?.aircraftId,
- update: {
- fmsStatus: status,
+ await sendSdsStatusMutation.mutateAsync({
+ sdsMessage: {
+ type: "sds-status-log",
+ auto: false,
+ data: {
+ direction: "to-aircraft",
+ stationId: event.data.stationId!,
+ station: station,
+ user: getPublicUser(session.data?.user),
+ status,
+ },
+ timeStamp: new Date().toISOString(),
},
});
toast.remove(t.id);
diff --git a/apps/dispatch/app/_components/map/AircraftMarker.tsx b/apps/dispatch/app/_components/map/AircraftMarker.tsx
index 9c0adaf3..3961690d 100644
--- a/apps/dispatch/app/_components/map/AircraftMarker.tsx
+++ b/apps/dispatch/app/_components/map/AircraftMarker.tsx
@@ -2,7 +2,7 @@ import { Marker, Polyline, useMap } from "react-leaflet";
import { DivIcon, Marker as LMarker, Popup as LPopup } from "leaflet";
import { useMapStore } from "_store/mapStore";
import { Fragment, useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { checkSimulatorConnected, cn } from "@repo/shared-components";
+import { cn } from "@repo/shared-components";
import { ChevronsRightLeft, House, MessageSquareText, Minimize2 } from "lucide-react";
import { SmartPopup, calculateAnchor, useSmartPopup } from "_components/SmartPopup";
import FMSStatusHistory, {
@@ -396,27 +396,11 @@ const AircraftMarker = ({ aircraft }: { aircraft: ConnectedAircraft & { Station:
};
export const AircraftLayer = () => {
- const [aircrafts, setAircrafts] = useState<(ConnectedAircraft & { Station: Station })[]>([]);
-
- useEffect(() => {
- const fetchAircrafts = async () => {
- try {
- const res = await fetch("/api/aircrafts");
- if (!res.ok) {
- throw new Error("Failed to fetch aircrafts");
- }
- const data: (ConnectedAircraft & { Station: Station })[] = await res.json();
- setAircrafts(data.filter((a) => checkSimulatorConnected(a)));
- } catch (error) {
- console.error("Failed to fetch aircrafts:", error);
- }
- };
-
- fetchAircrafts();
- const interval = setInterval(fetchAircrafts, 10_000);
-
- return () => clearInterval(interval);
- }, []);
+ const { data: aircrafts } = useQuery({
+ queryKey: ["connected-aircrafts", "map"],
+ queryFn: () => getConnectedAircraftsAPI(),
+ refetchInterval: 15000,
+ });
const { setMap } = useMapStore((state) => state);
const map = useMap();
const {
diff --git a/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx b/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
index 97e529ab..0dae2e20 100644
--- a/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
+++ b/apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
@@ -9,6 +9,7 @@ import {
Mission,
MissionLog,
MissionSdsLog,
+ MissionSdsStatusLog,
MissionStationLog,
Prisma,
PublicUser,
@@ -40,7 +41,7 @@ import {
TextSearch,
} from "lucide-react";
import { useSession } from "next-auth/react";
-import { sendSdsMessageAPI } from "_querys/missions";
+import { sendSdsMessageAPI, sendSdsStatusMessageAPI } from "_querys/missions";
import { getLivekitRooms } from "_querys/livekit";
import { findLeitstelleForPosition } from "_helpers/findLeitstelleinPoint";
import { formatDistance } from "date-fns";
@@ -54,9 +55,13 @@ const FMSStatusHistory = ({
mission?: Mission;
}) => {
const log = ((mission?.missionLog as unknown as MissionLog[]) || [])
- .filter((entry) => entry.type === "station-log" && entry.data.stationId === aircraft.Station.id)
+ .filter(
+ (entry) =>
+ (entry.type === "station-log" || entry.type == "sds-status-log") &&
+ entry.data.stationId === aircraft.Station.id,
+ )
.reverse()
- .splice(0, 6) as MissionStationLog[];
+ .splice(0, 6) as (MissionStationLog | MissionSdsStatusLog)[];
const aircraftUser: PublicUser =
typeof aircraft.publicUser === "string" ? JSON.parse(aircraft.publicUser) : aircraft.publicUser;
@@ -103,10 +108,13 @@ const FMSStatusHistory = ({
- {entry.data.newFMSstatus}
+ {entry.type === "sds-status-log" ? entry.data.status : entry.data.newFMSstatus}
{new Date(entry.timeStamp).toLocaleTimeString([], {
@@ -126,6 +134,7 @@ const FMSStatusSelector = ({
}: {
aircraft: ConnectedAircraft & { Station: Station };
}) => {
+ const session = useSession();
const dispatcherConnected = useDispatchConnectionStore((s) => s.status) === "connected";
const [hoveredStatus, setHoveredStatus] = useState(null);
const queryClient = useQueryClient();
@@ -144,6 +153,20 @@ const FMSStatusSelector = ({
},
});
+ const sendSdsStatusMutation = useMutation({
+ mutationFn: async ({ sdsMessage }: { sdsMessage: MissionSdsStatusLog }) => {
+ if (!aircraft?.id) throw new Error("No connected aircraft");
+ await sendSdsStatusMessageAPI({ sdsMessage, aircraftId: aircraft?.id });
+ queryClient.invalidateQueries({
+ queryKey: ["missions"],
+ });
+ },
+ });
+
+ if (!session.data?.user) {
+ return null;
+ }
+
return (
@@ -213,12 +236,21 @@ const FMSStatusSelector = ({
onMouseEnter={() => setHoveredStatus(status)}
onMouseLeave={() => setHoveredStatus(null)}
onClick={async () => {
- await changeAircraftMutation.mutateAsync({
- id: aircraft.id,
- update: {
- fmsStatus: status,
+ await sendSdsStatusMutation.mutateAsync({
+ sdsMessage: {
+ type: "sds-status-log",
+ auto: false,
+ timeStamp: new Date().toISOString(),
+ data: {
+ status: status,
+ direction: "to-aircraft",
+ stationId: aircraft.Station.id,
+ station: aircraft.Station,
+ user: getPublicUser(session.data?.user),
+ },
},
});
+ toast.success(`SDS Status ${status} gesendet`);
}}
>
{status}
@@ -378,7 +410,9 @@ const SDSTab = ({
?.slice()
.reverse()
.filter(
- (entry) => entry.type === "sds-log" && entry.data.stationId === aircraft.Station.id,
+ (entry) =>
+ (entry.type === "sds-log" || entry.type == "sds-status-log") &&
+ entry.data.stationId === aircraft.Station.id,
) || [],
[mission?.missionLog, aircraft.Station.id],
);
@@ -471,7 +505,7 @@ const SDSTab = ({
)}
{log.map((entry, index) => {
- const sdsEntry = entry as MissionSdsLog;
+ const sdsEntry = entry as MissionSdsLog | MissionSdsStatusLog;
return (
-
@@ -489,7 +523,9 @@ const SDSTab = ({
{sdsEntry.data.user.firstname?.[0]?.toUpperCase() ?? "?"}
{sdsEntry.data.user.lastname?.[0]?.toUpperCase() ?? "?"}
- {sdsEntry.data.message}
+
+ {sdsEntry.type == "sds-log" ? sdsEntry.data.message : sdsEntry.data.status}
+
);
})}
diff --git a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
index dcb042e1..a02ef87c 100644
--- a/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
+++ b/apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
@@ -726,7 +726,11 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
{entry.data.station.bosCallsign}
);
- if (entry.type === "message-log" || entry.type === "sds-log")
+ if (
+ entry.type === "message-log" ||
+ entry.type === "sds-log" ||
+ entry.type === "sds-status-log"
+ )
return (
-
@@ -741,9 +745,10 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
color: FMS_STATUS_TEXT_COLORS[6],
}}
>
- {entry.data.user.firstname?.[0]?.toUpperCase() ?? "?"}
- {entry.data.user.lastname?.[0]?.toUpperCase() ?? "?"}
- {entry.type === "sds-log" && (
+ {entry.type == "sds-status-log" && entry.data.direction == "to-lst"
+ ? entry.data.station.bosCallsignShort
+ : `${entry.data.user.firstname?.[0]?.toUpperCase() ?? "?"}${entry.data.user.lastname?.[0]?.toUpperCase() ?? "?"}`}
+ {(entry.type === "sds-log" || entry.type === "sds-status-log") && (
<>
- {entry.data.station.bosCallsignShort}
+ {entry.type == "sds-status-log" && entry.data.direction == "to-aircraft"
+ ? entry.data.station.bosCallsignShort
+ : "LST"}
)}
- {entry.data.message}
+
+ {entry.type === "sds-log" || entry.type === "message-log"
+ ? entry.data.message
+ : entry.data.status}
+
);
if (
diff --git a/apps/dispatch/app/_data/fmsStatusDescription.ts b/apps/dispatch/app/_data/fmsStatusDescription.ts
index 3ca69b0c..c83c4551 100644
--- a/apps/dispatch/app/_data/fmsStatusDescription.ts
+++ b/apps/dispatch/app/_data/fmsStatusDescription.ts
@@ -24,3 +24,30 @@ export const fmsStatusDescription: { [key: string]: string } = {
o: "Warten, alle Abfrageplätze belegt",
u: "Verstanden",
};
+
+export const fmsStatusDescriptionShort: { [key: string]: string } = {
+ NaN: "Keine D.",
+ "0": "Prio. Sprechen",
+ "1": "E.-bereit Funk",
+ "2": "E.-bereit Wache",
+ "3": "E.-übernahme",
+ "4": "Einsatzort",
+ "5": "Sprechwunsch",
+ "6": "Nicht e.-bereit",
+ "7": "Einsatzgeb.",
+ "8": "Bed. Verfügbar",
+ "9": "F-anmeldung",
+ E: "Einsatzabbruch",
+ C: "Melden Sie Einsatzübernahme",
+ F: "Kommen Sie über Draht",
+ H: "Fahren Sie Wache an",
+ J: "Sprechen Sie",
+ L: "Geben Sie Lagemeldung",
+ P: "Einsatz mit Polizei",
+ U: "Ungültige Statusfolge",
+ c: "Status korrigieren",
+ d: "Nennen Sie Transportziel",
+ h: "Zielklinik verständigt",
+ o: "Warten, alle Abfrageplätze belegt",
+ u: "Verstanden",
+};
diff --git a/apps/dispatch/app/_data/livekitRooms.ts b/apps/dispatch/app/_data/livekitRooms.ts
index 1bbb1ae0..f98a61aa 100644
--- a/apps/dispatch/app/_data/livekitRooms.ts
+++ b/apps/dispatch/app/_data/livekitRooms.ts
@@ -1 +1,7 @@
-export const ROOMS = ["LST_01", "LST_02", "LST_03", "LST_04", "LST_05"];
+export const ROOMS = [
+ { name: "VAR_LST_RD_01", id: "2201" },
+ { name: "VAR_LST_RD_02", id: "2202" },
+ { name: "VAR_LST_RD_03", id: "2203" },
+ { name: "VAR_LST_RD_04", id: "2204" },
+ { name: "VAR_LST_RD_05", id: "2205" },
+];
diff --git a/apps/dispatch/app/_querys/missions.ts b/apps/dispatch/app/_querys/missions.ts
index 240591c1..bab144c4 100644
--- a/apps/dispatch/app/_querys/missions.ts
+++ b/apps/dispatch/app/_querys/missions.ts
@@ -1,4 +1,4 @@
-import { Mission, MissionSdsLog, Prisma } from "@repo/db";
+import { Mission, MissionSdsLog, MissionSdsStatusLog, Prisma } from "@repo/db";
import axios from "axios";
import { serverApi } from "_helpers/axios";
@@ -29,6 +29,20 @@ export const editMissionAPI = async (id: number, mission: Prisma.MissionUpdateIn
const respone = await serverApi.patch(`/mission/${id}`, mission);
return respone.data;
};
+
+export const sendSdsStatusMessageAPI = async ({
+ sdsMessage,
+ aircraftId,
+}: {
+ aircraftId: number;
+ sdsMessage: MissionSdsStatusLog;
+}) => {
+ const respone = await serverApi.post(`/aircrafts/${aircraftId}/send-sds-message`, {
+ sdsMessage,
+ });
+ return respone.data;
+};
+
export const sendSdsMessageAPI = async ({
missionId,
sdsMessage,
diff --git a/apps/dispatch/app/_store/audioStore.ts b/apps/dispatch/app/_store/audioStore.ts
index 7ce25c64..714264b2 100644
--- a/apps/dispatch/app/_store/audioStore.ts
+++ b/apps/dispatch/app/_store/audioStore.ts
@@ -21,12 +21,15 @@ import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
import { changeDispatcherAPI } from "_querys/dispatcher";
import { getRadioStream } from "_helpers/radioEffect";
import { usePilotConnectionStore } from "_store/pilot/connectionStore";
+import { ROOMS } from "_data/livekitRooms";
let interval: NodeJS.Timeout;
+const connectedSound = new Audio("/sounds/403.wav");
+
type TalkState = {
addSpeakingParticipant: (participant: Participant) => void;
- connect: (roomName: string, role: string) => void;
+ connect: (room: (typeof ROOMS)[number] | undefined, role: string) => void;
connectionQuality: ConnectionQuality;
disconnect: () => void;
isTalking: boolean;
@@ -44,6 +47,8 @@ type TalkState = {
radioVolume: number;
dmeVolume: number;
};
+ selectedRoom?: (typeof ROOMS)[number];
+ setSelectedRoom: (room: (typeof ROOMS)[number]) => void;
speakingParticipants: Participant[];
state: "connecting" | "connected" | "disconnected" | "error";
toggleTalking: () => void;
@@ -72,6 +77,10 @@ export const useAudioStore = create((set, get) => ({
remoteParticipants: 0,
connectionQuality: ConnectionQuality.Unknown,
room: null,
+ selectedRoom: ROOMS[0],
+ setSelectedRoom: (room) => {
+ set({ selectedRoom: room });
+ },
resetSpeakingParticipants: (source: string) => {
set({
speakingParticipants: [],
@@ -117,11 +126,11 @@ export const useAudioStore = create((set, get) => ({
(oldSettings.micDeviceId !== newSettings.micDeviceId ||
oldSettings.micVolume !== newSettings.micVolume)
) {
- const { room, disconnect, connect } = get();
+ const { room, disconnect, connect, selectedRoom } = get();
const role = room?.localParticipant.attributes.role;
- if (room?.name || role) {
+ if (selectedRoom || role) {
disconnect();
- connect(room?.name || "", role || "user");
+ connect(selectedRoom, role || "user");
}
}
},
@@ -160,7 +169,7 @@ export const useAudioStore = create((set, get) => ({
set((state) => ({ isTalking: !state.isTalking, transmitBlocked: false }));
},
- connect: async (roomName, role) => {
+ connect: async (_room, role) => {
set({ state: "connecting" });
try {
@@ -172,10 +181,12 @@ export const useAudioStore = create((set, get) => ({
connectedRoom.removeAllListeners();
}
+ const { selectedRoom } = get();
+
const url = process.env.NEXT_PUBLIC_LIVEKIT_URL;
if (!url) return console.error("NEXT_PUBLIC_LIVEKIT_URL not set");
- const token = await getToken(roomName);
+ const token = await getToken(_room?.name || selectedRoom?.name || "VAR_LST_RD_01");
if (!token) throw new Error("Fehlende Berechtigung");
const room = new Room({});
await room.prepareConnection(url, token);
@@ -186,7 +197,7 @@ export const useAudioStore = create((set, get) => ({
if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
- zone: roomName,
+ zone: _room?.name || selectedRoom?.name || "VAR_LST_RD_01",
ghostMode: dispatchState.ghostMode,
});
}
@@ -208,7 +219,7 @@ export const useAudioStore = create((set, get) => ({
source: Track.Source.Microphone,
});
await publishedTrack.mute();
-
+ connectedSound.play().catch((e) => console.error("Fehler beim Abspielen des Sounds", e));
set({ localRadioTrack: publishedTrack });
set({ state: "connected", room, isTalking: false, message: null });
diff --git a/apps/dispatch/app/_store/dispatch/connectionStore.ts b/apps/dispatch/app/_store/dispatch/connectionStore.ts
index c7a646aa..9663e473 100644
--- a/apps/dispatch/app/_store/dispatch/connectionStore.ts
+++ b/apps/dispatch/app/_store/dispatch/connectionStore.ts
@@ -27,7 +27,7 @@ export const useDispatchConnectionStore = create((set) => ({
setHideDraftMissions: (hide) => set({ hideDraftMissions: hide }),
connectedDispatcher: null,
message: "",
- selectedZone: "LST_01",
+ selectedZone: "VAR_LST_RD_01",
logoffTime: "",
ghostMode: false,
connect: async (uid, selectedZone, logoffTime, ghostMode) =>
@@ -48,7 +48,7 @@ export const useDispatchConnectionStore = create((set) => ({
dispatchSocket.on("connect", () => {
const { logoffTime, selectedZone, ghostMode } = useDispatchConnectionStore.getState();
- useAudioStore.getState().connect("LST_01", selectedZone || "Leitstelle");
+ useAudioStore.getState().connect(undefined, selectedZone || "Leitstelle");
dispatchSocket.emit("connect-dispatch", {
logoffTime,
selectedZone,
diff --git a/apps/dispatch/app/_store/pilot/MrtStore.ts b/apps/dispatch/app/_store/pilot/MrtStore.ts
index f5d32dc6..f8432402 100644
--- a/apps/dispatch/app/_store/pilot/MrtStore.ts
+++ b/apps/dispatch/app/_store/pilot/MrtStore.ts
@@ -1,165 +1,92 @@
-import { MissionSdsLog, Station } from "@repo/db";
-import { fmsStatusDescription } from "_data/fmsStatusDescription";
-import { DisplayLineProps } from "(app)/pilot/_components/mrt/Mrt";
import { create } from "zustand";
-interface SetSdsPageParams {
- page: "sds";
- station: Station;
- sdsMessage: MissionSdsLog;
+interface SetOffPageParams {
+ page: "off";
+}
+
+interface SetStartupPageParams {
+ page: "startup";
}
interface SetHomePageParams {
page: "home";
- station: Station;
- fmsStatus: string;
}
-interface SetSendingStatusPageParams {
- page: "sending-status";
- station: Station;
+interface SetVoicecallPageParams {
+ page: "voice-call";
+}
+interface SetSdsReceivedPopupParams {
+ popup: "sds-received";
}
-interface SetNewStatusPageParams {
- page: "new-status";
- station: Station;
+interface SetGroupSelectionPopupParams {
+ popup: "group-selection";
}
-type SetPageParams =
+interface SetStatusSentPopupParams {
+ popup: "status-sent";
+}
+
+interface SetLoginPopupParams {
+ popup: "login";
+}
+
+interface SetSdsSentPopupParams {
+ popup: "sds-sent";
+}
+
+export type SetPageParams =
| SetHomePageParams
- | SetSendingStatusPageParams
- | SetSdsPageParams
- | SetNewStatusPageParams;
+ | SetOffPageParams
+ | SetStartupPageParams
+ | SetVoicecallPageParams;
+
+export type SetPopupParams =
+ | SetStatusSentPopupParams
+ | SetSdsSentPopupParams
+ | SetGroupSelectionPopupParams
+ | SetSdsReceivedPopupParams
+ | SetLoginPopupParams;
+
+interface StringifiedData {
+ sdsText?: string;
+ sentSdsText?: string;
+
+ groupSelectionGroupId?: string;
+ callTextHeader?: string;
+}
interface MrtStore {
page: SetPageParams["page"];
+ popup?: SetPopupParams["popup"];
- lines: DisplayLineProps[];
+ stringifiedData: StringifiedData;
+ setStringifiedData: (data: Partial) => void;
setPage: (pageData: SetPageParams) => void;
- setLines: (lines: MrtStore["lines"]) => void;
+ setPopup: (popupData: SetPopupParams | null) => void;
+
+ // internal
+ updateIntervall?: number;
+ nightMode: boolean;
+ setNightMode: (nightMode: boolean) => void;
}
export const useMrtStore = create((set) => ({
- page: "home",
- pageData: {
- message: "",
+ page: "off",
+ nightMode: false,
+ stringifiedData: {
+ groupSelectionGroupId: "2201",
+ },
+ setNightMode: (nightMode) => set({ nightMode }),
+ setStringifiedData: (data) =>
+ set((state) => ({
+ stringifiedData: { ...state.stringifiedData, ...data },
+ })),
+ setPopup: (popupData) => {
+ set({ popup: popupData ? popupData.popup : undefined });
},
- lines: [
- {
- textLeft: "VAR.#",
- textSize: "2",
- },
- {
- textLeft: "No Data",
- textSize: "3",
- },
- ],
- setLines: (lines) => set({ lines }),
setPage: (pageData) => {
- switch (pageData.page) {
- case "home": {
- const { station, fmsStatus } = pageData as SetHomePageParams;
- set({
- page: "home",
- lines: [
- {
- textLeft: `${station?.bosCallsign}`,
- style: { fontWeight: "bold" },
- textSize: "2",
- },
- { textLeft: "ILS VAR#", textSize: "3" },
- {
- textLeft: fmsStatus,
- style: { fontWeight: "extrabold" },
- textSize: "4",
- },
- {
- textLeft: fmsStatusDescription[fmsStatus],
- textSize: "1",
- },
- ],
- });
- break;
- }
-
- case "sending-status": {
- const { station } = pageData as SetSendingStatusPageParams;
- set({
- page: "sending-status",
- lines: [
- {
- textLeft: `${station?.bosCallsign}`,
- style: { fontWeight: "bold" },
- textSize: "2",
- },
- { textLeft: "ILS VAR#", textSize: "3" },
- {
- textMid: "sending...",
- style: { fontWeight: "bold" },
- textSize: "4",
- },
- {
- textLeft: "Status wird gesendet...",
- textSize: "1",
- },
- ],
- });
- break;
- }
- case "new-status": {
- const { station } = pageData as SetNewStatusPageParams;
- set({
- page: "new-status",
- lines: [
- {
- textLeft: `${station?.bosCallsign}`,
- style: { fontWeight: "bold" },
- textSize: "2",
- },
- { textLeft: "ILS VAR#", textSize: "3" },
- {
- textLeft: "empfangen",
- style: { fontWeight: "bold" },
- textSize: "4",
- },
- ],
- });
- break;
- }
- case "sds": {
- const { sdsMessage } = pageData as SetSdsPageParams;
- const msg = sdsMessage.data.message;
- set({
- page: "sds",
- lines: [
- {
- textLeft: `SDS-Nachricht`,
- style: { fontWeight: "bold" },
- textSize: "2",
- },
- {
- textLeft: msg,
- style: {
- whiteSpace: "normal",
- overflowWrap: "break-word",
- wordBreak: "break-word",
- display: "block",
- maxWidth: "100%",
- maxHeight: "100%",
- overflow: "auto",
- textOverflow: "ellipsis",
- lineHeight: "1.2em",
- },
- textSize: "2",
- },
- ],
- });
- break;
- }
- default:
- set({ page: "home" });
- break;
- }
+ set({ page: pageData.page });
},
}));
diff --git a/apps/dispatch/app/_store/pilot/connectionStore.ts b/apps/dispatch/app/_store/pilot/connectionStore.ts
index e9fc29f8..1ca44645 100644
--- a/apps/dispatch/app/_store/pilot/connectionStore.ts
+++ b/apps/dispatch/app/_store/pilot/connectionStore.ts
@@ -86,7 +86,7 @@ pilotSocket.on("connect", () => {
usePilotConnectionStore.setState({ status: "connected", message: "" });
const { logoffTime, selectedStation, debug } = usePilotConnectionStore.getState();
dispatchSocket.disconnect();
- useAudioStore.getState().connect("LST_01", selectedStation?.bosCallsignShort || "pilot");
+ useAudioStore.getState().connect(undefined, selectedStation?.bosCallsignShort || "pilot");
pilotSocket.emit("connect-pilot", {
logoffTime,
@@ -109,7 +109,7 @@ pilotSocket.on("connect-message", (data) => {
});
pilotSocket.on("disconnect", () => {
- usePilotConnectionStore.setState({ status: "disconnected" });
+ usePilotConnectionStore.setState({ status: "disconnected", connectedAircraft: null });
useAudioStore.getState().disconnect();
});
@@ -142,11 +142,13 @@ pilotSocket.on("mission-alert", (data: Mission & { Stations: Station[] }) => {
});
pilotSocket.on("sds-message", (sdsMessage: MissionSdsLog) => {
+ console.log("Received sds-message via socket:", sdsMessage);
const station = usePilotConnectionStore.getState().selectedStation;
if (!station) return;
- useMrtStore.getState().setPage({
- page: "sds",
- station,
- sdsMessage,
+ useMrtStore.getState().setPopup({
+ popup: "sds-received",
+ });
+ useMrtStore.getState().setStringifiedData({
+ sdsText: sdsMessage.data.message,
});
});
diff --git a/apps/dispatch/app/globals.css b/apps/dispatch/app/globals.css
index 876c3519..979f4a4d 100644
--- a/apps/dispatch/app/globals.css
+++ b/apps/dispatch/app/globals.css
@@ -9,6 +9,11 @@
src: url("/fonts/MelderV2.ttf") format("truetype"); /* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
}
+@font-face {
+ font-family: "Bahnschrift";
+ src: url("/fonts/bahnschrift.ttf") format("truetype"); /* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
+}
+
@theme {
--color-rescuetrack: #46b7a3;
--color-rescuetrack-highlight: #ff4500;
diff --git a/apps/dispatch/next-env.d.ts b/apps/dispatch/next-env.d.ts
index 9edff1c7..c4b7818f 100644
--- a/apps/dispatch/next-env.d.ts
+++ b/apps/dispatch/next-env.d.ts
@@ -1,6 +1,6 @@
///
///
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/dispatch/public/fonts/bahnschrift.ttf b/apps/dispatch/public/fonts/bahnschrift.ttf
new file mode 100644
index 00000000..2c121b3d
Binary files /dev/null and b/apps/dispatch/public/fonts/bahnschrift.ttf differ
diff --git a/apps/dispatch/public/sounds/1504.wav b/apps/dispatch/public/sounds/1504.wav
new file mode 100644
index 00000000..edde45b8
Binary files /dev/null and b/apps/dispatch/public/sounds/1504.wav differ
diff --git a/apps/dispatch/public/sounds/403.wav b/apps/dispatch/public/sounds/403.wav
new file mode 100644
index 00000000..3d855dc6
Binary files /dev/null and b/apps/dispatch/public/sounds/403.wav differ
diff --git a/apps/dispatch/public/sounds/775.wav b/apps/dispatch/public/sounds/775.wav
new file mode 100644
index 00000000..bb406ab5
Binary files /dev/null and b/apps/dispatch/public/sounds/775.wav differ
diff --git a/apps/hub/Dockerfile b/apps/hub/Dockerfile
index 7bf8906e..6c5c55af 100644
--- a/apps/hub/Dockerfile
+++ b/apps/hub/Dockerfile
@@ -67,7 +67,4 @@ USER nextjs
# Expose the application port
EXPOSE 3000
-ENV PORT=3000
-ENV HOSTNAME="0.0.0.0"
-
CMD ["node", "apps/hub/server.js"]
\ No newline at end of file
diff --git a/packages/database/prisma/json/MissionVehicleLog.ts b/packages/database/prisma/json/MissionVehicleLog.ts
index 7bceda67..c7de840c 100644
--- a/packages/database/prisma/json/MissionVehicleLog.ts
+++ b/packages/database/prisma/json/MissionVehicleLog.ts
@@ -1,4 +1,5 @@
import { Station } from "../../generated/client";
+import { StationStatus } from "./SocketEvents";
import { PublicUser } from "./User";
export interface MissionVehicleLog {
@@ -37,6 +38,19 @@ export interface MissionSdsLog {
};
}
+export interface MissionSdsStatusLog {
+ type: "sds-status-log";
+ auto: false;
+ timeStamp: string;
+ data: {
+ direction: "to-lst" | "to-aircraft";
+ stationId: number;
+ station: Station;
+ user: PublicUser;
+ status: string;
+ };
+}
+
export interface MissionMessageLog {
type: "message-log";
auto: false;
@@ -90,4 +104,5 @@ export type MissionLog =
| MissionAlertLogAuto
| MissionCompletedLog
| MissionVehicleLog
- | MissionReopenedLog;
+ | MissionReopenedLog
+ | MissionSdsStatusLog;