supporting agencies list order/styling

graphographer · Apr 4, 2024 · ccc350e · ccc350e
1 parent ecc388e
commit ccc350e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/components/tabs/BeMapAgencyPresence.ts b/src/components/tabs/BeMapAgencyPresence.ts
@@ -17,6 +17,10 @@ export class BeMapAgencyPresence extends StateProvider {
 				margin-top: 0;
 			}
 
+			ul {
+				margin-top: 0;
+			}
+
 			thead th {
 				text-align: center;
 			}
@@ -35,7 +39,7 @@ export class BeMapAgencyPresence extends StateProvider {
 		['DOS', 'U.S. Department of State'],
 		['MCC', 'Millenium Challenge Corporation'],
 		['PC', 'The Peace Corps'],
-		['USAID', 'USAID'],
+		['USAID', 'U.S. Agency for International Development'],
 		['USDA', 'U.S. Department of Agriculture']
 	];
 
@@ -45,12 +49,11 @@ export class BeMapAgencyPresence extends StateProvider {
 		'Secondary',
 		'Workforce Development',
 		'Education Systems Strengthening',
-		'Education Level Not Specified'
+		'Education Levels Not Specified'
 	];
 
 	render() {
 		if (this.state.agencyEducationSupportForSelectedCountry) {
-			console.log('WHY HERE?', this.state.selectedCountry);
 			return html`
 				<table>
 					<caption>
@@ -91,10 +94,14 @@ export class BeMapAgencyPresence extends StateProvider {
 					</tbody>
 				</table>
 
-				<p>
-					<b>Supporting Agencies:</b>
-					${this.state.agenciesInSelectedCountry!.join(', ')}
-				</p>
+				<b>Supporting Agencies:</b>
+				<ul>
+					${BeMapAgencyPresence.agencies
+						.filter(([, long]) =>
+							this.state.agenciesInSelectedCountry.includes(long)
+						)
+						.map(([short, long]) => html`<li>${short} (${long})</li>`)}
+				</ul>
 			`;
 		} else {
 			return html`<h4>

diff --git a/src/types/EEducationLevel.ts b/src/types/EEducationLevel.ts
@@ -4,13 +4,13 @@ export type TEducationLevel =
 	| 'Secondary'
 	| 'Workforce Development'
 	| 'Education Systems Strengthening'
-	| 'Education Level Not Specified';
+	| 'Education Levels Not Specified';
 
 export const EDUCATION_LEVELS: TEducationLevel[] = [
 	'Pre-Primary',
 	'Primary',
 	'Secondary',
 	'Workforce Development',
 	'Education Systems Strengthening',
-	'Education Level Not Specified'
+	'Education Levels Not Specified'
 ];
diff --git a/src/types/TAgencyPresence.ts b/src/types/TAgencyPresence.ts
@@ -12,5 +12,5 @@ export type TAgencyPresence = {
 	Secondary: number;
 	'Workforce Development': number;
 	'Education Systems Strengthening': number;
-	'Education Level Not Specified': boolean;
+	'Education Levels Not Specified': boolean;
 };