diff --git a/frontend/src/components/Datasets/ResultsDatasets.css b/frontend/src/components/Datasets/ResultsDatasets.css index ed84389..e368bcd 100644 --- a/frontend/src/components/Datasets/ResultsDatasets.css +++ b/frontend/src/components/Datasets/ResultsDatasets.css @@ -33,22 +33,21 @@ } @media (min-width: 860px) { -.datasetCardResults { - /* width: 20vw; */ - height: 207px; - margin: 54px; - /* border: 2px solid #3b9ad5; */ - padding: 3px; - display: flex; - box-shadow: 18 (0, 0, 0, -0.75) 0px 1px 0px, rgba(1, 1, 2, 12); - align-items: center; - align-content: center; - flex-direction: column; - background-color: #495782; - justify-content: center; - border-radius: 8px; -} - + .datasetCardResults { + /* width: 20vw; */ + height: 207px; + margin: 54px; + /* border: 2px solid #3b9ad5; */ + padding: 3px; + display: flex; + box-shadow: 18 (0, 0, 0, -0.75) 0px 1px 0px, rgba(1, 1, 2, 12); + align-items: center; + align-content: center; + flex-direction: column; + background-color: #495782; + justify-content: center; + border-radius: 8px; + } } .tittle h2 { @@ -138,8 +137,8 @@ display: flex; padding-top: 2px; padding-bottom: 2px; - flex-direction: column; padding-left: 5px; + flex-direction: column; align-items: center; overflow-y: scroll; } @@ -185,6 +184,8 @@ background: #c8d4e6; padding: 9px; margin: 0px; + display: flex; + align-items: center; } .tittle2 { @@ -224,10 +225,7 @@ align-content: center; } - - @media (max-width: 860px) { - .datasetCardResults { /* width: 20vw; */ height: 247px; @@ -245,7 +243,6 @@ border-radius: 8px; } - .resultsRecord { display: flex; flex-direction: row; @@ -260,11 +257,11 @@ flex-direction: row; justify-content: center; align-items: center; - width: fit-content; + width: 100%; background: #c8d4e6; height: 60px; margin-top: 2px; -} + } .datasetCard p { font-size: 11px; font-weight: normal; @@ -273,7 +270,6 @@ margin-top: -5px; } - .datasetCard { width: 75vw; margin: 30px; @@ -341,33 +337,31 @@ } @media (max-width: 600px) { - -.datasetCardResults { - width: 49vw; - height: 247px; - margin: 24px !important; - width: 75vw; - /* border: 2px solid #3b9ad5; */ - padding: 3px; - display: flex; - box-shadow: 18 (0, 0, 0, -0.75) 0px 1px 0px, rgba(1, 1, 2, 12); - align-items: center; - align-content: center; - flex-direction: column; - background-color: #495782; - justify-content: center; - border-radius: 8px; -} -.tittle4 { - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - width: -moz-fit-content; - width: 100%; - background: #c8d4e6; - height: 60px; - margin-top: 2px; -} - + .datasetCardResults { + width: 49vw; + height: 247px; + margin: 24px !important; + width: 75vw; + /* border: 2px solid #3b9ad5; */ + padding: 3px; + display: flex; + box-shadow: 18 (0, 0, 0, -0.75) 0px 1px 0px, rgba(1, 1, 2, 12); + align-items: center; + align-content: center; + flex-direction: column; + background-color: #495782; + justify-content: center; + border-radius: 8px; + } + .tittle4 { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: -moz-fit-content; + width: 100%; + background: #c8d4e6; + height: 60px; + margin-top: 2px; + } } diff --git a/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css b/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css index d352ad3..558e3af 100644 --- a/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css +++ b/frontend/src/components/Results/IndividualsResults/TableResultsIndividuals.css @@ -57,7 +57,9 @@ 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; @@ -74,8 +76,6 @@ h6:hover { padding: 3px; } - - h7 { text-transform: uppercase; /* margin-left: 40px; */ @@ -177,6 +177,19 @@ h1 { overflow: scroll; } +.containerBeaconResultsVariants { + overflow-y: scroll; + height: 100vh; +} + + +.containerResultsVariants { + display: flex; + align-content: center; + align-items: center; + justify-content: center; +} + @media (max-width: 860px) { .containerBeaconResults { display: flex; @@ -193,13 +206,24 @@ h1 { overflow: scroll; } + .containerResultsVariants { + display: flex; + align-content: center; + align-items: center; + justify-content: center; + } + + .containerBeaconResultsVariants { + overflow-y: scroll; + height: 100vh; + width: 70vw; + } .tittleResults { - width: 45vw; + width: 46vw; background: white; border-radius: 2px; height: 212px; display: flex; - padding: 2px; flex-direction: column; align-items: center; } @@ -222,7 +246,9 @@ 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; @@ -260,5 +286,5 @@ h1 { padding: 2px; flex-direction: column; align-items: center; + } } -} \ No newline at end of file diff --git a/frontend/src/components/Results/VariantResults/TableResultsVariant.js b/frontend/src/components/Results/VariantResults/TableResultsVariant.js index e4a9c46..7f8f251 100644 --- a/frontend/src/components/Results/VariantResults/TableResultsVariant.js +++ b/frontend/src/components/Results/VariantResults/TableResultsVariant.js @@ -15,7 +15,7 @@ function TableResultsVariant (props) { const [resultsJSON, setResultsJSON] = useState([]) const [stringDataToCopy, setStringDataToCopy] = useState('') - + const [beaconsArrayResults, setBeaconsArrayResults] = useState([]) const [beaconsArrayResultsOrdered, setBeaconsArrayResultsOrdered] = useState( @@ -34,8 +34,6 @@ function TableResultsVariant (props) { const [triggerArray, setTriggerArray] = useState([]) - - const copyData = e => { navigator.clipboard .writeText(stringDataToCopy) @@ -50,7 +48,6 @@ function TableResultsVariant (props) { const handleClickDatasets = e => { console.log(e) - openDatasetArray[e] = true console.log(openDatasetArray) @@ -77,203 +74,15 @@ function TableResultsVariant (props) { } useEffect(() => { - setRows([]) - setIds([]) + props.results.forEach((element, index) => { + resultsJSON.push([ + JSON.stringify(element[1], null, 2).replace('[', '').replace(']', '') + ]) - resultsSelected.forEach((element, index) => { arrayBeaconsIds.push(element[0]) }) - resultsSelectedFinal.forEach((element, index) => { - if (element[1] !== undefined) { - let eth_id = '' - let eth_label = '' - let stringEth = '' - - if (element[1].ethnicity !== '' && element[1].ethnicity !== undefined) { - if (element[1].ethnicity.id !== undefined) { - eth_id = element[1].ethnicity.id - } - - eth_label = element[1].ethnicity.label - stringEth = `${eth_id} / ${eth_label} ` - } else { - stringEth = '' - } - - let sex_id = '' - let sex_label = '' - let stringSex = '' - - if (element[1].sex !== '') { - sex_id = element[1].sex.id - sex_label = element[1].sex.label - stringSex = `${element[1].sex.label} / ${element[1].sex.id}` - } else { - stringSex = '' - } - - let geographic_id = '' - let geographic_label = '' - let stringGeographic = '' - - if ( - element[1].geographicOrigin !== '' && - element[1].geographicOrigin !== undefined - ) { - geographic_id = element[1].geographicOrigin.id - geographic_label = element[1].geographicOrigin.label - stringGeographic = `${geographic_id} / ${geographic_label}` - } else { - stringGeographic = '' - } - - let measuresJson = [] - if (element[1].measures !== '' && element[1].measures !== undefined) { - if (typeof element[1].measures === 'object') { - element[1].measures.forEach(element2 => { - measuresJson.push( - JSON.stringify(element2, null, 2) - .replaceAll('[', '') - .replaceAll(']', '') - .replaceAll('{', '') - .replaceAll('}', '') - .replaceAll(',', '') - .replaceAll(' ,', '') - .replaceAll(', ', '') - .replaceAll('"', '') - ) - }) - measuresJson = measuresJson.toString() - measuresJson = measuresJson - .replaceAll(', ', ',') - .replaceAll(' ,', ',') - measuresJson = measuresJson.replaceAll(',', '') - } else { - measuresJson = JSON.stringify(element[1].measures, null, 2) - .replaceAll('[', '') - .replaceAll(']', '') - .replaceAll('{', '') - .replaceAll('}', '') - .replaceAll(',', '') - .replaceAll(' ,', '') - .replaceAll(', ', '') - .replaceAll('"', '') - - measuresJson = measuresJson.toString() - measuresJson = measuresJson - .replaceAll(', ', ',') - .replaceAll(' ,', ',') - measuresJson = measuresJson.replaceAll(',', '') - } - } - - let interventionsProcedures = [] - - if ( - element[1].interventionsOrProcedures !== '' && - element[1].interventionsOrProcedures !== undefined - ) { - if (typeof element[1].interventionsOrProcedures === 'object') { - element[1].interventionsOrProcedures.forEach(element2 => { - interventionsProcedures.push( - JSON.stringify(element2, null, 2) - .replaceAll('[', '') - .replaceAll(']', '') - .replaceAll('{', '') - .replaceAll('}', '') - .replaceAll(',', '') - .replaceAll(' ,', '') - .replaceAll(', ', '') - .replaceAll('"', '') - ) - }) - interventionsProcedures = interventionsProcedures.toString() - interventionsProcedures = interventionsProcedures - .replaceAll(', ', ',') - .replaceAll(' ,', ',') - interventionsProcedures = interventionsProcedures.replaceAll( - ',', - '' - ) - } else { - interventionsProcedures = JSON.stringify( - element[1].interventionsOrProcedures, - null, - 2 - ) - .replaceAll('[', '') - .replaceAll(']', '') - .replaceAll('{', '') - .replaceAll('}', '') - .replaceAll(',', '') - .replaceAll(' ,', '') - .replaceAll(', ', '') - .replaceAll('"', '') - interventionsProcedures = interventionsProcedures.toString() - interventionsProcedures = interventionsProcedures - .replaceAll(', ', ',') - .replaceAll(' ,', ',') - interventionsProcedures = interventionsProcedures.replaceAll( - ',', - '' - ) - } - } - - let diseases = [] - - if (element[1].diseases !== '' && element[1].diseases !== undefined) { - if (typeof element[1].diseases === 'object') { - element[1].diseases.forEach(element2 => { - diseases.push( - JSON.stringify(element2, null, 2) - .replaceAll('[', '') - .replaceAll(']', '') - .replaceAll('{', '') - .replaceAll('}', '') - .replaceAll(',', '') - .replaceAll(' ,', '') - .replaceAll(', ', '') - .replaceAll('"', '') - ) - }) - diseases = diseases.toString() - diseases = diseases.replaceAll(', ', ',').replaceAll(' ,', ',') - diseases = diseases.replaceAll(',', '') - } else { - diseases = JSON.stringify(element[1].diseases, null, 2) - .replaceAll('[', '') - .replaceAll(']', '') - .replaceAll('{', '') - .replaceAll('}', '') - .replaceAll(',', '') - .replaceAll(' ,', '') - .replaceAll(', ', '') - .replaceAll('"', '') - diseases = diseases.toString() - diseases = diseases.replaceAll(', ', ',').replaceAll(' ,', ',') - diseases = diseases.replaceAll(',', '') - } - } - - rows.push({ - id: index, - IndividualId: element[1].id, - Beacon: element[0], - ethnicity: stringEth, - geographicOrigin: stringGeographic, - interventionsOrProcedures: interventionsProcedures, - measures: measuresJson, - sex: stringSex, - diseases: diseases - }) - - if (index === resultsSelectedFinal.length - 1) { - setEditable(rows.map(o => ({ ...o }))) - setTrigger2(true) - } - } - }) + setTrigger2(true) + setStringDataToCopy(resultsJSON) }, [trigger, resultsSelectedFinal]) useEffect(() => { @@ -304,82 +113,19 @@ function TableResultsVariant (props) { }, []) return ( -
++ ) + })}{element}
+
-- ) - })}{element}
-