fix: add km and MWK units in middle column AB#20153

rodekruis · Jul 17, 2023 · 4ec220a · 4ec220a
1 parent 3c7c0d3
commit 4ec220a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/interfaces/IBF-dashboard/src/app/components/aggregates/aggregates.component.html b/interfaces/IBF-dashboard/src/app/components/aggregates/aggregates.component.html
@@ -85,6 +85,7 @@
                   ) | percent: '.0-0'
                 }}
               </span>
+              {{ indicator.aggregateUnit }}
             </ion-label>
           </ion-item>
         </ion-col>

diff --git a/services/API-service/migration/1689575782230-aggregateUnit.ts b/services/API-service/migration/1689575782230-aggregateUnit.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class aggregateUnit1689575782230 implements MigrationInterface {
+  name = 'aggregateUnit1689575782230';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "IBF-app"."indicator-metadata" ADD "aggregateUnit" character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "IBF-app"."indicator-metadata" DROP COLUMN "aggregateUnit"`,
+    );
+  }
+}
diff --git a/services/API-service/src/api/metadata/indicator-metadata.entity.ts b/services/API-service/src/api/metadata/indicator-metadata.entity.ts
@@ -80,6 +80,10 @@ export class IndicatorMetadataEntity {
   @Column({ nullable: true })
   public unit: string;
 
+  @ApiProperty({ example: 'km' })
+  @Column({ nullable: true })
+  public aggregateUnit: string;
+
   @ApiProperty()
   @Column({ default: false })
   public lazyLoad: boolean;

diff --git a/services/API-service/src/scripts/json/indicator-metadata.json b/services/API-service/src/scripts/json/indicator-metadata.json
@@ -1267,7 +1267,8 @@
     "order": 2,
     "dynamic": true,
     "lazyLoad": true,
-    "unit": "$"
+    "unit": "MWK",
+    "aggregateUnit": "MWK"
   },
   {
     "countryCodes": "MWI",
@@ -1285,7 +1286,8 @@
     "order": 2,
     "dynamic": true,
     "lazyLoad": true,
-    "unit": "nr. of roads"
+    "unit": "km",
+    "aggregateUnit": "km"
   },
   {
     "countryCodes": "MWI",
@@ -1303,13 +1305,13 @@
     "order": 2,
     "dynamic": true,
     "lazyLoad": true,
-    "unit": "nr. of schools"
+    "unit": "schools"
   },
   {
     "countryCodes": "MWI",
     "disasterTypes": ["flash-floods"],
     "name": "nr_affected_clinics",
-    "label": "Affected clinics",
+    "label": "Affected health sites",
     "icon": "Clinics_affected.svg",
     "weightedAvg": false,
     "active": "no",
@@ -1321,7 +1323,7 @@
     "order": 2,
     "dynamic": true,
     "lazyLoad": true,
-    "unit": "nr. of clinics"
+    "unit": "health sites"
   },
   {
     "countryCodes": "MWI",
@@ -1339,7 +1341,7 @@
     "order": 2,
     "dynamic": true,
     "lazyLoad": true,
-    "unit": "nr. of waterpoints"
+    "unit": "waterpoints"
   },
   {
     "countryCodes": "MWI",
@@ -1357,7 +1359,7 @@
     "order": 2,
     "dynamic": true,
     "lazyLoad": true,
-    "unit": "nr. of buildings"
+    "unit": "buildings"
   },
   {
     "countryCodes": "KEN",