diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 6173bff5..0ba73494 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -127,8 +127,8 @@ class JobsController extends AppController { if(isset($month) && isset($year)) { //After a Specific Month for a Year - - + + $startDate = $year.'-'.$month.'-01'; $startDateTime = strtotime($startDate); @@ -137,17 +137,32 @@ class JobsController extends AppController { $endDate = $year.'-'.$month.'-'.$numberOfDaysInMonth; + $monthStrings = array( + '01'=>'January', + '02'=> 'February', + '03'=>'March', + '04'=> 'April', + '05'=> 'May', + '06'=> 'June', + '07'=> 'July', + '08'=> 'August', + '09'=> 'September', + '10'=> 'October', + '11'=> 'November', + '12' => 'December'); - $jobRangeTitle = "$month/$year"; + + + $jobRangeTitle = $monthStrings[$month]." $year"; $jobs = $this->Job->find('all', array('conditions'=> array('Job.date_order_received BETWEEN ? AND ?'=>array($startDate, $endDate)), - 'order'=>'Job.date_order_received ASC')); + 'order'=>'Job.date_order_received ASC')); - /* $dateStringFormat = 'j F Y'; + /* $dateStringFormat = 'j F Y'; $dateString['first'] = date($dateStringFormat, $firstDayUnix); $dateString['last'] = date($dateStringFormat, $lastDayUnix); -*/ + */ $this->set('jobRangeTitle', $jobRangeTitle); $this->set('year', $year); @@ -156,6 +171,8 @@ class JobsController extends AppController { $this->set('jobs', $jobs); + $this->set('totals', $this->getTotals($jobs)); + print_r($totals); $this->set('principleList',$this->Job->Enquiry->Principle->find('list')); $this->set('startDate',$startDate); @@ -196,7 +213,7 @@ class JobsController extends AppController { $lastYear = $year - 1; $jobRangeTitle = $lastYear.' - '.$year.' ('.$dateString['first']." to ".$dateString['last'].')'; - + } $this->set('jobRangeTitle', $jobRangeTitle); diff --git a/views/jobs/view_report.ctp b/views/jobs/view_report.ctp index 514e3a10..bc83309a 100644 --- a/views/jobs/view_report.ctp +++ b/views/jobs/view_report.ctp @@ -10,7 +10,7 @@