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 $record_type = 0; // Record type (duration vs start and finish, or both).
+ var $allow_overlap = 0; // Whether to allow overlapping time entries.
var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
var $bcc_email = null; // Bcc email.
var $currency = null; // Currency.
var $plugins = null; // Comma-separated list of enabled plugins.
+ var $config = null; // Comma-separated list of miscellaneous config options.
var $team = null; // Team name.
var $custom_logo = 0; // Whether to use a custom logo for team.
- var $address = null; // Address for invoices.
var $lock_spec = null; // Cron specification for record locking.
- var $workday_hours = 8; // Number of work hours in a regular day.
+ var $workday_minutes = 480; // Number of work minutes in a regular day.
var $rights = 0; // A mask of user rights.
// Constructor.
$mdb2 = getConnection();
$sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name,
- t.address, t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
+ t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
t.tracking_mode, t.project_required, t.task_required, t.record_type, t.uncompleted_indicators,
- t.bcc_email, t.plugins, t.lock_spec, t.workday_hours, t.custom_logo
+ t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
if ($id)
$sql .= "u.id = $id";
$this->project_required = $val['project_required'];
$this->task_required = $val['task_required'];
$this->record_type = $val['record_type'];
- $this->uncompleted_indicators = $val['uncompleted_indicators'];
+ // $this->uncompleted_indicators = $val['uncompleted_indicators']; // TODO: remove the field from query and drop the field.
$this->bcc_email = $val['bcc_email'];
$this->team = $val['team_name'];
- $this->address = $val['address'];
$this->currency = $val['currency'];
$this->plugins = $val['plugins'];
$this->lock_spec = $val['lock_spec'];
- $this->workday_hours = $val['workday_hours'];
+ $this->workday_minutes = $val['workday_minutes'];
$this->custom_logo = $val['custom_logo'];
+ $this->config = $val['config'];
+ $config_array = explode(',', $this->config);
+
+ // Set user config options.
+ $this->show_holidays = in_array('show_holidays', $config_array);
+ $this->allow_overlap = in_array('allow_overlap', $config_array);
+ $this->uncompleted_indicators = in_array('uncompleted_indicators', $config_array);
+
// Set "on behalf" id and name.
if (isset($_SESSION['behalf_id'])) {
$this->behalf_id = $_SESSION['behalf_id'];