Added an environment check for enabled libxml to address issue #67.

[timetracker.git] / reports.php

diff --git a/reports.php b/reports.php
index e6334f9b6431b3f3a862b54f83c2c4e9503342d0..ee82a64f30dc0fbdc46cbf78644918f8f3167f21 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -30,7 +30,6 @@ require_once('initialize.php');
 import('form.Form');
 import('form.ActionForm');
 import('DateAndTime');
 import('form.Form');
 import('form.ActionForm');
 import('DateAndTime');

-import('ttTeamHelper');

 import('ttGroupHelper');
 import('Period');
 import('ttProjectHelper');
 import('ttGroupHelper');
 import('Period');
 import('ttProjectHelper');


@@ -165,7 +164,7 @@ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isCli
     $users = $user->getUsers($options); // Active and inactive users.
   }
   elseif ($user->isClient())
     $users = $user->getUsers($options); // Active and inactive users.
   }
   elseif ($user->isClient())

-    $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+    $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.

 
   foreach ($users as $single_user) {
     $user_list[$single_user['id']] = $single_user['name'];
 
   foreach ($users as $single_user) {
     $user_list[$single_user['id']] = $single_user['name'];


@@ -290,7 +289,7 @@ if ($request->isPost()) {
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {
       // This loads new favorite report options into the bean (into our form).
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {
       // This loads new favorite report options into the bean (into our form).

-      ttFavReportHelper::loadReport($user->getUser(), $bean);
+      ttFavReportHelper::loadReport($bean);

 
       // If user selected no favorite report - mark all user checkboxes (most probable scenario).
       if ($bean->getAttribute('favorite_report') == -1)
 
       // If user selected no favorite report - mark all user checkboxes (most probable scenario).
       if ($bean->getAttribute('favorite_report') == -1)


@@ -306,7 +305,7 @@ if ($request->isPost()) {
     if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
 
     if ($err->no()) {
     if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
 
     if ($err->no()) {

-      $id = ttFavReportHelper::saveReport($user->id, $bean); // TODO: review "on behalf" situations (both user and group), redesign if needed.
+      $id = ttFavReportHelper::saveReport($bean);

       if (!$id)
         $err->add($i18n->get('error.db'));
       if ($err->no()) {
       if (!$id)
         $err->add($i18n->get('error.db'));
       if ($err->no()) {


@@ -323,7 +322,7 @@ if ($request->isPost()) {
       // Load default report.
       $bean->setAttribute('favorite_report','');
       $bean->setAttribute('new_fav_report', $report_list[0]['name']);
       // Load default report.
       $bean->setAttribute('favorite_report','');
       $bean->setAttribute('new_fav_report', $report_list[0]['name']);

-      ttFavReportHelper::loadReport($user->id, $bean);
+      ttFavReportHelper::loadReport($bean);

       $form->setValueByElement('users', array_keys($user_list));
       $bean->saveBean();
       header('Location: reports.php');
       $form->setValueByElement('users', array_keys($user_list));
       $bean->saveBean();
       header('Location: reports.php');


@@ -332,12 +331,12 @@ if ($request->isPost()) {
   } else {
     // Generate button pressed. Check some values.
     if (!$bean->getAttribute('period')) {
   } else {
     // Generate button pressed. Check some values.
     if (!$bean->getAttribute('period')) {

-      $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
+      $start_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));

 
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
         $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
 
 
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
         $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
 

-      $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
+      $end_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));

       if ($end_date->isError() || !$bean->getAttribute('end_date'))
         $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
 
       if ($end_date->isError() || !$bean->getAttribute('end_date'))
         $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));