From 1b256e9d99e802b48bba2551d31a16dd930d4d06 Mon Sep 17 00:00:00 2001 From: s8613 Date: Sat, 14 Jun 2025 10:42:36 +0200 Subject: [PATCH] merge conflicts --- .../src/routes/extractedResult.$pitchBook.tsx | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index 8888bd8..cfe8bae 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -7,17 +7,6 @@ import KennzahlenTable from "../components/KennzahlenTable"; import PDFViewer from "../components/pdfViewer"; import { kpiQueryOptions, settingsQueryOptions } from "../util/query"; -// SETTINGS von KennzahlenTable component (mock) -const SETTINGS = [ - { name: "Rendite", position: 1, active: true, mandatory: true }, - { name: "Ausschüttungsrendite", position: 2, active: true, mandatory: true }, - { name: "Laufzeit", position: 3, active: true, mandatory: true }, - { name: "Länderallokation", position: 4, active: true, mandatory: true }, - { name: "Managmentgebühren", position: 5, active: true, mandatory: true }, - { name: "Risikoprofil", position: 6, active: false, mandatory: true }, - { name: "Irgendwas", position: 7, active: true, mandatory: true }, -]; - export const Route = createFileRoute("/extractedResult/$pitchBook")({ component: ExtractedResultsPage, loader: ({ context: { queryClient }, params: { pitchBook } }) => @@ -45,7 +34,7 @@ function ExtractedResultsPage() { const { data: settings } = useSuspenseQuery(settingsQueryOptions()); const prepareClipboardData = () => { - const activeSettings = SETTINGS + const activeSettings = settings .filter(setting => setting.active) .sort((a, b) => a.position - b.position);