Connected funding schemes too

backend/main.py

@@ -456,6 +456,12 @@ def get_stats(request: Request):
     if c := params.get("country"):
         lf = lf.filter(pl.col("list_country").list.contains(c))
         df = df.filter(pl.col("list_country").list.contains(c))
+    if eu := params.get("topic"):
+        lf = lf.filter(pl.col("list_euroSciVocTitle").list.contains(eu))
+        df = df.filter(pl.col("list_euroSciVocTitle").list.contains(eu))
+    if fs := params.get("fundingScheme"):
+        lf = lf.filter(pl.col("_fundingScheme_lc").str.contains(fs.lower()))
+        df = df.filter(pl.col("_fundingScheme_lc").str.contains(fs.lower()))
     if mn := params.get("minFunding"):
         lf = lf.filter(pl.col("ecMaxContribution") >= int(mn))
         df = df.filter(pl.col("ecMaxContribution") >= int(mn))

frontend/src/components/Dashboard.tsx

@@ -64,7 +64,8 @@ const FILTER_LABELS: Record<keyof FilterState, string> = {
   organization: "Organization",
   country:      "Country",
   legalBasis:   "Legal Basis",
-  topics:       "EuroSciVoc",
+  topic:       "EuroSciVoc",
+  fundingScheme: "Funding Scheme",
 };
 
 type ChartType = "bar" | "pie" | "doughnut" | "line";
@@ -121,7 +122,7 @@ const Dashboard: React.FC<DashboardProps> = ({
     }));
 
   const filterKeys: Array<keyof FilterState> = [
-    'status', 'organization', 'country', 'legalBasis','topics'
+    'status', 'organization', 'country', 'legalBasis','topics','fundingScheme',
   ];
 
   if (loadingStats && !Object.keys(statsData).length) {
@@ -139,7 +140,8 @@ const Dashboard: React.FC<DashboardProps> = ({
               : key === 'organization' ? 'organizations'
               : key === 'country' ? 'countries'
               : key === "legalBasis" ? "legalBases"
-              : 'topics'
+              : key === "topic" ? "topics"
+              : 'fundingSchemes'
             ] || [];
             const isOrg = key === 'organization';
             return (

frontend/src/components/ProjectDetails.tsx

@@ -130,10 +130,8 @@ export default function ProjectDetails({
             <Text fontWeight="bold">Acronym</Text>
             <Text>{project.acronym}</Text>
           </Box>
-          <Box><Text fontWeight="bold">Start Date</Text><Text>{project.startDate && project.startDate !== "NaT" && !isNaN(Date.parse(project.startDate))
-                ? new Date(project.startDate).toISOString().split("T")[0]: "--"}</Text></Box>
-          <Box><Text fontWeight="bold">End Date</Text><Text>{project.endDate && project.endDate !== "NaT" && !isNaN(Date.parse(project.endDate))
-                ? new Date(project.endDate).toISOString().split("T")[0]: "--"}</Text></Box>
+          <Box><Text fontWeight="bold">Start Date</Text><Text>{project.startDate}</Text></Box>
+          <Box><Text fontWeight="bold">End Date</Text><Text>{project.endDate}</Text></Box>
           <Box><Text fontWeight="bold">Funding (EC max)</Text><Text>€{fmtNum(project.ecMaxContribution)}</Text></Box>
           <Box><Text fontWeight="bold">Total Cost</Text><Text>€{fmtNum(project.totalCost)}</Text></Box>
           <Box><Text fontWeight="bold">Funding Scheme</Text><Text>{project.fundingScheme}</Text></Box>

frontend/src/components/ProjectExplorer.tsx

@@ -256,7 +256,7 @@ const ProjectExplorer: React.FC<ProjectExplorerProps> = ({
                     <Td w="50%" overflow="hidden" textOverflow="ellipsis">{p.title}</Td>
                     <Td w="10%">{p.status}</Td>
                     <Td w="10%">{p.id}</Td>
-                    <Td w="10%" whiteSpace="nowrap">{p.startDate && p.startDate !== "NaT" && !isNaN(Date.parse(p.startDate)) ? new Date(p.startDate).toISOString().split("T")[0]: "--"}</Td>
+                    <Td w="10%" whiteSpace="nowrap">{p.startDate}</Td>
                     <Td w="10%">{p.fundingScheme || '-'}</Td>
                     <Td w="10%">€{fmtNum(p.ecMaxContribution)}</Td>
 

frontend/src/hooks/types.ts

@@ -52,7 +52,8 @@ export interface FilterState {
   organization: string;
   country: string;
   legalBasis: string;
-  topics: string;
+  topic: string;
+  fundingScheme: string;
   minYear: string;
   maxYear: string;
   minEndYear: string;

frontend/src/hooks/useAppState.ts

@@ -32,7 +32,8 @@ export const useAppState = () => {
     organization: "",
     country: "",
     legalBasis: "",
-    topics: "",
+    topic: "",
+    fundingScheme: "",
     minYear: "2000",
     maxYear: "2025",
     minEndYear: "2000",