X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=2344fe321e63b8cc5da0b2a5ea3846ad99dacbf6;hb=7706d5a5ca4aa6f4f093beadbf688d2cccaa4bef;hp=2ae75923fd4be432a368f2efefb7379b3f9031de;hpb=983bd79a9542306ecbd0f1be372d7006e7b337e1;p=timetracker.git diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 2ae75923..2344fe32 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -269,7 +269,7 @@ class ttTeamHelper { $result = array(); $mdb2 = getConnection(); - $sql = "select id, name, rights from tt_roles where team_id = $team_id and status = 1 order by upper(name)"; + $sql = "select id, name, rank, description from tt_roles where team_id = $team_id and status = 1 order by rank"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -286,8 +286,8 @@ class ttTeamHelper { $result = array(); $mdb2 = getConnection(); - $sql = "select id, name, rights from tt_roles - where team_id = $team_id and status = 0 order by upper(name)"; + $sql = "select id, name, rank, description from tt_roles + where team_id = $team_id and status = 0 order by rank"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -298,6 +298,23 @@ class ttTeamHelper { return $result; } + // getAllRoles - obtains all roles defined for team. + static function getAllRoles($team_id) { + $mdb2 = getConnection(); + + $result = array(); + $sql = "select * from tt_roles 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; + } + // The getActiveClients returns an array of active clients for team. static function getActiveClients($team_id, $all_fields = false) { @@ -520,23 +537,6 @@ class ttTeamHelper { return false; } - // getRoles - obtains all roles defined for team. - static function getRoles($team_id) { - $mdb2 = getConnection(); - - $result = array(); - $sql = "select * from tt_roles 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; - } - // getExpenseItems - obtains all expense items for all users in team. static function getExpenseItems($team_id) { $mdb2 = getConnection();