hoffentlich
This commit is contained in:
@@ -64,13 +64,13 @@ export default async function MitgliederPage(props: {
|
||||
}
|
||||
})
|
||||
|
||||
const adminUserIds = new Set(admins.map(a => a.userId))
|
||||
const adminUserIds = new Set(admins.map((a: typeof admins[number]) => a.userId))
|
||||
// Map userId → member record so admin entries show real member data
|
||||
const memberByUserId = new Map(members.filter(m => m.userId).map(m => [m.userId!, m]))
|
||||
const memberByUserId = new Map<string, typeof members[number]>(members.filter((m: typeof members[number]) => m.userId).map((m: typeof members[number]) => [m.userId!, m]))
|
||||
|
||||
const combinedList = [
|
||||
// Include admins only if there's no status filter, or if filtering for 'aktiv'
|
||||
...(!statusFilter || statusFilter === 'aktiv' ? admins.map(a => {
|
||||
...(!statusFilter || statusFilter === 'aktiv' ? admins.map((a: typeof admins[number]) => {
|
||||
const m = memberByUserId.get(a.user.id)
|
||||
return {
|
||||
id: m ? m.id : `admin-${a.user.id}`,
|
||||
@@ -86,7 +86,7 @@ export default async function MitgliederPage(props: {
|
||||
role: 'Administrator',
|
||||
}
|
||||
}) : []),
|
||||
...members.filter(m => !adminUserIds.has(m.userId ?? '')).map(m => ({
|
||||
...members.filter((m: typeof members[number]) => !adminUserIds.has(m.userId ?? '')).map((m: typeof members[number]) => ({
|
||||
id: m.id,
|
||||
name: m.name,
|
||||
betrieb: m.betrieb,
|
||||
@@ -101,7 +101,7 @@ export default async function MitgliederPage(props: {
|
||||
}))
|
||||
]
|
||||
|
||||
combinedList.sort((a, b) => a.name.localeCompare(b.name))
|
||||
combinedList.sort((a: typeof combinedList[number], b: typeof combinedList[number]) => a.name.localeCompare(b.name))
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
|
||||
@@ -43,7 +43,7 @@ export default function NewsEditPage({ params }: { params: Promise<{ id: string
|
||||
setBody(news.body)
|
||||
setKategorie(news.kategorie)
|
||||
if (news.attachments) {
|
||||
setAttachments(news.attachments.map(a => ({ ...a, sizeBytes: a.sizeBytes ?? 0 })))
|
||||
setAttachments(news.attachments.map((a: typeof news.attachments[number]) => ({ ...a, sizeBytes: a.sizeBytes ?? 0 })))
|
||||
}
|
||||
}
|
||||
}, [news])
|
||||
|
||||
@@ -30,8 +30,8 @@ export default async function NewsPage() {
|
||||
orderBy: [{ publishedAt: 'desc' }, { createdAt: 'desc' }],
|
||||
})
|
||||
|
||||
const published = news.filter((n) => n.publishedAt)
|
||||
const drafts = news.filter((n) => !n.publishedAt)
|
||||
const published = news.filter((n: typeof news[number]) => n.publishedAt)
|
||||
const drafts = news.filter((n: typeof news[number]) => !n.publishedAt)
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
@@ -56,7 +56,7 @@ export default async function NewsPage() {
|
||||
<div className="bg-white rounded-lg border overflow-hidden">
|
||||
<table className="w-full data-table">
|
||||
<tbody>
|
||||
{drafts.map((n) => (
|
||||
{drafts.map((n: typeof drafts[number]) => (
|
||||
<tr key={n.id}>
|
||||
<td className="w-full">
|
||||
<p className="font-medium text-gray-900">{n.title}</p>
|
||||
@@ -96,7 +96,7 @@ export default async function NewsPage() {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{published.map((n) => (
|
||||
{published.map((n: typeof published[number]) => (
|
||||
<tr key={n.id}>
|
||||
<td className="font-medium text-gray-900">{n.title}</td>
|
||||
<td>
|
||||
|
||||
@@ -68,7 +68,7 @@ export default async function DashboardPage() {
|
||||
</Link>
|
||||
</div>
|
||||
<div className="space-y-3">
|
||||
{recentNews.map((n) => (
|
||||
{recentNews.map((n: typeof recentNews[number]) => (
|
||||
<div key={n.id} className="flex items-start gap-3 py-2 border-b last:border-0">
|
||||
<div className="flex-1 min-w-0">
|
||||
<p className="font-medium text-sm text-gray-900 truncate">{n.title}</p>
|
||||
@@ -99,7 +99,7 @@ export default async function DashboardPage() {
|
||||
{nextTermine.length === 0 && (
|
||||
<p className="text-sm text-gray-500">Keine bevorstehenden Termine</p>
|
||||
)}
|
||||
{nextTermine.map((t) => (
|
||||
{nextTermine.map((t: typeof nextTermine[number]) => (
|
||||
<div key={t.id} className="flex items-start gap-3 py-2 border-b last:border-0">
|
||||
<div className="text-center min-w-[40px]">
|
||||
<p className="text-lg font-bold text-brand-500 leading-none">
|
||||
|
||||
@@ -64,13 +64,13 @@ export default function StelleNeuPage() {
|
||||
required
|
||||
value={form.memberId}
|
||||
onChange={(e) => {
|
||||
const selected = members?.find((m) => m.id === e.target.value)
|
||||
const selected = members?.find((m: NonNullable<typeof members>[number]) => m.id === e.target.value)
|
||||
setForm({ ...form, memberId: e.target.value, sparte: selected?.sparte ?? form.sparte })
|
||||
}}
|
||||
className={inputClass}
|
||||
>
|
||||
<option value="">Mitglied auswählen...</option>
|
||||
{members?.map((m) => (
|
||||
{members?.map((m: NonNullable<typeof members>[number]) => (
|
||||
<option key={m.id} value={m.id}>
|
||||
{m.betrieb} – {m.name}
|
||||
</option>
|
||||
|
||||
Reference in New Issue
Block a user