springup/cmc-sales
2
0
Fork 0
Code Issues 48 Pull requests Actions Packages Projects Releases Wiki Activity

Added job sorting links to index

Browse source
This commit is contained in:
Karl Cordes 2011-04-13 11:26:38 +10:00
parent acd21f97f2
commit 674876f2e4
3 changed files with 210 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
controllers/jobs_controller.php
View file

@ -14,9 +14,37 @@ class JobsController extends AppController {
); );
function index() { function index($showUnpaid = null, $showUnsent = null) {
$this->Job->recursive = 1; $this->Job->recursive = 1;
$this->set('jobs', $this->paginate());
if(isset($showUnpaid) && isset($showUnsent)) {
$conditions = array(
'Job.all_paid' => 0,
'Job.all_sent' => 0,
);
}
else if(isset($showUnpaid)) {
$conditions = array(
'Job.all_paid' => 0,
);
}
else if(isset($showUnsent)) {
$conditions = array(
'Job.all_sent' => 0,
);
}
else {
$conditions = array();
}
$this->set('jobs', $this->paginate($conditions));
$this->set('customers', $this->Job->Enquiry->Customer->find('list')); $this->set('customers', $this->Job->Enquiry->Customer->find('list'));
$this->set('currencies', $this->Job->Currency->find('list')); $this->set('currencies', $this->Job->Currency->find('list'));

21
views/jobs/index.ctp
View file

@ -7,12 +7,14 @@ echo $javascript->link('job_index');
<h2><?php __('Jobs');?></h2> <h2><?php __('Jobs');?></h2>
<div class="showActions">
<ul>
<? //<iframe src="/jobs/index_grid" id="jobs_grid_iframe"></iframe> <li><?=$html->link('Show all', array('action'=>'index'));?></li>
?> <li><?=$html->link('Show only Unpaid', array('action'=>'index/1'));?></li>
<li><?=$html->link('Show only Unsent', array('action'=>'index/0/1'));?></li>
<li><?=$html->link('Show only Unpaid & Unsent', array('action'=>'index/1/1'));?></li>
</ul>
</div>
<?php <?php
echo $paginator->counter(array( echo $paginator->counter(array(
@ -27,10 +29,7 @@ echo $paginator->counter(array(
<?php echo $form->create('Job', array('action'=>'/jobs/ajax_edit'));?> <?php echo $form->create('Job', array('action'=>'/jobs/ajax_edit'));?>
<div id="fixedHeader"> <div class="scrollHorizontal">
</div>
<table cellpadding="0" cellspacing="0" class="jobsTable"> <table cellpadding="0" cellspacing="0" class="jobsTable">
<thead class="jobTableHead"> <thead class="jobTableHead">
<tr class="jobTableHeadRow" id="originalHeader"> <tr class="jobTableHeadRow" id="originalHeader">
@ -184,6 +183,8 @@ echo $paginator->counter(array(
</tbody> </tbody>
</table> </table>
</div>
<div class="paging"> <div class="paging">
<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>

17
webroot/css/quotenik.css
View file

@ -1335,7 +1335,24 @@ select.job_status {
} }
.showActions ul {
list-style: none;
}
.showActions ul li {
display: inline;
padding-left: 0.2em;
}
.showActions {
padding-bottom: 1em;
}
.scrollHorizontal {
height: 800px;
overflow:scroll;
}
/* CSS for the Job Reporting */ /* CSS for the Job Reporting */