diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php
index 2502d2aa..7b5e8d47 100755
--- a/controllers/jobs_controller.php
+++ b/controllers/jobs_controller.php
@@ -64,7 +64,7 @@ class JobsController extends AppController {
function reports() {
$this->Job->recursive = 1;
- $this->set('jobs', $this->Job->find('all'));
+ $this->set('jobs', $this->Job->find('all', array('order'=>array('Job.date_order_received'=>'asc'))));
$this->set('customers', $this->Job->Enquiry->Customer->find('list'));
$this->set('currencies', $this->Job->Currency->find('list'));
diff --git a/models/job.php b/models/job.php
index f0faf131..d6c9d8bc 100755
--- a/models/job.php
+++ b/models/job.php
@@ -52,5 +52,10 @@ class Job extends AppModel {
)
);
+
+
+ function getJobsByWeekNumber() {
+
+ }
}
?>
\ No newline at end of file
diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp
index c9664846..a79812c1 100644
--- a/views/jobs/index.ctp
+++ b/views/jobs/index.ctp
@@ -33,20 +33,20 @@ echo $paginator->counter(array(
| Actions |
- sort('Order Received');?> |
- sort('Status');?> |
+ sort('Order Received', 'date_order_received');?> |
+ sort('Status', 'job_status');?> |
sort('Sale Category');?> |
- sort('Job Type');?> |
- sort('Shipment Category');?> |
- sort('Job Number');?> |
+ sort('Job Type', 'job_type');?> |
+ sort('Shipment Category','shipment_category');?> |
+ sort('Job Number','title');?> |
Enquiry Number |
CMC POs |
Date Order Placed on Principle |
- sort('Customer');?> |
+ sort('Customer','Customer.name');?> |
Customer Order No |
sort('Supplier Ref');?> |
- sort('Scheduled Ex-Works');?> |
- sort('Date Sent to Customer');?> |
+ sort('Scheduled Ex-Works', 'date_scheduled_ex_works');?> |
+ sort('Date Sent to Customer', 'date_sent_to_customer');?> |
sort('Freight Paid By CMC');?> |
sort('Sale Currency');?> |
sort('Gross Sales AUD');?> |
diff --git a/views/jobs/reports.ctp b/views/jobs/reports.ctp
new file mode 100644
index 00000000..fc97f8c6
--- /dev/null
+++ b/views/jobs/reports.ctp
@@ -0,0 +1,65 @@
+Book 1 - Reports
+
+
+
+//debug($jobs); ?>
+
+
+
+
+$weekList = array();
+
+
+foreach($jobs as $job) {
+
+ $time = strtotime($job['Job']['date_order_received']);
+
+
+
+ $year = date('Y', $time); //ISO-8601 year number
+ $weekNo = date('W', $time);
+
+ $weekList[$year][$weekNo][] = $job;
+ /*if(isset($weekList[$year][$weekNo])) {
+ $weekList[$year][$weekNo]++;
+ }
+ else {
+ $weekList[$year][$weekNo] = 0;
+ }*/
+
+
+}
+
+
+
+
+//echo debug($weekList);
+foreach($weekList as $year => $weekNos):
+?>
+=$year?>
+
+
+
+ foreach ($weekNos as $week => $jobArr): ?>
+ | Week =$week?> |
+
+
+
+
+
+
+ foreach ($weekNos as $week => $jobArr): ?>
+ |
+ $totalSales = 0;
+ foreach($jobArr as $job) {
+ $totalSales += $job['Job']['company_gross_sales_aud'];
+ }
+ echo $totalSales;
+ ?>
+ |
+
+
+
+
+
+