else
$sql .= 'name ';
- $sql .= "from tt_clients where team_id = $user->team_id
- and id = $client_id and (status = 1 or status = 0)";
+ $sql .= "from tt_clients where group_id = ".$user->getActiveGroup().
+ " and id = $client_id and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
return false;
}
- // getClients - returns an array of active and inactive clients in a team.
+ // getClients - returns an array of active and inactive clients in a group.
static function getClients()
{
global $user;
$result = array();
$mdb2 = getConnection();
- $sql = "select id, name from tt_clients
- where team_id = $user->team_id and (status = 0 or status = 1) order by upper(name)";
+ $sql = "select id, name from tt_clients where group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1) order by upper(name)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
$mdb2 = getConnection();
global $user;
- $sql = "select id from tt_clients where team_id = $user->team_id and name = ".
- $mdb2->quote($client_name)." and (status = 1 or status = 0)";
+ $sql = "select id from tt_clients where group_id = ".$user->getActiveGroup().
+ " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$mdb2 = getConnection();
global $user;
- $sql = "select name, address from tt_clients where team_id = $user->team_id
- and id = $client_id and status is NULL";
+ $sql = "select name, address from tt_clients where group_id = ".$user->getActiveGroup().
+ " and id = $client_id and status is NULL";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
}
// Handle time records.
+ $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
if ($delete_client_entries) {
- $sql = "update tt_log set status = NULL where client_id = $id";
+ $sql = 'update tt_log set status = NULL'.$modified_part." where client_id = $id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
// Handle expense items.
if ($delete_client_entries) {
- $sql = "update tt_expense_items set status = NULL where client_id = $id";
+ $sql = 'update tt_expense_items set status = NULL'.$modified_part." where client_id = $id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
// Handle invoices.
if ($delete_client_entries) {
- $sql = "update tt_invoices set status = NULL where client_id = $id";
+ $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = ".$user->getActiveGroup();
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
if (is_a($affected, 'PEAR_Error'))
return false;
- $sql = "update tt_clients set status = NULL where id = $id and team_id = ".$user->team_id;
+ // Handle users for client.
+ $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = ".$user->getActiveGroup();
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error'))
+ return false;
+
+ // Mark client deleted.
+ $sql = "update tt_clients set status = NULL where id = $id and group_id = ".$user->getActiveGroup();
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
global $user;
$mdb2 = getConnection();
- $team_id = (int) $fields['team_id'];
+ $group_id = (int) $fields['group_id'];
+ $org_id = (int) $fields['org_id'];
$name = $fields['name'];
$address = $fields['address'];
$tax = $fields['tax'];
$tax = str_replace(',', '.', $tax);
if ($tax == '') $tax = 0;
- $sql = "insert into tt_clients (team_id, name, address, tax, projects, status)
- values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+ $sql = "insert into tt_clients (group_id, org_id, name, address, tax, projects, status)".
+ " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
// Update client properties in tt_clients table.
$comma_separated = implode(",", $projects); // This is a comma-separated list of associated project ids.
$sql = "update tt_clients set name = ".$mdb2->quote($name).", address = ".$mdb2->quote($address).
- ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status where team_id = ".$user->team_id." and id = ".$id;
+ ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status".
+ " where group_id = ".$user->getActiveGroup()." and id = ".$id;
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
- // The setMappedClient function is used during team import to change client_id value for tt_users to a mapped value.
- static function setMappedClient($team_id, $imported_id, $mapped_id)
+ // The setMappedClient function is used during group import to change client_id value for tt_users to a mapped value.
+ static function setMappedClient($group_id, $imported_id, $mapped_id)
{
$mdb2 = getConnection();
- $sql = "update tt_users set client_id = $mapped_id where client_id = $imported_id and team_id = $team_id ";
+ $sql = "update tt_users set client_id = $mapped_id where client_id = $imported_id and group_id = $group_id ";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
$mdb2 = getConnection();
// Do a query with inner join to get assigned projects.
- $sql = "select p.id, p.name from tt_projects p
- inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)
- where p.team_id = $user->team_id and p.status = 1 order by p.name";
+ $sql = "select p.id, p.name from tt_projects p".
+ " inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)".
+ " where p.group_id = ".$user->getActiveGroup()." and p.status = 1 order by p.name";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
$sql = "select distinct c.id, c.name, c.projects from tt_user_project_binds upb
inner join tt_client_project_binds cpb on (cpb.project_id = upb.project_id)
inner join tt_clients c on (c.id = cpb.client_id and c.status = 1)
- where upb.user_id = $user_id and upb.status = 1 order by c.name";
+ where upb.user_id = $user_id and upb.status = 1 order by upper(c.name)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
}
return $result;
}
-
- // getAssignedProjectsForUser - returns an array of projects assigned to a user and associatied with a client.
- static function getAssignedProjectsForUser($client_id)
- {
- global $user;
- $user_id = $user->getActiveUser();
-
- $result = array();
- $mdb2 = getConnection();
-
- // Do a query with inner join to get assigned projects.
- $sql = "select p.id, p.name from tt_projects p
- inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)
- 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.team_id = $user->team_id and p.status = 1 order by p.name";
- $res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
- while ($val = $res->fetchRow()) {
- $result[] = $val;
- }
- }
- return $result;
- }
}
projects / timetracker.git / blobdiff