Implemented sending email to timesheet approver.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index c2841c88d35644226c146ce666d5e92adc732c0d..391e9327565338f32fbf8b9804570b413f134683 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -264,6 +264,29 @@ class ttTimesheetHelper {
     return $approvers;
   }
 
     return $approvers;
   }
 

+  // getApprover obtains approver properties such as name and email.
+  static function getApprover($user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $rank = ttUserHelper::getUserRank($user->getUser());
+    $sql = "select u.name, u.email".
+      " from tt_users u".
+      " left join tt_roles r on (r.id = u.role_id)".
+      " where u.id = $user_id and u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id".
+      " and (r.rank > $rank and r.rights like '%approve_timesheets%')";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if ($val = $res->fetchRow()) {
+        return $val;
+      }
+    }
+    return false;
+  }
+

   // submitTimesheet marks a timesheet as submitted and also sends an email
   // to a selected approver.
   static function submitTimesheet($fields) {
   // submitTimesheet marks a timesheet as submitted and also sends an email
   // to a selected approver.
   static function submitTimesheet($fields) {


@@ -281,10 +304,46 @@ class ttTimesheetHelper {
     $sql = "update tt_timesheets set submit_status = 1".
       " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     $sql = "update tt_timesheets set submit_status = 1".
       " where id = $timesheet_id 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;
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // sendSubmitEmail sends a notification to an approver about a timesheet submit.
+  static function sendSubmitEmail($fields) {
+    global $i18n;
+    global $user;
+
+    // Send email to a selected approver.
+    if (!$fields['approver_id']) return true; // No approver, nothing to do.

 
 

-    // TODO: send email to approver here...
-    // $approver_id = $fields['approver_id'];
+    $approver = ttTimesheetHelper::getApprover($fields['approver_id']);
+    if (!$approver) return false; // Invalid approver id.
+
+    $fields['to'] = $approver['email'];
+    $fields['subject'] = $i18n->get('form.timesheet_view.submit_subject');
+    $fields['body'] = sprintf($i18n->get('form.timesheet_view.submit_body'), $user->getName());
+
+    return ttTimesheetHelper::sendEmail($fields);
+  }
+
+  // sendEmail is a generic finction that sends a timesheet related email.
+  // TODO: perhaps make it even more generic for the entire application.
+  static function sendEmail($fields, $html = true) {
+    global $i18n;
+    global $user;
+
+    // Send email.
+    import('mail.Mailer');
+    $mailer = new Mailer();
+    $mailer->setCharSet(CHARSET);
+    if ($html)
+      $mailer->setContentType('text/html');
+    $mailer->setSender(SENDER);
+    $mailer->setReceiver($fields['to']);
+    if (!empty($user->bcc_email))
+      $mailer->setReceiverBCC($user->bcc_email);
+    $mailer->setMailMode(MAIL_MODE);
+    if (!$mailer->send($fields['subject'], $fields['body']))
+      return false;

 
     return true;
   }
 
     return true;
   }

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 28eeebcfd6a04366be31fc25a28c9d8ef629405e..4a2320b40595d5fe389b26d69d01db1fe6f5d71d 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -167,6 +167,11 @@ class ttUser {
     return ($this->behalfUser ? $this->behalfUser->id : $this->id);
   }
 
     return ($this->behalfUser ? $this->behalfUser->id : $this->id);
   }
 

+  // getName returns user name on behalf of whom the current user is operating.
+  function getName() {
+    return ($this->behalfUser ? $this->behalfUser->name : $this->name);
+  }
+

   // getQuotaPercent returns quota percent for active user.
   function getQuotaPercent() {
     return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);
   // getQuotaPercent returns quota percent for active user.
   function getQuotaPercent() {
     return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0784ed5f2870e6b8f48133b06d0bc4b835b668bf..9e2a364c5f7969d4c8005860c674e7ca1ac37541 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -551,4 +551,14 @@ $i18n_key_words = array(
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
 'role.admin.description' => 'Site adminsitrator.',
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
 'role.admin.description' => 'Site adminsitrator.',

+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: improve wording, then fill in other translation files.
+'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' => "Dear User,\n\nYour timesheet %s was approved.",
+'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+'form.timesheet_view.disapprove_subject' => "Dear User,\n\nYour timesheet %s was not approved.\n\n%s",
+'form.timesheet_view.success_message' => 'Notification sent by email.',

 );
 );

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b1be81d21b4bd8b9a15d456987609536e2c32ba4..fe8ac9ff1140bc2c7421d580c4419f50db840428 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">&nbsp;Anuko Time Tracker 1.18.52.4822 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.52.4823 | Copyright &copy; <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 d0198c780ca6e51622d8db2d3e55986b43252987..0a3cc7201fb5e3057f9cc47b5f92d04ce5080a83 100644 (file)
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -51,6 +51,7 @@ if (!$timesheet) {
 
 if ($request->isPost()) {
   $cl_comment = trim($request->getParameter('comment'));
 
 if ($request->isPost()) {
   $cl_comment = trim($request->getParameter('comment'));

+  $approver_id = $request->getParameter('approver');

 }
 
 $options = ttTimesheetHelper::getReportOptions($timesheet);
 }
 
 $options = ttTimesheetHelper::getReportOptions($timesheet);


@@ -76,7 +77,7 @@ if ($showSubmit) {
       'name'=>'approver',
       'style'=>'width: 200px;',
       'data'=>$approvers,
       'name'=>'approver',
       'style'=>'width: 200px;',
       'data'=>$approvers,

-      'datakeys'=>array('id','name')));
+      'datakeys'=>array('id','name','email')));

   }
   $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 }
   }
   $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 }


@@ -92,12 +93,16 @@ if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],
       'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],
       'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.

-    if (ttTimesheetHelper::submitTimesheet($fields)) {
+    if (!ttTimesheetHelper::submitTimesheet($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendSubmitEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {

       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();

-    } else
-      $err->add($i18n->get('error.db'));
+    }

   }
 
   if ($request->getParameter('btn_approve')) {
   }
 
   if ($request->getParameter('btn_approve')) {