Verbesserung. Gesamtview, papierkorb Archiv
This commit is contained in:
1 parent
019c686254
commit
782678a1cf
16 files changed
+640
-22
No files matched your search
@@ -6,6 +6,9 @@ import Consultants from './pages/Consultants'
|
||||
import AssignmentCreate from './pages/AssignmentCreate'
|
||||
import AssignmentDetail from './pages/AssignmentDetail'
|
||||
import AssignmentEdit from './pages/AssignmentEdit'
|
||||
import AssignmentTrash from './pages/AssignmentTrash'
|
||||
import AssignmentArchive from './pages/AssignmentArchive'
|
||||
import MeetingHistory from './pages/MeetingHistory'
|
||||
import MeetingView from './pages/meeting/MeetingView'
|
||||
import FeedbackDraftPage from './pages/FeedbackDraftPage'
|
||||
import AssignmentFeedbackPage from './pages/AssignmentFeedbackPage'
|
||||
@@ -21,8 +24,11 @@ export default function App() {
|
||||
<Routes>
|
||||
<Route path="/" element={<Dashboard />} />
|
||||
<Route path="/assignment/new" element={<AssignmentCreate />} />
|
||||
<Route path="/assignments/trash" element={<AssignmentTrash />} />
|
||||
<Route path="/assignments/archive" element={<AssignmentArchive />} />
|
||||
<Route path="/assignment/:id" element={<AssignmentDetail />} />
|
||||
<Route path="/assignment/:id/edit" element={<AssignmentEdit />} />
|
||||
<Route path="/assignment/:id/history" element={<MeetingHistory />} />
|
||||
<Route path="/assignment/:id/meeting/:meetingId" element={<MeetingView />} />
|
||||
<Route path="/assignment/:id/feedback/:instituteeId" element={<AssignmentFeedbackPage />} />
|
||||
<Route path="/assignment/:id/feedback-draft/:instituteeId" element={<FeedbackDraftPage />} />
|
||||
|
||||
@@ -11,6 +11,8 @@ export const updateFeedbackDraft = (id: number, patch: Partial<FeedbackDraft>):
|
||||
|
||||
export const getAssignmentFeedback = (assignmentId: number, instituteeId: number): Promise<AssignmentFeedback | undefined> =>
|
||||
rpc('assignmentFeedback', 'getAssignmentFeedback', assignmentId, instituteeId)
|
||||
/** Für die Auswertungsübersicht: Feedback-Status (Entwurf/Final) aller Assignments auf einen Schlag, statt N+1-Abfragen pro Zeile. */
|
||||
export const listAssignmentFeedbacksAll = (): Promise<AssignmentFeedback[]> => rpc('assignmentFeedback', 'listAssignmentFeedbacksAll')
|
||||
export const getAssignmentFeedbackById = (id: number): Promise<AssignmentFeedback | undefined> =>
|
||||
rpc('assignmentFeedback', 'getAssignmentFeedbackById', id)
|
||||
export const addAssignmentFeedback = (f: Omit<AssignmentFeedback, 'id'>): Promise<number> =>
|
||||
|
||||
@@ -8,9 +8,21 @@ export const addAssignment = (a: Omit<Assignment, 'id'>): Promise<number> => rpc
|
||||
export const updateAssignment = (id: number, patch: Partial<Assignment>): Promise<number> =>
|
||||
rpc('assignments', 'updateAssignment', id, patch)
|
||||
|
||||
export const isAssignmentFeedbackComplete = (assignmentId: number): Promise<boolean> =>
|
||||
rpc('assignments', 'isAssignmentFeedbackComplete', assignmentId)
|
||||
export const softDeleteAssignment = (id: number): Promise<number> => rpc('assignments', 'softDeleteAssignment', id)
|
||||
export const restoreAssignment = (id: number): Promise<number> => rpc('assignments', 'restoreAssignment', id)
|
||||
export const archiveAssignment = (id: number): Promise<number> => rpc('assignments', 'archiveAssignment', id)
|
||||
export const unarchiveAssignment = (id: number): Promise<number> => rpc('assignments', 'unarchiveAssignment', id)
|
||||
|
||||
/** Cascade: meetingInstances (+ deren Kinder) → feedbackDrafts → assignmentFeedbacks (+ deren Kinder) → assignment. */
|
||||
export const hardDeleteAssignment = (id: number): Promise<void> => rpc('assignments', 'hardDeleteAssignment', id)
|
||||
|
||||
export interface AssignmentWithDetails extends Assignment {
|
||||
typeName: string
|
||||
instituteeNames: string[]
|
||||
/** Nur für status==='done' relevant: jedes Institutee hat ein finales Feedback — steuert den Löschen-Button in der Übersicht. */
|
||||
feedbackComplete: boolean
|
||||
}
|
||||
|
||||
/** Für die Dashboard-Liste: Assignments mit aufgelöstem Typ- und Institutee-Namen, neueste zuerst. */
|
||||
|
||||
@@ -81,6 +81,10 @@ export interface Assignment {
|
||||
from?: string
|
||||
to?: string
|
||||
}>
|
||||
/** Papierkorb-Zeitpunkt — analog MeetingInstance.deletedAt, nach 30 Tagen automatisch endgültig gelöscht. */
|
||||
deletedAt?: string
|
||||
/** Archiv-Zeitpunkt — dauerhafte Aufbewahrung (spätere Auswertung/ML), unabhängig vom Papierkorb. */
|
||||
archivedAt?: string
|
||||
}
|
||||
|
||||
// ─── Meeting-Instanzen ────────────────────────────────────────────────────────
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { listAssignmentsWithDetails, unarchiveAssignment, type AssignmentWithDetails } from '../db'
|
||||
|
||||
export default function AssignmentArchive() {
|
||||
const [assignments, setAssignments] = useState<AssignmentWithDetails[]>([])
|
||||
const navigate = useNavigate()
|
||||
|
||||
const load = () => { listAssignmentsWithDetails().then(setAssignments) }
|
||||
useEffect(() => { load() }, [])
|
||||
|
||||
const archived = assignments.filter(a => a.archivedAt)
|
||||
|
||||
const unarchive = async (id: number) => {
|
||||
await unarchiveAssignment(id)
|
||||
load()
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
<button onClick={() => navigate('/')} className="text-sm text-brand mb-2 block">← Zurück</button>
|
||||
<h1 className="text-xl font-bold text-gray-800">🗄 Archiv</h1>
|
||||
|
||||
{archived.length === 0 && (
|
||||
<p className="text-gray-400 text-sm text-center py-8">Archiv ist leer.</p>
|
||||
)}
|
||||
|
||||
{archived.map(a => (
|
||||
<div key={a.id} className="bg-white rounded-xl shadow-sm border border-gray-100 p-4">
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="flex-1 min-w-0">
|
||||
{a.assignmentNumber && (
|
||||
<div className="text-xs font-semibold text-brand uppercase tracking-wide leading-none mb-0.5">
|
||||
{a.assignmentNumber}
|
||||
</div>
|
||||
)}
|
||||
<div className="font-semibold text-gray-800 truncate">{a.title}</div>
|
||||
<div className="text-sm text-gray-500">{a.client}</div>
|
||||
<div className="text-xs text-gray-400 mt-0.5">
|
||||
{a.typeName} · {a.instituteeNames.join(', ')}
|
||||
</div>
|
||||
{a.archivedAt && (
|
||||
<div className="text-xs text-gray-400 mt-1">
|
||||
Archiviert am {new Date(a.archivedAt).toLocaleDateString('de-DE')}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<button onClick={() => unarchive(a.id!)}
|
||||
className="flex-shrink-0 text-xs bg-white border border-gray-200 text-gray-600 px-2.5 py-1 rounded-lg hover:bg-gray-100">
|
||||
↺ Aus Archiv zurückholen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
getConsultantsByIds,
|
||||
listAssessmentsForMeetings,
|
||||
listFeedbackCategoriesAll, listFeedbackCriterionItemsAll, filterVisibleFeedbackStructure,
|
||||
isAssignmentFeedbackComplete, softDeleteAssignment, archiveAssignment,
|
||||
} from '../db'
|
||||
import { exportMeetingAsMarkdown, exportMeetingAsJson, downloadFile } from '../utils/meetingExport'
|
||||
import { weightedAverageRating } from '../utils/ratingTrend'
|
||||
@@ -44,11 +45,15 @@ export default function AssignmentDetail() {
|
||||
const [allAssessments, setAllAssessments] = useState<Assessment[]>([])
|
||||
const [fbCategories, setFbCategories] = useState<FeedbackCategory[]>([])
|
||||
const [fbItems, setFbItems] = useState<FeedbackCriterionItem[]>([])
|
||||
const [feedbackComplete, setFeedbackComplete] = useState(false)
|
||||
const [confirmAssignmentTrash, setConfirmAssignmentTrash] = useState(false)
|
||||
const [confirmAssignmentArchive, setConfirmAssignmentArchive] = useState(false)
|
||||
|
||||
const load = async () => {
|
||||
const a = await getAssignment(assignmentId)
|
||||
if (!a) return
|
||||
setAssignment(a)
|
||||
setFeedbackComplete(a.status === 'done' ? await isAssignmentFeedbackComplete(assignmentId) : false)
|
||||
|
||||
const [aType, templates, instances, cons] = await Promise.all([
|
||||
getAssignmentType(a.assignmentTypeId),
|
||||
@@ -132,6 +137,16 @@ export default function AssignmentDetail() {
|
||||
await load()
|
||||
}
|
||||
|
||||
const trashAssignment = async () => {
|
||||
await softDeleteAssignment(assignmentId)
|
||||
navigate('/')
|
||||
}
|
||||
|
||||
const archiveThisAssignment = async () => {
|
||||
await archiveAssignment(assignmentId)
|
||||
navigate('/')
|
||||
}
|
||||
|
||||
const statusBadge = (status: MeetingInstance['status']) => {
|
||||
const map = {
|
||||
planned: 'bg-yellow-100 text-yellow-700',
|
||||
@@ -155,11 +170,18 @@ export default function AssignmentDetail() {
|
||||
)}
|
||||
<h1 className="text-xl font-bold text-gray-800 leading-tight">{assignment.title}</h1>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => navigate(`/assignment/${assignmentId}/edit`)}
|
||||
className="flex-shrink-0 text-xs px-3 py-1.5 border border-gray-200 rounded-lg text-gray-500 hover:border-brand hover:text-brand transition">
|
||||
✏️ Bearbeiten
|
||||
</button>
|
||||
<div className="flex-shrink-0 flex gap-1.5">
|
||||
<button
|
||||
onClick={() => navigate(`/assignment/${assignmentId}/history`)}
|
||||
className="text-xs px-3 py-1.5 border border-gray-200 rounded-lg text-gray-500 hover:border-brand hover:text-brand transition">
|
||||
📜 Gesamtprotokoll
|
||||
</button>
|
||||
<button
|
||||
onClick={() => navigate(`/assignment/${assignmentId}/edit`)}
|
||||
className="text-xs px-3 py-1.5 border border-gray-200 rounded-lg text-gray-500 hover:border-brand hover:text-brand transition">
|
||||
✏️ Bearbeiten
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div className="text-sm text-gray-500">{assignment.client} · {assignmentType?.name}</div>
|
||||
<div className="text-xs text-gray-400 mt-1">
|
||||
@@ -167,6 +189,52 @@ export default function AssignmentDetail() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Assignment-Aktionen (nur für abgeschlossene Assignments) */}
|
||||
{assignment.status === 'done' && (
|
||||
<div className="bg-white rounded-xl shadow-sm border border-gray-100 p-4 space-y-2">
|
||||
<span className="text-sm font-semibold text-gray-700">Assignment-Aktionen</span>
|
||||
<div className="flex gap-2 flex-wrap">
|
||||
<button
|
||||
onClick={() => setConfirmAssignmentTrash(p => !p)}
|
||||
disabled={!feedbackComplete}
|
||||
title={!feedbackComplete ? 'Erst möglich, wenn für alle Institutees ein finales Feedback vorliegt' : undefined}
|
||||
className={`text-xs px-3 py-1.5 rounded-lg font-medium ${
|
||||
feedbackComplete ? 'bg-red-50 text-red-600 border border-red-200 hover:bg-red-100' : 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
||||
}`}>
|
||||
🗑 In Papierkorb verschieben
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setConfirmAssignmentArchive(p => !p)}
|
||||
className="text-xs px-3 py-1.5 rounded-lg font-medium bg-gray-50 text-gray-600 border border-gray-200 hover:bg-gray-100">
|
||||
🗄 Archivieren
|
||||
</button>
|
||||
</div>
|
||||
{!feedbackComplete && (
|
||||
<div className="text-xs text-gray-400">
|
||||
Löschen erst möglich, sobald für alle Institutees ein finales Feedback vorliegt.
|
||||
</div>
|
||||
)}
|
||||
{confirmAssignmentTrash && (
|
||||
<div className="bg-red-50 border border-red-200 rounded-lg px-3 py-2.5 flex items-center justify-between gap-2">
|
||||
<span className="text-xs text-red-700">Assignment in den Papierkorb verschieben?</span>
|
||||
<div className="flex gap-1.5">
|
||||
<button onClick={trashAssignment} className="text-xs bg-red-600 text-white px-2.5 py-1 rounded-lg font-medium">Ja</button>
|
||||
<button onClick={() => setConfirmAssignmentTrash(false)} className="text-xs border border-gray-200 text-gray-500 px-2.5 py-1 rounded-lg">Nein</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{confirmAssignmentArchive && (
|
||||
<div className="bg-gray-50 border border-gray-200 rounded-lg px-3 py-2.5 flex items-center justify-between gap-2">
|
||||
<span className="text-xs text-gray-600">Assignment archivieren?</span>
|
||||
<div className="flex gap-1.5">
|
||||
<button onClick={archiveThisAssignment} className="text-xs bg-gray-700 text-white px-2.5 py-1 rounded-lg font-medium">Ja</button>
|
||||
<button onClick={() => setConfirmAssignmentArchive(false)} className="text-xs border border-gray-200 text-gray-500 px-2.5 py-1 rounded-lg">Nein</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Ad-hoc Meeting */}
|
||||
<div className="bg-white rounded-xl shadow-sm border border-gray-100 p-4">
|
||||
<div className="flex items-center justify-between">
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import {
|
||||
listAssignmentsWithDetails, restoreAssignment, hardDeleteAssignment,
|
||||
type AssignmentWithDetails,
|
||||
} from '../db'
|
||||
|
||||
const TRASH_RETENTION_DAYS = 30
|
||||
|
||||
export default function AssignmentTrash() {
|
||||
const [assignments, setAssignments] = useState<AssignmentWithDetails[]>([])
|
||||
const [confirmHardDelete, setConfirmHardDelete] = useState<number | null>(null)
|
||||
const navigate = useNavigate()
|
||||
|
||||
const load = () => { listAssignmentsWithDetails().then(setAssignments) }
|
||||
useEffect(() => { load() }, [])
|
||||
|
||||
const trashed = assignments.filter(a => a.deletedAt)
|
||||
|
||||
const restore = async (id: number) => {
|
||||
await restoreAssignment(id)
|
||||
load()
|
||||
}
|
||||
|
||||
const hardDelete = async (id: number) => {
|
||||
await hardDeleteAssignment(id)
|
||||
setConfirmHardDelete(null)
|
||||
load()
|
||||
}
|
||||
|
||||
const remainingDays = (deletedAt: string) => {
|
||||
const elapsedDays = Math.floor((Date.now() - new Date(deletedAt).getTime()) / 86_400_000)
|
||||
return Math.max(0, TRASH_RETENTION_DAYS - elapsedDays)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
<button onClick={() => navigate('/')} className="text-sm text-brand mb-2 block">← Zurück</button>
|
||||
<h1 className="text-xl font-bold text-gray-800">🗑 Papierkorb</h1>
|
||||
|
||||
{trashed.length === 0 && (
|
||||
<p className="text-gray-400 text-sm text-center py-8">Papierkorb ist leer.</p>
|
||||
)}
|
||||
|
||||
{trashed.map(a => (
|
||||
<div key={a.id} className="bg-white rounded-xl shadow-sm border border-gray-100 p-4">
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="flex-1 min-w-0">
|
||||
{a.assignmentNumber && (
|
||||
<div className="text-xs font-semibold text-brand uppercase tracking-wide leading-none mb-0.5">
|
||||
{a.assignmentNumber}
|
||||
</div>
|
||||
)}
|
||||
<div className="font-semibold text-gray-800 truncate">{a.title}</div>
|
||||
<div className="text-sm text-gray-500">{a.client}</div>
|
||||
<div className="text-xs text-gray-400 mt-0.5">
|
||||
{a.typeName} · {a.instituteeNames.join(', ')}
|
||||
</div>
|
||||
{a.deletedAt && (
|
||||
<div className="text-xs text-gray-400 mt-1">
|
||||
Gelöscht am {new Date(a.deletedAt).toLocaleDateString('de-DE')} · noch {remainingDays(a.deletedAt)} Tage bis zur endgültigen Löschung
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col gap-1.5 items-end flex-shrink-0">
|
||||
<button onClick={() => restore(a.id!)}
|
||||
className="text-xs bg-white border border-gray-200 text-gray-600 px-2.5 py-1 rounded-lg hover:bg-gray-100">
|
||||
↺ Wiederherstellen
|
||||
</button>
|
||||
<button onClick={() => setConfirmHardDelete(confirmHardDelete === a.id ? null : a.id!)}
|
||||
className="text-xs text-red-400 hover:text-red-600 px-2 py-1">
|
||||
✕ Endgültig löschen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{confirmHardDelete === a.id && (
|
||||
<div className="mt-2 bg-red-50 border border-red-200 rounded-lg p-3 space-y-2">
|
||||
<div className="text-xs text-red-700 font-medium">
|
||||
Endgültig löschen? Alle Meetings, Protokolle und Feedback-Daten dieses Assignments werden unwiderruflich entfernt.
|
||||
</div>
|
||||
<div className="flex gap-2">
|
||||
<button onClick={() => hardDelete(a.id!)}
|
||||
className="flex-1 py-1.5 rounded-lg text-xs font-medium bg-red-600 text-white">
|
||||
Endgültig löschen
|
||||
</button>
|
||||
<button onClick={() => setConfirmHardDelete(null)}
|
||||
className="px-3 py-1.5 rounded-lg text-xs border border-gray-200 text-gray-500">
|
||||
Abbrechen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
+81
-11
@@ -1,20 +1,37 @@
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { listAssignmentsWithDetails, type AssignmentWithDetails } from '../db'
|
||||
import { listAssignmentsWithDetails, softDeleteAssignment, archiveAssignment, type AssignmentWithDetails } from '../db'
|
||||
|
||||
export default function Dashboard() {
|
||||
const [assignments, setAssignments] = useState<AssignmentWithDetails[]>([])
|
||||
const [query, setQuery] = useState('')
|
||||
const [statusFilter, setStatusFilter] = useState<'all' | 'active' | 'done'>('all')
|
||||
const [statusFilter, setStatusFilter] = useState<'all' | 'active' | 'done'>('active')
|
||||
const [confirmTrashId, setConfirmTrashId] = useState<number | null>(null)
|
||||
const [confirmArchiveId, setConfirmArchiveId] = useState<number | null>(null)
|
||||
const navigate = useNavigate()
|
||||
|
||||
useEffect(() => {
|
||||
listAssignmentsWithDetails().then(setAssignments)
|
||||
}, [])
|
||||
const load = () => { listAssignmentsWithDetails().then(setAssignments) }
|
||||
useEffect(() => { load() }, [])
|
||||
|
||||
const trashAssignment = async (id: number) => {
|
||||
await softDeleteAssignment(id)
|
||||
setConfirmTrashId(null)
|
||||
load()
|
||||
}
|
||||
|
||||
const archiveThisAssignment = async (id: number) => {
|
||||
await archiveAssignment(id)
|
||||
setConfirmArchiveId(null)
|
||||
load()
|
||||
}
|
||||
|
||||
const trashCount = useMemo(() => assignments.filter(a => a.deletedAt).length, [assignments])
|
||||
const archiveCount = useMemo(() => assignments.filter(a => a.archivedAt).length, [assignments])
|
||||
|
||||
const filtered = useMemo(() => {
|
||||
const q = query.trim().toLowerCase()
|
||||
return assignments.filter(a => {
|
||||
if (a.deletedAt || a.archivedAt) return false
|
||||
if (statusFilter !== 'all' && a.status !== statusFilter) return false
|
||||
if (!q) return true
|
||||
return (
|
||||
@@ -31,12 +48,26 @@ export default function Dashboard() {
|
||||
{/* Header */}
|
||||
<div className="flex items-center justify-between">
|
||||
<h1 className="text-xl font-bold text-gray-800">Assignments</h1>
|
||||
<button
|
||||
onClick={() => navigate('/assignment/new')}
|
||||
className="bg-brand text-white px-4 py-2 rounded-lg text-sm font-medium"
|
||||
>
|
||||
+ Neues
|
||||
</button>
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={() => navigate('/assignments/trash')}
|
||||
className="text-xs px-2.5 py-1.5 border border-gray-200 rounded-lg text-gray-500 hover:border-brand hover:text-brand transition"
|
||||
>
|
||||
🗑 Papierkorb{trashCount > 0 && ` (${trashCount})`}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => navigate('/assignments/archive')}
|
||||
className="text-xs px-2.5 py-1.5 border border-gray-200 rounded-lg text-gray-500 hover:border-brand hover:text-brand transition"
|
||||
>
|
||||
🗄 Archiv{archiveCount > 0 && ` (${archiveCount})`}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => navigate('/assignment/new')}
|
||||
className="bg-brand text-white px-4 py-2 rounded-lg text-sm font-medium"
|
||||
>
|
||||
+ Neues
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Suche + Status-Filter */}
|
||||
@@ -92,6 +123,45 @@ export default function Dashboard() {
|
||||
{a.status === 'active' ? 'Aktiv' : 'Fertig'}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{a.status === 'done' && (
|
||||
<div className="mt-2 pt-2 border-t border-gray-100 flex gap-2" onClick={e => e.stopPropagation()}>
|
||||
<button
|
||||
onClick={() => { setConfirmTrashId(confirmTrashId === a.id ? null : a.id!); setConfirmArchiveId(null) }}
|
||||
disabled={!a.feedbackComplete}
|
||||
title={!a.feedbackComplete ? 'Erst möglich, wenn für alle Institutees ein finales Feedback vorliegt' : undefined}
|
||||
className={`text-xs px-2.5 py-1 rounded-lg font-medium ${
|
||||
a.feedbackComplete ? 'bg-red-50 text-red-600 border border-red-200 hover:bg-red-100' : 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
||||
}`}>
|
||||
🗑 Papierkorb
|
||||
</button>
|
||||
<button
|
||||
onClick={() => { setConfirmArchiveId(confirmArchiveId === a.id ? null : a.id!); setConfirmTrashId(null) }}
|
||||
className="text-xs px-2.5 py-1 rounded-lg font-medium bg-gray-50 text-gray-600 border border-gray-200 hover:bg-gray-100">
|
||||
🗄 Archivieren
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{confirmTrashId === a.id && (
|
||||
<div className="mt-2 bg-red-50 border border-red-200 rounded-lg px-3 py-2.5 flex items-center justify-between gap-2" onClick={e => e.stopPropagation()}>
|
||||
<span className="text-xs text-red-700">In den Papierkorb verschieben?</span>
|
||||
<div className="flex gap-1.5">
|
||||
<button onClick={() => trashAssignment(a.id!)} className="text-xs bg-red-600 text-white px-2.5 py-1 rounded-lg font-medium">Ja</button>
|
||||
<button onClick={() => setConfirmTrashId(null)} className="text-xs border border-gray-200 text-gray-500 px-2.5 py-1 rounded-lg">Nein</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{confirmArchiveId === a.id && (
|
||||
<div className="mt-2 bg-gray-50 border border-gray-200 rounded-lg px-3 py-2.5 flex items-center justify-between gap-2" onClick={e => e.stopPropagation()}>
|
||||
<span className="text-xs text-gray-600">Archivieren?</span>
|
||||
<div className="flex gap-1.5">
|
||||
<button onClick={() => archiveThisAssignment(a.id!)} className="text-xs bg-gray-700 text-white px-2.5 py-1 rounded-lg font-medium">Ja</button>
|
||||
<button onClick={() => setConfirmArchiveId(null)} className="text-xs border border-gray-200 text-gray-500 px-2.5 py-1 rounded-lg">Nein</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
listAssessmentsAll,
|
||||
getRatingTrendWeightStep,
|
||||
listDoneMeetingsChronological,
|
||||
listAssignmentFeedbacksAll,
|
||||
} from '../db'
|
||||
import { RATING_OPTIONS } from '../config/constants'
|
||||
import { buildGroupMeetingScores, computeTrend, type TrendResult } from '../utils/ratingTrend'
|
||||
@@ -25,6 +26,13 @@ interface InstScore {
|
||||
catScores: CatScore[]
|
||||
overall: number | null
|
||||
overallTrend: TrendResult['trend']
|
||||
feedbackStatus: 'none' | 'draft' | 'final'
|
||||
}
|
||||
|
||||
function feedbackStatusBadge(status: InstScore['feedbackStatus']) {
|
||||
if (status === 'final') return <span className="text-xs font-medium px-2 py-1 rounded-lg bg-green-100 text-green-700">✓ Final</span>
|
||||
if (status === 'draft') return <span className="text-xs font-medium px-2 py-1 rounded-lg bg-amber-100 text-amber-700">Entwurf</span>
|
||||
return <span className="text-xs font-medium px-2 py-1 rounded-lg bg-gray-100 text-gray-400">Kein Feedback</span>
|
||||
}
|
||||
|
||||
function ratingColor(avg: number | null): string {
|
||||
@@ -61,17 +69,21 @@ export default function Evaluation() {
|
||||
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
const [assignments, consultants, structure, assessments, weightStep] = await Promise.all([
|
||||
const [allAssignments, consultants, structure, assessments, weightStep, feedbacks] = await Promise.all([
|
||||
listAssignments(),
|
||||
listConsultants(),
|
||||
loadFeedbackStructure(),
|
||||
listAssessmentsAll(),
|
||||
getRatingTrendWeightStep(),
|
||||
listAssignmentFeedbacksAll(),
|
||||
])
|
||||
const { dimensions: dims, categories: cats, items } = structure
|
||||
setDimensions(dims)
|
||||
setCategories(cats)
|
||||
|
||||
// Papierkorb/Archiv ausgeschlossen — analog zum Dashboard-Filter, siehe CLAUDE.md.
|
||||
const assignments = allAssignments.filter(a => !a.deletedAt && !a.archivedAt)
|
||||
|
||||
const rows: InstScore[] = []
|
||||
for (const a of assignments) {
|
||||
const meetings = await listDoneMeetingsChronological(a.id!)
|
||||
@@ -99,7 +111,10 @@ export default function Evaluation() {
|
||||
const { suggestion: overall, trend: overallTrend } = computeTrend(overallHistory, weightStep)
|
||||
if (overall === null && catScores.every(c => c.avg === null)) continue
|
||||
|
||||
rows.push({ institutee: inst, assignment: a, catScores, overall, overallTrend })
|
||||
const fb = feedbacks.find(f => f.assignmentId === a.id && f.instituteeId === instId)
|
||||
const feedbackStatus: InstScore['feedbackStatus'] = fb?.status === 'final' ? 'final' : fb?.status === 'draft' ? 'draft' : 'none'
|
||||
|
||||
rows.push({ institutee: inst, assignment: a, catScores, overall, overallTrend, feedbackStatus })
|
||||
}
|
||||
}
|
||||
setData(rows)
|
||||
@@ -148,6 +163,7 @@ export default function Evaluation() {
|
||||
<div className={`px-3 py-1 rounded-full text-sm font-bold flex items-center gap-1 ${ratingColor(row.overall)}`}>
|
||||
{ratingLabel(row.overall)} {trendArrow(row.overallTrend)}
|
||||
</div>
|
||||
{feedbackStatusBadge(row.feedbackStatus)}
|
||||
<button
|
||||
onClick={e => { e.stopPropagation(); navigate(`/assignment/${row.assignment.id}/feedback/${row.institutee.id}`) }}
|
||||
className="text-xs bg-amber-100 text-amber-700 px-2 py-1 rounded-lg">
|
||||
|
||||
@@ -0,0 +1,201 @@
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
import { useNavigate, useParams } from 'react-router-dom'
|
||||
import {
|
||||
type Assignment, type PhaseTemplate, type MeetingInstance, type Consultant,
|
||||
type FeedbackCategory, type FeedbackCriterionItem, type ConversationEntry, type Assessment, type FeedbackRating,
|
||||
getAssignment, getAssignmentType,
|
||||
listPhaseTemplatesForType,
|
||||
listDoneMeetingsChronological,
|
||||
getConsultantsByIds,
|
||||
listFeedbackCategoriesAll, listFeedbackCriterionItemsAll, filterVisibleFeedbackStructure,
|
||||
listConversationEntriesForMeetings,
|
||||
listAssessmentsForMeetings,
|
||||
} from '../db'
|
||||
import { NotationText } from '../utils/notationParser'
|
||||
import { INST_COLORS } from '../config/constants'
|
||||
import { weightedAverageRating } from '../utils/ratingTrend'
|
||||
|
||||
const RATING_BG: Record<FeedbackRating, string> = {
|
||||
na: 'bg-gray-400 text-white',
|
||||
not_client_ready: 'bg-red-500 text-white',
|
||||
partially_client_ready: 'bg-orange-500 text-white',
|
||||
nearly_client_ready: 'bg-green-400 text-white',
|
||||
client_ready: 'bg-green-700 text-white',
|
||||
}
|
||||
|
||||
export default function MeetingHistory() {
|
||||
const { id } = useParams()
|
||||
const navigate = useNavigate()
|
||||
const assignmentId = Number(id)
|
||||
|
||||
const [assignment, setAssignment] = useState<Assignment | null>(null)
|
||||
const [templates, setTemplates] = useState<PhaseTemplate[]>([])
|
||||
const [meetings, setMeetings] = useState<MeetingInstance[]>([])
|
||||
const [institutees, setInstitutees] = useState<Consultant[]>([])
|
||||
const [fbCategories, setFbCategories] = useState<FeedbackCategory[]>([])
|
||||
const [fbItems, setFbItems] = useState<FeedbackCriterionItem[]>([])
|
||||
const [entries, setEntries] = useState<ConversationEntry[]>([])
|
||||
const [assessments, setAssessments] = useState<Assessment[]>([])
|
||||
const [loaded, setLoaded] = useState(false)
|
||||
const latestRef = useRef<HTMLDivElement>(null)
|
||||
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
const a = await getAssignment(assignmentId)
|
||||
if (!a) return
|
||||
setAssignment(a)
|
||||
|
||||
const [aType, tmpls, doneMeetings, cons] = await Promise.all([
|
||||
getAssignmentType(a.assignmentTypeId),
|
||||
listPhaseTemplatesForType(a.assignmentTypeId),
|
||||
listDoneMeetingsChronological(assignmentId),
|
||||
getConsultantsByIds(a.instituteeIds),
|
||||
])
|
||||
setTemplates(tmpls)
|
||||
setMeetings(doneMeetings)
|
||||
setInstitutees(a.instituteeIds.map(cid => cons.find(c => c.id === cid)!).filter(Boolean))
|
||||
|
||||
const [allCats, allItems] = await Promise.all([
|
||||
listFeedbackCategoriesAll(),
|
||||
listFeedbackCriterionItemsAll(),
|
||||
])
|
||||
const { categories: visibleCats, items: visibleItems } = filterVisibleFeedbackStructure(allCats, allItems, aType?.criteriaIds)
|
||||
setFbCategories(visibleCats)
|
||||
setFbItems(visibleItems)
|
||||
|
||||
const meetingIds = doneMeetings.map(m => m.id!)
|
||||
const [convEntries, asmts] = await Promise.all([
|
||||
listConversationEntriesForMeetings(meetingIds),
|
||||
listAssessmentsForMeetings(meetingIds),
|
||||
])
|
||||
setEntries(convEntries)
|
||||
setAssessments(asmts)
|
||||
setLoaded(true)
|
||||
}
|
||||
load()
|
||||
}, [assignmentId])
|
||||
|
||||
useEffect(() => {
|
||||
if (loaded) latestRef.current?.scrollIntoView({ block: 'start' })
|
||||
}, [loaded])
|
||||
|
||||
const displayName = (inst: Consultant) => {
|
||||
const dup = institutees.filter(c => c.firstName === inst.firstName && c.id !== inst.id).length > 0
|
||||
return dup ? `${inst.firstName} ${inst.lastName.charAt(0)}.` : inst.firstName
|
||||
}
|
||||
|
||||
if (!assignment) return <div className="text-center py-10 text-gray-400">Lädt…</div>
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<button onClick={() => navigate(`/assignment/${assignmentId}`)} className="text-sm text-brand mb-2 block">← Assignment</button>
|
||||
<h1 className="text-xl font-bold text-gray-800">📜 Gesamtprotokoll</h1>
|
||||
<div className="text-sm text-gray-500">{assignment.title} · {assignment.client}</div>
|
||||
</div>
|
||||
|
||||
{meetings.length === 0 && (
|
||||
<p className="text-gray-400 text-sm text-center py-8">Noch keine abgeschlossenen Meetings.</p>
|
||||
)}
|
||||
|
||||
{meetings.map((meeting, idx) => {
|
||||
const template = templates.find(t => t.id === meeting.phaseTemplateId)
|
||||
const meetingEntries = entries
|
||||
.filter(e => e.meetingInstanceId === meeting.id)
|
||||
.sort((a, b) => a.sequenceIndex - b.sequenceIndex)
|
||||
const meetingAssessments = assessments.filter(a => a.meetingInstanceId === meeting.id)
|
||||
const isLatest = idx === meetings.length - 1
|
||||
|
||||
return (
|
||||
<div key={meeting.id}
|
||||
ref={isLatest ? latestRef : undefined}
|
||||
className={`bg-white rounded-xl shadow-sm p-4 space-y-3 ${isLatest ? 'border-2 border-brand' : 'border border-gray-100'}`}>
|
||||
<div className="flex items-center justify-between">
|
||||
<div>
|
||||
<div className="font-semibold text-gray-800">
|
||||
{template?.label ?? 'Meeting'}{template?.isRepeatable ? ` #${meeting.phaseIndex}` : ''}
|
||||
</div>
|
||||
<div className="text-xs text-gray-400">{new Date(meeting.date).toLocaleDateString('de-DE')}</div>
|
||||
</div>
|
||||
{isLatest && (
|
||||
<span className="text-xs bg-brand text-white px-2 py-1 rounded-full font-medium flex-shrink-0">
|
||||
Aktuellstes Meeting
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{meeting.generalNotes?.trim() && (
|
||||
<div className="bg-gray-50 rounded-lg px-3 py-2">
|
||||
<NotationText text={meeting.generalNotes} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{meetingEntries.length > 0 && (
|
||||
<div className="space-y-1.5">
|
||||
{meetingEntries.map(entry => {
|
||||
const instIdx = institutees.findIndex(c => c.id === entry.instituteeId)
|
||||
const inst = institutees[instIdx]
|
||||
const color = INST_COLORS[instIdx % INST_COLORS.length]
|
||||
return (
|
||||
<div key={entry.id}
|
||||
className={`rounded-lg border px-3 py-2 ${color?.bg ?? 'bg-gray-50'} ${color?.border ?? 'border-gray-200'}`}>
|
||||
<div className="flex items-start gap-2">
|
||||
<span className={`flex-shrink-0 text-xs font-bold text-white px-2 py-0.5 rounded mt-0.5 ${color?.tag ?? 'bg-gray-400'}`}>
|
||||
{inst ? displayName(inst) : '?'}
|
||||
</span>
|
||||
<div className="flex-1 min-w-0">
|
||||
{entry.note && (
|
||||
<NotationText
|
||||
text={entry.note}
|
||||
renderLineAddon={line => {
|
||||
const critId = entry.lineTags?.find(t => t.text === line)?.criterionItemId
|
||||
const critName = critId ? fbItems.find(i => i.id === critId)?.name : null
|
||||
return critName
|
||||
? <span className="flex-shrink-0 text-xs bg-indigo-50 text-indigo-700 border border-indigo-200 rounded-full px-2 py-0.5 mt-0.5">{critName}</span>
|
||||
: null
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{(entry.fillerCount ?? 0) > 0 && (
|
||||
<span className="inline-block mt-1 text-xs bg-red-50 text-red-500 border border-red-200 px-1.5 py-0.5 rounded font-medium">
|
||||
äh×{entry.fillerCount}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{institutees.length > 0 && fbCategories.length > 0 && meetingAssessments.length > 0 && (
|
||||
<div className="space-y-1 pt-1 border-t border-gray-50">
|
||||
{institutees.map(inst => {
|
||||
const chips = fbCategories.map(cat => {
|
||||
const catItems = fbItems.filter(i => i.categoryId === cat.id)
|
||||
const mode = weightedAverageRating(catItems, itemId =>
|
||||
meetingAssessments.find(a => a.instituteeId === inst.id && a.criteriaId === itemId)?.score ?? null,
|
||||
)
|
||||
return mode ? { cat, mode } : null
|
||||
}).filter(Boolean) as { cat: FeedbackCategory; mode: FeedbackRating }[]
|
||||
if (chips.length === 0) return null
|
||||
return (
|
||||
<div key={inst.id} className="flex items-center gap-1 flex-wrap">
|
||||
<span className="text-xs text-gray-400">{displayName(inst)}:</span>
|
||||
{chips.map(({ cat, mode }) => (
|
||||
<span key={cat.id} className={`text-xs px-2 py-0.5 rounded font-medium ${RATING_BG[mode]}`}>
|
||||
{cat.name}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -311,6 +311,11 @@ export default function MeetingView() {
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex gap-1.5 flex-shrink-0 items-start">
|
||||
<button onClick={() => navigate(`/assignment/${assignment?.id}/history`)}
|
||||
title="Gesamtprotokoll aller Meetings"
|
||||
className="text-sm bg-white border border-gray-200 text-gray-600 px-2.5 py-1.5 rounded-lg font-medium">
|
||||
📜 Verlauf
|
||||
</button>
|
||||
<div className="relative">
|
||||
<button onClick={() => setShowExportMenu(p => !p)}
|
||||
className="text-sm bg-white border border-gray-200 text-gray-600 px-2.5 py-1.5 rounded-lg font-medium">
|
||||
|
||||
Reference in new issue
Block a user