Timetracking: adapt filters to lazy load

Author: lbayle

classes/config.class.php

@@ -126,7 +126,7 @@ class Config {
    const id_userGroups = 'userGroups';
    const id_importRelationshipTreeToCommandOptions = 'importRelationshipTreeToCommandOptions';
 
-   const default_timetrackingFilters = "onlyAssignedTo:0,hideResolved:0,hideForbidenStatus:1,hideNoActivitySince:3";
+   const default_timetrackingFilters = "onlyAssignedTo:0,hideResolved:0,hideForbidenStatus:1";
    const default_timetrackingForbidenStatusList = "90"; // 90:closed (do not include 'new')
 
    // TODO Move to a more appropriate class

classes/team.class.php

@@ -1549,8 +1549,9 @@ public function getUdcValue($userid, $timestamp, $targetCurrency=NULL, $isRaw=FA
     *
     * @return array of status_id => status_name
     */
-   function getTimetrackingForbidenStatusList($project_id = 0) {
+   function getTimetrackingForbidenStatusList($project_id) {
 
+      $timetrackingForbidenStatusList= array();
       $keyExists =  Config::keyExists(Config::id_timetrackingForbidenStatusList, array(0, $project_id, $this->id, 0, 0, 0));
 
       // externalTasks should not be edited, but only allowed status is 'closed'

classes/user.class.php

@@ -1099,7 +1099,7 @@ public function getAvailableTime($timestamp) {
     * if not found, use defaults settings defined in constants.php
     *
     * id = 'id_timetrackingFilters'
-    * type = keyValue  "onlyAssignedTo:0,hideResolved:1,hideForbidenStatus:0,hideNoActivitySince:3"
+    * type = keyValue  "onlyAssignedTo:0,hideResolved:1,hideForbidenStatus:0"
     *
     * @param string $filterName 'onlyAssignedTo'
     * @return unknown_type returns filterValue

timetracking/time_tracking.php

@@ -103,17 +103,8 @@ protected function display() {
                $isFilter_hideResolved = isset($_POST["cb_hideResolved"]) ? '1' : '0';
                //$isFilter_hideForbidenStatus = isset($_POST["cb_hideForbidenStatus"])   ? '1' : '0';
 
-               $isFilter_hideNoActivitySince = isset($_POST["cb_hideNoActivitySince"]) ? '1' : '0';
-               if (!$isFilter_hideNoActivitySince) {
-                  // if unchecked, then hide none
-                  $hideNoActivitySince = 0;
-               } else {
-                  $hideNoActivitySince = Tools::getSecurePOSTIntValue('hideNoActivitySince');
-               }
-
                $managed_user->setTimetrackingFilter('onlyAssignedTo', $isFilter_onlyAssignedTo);
                $managed_user->setTimetrackingFilter('hideResolved', $isFilter_hideResolved);
-               $managed_user->setTimetrackingFilter('hideNoActivitySince', $hideNoActivitySince);
                //$managed_user->setTimetrackingFilter('hideForbidenStatus', $isFilter_hideForbidenStatus);
 
             }
@@ -154,19 +145,6 @@ protected function display() {
             $isHideForbidenStatus = ('0' == $managed_user->getTimetrackingFilter('hideForbidenStatus')) ? false : true;
             $this->smartyHelper->assign('isHideForbidenStatus', $isHideForbidenStatus);
 
-            $hideNoActivitySince = $managed_user->getTimetrackingFilter('hideNoActivitySince');
-            if (0 == $hideNoActivitySince) {
-               // uncheck, but set value to default (instead of zero)
-               $this->smartyHelper->assign('isHideNoActivitySince', false);
-               $defaultFilters = Tools::doubleExplode(':', ',', Config::default_timetrackingFilters);
-               $hideNoActivitySince =  $defaultFilters['hideNoActivitySince'];
-            } else {
-               $this->smartyHelper->assign('isHideNoActivitySince', true);
-            }
-            $this->smartyHelper->assign('hideNoActivitySince', $hideNoActivitySince);
-
-            //$availableIssues = TimeTrackingTools::getIssues($this->teamid, $defaultProjectid, $isOnlyAssignedTo, $managed_user->getId(), $projList, $isHideResolved, $isHideForbidenStatus, $defaultBugid, $hideNoActivitySince);
-
             $this->smartyHelper->assign('jobs', SmartyTools::getSmartyArray(TimeTrackingTools::getJobs($defaultProjectid, $this->teamid), $job));
             $this->smartyHelper->assign('duration', SmartyTools::getSmartyArray(TimeTrackingTools::getDurationList($this->teamid),$duration));
 

timetracking/time_tracking_ajax.php

@@ -49,9 +49,6 @@
          $isHideResolved = ('0' == $managedUser->getTimetrackingFilter('hideResolved')) ? false : true;
          //$isHideForbidenStatus = ('0' == $managedUser->getTimetrackingFilter('hideForbidenStatus')) ? false : true;
          $isHideForbidenStatus=true;
-         $hideNoActivitySince = $managedUser->getTimetrackingFilter('hideNoActivitySince');
-//         $availableIssues = TimeTrackingTools::getIssues($teamid, $defaultProjectid, $isOnlyAssignedTo, $managedUserid, $projList, $isHideResolved, $isHideForbidenStatus, 0, $hideNoActivitySince);
-         
 
          $data = array();
          try {
@@ -61,9 +58,33 @@
                   $projList = array ();
                      $projectidList = array_keys($team->getProjects(true, false, true));
                }
+
                $issueList = Issue::search($searchStr, $projectidList);
-               // https://select2.org/data-sources/formats
                foreach ($issueList as $issue) {
+
+                  $project1 = ProjectCache::getInstance()->getProject($issue->getProjectId());
+
+                  // except for SideTask & ExternalTask
+                  if ((false == $project1->isExternalTasksProject()) &&
+                      (false == $project1->isSideTasksProject(array($teamid)))) {
+
+                     if ($isOnlyAssignedTo && ($managedUserid != $issue->getHandlerId())) {
+                        //$logger->error("isOnlyAssignedTo : ".$issue->getId()." handler=".$issue->getHandlerId() );
+                        continue;
+                     }
+                     if ($isHideResolved && $issue->isResolved()) {
+                        //$logger->error("isHideResolved : ".$issue->getId()." status=".$issue->getStatus() );
+                        continue;
+                     }
+                     if ($isHideForbidenStatus) {
+                        $ttForbidenStatusList = array_keys($team->getTimetrackingForbidenStatusList($issue->getProjectId()));
+                        if (in_array($issue->getStatus(), $ttForbidenStatusList)) {
+                           //$logger->error("forbidden : ".$issue->getId()." status=".$issue->getStatus() );
+                           continue;
+                        }
+                     }
+                  }
+                  // https://select2.org/data-sources/formats
                   $data[] = array('id'=>$issue->getId(), 'text'=>$issue->getFormattedIds().' : '.$issue->getSummary());
                }
             }

tpl/time_tracking.html

@@ -48,7 +48,7 @@ <h2>{$managedUser_realname}</h2>
             </select>
             {/if}
             <a title="{t}Set filters{/t}" id="filters" style="text-decoration: none" href="{$page}">
-               {if $isOnlyAssignedTo || $isHideResolved || ($isHideNoActivitySince)}
+               {if $isOnlyAssignedTo || $isHideResolved}
                <img border="0" width="16" height="12" align="absmiddle" src="images/im-filter-active.png" alt="{t}Set filters{/t}" />
                {else}
                <img border="0" width="16" height="12" align="absmiddle" src="images/im-filter.png" alt="{t}Set filters{/t}" />
@@ -125,14 +125,6 @@ <h2>{$managedUser_realname}</h2>
             <fieldset>
 
                <table class="invisible">
-                  <tr>
-                     <td><input type="checkbox" id="cb_hideNoActivitySince" name="cb_hideNoActivitySince" {if ($isHideNoActivitySince)} checked="checked" {/if}/></td>
-                     <td>
-                        <label>{t}Hide tasks with no activity since{/t} </label>
-                        <input id="hideNoActivitySince" name="hideNoActivitySince" value="{$hideNoActivitySince}" style="width:20px;"/>
-                        <label>{t}month{/t}</label>
-                     </td>
-                  </tr>
                   <tr>
                      <td><input type="checkbox" id="cb_onlyAssignedTo" name="cb_onlyAssignedTo" {if $isOnlyAssignedTo} checked="checked" {/if}/></td>
                      <td><label for="cb_onlyAssignedTo">{t}Hide tasks not assigned to me{/t}</label></td>