From 885fe635ea902a58db61316b2e9a97262d92e461 Mon Sep 17 00:00:00 2001
From: Alex Parsons <alex.parsons@mysociety.org>
Date: Mon, 17 Feb 2025 13:03:39 +0000
Subject: [PATCH] Updated register display

This adds a menu structure in the side bar by category.
And brings the formatting into twfy from parlparse.
---
 www/docs/mp/index.php                         | 24 ++++++----
 .../templates/html/mp/_register_entry.php     | 45 +++++++++++++++++++
 .../templates/html/mp/_register_field.php     | 18 ++++++++
 .../templates/html/mp/register.php            | 43 +++++++++++++-----
 4 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100644 www/includes/easyparliament/templates/html/mp/_register_entry.php
 create mode 100644 www/includes/easyparliament/templates/html/mp/_register_field.php

diff --git a/www/docs/mp/index.php b/www/docs/mp/index.php
index b39ff6ea39..941779c31d 100644
--- a/www/docs/mp/index.php
+++ b/www/docs/mp/index.php
@@ -996,17 +996,25 @@ function person_pbc_membership($member) {
 }
 
 function person_register_interests($member, $extra_info) {
-    if (!isset($extra_info['register_member_interests_html'])) {
-        return;
-    }
 
-    $reg = [ 'date' => '', 'data' => '<p>Nil</p>' ];
-    if (isset($extra_info['register_member_interests_date'])) {
-        $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
+    $valid_chambers = ['commons', 'scottish-parliament', 'northern-ireland-assembly', 'senedd'];
+
+    $lang = LANGUAGE;
+
+    $reg = [ 'date' => '', 'chamber_registers' => [] ];
+
+    foreach ($valid_chambers as $chamber) {
+        $key = 'person_regmem_' . $chamber . '_' . $lang;
+        if (!isset($extra_info[$key])) {
+            continue;
+        }
+        $reg['chamber_registers'][$chamber] = MySociety\TheyWorkForYou\DataClass\Regmem\Person::fromJson($extra_info[$key]);
     }
-    if ($extra_info['register_member_interests_html'] != '') {
-        $reg['data'] = $extra_info['register_member_interests_html'];
+    // if chamber_registers is empty, we don't have any data
+    if (empty($reg['chamber_registers'])) {
+        return;
     }
+
     return $reg;
 }
 
diff --git a/www/includes/easyparliament/templates/html/mp/_register_entry.php b/www/includes/easyparliament/templates/html/mp/_register_entry.php
new file mode 100644
index 0000000000..e342c9a4e3
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/mp/_register_entry.php
@@ -0,0 +1,45 @@
+<?php /** @var MySociety\TheyWorkForYou\DataClass\Regmem\InfoEntry $entry */ ?>
+
+<div class="interest-item" id="<?= $entry->comparable_id ?>">
+
+<?php if (!$entry->details->isEmpty()): ?>
+    <?php print_r($entry->details) ?>
+
+    <?php if ($entry->content): ?>
+        <?php if ($entry->info_type == "subentry"): ?>
+            <h6 class="interest-summary"><?= htmlspecialchars($entry->content) ?></h6>
+        <?php else: ?>
+            <h4 class="interest-summary"><?= htmlspecialchars($entry->content) ?></h4>
+        <?php endif; ?>
+
+    <?php endif; ?>
+        <ul class="interest-details-list">
+        <?php foreach ($entry->details as $detail): ?>
+            <?php include '_register_field.php'; ?>
+        <?php endforeach; ?>
+        <?php if ($entry->date_registered): ?>
+            <li class="registration-date">Registration Date: <?= htmlspecialchars($entry->date_registered) ?></li>
+            <?php endif; ?>
+            <?php if ($entry->date_published): ?>
+            <li class="published-date">Published Date: <?= htmlspecialchars($entry->date_published) ?></li>
+            <?php endif; ?>
+            <?php if ($entry->date_updated): ?>
+            <li class="last-updated-date">Last Updated Date: <?= htmlspecialchars($entry->date_updated) ?></li>
+            <?php endif; ?>
+        </ul>
+<?php endif; ?>
+
+    </ul>
+    <?php if (!$entry->sub_entries->isEmpty()): ?>
+        <h5 class="child-item-header">Specific work or payments</h5>
+        <div class="interest-child-items" id="parent-<?= $entry->comparable_id ?>">
+            <?php foreach ($entry->sub_entries as $subentry): ?>
+                <?php $parent_entry = $entry; ?>
+                <?php $entry = $subentry; ?>
+                <?php include '_register_entry.php'; ?>
+                <?php $entry = $parent_entry; ?>
+            <?php endforeach; ?>
+        </div>
+    <?php endif; ?>
+
+</div>
\ No newline at end of file
diff --git a/www/includes/easyparliament/templates/html/mp/_register_field.php b/www/includes/easyparliament/templates/html/mp/_register_field.php
new file mode 100644
index 0000000000..53305a6e60
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/mp/_register_field.php
@@ -0,0 +1,18 @@
+<?php /** @var MySociety\TheyWorkForYou\DataClass\Regmem\Detail $detail */ ?>
+
+<li class="interest-detail">
+    <span class="interest-detail-name"><?= $detail->display_as ?>: </span>
+    <?php if ($detail->type == "container"): ?>
+        <ul class="interest-detail-values-groups">
+            <?php $upper_detail = $detail; ?>
+            <?php foreach ($detail->sub_details() as $detail): ?>
+                <?php include '_register_field.php'; ?>
+            <?php endforeach; ?>
+            <?php $detail = $upper_detail; ?>
+        </ul>
+    <?php else : ?>
+        <?php if ($detail->value): ?>
+            <span class="interest-detail-value"><?= htmlspecialchars($detail->value) ?></span>
+        <?php endif; ?>
+    <?php endif; ?>
+</li>
\ No newline at end of file
diff --git a/www/includes/easyparliament/templates/html/mp/register.php b/www/includes/easyparliament/templates/html/mp/register.php
index bdb7256f0e..9feac96a6c 100644
--- a/www/includes/easyparliament/templates/html/mp/register.php
+++ b/www/includes/easyparliament/templates/html/mp/register.php
@@ -10,14 +10,26 @@
         <div class="person-panels">
             <div class="sidebar__unit in-page-nav">
                 <div>
-                    <h3 class="browse-content"><?= gettext('Browse content') ?></h3>
+
+                <h3 class="browse-content"><?= gettext('Browse content') ?></h3>
                     <ul>
-                      <li><a href="https://pages.mysociety.org/parl_register_interests/datasets/parliament_2024/latest">Download a spreadsheet</a></li>
-                      <li><a href="https://www.mysociety.org/2024/01/17/improving-the-register-of-mps-interests/">Read more about the data</a></li>
+                        <li><a href="https://pages.mysociety.org/parl_register_interests/datasets/parliament_2024/latest">Download a spreadsheet</a></li>
+                        <li><a href="https://www.mysociety.org/2024/01/17/improving-the-register-of-mps-interests/">Read more about the data</a></li>
+                    </ul>
 
+                    <?php foreach ($register_interests['chamber_registers'] as $register): ?>
+                    <?php /** @var MySociety\TheyWorkForYou\DataClass\Regmem\Person $register */ ?>
+
+                    <h3 class="browse-content"><?= $register->displayChamber() ?></h3>
+                    <ul>
+                            <?php foreach ($register->categories as $category): ?>
+                                <li><a href="#category-<?= $register->chamber . $category->category_id ?>"><?= $category->category_name ?></a></li>
+                            <?php endforeach; ?>
                     </ul>
-                      <?php include '_featured_content.php'; ?>
-                      <?php include '_donation.php'; ?>
+                    <?php endforeach; ?>
+
+                    <?php include '_featured_content.php'; ?>
+                    <?php include '_donation.php'; ?>
                 </div>
             </div>
 
@@ -27,16 +39,27 @@
                 <div class="panel register">
                     <a name="register"></a>
                     <h2>Register of Members&rsquo; Interests</h2>
-                    <p><b>New</b>: <a href="https://pages.mysociety.org/parl_register_interests/datasets/parliament_2024/latest">Download a spreadsheet of all Members Interests.</a></p>
 
                     <p>
                         <a href="<?= WEBPATH ?>regmem/?p=<?= $person_id ?>">View the history of this MP&rsquo;s entries in the Register</a>
                     </p>
-                    <?php if ($register_interests['date']): ?>
-                        <p>Last updated: <?= $register_interests['date'] ?>.</p>
-                    <?php endif; ?>
 
-                    <?= $register_interests['data'] ?>
+                    <?php /** @var MySociety\TheyWorkForYou\DataClass\Regmem\Person $register */ ?>
+                    <?php foreach ($register_interests['chamber_registers'] as $chamber => $register): ?>
+                            
+                        <p>This register last updated on: <?= $register->published_date ?></p>
+
+                        <?php foreach ($register->categories as $category): ?>
+                            <h3 id="category-<?= $chamber . $category->category_id ?>"><?= $category->category_name ?></h3>
+                        
+                            <?php foreach ($category->entries as $entry): ?>
+                                <?php include('_register_entry.php'); ?>
+
+                            <?php endforeach; ?>
+                        
+                        <?php endforeach; ?>
+
+                    <?php endforeach; ?>
 
 
                     <p>