Merge pull request #83 from mj84/macro-timeframe-absolute

Added macro time_frame_absolue

Author: nilmerg

application/controllers/TemplateController.php

@@ -27,9 +27,10 @@ public function indexAction()
 
         $template
             ->setMacros([
-                'date'       => (new DateTime())->format('jS M, Y'),
-                'time_frame' => 'Time Frame',
-                'title'      => 'Icinga Report Preview'
+                'date'                => (new DateTime())->format('jS M, Y'),
+                'time_frame'          => 'Time Frame',
+                'time_frame_absolute' => 'Time Frame (absolute)',
+                'title'               => 'Icinga Report Preview'
             ])
             ->setPreview(true);
 

library/Reporting/Report.php

@@ -362,9 +362,14 @@ public function toPdf()
 
         if ($this->template !== null) {
             $this->template->setMacros([
-                'date'       => (new DateTime())->format('jS M, Y'),
-                'time_frame' => $this->timeframe->getName(),
-                'title'      => $this->name
+                'title'               => $this->name,
+                'date'                => (new DateTime())->format('jS M, Y'),
+                'time_frame'          => $this->timeframe->getName(),
+                'time_frame_absolute' => sprintf(
+                    'From %s to %s',
+                    $this->timeframe->getTimerange()->getStart()->format('r'),
+                    $this->timeframe->getTimerange()->getEnd()->format('r')
+                )
             ]);
 
             $html->setCoverPage($this->template->getCoverPage()->setMacros($this->template->getMacros()));

library/Reporting/Web/Forms/TemplateForm.php

@@ -264,6 +264,7 @@ protected function addColumnSettings($name, $label)
                     'options' => [
                         'report_title'          => 'Report Title',
                         'time_frame'            => 'Time Frame',
+                        'time_frame_absolute'   => 'Time Frame (absolute)',
                         'page_number'           => 'Page Number',
                         'total_number_of_pages' => 'Total Number of Pages',
                         'page_of'               => 'Page Number + Total Number of Pages',

library/Reporting/Web/Widget/HeaderOrFooter.php

@@ -35,6 +35,9 @@ protected function resolveVariable($variable)
             case 'time_frame':
                 $resolved = Html::tag('p', $this->getMacro('time_frame'));
                 break;
+            case 'time_frame_absolute':
+                $resolved = Html::tag('p', $this->getMacro('time_frame_absolute'));
+                break;
             case 'page_number':
                 $resolved = Html::tag('span', ['class' => 'pageNumber']);
                 break;