From 05f0dada8939fad19e44c9ff26bad6ae578e34cc Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 22 Apr 2019 17:56:17 +0000 Subject: [PATCH] Merged getRecords and getRecordsWithFiles into one function to keep things compact. --- WEB-INF/lib/ttTimeHelper.class.php | 76 ++++-------------------------- WEB-INF/templates/footer.tpl | 2 +- time.php | 2 +- 3 files changed, 10 insertions(+), 70 deletions(-) diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index 0d5863ed..9ad64fc4 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -807,8 +807,7 @@ class ttTimeHelper { } // getRecords - returns time records for a user for a given date. - static function getRecords($date) { - // TODO: merge getRecords and getRecordsWithFiles into one function. + static function getRecords($date, $includeFiles = false) { global $user; $mdb2 = getConnection(); @@ -835,66 +834,11 @@ class ttTimeHelper { } } - $left_joins = " left join tt_projects p on (l.project_id = p.id)". - " left join tt_tasks t on (l.task_id = t.id)"; - if ($user->isPluginEnabled('cl')) - $left_joins .= " left join tt_clients c on (l.client_id = c.id)"; - if ($include_cf_1) { - if ($cf_1_type == CustomFields::TYPE_TEXT) - $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)"; - elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { - $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)". - " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)"; - } - } - - $result = array(); - $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,". - " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,". - " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,". - " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins". - " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1". - " order by l.start, l.id"; - $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - if($val['duration']=='0:00') - $val['finish'] = ''; - $result[] = $val; - } - } else return false; - - return $result; - } - - // getRecordsWithFiles - returns time records for a user for a given date - // with information whether they have attached files (has_files property). - // A separate fiunction from getRecords because sql here is more complex. - static function getRecordsWithFiles($date) { - global $user; - $mdb2 = getConnection(); - - $user_id = $user->getUser(); - $group_id = $user->getGroup(); - $org_id = $user->org_id; - - $sql_time_format = "'%k:%i'"; // 24 hour format. - if ('%I:%M %p' == $user->getTimeFormat()) - $sql_time_format = "'%h:%i %p'"; // 12 hour format for MySQL TIME_FORMAT function. - - $client_field = null; - if ($user->isPluginEnabled('cl')) - $client_field = ", c.name as client"; - - $include_cf_1 = $user->isPluginEnabled('cf'); - if ($include_cf_1) { - $custom_fields = new CustomFields(); - $cf_1_type = $custom_fields->fields[0]['type']; - if ($cf_1_type == CustomFields::TYPE_TEXT) { - $custom_field = ", cfl.value as cf_1"; - } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { - $custom_field = ", cfo.value as cf_1"; - } + if ($includeFiles) { + $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files'; + $fileJoin = " left join (select distinct entity_id from tt_files". + " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1". + " on (l.id = Sub1.entity_id)"; } $left_joins = " left join tt_projects p on (l.project_id = p.id)". @@ -909,17 +853,13 @@ class ttTimeHelper { " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)"; } } - - $left_joins .= " left join (select distinct entity_id from tt_files". - " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1". - " on (l.id = Sub1.entity_id)"; + $left_joins .= $fileJoin; $result = array(); $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,". " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,". " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,". - " if(Sub1.entity_id is null, 0, 1) as has_files,". - " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins". + " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field $filePart from tt_log l $left_joins". " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1". " order by l.start, l.id"; $res = $mdb2->query($sql); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 62a5cf42..5e674621 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.19.1.4970 | Copyright © Anuko | +  Anuko Time Tracker 1.19.1.4971 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/time.php b/time.php index 2a2c616b..d05f0c59 100644 --- a/time.php +++ b/time.php @@ -442,7 +442,7 @@ if ($request->isPost()) { } // isPost $week_total = ttTimeHelper::getTimeForWeek($selected_date); -$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($cl_date) : ttTimeHelper::getRecords($cl_date); +$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles); $smarty->assign('selected_date', $selected_date); $smarty->assign('week_total', $week_total); -- 2.20.1