PxlLoewe/var-monorepo
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

one more cluster & button fix

Browse Source
This commit is contained in:
nocnico
2025-05-22 20:26:58 +02:00
parent 56fb51e6b8
commit 2795465cd7
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
View File

@@ -11,6 +11,7 @@ import { getConnectedAircraftsAPI } from "querys/aircrafts";
import { getMissionsAPI } from "querys/missions"; import { getMissionsAPI } from "querys/missions";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { useMap } from "react-leaflet"; import { useMap } from "react-leaflet";
import { HPGValidationRequired } from "helpers/hpgValidationRequired";
const PopupContent = ({ const PopupContent = ({
aircrafts, aircrafts,
@@ -56,15 +57,13 @@ const PopupContent = ({
}} }}
/> />
{missions.map((mission) => { {missions.map((mission) => {
const markerColor = const needsAction =
mission.hpgValidationState === HPGValidationRequired(mission.missionStationIds, aircrafts, mission.hpgMissionString) &&
(HpgValidationState.POSITION_AMANDED || mission.hpgValidationState !== "VALID";
HpgValidationState.INVALID ||
HpgValidationState.HPG_DISCONNECT || const markerColor = needsAction
HpgValidationState.HPG_BUSY || ? MISSION_STATUS_COLORS["attention"]
HpgValidationState.HPG_INVALID_MISSION) : MISSION_STATUS_COLORS[mission.state];
? MISSION_STATUS_COLORS["attention"]
: MISSION_STATUS_COLORS[mission.state];
return ( return (
<div <div
key={mission.id} key={mission.id}

21
apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
View File

@@ -177,16 +177,17 @@ const Einsatzdetails = ({
</div> </div>
<div className="flex items-center gap-2 w-full"> <div className="flex items-center gap-2 w-full">
{(!hpgNeedsAttention || ignoreHpg) && ( {(!hpgNeedsAttention || ignoreHpg) &&
<button mission.hpgValidationState !== HpgValidationState.POSITION_AMANDED && (
className="btn btn-sm btn-info btn-outline flex-3" <button
onClick={() => sendAlertMutation.mutate(mission.id)} className="btn btn-sm btn-info btn-outline flex-3"
> onClick={() => sendAlertMutation.mutate(mission.id)}
<span className="flex items-center gap-2"> >
<BellRing size={16} /> Alarmieren <span className="flex items-center gap-2">
</span> <BellRing size={16} /> Alarmieren
</button> </span>
)} </button>
)}
{!ignoreHpg && {!ignoreHpg &&
hpgNeedsAttention && hpgNeedsAttention &&
mission.hpgValidationState !== HpgValidationState.POSITION_AMANDED && ( mission.hpgValidationState !== HpgValidationState.POSITION_AMANDED && (