From 3e3f7926d9b511e3991d7b23a9350814ecf7ca12 Mon Sep 17 00:00:00 2001 From: nocnico Date: Mon, 2 Jun 2025 22:15:41 +0200 Subject: [PATCH 1/3] Edit DME & MRT Callsign & Date display --- apps/dispatch/app/_store/pilot/MrtStore.ts | 6 +++--- apps/dispatch/app/_store/pilot/dmeStore.ts | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/dispatch/app/_store/pilot/MrtStore.ts b/apps/dispatch/app/_store/pilot/MrtStore.ts index 7a2c5cd5..f8d70138 100644 --- a/apps/dispatch/app/_store/pilot/MrtStore.ts +++ b/apps/dispatch/app/_store/pilot/MrtStore.ts @@ -67,7 +67,7 @@ export const useMrtStore = create( page: "home", lines: [ { - textLeft: `VAR#.${station?.bosCallsign}`, + textLeft: `${station?.bosCallsign}`, style: { fontWeight: "bold" }, textSize: "2", }, @@ -92,7 +92,7 @@ export const useMrtStore = create( page: "sending-status", lines: [ { - textLeft: `VAR#.${station?.bosCallsign}`, + textLeft: `${station?.bosCallsign}`, style: { fontWeight: "bold" }, textSize: "2", }, @@ -116,7 +116,7 @@ export const useMrtStore = create( page: "new-status", lines: [ { - textLeft: `VAR#.${station?.bosCallsign}`, + textLeft: `${station?.bosCallsign}`, style: { fontWeight: "bold" }, textSize: "2", }, diff --git a/apps/dispatch/app/_store/pilot/dmeStore.ts b/apps/dispatch/app/_store/pilot/dmeStore.ts index b8d5d0e3..6bc6b11a 100644 --- a/apps/dispatch/app/_store/pilot/dmeStore.ts +++ b/apps/dispatch/app/_store/pilot/dmeStore.ts @@ -75,13 +75,17 @@ export const useDmeStore = create( lines: [ { textMid: pageData.station.bosCallsign - ? `VAR#.${pageData.station.bosCallsign}` + ? `${pageData.station.bosCallsign}` : "no Data", style: { fontWeight: "bold" }, }, { textMid: "⠀" }, { - textMid: new Date().toLocaleDateString(), + textMid: new Date().toLocaleDateString("de-DE", { + year: "numeric", + month: "2-digit", + day: "2-digit", + }), }, { textMid: new Date().toLocaleTimeString(), @@ -122,9 +126,7 @@ export const useDmeStore = create( lines: [ { textLeft: `${pageData.mission.missionKeywordAbbreviation}`, - textRight: pageData.mission.Stations.map( - (s) => s.bosCallsignShort, - ).join(","), + textRight: pageData.mission.Stations.map((s) => s.bosCallsignShort).join(","), style: { fontWeight: "bold" }, }, { @@ -140,16 +142,14 @@ export const useDmeStore = create( style: { fontWeight: "bold" }, }, { - textLeft: - pageData.mission.missionPatientInfo || "keine Daten", + textLeft: pageData.mission.missionPatientInfo || "keine Daten", }, { textMid: "Weitere Infos:", style: { fontWeight: "bold" }, }, { - textLeft: - pageData.mission.missionAdditionalInfo || "keine Daten", + textLeft: pageData.mission.missionAdditionalInfo || "keine Daten", }, ], }); From c884fedb62ba6e2d4a5bbd47d8aa02640b4de2b6 Mon Sep 17 00:00:00 2001 From: nocnico Date: Mon, 2 Jun 2025 22:21:54 +0200 Subject: [PATCH 2/3] minor fixes Pilot navbar --- .../navbar/_components/Connection.tsx | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/apps/dispatch/app/pilot/_components/navbar/_components/Connection.tsx b/apps/dispatch/app/pilot/_components/navbar/_components/Connection.tsx index 4c02114e..6a876dd3 100644 --- a/apps/dispatch/app/pilot/_components/navbar/_components/Connection.tsx +++ b/apps/dispatch/app/pilot/_components/navbar/_components/Connection.tsx @@ -4,6 +4,7 @@ import { usePilotConnectionStore } from "_store/pilot/connectionStore"; import { useEffect, useRef, useState } from "react"; import { useQuery } from "@tanstack/react-query"; import { getStationsAPI } from "_querys/stations"; +import toast from "react-hot-toast"; export const ConnectionBtn = () => { const modalRef = useRef(null); @@ -15,6 +16,7 @@ export const ConnectionBtn = () => { logoffTime: null, selectedStationId: null, }); + const [logoffDebounce, setLogoffDebounce] = useState(null); const { data: stations } = useQuery({ queryKey: ["stations"], @@ -73,37 +75,45 @@ export const ConnectionBtn = () => { ) : (

Als Pilot anmelden

)} -
- -
+ {connection.status !== "connected" && ( +
+ +
+ )}