aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perllib/FixMyStreet/App/Controller/Dashboard.pm6
-rw-r--r--t/app/controller/dashboard.t7
2 files changed, 12 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index dbbd57623..867d0659b 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -213,6 +213,8 @@ sub export_as_csv {
'Latitude', 'Longitude',
'Nearest Postcode',
'Ward',
+ 'Easting',
+ 'Northing',
'Report URL',
);
my @body = ($csv->string);
@@ -249,6 +251,8 @@ sub export_as_csv {
grep {$c->stash->{children}->{$_} }
split ',', $hashref->{areas};
+ my @local_coords = $report->local_coords;
+
$csv->combine(
@{$hashref}{
'id',
@@ -266,6 +270,8 @@ sub export_as_csv {
'postcode',
},
$wards,
+ $local_coords[0],
+ $local_coords[1],
(join '', $c->cobrand->base_url_for_report($report), $report->url),
);
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
index 4ecad9f31..5c0e19070 100644
--- a/t/app/controller/dashboard.t
+++ b/t/app/controller/dashboard.t
@@ -604,7 +604,7 @@ FixMyStreet::override_config {
}
is scalar @rows, 6, '1 (header) + 5 (reports) = 6 lines';
- is scalar @{$rows[0]}, 16, '16 columns present';
+ is scalar @{$rows[0]}, 18, '18 columns present';
is_deeply $rows[0],
[
@@ -623,11 +623,16 @@ FixMyStreet::override_config {
'Longitude',
'Nearest Postcode',
'Ward',
+ 'Easting',
+ 'Northing',
'Report URL',
],
'Column headers look correct';
is $rows[5]->[14], 'Bradford-on-Avon', 'Ward column is name not ID';
+
+ is $rows[5]->[15], '610591', 'Correct Easting conversion';
+ is $rows[5]->[16], '126573', 'Correct Northing conversion';
};
};
restore_time;