Neues MRt eingefügt. Status 059 sind nun keine FMS status mehr

apps/dispatch/app/_store/dispatch/connectionStore.ts

@@ -27,7 +27,7 @@ export const useDispatchConnectionStore = create<ConnectionStore>((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<ConnectionStore>((set) => ({
 
 dispatchSocket.on("connect", () => {
 	const { logoffTime, selectedZone, ghostMode } = useDispatchConnectionStore.getState();
-	useAudioStore.getState().connect("LST_01", selectedZone || "Leitstelle");
+	useAudioStore.getState().connect("VAR_LST_RD_01", selectedZone || "Leitstelle");
 	dispatchSocket.emit("connect-dispatch", {
 		logoffTime,
 		selectedZone,

apps/dispatch/app/_store/pilot/MrtStore.ts

@@ -1,165 +1,82 @@
-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 SetStatusSentPopupParams {
+	popup: "status-sent";
 }
 
-type SetPageParams =
+interface SetLoginPopupParams {
+	popup: "login";
+}
+
+interface SetSdsSentPopupParams {
+	popup: "sds-sent";
+}
+
+export type SetPageParams =
 	| SetHomePageParams
-	| SetSendingStatusPageParams
-	| SetSdsPageParams
-	| SetNewStatusPageParams;
+	| SetOffPageParams
+	| SetStartupPageParams
+	| SetVoicecallPageParams;
+
+export type SetPopupParams =
+	| SetStatusSentPopupParams
+	| SetSdsSentPopupParams
+	| SetSdsReceivedPopupParams
+	| SetLoginPopupParams;
+
+interface StringifiedData {
+	sdsText?: string;
+	sentSdsText?: string;
+}
 
 interface MrtStore {
 	page: SetPageParams["page"];
+	popup?: SetPopupParams["popup"];
 
-	lines: DisplayLineProps[];
+	stringifiedData: StringifiedData;
+	setStringifiedData: (data: Partial<StringifiedData>) => 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<MrtStore>((set) => ({
-	page: "home",
-	pageData: {
-		message: "",
+	page: "off",
+	nightMode: false,
+	stringifiedData: {},
+	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 });
 	},
 }));

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("VAR_LST_RD_01", selectedStation?.bosCallsignShort || "pilot");
 
 	pilotSocket.emit("connect-pilot", {
 		logoffTime,
@@ -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,
 	});
 });