From 4ccca5dab8c54735eba713ced002d6519666fcc2 Mon Sep 17 00:00:00 2001 From: Liliana Sanfilippo <liliana.sanfilippo@uni-bielefeld.de> Date: Fri, 27 Sep 2024 19:50:21 +0200 Subject: [PATCH] graph & timeline --- src/components/Graph.tsx | 7 +++++-- src/components/Tabs.tsx | 16 +++++++++++++--- src/data/hptimelinedata.tsx | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/components/Graph.tsx b/src/components/Graph.tsx index c9ff49df..8b7345a7 100644 --- a/src/components/Graph.tsx +++ b/src/components/Graph.tsx @@ -10,7 +10,8 @@ const backgroundcolorscale = [ 'rgba(244, 204, 30, 0.2)', 'rgba(130, 149, 164, 0.2)', 'rgba(0, 101, 48, 0.2)', - 'rbga(184, 91, 209, 0.2)' + 'rbga(184, 91, 209, 0.2)', + 'rbga(50, 35, 44, 0.2' ] @@ -22,7 +23,8 @@ const bordercolorscale = [ 'rgba(244, 204, 30, 1)', 'rgba(130, 149, 164, 1)', 'rgba(0, 101, 48, 1)', - 'rbga(184, 91, 209, 1)' + 'rbga(184, 91, 209, 1)', + 'rbga(50, 35, 44, 1' ] ChartJS.register(ArcElement, Tooltip, Legend, CategoryScale, @@ -208,6 +210,7 @@ export const HowOftenTreatmentatients: React.FC = () => { labels, datasets: [ { + label: "", data: [ 6.49, 6.49, diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx index 4c52c8d1..af547f61 100644 --- a/src/components/Tabs.tsx +++ b/src/components/Tabs.tsx @@ -40,6 +40,12 @@ import Collapsible from "./Collapsible"; problem = true; problem_desc.push("interview language"); } + + /* Expert on */ + let expert = ""; + if (data[i].experton) { + expert = `Expert on ${data[i].experton}`; + } /* Aim/Goal */ var goalheading: string = ""; @@ -152,14 +158,15 @@ import Collapsible from "./Collapsible"; <div className="row"> <div className="col-6"> <div className={"t-tag " + data[i].tag}> - {data[i].job} + {data[i].job} {data[i].affiliation} </div> </div> - <div className="col-3">{lang}</div> + <div className="col" style={{padding: "5px"}}>{expert}</div> + <div className="col" style={{width: "20%", flex: "1 0 0%", padding: "5px"}}>{lang}</div> </div> <div className="row"> <div className="col"> - <BlockQuoteB text={data[i].quote} cite={quoted}></BlockQuoteB> + </div> <div className="col-3"> <img className="middle sechpro" src={data[i].pictureurl}/> @@ -189,6 +196,9 @@ import Collapsible from "./Collapsible"; {imp_img} </div> + <div className="col"> + <BlockQuoteB text={data[i].quote} cite={quoted}></BlockQuoteB> + </div> {int} {refs} </> diff --git a/src/data/hptimelinedata.tsx b/src/data/hptimelinedata.tsx index 7f3e0b57..4156bc69 100644 --- a/src/data/hptimelinedata.tsx +++ b/src/data/hptimelinedata.tsx @@ -29,6 +29,7 @@ export interface TimelineDatenpunkt { references?: Array<React.ReactNode>; /* Muss HTML Code sein - Liliana erstellt den aus Bib dateien */ interview?: React.ReactNode; text?: string | Array<string> | Array<React.ReactNode>; /* Extra Text */ + experton?: string; } type StakeholderTag = 'Industry' | 'Academia' | 'Patient' | 'Medical Professional' | 'Milestone' | 'Other'; -- GitLab