From 75a1eedb8977b8f2db459128bab9aaf367e3b58b Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sun, 14 Apr 2019 20:49:46 +0000 Subject: [PATCH] Adjusted time.php to honor note on separate row option. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/time.tpl | 48 ++++++++++++++++++++++++------------ time.php | 48 +++++++++++++++++++++++++++++++++--- 3 files changed, 77 insertions(+), 21 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index af947bcc..0372c8dc 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {/if} -{if $user->isPluginEnabled('cl')} +{if $show_client} @@ -41,29 +41,31 @@ {/if} -{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} +{if $show_project} {/if} -{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} +{if $show_task} {/if} -{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} +{if $show_start} +{/if} +{if $show_finish} {/if} -{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} +{if $show_duration} @@ -101,50 +103,58 @@ {if $time_records}
 Anuko Time Tracker 1.18.65.4940 | Copyright © Anuko | +  Anuko Time Tracker 1.18.65.4941 | 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 049979ca..2b67e1cb 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -24,7 +24,7 @@ {$forms.timeRecordForm.user.control}
{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}: {$forms.timeRecordForm.client.control}{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:{$forms.timeRecordForm.cf_1.control}
{$i18n.label.project} (*): {$forms.timeRecordForm.project.control}
{$i18n.label.task}{if $user->task_required} (*){/if}: {$forms.timeRecordForm.task.control}
{$i18n.label.start}: {$forms.timeRecordForm.start.control} 
{$i18n.label.finish}: {$forms.timeRecordForm.finish.control} 
{$i18n.label.duration}: {$forms.timeRecordForm.duration.control} {if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}
- {if $user->isPluginEnabled('cl')} - + {if $show_client} + {/if} {if $show_cf_1} {/if} - {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} + {if $show_project} {/if} - {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} + {if $show_task} {/if} - {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} + {if $show_start} + {/if} + {if $show_finish} {/if} + {if $show_note_column} - - + {/if} {if $show_files} {/if} + + {foreach $time_records as $record} - {if $user->isPluginEnabled('cl')} + {if $show_client} {/if} {if $show_cf_1} {/if} - {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} + {if $show_project} {/if} - {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} + {if $show_task} {/if} - {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} + {if $show_start} + {/if} + {if $show_finish} {/if} + {if $show_note_column} + {/if} {if $show_files} {if $record.has_files} @@ -173,6 +183,12 @@ {/if} + {if $show_note_row && $record.comment} + + + + + {/if} {/foreach}
{$i18n.label.client}{$i18n.label.client}{$custom_fields->fields[0]['label']|escape}{$i18n.label.project}{$i18n.label.task}{$i18n.label.start}{$i18n.label.finish}{$i18n.label.duration}{$i18n.label.note}
{$record.client|escape}{$record.cf_1|escape}{$record.project|escape}{$record.task|escape}{if $record.start}{$record.start}{else} {/if}{if $record.finish}{$record.finish}{else} {/if}{if ($record.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if}{if $record.comment}{$record.comment|escape}{else} {/if}{$i18n.label.files}
{$i18n.label.note}:{$record.comment|escape}
{/if} diff --git a/time.php b/time.php index 615f2ef9..7450679b 100644 --- a/time.php +++ b/time.php @@ -28,6 +28,7 @@ require_once('initialize.php'); import('form.Form'); +import('ttConfigHelper'); import('ttUserHelper'); import('ttGroupHelper'); import('ttClientHelper'); @@ -66,6 +67,16 @@ if ($request->isPost() && $userChanged) { $group_id = $user->getGroup(); +$showClient = $user->isPluginEnabled('cl'); +$trackingMode = $user->getTrackingMode(); +$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode; +$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode; +$recordType = $user->getRecordType(); +$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType; +$showFinish = $showStart; +$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType; +$showFiles = $user->isPluginEnabled('at'); + // Initialize and store date in session. $cl_date = $request->getParameter('date', @$_SESSION['date']); $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date); @@ -82,6 +93,26 @@ if ($user->isPluginEnabled('cf')) { $smarty->assign('custom_fields', $custom_fields); } +$config = new ttConfigHelper($user->getConfig()); +$showNoteColumn = !$config->getDefinedValue('time_note_on_separate_row'); +$showNoteRow = $config->getDefinedValue('time_note_on_separate_row'); +if ($showNoteRow) { + // Determine column span for note field. + $colspan = 0; + if ($showClient) $colspan++; + if ($user->isPluginEnabled('cf')) $colspan++; + if ($showProject) $colspan++; + if ($showTask) $colspan++; + if ($showStart) $colspan++; + if ($showFinish) $colspan++; + $colspan++; // There is always a duration. + if ($showFiles) $colspan++; + $colspan++; // There is always an edit column. + $colspan++; // There is always a delete column. + $colspan--; // Remove one column for label. + $smarty->assign('colspan', $colspan); +} + if ($user->isPluginEnabled('mq')){ require_once('plugins/MonthlyQuota.class.php'); $quota = new MonthlyQuota(); @@ -149,7 +180,7 @@ if ($user->can('track_time')) { } // Dropdown for clients in MODE_TIME. Use all active clients. -if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) { +if (MODE_TIME == $user->getTrackingMode() && $showClient) { $active_clients = ttGroupHelper::getActiveClients(true); $form->addInput(array('type'=>'combobox', 'onchange'=>'fillProjectDropdown(this.value);', @@ -175,7 +206,7 @@ if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $use 'empty'=>array(''=>$i18n->get('dropdown.select')))); // Dropdown for clients if the clients plugin is enabled. - if ($user->isPluginEnabled('cl')) { + if ($showClient) { $active_clients = ttGroupHelper::getActiveClients(true); // We need an array of assigned project ids to do some trimming. foreach($project_list as $project) @@ -270,7 +301,7 @@ if ($request->isPost()) { if ($request->getParameter('btn_submit')) { // Validate user input. - if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client) + if ($showClient && $user->isPluginEnabled('cm') && !$cl_client) $err->add($i18n->get('error.client')); if ($custom_fields) { if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']); @@ -396,14 +427,23 @@ if ($request->isPost()) { } // isPost $week_total = ttTimeHelper::getTimeForWeek($selected_date); -$showFiles = $user->isPluginEnabled('at'); $timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date); $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_client', $showClient); $smarty->assign('show_cf_1', $user->isPluginEnabled('cf')); +$smarty->assign('show_project', $showProject); +$smarty->assign('show_task', $showTask); +$smarty->assign('show_start', $showStart); +$smarty->assign('show_finish', $showFinish); +$smarty->assign('show_duration', $showDuration); + + +$smarty->assign('show_note_column', $showNoteColumn); +$smarty->assign('show_note_row', $showNoteRow); $smarty->assign('show_files', $showFiles); $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list); -- 2.20.1