fix: N/A-Aggregationsbug behoben, FeedbackDraftPage migriert, toten Code entfernt
- buildAiPrompt (AssignmentFeedbackPage.tsx): 'na' wird jetzt korrekt aus dem Score-Mittelwert ausgeschlossen (war bislang als 0 mitgerechnet) - FeedbackDraftPage.tsx auf feedbackCriterionItems/feedbackCategories migriert, letzter Konsument der Legacy-Tabellen außer den Seeds. Notizen hängen jetzt korrekt pro Kriterium über lineTags, statt ungefiltert an jedes Kriterium. Score-Anzeige nutzt RATING_OPTIONS-Labels statt rohem /5-Wert. - FeedbackStructureConfig.tsx: verwaisten AssignmentType/PhaseTemplate-CRUD-Code entfernt (Funktionalität war bereits nach AssignmentTypeConfig.tsx verschoben) - Doku aktualisiert: CLAUDE.md, docs/HANDOVER.md, docs/STATUS_UND_OFFENE_PUNKTE.md, docs/TECHNISCHE_ARCHITEKTUR.md Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
f47353dbe1
commit
911dcace72
7 files changed
+47
-129
No files matched your search
@@ -71,7 +71,7 @@ async function buildAiPrompt(
|
||||
const crits = items.filter(i => critIds.includes(i.id!))
|
||||
|
||||
const scoreLines = crits.map(c => {
|
||||
const scores = instAssessments.filter(a => a.criteriaId === c.id && a.score !== null)
|
||||
const scores = instAssessments.filter(a => a.criteriaId === c.id && a.score !== null && a.score !== 'na')
|
||||
const avg = scores.length > 0
|
||||
? (scores.reduce((s, a) => s + ratingToNum(a.score), 0) / scores.length).toFixed(1)
|
||||
: '—'
|
||||
|
||||
@@ -4,19 +4,30 @@ import {
|
||||
db,
|
||||
type Assignment,
|
||||
type Consultant,
|
||||
type Category,
|
||||
type Criterion,
|
||||
type FeedbackCategory,
|
||||
type FeedbackCriterionItem,
|
||||
type FeedbackDraft,
|
||||
type FeedbackRating,
|
||||
} from '../db'
|
||||
import { RATING_OPTIONS, RATING_NUM_MAP } from '../config/constants'
|
||||
import { numberToRating } from '../utils/ratingTrend'
|
||||
|
||||
const ratingToNum = (r: FeedbackRating | null | undefined): number => {
|
||||
const m: Record<FeedbackRating, number> = { na: 0, not_client_ready: 1, partially_client_ready: 2, nearly_client_ready: 3, client_ready: 4 }
|
||||
return r ? (m[r] ?? 0) : 0
|
||||
const ratingToNum = (r: FeedbackRating | null | undefined): number =>
|
||||
r ? (RATING_NUM_MAP[r] ?? 0) : 0
|
||||
|
||||
const ratingLabel = (avg: number | null): string => {
|
||||
if (avg === null) return '—'
|
||||
const r = RATING_OPTIONS.find(x => x.value === numberToRating(avg))
|
||||
return r ? `${r.short} (${avg.toFixed(1)})` : avg.toFixed(1)
|
||||
}
|
||||
|
||||
const scoreColor = (avg: number | null): string => {
|
||||
if (avg === null) return 'bg-gray-100 text-gray-400'
|
||||
return RATING_OPTIONS.find(r => r.value === numberToRating(avg))?.color ?? 'bg-gray-100 text-gray-400'
|
||||
}
|
||||
|
||||
interface CriterionSummary {
|
||||
criterion: Criterion
|
||||
criterion: FeedbackCriterionItem
|
||||
avg: number | null
|
||||
notes: string[]
|
||||
}
|
||||
@@ -29,7 +40,7 @@ export default function FeedbackDraftPage() {
|
||||
|
||||
const [assignment, setAssignment] = useState<Assignment | null>(null)
|
||||
const [institutee, setInstitutee] = useState<Consultant | null>(null)
|
||||
const [categories, setCategories] = useState<Category[]>([])
|
||||
const [categories, setCategories] = useState<FeedbackCategory[]>([])
|
||||
const [summary, setSummary] = useState<CriterionSummary[]>([])
|
||||
const [draft, setDraft] = useState<FeedbackDraft | null>(null)
|
||||
const [content, setContent] = useState('')
|
||||
@@ -40,7 +51,7 @@ export default function FeedbackDraftPage() {
|
||||
const [a, cons, cats] = await Promise.all([
|
||||
db.assignments.get(assignmentId),
|
||||
db.consultants.get(instId),
|
||||
db.categories.orderBy('order').toArray(),
|
||||
db.feedbackCategories.orderBy('order').toArray(),
|
||||
])
|
||||
setAssignment(a ?? null)
|
||||
setInstitutee(cons ?? null)
|
||||
@@ -56,21 +67,25 @@ export default function FeedbackDraftPage() {
|
||||
|
||||
const instAssessments = allAssessments.filter(a => a.instituteeId === instId)
|
||||
const instEntries = allEntries.filter(e => e.instituteeId === instId)
|
||||
const allLineTags = instEntries.flatMap(e => e.lineTags ?? [])
|
||||
|
||||
const criteriaIds = [...new Set(instAssessments.map(a => a.criteriaId))]
|
||||
const criteriaIds = [...new Set([
|
||||
...instAssessments.map(a => a.criteriaId),
|
||||
...allLineTags.map(t => t.criterionItemId),
|
||||
])]
|
||||
const crits = criteriaIds.length > 0
|
||||
? await db.criteria.where('id').anyOf(criteriaIds).toArray()
|
||||
? await db.feedbackCriterionItems.where('id').anyOf(criteriaIds).toArray()
|
||||
: []
|
||||
|
||||
const sum: CriterionSummary[] = crits.map(crit => {
|
||||
const relevant = instAssessments.filter(a => a.criteriaId === crit.id && a.score !== null)
|
||||
const relevant = instAssessments.filter(a => a.criteriaId === crit.id && a.score !== null && a.score !== 'na')
|
||||
const avg = relevant.length > 0
|
||||
? relevant.reduce((s, a) => s + ratingToNum(a.score), 0) / relevant.length
|
||||
: null
|
||||
const notes = [
|
||||
...instAssessments.filter(a => a.criteriaId === crit.id && a.note).map(a => a.note),
|
||||
...instEntries.filter(e => e.note).map(e => e.note),
|
||||
].filter(Boolean)
|
||||
...allLineTags.filter(t => t.criterionItemId === crit.id).map(t => t.text),
|
||||
]
|
||||
return { criterion: crit, avg, notes }
|
||||
})
|
||||
setSummary(sum)
|
||||
@@ -104,8 +119,7 @@ export default function FeedbackDraftPage() {
|
||||
for (const [catId, items] of grouped) {
|
||||
text += `## ${catMap.get(catId) ?? 'Sonstige'}\n`
|
||||
for (const item of items) {
|
||||
const avgStr = item.avg !== null ? item.avg.toFixed(1) : '—'
|
||||
text += `${item.criterion.name}: ${avgStr}/5\n`
|
||||
text += `${item.criterion.name}: ${ratingLabel(item.avg)}\n`
|
||||
if (item.notes.length > 0) {
|
||||
const uniqueNotes = [...new Set(item.notes)]
|
||||
text += uniqueNotes.map(n => ` • ${n}`).join('\n') + '\n'
|
||||
@@ -146,13 +160,6 @@ export default function FeedbackDraftPage() {
|
||||
}, 600)
|
||||
}
|
||||
|
||||
const scoreColor = (avg: number | null) => {
|
||||
if (avg === null) return 'bg-gray-100 text-gray-400'
|
||||
if (avg >= 4) return 'bg-green-100 text-green-700'
|
||||
if (avg >= 3) return 'bg-yellow-100 text-yellow-700'
|
||||
return 'bg-red-100 text-red-700'
|
||||
}
|
||||
|
||||
if (!assignment || !institutee) return <div className="text-center py-10 text-gray-400">Lädt…</div>
|
||||
|
||||
return (
|
||||
@@ -179,7 +186,7 @@ export default function FeedbackDraftPage() {
|
||||
className="flex items-center justify-between py-1.5 border-b border-gray-50 last:border-0">
|
||||
<span className="text-sm text-gray-700">{s.criterion.name}</span>
|
||||
<span className={`text-sm font-semibold px-2 py-0.5 rounded min-w-[40px] text-center ${scoreColor(s.avg)}`}>
|
||||
{s.avg !== null ? s.avg.toFixed(1) : '—'}
|
||||
{ratingLabel(s.avg)}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -1,20 +1,12 @@
|
||||
import { useEffect, useState } from 'react'
|
||||
import { db, type FeedbackDimension, type FeedbackCategory, type FeedbackCriterionItem, type AssignmentType, type PhaseTemplate } from '../db'
|
||||
import { db, type FeedbackDimension, type FeedbackCategory, type FeedbackCriterionItem } from '../db'
|
||||
|
||||
export default function FeedbackStructureConfig() {
|
||||
const [dimensions, setDimensions] = useState<FeedbackDimension[]>([])
|
||||
const [categories, setCategories] = useState<FeedbackCategory[]>([])
|
||||
const [items, setItems] = useState<FeedbackCriterionItem[]>([])
|
||||
const [assignmentTypes, setAssignmentTypes] = useState<AssignmentType[]>([])
|
||||
const [expanded, setExpanded] = useState<Set<number>>(new Set())
|
||||
const [expandedCat, setExpandedCat] = useState<Set<number>>(new Set())
|
||||
const [showCatalogs, setShowCatalogs] = useState(false)
|
||||
const [phaseTemplates, setPhaseTemplates] = useState<PhaseTemplate[]>([])
|
||||
const [showTypeConfig, setShowTypeConfig] = useState(false)
|
||||
const [expandedType, setExpandedType] = useState<number | null>(null)
|
||||
const [newTypeName, setNewTypeName] = useState('')
|
||||
const [newPhase, setNewPhase] = useState<Record<number, { label: string; withWhom: 'lead'|'client'; isRepeatable: boolean; hasConversation: boolean; hasAssessment: boolean }>>({})
|
||||
const [typeError, setTypeError] = useState<Record<number, string>>({})
|
||||
|
||||
// Neue Einträge
|
||||
const [newDimName, setNewDimName] = useState('')
|
||||
@@ -22,18 +14,14 @@ export default function FeedbackStructureConfig() {
|
||||
const [newItemName, setNewItemName] = useState<Record<number, string>>({})
|
||||
|
||||
const load = async () => {
|
||||
const [dims, cats, itms, types, phases] = await Promise.all([
|
||||
const [dims, cats, itms] = await Promise.all([
|
||||
db.feedbackDimensions.orderBy('order').toArray(),
|
||||
db.feedbackCategories.orderBy('order').toArray(),
|
||||
db.feedbackCriterionItems.orderBy('order').toArray(),
|
||||
db.assignmentTypes.toArray(),
|
||||
db.phaseTemplates.toArray(),
|
||||
])
|
||||
setDimensions(dims)
|
||||
setCategories(cats)
|
||||
setItems(itms)
|
||||
setAssignmentTypes(types)
|
||||
setPhaseTemplates(phases)
|
||||
}
|
||||
|
||||
useEffect(() => { load() }, [])
|
||||
@@ -125,70 +113,6 @@ export default function FeedbackStructureConfig() {
|
||||
setItems(prev => prev.map(i => i.id === id ? { ...i, weight } : i))
|
||||
}
|
||||
|
||||
const toggleCatalogCategory = async (type: AssignmentType, catId: number) => {
|
||||
const current = type.criteriaIds ?? []
|
||||
const next = current.includes(catId) ? current.filter(id => id !== catId) : [...current, catId]
|
||||
await db.assignmentTypes.update(type.id!, { criteriaIds: next })
|
||||
setAssignmentTypes(prev => prev.map(t => t.id === type.id ? { ...t, criteriaIds: next } : t))
|
||||
}
|
||||
|
||||
// ── AssignmentType CRUD ───────────────────────────────────────────────────
|
||||
|
||||
const addAssignmentType = async () => {
|
||||
if (!newTypeName.trim()) return
|
||||
await db.assignmentTypes.add({ name: newTypeName.trim(), defaultPhaseKeys: [] })
|
||||
setNewTypeName('')
|
||||
await load()
|
||||
}
|
||||
|
||||
const updateAssignmentTypeName = async (id: number, name: string) => {
|
||||
await db.assignmentTypes.update(id, { name })
|
||||
setAssignmentTypes(prev => prev.map(t => t.id === id ? { ...t, name } : t))
|
||||
}
|
||||
|
||||
const deleteAssignmentType = async (id: number) => {
|
||||
const count = await db.assignments.where('assignmentTypeId').equals(id).count()
|
||||
if (count > 0) {
|
||||
setTypeError(prev => ({ ...prev, [id]: `Kann nicht gelöscht werden – ${count} Assignment(s) verwenden diesen Typ.` }))
|
||||
return
|
||||
}
|
||||
await db.phaseTemplates.where('assignmentTypeId').equals(id).delete()
|
||||
await db.assignmentTypes.delete(id)
|
||||
setTypeError(prev => { const n = { ...prev }; delete n[id]; return n })
|
||||
await load()
|
||||
}
|
||||
|
||||
// ── PhaseTemplate CRUD ────────────────────────────────────────────────────
|
||||
|
||||
const addPhaseTemplate = async (typeId: number) => {
|
||||
const p = newPhase[typeId]
|
||||
if (!p?.label.trim()) return
|
||||
const existing = phaseTemplates.filter(t => t.assignmentTypeId === typeId)
|
||||
await db.phaseTemplates.add({
|
||||
assignmentTypeId: typeId,
|
||||
phaseKey: p.label.trim().toLowerCase().replace(/\s+/g, '_'),
|
||||
label: p.label.trim(),
|
||||
withWhom: p.withWhom,
|
||||
isRepeatable: p.isRepeatable,
|
||||
hasConversation: p.hasConversation,
|
||||
hasAssessment: p.hasAssessment,
|
||||
criteriaIds: [],
|
||||
order: existing.length + 1,
|
||||
})
|
||||
setNewPhase(prev => ({ ...prev, [typeId]: { label: '', withWhom: 'lead', isRepeatable: false, hasConversation: false, hasAssessment: false } }))
|
||||
await load()
|
||||
}
|
||||
|
||||
const updatePhaseTemplate = async (id: number, fields: Partial<PhaseTemplate>) => {
|
||||
await db.phaseTemplates.update(id, fields)
|
||||
setPhaseTemplates(prev => prev.map(t => t.id === id ? { ...t, ...fields } : t))
|
||||
}
|
||||
|
||||
const deletePhaseTemplate = async (id: number) => {
|
||||
await db.phaseTemplates.delete(id)
|
||||
setPhaseTemplates(prev => prev.filter(t => t.id !== id))
|
||||
}
|
||||
|
||||
const sorted = [...dimensions].sort((a, b) => a.order - b.order)
|
||||
|
||||
return (
|
||||
|
||||
Reference in new issue
Block a user