Added public ID, fixed Aircraft Marker styles
This commit is contained in:
@@ -111,8 +111,6 @@ const AircraftPopupContent = ({
|
||||
}),
|
||||
});
|
||||
|
||||
console.log("Missions", missions);
|
||||
|
||||
const mission = missions && missions[0];
|
||||
|
||||
const renderTabContent = useMemo(() => {
|
||||
@@ -127,7 +125,11 @@ const AircraftPopupContent = ({
|
||||
return mission ? (
|
||||
<MissionTab mission={mission} />
|
||||
) : (
|
||||
<span className="text-gray-100">No mission available</span>
|
||||
<div className="flex flex-col items-center justify-center min-h-full">
|
||||
<span className="text-gray-500 my-10 font-semibold">
|
||||
Kein aktiver Einsatz
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
case "chat":
|
||||
return <SDSTab aircraft={aircraft} mission={mission} />;
|
||||
@@ -250,7 +252,9 @@ const AircraftPopupContent = ({
|
||||
>
|
||||
<span className="text-white text-base font-medium">Einsatz</span>
|
||||
<br />
|
||||
<span className="text-white text-sm font-medium">__202504161</span>
|
||||
<span className="text-white text-sm font-medium">
|
||||
{mission?.publicId || "Kein aktiver Einsatz"}
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
className="px-4 flex justify-center items-center cursor-pointer"
|
||||
|
||||
@@ -158,12 +158,13 @@ export const ContextMenu = () => {
|
||||
});
|
||||
|
||||
setOpen(true);
|
||||
console.log(data.address.road);
|
||||
setMissionFormValues({
|
||||
addressLat: contextMenu.lat,
|
||||
addressLng: contextMenu.lng,
|
||||
addressCity: data.address.city || data.address.town,
|
||||
addressStreet: `${data.address.road}, ${data.address.house_number || "keine HN"}`,
|
||||
addressZip: data.address.postcode,
|
||||
addressCity: data.address.city || data.address.town || "",
|
||||
addressStreet: `${data.address.road || "keine Straße"}, ${data.address.house_number || "keine HN"}`,
|
||||
addressZip: data.address.postcode || "",
|
||||
state: "draft",
|
||||
addressOSMways: [(exactAddress || closestToContext) as any],
|
||||
});
|
||||
@@ -238,15 +239,15 @@ export const ContextMenu = () => {
|
||||
Math.pow(currLon - contextMenu.lng, 2),
|
||||
);
|
||||
return prevDistance < currDistance ? prev : curr;
|
||||
});
|
||||
}, [] as any);
|
||||
|
||||
setOpen(true);
|
||||
setMissionFormValues({
|
||||
addressLat: contextMenu.lat,
|
||||
addressLng: contextMenu.lng,
|
||||
addressCity: data.address.city || data.address.town,
|
||||
addressStreet: `${data.address.road}, ${data.address.house_number || "keine HN"}`,
|
||||
addressZip: data.address.postcode,
|
||||
addressCity: data.address.city || data.address.town || "",
|
||||
addressStreet: `${data.address.road || "keine Straße"}, ${data.address.house_number || "keine HN"}`,
|
||||
addressZip: data.address.postcode || "",
|
||||
state: "draft",
|
||||
addressOSMways: [(exactAddress || closestToContext) as any],
|
||||
});
|
||||
|
||||
@@ -62,6 +62,7 @@ export const SearchElements = () => {
|
||||
}
|
||||
}, []);
|
||||
|
||||
if (!element.nodes) return null;
|
||||
return (
|
||||
<Polygon
|
||||
positions={element.nodes.map((node) => [node.lat, node.lon])}
|
||||
|
||||
@@ -312,15 +312,16 @@ const SDSTab = ({
|
||||
},
|
||||
});
|
||||
|
||||
const log = (mission?.missionLog as unknown as MissionLog[])
|
||||
.slice()
|
||||
.reverse()
|
||||
.filter(
|
||||
(entry) =>
|
||||
entry.type === "sds-log" &&
|
||||
entry.data.stationId === aircraft.Station.id,
|
||||
);
|
||||
console.log(mission?.missionLog, log);
|
||||
const log =
|
||||
(mission?.missionLog as unknown as MissionLog[])
|
||||
?.slice()
|
||||
.reverse()
|
||||
.filter(
|
||||
(entry) =>
|
||||
entry.type === "sds-log" &&
|
||||
entry.data.stationId === aircraft.Station.id,
|
||||
) || [];
|
||||
|
||||
return (
|
||||
<div className="p-4">
|
||||
<div className="flex items-center gap-2">
|
||||
@@ -414,7 +415,9 @@ const SDSTab = ({
|
||||
);
|
||||
})}
|
||||
{!log.length && (
|
||||
<p className="text-gray-500">Kein SDS-Verlauf verfügbar</p>
|
||||
<p className="text-gray-500 w-full text-center my-10 font-semibold">
|
||||
Kein SDS-Verlauf verfügbar
|
||||
</p>
|
||||
)}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -143,8 +143,7 @@ const Einsatzdetails = ({ mission }: { mission: Mission }) => {
|
||||
</li>
|
||||
<li className="flex items-center gap-2 mt-3">
|
||||
<Hash size={16} />
|
||||
__{new Date().toISOString().slice(0, 10).replace(/-/g, "")}
|
||||
{mission.id}
|
||||
{mission.publicId}
|
||||
</li>
|
||||
</ul>
|
||||
<div className="divider mt-0 mb-0" />
|
||||
|
||||
@@ -373,7 +373,7 @@ export const MissionForm = () => {
|
||||
);
|
||||
setSeachOSMElements([]); // Reset search elements
|
||||
|
||||
toast.success(`Einsatz ${newMission.id} erstellt`);
|
||||
toast.success(`Einsatz ${newMission.publicId} erstellt`);
|
||||
form.reset();
|
||||
setOpen(false);
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user