Started using quota percent for users if defined.

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

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 60f4f984b40c5f61a374e2ca35f4a7ab13dd8c2c..7d6ee6dee070a72af7992535f6152fdd9800a5fa 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -28,7 +28,10 @@
 
 import('ttConfigHelper');
 import('ttGroupHelper');
 
 import('ttConfigHelper');
 import('ttGroupHelper');

+import('ttBehalfUser');

 import('ttGroup');
 import('ttGroup');

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

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


@@ -40,6 +43,7 @@ class ttUser {
   var $role_name = null;        // Role name.
   var $rank = null;             // User role rank.
   var $client_id = null;        // Client id for client user role.
   var $role_name = null;        // Role name.
   var $rank = null;             // User role rank.
   var $client_id = null;        // Client id for client user role.

+  var $quota_percent = 100.0;   // Time quota percent for quotas plugin.

   var $behalf_id = null;        // User id, on behalf of whom we are working.
   var $behalf_group_id = null;  // Group id, on behalf of which we are working.
   var $behalf_name = null;      // User name, on behalf of whom we are working.
   var $behalf_id = null;        // User id, on behalf of whom we are working.
   var $behalf_group_id = null;  // Group id, on behalf of which we are working.
   var $behalf_name = null;      // User name, on behalf of whom we are working.


@@ -59,7 +63,6 @@ class ttUser {
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.

-  var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).

   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.


@@ -71,10 +74,8 @@ class ttUser {
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.

-  var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
-  var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
-  var $unit_totals_only = 0;    // Totals only option for the Work units plugin.

 
 

+  var $behalfUser = null;       // A ttBehalfUser instance with on behalf user attributes.

   var $behalfGroup = null;      // A ttGroup instance with on behalf group attributes.
 
   // Constructor.
   var $behalfGroup = null;      // A ttGroup instance with on behalf group attributes.
 
   // Constructor.


@@ -86,11 +87,11 @@ class ttUser {
 
     $mdb2 = getConnection();
 
 
     $mdb2 = getConnection();
 

-    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email,
-      g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start,
-      g.tracking_mode, g.project_required, g.task_required, g.record_type,
-      g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo
-      FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
+      " u.quota_percent, u.email, g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
+      " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type,".
+      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo".
+      " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";

     if ($id)
       $sql .= "u.id = $id";
     else
     if ($id)
       $sql .= "u.id = $id";
     else


@@ -112,9 +113,10 @@ class ttUser {
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);

-      $this->is_client = !in_array('track_own_time', $this->rights);

       $this->rank = $val['rank'];
       $this->client_id = $val['client_id'];
       $this->rank = $val['rank'];
       $this->client_id = $val['client_id'];

+      $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
+      if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];

       $this->email = $val['email'];
       $this->lang = $val['lang'];
       $this->decimal_mark = $val['decimal_mark'];
       $this->email = $val['email'];
       $this->lang = $val['lang'];
       $this->decimal_mark = $val['decimal_mark'];


@@ -142,19 +144,13 @@ class ttUser {
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');

-      $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
-      if ($this->isPluginEnabled('wu')) {
-        $minutes_in_unit = $config->getIntValue('minutes_in_unit');
-        if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
-        $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
-        if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
-        $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
-      }

       
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
         $this->behalf_id = $_SESSION['behalf_id'];
         $this->behalf_name = $_SESSION['behalf_name'];
       
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
         $this->behalf_id = $_SESSION['behalf_id'];
         $this->behalf_name = $_SESSION['behalf_name'];

+
+        $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);

       }
       // Set "on behalf" id and name (group).
       if (isset($_SESSION['behalf_group_id'])) {
       }
       // Set "on behalf" id and name (group).
       if (isset($_SESSION['behalf_group_id'])) {


@@ -166,9 +162,14 @@ class ttUser {
     }
   }
 
     }
   }
 

-  // The getUser returns user id on behalf of whom the current user is operating.
+  // getUser returns user id on behalf of whom the current user is operating.

   function getUser() {
   function getUser() {

-    return ($this->behalf_id ? $this->behalf_id : $this->id);
+    return ($this->behalfUser ? $this->behalfUser->id : $this->id);
+  }
+
+  // getQuotaPercent returns quota percent for active user.
+  function getQuotaPercent() {
+    return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);

   }
 
   // The getGroup returns group id on behalf of which the current user is operating.
   }
 
   // The getGroup returns group id on behalf of which the current user is operating.


@@ -181,6 +182,16 @@ class ttUser {
     return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
   }
 
     return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
   }
 

+  // getDateFormat returns date format for active group.
+  function getDateFormat() {
+    return ($this->behalfGroup ? $this->behalfGroup->date_format : $this->date_format);
+  }
+
+  // getTimeFormat returns time format for active group.
+  function getTimeFormat() {
+    return ($this->behalfGroup ? $this->behalfGroup->time_format : $this->time_format);
+  }
+

   // getTrackingMode returns tracking mode for active group.
   function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
   // getTrackingMode returns tracking mode for active group.
   function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);


@@ -191,11 +202,26 @@ class ttUser {
     return ($this->behalfGroup ? $this->behalfGroup->record_type : $this->record_type);
   }
 
     return ($this->behalfGroup ? $this->behalfGroup->record_type : $this->record_type);
   }
 

+  // getCurrency returns currency string for active group.
+  function getCurrency() {
+    return ($this->behalfGroup ? $this->behalfGroup->currency : $this->currency);
+  }
+

   // getPlugins returns plugins string for active group.
   function getPlugins() {
     return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins);
   }
 
   // getPlugins returns plugins string for active group.
   function getPlugins() {
     return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins);
   }
 

+  // getLockSpec returns lock specification for active group.
+  function getLockSpec() {
+    return ($this->behalfGroup ? $this->behalfGroup->lock_spec : $this->lock_spec);
+  }
+
+  // getWorkdayMinutes returns workday_minutes for active group.
+  function getWorkdayMinutes() {
+    return ($this->behalfGroup ? $this->behalfGroup->workday_minutes : $this->workday_minutes);
+  }
+

   // getConfig returns config string for active group.
   function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
   // getConfig returns config string for active group.
   function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);


@@ -210,6 +236,12 @@ class ttUser {
     return $config->getDefinedValue($name);
   }
 
     return $config->getDefinedValue($name);
   }
 

+  // getConfigInt retruns an integer value defined in a group, or false.
+  function getConfigInt($name, $defaultVal) {
+    $config = new ttConfigHelper($this->getConfig());
+    return $config->getIntValue($name, $defaultVal);
+  }
+

   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);


@@ -232,11 +264,14 @@ class ttUser {
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 

-    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
+    $user_id = $this->getUser();
+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+

     // Do a query with inner join to get assigned projects.
     // Do a query with inner join to get assigned projects.

-    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
-      inner join tt_user_project_binds upb on (upb.user_id = ".$this->getUser()." and upb.project_id = p.id and upb.status = 1)
-      where p.group_id = $group_id and p.status = 1 order by p.name";
+    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p".
+      " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {


@@ -266,8 +301,11 @@ class ttUser {
     $mdb2 = getConnection();
     $tasks = implode(',', $task_ids); // This is a comma-separated list of task ids.
 
     $mdb2 = getConnection();
     $tasks = implode(',', $task_ids); // This is a comma-separated list of task ids.
 

+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+

     $sql = "select id, name, description from tt_tasks".
     $sql = "select id, name, description from tt_tasks".

-      " where group_id = $this->group_id and status = 1 and id in ($tasks) order by name";
+      " where group_id = $group_id and org_id = $org_id and status = 1 and id in ($tasks) order by name";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {


@@ -290,9 +328,12 @@ class ttUser {
 
     $mdb2 = getConnection();
 
 
     $mdb2 = getConnection();
 

+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+

     // Get active clients for group.
     $clients = array();
     // Get active clients for group.
     $clients = array();

-    $sql = "select id, name, address, projects from tt_clients where group_id = $this->group_id and status = 1";
+    $sql = "select id, name, address, projects from tt_clients where group_id = $group_id and org_id = $org_id and status = 1";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {


@@ -310,7 +351,7 @@ class ttUser {
     if (!$this->isPluginEnabled('lk'))
       return false; // Locking feature is disabled.
 
     if (!$this->isPluginEnabled('lk'))
       return false; // Locking feature is disabled.
 

-    if (!$this->lock_spec)
+    if (!$this->getLockSpec())

       return false; // There is no lock specification.
 
     if (!$this->behalf_id && $this->can('override_own_date_lock'))
       return false; // There is no lock specification.
 
     if (!$this->behalf_id && $this->can('override_own_date_lock'))


@@ -323,7 +364,7 @@ class ttUser {
     require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
 
     // Calculate the last occurrence of a lock.
     require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
 
     // Calculate the last occurrence of a lock.

-    $last = tdCron::getLastOccurrence($this->lock_spec, time());
+    $last = tdCron::getLastOccurrence($this->getLockSpec(), time());

     $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
     if ($date->before($lockdate))
       return true;
     $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
     if ($date->before($lockdate))
       return true;


@@ -519,7 +560,7 @@ class ttUser {
   // - subgroup must ve valid;
   // - user should be a member of it.
   function checkBehalfId() {
   // - subgroup must ve valid;
   // - user should be a member of it.
   function checkBehalfId() {

-    if (!$this->behalf_group_id) {
+    if (!$this->behalfGroup) {

       // Checking user from home group.
       $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
       $users = $this->getUsers($options);
       // Checking user from home group.
       $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
       $users = $this->getUsers($options);


@@ -529,7 +570,7 @@ class ttUser {
       }
     } else {
       // Checking user from a subgroup.
       }
     } else {
       // Checking user from a subgroup.

-      $group_id = $this->behalf_group_id;
+      $group_id = $this->behalfGroup->id;

       if (!$this->isSubgroupValid($group_id))
         return false;
 
       if (!$this->isSubgroupValid($group_id))
         return false;
 


@@ -552,11 +593,10 @@ class ttUser {
   // In this case we still allow access to charts, but set behalf_id to someone else.
   // Another example: working in a subgroup on behalf of someone else.
   function adjustBehalfId() {
   // In this case we still allow access to charts, but set behalf_id to someone else.
   // Another example: working in a subgroup on behalf of someone else.
   function adjustBehalfId() {

-    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
-    $rank = $this->getMaxRankForGroup($group_id);
+    $rank = $this->getMaxRankForGroup($this->getGroup());

 
     // Adjust to first found user in group.
 
     // Adjust to first found user in group.

-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);

     $users = $this->getUsers($options);
     foreach($users as $one_user) {
       // Fake loop to access first element.
     $users = $this->getUsers($options);
     foreach($users as $one_user) {
       // Fake loop to access first element.


@@ -571,15 +611,10 @@ class ttUser {
 
   // updateGroup updates group information with new data.
   function updateGroup($fields) {
 
   // updateGroup updates group information with new data.
   function updateGroup($fields) {

-    if (!($this->can('manage_basic_settings') ||
-      $this->can('manage_advanced_settings') ||
-      $this->can('manage_features'))) return false;
-    // TODO: update the above for subgroup updates.
+    $mdb2 = getConnection();

 
     $group_id = $fields['group_id'];
     if ($group_id && !$this->isGroupValid($group_id)) return false;
 
     $group_id = $fields['group_id'];
     if ($group_id && !$this->isGroupValid($group_id)) return false;

-
-    $mdb2 = getConnection();

     if (!$group_id) $group_id = $this->getGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (!$group_id) $group_id = $this->getGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);


@@ -742,7 +777,7 @@ class ttUser {
       $user_part .= ' <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_name).'</span>';
     }
     if ($this->behalf_group_id) {
       $user_part .= ' <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_name).'</span>';
     }
     if ($this->behalf_group_id) {

-      $user_part .= ',  <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_group_name).'</span>';
+      $user_part .= ',  <span class="onBehalf">'.htmlspecialchars($this->behalf_group_name).'</span>';

     } else {
       if ($this->group_name) // Note: we did not require group names in the past.
         $user_part .= ', '.$this->group_name;
     } else {
       if ($this->group_name) // Note: we did not require group names in the past.
         $user_part .= ', '.$this->group_name;


@@ -764,6 +799,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;
 


@@ -782,17 +824,18 @@ class ttUser {
 
     $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
 
 
     $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
 

-    // Adjust on behalf user.
+    // Adjust on behalf user to first found user in subgroup.

     $this->adjustBehalfId();
     return;
   }
 
     $this->adjustBehalfId();
     return;
   }
 

-   // setOnBehalfUser sets on behalf user both the object and the session.
+  // setOnBehalfUser sets on behalf user both the object and the session.

   function setOnBehalfUser($user_id) {
 
     // Unset things first.
     $this->behalf_id = null;
     $this->behalf_name = null;
   function setOnBehalfUser($user_id) {
 
     // Unset things first.
     $this->behalf_id = null;
     $this->behalf_name = null;

+    unset($this->behalfUser);

     unset($_SESSION['behalf_id']);
     unset($_SESSION['behalf_name']);
 
     unset($_SESSION['behalf_id']);
     unset($_SESSION['behalf_name']);
 


@@ -808,6 +851,21 @@ class ttUser {
     $_SESSION['behalf_name'] = $onBehalfUserName;
     $this->behalf_id = $user_id;
     $this->behalf_name = $onBehalfUserName;
     $_SESSION['behalf_name'] = $onBehalfUserName;
     $this->behalf_id = $user_id;
     $this->behalf_name = $onBehalfUserName;

+
+    $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);

     return;
   }
     return;
   }

+
+  // The exists() function determines if an active user exists in context of a page.
+  // If we are working as self, true.
+  // If we are working in a subgroup with active users, true.
+  // If we are working in a subgroup without active users, false.
+  function exists() {
+    if (!$this->behalfGroup)
+      return true; // Working as self.
+    else if ($this->behalfGroup->active_users)
+      return true; // Subgroup has users.
+
+    return false;
+  }

 }
 }