Make sure the number of served benificiaries are shown

rodekruis · Sep 2, 2024 · cd0e3d4 · cd0e3d4
1 parent 38a796b
commit cd0e3d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/PWA/public/Services/BenificiaryInfoService.js b/PWA/public/Services/BenificiaryInfoService.js
@@ -4,10 +4,9 @@ export class BenificiaryInfoService {
     }
     async benificiaryInfoTextFromDistribution(distribution) {
         const benificiaries = await this.database.benificiariesForDistribution(distribution);
-        const numberOfServedBenificiaries = 42; //TODO: implement proper calculation
+        const numberOfServedBenificiaries = benificiaries.filter(benificiary => benificiary.hasBeenMarkedAsReceived).length;
         if (benificiaries.length > 0) {
-            //Beneficiaries served: {{ number_recipients }} / {{ number_beneficiaries }}
-            return "Beneficiaries served: " + numberOfServedBenificiaries;
+            return "Beneficiaries served: " + numberOfServedBenificiaries + " / " + benificiaries.length;
         }
         else {
             return "No beneficiary data found";

diff --git a/PWA/src/Services/BenificiaryInfoService.ts b/PWA/src/Services/BenificiaryInfoService.ts
@@ -12,10 +12,9 @@ export class BenificiaryInfoService {
 
     async benificiaryInfoTextFromDistribution(distribution: Distribution): Promise<string> {
       const benificiaries: DistributionBeneficiary[] = await this.database.benificiariesForDistribution(distribution)
-      const numberOfServedBenificiaries = 42 //TODO: implement proper calculation
+      const numberOfServedBenificiaries = benificiaries.filter(benificiary => benificiary.hasBeenMarkedAsReceived).length
       if(benificiaries.length > 0) {
-        //Beneficiaries served: {{ number_recipients }} / {{ number_beneficiaries }}
-         return "Beneficiaries served: " + numberOfServedBenificiaries  
+         return "Beneficiaries served: " + numberOfServedBenificiaries +" / " + benificiaries.length 
       } else {
         return "No beneficiary data found"
       }