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' => '
Nil
' ]; - 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 @@ + + +New: Download a spreadsheet of all Members Interests.
View the history of this MP’s entries in the Register
- -Last updated: = $register_interests['date'] ?>.
- - = $register_interests['data'] ?> + + $register): ?> + +This register last updated on: = $register->published_date ?>
+ + categories as $category): ?> +