From 1846b24de836e30c4595b265157bf68c63651ff9 Mon Sep 17 00:00:00 2001 From: s8613 Date: Fri, 13 Jun 2025 16:21:41 +0200 Subject: [PATCH 01/11] added Snackbar and copy logic --- .../src/routes/extractedResult.$pitchBook.tsx | 97 ++++++++++++++++++- 1 file changed, 93 insertions(+), 4 deletions(-) diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index db7c47e..921b669 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -1,5 +1,5 @@ import ContentPasteIcon from "@mui/icons-material/ContentPaste"; -import { Box, Button, Paper, Typography } from "@mui/material"; +import { Box, Button, Paper, Typography, Snackbar, Alert } from "@mui/material"; import { useSuspenseQuery } from "@tanstack/react-query"; import { createFileRoute, useNavigate } from "@tanstack/react-router"; import { useState } from "react"; @@ -7,6 +7,17 @@ import KennzahlenTable from "../components/KennzahlenTable"; import PDFViewer from "../components/pdfViewer"; import { kpiQueryOptions } 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 } }) => @@ -18,6 +29,8 @@ function ExtractedResultsPage() { const navigate = useNavigate(); const status: "green" | "yellow" | "red" = "red"; const [currentPage, setCurrentPage] = useState(1); + const [copied, setCopied] = useState(false); + const [snackbarOpen, setSnackbarOpen] = useState(false); const statusColor = { red: "#f43131", @@ -27,6 +40,57 @@ function ExtractedResultsPage() { const { data: kpi } = useSuspenseQuery(kpiQueryOptions(pitchBook)); + const prepareClipboardData = () => { + const activeSettings = SETTINGS + .filter(setting => setting.active) + .sort((a, b) => a.position - b.position); + + const values = activeSettings.map(setting => { + const settingData = kpi[setting.name.toUpperCase()]; + if (!settingData || settingData.length === 0) { + return ""; + } + return settingData[0]?.entity || ""; + }); + return values.join('\t'); + }; + + const handleCopyToClipboard = async () => { + try { + const textToCopy = prepareClipboardData(); + + // Use the modern Clipboard API if available + if (navigator.clipboard && window.isSecureContext) { + await navigator.clipboard.writeText(textToCopy); + } else { + // Fallback for older browsers or non-secure contexts + const textArea = document.createElement("textarea"); + textArea.value = textToCopy; + textArea.style.position = "fixed"; + textArea.style.left = "-999999px"; + textArea.style.top = "-999999px"; + document.body.appendChild(textArea); + textArea.focus(); + textArea.select(); + document.execCommand('copy'); + textArea.remove(); + } + + // Show success feedback + setCopied(true); + setSnackbarOpen(true); + setTimeout(() => setCopied(false), 2000); + + } catch (err) { + console.error('Failed to copy text: ', err); + // You could show an error snackbar here if needed + } + }; + + const handleCloseSnackbar = () => { + setSnackbarOpen(false); + }; + return ( @@ -93,9 +157,19 @@ function ExtractedResultsPage() { - From 1b256e9d99e802b48bba2551d31a16dd930d4d06 Mon Sep 17 00:00:00 2001 From: s8613 Date: Sat, 14 Jun 2025 10:42:36 +0200 Subject: [PATCH 03/11] 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); From 935cf0c1762e9ad6d01077c1f893ede859a762ac Mon Sep 17 00:00:00 2001 From: s8613 Date: Sat, 14 Jun 2025 12:43:59 +0200 Subject: [PATCH 04/11] Added new page overview of all pitchbooks. --- .../frontend/src/components/ConfigTable.tsx | 10 +- .../src/components/PitchBooksTable.tsx | 186 ++++++++++++++++++ .../frontend/src/components/UploadPage.tsx | 13 ++ project/frontend/src/routeTree.gen.ts | 26 +++ project/frontend/src/routes/config-add.tsx | 15 +- .../src/routes/config-detail.$kpiId.tsx | 17 +- project/frontend/src/routes/config.tsx | 22 ++- .../src/routes/extractedResult.$pitchBook.tsx | 17 +- project/frontend/src/routes/pitchbooks.tsx | 59 ++++++ project/frontend/src/util/api.ts | 8 + project/frontend/src/util/query.ts | 9 +- 11 files changed, 370 insertions(+), 12 deletions(-) create mode 100644 project/frontend/src/components/PitchBooksTable.tsx create mode 100644 project/frontend/src/routes/pitchbooks.tsx diff --git a/project/frontend/src/components/ConfigTable.tsx b/project/frontend/src/components/ConfigTable.tsx index 74675d7..5176a21 100644 --- a/project/frontend/src/components/ConfigTable.tsx +++ b/project/frontend/src/components/ConfigTable.tsx @@ -6,7 +6,11 @@ import type { Kennzahl } from "../types/kpi"; import { getDisplayType } from "../types/kpi"; import { fetchKennzahlen as fetchK } from "../util/api"; -export function ConfigTable() { +type ConfigTableProps = { + from?: string; +}; + +export function ConfigTable({ from }: ConfigTableProps) { const navigate = useNavigate(); const [kennzahlen, setKennzahlen] = useState([]); const [draggedItem, setDraggedItem] = useState(null); @@ -160,12 +164,10 @@ export function ConfigTable() { return; } - console.log("Navigating to detail page for KPI:", kennzahl); - console.log("KPI ID:", kennzahl.id); - navigate({ to: `/config-detail/$kpiId`, params: { kpiId: kennzahl.id.toString() }, + search: from ? { from } : undefined, }); }; diff --git a/project/frontend/src/components/PitchBooksTable.tsx b/project/frontend/src/components/PitchBooksTable.tsx new file mode 100644 index 0000000..7a86ada --- /dev/null +++ b/project/frontend/src/components/PitchBooksTable.tsx @@ -0,0 +1,186 @@ +import { Box, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Typography, CircularProgress, Chip } from "@mui/material"; +import { useSuspenseQuery } from "@tanstack/react-query"; +import { useNavigate } from "@tanstack/react-router"; +import { pitchBooksQueryOptions } from "../util/query"; +import PictureAsPdfIcon from '@mui/icons-material/PictureAsPdf'; +import CheckCircleIcon from '@mui/icons-material/CheckCircle'; +import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty'; + +interface PitchBook { + id: number; + filename: string; + created_at: string; + kpi?: string | { + [key: string]: { + label: string; + entity: string; + page: number; + status: string; + source: string; + }[]; + }; + status?: 'processing' | 'completed'; +} + +export function PitchBooksTable() { + const navigate = useNavigate(); + const { data: pitchBooks, isLoading } = useSuspenseQuery(pitchBooksQueryOptions()); + + const handleRowClick = (pitchBookId: number) => { + navigate({ + to: "/extractedResult/$pitchBook", + params: { pitchBook: pitchBookId.toString() }, + search: { from: "overview" } + }); + }; + + const getKPIValue = (pitchBook: PitchBook, fieldName: string): string => { + if (!pitchBook.kpi || typeof pitchBook.kpi === 'string') { + try { + const parsedKPI = JSON.parse(pitchBook.kpi as string); + // Convert array to object format if needed + const kpiObj = Array.isArray(parsedKPI) ? + parsedKPI.reduce((acc: any, item: any) => { + if (!acc[item.label]) acc[item.label] = []; + acc[item.label].push(item); + return acc; + }, {}) : parsedKPI; + + return kpiObj[fieldName]?.[0]?.entity || 'N/A'; + } catch { + return 'N/A'; + } + } + + return (pitchBook.kpi as any)[fieldName]?.[0]?.entity || 'N/A'; + }; + + const getStatus = (pitchBook: PitchBook) => { + if (pitchBook.kpi && + ((typeof pitchBook.kpi === 'string' && pitchBook.kpi !== '{}') || + (typeof pitchBook.kpi === 'object' && Object.keys(pitchBook.kpi).length > 0))) { + return 'completed'; + } + return 'processing'; + }; + + if (isLoading) { + return ( + + + + ); + } + + return ( + + + + + + Fondsname + Fondsmanager + Dateiname + Status + + + + {pitchBooks.map((pitchBook: PitchBook) => { + const status = getStatus(pitchBook); + const fundName = getKPIValue(pitchBook, 'FONDSNAME') || + getKPIValue(pitchBook, 'FUND_NAME') || + getKPIValue(pitchBook, 'NAME'); + + const manager = getKPIValue(pitchBook, 'FONDSMANAGER') || + getKPIValue(pitchBook, 'MANAGER') || + getKPIValue(pitchBook, 'PORTFOLIO_MANAGER'); + + return ( + handleRowClick(pitchBook.id)} + sx={{ + cursor: "pointer", + "&:hover": { + backgroundColor: "#f9f9f9", + }, + }} + > + + + + + + + + {fundName} + + + {manager} + + + {pitchBook.filename} + + + + {status === 'completed' ? ( + } + label="Abgeschlossen" + size="small" + sx={{ + backgroundColor: "#e8f5e9", + color: "#2e7d32", + "& .MuiChip-icon": { + color: "#2e7d32", + }, + }} + /> + ) : ( + } + label="In Bearbeitung" + size="small" + sx={{ + backgroundColor: "#fff3e0", + color: "#e65100", + "& .MuiChip-icon": { + color: "#e65100", + }, + }} + /> + )} + + + ); + })} + +
+ {pitchBooks.length === 0 && ( + + + Keine Pitch Books vorhanden + + + )} + + ); +} \ No newline at end of file diff --git a/project/frontend/src/components/UploadPage.tsx b/project/frontend/src/components/UploadPage.tsx index 66fe220..3a2a85c 100644 --- a/project/frontend/src/components/UploadPage.tsx +++ b/project/frontend/src/components/UploadPage.tsx @@ -178,6 +178,19 @@ export default function UploadPage() { > Kennzahlen extrahieren + ); diff --git a/project/frontend/src/routeTree.gen.ts b/project/frontend/src/routeTree.gen.ts index 489b1cf..5377387 100644 --- a/project/frontend/src/routeTree.gen.ts +++ b/project/frontend/src/routeTree.gen.ts @@ -11,6 +11,7 @@ // Import Routes import { Route as rootRoute } from './routes/__root' +import { Route as PitchbooksImport } from './routes/pitchbooks' import { Route as ConfigAddImport } from './routes/config-add' import { Route as ConfigImport } from './routes/config' import { Route as IndexImport } from './routes/index' @@ -20,6 +21,12 @@ import { Route as ExtractedResultPitchBookKpiImport } from './routes/extractedRe // Create/Update Routes +const PitchbooksRoute = PitchbooksImport.update({ + id: '/pitchbooks', + path: '/pitchbooks', + getParentRoute: () => rootRoute, +} as any) + const ConfigAddRoute = ConfigAddImport.update({ id: '/config-add', path: '/config-add', @@ -82,6 +89,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ConfigAddImport parentRoute: typeof rootRoute } + '/pitchbooks': { + id: '/pitchbooks' + path: '/pitchbooks' + fullPath: '/pitchbooks' + preLoaderRoute: typeof PitchbooksImport + parentRoute: typeof rootRoute + } '/config-detail/$kpiId': { id: '/config-detail/$kpiId' path: '/config-detail/$kpiId' @@ -112,6 +126,7 @@ export interface FileRoutesByFullPath { '/': typeof IndexRoute '/config': typeof ConfigRoute '/config-add': typeof ConfigAddRoute + '/pitchbooks': typeof PitchbooksRoute '/config-detail/$kpiId': typeof ConfigDetailKpiIdRoute '/extractedResult/$pitchBook': typeof ExtractedResultPitchBookRoute '/extractedResult/$pitchBook/$kpi': typeof ExtractedResultPitchBookKpiRoute @@ -121,6 +136,7 @@ export interface FileRoutesByTo { '/': typeof IndexRoute '/config': typeof ConfigRoute '/config-add': typeof ConfigAddRoute + '/pitchbooks': typeof PitchbooksRoute '/config-detail/$kpiId': typeof ConfigDetailKpiIdRoute '/extractedResult/$pitchBook': typeof ExtractedResultPitchBookRoute '/extractedResult/$pitchBook/$kpi': typeof ExtractedResultPitchBookKpiRoute @@ -131,6 +147,7 @@ export interface FileRoutesById { '/': typeof IndexRoute '/config': typeof ConfigRoute '/config-add': typeof ConfigAddRoute + '/pitchbooks': typeof PitchbooksRoute '/config-detail/$kpiId': typeof ConfigDetailKpiIdRoute '/extractedResult/$pitchBook': typeof ExtractedResultPitchBookRoute '/extractedResult_/$pitchBook/$kpi': typeof ExtractedResultPitchBookKpiRoute @@ -142,6 +159,7 @@ export interface FileRouteTypes { | '/' | '/config' | '/config-add' + | '/pitchbooks' | '/config-detail/$kpiId' | '/extractedResult/$pitchBook' | '/extractedResult/$pitchBook/$kpi' @@ -150,6 +168,7 @@ export interface FileRouteTypes { | '/' | '/config' | '/config-add' + | '/pitchbooks' | '/config-detail/$kpiId' | '/extractedResult/$pitchBook' | '/extractedResult/$pitchBook/$kpi' @@ -158,6 +177,7 @@ export interface FileRouteTypes { | '/' | '/config' | '/config-add' + | '/pitchbooks' | '/config-detail/$kpiId' | '/extractedResult/$pitchBook' | '/extractedResult_/$pitchBook/$kpi' @@ -168,6 +188,7 @@ export interface RootRouteChildren { IndexRoute: typeof IndexRoute ConfigRoute: typeof ConfigRoute ConfigAddRoute: typeof ConfigAddRoute + PitchbooksRoute: typeof PitchbooksRoute ConfigDetailKpiIdRoute: typeof ConfigDetailKpiIdRoute ExtractedResultPitchBookRoute: typeof ExtractedResultPitchBookRoute ExtractedResultPitchBookKpiRoute: typeof ExtractedResultPitchBookKpiRoute @@ -177,6 +198,7 @@ const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, ConfigRoute: ConfigRoute, ConfigAddRoute: ConfigAddRoute, + PitchbooksRoute: PitchbooksRoute, ConfigDetailKpiIdRoute: ConfigDetailKpiIdRoute, ExtractedResultPitchBookRoute: ExtractedResultPitchBookRoute, ExtractedResultPitchBookKpiRoute: ExtractedResultPitchBookKpiRoute, @@ -195,6 +217,7 @@ export const routeTree = rootRoute "/", "/config", "/config-add", + "/pitchbooks", "/config-detail/$kpiId", "/extractedResult/$pitchBook", "/extractedResult_/$pitchBook/$kpi" @@ -209,6 +232,9 @@ export const routeTree = rootRoute "/config-add": { "filePath": "config-add.tsx" }, + "/pitchbooks": { + "filePath": "pitchbooks.tsx" + }, "/config-detail/$kpiId": { "filePath": "config-detail.$kpiId.tsx" }, diff --git a/project/frontend/src/routes/config-add.tsx b/project/frontend/src/routes/config-add.tsx index b90d7b1..e63e072 100644 --- a/project/frontend/src/routes/config-add.tsx +++ b/project/frontend/src/routes/config-add.tsx @@ -6,10 +6,23 @@ import type { Kennzahl } from "../types/kpi"; export const Route = createFileRoute("/config-add")({ component: ConfigAddPage, + validateSearch: (search: Record): { from?: string } => { + return { + from: search.from as string | undefined, + }; + }, }); function ConfigAddPage() { const navigate = useNavigate(); + const { from } = Route.useSearch(); + + const handleBack = () => { + navigate({ + to: "/config", + search: from ? { from } : undefined, + }); + }; const handleSave = async (formData: Partial) => { try { @@ -68,7 +81,7 @@ function ConfigAddPage() { mb={4} > - navigate({ to: "/config" })}> + diff --git a/project/frontend/src/routes/config-detail.$kpiId.tsx b/project/frontend/src/routes/config-detail.$kpiId.tsx index 16ddce9..eee7898 100644 --- a/project/frontend/src/routes/config-detail.$kpiId.tsx +++ b/project/frontend/src/routes/config-detail.$kpiId.tsx @@ -9,16 +9,29 @@ import { typeDisplayMapping } from "../types/kpi"; export const Route = createFileRoute("/config-detail/$kpiId")({ component: KPIDetailPage, + validateSearch: (search: Record): { from?: string } => { + return { + from: search.from as string | undefined, + }; + }, }); function KPIDetailPage() { const { kpiId } = Route.useParams(); const navigate = useNavigate(); + const { from } = Route.useSearch(); const [kennzahl, setKennzahl] = useState(null); const [isEditing, setIsEditing] = useState(false); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); + const handleBack = () => { + navigate({ + to: "/config", + search: from ? { from } : undefined + }); + }; + useEffect(() => { const fetchKennzahl = async () => { try { @@ -138,7 +151,7 @@ function KPIDetailPage() { mb={4} > - navigate({ to: "/config" })}> + @@ -249,7 +262,7 @@ function KPIDetailPage() { mb={4} > - navigate({ to: "/config" })}> + diff --git a/project/frontend/src/routes/config.tsx b/project/frontend/src/routes/config.tsx index eddf16e..ac64c3d 100644 --- a/project/frontend/src/routes/config.tsx +++ b/project/frontend/src/routes/config.tsx @@ -6,13 +6,29 @@ import { ConfigTable } from "../components/ConfigTable"; export const Route = createFileRoute("/config")({ component: ConfigPage, + validateSearch: (search: Record): { from?: string } => { + const from = typeof search.from === "string" ? search.from : undefined; + return { from }; + } }); function ConfigPage() { const navigate = useNavigate(); + const { from } = Route.useSearch(); const handleAddNewKPI = () => { - navigate({ to: "/config-add" }); + navigate({ + to: "/config-add", + search: from ? { from } : undefined + }); + }; + + const handleBack = () => { + if (from === "pitchbooks") { + navigate({ to: "/pitchbooks" }); + } else { + navigate({ to: "/" }); + } }; return ( @@ -34,7 +50,7 @@ function ConfigPage() { px={4} > - navigate({ to: "/" })}> + @@ -53,7 +69,7 @@ function ConfigPage() { - + ); diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index 6878542..feba82f 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -1,5 +1,6 @@ import ContentPasteIcon from "@mui/icons-material/ContentPaste"; -import { Box, Button, Paper, Typography } from "@mui/material"; +import ArrowBackIcon from "@mui/icons-material/ArrowBack"; +import { Box, Button, Paper, Typography, IconButton } from "@mui/material"; import { useSuspenseQuery } from "@tanstack/react-query"; import { createFileRoute, useNavigate } from "@tanstack/react-router"; import { useState } from "react"; @@ -9,6 +10,11 @@ import { kpiQueryOptions, settingsQueryOptions } from "../util/query"; export const Route = createFileRoute("/extractedResult/$pitchBook")({ component: ExtractedResultsPage, + validateSearch: (search: Record): { from?: string } => { + return { + from: search.from as string | undefined, + }; + }, loader: ({ context: { queryClient }, params: { pitchBook } }) => Promise.allSettled([ queryClient.ensureQueryData(kpiQueryOptions(pitchBook)), @@ -19,6 +25,7 @@ export const Route = createFileRoute("/extractedResult/$pitchBook")({ function ExtractedResultsPage() { const { pitchBook } = Route.useParams(); const navigate = useNavigate(); + const { from } = Route.useSearch(); const status: "green" | "yellow" | "red" = "red"; const [currentPage, setCurrentPage] = useState(1); @@ -34,6 +41,14 @@ function ExtractedResultsPage() { return ( + {from === "overview" && ( + navigate({ to: "/pitchbooks" })} + sx={{ ml: -1 }} + > + + + )} + queryClient.ensureQueryData(pitchBooksQueryOptions()), +}); + +function PitchBooksPage() { + const navigate = useNavigate(); + + return ( + + + + navigate({ to: "/" })}> + + + + Übersicht aller Pitch Books + + + navigate({ + to: "/config", + search: { from: "pitchbooks" } + })} + > + + + + + + + + ); +} \ No newline at end of file diff --git a/project/frontend/src/util/api.ts b/project/frontend/src/util/api.ts index 5a8c3c6..ac3cda2 100644 --- a/project/frontend/src/util/api.ts +++ b/project/frontend/src/util/api.ts @@ -107,3 +107,11 @@ export const fetchKennzahlen = async (): Promise => { const data = await response.json(); return data; }; + +export async function fetchPitchBooks() { + const response = await fetch("http://localhost:5050/api/pitch_book/"); + if (!response.ok) { + throw new Error("Failed to fetch pitch books"); + } + return response.json(); +} diff --git a/project/frontend/src/util/query.ts b/project/frontend/src/util/query.ts index 0821301..db07917 100644 --- a/project/frontend/src/util/query.ts +++ b/project/frontend/src/util/query.ts @@ -1,5 +1,5 @@ import { queryOptions } from "@tanstack/react-query"; -import { fetchKPI, fetchKennzahlen } from "./api"; +import { fetchKPI, fetchKennzahlen, fetchPitchBooks } from "./api"; export const kpiQueryOptions = (pitchBookId: string) => queryOptions({ @@ -12,3 +12,10 @@ export const settingsQueryOptions = () => queryKey: ["pitchBookSettings"], queryFn: () => fetchKennzahlen(), }); + +export const pitchBooksQueryOptions = () => + queryOptions({ + queryKey: ["pitchBooks"], + queryFn: fetchPitchBooks, + staleTime: 30000, + }); \ No newline at end of file From 940b198003b79efc10a251437dd9ad4b2a3fb193 Mon Sep 17 00:00:00 2001 From: s8613 Date: Sat, 14 Jun 2025 13:01:44 +0200 Subject: [PATCH 05/11] Fixed redirect when error. --- .../src/routes/extractedResult.$pitchBook.tsx | 14 +++++++++++--- .../routes/extractedResult_.$pitchBook.$kpi.tsx | 12 ++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index feba82f..68acdb4 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -7,6 +7,7 @@ import { useState } from "react"; import KennzahlenTable from "../components/KennzahlenTable"; import PDFViewer from "../components/pdfViewer"; import { kpiQueryOptions, settingsQueryOptions } from "../util/query"; +import { redirect } from "@tanstack/react-router"; export const Route = createFileRoute("/extractedResult/$pitchBook")({ component: ExtractedResultsPage, @@ -15,11 +16,18 @@ export const Route = createFileRoute("/extractedResult/$pitchBook")({ from: search.from as string | undefined, }; }, - loader: ({ context: { queryClient }, params: { pitchBook } }) => - Promise.allSettled([ + loader: async ({ context: { queryClient }, params: { pitchBook } }) => { + const results = await Promise.allSettled([ queryClient.ensureQueryData(kpiQueryOptions(pitchBook)), queryClient.ensureQueryData(settingsQueryOptions()), - ]), + ]); + if (results[0].status === "rejected") { + throw redirect({ + to: "/" + }); + } + return results; + } }); function ExtractedResultsPage() { diff --git a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx index ccf34b8..21dc929 100644 --- a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx +++ b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx @@ -23,11 +23,19 @@ import PDFViewer from "../components/pdfViewer"; import { kpiQueryOptions } from "../util/query"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; import {fetchPutKPI} from "../util/api"; +import { redirect } from "@tanstack/react-router"; export const Route = createFileRoute("/extractedResult_/$pitchBook/$kpi")({ component: ExtractedResultsPage, - loader: ({ context: { queryClient }, params: { pitchBook } }) => - queryClient.ensureQueryData(kpiQueryOptions(pitchBook)), + loader: async ({ context: { queryClient }, params: { pitchBook } }) => { + try { + return await queryClient.ensureQueryData(kpiQueryOptions(pitchBook)); + } catch (err) { + throw redirect({ + to: "/" + }); + } + }, }); function ExtractedResultsPage() { From 4a347951e906b4770425b0042a2f2abefca46872 Mon Sep 17 00:00:00 2001 From: s8613 Date: Sat, 14 Jun 2025 13:36:00 +0200 Subject: [PATCH 06/11] fixed redirect for extracedresults. --- .../frontend/src/components/KennzahlenTable.tsx | 5 ++++- .../src/routes/extractedResult.$pitchBook.tsx | 1 + .../routes/extractedResult_.$pitchBook.$kpi.tsx | 15 ++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/project/frontend/src/components/KennzahlenTable.tsx b/project/frontend/src/components/KennzahlenTable.tsx index 406798e..c9729dd 100644 --- a/project/frontend/src/components/KennzahlenTable.tsx +++ b/project/frontend/src/components/KennzahlenTable.tsx @@ -34,6 +34,7 @@ interface KennzahlenTableProps { source: string; }[]; }; + from?: string; } export default function KennzahlenTable({ @@ -41,10 +42,11 @@ export default function KennzahlenTable({ data, pdfId, settings, + from }: KennzahlenTableProps) { const [editingIndex, setEditingIndex] = useState(""); const [editValue, setEditValue] = useState(""); - const navigate = useNavigate({ from: "/extractedResult/$pitchBook" }); + const navigate = useNavigate(); const queryClient = useQueryClient(); @@ -120,6 +122,7 @@ export default function KennzahlenTable({ pitchBook: pdfId, kpi: settingName, }, + search: { from: from ?? undefined }, }); }; diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index 68acdb4..59a8039 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -98,6 +98,7 @@ function ExtractedResultsPage() { onPageClick={setCurrentPage} data={kpi} pdfId={pitchBook} + from={from} /> ) => { + return { + from: typeof search.from === "string" ? search.from : undefined, + }; + }, loader: async ({ context: { queryClient }, params: { pitchBook } }) => { try { return await queryClient.ensureQueryData(kpiQueryOptions(pitchBook)); @@ -43,6 +48,7 @@ function ExtractedResultsPage() { const { pitchBook, kpi } = params; const navigate = useNavigate(); const queryClient = useQueryClient(); + const { from } = Route.useSearch(); const { data: kpiData @@ -76,7 +82,8 @@ function ExtractedResultsPage() { }); navigate({ to: "/extractedResult/$pitchBook", - params: { pitchBook } + params: { pitchBook }, + search: from ? { from } : undefined }); }, onError: (error) => { @@ -112,7 +119,8 @@ function ExtractedResultsPage() { } else { navigate({ to: "/extractedResult/$pitchBook", - params: { pitchBook } + params: { pitchBook }, + search: from ? { from } : undefined }); } }; @@ -121,7 +129,8 @@ function ExtractedResultsPage() { setShowConfirmDialog(false); navigate({ to: "/extractedResult/$pitchBook", - params: { pitchBook } + params: { pitchBook }, + search: from ? { from } : undefined }); }; From 6285be6d40b164c927cfbdc48ea1ea599fa3e913 Mon Sep 17 00:00:00 2001 From: s8613 Date: Sun, 15 Jun 2025 12:05:07 +0200 Subject: [PATCH 07/11] merge conflicts and small bug of page number --- .../src/components/KennzahlenTable.tsx | 28 +++++++++++-------- .../extractedResult_.$pitchBook.$kpi.tsx | 16 +++++++++-- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/project/frontend/src/components/KennzahlenTable.tsx b/project/frontend/src/components/KennzahlenTable.tsx index f4db2d7..10058ca 100644 --- a/project/frontend/src/components/KennzahlenTable.tsx +++ b/project/frontend/src/components/KennzahlenTable.tsx @@ -286,18 +286,22 @@ export default function KennzahlenTable({ )} - - onPageClick?.( - Number(row.extractedValues.at(0)?.page), - row.extractedValues.at(0)?.entity || "", - ) - } - sx={{ cursor: "pointer" }} - > - {row.extractedValues.at(0)?.page} - + {(row.extractedValues.at(0)?.page ?? 0) > 0 ? ( + { + const extractedValue = row.extractedValues.at(0); + if (extractedValue?.page && extractedValue.page > 0) { + onPageClick?.(Number(extractedValue.page), extractedValue.entity || ""); + } + }} + sx={{ cursor: "pointer" }} + > + {row.extractedValues.at(0)?.page} + + ) : ( + "" + )} ); diff --git a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx index b2f6b17..22ec938 100644 --- a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx +++ b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx @@ -30,8 +30,6 @@ import { useEffect, useState } from "react"; import PDFViewer from "../components/pdfViewer"; import { fetchPutKPI } from "../util/api"; import { kpiQueryOptions } from "../util/query"; -import ArrowBackIcon from "@mui/icons-material/ArrowBack"; -import {fetchPutKPI} from "../util/api"; import { redirect } from "@tanstack/react-router"; export const Route = createFileRoute("/extractedResult_/$pitchBook/$kpi")({ @@ -78,9 +76,21 @@ function ExtractedResultsPage() { const { mutate: updateKPI } = useMutation({ mutationFn: () => { const updatedData = { ...kpiData }; + let baseObject; + if (selectedIndex >= 0) { + baseObject = kpiValues[selectedIndex]; + } else { + baseObject = { + label: kpi.toUpperCase(), + entity: selectedValue, + page: 0, + status: "single-source", + source: "manual", + }; + } updatedData[kpi.toUpperCase()] = [ { - ...kpiValues[0], + ...baseObject, entity: selectedValue, }, ]; From b3e4dd634e31c5c6ad2f813fb705c245b9db2d6b Mon Sep 17 00:00:00 2001 From: Jaronim Pracht Date: Sun, 15 Jun 2025 14:30:46 +0200 Subject: [PATCH 08/11] Add progress updates to ocr & exxeta processes --- .../controller/pitch_book_controller.py | 43 +------------------ project/backend/exxetaGPT-service/app.py | 4 +- .../exxetaGPT-service/extractExxeta.py | 21 ++++++--- project/backend/ocr-service/app.py | 4 +- project/backend/validate-service/app.py | 7 +-- project/docker-compose.yml | 2 + .../frontend/src/components/UploadPage.tsx | 36 ++++++---------- 7 files changed, 39 insertions(+), 78 deletions(-) diff --git a/project/backend/coordinator/controller/pitch_book_controller.py b/project/backend/coordinator/controller/pitch_book_controller.py index 8dc6776..4a77dbd 100644 --- a/project/backend/coordinator/controller/pitch_book_controller.py +++ b/project/backend/coordinator/controller/pitch_book_controller.py @@ -17,48 +17,6 @@ OCR_SERVICE_URL = os.getenv("OCR_SERVICE_URL", "http://localhost:5051") progress_per_id = {} # {id: {kpi: 0, pdf: 0}} storage_lock = threading.Lock() -def process_pdf_async(app, file_id, file_data, filename): - with app.app_context(): - try: - file_obj = BytesIO(file_data) - file_obj.name = filename - - files = {"file": (filename, file_obj, "application/pdf")} - data = {"id": file_id} - - response = requests.post( - f"{OCR_SERVICE_URL}/ocr", files=files, data=data, timeout=600 - ) - - if response.status_code == 200: - response_data = response.json() - if "ocr_pdf" in response_data: - import base64 - - ocr_pdf_data = base64.b64decode(response_data["ocr_pdf"]) - - file_record = PitchBookModel.query.get(file_id) - if file_record: - file_record.file = ocr_pdf_data - db.session.commit() - - print("[DEBUG] PDF updated in database:") - print("[DEBUG] - Successfully saved to database") - - socketio.emit("progress", {"id": file_id, "progress": 50}) - else: - socketio.emit( - "error", {"id": file_id, "message": "OCR processing failed"} - ) - - except Exception as e: - import traceback - - traceback.print_exc() - socketio.emit( - "error", {"id": file_id, "message": f"Processing failed: {str(e)}"} - ) - @pitch_book_controller.route("/", methods=["POST"]) def upload_file(): @@ -88,6 +46,7 @@ def upload_file(): files = {"file": (uploaded_file.filename, file_data, "application/pdf")} data = {"id": new_file.id} + socketio.emit("progress", {"id": new_file.id, "progress": 5}) response = requests.post( f"{OCR_SERVICE_URL}/ocr", files=files, data=data, timeout=600 ) diff --git a/project/backend/exxetaGPT-service/app.py b/project/backend/exxetaGPT-service/app.py index b40ee91..9b1597b 100644 --- a/project/backend/exxetaGPT-service/app.py +++ b/project/backend/exxetaGPT-service/app.py @@ -15,7 +15,7 @@ def extract_text_from_ocr_json(): pitchbook_id = json_data["id"] pages_data = json_data["extracted_text_per_page"] - entities_json = extract_with_exxeta(pages_data) + entities_json = extract_with_exxeta(pages_data, pitchbook_id) entities = json.loads(entities_json) if isinstance(entities_json, str) else entities_json validate_payload = { @@ -39,4 +39,4 @@ def extract_text_from_ocr_json(): if __name__ == "__main__": - app.run(host="0.0.0.0", port=5053, debug=True) \ No newline at end of file + app.run(host="0.0.0.0", port=5053, debug=True) diff --git a/project/backend/exxetaGPT-service/extractExxeta.py b/project/backend/exxetaGPT-service/extractExxeta.py index 8bd979d..c554f0c 100644 --- a/project/backend/exxetaGPT-service/extractExxeta.py +++ b/project/backend/exxetaGPT-service/extractExxeta.py @@ -9,6 +9,7 @@ MODEL = "gpt-4o-mini" EXXETA_BASE_URL = "https://ai.exxeta.com/api/v2/azure/openai" load_dotenv() EXXETA_API_KEY = os.getenv("API_KEY") +COORDINATOR_URL = os.getenv("COORDINATOR_URL", "http://localhost:5050") MAX_RETRIES = 3 TIMEOUT = 180 @@ -16,14 +17,20 @@ TIMEOUT = 180 logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) -def extract_with_exxeta(pages_json): +def extract_with_exxeta(pages_json, pitchbook_id): results = [] if not EXXETA_API_KEY: logger.warning("EXXETA_API_KEY nicht gesetzt. Rückgabe eines leeren JSON.") return json.dumps(results, indent=2, ensure_ascii=False) + i = 0 for page_data in pages_json: + i += 1 + if i % 8 == 0: + requests.post(COORDINATOR_URL + "/api/progress", json={"id": pitchbook_id, "progress": 35 + 60/len(pages_json)*i}) + + page_num = page_data.get("page") page_data.get("page") text = page_data.get("text", "") @@ -57,7 +64,7 @@ def extract_with_exxeta(pages_json): prompt = ( "Bitte extrahiere relevante Fondskennzahlen aus dem folgenden Pitchbook-Text. " "Analysiere den Text sorgfältig, um **nur exakt benannte und relevante Werte** zu extrahieren.\n\n" - + "ZU EXTRAHIERENDE KENNZAHLEN (immer exakt wie unten angegeben):\n" "- FONDSNAME\n" "- FONDSMANAGER\n" @@ -74,14 +81,14 @@ def extract_with_exxeta(pages_json): "- MANAGEMENTGEBÜHREN (ggf. mit Staffelung und Bezug auf NAV/GAV)\n" "- SEKTORENALLOKATION (z. B. BÜRO, LOGISTIK, WOHNEN... inkl. %-Angaben)\n" "- LÄNDERALLOKATION (z. B. DEUTSCHLAND, FRANKREICH, etc. inkl. %-Angaben)\n\n" - + "WICHTIG:\n" "- Gib **nur eine Entität pro Kennzahl** an - keine Listen oder Interpretationen.\n" "- Wenn mehrere Varianten genannt werden (z. B. \"Core und Core+\"), gib sie im Originalformat als **eine entity** an.\n" "- **Keine Vermutungen oder Ergänzungen**. Wenn keine Information enthalten ist, gib die Kennzahl **nicht aus**.\n" "- Extrahiere **nur wörtlich vorkommende Inhalte** (keine Berechnungen, keine Zusammenfassungen).\n" "- Jeder gefundene Wert muss einem der obigen Label **eindeutig zuordenbar** sein.\n\n" - + "FORMAT:\n" "Antworte als **reines JSON-Array** mit folgendem Format:\n" "[\n" @@ -92,7 +99,7 @@ def extract_with_exxeta(pages_json): " },\n" " ...\n" "]\n\n" - + f"Falls keine Kennzahl enthalten ist, gib ein leeres Array [] zurück.\n\n" f"Nur JSON-Antwort - keine Kommentare, keine Erklärungen, kein Text außerhalb des JSON.\n\n" f"TEXT:\n{text}" @@ -144,4 +151,6 @@ def extract_with_exxeta(pages_json): if attempt == MAX_RETRIES: results.extend([]) - return json.dumps(results, indent=2, ensure_ascii=False) \ No newline at end of file + + requests.post(COORDINATOR_URL + "/api/progress", json={"id": pitchbook_id, "progress": 95}) + return json.dumps(results, indent=2, ensure_ascii=False) diff --git a/project/backend/ocr-service/app.py b/project/backend/ocr-service/app.py index 06a6f14..ba6c0ae 100644 --- a/project/backend/ocr-service/app.py +++ b/project/backend/ocr-service/app.py @@ -41,6 +41,7 @@ def convert_pdf_async(temp_path, pitchbook_id): logger.info("Sending payload to EXXETA and SPACY services") + requests.post(COORDINATOR_URL + "/api/progress", json={"id": pitchbook_id, "progress": 35}) try: exxeta_response = requests.post(EXXETA_URL, json=payload, timeout=600) logger.info(f"EXXETA response: {exxeta_response.status_code}") @@ -59,9 +60,8 @@ def convert_pdf_async(temp_path, pitchbook_id): headers = {} try: - requests.put(f"{COORDINATOR_URL}/api/pitch_book/{pitchbook_id}", files=files, timeout=600, headers=headers) - requests.post(COORDINATOR_URL + "/api/progress", json={"id": pitchbook_id, "progress": 50}, timeout=600) + requests.put(f"{COORDINATOR_URL}/api/pitch_book/{pitchbook_id}", files=files, timeout=600, headers=headers) logger.info("COORDINATOR response: Progress + File updated") except Exception as e: logger.error(f"Error calling COORDINATOR: {e}") diff --git a/project/backend/validate-service/app.py b/project/backend/validate-service/app.py index 2dfb9cb..693c032 100644 --- a/project/backend/validate-service/app.py +++ b/project/backend/validate-service/app.py @@ -10,7 +10,7 @@ import json app = Flask(__name__) load_dotenv() -coordinator_url = os.getenv("COORDINATOR_URL", "http://localhost:5000") +COORDINATOR_URL = os.getenv("COORDINATOR_URL", "http://localhost:5000") # todo add persistence layer data_storage = {} # {id: {spacy_data: [], exxeta_data: []}} @@ -19,7 +19,7 @@ storage_lock = threading.Lock() def send_to_coordinator_service(processed_data, request_id): - if not coordinator_url: + if not COORDINATOR_URL: print("Not processed, missing url", processed_data) return @@ -28,7 +28,7 @@ def send_to_coordinator_service(processed_data, request_id): "kpi": json.dumps(processed_data), } requests.put( - coordinator_url + "/api/pitch_book/" + str(request_id), + COORDINATOR_URL + "/api/pitch_book/" + str(request_id), data=payload, ) print(f"Result PitchBook {request_id} sent to coordinator") @@ -40,6 +40,7 @@ def send_to_coordinator_service(processed_data, request_id): def process_data_async(request_id, spacy_data, exxeta_data): try: + requests.post(COORDINATOR_URL + "/api/progress", json={"id": request_id, "progress": 95}) print(f"Start asynchronous processing for PitchBook: {request_id}") # Perform merge diff --git a/project/docker-compose.yml b/project/docker-compose.yml index 3cfe028..5ab0201 100644 --- a/project/docker-compose.yml +++ b/project/docker-compose.yml @@ -44,6 +44,7 @@ services: environment: - EXXETA_SERVICE_URL=http://exxeta:5000/extract - SPACY_SERVICE_URL=http://spacy:5052/extract + - COORDINATOR_URL=http://coordinator:5000 ports: - 5051:5000 @@ -63,6 +64,7 @@ services: - .env environment: - VALIDATE_SERVICE_URL=http://validate:5000/validate + - COORDINATOR_URL=http://coordinator:5000 ports: - 5053:5000 diff --git a/project/frontend/src/components/UploadPage.tsx b/project/frontend/src/components/UploadPage.tsx index 66fe220..94cf9e5 100644 --- a/project/frontend/src/components/UploadPage.tsx +++ b/project/frontend/src/components/UploadPage.tsx @@ -6,8 +6,6 @@ import FileUpload from "react-material-file-upload"; import { socket } from "../socket"; import { CircularProgressWithLabel } from "./CircularProgressWithLabel"; -const PROGRESS = true; - export default function UploadPage() { const [files, setFiles] = useState([]); const [pageId, setPageId] = useState(null); @@ -27,17 +25,11 @@ export default function UploadPage() { console.log("File uploaded successfully"); const data = await response.json(); setPageId(data.id.toString()); - setLoadingState(0); - - !PROGRESS && - navigate({ - to: "/extractedResult/$pitchBook", - params: { pitchBook: data.id.toString() }, - }); + setLoadingState(5); } else { console.error("Failed to upload file"); } - }, [files, navigate]); + }, [files]); const onConnection = useCallback(() => { console.log("connected"); @@ -79,18 +71,16 @@ export default function UploadPage() { return ( <> - {PROGRESS && ( - ({ color: "#fff", zIndex: theme.zIndex.drawer + 1 })} - open={pageId !== null && loadingState !== null && loadingState < 100} - > - - - )} + ({ color: "#fff", zIndex: theme.zIndex.drawer + 1 })} + open={pageId !== null && loadingState !== null && loadingState < 100} + > + + ); -} \ No newline at end of file +} From d8f29adeba6c7ea564c7ed2b6e086dbd956a13ea Mon Sep 17 00:00:00 2001 From: s8613 Date: Sun, 15 Jun 2025 19:03:50 +0200 Subject: [PATCH 09/11] Fixed one endpoint call to match ticket #60 dynamic changing host. --- project/frontend/src/util/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/frontend/src/util/api.ts b/project/frontend/src/util/api.ts index 095990c..65d3b2e 100644 --- a/project/frontend/src/util/api.ts +++ b/project/frontend/src/util/api.ts @@ -113,7 +113,7 @@ export const fetchKennzahlen = async (): Promise => { }; export async function fetchPitchBooks() { - const response = await fetch("http://localhost:5050/api/pitch_book/"); + const response = await fetch(`${API_HOST}/api/pitch_book/`); if (!response.ok) { throw new Error("Failed to fetch pitch books"); } From 6f905970cd07c562a530c01c45a6a9f3d23c3a2f Mon Sep 17 00:00:00 2001 From: Zainab2604 Date: Sun, 15 Jun 2025 22:17:09 +0200 Subject: [PATCH 10/11] =?UTF-8?q?Hinzuf=C3=BCgen=20der=20Ampelsystem=20Log?= =?UTF-8?q?ik?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/routes/extractedResult.$pitchBook.tsx | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index bee005d..ef01d71 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -2,7 +2,7 @@ import ContentPasteIcon from "@mui/icons-material/ContentPaste"; import { Box, Button, Paper, Typography } from "@mui/material"; import { useSuspenseQuery } from "@tanstack/react-query"; import { createFileRoute, useNavigate } from "@tanstack/react-router"; -import { useCallback, useState } from "react"; +import { useCallback, useState, useMemo } from "react"; import KennzahlenTable from "../components/KennzahlenTable"; import PDFViewer from "../components/pdfViewer"; import { kpiQueryOptions, settingsQueryOptions } from "../util/query"; @@ -19,7 +19,6 @@ export const Route = createFileRoute("/extractedResult/$pitchBook")({ function ExtractedResultsPage() { const { pitchBook } = Route.useParams(); const navigate = useNavigate(); - const status: "green" | "yellow" | "red" = "red"; const [currentPage, setCurrentPage] = useState(1); const [focusHighlight, setFocusHighlight] = useState({ page: 5, @@ -31,15 +30,38 @@ function ExtractedResultsPage() { setFocusHighlight({ page, text: entity }); }, []); + const { data: kpi } = useSuspenseQuery(kpiQueryOptions(pitchBook)); + const { data: settings } = useSuspenseQuery(settingsQueryOptions()); + + const status = useMemo(() => { + let hasRedBorders = false; + let hasYellowBorders = false; + + settings + .filter((setting) => setting.active) + .forEach((setting) => { + const values = kpi[setting.name.toUpperCase()] || []; + const hasNoValue = setting.mandatory && (values.length === 0 || values[0]?.entity === ""); + const hasMultipleValues = values.length > 1; + + if (hasNoValue) { + hasRedBorders = true; + } else if (hasMultipleValues) { + hasYellowBorders = true; + } + }); + + if (hasRedBorders) return "red"; + if (hasYellowBorders) return "yellow"; + return "green"; + }, [kpi, settings]); + const statusColor = { red: "#f43131", yellow: "#f6ed48", green: "#3fd942", }[status]; - const { data: kpi } = useSuspenseQuery(kpiQueryOptions(pitchBook)); - const { data: settings } = useSuspenseQuery(settingsQueryOptions()); - return ( From 3e6750f4177e78de7f45a7c7e88a2de999da7031 Mon Sep 17 00:00:00 2001 From: s8613 Date: Mon, 16 Jun 2025 18:54:06 +0200 Subject: [PATCH 11/11] Fixed merge conflict --- project/frontend/src/routes/extractedResult.$pitchBook.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx index 7ad03dc..63b3c96 100644 --- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx +++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx @@ -64,9 +64,6 @@ function ExtractedResultsPage() { green: "#3fd942", }[status]; - const { data: kpi } = useSuspenseQuery(kpiQueryOptions(pitchBook)); - const { data: settings } = useSuspenseQuery(settingsQueryOptions()); - const prepareClipboardData = () => { const activeSettings = settings .filter(setting => setting.active)