X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=52f24fc67892f8300e7adaa2334b8de117377cc3;hb=cb8e3de960b758147b34d8323054e7de70548619;hp=493884ac00d3717a4e936cde731e70f14c5b00fc;hpb=9a23a8c0a51b7ec38a96f525484134f3cb85dc7e;p=timetracker.git diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 493884ac..52f24fc6 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -31,11 +31,11 @@ import('DateAndTime'); // Class ttTeamHelper - contains helper functions that operate with teams. class ttTeamHelper { - + // The getUserCount function returns number of people in team. static function getUserCount($team_id) { - $mdb2 = getConnection(); - + $mdb2 = getConnection(); + $sql = "select count(id) as cnt from tt_users where team_id = $team_id and status = 1"; $res = $mdb2->query($sql); @@ -45,18 +45,18 @@ class ttTeamHelper { } return false; } - + // The getUsersForClient obtains all active and inactive users in a team that are relevant to a client. static function getUsersForClient() { global $user; $mdb2 = getConnection(); - + $sql = "select u.id, u.name from tt_user_project_binds upb inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id) inner join tt_users u on (u.id = upb.user_id) where (u.status = 1 or u.status = 0) group by u.id - order by u.name"; + order by upper(u.name)"; $res = $mdb2->query($sql); $user_list = array(); if (is_a($res, 'PEAR_Error')) @@ -65,17 +65,17 @@ class ttTeamHelper { $user_list[] = $val; } return $user_list; - } + } // The getActiveUsers obtains all active users in a given team. static function getActiveUsers($options = null) { - global $user; + global $user; $mdb2 = getConnection(); - + if (isset($options['getAllFields'])) - $sql = "select * from tt_users where team_id = $user->team_id and status = 1 order by name"; + $sql = "select * from tt_users where team_id = $user->team_id and status = 1 order by upper(name)"; else - $sql = "select id, name from tt_users where team_id = $user->team_id and status = 1 order by name"; + $sql = "select id, name from tt_users where team_id = $user->team_id and status = 1 order by upper(name)"; $res = $mdb2->query($sql); $user_list = array(); if (is_a($res, 'PEAR_Error')) @@ -94,17 +94,16 @@ class ttTeamHelper { array_splice($user_list, $i+1, 1); // Remove duplicate. } } - } + } return $user_list; } - - + // The getUsers obtains all active and inactive (but not deleted) users in a given team. static function getUsers() { - global $user; + global $user; $mdb2 = getConnection(); - - $sql = "select id, name from tt_users where team_id = $user->team_id and (status = 1 or status = 0) order by name"; + + $sql = "select id, name from tt_users where team_id = $user->team_id and (status = 1 or status = 0) order by upper(name)"; $res = $mdb2->query($sql); $user_list = array(); if (is_a($res, 'PEAR_Error')) @@ -115,16 +114,15 @@ class ttTeamHelper { return $user_list; } - // The getInactiveUsers obtains all inactive users in a given team. static function getInactiveUsers($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) - $sql = "select * from tt_users where team_id = $team_id and status = 0 order by name"; + $sql = "select * from tt_users where team_id = $team_id and status = 0 order by upper(name)"; else - $sql = "select id, name from tt_users where team_id = $team_id and status = 0 order by name"; + $sql = "select id, name from tt_users where team_id = $team_id and status = 0 order by upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -135,15 +133,15 @@ class ttTeamHelper { } return false; } - + // The getAllUsers obtains all users in a given team. static function getAllUsers($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) - $sql = "select * from tt_users where team_id = $team_id order by name"; + $sql = "select * from tt_users where team_id = $team_id order by upper(name)"; else - $sql = "select id, name from tt_users where team_id = $team_id order by name"; + $sql = "select id, name from tt_users where team_id = $team_id order by upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -154,15 +152,15 @@ class ttTeamHelper { } return false; } - + // getActiveProjects - returns an array of active projects for team. static function getActiveProjects($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); $sql = "select id, name, description, tasks from tt_projects - where team_id = $team_id and status = 1 order by name"; + where team_id = $team_id and status = 1 order by upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -172,15 +170,15 @@ class ttTeamHelper { } return $result; } - + // getInactiveProjects - returns an array of inactive projects for team. static function getInactiveProjects($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); - + $sql = "select id, name, description, tasks from tt_projects - where team_id = $team_id and status = 0 order by name"; + where team_id = $team_id and status = 0 order by upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -190,15 +188,15 @@ class ttTeamHelper { } return $result; } - + // The getAllProjects obtains all projects in a given team. static function getAllProjects($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) - $sql = "select * from tt_projects where team_id = $team_id order by status, name"; + $sql = "select * from tt_projects where team_id = $team_id order by status, upper(name)"; else - $sql = "select id, name from tt_projects where team_id = $team_id order by status, name"; + $sql = "select id, name from tt_projects where team_id = $team_id order by status, upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -213,10 +211,10 @@ class ttTeamHelper { // getActiveTasks - returns an array of active tasks for team. static function getActiveTasks($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); - $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by name"; + $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -226,15 +224,15 @@ class ttTeamHelper { } return $result; } - + // getInactiveTasks - returns an array of inactive tasks for team. static function getInactiveTasks($team_id) { - $result = array(); + $result = array(); $mdb2 = getConnection(); - + $sql = "select id, name, description from tt_tasks - where team_id = $team_id and status = 0 order by name"; + where team_id = $team_id and status = 0 order by upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -244,15 +242,15 @@ class ttTeamHelper { } return $result; } - + // The getAllTasks obtains all tasks in a given team. static function getAllTasks($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) - $sql = "select * from tt_tasks where team_id = $team_id order by status, name"; + $sql = "select * from tt_tasks where team_id = $team_id order by status, upper(name)"; else - $sql = "select id, name from tt_tasks where team_id = $team_id order by status, name"; + $sql = "select id, name from tt_tasks where team_id = $team_id order by status, upper(name)"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -263,55 +261,58 @@ class ttTeamHelper { } return false; } - + // The getActiveClients returns an array of active clients for team. static function getActiveClients($team_id, $all_fields = false) { $result = array(); - $mdb2 = getConnection(); - - if ($all_fields) - $sql = "select * from tt_clients where team_id = $team_id and status = 1 order by name"; + $mdb2 = getConnection(); + + if ($all_fields) + $sql = "select * from tt_clients where team_id = $team_id and status = 1 order by upper(name)"; else - $sql = "select id, name from tt_clients where team_id = $team_id and status = 1 order by name"; - $res = $mdb2->query($sql); - $result = array(); - if (!is_a($res, 'PEAR_Error')) { + $sql = "select id, name from tt_clients where team_id = $team_id and status = 1 order by upper(name)"; + + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { - $result[] = $val; + $result[] = $val; } } return $result; } - + // The getInactiveClients returns an array of inactive clients for team. static function getInactiveClients($team_id, $all_fields = false) { $result = array(); - $mdb2 = getConnection(); - - if ($all_fields) - $sql = "select * from tt_clients where team_id = $team_id and status = 0 order by name"; + $mdb2 = getConnection(); + + if ($all_fields) + $sql = "select * from tt_clients where team_id = $team_id and status = 0 order by upper(name)"; else - $sql = "select id, name from tt_clients where team_id = $team_id and status = 0 order by name"; - $res = $mdb2->query($sql); + $sql = "select id, name from tt_clients where team_id = $team_id and status = 0 order by upper(name)"; + + $res = $mdb2->query($sql); $result = array(); - if (!is_a($res, 'PEAR_Error')) { + if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { $result[] = $val; } } return $result; } - + // The getAllClients obtains all clients in a given team. static function getAllClients($team_id, $all_fields = false) { $mdb2 = getConnection(); - + if ($all_fields) - $sql = "select * from tt_clients where team_id = $team_id order by status, name"; + $sql = "select * from tt_clients where team_id = $team_id order by status, upper(name)"; else - $sql = "select id, name from tt_clients where team_id = $team_id order by status, name"; + $sql = "select id, name from tt_clients where team_id = $team_id order by status, upper(name)"; + $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -326,79 +327,79 @@ class ttTeamHelper { // The getActiveInvoices returns an array of active invoices for team. static function getActiveInvoices($localizeDates = true) { - global $user; - + global $user; + $result = array(); - $mdb2 = getConnection(); - - if (ROLE_CLIENT == $user->role && $user->client_id) - $client_part = " and i.client_id = $user->client_id"; - - $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i - left join tt_clients c on (c.id = i.client_id) - where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name"; + $mdb2 = getConnection(); + + if (ROLE_CLIENT == $user->role && $user->client_id) + $client_part = " and i.client_id = $user->client_id"; + + $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i + left join tt_clients c on (c.id = i.client_id) + where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { $dt = new DateAndTime(DB_DATEFORMAT); while ($val = $res->fetchRow()) { - if ($localizeDates) { - $dt->parseVal($val['date']); + if ($localizeDates) { + $dt->parseVal($val['date']); $val['date'] = $dt->toString($user->date_format); - } - $result[] = $val; + } + $result[] = $val; } } return $result; } - + // The getAllInvoices returns an array of all invoices for team. static function getAllInvoices() { - global $user; - + global $user; + $result = array(); - $mdb2 = getConnection(); - - $sql = "select * from tt_invoices where team_id = $user->team_id"; + $mdb2 = getConnection(); + + $sql = "select * from tt_invoices where team_id = $user->team_id"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { $dt = new DateAndTime(DB_DATEFORMAT); while ($val = $res->fetchRow()) { - $result[] = $val; + $result[] = $val; } } return $result; } - + // The getRecentInvoices returns an array of recent invoices (max 3) for a client. static function getRecentInvoices($team_id, $client_id) { - global $user; - + global $user; + $result = array(); - $mdb2 = getConnection(); - - $sql = "select i.id, i.name from tt_invoices i - left join tt_clients c on (c.id = i.client_id) - where i.team_id = $team_id and i.status = 1 and c.id = $client_id - order by i.id desc limit 3"; + $mdb2 = getConnection(); + + $sql = "select i.id, i.name from tt_invoices i + left join tt_clients c on (c.id = i.client_id) + where i.team_id = $team_id and i.status = 1 and c.id = $client_id + order by i.id desc limit 3"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { $dt = new DateAndTime(DB_DATEFORMAT); while ($val = $res->fetchRow()) { - $result[] = $val; + $result[] = $val; } } return $result; } - + // getUserToProjectBinds - obtains all user to project binds for a team. static function getUserToProjectBinds($team_id) { $mdb2 = getConnection(); - + $result = array(); $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where team_id = $team_id) order by user_id, status, project_id"; $res = $mdb2->query($sql); @@ -411,7 +412,7 @@ class ttTeamHelper { } return false; } - + // The getAllCustomFields obtains all custom fields in a given team. static function getAllCustomFields($team_id) { $mdb2 = getConnection(); @@ -445,7 +446,7 @@ class ttTeamHelper { } return false; } - + // The getCustomFieldLog obtains all custom field log entries for a given team. static function getCustomFieldLog($team_id) { $mdb2 = getConnection(); @@ -462,7 +463,7 @@ class ttTeamHelper { } return false; } - + // getFavReports - obtains all favorite reports for all users in team. static function getFavReports($team_id) { $mdb2 = getConnection(); @@ -479,7 +480,7 @@ class ttTeamHelper { } return false; } - + // getExpenseItems - obtains all expense items for all users in team. static function getExpenseItems($team_id) { $mdb2 = getConnection(); @@ -496,7 +497,24 @@ class ttTeamHelper { } return false; } - + + // getPredefinedExpenses - obtains predefined expenses for team. + static function getPredefinedExpenses($team_id) { + $mdb2 = getConnection(); + + $result = array(); + $sql = "select id, name, cost from tt_predefined_expenses where team_id = $team_id"; + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $result[] = $val; + } + return $result; + } + return false; + } + // getNotifications - obtains notification descriptions for team. static function getNotifications($team_id) { $mdb2 = getConnection(); @@ -504,7 +522,24 @@ class ttTeamHelper { $result = array(); $sql = "select c.id, c.cron_spec, c.email, fr.name from tt_cron c left join tt_fav_reports fr on (fr.id = c.report_id) - where c.team_id = $team_id and c.status is not null"; + where c.team_id = $team_id and c.status is not null"; + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $result[] = $val; + } + return $result; + } + return false; + } + + // getMonthlyQuotas - obtains monthly quotas for team. + static function getMonthlyQuotas($team_id) { + $mdb2 = getConnection(); + + $result = array(); + $sql = "select year, month, quota from tt_monthly_quotas where team_id = $team_id"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -520,7 +555,7 @@ class ttTeamHelper { static function getTeams() { $result = array(); $mdb2 = getConnection(); - + $sql = "select id, name, lang, timestamp from tt_teams where status = 1 order by id desc"; $res = $mdb2->query($sql); $result = array(); @@ -533,61 +568,55 @@ class ttTeamHelper { } return false; } - + // The markDeleted function marks the team and everything in it as deleted. static function markDeleted($team_id) { - - // Iterate through team users and mark them as deleted. - $users = ttTeamHelper::getAllUsers($team_id); - foreach ($users as $one_user) { - if (!ttUserHelper::markDeleted($one_user['id'])) - return false; - } - + + // Iterate through team users and mark them as deleted. + $users = ttTeamHelper::getAllUsers($team_id); + foreach ($users as $one_user) { + if (!ttUserHelper::markDeleted($one_user['id'])) return false; + } + // Mark tasks deleted. - if (!ttTeamHelper::markTasksDeleted($team_id)) - return false; - - $mdb2 = getConnection(); - - // Mark projects deleted. + if (!ttTeamHelper::markTasksDeleted($team_id)) return false; + + $mdb2 = getConnection(); + + // Mark projects deleted. $sql = "update tt_projects set status = NULL where team_id = $team_id"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Mark clients deleted. + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark clients deleted. $sql = "update tt_clients set status = NULL where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; - // Mark custom fields deleted. + // Mark custom fields deleted. $sql = "update tt_custom_fields set status = NULL where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Mark team deleted. - $sql = "update tt_teams set status = NULL where id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; - return true; + // Mark team deleted. + $sql = "update tt_teams set status = NULL where id = $team_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + return true; } // The getTeamDetails function returns team details. static function getTeamDetails($team_id) { $result = array(); $mdb2 = getConnection(); - + $role_manager = ROLE_MANAGER; $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email from tt_teams t inner join tt_users u on (u.team_id = t.id and u.role = $role_manager) - where t.id = $team_id"; - + where t.id = $team_id"; + $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); @@ -596,78 +625,79 @@ class ttTeamHelper { return false; } - - // The insert function creates a new team. + + // The insert function creates a new team. static function insert($fields) { $mdb2 = getConnection(); - - if ($fields['lock_interval'] !== null) { - $locktime_f = ', locktime'; - $locktime_v = ", " . (int)$fields['lock_interval']; + + $lock_spec = $fields['lock_spec']; + if ($lock_spec !== null) { + $lockspec_f = ', lock_spec'; + $lockspec_v = ', ' . $mdb2->quote($lock_spec); } else { - $locktime_f = ''; - $locktime_v = ''; + $lockspec_f = ''; + $lockspec_v = ''; } - + $lang = $fields['lang']; if (!$lang) { global $i18n; $lang = $i18n->lang; } - + $decimal_mark = $fields['decimal_mark']; if ($decimal_mark !== null) { $decimal_mark_f = ', decimal_mark'; - $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark); + $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark); } else { $decimal_mark_f = ''; - $decimal_mark_v = ''; + $decimal_mark_v = ''; } $date_format = $fields['date_format']; if ($date_format !== null) { $date_format_f = ', date_format'; - $date_format_v = ', ' . $mdb2->quote($date_format); - } else if (defined('DATE_FORMAT_DEFAULT')) { + $date_format_v = ', ' . $mdb2->quote($date_format); + } elseif (defined('DATE_FORMAT_DEFAULT')) { $date_format_f = ', date_format'; $date_format_v = ', ' . $mdb2->quote(DATE_FORMAT_DEFAULT); } else { $date_format_f = ''; - $date_format_v = ''; + $date_format_v = ''; } $time_format = $fields['time_format']; if ($time_format !== null) { $time_format_f = ', time_format'; $time_format_v = ', ' . $mdb2->quote($time_format); - } else if (defined('TIME_FORMAT_DEFAULT')) { + } elseif (defined('TIME_FORMAT_DEFAULT')) { $time_format_f = ', time_format'; $time_format_v = ', ' . $mdb2->quote(TIME_FORMAT_DEFAULT); } else { $time_format_f = ''; - $time_format_v = ''; + $time_format_v = ''; } - + $week_start = $fields['week_start']; if ($week_start !== null) { $week_start_f = ', week_start'; $week_start_v = ', ' . (int)$week_start; - } else if (defined('WEEK_START_DEFAULT')) { + } elseif (defined('WEEK_START_DEFAULT')) { $week_start_f = ', week_start'; - $week_start_v = ', ' . (int)WEEK_START_DEFAULT; + $week_start_v = ', ' . (int)WEEK_START_DEFAULT; } else { $week_start_f = ''; - $week_start_v = ''; + $week_start_v = ''; } - + $plugins = $fields['plugins']; if ($plugins !== null) { $plugins_f = ', plugins'; $plugins_v = ', ' . $mdb2->quote($plugins); } else { $plugins_f = ''; - $plugins_v = ''; + $plugins_v = ''; } $tracking_mode = $fields['tracking_mode']; @@ -676,24 +706,41 @@ class ttTeamHelper { $tracking_mode_v = ', ' . (int)$tracking_mode; } else { $tracking_mode_f = ''; - $tracking_mode_v = ''; + $tracking_mode_v = ''; } - + $record_type = $fields['record_type']; if ($record_type !== null) { $record_type_f = ', record_type'; $record_type_v = ', ' . (int)$record_type; } else { $record_type_f = ''; - $record_type_v = ''; + $record_type_v = ''; + } + + $uncompleted_indicators = $fields['uncompleted_indicators']; + if ($uncompleted_indicators !== null) { + $uncompleted_indicators_f = ', uncompleted_indicators'; + $uncompleted_indicators_v = ', ' . (int)$uncompleted_indicators; + } else { + $uncompleted_indicators_f = ''; + $uncompleted_indicators_v = ''; + } + + $workday_hours = $fields['workday_hours']; + if ($workday_hours !== null) { + $workday_hours_f = ', workday_hours'; + $workday_hours_v = ', ' . (int)$workday_hours; + } else { + $workday_hours_f = ''; + $workday_hours_v = ''; } - - $sql = "insert into tt_teams (name, address, currency $locktime_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f) - values(". - $mdb2->quote(trim($fields['name'])). + + $sql = "insert into tt_teams (name, address, currency $lockspec_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f $uncompleted_indicators_f $workday_hours_f) + values(".$mdb2->quote(trim($fields['name'])). ", ".$mdb2->quote(trim($fields['address'])). - ", ".$mdb2->quote(trim($fields['currency']))." $locktime_v, ".$mdb2->quote($lang). - "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v)"; + ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v, ".$mdb2->quote($lang). + "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v $uncompleted_indicators_v $workday_hours_v)"; $affected = $mdb2->exec($sql); if (!is_a($affected, 'PEAR_Error')) { @@ -705,16 +752,15 @@ class ttTeamHelper { } // The update function updates team information. - static function update($team_id, $fields) + static function update($team_id, $fields) { - // We'll require team name to be always set. - if (!isset($fields['name'])) return false; + // We'll require team name to be always set. + if (!isset($fields['name']) || $fields['name'] == "") return false; - $mdb2 = getConnection(); - $name_part = 'name = '.$mdb2->quote($fields['name']); + $mdb2 = getConnection(); + $name_part = 'name = '.$mdb2->quote($fields['name']); $currency_part = ''; $addr_part = ''; - $locktime_part = ''; $lang_part = ''; $decimal_mark_part = ''; $date_format_part = ''; @@ -722,11 +768,13 @@ class ttTeamHelper { $week_start_part = ''; $tracking_mode_part = ''; $record_type_part = ''; + $uncompleted_indicators_part = ''; $plugins_part = ''; - + $lock_spec_part = ''; + $workday_hours_part = ''; + if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']); if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']); - if (isset($fields['locktime'])) $locktime_part = ', locktime = '.intval($fields['locktime']); if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']); if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']); if (isset($fields['date_format'])) $date_format_part = ', date_format = '.$mdb2->quote($fields['date_format']); @@ -734,20 +782,21 @@ class ttTeamHelper { if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']); if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']); if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']); + if (isset($fields['uncompleted_indicators'])) $uncompleted_indicators_part = ', uncompleted_indicators = '.intval($fields['uncompleted_indicators']); if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']); + if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']); + if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']); - $sql = "update tt_teams set $name_part $addr_part $currency_part $locktime_part $lang_part $decimal_mark_part - $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part $plugins_part where id = $team_id"; + $sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part + $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part + $uncompleted_indicators_part $plugins_part $lock_spec_part $workday_hours_part where id = $team_id"; $affected = $mdb2->exec($sql); - - if (is_a($affected, 'PEAR_Error')) { - return false; - } - + if (is_a($affected, 'PEAR_Error')) return false; + return true; } - - // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100). + + // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 25). static function getInactiveTeams() { $inactive_teams = array(); $mdb2 = getConnection(); @@ -760,24 +809,24 @@ class ttTeamHelper { $count = 0; if (!is_a($res, 'PEAR_Error')) { while ($val = $res->fetchRow()) { - $team_id = $val['id']; - if (ttTeamHelper::isTeamActive($team_id) == false) { - $count ++; - $inactive_teams[] = $team_id; - // Limit the array size for perfomance by allowing this operation on small chunks only. - if ($count >= 25) break; - } + $team_id = $val['id']; + if (ttTeamHelper::isTeamActive($team_id) == false) { + $count++; + $inactive_teams[] = $team_id; + // Limit the array size for perfomance by allowing this operation on small chunks only. + if ($count >= 100) break; + } } return $inactive_teams; } return false; } - + // The isTeamActive determines if a team is using Time Tracker or abandoned it. static function isTeamActive($team_id) { - $users = array(); - - $mdb2 = getConnection(); + $users = array(); + + $mdb2 = getConnection(); $sql = "select id from tt_users where team_id = $team_id"; $res = $mdb2->query($sql); if (is_a($res, 'PEAR_Error')) die($res->getMessage()); @@ -789,8 +838,8 @@ class ttTeamHelper { return false; // No users in team. $count = 0; - $ts = date('Y-m-d', strtotime('-2 years')); - $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'"; + $ts = date('Y-m-d', strtotime('-2 years')); + $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) { @@ -804,154 +853,141 @@ class ttTeamHelper { if ($count <= 5) { // We will consider a team inactive if it has 5 or less time entries made more than 1 year ago. $count_last_year = 0; - $ts = date('Y-m-d', strtotime('-1 year')); - $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'"; + $ts = date('Y-m-d', strtotime('-1 year')); + $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) { $count_last_year = $val['cnt']; } if ($count_last_year == 0) - return false; // No time entries for the last year and only a few entries before that... - } + return false; // No time entries for the last year and only a few entries before that. + } } return true; } - + // The delete function permanently deletes all data for a team. static function delete($team_id) { - $mdb2 = getConnection(); - - // Delete users. + $mdb2 = getConnection(); + + // Delete users. $sql = "select id from tt_users where team_id = $team_id"; $res = $mdb2->query($sql); if (is_a($res, 'PEAR_Error')) return false; while ($val = $res->fetchRow()) { $user_id = $val['id']; - if (!ttUserHelper::delete($user_id)) - return false; + if (!ttUserHelper::delete($user_id)) return false; } // Delete tasks. - if (!ttTeamHelper::deleteTasks($team_id)) - return false; - + if (!ttTeamHelper::deleteTasks($team_id)) return false; + // Delete client to project binds. $sql = "delete from tt_client_project_binds where client_id in (select id from tt_clients where team_id = $team_id)"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + if (is_a($affected, 'PEAR_Error')) return false; // Delete projects. - $sql = "delete from tt_projects where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Delete clients. - $sql = "delete from tt_clients where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Delete invoices. - $sql = "delete from tt_invoices where team_id = $team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Delete custom fields. - if (!ttTeamHelper::deleteCustomFields($team_id)) - return false; - + $sql = "delete from tt_projects where team_id = $team_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Delete clients. + $sql = "delete from tt_clients where team_id = $team_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Delete invoices. + $sql = "delete from tt_invoices where team_id = $team_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Delete custom fields. + if (!ttTeamHelper::deleteCustomFields($team_id)) return false; + // Delete team. $sql = "delete from tt_teams where id = $team_id"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + if (is_a($affected, 'PEAR_Error')) return false; return true; } // The markTasksDeleted deletes task binds and marks the tasks as deleted for a team. static function markTasksDeleted($team_id) { - $mdb2 = getConnection(); - $sql = "select id from tt_tasks where team_id = $team_id"; - $res = $mdb2->query($sql); - if (is_a($res, 'PEAR_Error')) return false; - while ($val = $res->fetchRow()) { - - // Delete task binds. - $task_id = $val['id']; - $sql = "delete from tt_project_task_binds where task_id = $task_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Mark task as deleted. - $sql = "update tt_tasks set status = NULL where id = $task_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - } - - return true; - } - + $mdb2 = getConnection(); + $sql = "select id from tt_tasks where team_id = $team_id"; + $res = $mdb2->query($sql); + if (is_a($res, 'PEAR_Error')) return false; + + while ($val = $res->fetchRow()) { + + // Delete task binds. + $task_id = $val['id']; + $sql = "delete from tt_project_task_binds where task_id = $task_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark task as deleted. + $sql = "update tt_tasks set status = NULL where id = $task_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + } + + return true; + } + // The deleteTasks deletes all tasks and task binds for an inactive team. static function deleteTasks($team_id) { - $mdb2 = getConnection(); - $sql = "select id from tt_tasks where team_id = $team_id"; - $res = $mdb2->query($sql); - if (is_a($res, 'PEAR_Error')) return false; - while ($val = $res->fetchRow()) { - - // Delete task binds. - $task_id = $val['id']; - $sql = "delete from tt_project_task_binds where task_id = $task_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Delete task. - $sql = "delete from tt_tasks where id = $task_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - } - - return true; - } - + $mdb2 = getConnection(); + $sql = "select id from tt_tasks where team_id = $team_id"; + $res = $mdb2->query($sql); + if (is_a($res, 'PEAR_Error')) return false; + + while ($val = $res->fetchRow()) { + + // Delete task binds. + $task_id = $val['id']; + $sql = "delete from tt_project_task_binds where task_id = $task_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Delete task. + $sql = "delete from tt_tasks where id = $task_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + } + + return true; + } + // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive team. static function deleteCustomFields($team_id) { - $mdb2 = getConnection(); - $sql = "select id from tt_custom_fields where team_id = $team_id"; - $res = $mdb2->query($sql); - if (is_a($res, 'PEAR_Error')) return false; - while ($val = $res->fetchRow()) { - $field_id = $val['id']; - - // Clean up tt_custom_field_log. - $sql = "delete from tt_custom_field_log where field_id = $field_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Clean up tt_custom_field_options. - $sql = "delete from tt_custom_field_options where field_id = $field_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - - // Delete custom field. - $sql = "delete from tt_custom_fields where id = $field_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; - } - - return true; + $mdb2 = getConnection(); + $sql = "select id from tt_custom_fields where team_id = $team_id"; + $res = $mdb2->query($sql); + if (is_a($res, 'PEAR_Error')) return false; + + while ($val = $res->fetchRow()) { + $field_id = $val['id']; + + // Clean up tt_custom_field_log. + $sql = "delete from tt_custom_field_log where field_id = $field_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Clean up tt_custom_field_options. + $sql = "delete from tt_custom_field_options where field_id = $field_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Delete custom field. + $sql = "delete from tt_custom_fields where id = $field_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + } + + return true; } } -?> \ No newline at end of file