From: Nik Okuntseff Date: Mon, 26 Nov 2018 19:04:56 +0000 (+0000) Subject: A bit more refactoring for subgroups. X-Git-Tag: timetracker_1.19-1~540 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5492c8b02d8f7ff98a159c01948101000d98e06e;p=timetracker.git A bit more refactoring for subgroups. --- diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php index e557676f..8f673f43 100644 --- a/WEB-INF/lib/ttClientHelper.class.php +++ b/WEB-INF/lib/ttClientHelper.class.php @@ -31,9 +31,11 @@ class ttClientHelper { // The getClient looks up a client by id. static function getClient($client_id, $all_fields = false) { - - $mdb2 = getConnection(); global $user; + $mdb2 = getConnection(); + + $group_id = $user->getGroup(); + $org_id = $user->org_id; $sql = 'select '; if ($all_fields) @@ -41,7 +43,7 @@ class ttClientHelper { else $sql .= 'name '; - $sql .= "from tt_clients where group_id = ".$user->getGroup(). + $sql .= "from tt_clients where group_id = $group_id and org_id = $org_id". " and id = $client_id and (status = 1 or status = 0)"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index 13e5dea0..3d67f6a7 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -155,7 +155,7 @@ class ttInvoiceHelper { // It is anticipated to support "totals only" option later on. // Our query is different depending on tracking mode. - if (MODE_TIME == $user->tracking_mode) { + if (MODE_TIME == $user->getTrackingMode()) { // In "time only" tracking mode there is a single user rate. $sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name, t.name as task_name, l.comment as note, @@ -258,7 +258,7 @@ class ttInvoiceHelper { if (isset($fields['project_id'])) $project_id = (int) $fields['project_id']; // Our query is different depending on tracking mode. - if (MODE_TIME == $user->tracking_mode) { + if (MODE_TIME == $user->getTrackingMode()) { // In "time only" tracking mode there is a single user rate. $sql = "select count(*) as num from tt_log l, tt_users u where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL @@ -344,7 +344,7 @@ class ttInvoiceHelper { $last_id = $val['last_insert_id']; // Our update sql is different depending on tracking mode. - if (MODE_TIME == $user->tracking_mode) { + if (MODE_TIME == $user->getTrackingMode()) { // In "time only" tracking mode there is a single user rate. $sql = "update tt_log l left join tt_users u on (u.id = l.user_id) @@ -426,6 +426,9 @@ class ttInvoiceHelper { $style_tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;'; $style_tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;'; + // Determine tracking mode once for multiple reuse below. + $trackingMode = $user->getTrackingMode(); + // Start creating email body. $body = ''; $body .= ''; @@ -451,9 +454,9 @@ class ttInvoiceHelper { $body .= ''; $body .= ''.$i18n->get('label.date').''; $body .= ''.$i18n->get('form.invoice.person').''; - if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) + if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode) $body .= ''.$i18n->get('label.project').''; - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) + if (MODE_PROJECTS_AND_TASKS == $trackingMode) $body .= ''.$i18n->get('label.task').''; $body .= ''.$i18n->get('label.note').''; $body .= ''.$i18n->get('label.duration').''; @@ -463,9 +466,9 @@ class ttInvoiceHelper { $body .= ''; $body .= ''.$item['date'].''; $body .= ''.htmlspecialchars($item['user_name']).''; - if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) + if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode) $body .= ''.htmlspecialchars($item['project_name']).''; - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) + if (MODE_PROJECTS_AND_TASKS == $trackingMode) $body .= ''.htmlspecialchars($item['task_name']).''; $body .= ''.htmlspecialchars($item['note']).''; $body .= ''.$item['duration'].''; @@ -474,9 +477,9 @@ class ttInvoiceHelper { } // Output summary. $colspan = 4; - if (MODE_PROJECTS == $user->tracking_mode) + if (MODE_PROJECTS == $trackingMode) $colspan++; - elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) + elseif (MODE_PROJECTS_AND_TASKS == $trackingMode) $colspan += 2; $body .= ' '; if ($tax) { diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 40949083..dba4a8b6 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.28.4525 | Copyright © Anuko | +  Anuko Time Tracker 1.18.28.4526 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}