Skip to content

Fixes #171 where "format" is ignored when using daterange. #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #171 where "format" is ignored when using daterange. #243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions classes/headers/VariableHeader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ public static function afterParse(&$report) {
}

//if the type is daterange, parse start and end with strtotime
if($params['type'] === 'daterange' && !empty($report->macros[$params['name']][0]) && !empty($report->macros[$params['name']][1])) {
$start = date_create($report->macros[$params['name']][0]);
if($params['type'] === 'daterange' && !empty($report->macros[$params['name']]['start']) && !empty($report->macros[$params['name']]['end'])) {
$start = date_create($report->macros[$params['name']]['start']);
if(!$start) throw new Exception($params['display']." must have a valid start date.");
date_time_set($start,0,0,0);
$report->macros[$params['name']]['start'] = date_format($start,$params['format']);

$end = date_create($report->macros[$params['name']][1]);
$end = date_create($report->macros[$params['name']]['end']);
if(!$end) throw new Exception($params['display']." must have a valid end date.");
date_time_set($end,23,59,59);
$report->macros[$params['name']]['end'] = date_format($end,$params['format']);
Expand Down