diff --git a/src/App.js b/src/App.js index 8322b62..12166f7 100644 --- a/src/App.js +++ b/src/App.js @@ -52,6 +52,7 @@ class App extends Component { let colors = (this.state.radioDataset === 'LPR') ? this.props.lprColors : this.props.niColors; let thresholds = (this.state.radioDataset === 'LPR') ? this.props.lprThresholds : this.props.niThresholds; return ( +
{/*Header Section*/} @@ -441,7 +442,7 @@ App.defaultProps = { titleNotes = { lprMsg: "Lawful permanent residents (LPRs, often referred to as “immigrants” or “green card holders”) are non-citizens who are lawfully authorized to live permanently in the US. LPRs may apply to become US citizens if they meet certain eligibility requirements. LPRs do not include foreign nationals granted temporary admission to the US, such as tourists and temporary workers (including H1B visa holders). 5-year average: ≈1.03 million/year.

For more information, visit https://goo.gl/dN78yY.", niMsg: "Nonimmigrants (NIs) are foreign nationals granted temporary admission into the US for reasons including tourism and business trips, academic/vocational study, temporary employment, and to act as a representative of a foreign government or international organization. NIs are authorized to enter the country for specific purposes and defined periods of time, which are prescribed by their class of admission. 5-year average: ≈63.72 million/year.

For more information visit https://goo.gl/LJLYzc.", - genMsg: "Data not shown for those with unknown country of birth/origin and for countries where total activity count was less than 10 people.
DW = Data withheld to limit disclosures, per government sources." + genMsg: "Data not shown for those with unknown country of birth/origin and for countries where total activity count was less than 10 people.
dw = Data withheld to limit disclosures, per government sources." } export default App; diff --git a/src/Card.js b/src/Card.js index 7c183a2..ed4bff9 100644 --- a/src/Card.js +++ b/src/Card.js @@ -24,7 +24,7 @@ class Card extends Component { return(
{!countryData.immigrationData ? -
No data available.
+
No data provided.
:
@@ -33,7 +33,12 @@ class Card extends Component {

{countryData.immigrationData.countryName}

-

{selectedYear} Selected Total: {countryData.immigrationData.selectedTotal.toLocaleString()}

+

{selectedYear} Selected {selectedSet} Total: + {selectedSet === "LPR" ? + selectedKeys.length === 6 ? countryData.immigrationData.total.toLocaleString() + : countryData.immigrationData.selectedTotal.toLocaleString() + : selectedKeys.length === 5 ? countryData.immigrationData.total.toLocaleString() + : countryData.immigrationData.selectedTotal.toLocaleString()}

Immediate Relative: {countryData.immigrationData.immediateRelative.toLocaleString() ? countryData.immigrationData.immediateRelative.toLocaleString(): 'DW'}

+ >Immediate Relative: {isNaN(countryData.immigrationData.immediateRelative) ? 'dw' : countryData.immigrationData.immediateRelative.toLocaleString()}

Family-Sponsored: {countryData.immigrationData.familySponsored.toLocaleString() ? countryData.immigrationData.familySponsored.toLocaleString(): 'DW'}

+ >Family-Sponsored: {isNaN(countryData.immigrationData.familySponsored) ? 'dw' : countryData.immigrationData.familySponsored.toLocaleString()}

Refugee & Asylee: {countryData.immigrationData.refugeeAsylee.toLocaleString() ? countryData.immigrationData.refugeeAsylee.toLocaleString(): 'DW'}

+ >Refugee & Asylee: {isNaN(countryData.immigrationData.refugeeAsylee) ? 'dw' : countryData.immigrationData.refugeeAsylee.toLocaleString()}

Employment-Based: {countryData.immigrationData.employmentBased.toLocaleString() ? countryData.immigrationData.employmentBased.toLocaleString(): 'DW'}

+ >Employment-Based: {isNaN(countryData.immigrationData.employmentBased) ? 'dw' : countryData.immigrationData.employmentBased.toLocaleString()}

Diversity Lottery: {countryData.immigrationData.diversityLottery.toLocaleString() ? countryData.immigrationData.diversityLottery.toLocaleString(): 'DW'}

+ >Diversity Lottery: {isNaN(countryData.immigrationData.diversityLottery) ? 'dw' : countryData.immigrationData.diversityLottery.toLocaleString()}

Other: {countryData.immigrationData.otherLPR.toLocaleString() ? countryData.immigrationData.otherLPR.toLocaleString(): 'DW'}

+ >Other: {isNaN(countryData.immigrationData.otherLPR) ? 'dw' : countryData.immigrationData.otherLPR.toLocaleString()}

:
}

Temporary Visitor: {countryData.immigrationData.temporaryVisitor.toLocaleString() ? countryData.immigrationData.temporaryVisitor.toLocaleString(): 'DW'}

+ >Temporary Visitor: {isNaN(countryData.immigrationData.temporaryVisitor) ? 'dw' : countryData.immigrationData.temporaryVisitor.toLocaleString()}

Temporary Worker: {countryData.immigrationData.temporaryWorker.toLocaleString() ? countryData.immigrationData.temporaryWorker.toLocaleString(): 'DW'}

+ >Temporary Worker: {isNaN(countryData.immigrationData.temporaryWorker) ? 'dw' : countryData.immigrationData.temporaryWorker.toLocaleString()}

Student & Exchange: {countryData.immigrationData.studentExchange.toLocaleString() ? countryData.immigrationData.studentExchange.toLocaleString(): 'DW'}

+ >Student & Exchange: {isNaN(countryData.immigrationData.studentExchange) ? 'dw' : countryData.immigrationData.studentExchange.toLocaleString()}

Diplomat & Representative: {countryData.immigrationData.diplomatRep.toLocaleString() ? countryData.immigrationData.diplomatRep.toLocaleString(): 'DW'}

+ >Diplomat & Representative: {isNaN(countryData.immigrationData.diplomatRep) ? 'dw' : countryData.immigrationData.diplomatRep.toLocaleString()}

Other: {countryData.immigrationData.otherNI.toLocaleString() ? countryData.immigrationData.otherNI.toLocaleString(): 'DW'}

+ >Other: {isNaN(countryData.immigrationData.otherNI) ? 'dw' : countryData.immigrationData.otherNI.toLocaleString()}

:
}