X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=e58241e05e731358282939763356cf4d3ea317ca;hb=cdb0911b4f72d4bb1df7cd82f2bce0d9ab1579b0;hp=7b7808cb3840cf23f32166ca9c679426d59c6a13;hpb=6856837ddde5cc90ac5dad2e5d67204036ec3158;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 7b7808cb..e58241e0 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -53,6 +53,8 @@ class ttReportHelper { if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0'; if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; @@ -96,6 +98,8 @@ class ttReportHelper { if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0'; if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; + if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; @@ -143,6 +147,8 @@ class ttReportHelper { if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project'); if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and ei.paid = 0'; // Prepare user list part. $userlist = -1; @@ -182,6 +188,8 @@ class ttReportHelper { if ($report['project_id']) $dropdown_parts .= ' and ei.project_id = '.$report['project_id']; if ($report['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; if ($report['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; + if ($report['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($report['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0'; // Prepare user list part. $userlist = -1; @@ -276,6 +284,10 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($user->canManageTeam() && $bean->getAttribute('chpaid')) + array_push($fields, 'l.paid as paid'); + // Add invoice name if it is selected. if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); @@ -342,6 +354,9 @@ class ttReportHelper { array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($user->canManageTeam() && $bean->getAttribute('chpaid')) + array_push($fields, 'ei.paid as paid'); // Add invoice name if it is selected. if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); @@ -422,6 +437,39 @@ class ttReportHelper { return $report_items; } + // putInSession stores tt_log and tt_expense_items ids from a report in user session + // as 2 comma-separated lists. + static function putInSession($report_items) { + unset($_SESSION['report_item_ids']); + unset($_SESSION['report_item_expense_ids']); + + // Iterate through records and build 2 comma-separated lists. + foreach($report_items as $item) { + if ($item['type'] == 1) + $report_item_ids .= ','.$item['id']; + else if ($item['type'] == 2) + $report_item_expense_ids .= ','.$item['id']; + } + $report_item_ids = trim($report_item_ids, ','); + $report_item_expense_ids = trim($report_item_expense_ids, ','); + + // The lists are reqdy. Put them in session. + if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids; + if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids; + } + + // getFromSession obtains tt_log and tt_expense_items ids stored in user session. + static function getFromSession() { + $items = array(); + $report_item_ids = $_SESSION['report_item_ids']; + if ($report_item_ids) + $items['report_item_ids'] = explode(',', $report_item_ids); + $report_item_expense_ids = $_SESSION['report_item_expense_ids']; + if ($report_item_expense_ids) + $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids); + return $items; + } + // getFavItems retrieves all items associated with a favorite report. // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all. // Expense items use the "note" field for item name. @@ -1042,6 +1090,23 @@ class ttReportHelper { } } + // The markPaid marks a set of records as either paid or unpaid. + static function markPaid($time_log_ids, $expense_item_ids, $paid = true) + { + $mdb2 = getConnection(); + $paid_val = (int) $paid; + if ($time_log_ids) { + $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + if ($expense_item_ids) { + $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + } + // prepareReportBody - prepares an email body for report. static function prepareReportBody($bean, $comment) { @@ -1160,6 +1225,8 @@ class ttReportHelper { $body .= '