From dd0f4adb5926af8dc8479e2c17dd002788587c2f Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Wed, 11 May 2011 09:44:56 +1000 Subject: [PATCH] Reworking the reports --- controllers/jobs_controller.php | 15 +++++++++++++++ controllers/shipments_controller.php | 10 ++++++---- views/jobs/view_report.ctp | 6 ++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index cedd468c..9eae3f3d 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -166,6 +166,21 @@ class JobsController extends AppController { } + /** + * Generate aggregates for the financial data in $jobs. + * + * Procedure: + * 1. Loop over the $jobs. + * 2. Check if this job is cancelled or on hold. + * 3. If not, add each $job[$field] to the total. + * + * @param $jobs + */ + function getTotals($jobs, $fields) { + + } + + function getFinancialYears() { } diff --git a/controllers/shipments_controller.php b/controllers/shipments_controller.php index 696043ce..359cc02c 100644 --- a/controllers/shipments_controller.php +++ b/controllers/shipments_controller.php @@ -149,13 +149,15 @@ class ShipmentsController extends AppController { } print_r($boxIDs);*/ - /*foreach($this->data['Job'] as $job) { + $jobIDs = array(); + foreach($this->data['Job'] as $job) { foreach($job as $index => $id) { - echo $id."\n"; + $jobIDs[] = $id; } - }*/ + } - print_r($this->data); + $this->Shipment->Job->updateAll(array('Job.all_sent' => 1), array('Job.id'=>$jobIDs)); + //print_r($this->data); echo "SUCCESS"; diff --git a/views/jobs/view_report.ctp b/views/jobs/view_report.ctp index 86fc2256..0664f450 100644 --- a/views/jobs/view_report.ctp +++ b/views/jobs/view_report.ctp @@ -62,6 +62,12 @@ $class =''; $doCount = true; } + + + + + + ?>