projects
/
timetracker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8084d2
)
A few fixes related to tt_timesheets fields renaming.
author
Nik Okuntseff
<support@anuko.com>
Sat, 2 Mar 2019 14:46:01 +0000
(14:46 +0000)
committer
Nik Okuntseff
<support@anuko.com>
Sat, 2 Mar 2019 14:46:01 +0000
(14:46 +0000)
WEB-INF/lib/ttGroupExportHelper.class.php
patch
|
blob
|
history
WEB-INF/lib/ttOrgImportHelper.class.php
patch
|
blob
|
history
WEB-INF/templates/footer.tpl
patch
|
blob
|
history
timesheet_view.php
patch
|
blob
|
history
diff --git
a/WEB-INF/lib/ttGroupExportHelper.class.php
b/WEB-INF/lib/ttGroupExportHelper.class.php
index
06a3697
..
ac35cd8
100644
(file)
--- a/
WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/
WEB-INF/lib/ttGroupExportHelper.class.php
@@
-331,11
+331,12
@@
class ttGroupExportHelper {
$timesheet_part = $this->indentation.' '."<timesheet id=\"".$this->timesheetMap[$timesheet_item['id']]."\"";
$timesheet_part .= " user_id=\"".$this->userMap[$timesheet_item['user_id']]."\"";
$timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
$timesheet_part = $this->indentation.' '."<timesheet id=\"".$this->timesheetMap[$timesheet_item['id']]."\"";
$timesheet_part .= " user_id=\"".$this->userMap[$timesheet_item['user_id']]."\"";
$timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
+ $timesheet_part .= " project_id=\"".$this->projectMap[$timesheet_item['project_id']]."\"";
$timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
$timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
$timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
$timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
- $timesheet_part .= "
submitter_comment=\"".htmlspecialchars($timesheet_item['submitter_name
'])."\"";
- $timesheet_part .= " approv
al_status=\"".$timesheet_item['approval
_status']."\"";
- $timesheet_part .= "
manager_comment=\"".htmlspecialchars($timesheet_item['manager
_comment'])."\"";
+ $timesheet_part .= "
comment=\"".htmlspecialchars($timesheet_item['comment
'])."\"";
+ $timesheet_part .= " approv
e_status=\"".$timesheet_item['approve
_status']."\"";
+ $timesheet_part .= "
approve_comment=\"".htmlspecialchars($timesheet_item['approve
_comment'])."\"";
$timesheet_part .= " status=\"".$timesheet_item['status']."\"";
$timesheet_part .= "></timesheet>\n";
fwrite($this->file, $timesheet_part);
$timesheet_part .= " status=\"".$timesheet_item['status']."\"";
$timesheet_part .= "></timesheet>\n";
fwrite($this->file, $timesheet_part);
diff --git
a/WEB-INF/lib/ttOrgImportHelper.class.php
b/WEB-INF/lib/ttOrgImportHelper.class.php
index
43056bd
..
edd59b6
100644
(file)
--- a/
WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/
WEB-INF/lib/ttOrgImportHelper.class.php
@@
-283,11
+283,15
@@
class ttOrgImportHelper {
'group_id' => $this->current_group_id,
'org_id' => $this->org_id,
'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
'group_id' => $this->current_group_id,
'org_id' => $this->org_id,
'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+ 'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
'name' => $attrs['NAME'],
'name' => $attrs['NAME'],
+ 'comment' => $attrs['COMMENT'],
+ // TODO: add handling of these.
+ //`start_date` date NOT NULL, # timesheet start date
+ //`end_date` date NOT NULL, # timesheet end date
'submit_status' => $attrs['SUBMIT_STATUS'],
'submit_status' => $attrs['SUBMIT_STATUS'],
- 'submitter_comment' => $attrs['SUBMITTER_COMMENT'],
- 'approval_status' => $attrs['APPROVAL_STATUS'],
- 'manager_comment' => $attrs['MANAGER_COMMENT'],
+ 'approve_status' => $attrs['APPROVE_STATUS'],
+ 'approve_comment' => $attrs['APPROVE_COMMENT'],
'status' => $attrs['STATUS']));
if ($timesheet_id) {
// Add a mapping.
'status' => $attrs['STATUS']));
if ($timesheet_id) {
// Add a mapping.
diff --git
a/WEB-INF/templates/footer.tpl
b/WEB-INF/templates/footer.tpl
index
bd0a554
..
02b5b04
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.18.50.480
4
| Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+ <td align="center"> Anuko Time Tracker 1.18.50.480
5
| 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>
diff --git
a/timesheet_view.php
b/timesheet_view.php
index
bde974e
..
57eff61
100644
(file)
--- a/
timesheet_view.php
+++ b/
timesheet_view.php
@@
-63,7
+63,7
@@
if ($showSubmit) {
$showApprovers = count($approvers) >= 1;
}
$canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
$showApprovers = count($approvers) >= 1;
}
$canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
-$showApprove = $timesheet['submit_status'] && $timesheet['approv
al
_status'] == null;
+$showApprove = $timesheet['submit_status'] && $timesheet['approv
e
_status'] == null;
// Add a form with controls.
$form = new Form('timesheetForm');
// Add a form with controls.
$form = new Form('timesheetForm');