Fixed saving fav report in a subgroup.

[timetracker.git] / WEB-INF / lib / ttFavReportHelper.class.php

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index a1f2b945d83c3310124f3b61de5d2c669e8c386e..d37830090f74a1d7576a7682b4c9fd39da2ea7b6 100644 (file)
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -72,7 +72,6 @@ class ttFavReportHelper {
     }
     return false;
   }
     }
     return false;
   }

-

   // getReport - returns a report identified by its id.
   // TODO: get rid of this function by encapsulating all cron related tasks in its own class.
   // Because cron works for all orgs and we want this class to always work in context of
   // getReport - returns a report identified by its id.
   // TODO: get rid of this function by encapsulating all cron related tasks in its own class.
   // Because cron works for all orgs and we want this class to always work in context of


@@ -182,8 +181,9 @@ class ttFavReportHelper {
   }
 
   // saveReport - saves report options in the database.
   }
 
   // saveReport - saves report options in the database.

-  static function saveReport($user_id, $bean) {
+  static function saveReport($bean) {

     global $user;
     global $user;

+    $user_id = $user->getUser();

 
     //  Set default value of 0 for not set checkboxes (in bean).
     //  Later in this function we use it to construct $fields array to update database.
 
     //  Set default value of 0 for not set checkboxes (in bean).
     //  Later in this function we use it to construct $fields array to update database.


@@ -207,11 +207,11 @@ class ttFavReportHelper {
       $users = join(',', $users_in_bean);
     }
     if ($bean->getAttribute('start_date')) {
       $users = join(',', $users_in_bean);
     }
     if ($bean->getAttribute('start_date')) {

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

       $from = $dt->toString(DB_DATEFORMAT);
     }
     if ($bean->getAttribute('end_date')) {
       $from = $dt->toString(DB_DATEFORMAT);
     }
     if ($bean->getAttribute('end_date')) {

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

       $to = $dt->toString(DB_DATEFORMAT);
     }
 
       $to = $dt->toString(DB_DATEFORMAT);
     }
 


@@ -269,8 +269,9 @@ class ttFavReportHelper {
   }
 
   // loadReport - loads report options from database into a bean.
   }
 
   // loadReport - loads report options from database into a bean.

-  static function loadReport($user_id, &$bean) {
+  static function loadReport(&$bean) {

     global $user;
     global $user;

+    $user_id = $user->getUser();

 
     $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
     if ($val) {
 
     $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
     if ($val) {


@@ -285,11 +286,11 @@ class ttFavReportHelper {
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);

-        $bean->setAttribute('start_date', $dt->toString($user->date_format));
+        $bean->setAttribute('start_date', $dt->toString($user->getDateFormat()));

       }
       if ($val['period_end']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_end']);
       }
       if ($val['period_end']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_end']);

-        $bean->setAttribute('end_date', $dt->toString($user->date_format));
+        $bean->setAttribute('end_date', $dt->toString($user->getDateFormat()));

       }
       $bean->setAttribute('chclient', $val['show_client']);
       $bean->setAttribute('chinvoice', $val['show_invoice']);
       }
       $bean->setAttribute('chclient', $val['show_client']);
       $bean->setAttribute('chinvoice', $val['show_invoice']);