fixup! Show number of agreements in top level summary

mysociety · Mar 25, 2024 · b314bf4 · b314bf4
1 parent 9e86d80
commit b314bf4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/classes/Divisions.php b/classes/Divisions.php
@@ -258,7 +258,8 @@ public function getMemberDivisionDetails($strong_only = false) {
             $args
         );
 
-        $allowed_policies = (new \MySociety\TheyWorkForYou\Policies())->getPolicyIDs();
+        $policies_list = new \MySociety\TheyWorkForYou\Policies();
+        $allowed_policies = $policies_list->getPolicyIDs();
 
         foreach ($q as $row) {
           $policy_id = $row['policy_id'];
@@ -306,8 +307,8 @@ public function getMemberDivisionDetails($strong_only = false) {
         }
 
         // for each key in $policy_divisions, we want to add agreement information
-        foreach ($policy_divisions as $policy_id => $summary) {
-            $agreement_details = $this->member->member_agreements($policy_id);
+        foreach ($policy_divisions as $policy_id => &$summary) {
+            $agreement_details = $this->member->member_agreements($policy_id, HOUSE_TYPE_COMMONS, $policies_list );
             $summary["agreements_for"] = 0;
             $summary["agreements_against"] = 0;
             foreach ($agreement_details as $agreement){
@@ -320,7 +321,6 @@ public function getMemberDivisionDetails($strong_only = false) {
                     $summary["agreements_against"] += 1;
                 }
             }
-            $policy_divisions[$policy_id] = $summary;
         }
         return $policy_divisions;
     }

diff --git a/www/includes/easyparliament/member.php b/www/includes/easyparliament/member.php
@@ -2,6 +2,9 @@
 
 include_once INCLUDESPATH."easyparliament/glossary.php";
 
+use MySociety\TheyWorkForYou\Policies as Policies;
+
+
 class MEMBER {
 
     public $valid = false;
@@ -242,13 +245,16 @@ public function date_in_memberships($house, $date){
         return false;
     }
 
-    public function member_agreements($policyID, $house = HOUSE_TYPE_COMMONS){
-        // agreements that a member has been present for on a specific policy
-        $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
+    public function member_agreements(int $policyID, int $house = HOUSE_TYPE_COMMONS, Policies $policiesList = null) {
+        // agreements that a member has been present for on a specific policy.
+        // Pass in a Policies object to avoid reloading the list of policies.
+        // Ideally one that has been initalised without a specific policy id.
+        if (!$policiesList) {
+            $policiesList = new Policies($policyID);
+        }
         $rel_agreements = $policiesList->all_policy_agreements[$policyID] ?? [];
-        $MEMBER = $this;
-        $rel_agreements = array_filter($rel_agreements, function($agreement) use ($MEMBER, $house) {
-            return $MEMBER->date_in_memberships($house, $agreement['date']);
+        $rel_agreements = array_filter($rel_agreements, function($agreement) use ($house) {
+            return $this->date_in_memberships($house, $agreement['date']);
         });
         return $rel_agreements;
     }