Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename On Raas Blockade to On Raas Blockade #278

Merged
merged 4 commits into from
Nov 15, 2024
Merged

rename On Raas Blockade to On Raas Blockade #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5adb4d9
change ethnicity to race
Dert1129 Nov 15, 2024
209089a
rename A1c % to A1c
Dert1129 Nov 15, 2024
0a94fa9
fix dataHelper for report page
Dert1129 Nov 15, 2024
2ea5382
rename On Raas Blockade to On Raas Blockade
Dert1129 Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const searchConfig = {
"configtype",
"level",
"releaseversion",
"ethnicity",
"race",
"proteinuria",
"hypertensionhistory",
"hypertensionduration",
Expand All @@ -93,7 +93,7 @@ const searchConfig = {
configtype: { type: "value", size: 100},
level: { type: "value", size: 100},
releaseversion: {type: "value", size: 250},
ethnicity: {type: "value", size: 250},
race: {type: "value", size: 250},
proteinuria: {type: "value", size: 250},
hypertensionhistory: {type: "value", size: 250},
hypertensionduration: {type: "value", size: 250},
Expand Down
6 changes: 3 additions & 3 deletions src/components/SpatialViewer/Facets/AllFacets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ class AllFacets extends Component {
</AccordionItem>
<AccordionItem>
<AccordionHeader targetId="5">
Ethnicity
Race
</AccordionHeader>
<AccordionBody accordionId="5">
<Row className='mb-2'>
<Col>
<Facet field='ethnicity' label='' filterType='any' view={MultiCheckboxFacet}/>
<Facet field='race' label='' filterType='any' view={MultiCheckboxFacet}/>
</Col>
</Row>
</AccordionBody></AccordionItem>
<AccordionItem>
<AccordionHeader targetId="6">
A1c %
A1c
</AccordionHeader>
<AccordionBody accordionId="6">
<Row className='mb-2'>
Expand Down
12 changes: 6 additions & 6 deletions src/helpers/dataHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ export const mapSummaryKeysToPresentationStyle = (data) => {

export const mapClinicalKeysToPresentationStyle = (data) => {
const result = {};
result['A1C (%)']= "";
result['A1c %']= "";
result['Albuminuria (mg)'] = "";
result['Baseline eGFR (ml/min/1.73m2)'] = "";
result['Diabetes Duration (Years)'] = "";
result['Diabetes History'] = "";
result['Hypertension Duration (years)'] = "";
result['Hypertension History'] = "";
result['KDIGO Stage'] = "";
result['On RAAS Blockade'] = "";
result['RAAS Blockade'] = "";
result['Proteinuria (mg)'] = "";
result['Ethnicity'] = "";
result['Race'] = "";
result['Age (Years)'] = "";
result['Sample Type'] = "";
result['Sex'] = "";
Expand All @@ -81,7 +81,7 @@ export const mapClinicalKeysToPresentationStyle = (data) => {
return result;
}
if (data.a1c) {
result['A1C (%)'] = data.a1c ? data.a1c : "";
result['A1c %'] = data.a1c ? data.a1c : "";
}
if (data.albuminuria) {
result['Albuminuria (mg)'] = data.albuminuria ? data.albuminuria : "";
Expand All @@ -105,13 +105,13 @@ export const mapClinicalKeysToPresentationStyle = (data) => {
result['KDIGO Stage'] = data.kdigoStage ? data.kdigoStage : "";
}
if (data.onRaasBlockade) {
result['On RAAS Blockade'] = data.onRaasBlockade ? data.onRaasBlockade : "";
result['RAAS Blockade'] = data.onRaasBlockade ? data.onRaasBlockade : "";
}
if (data.proteinuria) {
result['Proteinuria (mg)'] = data.proteinuria ? data.proteinuria : "";
}
if (data.race) {
result['Ethnicity'] = data.race ? data.race : "";
result['race'] = data.race ? data.race : "";
}
if (data.ageBinned) {
result['Age (Years)'] = data.ageBinned ? data.ageBinned.replace(' Years', '') : "";
Expand Down
18 changes: 9 additions & 9 deletions src/helpers/dataHelper.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ describe('dataHelper', () => {
"kdigoStage": "testdkigo_stage",
"onRaasBlockade": "test-on_raas_blockade",
"proteinuria": "proteinuria",
"race": "test-Ethnicity",
"race": "test-race",
"age": "test-Age",
"sex": "test-sex",
"protocol": "test-protocol",
Expand All @@ -106,9 +106,9 @@ describe('dataHelper', () => {
'Hypertension Duration (years)': 'test-hypertension_duration',
'Hypertension History': 'test-hypertension_history',
'KDIGO Stage': 'testdkigo_stage',
'On RAAS Blockade': 'test-on_raas_blockade',
'RAAS Blockade': 'test-on_raas_blockade',
'Proteinuria (mg)': 'proteinuria',
'Ethnicity': 'test-Ethnicity',
'Race': 'test-race',
'Age (Years)': 'test-Age',
'Sample Type': 'test-sample_type',
'Sex': 'test-sex',
Expand All @@ -133,9 +133,9 @@ describe('dataHelper', () => {
'Hypertension Duration (years)': '',
'Hypertension History': '',
'KDIGO Stage': '',
'On RAAS Blockade': '',
'RAAS Blockade': '',
'Proteinuria (mg)': '',
'Ethnicity': '',
'Race': '',
'Age (Years)': '',
'Sample Type': '',
'Sex': '',
Expand All @@ -157,9 +157,9 @@ describe('dataHelper', () => {
'Hypertension Duration (years)': '',
'Hypertension History': '',
'KDIGO Stage': '',
'On RAAS Blockade': '',
'RAAS Blockade': '',
'Proteinuria (mg)': '',
'Ethnicity': '',
'Race': '',
'Age (Years)': '',
'Sample Type': '',
'Sex': '',
Expand All @@ -181,9 +181,9 @@ describe('dataHelper', () => {
'Hypertension Duration (years)': '',
'Hypertension History': '',
'KDIGO Stage': '',
'On RAAS Blockade': '',
'RAAS Blockade': '',
'Proteinuria (mg)': '',
'Ethnicity': '',
'Race': '',
'Age (Years)': '',
'Sample Type': '',
'Sex': '',
Expand Down
Loading