aboutsummaryrefslogtreecommitdiffstats
path: root/perllib
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2018-09-10 16:15:01 +0100
committerStruan Donald <struan@exo.org.uk>2018-09-12 14:21:49 +0100
commit52c76cda5259cac6230dec8913a108b0635e1413 (patch)
treee37732fbcbf1ecb8b3ccefa06fcc73fcbdc596bb /perllib
parent371cefadfe5c50610bc8abfb923757e39d66f3ff (diff)
add end argument to loop_period
So we can use it for collideoscope which does not use a fixed end period.
Diffstat (limited to 'perllib')
-rwxr-xr-xperllib/FixMyStreet/Script/UpdateAllReports.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/Script/UpdateAllReports.pm b/perllib/FixMyStreet/Script/UpdateAllReports.pm
index 21d8d28a0..5fa080b78 100755
--- a/perllib/FixMyStreet/Script/UpdateAllReports.pm
+++ b/perllib/FixMyStreet/Script/UpdateAllReports.pm
@@ -99,13 +99,14 @@ sub generate {
}
sub end_period {
- my $period = shift;
- FixMyStreet->set_time_zone(DateTime->now)->truncate(to => $period)->add($period . 's' => 1)->subtract(seconds => 1);
+ my ($period, $end) = @_;
+ $end ||= DateTime->now;
+ FixMyStreet->set_time_zone($end)->truncate(to => $period)->add($period . 's' => 1)->subtract(seconds => 1);
}
sub loop_period {
- my ($date, $period, $extra) = @_;
- my $end = end_period($period);
+ my ($date, $extra, $period, $end) = @_;
+ $end = end_period($period, $end);
my @out;
while ($date <= $end) {
push @out, { n => $date->$period, $extra ? (d => $date->$extra) : () };
@@ -147,7 +148,7 @@ sub generate_dashboard {
} else {
$group_by = 'year';
}
- my @problem_periods = loop_period($min_confirmed, $group_by, $extra);
+ my @problem_periods = loop_period($min_confirmed, $extra, $group_by);
my %problems_reported_by_period = stuff_by_day_or_year(
$group_by, $rs,