diff --git a/frontend/src/app/admin/page.tsx b/frontend/src/app/admin/page.tsx index a93be02..e19de39 100644 --- a/frontend/src/app/admin/page.tsx +++ b/frontend/src/app/admin/page.tsx @@ -538,7 +538,8 @@ export default function AdminDashboard() { if (statusFilter === 'aapne') return s === 'aapen'; if (statusFilter === 'ikke_aapne') return s !== 'aapen'; if (statusFilter === 'ikke_stengt') return ['aapen', 'aapen_med_vintergreener', 'aapner_snart'].includes(s); - if (statusFilter === 'stengt') return s === 'stengt' || s === 'nedlagt'; + if (statusFilter === 'stengt') return s === 'stengt'; + if (statusFilter === 'nedlagt') return s === 'nedlagt'; if (statusFilter === 'ukjent_feil') return s === 'ukjent' || s === 'NOT_FOUND'; return true; }); @@ -2004,6 +2005,7 @@ export default function AdminDashboard() { + @@ -2222,10 +2224,7 @@ export default function AdminDashboard() {

Banestatus

{f.course_statuses && f.course_statuses.length > 0 ? f.course_statuses.map((cs: any, idx: number) => { - let badgeColor = "bg-gray-100 text-gray-500"; - if (cs.status === "aapen") badgeColor = "bg-green-100 text-green-700"; - if (cs.status === "stengt" || cs.status === "nedlagt") badgeColor = "bg-red-100 text-red-700"; - if (cs.status === "aapen_med_vintergreener" || cs.status === "aapner_snart") badgeColor = "bg-yellow-100 text-yellow-700"; + const badgeColor = STATUS_BADGE_CLASSES[cs.status || 'ukjent'] || STATUS_BADGE_CLASSES.ukjent; return (
{cs.name} @@ -2512,10 +2511,7 @@ export default function AdminDashboard() { renderHtml /> {f.course_statuses && f.course_statuses.map((cs: any, idx: number) => { - let badgeColor = "bg-gray-100 text-gray-500"; - if (cs.status === "aapen") badgeColor = "bg-green-100 text-green-700"; - if (cs.status === "stengt" || cs.status === "nedlagt") badgeColor = "bg-red-100 text-red-700"; - if (cs.status === "aapen_med_vintergreener" || cs.status === "aapner_snart") badgeColor = "bg-yellow-100 text-yellow-700"; + const badgeColor = STATUS_BADGE_CLASSES[cs.status || 'ukjent'] || STATUS_BADGE_CLASSES.ukjent; return (
{cs.name} diff --git a/frontend/src/app/admin/rediger/[slug]/EditFacilityClient.tsx b/frontend/src/app/admin/rediger/[slug]/EditFacilityClient.tsx index 29e6abb..9ffe990 100644 --- a/frontend/src/app/admin/rediger/[slug]/EditFacilityClient.tsx +++ b/frontend/src/app/admin/rediger/[slug]/EditFacilityClient.tsx @@ -1535,6 +1535,8 @@ export default function EditFacilityClient({ initialData, allFacilities }: { ini + +