From 870ef02e00ccf3c54edd893bfa84cfb4d692ac0a Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sat, 13 Apr 2019 21:13:08 +0000 Subject: [PATCH] Added custom field output on time.php as a rewrite of PR#76." --- WEB-INF/lib/ttTimeHelper.class.php | 43 ++++++++++++++++++++++++++++-- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/time.tpl | 6 +++++ time.php | 1 + 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index c3ae8d6d..5745128f 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -800,6 +800,7 @@ class ttTimeHelper { // getRecords - returns time records for a user for a given date. static function getRecords($user_id, $date) { + // TODO: merge getRecords and getRecordsWithFiles into one function. global $user; $mdb2 = getConnection(); @@ -814,16 +815,35 @@ class ttTimeHelper { 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"; + } + } + $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 from tt_log l $left_joins". + " 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); @@ -856,10 +876,29 @@ class ttTimeHelper { 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"; + } + } + $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)"; + } + } $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". @@ -870,7 +909,7 @@ class ttTimeHelper { " 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 from tt_log l $left_joins". + " 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); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 167779d1..c1c5bd53 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {/if} + {if $show_cf_1} + + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} {/if} @@ -127,6 +130,9 @@ {if $user->isPluginEnabled('cl')} {/if} + {if $show_cf_1} + + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} {/if} diff --git a/time.php b/time.php index 63f5b8cf..615f2ef9 100644 --- a/time.php +++ b/time.php @@ -403,6 +403,7 @@ $smarty->assign('selected_date', $selected_date); $smarty->assign('week_total', $week_total); $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date)); $smarty->assign('time_records', $timeRecords); +$smarty->assign('show_cf_1', $user->isPluginEnabled('cf')); $smarty->assign('show_files', $showFiles); $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list); -- 2.20.1
 Anuko Time Tracker 1.18.64.4933 | Copyright © Anuko | +  Anuko Time Tracker 1.18.65.4934 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index e531d2b6..049979ca 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -104,6 +104,9 @@ {if $user->isPluginEnabled('cl')} {$i18n.label.client}{$custom_fields->fields[0]['label']|escape}{$i18n.label.project}{$record.client|escape}{$record.cf_1|escape}{$record.project|escape}