X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTimesheetHelper.class.php;h=0583265746c5080bc51a3a62d710aac55fda1622;hb=0eec39b28e4c408f92f9f99ede99e68640ef94d0;hp=056fc6859ab3c44c4f2666d879526f850999c3ff;hpb=a3d07d9fe0c01738c69c6ea37220f3feb4395912;p=timetracker.git

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 056fc685..05832657 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -212,10 +212,13 @@ class ttTimesheetHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    if ($user->isClient()) $client_part = "and client_id = $user->client_id";
+    if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
 
-    $sql = "select * from tt_timesheets".
-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status is not null";
+    $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name,".
+      " ts.name, ts.submitter_comment, ts.submit_status, ts.approval_status, ts.manager_comment from tt_timesheets ts".
+      " left join tt_users u on (u.id = ts.user_id)".
+      " left join tt_clients c on (c.id = ts.client_id)".
+      " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
@@ -294,4 +297,122 @@ class ttTimesheetHelper {
 
     return true;
   }
+
+  // getReportOptions prepares $options array to be used with ttReportHelper
+  // to obtain items for timesheet view.
+  static function getReportOptions($timesheet) {
+    global $user;
+    $group_by_client = $user->isPluginEnabled('cl') && !$timesheet['client_id'];
+    $trackingMode = $user->getTrackingMode();
+    $group_by_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+
+    $options['timesheet_id'] = $timesheet['id'];
+    $options['client_id'] = $timesheet['client_id'];
+    $options['users'] = $timesheet['user_id'];
+    $options['show_durarion'] = 1;
+    $options['show_cost'] = 1; // To include expenses.
+    $options['show_totals_only'] = 1;
+    $options['group_by1'] = 'date';
+    if ($group_by_client || $group_by_project) {
+      $options['group_by2'] = $group_by_client ? 'client' : 'project';
+    }
+    if ($options['group_by2'] && $options['group_by2'] != 'project' && $group_by_project) {
+      $options['group_by3'] = 'project';
+    }
+    return $options;
+  }
+
+  // getApprovers obtains a list of users who can approve a timesheet for a given user
+  // and also have an email to receive a notification about it.
+  static function getApprovers($user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $approvers = array();
+    $rank = ttUserHelper::getUserRank($user_id);
+    $sql = "select u.id, u.name, u.email".
+      " from tt_users u".
+      " left join tt_roles r on (r.id = u.role_id)".
+      " where u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id".
+      " and (r.rights like '%approve_all_timesheets%' or (r.rank > $rank and r.rights like '%approve_timesheets%'))";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $approvers[] = $val;
+      }
+    }
+    return $approvers;
+  }
+
+  // submitTimesheet marks a timesheet as submitted and sends an email to an approver.
+  static function submitTimesheet($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // First, mark a timesheet as submitted.
+    // Even if mail part below does not work, this will get us a functioning workflow
+    // (without email notifications).
+    $timesheet_id = $fields['timesheet_id'];
+    $sql = "update tt_timesheets set submit_status = 1".
+      " where id = $timesheet_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 approver here...
+    // $approver_id = $fields['approver_id'];
+
+    return true;
+  }
+
+  // approveTimesheet marks a timesheet as approved and sends an email to submitter.
+  static function approveTimesheet($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // First, mark a timesheet as approved.
+    // Even if mail part below does not work, this will get us a functioning workflow
+    // (without email notifications).
+    $timesheet_id = $fields['timesheet_id'];
+    $manager_comment = $fields['comment'];
+
+    $sql = "update tt_timesheets set approval_status = 1, manager_comment = ".$mdb2->quote($manager_comment).
+      " where id = $timesheet_id and submit_status = 1 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;
+  }
+
+  // disapproveTimesheet marks a timesheet as approved and sends an email to submitter.
+  static function disapproveTimesheet($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // First, mark a timesheet as disapproved.
+    // Even if mail part below does not work, this will get us a functioning workflow
+    // (without email notifications).
+    $timesheet_id = $fields['timesheet_id'];
+    $manager_comment = $fields['comment'];
+
+    $sql = "update tt_timesheets set approval_status = 0, manager_comment = ".$mdb2->quote($manager_comment).
+      " where id = $timesheet_id and submit_status = 1 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;
+  }
 }