From fde39bcb1bf60ce6c73811d315c6b34b2b43bef2 Mon Sep 17 00:00:00 2001 From: Kim Taylor Date: Mon, 25 Nov 2024 19:16:49 +1100 Subject: [PATCH] Update pledge page template to show elected candidates. --- pledge-update/parse_pledge_data.php | 22 ++++++++++++++++++++++ pledge-update/template.php | 12 +++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/pledge-update/parse_pledge_data.php b/pledge-update/parse_pledge_data.php index f687715..bd4db22 100644 --- a/pledge-update/parse_pledge_data.php +++ b/pledge-update/parse_pledge_data.php @@ -9,6 +9,7 @@ function parse_pledge_data($candidates_files, $default_image) { foreach ($candidates_files as $key => $file) { $config_file = dirname($file)."/config.json"; $config_string = file_get_contents($config_file); + $elected_file = dirname($file)."/candidates-elected.csv"; if ($config_string !== FALSE) { $config = json_decode($config_string, true); @@ -17,6 +18,24 @@ function parse_pledge_data($candidates_files, $default_image) { exit(1); } + $elected_data = []; + if (file_exists($elected_file)) { + if (($elected_handle = fopen($elected_file, "r")) !== FALSE) { + $headers = fgetcsv($elected_handle); + while (($data = fgetcsv($elected_handle)) !== FALSE) { + $candidate = []; + foreach ($headers as $key => $value) { + $candidate[$value] = $data[$key]; + } + $name_slug = trim_sluggify($candidate['Candidate Name']); + $elected_data[$name_slug] = $candidate; + } + } else { + error_log('Error opening candidates file'); + exit(1); + } + } + if (($handle = fopen($file, "r")) !== FALSE) { $headers = fgetcsv($handle); while (($data = fgetcsv($handle)) !== FALSE) { @@ -39,6 +58,9 @@ function parse_pledge_data($candidates_files, $default_image) { $candidate['Pledge'] = 'y'; } } + if (!empty($elected_data) && array_key_exists($name_slug, $elected_data)) { + $candidate['Elected'] = $elected_data[$name_slug]['Elected']; + } $candidate['Council'] = $config['councilName']; $candidate['Path'] = dirname($file); $media_desc = $candidate['Path']."/". diff --git a/pledge-update/template.php b/pledge-update/template.php index 54b46ca..240354a 100644 --- a/pledge-update/template.php +++ b/pledge-update/template.php @@ -97,6 +97,12 @@ $councilCount = count($councils); -
+
"> + +
ELECTED
+ +