Work in progress refactoring reports for subgroups.

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5a3289171bedeb7172be493668447520be55222b..d320e38156d2c03f662389b020c9addcd44ee257 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -29,6 +29,8 @@
 import('ttConfigHelper');
 import('ttGroupHelper');
 import('ttGroup');
 import('ttConfigHelper');
 import('ttGroupHelper');
 import('ttGroup');

+import('form.Form');
+import('form.ActionForm');

 
 class ttUser {
   var $login = null;            // User login.
 
 class ttUser {
   var $login = null;            // User login.


@@ -787,6 +789,13 @@ class ttUser {
     unset($_SESSION['behalf_id']);
     unset($_SESSION['behalf_name']);
 
     unset($_SESSION['behalf_id']);
     unset($_SESSION['behalf_name']);
 

+    // Destroy report bean if it was set in session.
+    $form = new Form('dummyForm');
+    $bean = new ActionForm('reportBean', $form, $request);
+    if ($bean->isSaved()) {
+      $bean->destroyBean();
+    }
+

     // Do not do anything if we don't have rights.
     if (!$this->can('manage_subgroups')) return;
 
     // Do not do anything if we don't have rights.
     if (!$this->can('manage_subgroups')) return;
 

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98e8e1c98ad1f3e815aa794335f090c54b2d7915..9f603c43e11aa965fe90d0c5657b91674790eb9f 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.4631 | 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.4632 | 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 31209995ea6a2241b46dc2600cbb2dfc036a0ddc..e6334f9b6431b3f3a862b54f83c2c4e9503342d0 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -43,6 +43,13 @@ if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') ||
   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }

+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
+// End of access checks.
+
+$trackingMode = $user->getTrackingMode();

 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {


@@ -97,7 +104,7 @@ if ($user->can('view_reports') || $user->can('view_all_reports')) {
 } elseif ($user->isClient()) {
   $project_list = ttProjectHelper::getProjectsForClient();
 } else {
 } elseif ($user->isClient()) {
   $project_list = ttProjectHelper::getProjectsForClient();
 } else {

-  $project_list = ttProjectHelper::getAssignedProjects($user->id);     
+  $project_list = ttProjectHelper::getAssignedProjects($user->getUser());

 }
 $form->addInput(array('type'=>'combobox',
   'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
 }
 $form->addInput(array('type'=>'combobox',
   'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',


@@ -106,7 +113,7 @@ $form->addInput(array('type'=>'combobox',
   'data'=>$project_list,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
   'data'=>$project_list,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.all'))));

-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS == $trackingMode) {

   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',


@@ -149,7 +156,7 @@ $user_list = array();
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports') || $user->can('view_all_reports')) {

-    $max_rank = $user->rank-1;
+    $rank = $user->getMaxRankForGroup($user->getGroup());

     if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
     if ($user->can('view_own_reports'))
       $options = array('max_rank'=>$max_rank,'include_self'=>true);
     if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
     if ($user->can('view_own_reports'))
       $options = array('max_rank'=>$max_rank,'include_self'=>true);


@@ -202,11 +209,11 @@ if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
 if ($user->can('view_reports') || $user->can('view_all_reports'))
   $form->addInput(array('type'=>'checkbox','name'=>'chip'));
   $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
 if ($user->can('view_reports') || $user->can('view_all_reports'))
   $form->addInput(array('type'=>'checkbox','name'=>'chip'));

-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)

   $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
   $form->addInput(array('type'=>'checkbox','name'=>'chproject'));

-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)

   $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
   $form->addInput(array('type'=>'checkbox','name'=>'chtask'));

-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {

   $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
   $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
 }
   $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
   $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
 }


@@ -226,9 +233,9 @@ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isCli
   $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
   $group_by_options['client'] = $i18n->get('form.reports.group_by_client');
   $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
   $group_by_options['client'] = $i18n->get('form.reports.group_by_client');

-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)

   $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
   $group_by_options['project'] = $i18n->get('form.reports.group_by_project');

-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)

   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
 if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
 if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];


@@ -253,7 +260,7 @@ $bean = new ActionForm('reportBean', $form, $request);
 if ($request->isGet() && !$bean->isSaved()) {
   // No previous form data were found in session. Use the following default values.
   $form->setValueByElement('users', array_keys($user_list));
 if ($request->isGet() && !$bean->isSaved()) {
   // No previous form data were found in session. Use the following default values.
   $form->setValueByElement('users', array_keys($user_list));

-  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format));
+  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));

   $form->setValueByElement('start_date', $period->getStartDate());
   $form->setValueByElement('end_date', $period->getEndDate());
   $form->setValueByElement('chclient', '1');
   $form->setValueByElement('start_date', $period->getStartDate());
   $form->setValueByElement('end_date', $period->getEndDate());
   $form->setValueByElement('chclient', '1');


@@ -283,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->id, $bean);
+      ttFavReportHelper::loadReport($user->getUser(), $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)