From 9dd803a2181fda4181b426d8c759f2454c9f13ee Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 14 Dec 2023 17:41:49 +0000
Subject: [PATCH] Change display of strong/weak votes.

Fixes #1744.
---
 classes/Divisions.php                         |  6 +--
 tests/DivisionsTest.php                       | 21 ++++----
 www/docs/js/main.js                           |  6 ---
 www/docs/style/sass/pages/_mp.scss            | 28 ----------
 .../html/mp/_division_description.php         |  2 +-
 .../templates/html/mp/divisions.php           | 52 +++++++++++++------
 .../templates/html/mp/recent.php              |  1 -
 7 files changed, 47 insertions(+), 69 deletions(-)

diff --git a/classes/Divisions.php b/classes/Divisions.php
index e36b080538..90bffe5097 100644
--- a/classes/Divisions.php
+++ b/classes/Divisions.php
@@ -621,7 +621,6 @@ private function divisionsByPolicy($q) {
             if ( !array_key_exists($policy_id, $policies) ) {
                 $policies[$policy_id] = array(
                     'policy_id' => $policy_id,
-                    'weak_count' => 0,
                     'divisions' => array()
                 );
                 if ( $this->policies ) {
@@ -633,12 +632,9 @@ private function divisionsByPolicy($q) {
                 }
             }
 
+            
             $division = $this->getDivisionDetails($row);
 
-            if ( !$division['strong'] ) {
-                $policies[$policy_id]['weak_count']++;
-            }
-
             $policies[$policy_id]['divisions'][] = $division;
         };
 
diff --git a/tests/DivisionsTest.php b/tests/DivisionsTest.php
index 0f9ff97a14..24ccb1fd7e 100644
--- a/tests/DivisionsTest.php
+++ b/tests/DivisionsTest.php
@@ -101,15 +101,14 @@ public function testVotedTellYesWithYesSentence() {
 
     public function testStrongIndicators() {
         $page = $this->fetch_division_page();
-        $this->assertContains('<li id="pw-2013-01-01-3-commons" class="policy-vote--minor', $page);
-        $this->assertContains('<li id="pw-2013-01-01-4-commons" class="policy-vote--major', $page);
-        $this->assertContains('<li id="pw-2013-01-01-5-commons" class="policy-vote--major', $page);
-        $this->assertContains('<li id="pw-2013-01-01-6-commons" class="policy-vote--minor', $page);
-    }
-
-    public function testWeakCount() {
-        $page = $this->fetch_division_page();
-        $this->assertContains('including 5 less important votes', $page);
+        preg_match('#Scoring votes.*?</ul>#s', $page, $m);
+        $major = $m[0];
+        $this->assertContains('<li id="pw-2013-01-01-4-commons"', $major);
+        $this->assertContains('<li id="pw-2013-01-01-5-commons"', $major);
+        preg_match('#Informative votes.*?</ul>#s', $page, $m);
+        $minor = $m[0];
+        $this->assertContains('<li id="pw-2013-01-01-3-commons"', $minor);
+        $this->assertContains('<li id="pw-2013-01-01-6-commons"', $minor);
     }
 
     public function testNotEnoughInfoStatement() {
@@ -119,8 +118,8 @@ public function testNotEnoughInfoStatement() {
 
     public function testRecentDivisionsForMP() {
         $page = $this->fetch_mp_recent_page();
-        $this->assertContains('<li id="pw-2013-01-01-3-commons" class="policy-vote--major', $page);
-        $this->assertNotContains('<li id="pw-2012-01-01-13-commons" class="policy-vote--major', $page);
+        $this->assertContains('<li id="pw-2013-01-01-3-commons"', $page);
+        $this->assertNotContains('<li id="pw-2012-01-01-13-commons"', $page);
     }
 
     public function testSingleDivision() {
diff --git a/www/docs/js/main.js b/www/docs/js/main.js
index 6e95930e5e..dd7dbea899 100644
--- a/www/docs/js/main.js
+++ b/www/docs/js/main.js
@@ -308,12 +308,6 @@ $(function(){
     t.parent().next(".nav-menu").toggleClass('closed');
   });
 
-  $('.js-show-all-votes').on('click', function(){
-    $(this).fadeOut();
-    $('.policy-vote--minor').slideDown();
-    $('#policy-votes-type').text('All');
-  });
-
   $('a[href="#past-list-dates"]').on('click', function(e){
     e.preventDefault();
     $(this).trigger('blur');
diff --git a/www/docs/style/sass/pages/_mp.scss b/www/docs/style/sass/pages/_mp.scss
index f0a1b66d37..2c5d03a702 100644
--- a/www/docs/style/sass/pages/_mp.scss
+++ b/www/docs/style/sass/pages/_mp.scss
@@ -610,26 +610,6 @@
   }
 }
 
-html.js {
-    .policy-vote--minor {
-        display: none;
-    }
-}
-
-.policy-vote--minor {
-    padding-left: 1.5em;
-    line-height: 1.3em !important; // override .vote-descriptions .policy-votes > li
-
-    .policy-vote__text,
-    .policy-vote__date {
-        font-size: 0.9em;
-    }
-
-    .policy-vote__text {
-        color: #666;
-    }
-}
-
 .policy-vote__date {
     display: block;
     color: #b5af9d; // desaturated taupe colour
@@ -709,14 +689,6 @@ html.js {
             margin-bottom: 0;
         }
     }
-
-    .js-show-all-votes {
-        display: none;
-    }
-}
-
-html.js .policy-votes-list-footer .js-show-all-votes {
-    display: block;
 }
 
 .voting-information-provenance {
diff --git a/www/includes/easyparliament/templates/html/mp/_division_description.php b/www/includes/easyparliament/templates/html/mp/_division_description.php
index ef7c39e005..4ce939ed41 100644
--- a/www/includes/easyparliament/templates/html/mp/_division_description.php
+++ b/www/includes/easyparliament/templates/html/mp/_division_description.php
@@ -1,4 +1,4 @@
-<li id="<?= $division['division_id'] ?>" class="<?= $show_all || $division['strong'] ? 'policy-vote--major' : 'policy-vote--minor' ?>">
+<li id="<?= $division['division_id'] ?>">
     <span class="policy-vote__date">On <?= strftime('%e %b %Y', strtotime($division['date'])) ?>:</span>
     <span class="policy-vote__text"><?= $full_name ?><?= $division['text'] ?></span>
     <?php if ($division['date'] > '2020-06-01' && $division['date'] < '2020-06-10' && $division['vote'] == 'absent') { ?>
diff --git a/www/includes/easyparliament/templates/html/mp/divisions.php b/www/includes/easyparliament/templates/html/mp/divisions.php
index 2ebe4477a7..143baceb90 100644
--- a/www/includes/easyparliament/templates/html/mp/divisions.php
+++ b/www/includes/easyparliament/templates/html/mp/divisions.php
@@ -39,19 +39,31 @@
                 <?php endif; ?>
 
                 <?php $displayed_votes = false; ?>
-                <?php if ( isset($policydivisions) && $policydivisions ) { ?>
 
-                    <?php if ($has_voting_record) { ?>
+                <?php
+                    # $policydivisions contains all the relevant divisions for this MP
+                    # $has_voting_record is true if the MP has voted on any policy
+                    if (isset($policydivisions) && $policydivisions && $has_voting_record) {
+                        # for some historical reason, the divisions page actually
+                        # does all divisions, but generally this is an array of one
+                        # (the current policy)
+                        foreach ($policydivisions as $policy) { ?>
 
-                        <?php foreach ($policydivisions as $policy) { ?>
                             <?php
-                                $show_all = false;
-                                if ( $policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions']) ) {
-                                    $show_all = true;
+                                $divisions_scoring = [];
+                                $divisions_informative = [];
+                                foreach ($policy['divisions'] as $division) {
+                                    if ($division['strong']) {
+                                        $divisions_scoring[] = $division;
+                                    } else {
+                                        $divisions_informative[] = $division;
+                                    }
                                 }
                             ?>
 
-                            <?php if ( isset($policy['header']) ) { ?>
+                            <?php
+                                # a header dict is used to give human information about the specific policy
+                                if ( isset($policy['header']) ) { ?>
                                 <div class="panel policy-votes-hero" style="background-image: url('<?php echo $policy['header']['image']; ?>');">
                                     <h2><?php echo $policy['header']['title']; ?></h2>
                                     <p><?php echo $policy['header']['description']; ?>.</p>
@@ -69,8 +81,9 @@
                                 </div>
                             <?php } ?>
 
-
-                            <?php if ( isset($policy['position']) ) { ?>
+                            <?php
+                                # display the calculated position for the policy on this page
+                                if ( isset($policy['position']) ) { ?>
                                 <div class="panel">
                                     <?php if ( $policy['position']['has_strong'] ) { ?>
                                         <h3 class="policy-vote-overall-stance">
@@ -84,9 +97,6 @@
                                             data on PublicWhip.org.uk</a>.
                                         </p>
 
-                                        <h3 class="policy-votes-list-header"><span id="policy-votes-type"><?=
-                                            $show_all ? 'All' : 'Key';
-                                        ?></span> votes about <?= $policy['desc'] ?>:</h3>
                                     <?php } else { ?>
                                         <h3 class="policy-vote-overall-stance">
                                             We don&rsquo;t have enough information to calculate <?= $full_name ?>&rsquo;s position on this issue
@@ -97,17 +107,26 @@
                                         </p>
                                     <?php } ?>
 
+                                <?php if ($divisions_scoring) { ?>
+                                    <h3 class="policy-votes-list-header">Scoring votes</h3>
                                     <ul class="vote-descriptions policy-votes">
-                                    <?php foreach ($policy['divisions'] as $division) {
+                                    <?php foreach ($divisions_scoring as $division) {
                                         include('_division_description.php');
                                         $displayed_votes = true;
                                     } ?>
                                     </ul>
+                                <?php } ?>
+                                <?php if ($divisions_informative) { ?>
+                                    <h3 class="policy-votes-list-header">Informative votes</h3>
+                                    <ul class="vote-descriptions policy-votes">
+                                        <?php foreach ($divisions_informative as $division) {
+                                            include('_division_description.php');
+                                            $displayed_votes = true;
+                                        } ?>
+                                    </ul>
+                                <?php } ?>
 
                                     <div class="policy-votes-list-footer">
-                                      <?php if ( !$show_all && $policy['weak_count'] > 0 ) { ?>
-                                        <p><button class="button secondary-button small js-show-all-votes">Show all votes, including <?= $policy['weak_count'] ?> less important <?= $policy['weak_count'] == 1 ? 'vote' : 'votes' ?></button></p>
-                                      <?php } ?>
                                         <p class="voting-information-provenance">
                                             Vote information from <a href="https://www.publicwhip.org.uk/mp.php?mpid=<?= $member_id ?>&amp;dmp=<?= $policy['policy_id'] ?>">PublicWhip</a>.
                                             Last updated: <?= $policy_last_update[$policy['policy_id']] ?>.
@@ -117,7 +136,6 @@
 
                                 </div>
                             <?php } ?>
-                        <?php } ?>
                     <?php } ?>
 
                 <?php } ?>
diff --git a/www/includes/easyparliament/templates/html/mp/recent.php b/www/includes/easyparliament/templates/html/mp/recent.php
index 62354dfb6b..b86866ce52 100644
--- a/www/includes/easyparliament/templates/html/mp/recent.php
+++ b/www/includes/easyparliament/templates/html/mp/recent.php
@@ -26,7 +26,6 @@
                 <?php
 
                 $displayed_votes = false;
-                $show_all = true;
                 $current_date = '';
                 $sidebar_links = array();