diff --git a/frontend/src/components/Datasets/ResultsDatasets.css b/frontend/src/components/Datasets/ResultsDatasets.css index f026225..51c1a6b 100644 --- a/frontend/src/components/Datasets/ResultsDatasets.css +++ b/frontend/src/components/Datasets/ResultsDatasets.css @@ -133,16 +133,33 @@ border-radius: 2px; height: 167px; display: flex; - padding: 2px; + padding-top: 2px; + padding-bottom: 2px; flex-direction: column; + padding-left: 5px; + align-items: center; + overflow-y: scroll; } -.buttonResults { - margin-top: 29px; - /* width: 100%; */ - /* display: flex; */ - /* align-items: center; */ - /* justify-content: center; */ +.seeResultsContainer{ + height: 100%; + display: flex; + align-items: center; +} +.resultSetsContainer { + display: flex; + align-items: center; + justify-content: center; + height: 50%; + width: 100%; +} + +.resultSetsContainer h6 { + background: #86e4a8; + border-radius: 2px; + width: fit-content; + margin-left: 5px; + padding: 3px; } .tittle h2 { @@ -172,7 +189,19 @@ flex-direction: row; justify-content: center; align-items: center; + width: 100%; + background: #c8d4e6; +} + +.tittle4{ + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: 100%; background: #c8d4e6; + height: 60px; + margin-top: 2px; } .resultsRecord h3 { @@ -204,8 +233,8 @@ .datasetCardResults { /* width: 20vw; */ - height: 207px; - margin: 54px; + height: 247px; + margin: 30px; /* border: 2px solid #3b9ad5; */ padding: 3px; display: flex; diff --git a/frontend/src/components/Results/BiosamplesResults/TableResultsBiosamples.js b/frontend/src/components/Results/BiosamplesResults/TableResultsBiosamples.js index 5aa16c5..34327ae 100644 --- a/frontend/src/components/Results/BiosamplesResults/TableResultsBiosamples.js +++ b/frontend/src/components/Results/BiosamplesResults/TableResultsBiosamples.js @@ -931,14 +931,16 @@ function TableResultsBiosamples (props) { {props.show === 'count' && (
{result[1]} results
)} - + {props.show === 'full' && ( + + )} ) diff --git a/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css b/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css index caa3b52..1472aaf 100644 --- a/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css +++ b/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css @@ -13,14 +13,12 @@ } .resultSetsButton { - width: 100%; display: flex; align-items: center; justify-content: center; } .resultSetsButton h7 { font-size: 12px; - margin-top: 6px; } .resultSetsButton h6 { @@ -29,11 +27,11 @@ .tittleResults h7 { font-size: 12px; - margin-top: 6px; - width: 100%; + padding: 4px; display: flex; align-items: center; justify-content: center; + margin-right: 9px; } h6 { @@ -59,20 +57,21 @@ h6:hover { } .tittleResults h5 { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; text-transform: uppercase; font-size: 11px; font-weight: normal; color: rgb(209, 45, 20); font-weight: bold; - width: 100%; + background: #ffd1d1; + width: fit-content; display: flex; align-items: center; justify-content: center; margin-top: 34px; - font-size: 14px; + font-size: 12px; + border-radius: 2px; + padding: 3px; } h7 { @@ -197,10 +196,11 @@ h1 { width: 50vw; background: white; border-radius: 2px; - /* height: 80px; */ + height: 212px; display: flex; padding: 2px; flex-direction: column; + align-items: center; } h6 { @@ -221,20 +221,21 @@ h1 { } .tittleResults h5 { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', - 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', - 'Helvetica Neue', sans-serif; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; text-transform: uppercase; font-size: 11px; font-weight: normal; color: rgb(209, 45, 20); font-weight: bold; - width: 100%; + background: #ffd1d1; + width: fit-content; display: flex; align-items: center; justify-content: center; margin-top: 34px; font-size: 12px; + border-radius: 2px; + padding: 3px; } h7 { text-transform: uppercase; diff --git a/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.js b/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.js index 1ac900d..ec3576d 100644 --- a/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.js +++ b/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.js @@ -44,6 +44,8 @@ function TableResultsIndividuals (props) { const [trigger, setTrigger] = useState(false) const [trigger2, setTrigger2] = useState(false) + const [triggerArray, setTriggerArray] = useState([]) + const getSelectedRowsToExport = ({ apiRef }) => { const selectedRowIds = selectedGridRowsSelector(apiRef) if (selectedRowIds.size > 0) { @@ -54,9 +56,26 @@ function TableResultsIndividuals (props) { } const handleClickDatasets = e => { - openDatasetArray.push(true) + console.log(e) + triggerArray.forEach((element, index) => { + if (index !== e) { + console.log('holi') + console.log(index) + triggerArray[index] = false + } + }) + console.log(triggerArray) + openDatasetArray.forEach((element, index) => { + if (index !== e) { + console.log('holi') + console.log(index) + triggerArray[index] = false + } + }) - const newArray = openDatasetArray.filter(a => a === e) + openDatasetArray[e] = true + triggerArray[e] = true + setTrigger(!trigger) } const columns = [ @@ -355,7 +374,6 @@ function TableResultsIndividuals (props) { }, [trigger, resultsSelectedFinal]) useEffect(() => { - console.log(props) let count = 0 @@ -393,7 +411,7 @@ function TableResultsIndividuals (props) { {props.show !== 'full' && (
-
+
{element[0] === result[0].meta.beaconId && ( -
+
- {openDatasetArray === true && + {openDatasetArray[index] === true && + triggerArray[index] === true && element[2] === true && props.show === 'boolean' &&
FOUND
} - {openDatasetArray === true && + {openDatasetArray[index] === true && + triggerArray[index] === true && element[2] === false && props.show === 'boolean' &&
NOT FOUND
} - {props.show === 'count' &&
{element[3]}
} + {props.show === 'count' && + triggerArray[index] === true && ( +
{element[3]}
+ )}
)} @@ -429,26 +452,31 @@ function TableResultsIndividuals (props) { {props.resultsNotPerDataset.map(element => { return ( <> - {result[2] === true && props.show === 'boolean' && element[0] === result[0].meta.beaconId && ( - <> - No datasets available -
FOUND
- - )} - {result[2] === false && props.show === 'boolean' && element[0] === result[0].meta.beaconId && ( - <> - No datasets available -
NOT FOUND
- - )} - {props.show === 'count' && element[0] === result[0].meta.beaconId && ( - <> - No datasets available -
- {result[1]} results -
- - )} + {result[2] === true && + props.show === 'boolean' && + element[0] === result[0].meta.beaconId && ( +
+ No datasets available +
FOUND
+
+ )} + {result[2] === false && + props.show === 'boolean' && + element[0] === result[0].meta.beaconId && ( +
+ No datasets available +
NOT FOUND
+
+ )} + {props.show === 'count' && + element[0] === result[0].meta.beaconId && ( +
+ No datasets available +
+ {result[1]} results +
+
+ )} ) })} @@ -469,14 +497,15 @@ function TableResultsIndividuals (props) { {props.show === 'full' && result[2] === true && (
-
+
{result[0].meta.beaconId} +

{result[0].response.organization.name}

-

{result[0].response.organization.name}

+
+
)} diff --git a/frontend/src/components/SignIn/SignInForm.css b/frontend/src/components/SignIn/SignInForm.css index 6509fa5..76c0b99 100644 --- a/frontend/src/components/SignIn/SignInForm.css +++ b/frontend/src/components/SignIn/SignInForm.css @@ -456,7 +456,7 @@ body { h6 { margin-left: 5px; - font-size: 13px !important; + font-size: 12px !important; width: 82vw !important; } .screen__background__shape5 { diff --git a/frontend/src/components/SignInOptions/SignInOptions.css b/frontend/src/components/SignInOptions/SignInOptions.css index 27d58be..d92d455 100644 --- a/frontend/src/components/SignInOptions/SignInOptions.css +++ b/frontend/src/components/SignInOptions/SignInOptions.css @@ -43,7 +43,7 @@ } h6 { - font-size: 15px !important; + font-size: 12px !important; font-weight: 600; color: #3d72a6; } @@ -69,7 +69,7 @@ } h6 { - font-size: 13px !important; + font-size: 12px !important; width: 51vw; } } \ No newline at end of file