From 0f62bbdf9f8c1be13ebae82f7f38b4152852442e Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 5 Jul 2024 10:39:39 +0100
Subject: [PATCH] [2024] Remove election-time specific code.

---
 classes/Homepage.php                          |   5 -
 www/docs/postcode/index.php                   |   5 -
 .../easyparliament/templates/html/index.php   |   6 +-
 .../templates/html/postcode/ge2024.php        | 140 ------------------
 .../templates/html/postcode/index.php         |   6 +-
 5 files changed, 2 insertions(+), 160 deletions(-)
 delete mode 100644 www/includes/easyparliament/templates/html/postcode/ge2024.php

diff --git a/classes/Homepage.php b/classes/Homepage.php
index 7b83e5ce29..852e025b7d 100644
--- a/classes/Homepage.php
+++ b/classes/Homepage.php
@@ -34,16 +34,11 @@ public function display() {
         $common = new Common;
         $dissolution = Dissolution::dates();
 
-        // temp for 2024 election
-        $now = new \DateTime();
-        $election_date = new \DateTime('2024-07-04 22:00:00');
-
         $data['debates'] = $this->getDebatesData();
 
         $user = new User();
         $data['mp_data'] = $user->getRep($this->cons_type, $this->mp_house);
         $data["commons_dissolved"] = isset($dissolution[1]);
-        $data["after_election"] = $now > $election_date;
 
         $data['regional'] = $this->getRegionalList();
         $data['popular_searches'] = $common->getPopularSearches();
diff --git a/www/docs/postcode/index.php b/www/docs/postcode/index.php
index b7c83d6afa..fdecaab71b 100644
--- a/www/docs/postcode/index.php
+++ b/www/docs/postcode/index.php
@@ -10,11 +10,6 @@
 
 // handling to switch the GE message based either on time or a query string
 
-$now = new DateTime();
-$election_date = new DateTime('2024-07-04 22:00:00');
-
-$data['post_election_message'] = (($now > $election_date) || (get_http_var("post_election") == 1));
-
 $pc = get_http_var('pc');
 if (!$pc) {
     postcode_error('Please supply a postcode!');
diff --git a/www/includes/easyparliament/templates/html/index.php b/www/includes/easyparliament/templates/html/index.php
index 89ea47485b..aa48984822 100644
--- a/www/includes/easyparliament/templates/html/index.php
+++ b/www/includes/easyparliament/templates/html/index.php
@@ -20,11 +20,7 @@
                 </div>
             </div>
             <?php } else { ?>
-            <?php if ($after_election === true) { ?>
-            <h1>Find out more about your new MP</h1>
-            <?php } else { ?>
-            <h1>Find out more about your <?php if ($commons_dissolved) { ?>former <?php } ?>MP, and election candidates</h1>
-            <?php } ?>
+            <h1>Find out more about your <?php if ($commons_dissolved) { ?>former <?php } ?>MP</h1>
             <div class="row collapse">
                 <form action="/postcode/" class="mp-search__form"  onsubmit="trackFormSubmit(this, 'PostcodeSearch', 'Submit', 'Home'); return false;">
                     <label for="postcode">Your postcode</label>
diff --git a/www/includes/easyparliament/templates/html/postcode/ge2024.php b/www/includes/easyparliament/templates/html/postcode/ge2024.php
deleted file mode 100644
index 5af0e87f6e..0000000000
--- a/www/includes/easyparliament/templates/html/postcode/ge2024.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<link rel="stylesheet" href="https://mapit.mysociety.org/static/mapit/leaflet/leaflet.5b09190de2e8.css" />
-<script src="https://mapit.mysociety.org/static/mapit/js/reqwest.min.c949fe855720.js"></script>
-<script src="https://mapit.mysociety.org/static/mapit/leaflet/leaflet.f1cc0a70c78b.js"></script>
-
-<h1>General election</h1>
-
-<style>
-:target {
-    background-color: #ffc;
-    padding: 0.5em;
-}
-</style>
-<p><a href='#current'>See your current <?php
-    if (isset($mcon) || isset($mreg)) echo 'representatives';
-    else echo 'MP';
-?></a></p>
-
-<p>There is a UK general election on <strong>4th July 2024</strong>
-<?php
-$date = strtotime("2024-07-04");
-$datediff = ceil(($date - time()) / 86400);
-if ($datediff > 1) {
-    echo "($datediff days away)";
-} elseif ($datediff > 0) {
-    echo '(tomorrow!)';
-} elseif ($datediff > -86400) {
-    echo '(today!)';
-}
-?>.
-</p>
-<?php
-$wheredoivote_url = 'https://wheredoivote.co.uk/';
-if ($address) {
-    $wheredoivote_url .= 'address/' . urlencode($address);
-} else {
-    $wheredoivote_url .= 'postcode/' . urlencode($pc);
-}
-?>
-
-<p>
-    To find out where to vote (your polling station), visit <a href="<?= $wheredoivote_url ?>">WhereDoIVote.co.uk</a>.
-</p>
-
-<p>
-    To understand more about <a href="https://www.mysociety.org/democracy/the-2024-general-election/">how the election will work</a>, you can read <a href="https://www.mysociety.org/democracy/the-2024-general-election/">our 10-point guide</a>.
-</p>
-
-<p>For this election, you will be in the
-<strong><?= $ballot->post_name ?></strong>
-constituency.
-You can see statistics and information for your new constituency at the
-<a href="https://www.localintelligencehub.com/area/WMC23/<?= rawurlencode($ballot->post_name) ?>">Local Intelligence Hub</a>.
-
-<h3>Candidates</h3>
-<p>
-
-The people standing in your constituency
-<?php
-if (!$ballot->candidates_verified) { echo '(not yet finalised or verified)'; }
-?> are:
-
-<ul>
-<?php foreach ($ballot->candidates as $candidate) {
-    echo '<li>';
-    echo '<a href="' . $candidate->person->absolute_url . '">';
-    echo $candidate->person->name;
-    echo '</a>';
-    echo ' (' . $candidate->party->party_name . ')'; # photo_url
-    echo '</li>';
-}
-?>
-</ul>
-
-<p>
-
-For more information visit <a href="<?= $ballot->wcivf_url ?>">WhoCanIVoteFor</a>.
-Thanks to <a href="https://democracyclub.org.uk/">Democracy Club</a> for providing this data.
-</p>
-<h3>New constituencies</h3>
-<p>Many constituency boundaries have changed for this election.
-Here's a map of your new constituency (pink) with your
-existing constituency in grey:</p>
-
-<div id="map" style="max-width: 400px; margin-bottom: 2em;">
-<div id="leaflet" style=" position: relative; width: 100%; height: 0; padding-top: 100%;">
-</div>
-</div>
-
-<p>
-Get <a href="https://www.mysociety.org/2023/09/12/navigating-the-new-constituencies/">more datasets</a> about the new constituencies. 
-</p>
-<script>
-    var map = new L.Map("leaflet");
-    map.attributionControl.setPrefix('');
-    var osm = new L.TileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-        attribution: 'Map © <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-        maxZoom: 18
-    });
-    map.addLayer(osm);
-
-    var mapit = mapit || {};
-    mapit.area_loaded = function(data) {
-        var area = new L.GeoJSON(data);
-        area.on('dblclick', function(e){
-            var z = map.getZoom() + (e.originalEvent.shiftKey ? -1 : 1);
-            map.setZoomAround(e.containerPoint, z);
-        });
-        area.setStyle({ color: this.mapit.colour });
-        mapit.areas.addLayer(area);
-        if (this.mapit.type == 'new') area.bringToFront();
-        if (this.mapit.type == 'old') area.bringToBack();
-        map.fitBounds(mapit.areas.getBounds());
-    };
-    mapit.areas = L.featureGroup().addTo(map);
-</script>
-
-
-
-<script>
-    reqwest({
-        url: 'https://mapit.mysociety.org/area/<?= $mapit_ids['new'] ?>.geojson?simplify_tolerance=0.0001',
-        type: 'json',
-        mapit: {
-            colour: '#f0f',
-            type: 'new'
-        },
-        crossOrigin: true,
-        success: mapit.area_loaded
-    });
-    reqwest({
-        url: 'https://mapit.mysociety.org/area/<?= $mapit_ids['old'] ?>.geojson?simplify_tolerance=0.0001',
-        type: 'json',
-        mapit: {
-            colour: '#666',
-            type: 'old'
-        },
-        crossOrigin: true,
-        success: mapit.area_loaded
-    });
-</script>
diff --git a/www/includes/easyparliament/templates/html/postcode/index.php b/www/includes/easyparliament/templates/html/postcode/index.php
index 299c259a17..7f8751d1ef 100644
--- a/www/includes/easyparliament/templates/html/postcode/index.php
+++ b/www/includes/easyparliament/templates/html/postcode/index.php
@@ -37,11 +37,7 @@ function member_image_box(string $person_id, string $person_url, string $person_
     }
 }
 
-if ($post_election_message) {
-    include "ge2024-post-election.php";
-} else {
-    include "ge2024.php";
-};
+include "ge2024-post-election.php";
 
 # The below is normally the main column, but for now let us make it the sidebar...