Fixed saving fav report in a subgroup.

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index b056bd819f209455316f0bda780b514a28451c00..d37830090f74a1d7576a7682b4c9fd39da2ea7b6 100644 (file)
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -181,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.


@@ -206,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);
     }
 


@@ -268,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) {


@@ -284,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']);

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9f603c43e11aa965fe90d0c5657b91674790eb9f..c49c2e568dad8db7b586eb6a0ed8cc677620c64b 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4632 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4633 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/reports.php b/reports.php
index e6334f9b6431b3f3a862b54f83c2c4e9503342d0..7c7ac0119f8b4260c17219641b96d4a1643f99a3 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -290,7 +290,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 +306,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 +323,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');