projects
/
timetracker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a9d5914
)
Added handling of show work units in fav reports and export / import.
author
Nik Okuntseff
<support@anuko.com>
Sun, 22 Jul 2018 15:58:05 +0000
(15:58 +0000)
committer
Nik Okuntseff
<support@anuko.com>
Sun, 22 Jul 2018 15:58:05 +0000
(15:58 +0000)
WEB-INF/lib/ttExportHelper.class.php
patch
|
blob
|
history
WEB-INF/lib/ttFavReportHelper.class.php
patch
|
blob
|
history
WEB-INF/lib/ttImportHelper.class.php
patch
|
blob
|
history
WEB-INF/templates/footer.tpl
patch
|
blob
|
history
diff --git
a/WEB-INF/lib/ttExportHelper.class.php
b/WEB-INF/lib/ttExportHelper.class.php
index
ca202ad
..
d0b5339
100644
(file)
--- a/
WEB-INF/lib/ttExportHelper.class.php
+++ b/
WEB-INF/lib/ttExportHelper.class.php
@@
-303,6
+303,7
@@
class ttExportHelper {
" show_end=\"".$fav_report['show_end']."\"".
" show_note=\"".$fav_report['show_note']."\"".
" show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
" show_end=\"".$fav_report['show_end']."\"".
" show_note=\"".$fav_report['show_note']."\"".
" show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
+ " show_work_units=\"".$fav_report['show_work_units']."\"".
" group_by=\"".$fav_report['group_by']."\"".
" show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
fwrite($file, " <name><![CDATA[".$fav_report["name"]."]]></name>\n");
" group_by=\"".$fav_report['group_by']."\"".
" show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
fwrite($file, " <name><![CDATA[".$fav_report["name"]."]]></name>\n");
diff --git
a/WEB-INF/lib/ttFavReportHelper.class.php
b/WEB-INF/lib/ttFavReportHelper.class.php
index
60acc12
..
006d556
100644
(file)
--- a/
WEB-INF/lib/ttFavReportHelper.class.php
+++ b/
WEB-INF/lib/ttFavReportHelper.class.php
@@
-83,7
+83,7
@@
class ttFavReportHelper {
billable, invoice, paid_status, users, period, period_start, period_end,
show_client, show_invoice, show_paid, show_ip,
show_project, show_start, show_duration, show_cost,
billable, invoice, paid_status, users, period, period_start, period_end,
show_client, show_invoice, show_paid, show_ip,
show_project, show_start, show_duration, show_cost,
- show_task, show_end, show_note, show_custom_field_1,
+ show_task, show_end, show_note, show_custom_field_1,
show_work_units,
group_by, show_totals_only)
values(".
$mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
group_by, show_totals_only)
values(".
$mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
@@
-95,7
+95,7
@@
class ttFavReportHelper {
$mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
$fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
$fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
$mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
$fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
$fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
- $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".
+ $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".
$fields['chunits'].", ".
$mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
$mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
@@
-138,6
+138,7
@@
class ttFavReportHelper {
"show_end = ".$fields['chfinish'].", ".
"show_note = ".$fields['chnote'].", ".
"show_custom_field_1 = ".$fields['chcf_1'].", ".
"show_end = ".$fields['chfinish'].", ".
"show_note = ".$fields['chnote'].", ".
"show_custom_field_1 = ".$fields['chcf_1'].", ".
+ "show_work_units = ".$fields['chunits'].", ".
"group_by = ".$mdb2->quote($fields['group_by']).", ".
"show_totals_only = ".$fields['chtotalsonly'].
" where id = ".$fields['id'];
"group_by = ".$mdb2->quote($fields['group_by']).", ".
"show_totals_only = ".$fields['chtotalsonly'].
" where id = ".$fields['id'];
@@
-166,6
+167,7
@@
class ttFavReportHelper {
if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0);
if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0);
if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
+ if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0);
if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) {
if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) {
@@
-221,6
+223,7
@@
class ttFavReportHelper {
'chfinish'=>$bean->getAttribute('chfinish'),
'chnote'=>$bean->getAttribute('chnote'),
'chcf_1'=>$bean->getAttribute('chcf_1'),
'chfinish'=>$bean->getAttribute('chfinish'),
'chnote'=>$bean->getAttribute('chnote'),
'chcf_1'=>$bean->getAttribute('chcf_1'),
+ 'chunits'=>$bean->getAttribute('chunits'),
'group_by'=>$bean->getAttribute('group_by'),
'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
'group_by'=>$bean->getAttribute('group_by'),
'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
@@
-292,6
+295,7
@@
class ttFavReportHelper {
$bean->setAttribute('chfinish', $val['show_end']);
$bean->setAttribute('chnote', $val['show_note']);
$bean->setAttribute('chcf_1', $val['show_custom_field_1']);
$bean->setAttribute('chfinish', $val['show_end']);
$bean->setAttribute('chnote', $val['show_note']);
$bean->setAttribute('chcf_1', $val['show_custom_field_1']);
+ $bean->setAttribute('chunits', $val['show_work_units']);
$bean->setAttribute('group_by', $val['group_by']);
$bean->setAttribute('chtotalsonly', $val['show_totals_only']);
$bean->setAttribute('new_fav_report', $val['name']);
$bean->setAttribute('group_by', $val['group_by']);
$bean->setAttribute('chtotalsonly', $val['show_totals_only']);
$bean->setAttribute('new_fav_report', $val['name']);
@@
-316,6
+320,7
@@
class ttFavReportHelper {
'chfinish'=>'1',
'chnote'=>'1',
'chcf_1'=>'',
'chfinish'=>'1',
'chnote'=>'1',
'chcf_1'=>'',
+ 'chunits'=>'',
'group_by'=>'',
'chtotalsonly'=>'',
'new_fav_report'=>''));
'group_by'=>'',
'chtotalsonly'=>'',
'new_fav_report'=>''));
diff --git
a/WEB-INF/lib/ttImportHelper.class.php
b/WEB-INF/lib/ttImportHelper.class.php
index
dfa3be5
..
7b68ba7
100644
(file)
--- a/
WEB-INF/lib/ttImportHelper.class.php
+++ b/
WEB-INF/lib/ttImportHelper.class.php
@@
-332,6
+332,7
@@
class ttImportHelper {
'chfinish' => (int) $this->currentElement['SHOW_END'],
'chnote' => (int) $this->currentElement['SHOW_NOTE'],
'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
'chfinish' => (int) $this->currentElement['SHOW_END'],
'chnote' => (int) $this->currentElement['SHOW_NOTE'],
'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
+ 'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
'group_by' => $this->currentElement['GROUP_BY'],
'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
}
'group_by' => $this->currentElement['GROUP_BY'],
'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
}
diff --git
a/WEB-INF/templates/footer.tpl
b/WEB-INF/templates/footer.tpl
index
f33073f
..
1b04936
100644
(file)
--- a/
WEB-INF/templates/footer.tpl
+++ b/
WEB-INF/templates/footer.tpl
@@
-12,7
+12,7
@@
<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
- <td align="center"> Anuko Time Tracker 1.17.92.428
1
| Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+ <td align="center"> Anuko Time Tracker 1.17.92.428
2
| Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>