diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 5a5ccaca..8e592da0 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -84,6 +84,47 @@ class JobsController extends AppController { $this->set('year', $year); $this->set('month', $month); + + if(isset($month) && isset($year)) { //After a Specific Month for a Year + + $nMonth = date('m',strtotime($month)); + + $startDate = $year.'-'.$nMonth.'-01'; + + $startDateTime = strtotime($startDate); + + $numberOfDaysInMonth = date('t', $startDateTime); + + $endDate = $year.'-'.$nMonth.'-'.$numberOfDaysInMonth; + + + + $jobs = $this->Job->find('all', array('conditions'=> + array('Job.date_order_received BETWEEN ? AND ?'=>array($startDate, $endDate)))); + + $this->set('jobs', $jobs); + + $this->set('principleList',$this->Job->Enquiry->Principle->find('list')); + + $this->set('startDate',$startDate); + $this->set('endDate',$endDate); + + + } + + elseif(isset($year) && !isset($month)) { //After a whole Years Stats. + + } + + else { + echo "Failure"; + } + + + //$this->set('jobs', ) + + + } @@ -101,7 +142,15 @@ class JobsController extends AppController { $time = strtotime($job['Job']['date_order_received']); $year = date('Y', $time); //ISO-8601 year number $month = date('F', $time); - $monthList[$year][$month][] = $job; + //$monthList[$year][$month][] = $job; + + if(!isset($monthList[$year][$month])) { + $monthList[$year][$month] = 1; + } + else { + $monthList[$year][$month]++; + } + } krsort($monthList); diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp index efd40e4d..fc5a28b4 100644 --- a/views/jobs/get_editable_row.ctp +++ b/views/jobs/get_editable_row.ctp @@ -122,7 +122,7 @@ else { input('gross_profit_aud', array('value'=>$job['Job']['gross_profit_aud'], 'label'=>false ));?> - Net Export Sales Conv to AUD? + input('net_export_sales_aud', array('value'=>$job['Job']['net_export_sales_aud'], 'label'=>false ));?> input('gross_profit_exports_aud', array('value'=>$job['Job']['gross_profit_exports_aud'], 'label'=>false));?> diff --git a/views/jobs/get_viewable_row.ctp b/views/jobs/get_viewable_row.ctp index 7745d577..4a718bc1 100644 --- a/views/jobs/get_viewable_row.ctp +++ b/views/jobs/get_viewable_row.ctp @@ -49,7 +49,7 @@ - Net Export Sales Conv to AUD? + @@ -57,7 +57,7 @@ - + diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp index 3af05fbc..f22fcb44 100644 --- a/views/jobs/index.ctp +++ b/views/jobs/index.ctp @@ -55,7 +55,7 @@ echo $paginator->counter(array( sort('Gross Sales AUD');?> sort('Net Sales AUD');?> sort('Gross Profit AUD');?> - sort('Net Export Sales Converted to Or Charged in AUD');?> + sort('Net Export Sales Converted to Or Invoiced in AUD');?> sort('Gross Profit Value Export in AUD');?> sort('GP% Excl Commissions');?> sort('ATO Exchange Rate');?> @@ -129,7 +129,7 @@ echo $paginator->counter(array( - Net Export Sales Conv to AUD? + diff --git a/views/jobs/reports.ctp b/views/jobs/reports.ctp index d03562ae..f63bc7bb 100644 --- a/views/jobs/reports.ctp +++ b/views/jobs/reports.ctp @@ -10,8 +10,8 @@