From acd21f97f252338857322d5a4e6cfa8228dd1f03 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Tue, 12 Apr 2011 14:54:06 +1000 Subject: [PATCH] Added all paid and all sent cols to jobs index --- controllers/jobs_controller.php | 34 ++++++++++++-------- views/elements/booleanTick.ctp | 5 +++ views/jobs/get_editable_row.ctp | 3 ++ views/jobs/get_viewable_row.ctp | 9 ++++++ views/jobs/index.ctp | 10 +++++- views/purchase_orders/view.ctp | 11 +------ webroot/css/quotenik.css | 10 +++++- webroot/img/gradient-blue.png | Bin 504 -> 0 bytes webroot/img/gradient-blue.xcf | Bin 1682 -> 0 bytes webroot/img/gradient-blue2.png | Bin 408 -> 0 bytes webroot/img/gradient-blue2.xcf | Bin 3834 -> 0 bytes webroot/img/gradient-blue3.png | Bin 540 -> 0 bytes webroot/img/gradient-blue4.png | Bin 498 -> 0 bytes webroot/img/gradient-green.png | Bin 449 -> 0 bytes webroot/img/gradient-green2.png | Bin 464 -> 0 bytes webroot/img/gradient-green3.png | Bin 323 -> 0 bytes webroot/img/grid/actions.gif | Bin 170 -> 0 bytes webroot/img/grid/ajax-loader-small.gif | Bin 1849 -> 0 bytes webroot/img/grid/arrow_redo.png | Bin 625 -> 0 bytes webroot/img/grid/arrow_right_peppermint.png | Bin 240 -> 0 bytes webroot/img/grid/arrow_right_spearmint.png | Bin 240 -> 0 bytes webroot/img/grid/arrow_undo.png | Bin 631 -> 0 bytes webroot/img/grid/bullet_blue.png | Bin 289 -> 0 bytes webroot/img/grid/bullet_star.png | Bin 347 -> 0 bytes webroot/img/grid/bullet_toggle_minus.png | Bin 207 -> 0 bytes webroot/img/grid/bullet_toggle_plus.png | Bin 209 -> 0 bytes webroot/img/grid/calendar.gif | Bin 1035 -> 0 bytes webroot/img/grid/collapse.gif | Bin 846 -> 0 bytes webroot/img/grid/comment_yellow.gif | Bin 257 -> 0 bytes webroot/img/grid/down.gif | Bin 59 -> 0 bytes webroot/img/grid/drag-handle.png | Bin 1223 -> 0 bytes webroot/img/grid/editor-helper-bg.gif | Bin 1164 -> 0 bytes webroot/img/grid/expand.gif | Bin 851 -> 0 bytes webroot/img/grid/header-bg.gif | Bin 872 -> 0 bytes webroot/img/grid/header-columns-bg.gif | Bin 836 -> 0 bytes webroot/img/grid/header-columns-over-bg.gif | Bin 823 -> 0 bytes webroot/img/grid/help.png | Bin 510 -> 0 bytes webroot/img/grid/info.gif | Bin 80 -> 0 bytes webroot/img/grid/listview.gif | Bin 2380 -> 0 bytes webroot/img/grid/pencil.gif | Bin 914 -> 0 bytes webroot/img/grid/row-over-bg.gif | Bin 823 -> 0 bytes webroot/img/grid/sort-asc.gif | Bin 830 -> 0 bytes webroot/img/grid/sort-asc.png | Bin 163 -> 0 bytes webroot/img/grid/sort-desc.gif | Bin 833 -> 0 bytes webroot/img/grid/sort-desc.png | Bin 161 -> 0 bytes webroot/img/grid/stripes.png | Bin 1238 -> 0 bytes webroot/img/grid/tag_red.png | Bin 592 -> 0 bytes webroot/img/grid/tick.png | Bin 537 -> 0 bytes webroot/img/grid/user_identity.gif | Bin 905 -> 0 bytes webroot/img/grid/user_identity_plus.gif | Bin 546 -> 0 bytes webroot/img/tick.png | Bin 0 -> 1940 bytes 51 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 views/elements/booleanTick.ctp delete mode 100755 webroot/img/gradient-blue.png delete mode 100755 webroot/img/gradient-blue.xcf delete mode 100755 webroot/img/gradient-blue2.png delete mode 100755 webroot/img/gradient-blue2.xcf delete mode 100755 webroot/img/gradient-blue3.png delete mode 100755 webroot/img/gradient-blue4.png delete mode 100755 webroot/img/gradient-green.png delete mode 100755 webroot/img/gradient-green2.png delete mode 100755 webroot/img/gradient-green3.png delete mode 100644 webroot/img/grid/actions.gif delete mode 100644 webroot/img/grid/ajax-loader-small.gif delete mode 100644 webroot/img/grid/arrow_redo.png delete mode 100644 webroot/img/grid/arrow_right_peppermint.png delete mode 100644 webroot/img/grid/arrow_right_spearmint.png delete mode 100644 webroot/img/grid/arrow_undo.png delete mode 100644 webroot/img/grid/bullet_blue.png delete mode 100644 webroot/img/grid/bullet_star.png delete mode 100644 webroot/img/grid/bullet_toggle_minus.png delete mode 100644 webroot/img/grid/bullet_toggle_plus.png delete mode 100644 webroot/img/grid/calendar.gif delete mode 100644 webroot/img/grid/collapse.gif delete mode 100644 webroot/img/grid/comment_yellow.gif delete mode 100644 webroot/img/grid/down.gif delete mode 100644 webroot/img/grid/drag-handle.png delete mode 100644 webroot/img/grid/editor-helper-bg.gif delete mode 100644 webroot/img/grid/expand.gif delete mode 100644 webroot/img/grid/header-bg.gif delete mode 100644 webroot/img/grid/header-columns-bg.gif delete mode 100644 webroot/img/grid/header-columns-over-bg.gif delete mode 100644 webroot/img/grid/help.png delete mode 100644 webroot/img/grid/info.gif delete mode 100644 webroot/img/grid/listview.gif delete mode 100644 webroot/img/grid/pencil.gif delete mode 100644 webroot/img/grid/row-over-bg.gif delete mode 100644 webroot/img/grid/sort-asc.gif delete mode 100644 webroot/img/grid/sort-asc.png delete mode 100644 webroot/img/grid/sort-desc.gif delete mode 100644 webroot/img/grid/sort-desc.png delete mode 100644 webroot/img/grid/stripes.png delete mode 100644 webroot/img/grid/tag_red.png delete mode 100644 webroot/img/grid/tick.png delete mode 100644 webroot/img/grid/user_identity.gif delete mode 100644 webroot/img/grid/user_identity_plus.gif create mode 100644 webroot/img/tick.png diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index c8fb6ff9..c9ceac7e 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -32,8 +32,15 @@ class JobsController extends AppController { /** Called via AJAX to get an editable row */ function getEditableRow($id) { $this->layout = 'ajax'; - $this->set('job', $this->Job->find('first', array('conditions'=>array('Job.id'=>$id)))); + + $job = $this->Job->find('first', array('conditions'=>array('Job.id'=>$id))); + $this->set('job', $job); + + $this->data = $job; + + + $this->set('yesNo', array(0=>'No', 1=>'Yes')); $this->set('currencies', $this->Job->Currency->find('list')); $this->set('sale_category_options', $this->sale_category_options()); $this->set('sale_category_array', $this->sale_category_array()); @@ -95,19 +102,19 @@ class JobsController extends AppController { $numberOfDaysInMonth = date('t', $startDateTime); - $endDate = $year.'-'.$nMonth.'-'.$numberOfDaysInMonth; + $endDate = $year.'-'.$nMonth.'-'.$numberOfDaysInMonth; - $jobs = $this->Job->find('all', array('conditions'=> - array('Job.date_order_received BETWEEN ? AND ?'=>array($startDate, $endDate)))); + $jobs = $this->Job->find('all', array('conditions'=> + array('Job.date_order_received BETWEEN ? AND ?'=>array($startDate, $endDate)))); - $this->set('jobs', $jobs); + $this->set('jobs', $jobs); - $this->set('principleList',$this->Job->Enquiry->Principle->find('list')); + $this->set('principleList',$this->Job->Enquiry->Principle->find('list')); - $this->set('startDate',$startDate); - $this->set('endDate',$endDate); + $this->set('startDate',$startDate); + $this->set('endDate',$endDate); } @@ -161,13 +168,14 @@ class JobsController extends AppController { function job_status_options() { $options = array('ORDER RECEIVED FROM CUSTOMER', 'ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY', - 'GOODS SHIPPED TO CUSTOMER - CMC WAITING ON PAYMENT', - 'WAITING ON PAYMENT AND ANOTHER DELIVERY', - 'GOODS DELIVERED TO CUSTOMER - CMC PAID IN FULL', - 'PAID IN FULL WAITING ON DELIVERY', + 'GOODS SHIPPED TO CUSTOMER', + 'WAITING ON DELIVERY', + 'MULTIPLE SHIPMENTS CMC WAITING ON ANOTHER DELIVERY', + 'GOODS DELIVERED TO CUSTOMER', 'JOB CANCELLED', 'JOB ON HOLD', - 'CUSTOMER TO PAY 100% WITH ORDER'); + 'CUSTOMER TO PAY 100% WITH ORDER' + ); $options = $this->buildEnumOpts($options); return $options; } diff --git a/views/elements/booleanTick.ctp b/views/elements/booleanTick.ctp new file mode 100644 index 00000000..1a8be328 --- /dev/null +++ b/views/elements/booleanTick.ctp @@ -0,0 +1,5 @@ +image('tick.png'); +} +?> \ No newline at end of file diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp index 8ea1ca71..f4c73cec 100644 --- a/views/jobs/get_editable_row.ctp +++ b/views/jobs/get_editable_row.ctp @@ -56,11 +56,14 @@ else { }*/ ?> + input('id', array('type'=>'hidden', 'value'=>$job['Job']['id'])); ?> input('date_order_received_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_order_received_display'));?> input('date_order_received', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_received', 'value'=>$job['Job']['date_order_received']));?> +input('all_paid', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_paid'], 'class'=>'yesNo'));?> +input('all_sent', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_sent'], 'class'=>'yesNo'));?> input('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>''));?> input('sale_category', array('options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?> diff --git a/views/jobs/get_viewable_row.ctp b/views/jobs/get_viewable_row.ctp index d735970e..9dafc7d9 100644 --- a/views/jobs/get_viewable_row.ctp +++ b/views/jobs/get_viewable_row.ctp @@ -1,6 +1,15 @@ element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?> + + + element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?> + + + element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?> + + + diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp index a29ade9f..3b6c5b14 100644 --- a/views/jobs/index.ctp +++ b/views/jobs/index.ctp @@ -37,6 +37,8 @@ echo $paginator->counter(array( Actions sort('Order Received', 'date_order_received');?> + sort('All Paid', 'all_paid');?> + sort('All Sent', 'all_sent');?> sort('Status', 'job_status');?> sort('Sale Category');?> sort('Job Type', 'job_type');?> @@ -81,6 +83,12 @@ echo $paginator->counter(array( element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?> + + element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?> + + + element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?> + @@ -110,7 +118,7 @@ echo $paginator->counter(array( "; } diff --git a/views/purchase_orders/view.ctp b/views/purchase_orders/view.ctp index e8e8331c..00d06498 100755 --- a/views/purchase_orders/view.ctp +++ b/views/purchase_orders/view.ctp @@ -46,19 +46,10 @@