var $date_format = null; // Date format.
var $time_format = null; // Time format.
var $week_start = 0; // Week start day.
- var $show_holidays = 0; // Whether to show holidays in calendar.
var $tracking_mode = 0; // Tracking mode.
var $project_required = 0; // Whether project selection is required on time entires.
var $task_required = 0; // Whether task selection is required on time entires.
var $custom_logo = 0; // Whether to use a custom logo for group.
var $lock_spec = null; // Cron specification for record locking.
+ var $holidays = null; // Holidays specification.
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.
$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".
+ " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.holidays, 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";
$this->currency = $val['currency'];
$this->plugins = $val['plugins'];
$this->lock_spec = $val['lock_spec'];
+ $this->holidays = $val['holidays'];
$this->workday_minutes = $val['workday_minutes'];
$this->custom_logo = $val['custom_logo'];
$this->configHelper = new ttConfigHelper($val['config']);
// Set user config options.
- $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
$this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
$this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
$this->future_entries = $this->configHelper->getDefinedValue('future_entries');
return ($this->behalfGroup ? $this->behalfGroup->time_format : $this->time_format);
}
+ // getWeekStart returns week start day for active group.
+ function getWeekStart() {
+ return ($this->behalfGroup ? $this->behalfGroup->week_start : $this->week_start);
+ }
+
// getTrackingMode returns tracking mode for active group.
function getTrackingMode() {
return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
return ($this->behalfGroup ? $this->behalfGroup->lock_spec : $this->lock_spec);
}
+ // getHolidays returns holidays specification for active group.
+ function getHolidays() {
+ return ($this->behalfGroup ? $this->behalfGroup->holidays : $this->holidays);
+ }
+
// getWorkdayMinutes returns workday_minutes for active group.
function getWorkdayMinutes() {
return ($this->behalfGroup ? $this->behalfGroup->workday_minutes : $this->workday_minutes);
return ($this->behalfGroup ? $this->behalfGroup->configHelper->getConfig() : $this->configHelper->getConfig());
}
+ // getConfigHelper returns ttConfigHelper instance for active group.
+ function getConfigHelper() {
+ return ($this->behalfGroup ? $this->behalfGroup->configHelper : $this->configHelper);
+ }
+
// getConfigOption returns true if an option is defined for group.
// This helps us keeping a set of user attributes smaller.
// We determine whether the option is set only on pages that need to know.
return $user_list;
}
- // getGroupsForDropdown obtains an array of groups to populate "Group" dropdown.
- // It consists of:
- // - User home group.
- // - The entire stack of groups all the way down to current on behalf group.
- // - All immediate children of the current on behalf group.
- // This allows user to navigate easily to home group, anything in between, and 1 level below.
+ // getGroupsForDropdown obtains an array of groups to populate the "Group" dropdown.
+ // It consists of the entire tree starting from user home group.
+ // Group name is prefixed with additional characters to indicate subgroups level.
function getGroupsForDropdown() {
- $mdb2 = getConnection();
+ global $user;
- // Start with subgroups.
+ // Start with user home group.
$groups = array();
- $group_id = $this->getGroup();
- $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
- $res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
- while ($val = $res->fetchRow()) {
- $groups[] = $val;
- }
- }
+ $subgroup_level = 0;
+ $group_id = $user->group_id;
- // Add current on behalf group to the beginning of array.
- $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
- $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
- array_unshift($groups, array('id'=>$selected_group_id,'name'=>$selected_group_name));
+ $this->addGroupToDropdown($groups, $group_id, $subgroup_level);
+ return $groups;
+ }
- // Iterate all the way to the home group, starting with selected ("on behalf") group.
- $current_group_id = $selected_group_id;
- while ($current_group_id != $this->group_id) {
- $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $current_group_id and status = 1";
- $res = $mdb2->query($sql);
- if (is_a($res, 'PEAR_Error')) return false;
+ // addGroupToDropdown is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
+ function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
+ // Add indentation markup to indicate subdirectory level.
+ for ($i = 0; $i < $subgroup_level; $i++) {
+ $name .= '🛑'; // Unicode stop sign.
+ }
+ if ($subgroup_level) $name .= ' '; // Add an extra space.
+ $name .= ttGroupHelper::getGroupName($group_id);
- $val = $res->fetchRow();
- $parent_id = $val['parent_id'];
- if ($parent_id) {
- // Get parent group name.
- $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
- $res = $mdb2->query($sql);
- if (is_a($res, 'PEAR_Error')) return false;
- $val = $res->fetchRow();
- if (!$val) return false;
- array_unshift($groups, array('id'=>$parent_id,'name'=>$val['name']));
- $current_group_id = $parent_id;
- } else {
- return false;
- }
+ $groups[] = array('id'=>$group_id, 'name'=>$name);
+
+ $subgroups = $this->getSubgroups($group_id);
+ foreach($subgroups as $subgroup) {
+ $this->addGroupToDropdown($groups, $subgroup['id'], $subgroup_level+1);
}
- return $groups;
}
// getSubgroups obtains a list of immediate subgroups.
projects / timetracker.git / blobdiff