$fields['to'] = $email;
$fields['subject'] = $i18n->get('form.timesheet_view.approve_subject');
- $fields['body'] = sprintf($i18n->get('form.timesheet_view.approve_body'), htmlspecialchars($fields['name']));
+ $fields['body'] = sprintf($i18n->get('form.timesheet_view.approve_body'), htmlspecialchars($fields['name']), htmlspecialchars($fields['comment']));
+
+ return ttTimesheetHelper::sendEmail($fields);
+ }
+
+ // sendDisapprovedEmail sends a notification to user about a timesheet disapproval.
+ static function sendDisapprovedEmail($fields) {
+ global $i18n;
+ global $user;
+
+ // Obtain user email.
+ $user_details = $user->getUserDetails($fields['user_id']);
+ $email = $user_details['email'];
+ if (!$email) return true; // No email to send to, nothing to do.
+
+ $fields['to'] = $email;
+ $fields['subject'] = $i18n->get('form.timesheet_view.disapprove_subject');
+ $fields['body'] = sprintf($i18n->get('form.timesheet_view.disapprove_body'), htmlspecialchars($fields['name']), htmlspecialchars($fields['comment']));
return ttTimesheetHelper::sendEmail($fields);
}
return (!is_a($affected, 'PEAR_Error'));
}
- // disapproveTimesheet marks a timesheet as approved and sends an email to submitter.
- static function disapproveTimesheet($fields) {
+ // markDisapproved marks a timesheet as not approved.
+ static function markDisapproved($fields) {
global $user;
$mdb2 = getConnection();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // First, mark timesheet as disapproved.
- // Even if mail part below does not work, this will get us a functioning workflow
- // without email notification.
$timesheet_id = $fields['timesheet_id'];
$comment = $fields['comment'];
$sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).
" where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
- if (is_a($affected, 'PEAR_Error')) return false;
-
- // TODO: send email to submitter here...
- return true;
+ return (!is_a($affected, 'PEAR_Error'));
}
// The timesheetItemsExist determines whether tt_log records exist in the specified period
'form.timesheet_view.submit_subject' => 'Timesheet approval request',
'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
'form.timesheet_view.approve_subject' => 'Timesheet approved',
-'form.timesheet_view.approve_body' => "Your timesheet %s was approved.",
+'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
-'form.timesheet_view.disapprove_subject' => "Your timesheet %s was not approved.",
+'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
);
<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
- <td align="center"> Anuko Time Tracker 1.18.52.4825 | Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+ <td align="center"> Anuko Time Tracker 1.18.53.4826 | 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>
if ($request->getParameter('btn_disapprove')) {
$fields = array('timesheet_id' => $timesheet['id'],
+ 'name' => $timesheet['name'],
+ 'user_id' => $timesheet['user_id'],
'comment' => $cl_comment);
- if (ttTimesheetHelper::disapproveTimesheet($fields)) {
+ if (!ttTimesheetHelper::markDisapproved($fields))
+ $err->add($i18n->get('error.db'));
+ if ($err->no() && !ttTimesheetHelper::sendDisapprovedEmail($fields)) {
+ $err->add($i18n->get('error.mail_send'));
+ }
+ if ($err->no()) {
// Redirect to self.
header('Location: timesheet_view.php?id='.$timesheet['id']);
exit();
- } else
- $err->add($i18n->get('error.db'));
+ }
}
}