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

Added Temp header to jobs list editing

Browse source
This commit is contained in:
Karl Cordes 2011-04-07 16:04:40 +10:00
parent 91abc8081d
commit 0841b715c1
6 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
views/jobs/get_editable_row.ctp
View file

@ -64,15 +64,12 @@ else {
}*/
?>
<?=$form->input('id', array('type'=>'hidden', 'value'=>$job['Job']['id'])); ?>
<td><button class="saveButton">Save</button> <button class="cancelButton">Cancel</button></td>
<td><?=$form->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'));?>
<?=$form->input('date_order_received', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_received', 'value'=>$job['Job']['date_order_received']));?>
</td>
<td><?=$form->input('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>'job_status'));?></td>
<td><?=$form->input('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>''));?></td>
<td>
<?=$form->input('sale_category', array('options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?>
</td>
@ -133,7 +130,7 @@ else {
<td>
<?=$form->input('gp_percent', array('value'=>$job['Job']['gp_percent'], 'label'=>false));?>
</td>
<td>? Double column?</td>
<td>
<?=$form->input('ato_exchange_rate', array('value'=>$job['Job']['ato_exchange_rate'], 'label'=>false ));?>
</td>

2
views/jobs/get_viewable_row.ctp
View file

@ -57,7 +57,7 @@
<td>
<?=$job['Job']['gp_percent'];?>
</td>
<td>? Double column?</td>
<td>
<?=$job['Job']['ato_exchange_rate'];?>
</td>

31
views/jobs/index.ctp
View file

@ -1,5 +1,6 @@
<?php
echo $javascript->link('jquery.chromatable');
echo $javascript->link('job_index');
?>
@ -25,12 +26,14 @@ echo $paginator->counter(array(
</div>
<?php echo $form->create('Job', array('action'=>'/jobs/ajax_edit'));?>
<div id="fixedHeader">
</div>
<div class="outer">
<?php echo $form->create('Job', array('action'=>'/jobs/ajax_edit'));?>
<table cellpadding="0" cellspacing="0" class="jobsTable">
<thead>
<tr>
<thead class="jobTableHead">
<tr class="jobTableHeadRow" id="originalHeader">
<th class="actions">Actions</th>
<th><?php echo $paginator->sort('Order Received', 'date_order_received');?></th>
@ -55,7 +58,6 @@ echo $paginator->counter(array(
<th><?php echo $paginator->sort('Net Export Sales Converted to Or Charged in AUD');?></th>
<th><?php echo $paginator->sort('Gross Profit Value Export in AUD');?></th>
<th><?php echo $paginator->sort('GP% Excl Commissions');?></th>
<th><?php echo $paginator->sort('Company Gross Sales AUD');?></th>
<th><?php echo $paginator->sort('ATO Exchange Rate');?></th>
<th><?php echo $paginator->sort('Gross Australian Sales Foreign Currency');?></th>
<th><?php echo $paginator->sort('Net Australian Sales Foreign Currency');?></th>
@ -78,7 +80,7 @@ echo $paginator->counter(array(
<tr id="<?=$job['Job']['id']?>">
<td><button class="editButton">Edit</button></td>
<td>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
<td class=""><?=$job['Job']['job_status'];?></td>
<td class="sale_category nowrap">
<?=$sale_category_array[$job['Job']['sale_category']];?>
@ -107,10 +109,10 @@ echo $paginator->counter(array(
</td>
<td>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?>
</td>
<td>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?>
</td>
<td> <?=$job['Job']['domestic_freight_paid_by'];?>
</td>
@ -135,7 +137,6 @@ echo $paginator->counter(array(
<td>
<?=$job['Job']['gp_percent'];?>
</td>
<td>? Double column?</td>
<td>
<?=$job['Job']['ato_exchange_rate'];?>
</td>
@ -165,16 +166,14 @@ echo $paginator->counter(array(
</tbody>
</table>
<? echo $form->end(); ?>
<div class="paging">
<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
<div class="paging">
<?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
| <?php echo $paginator->numbers();?>
<?php echo $paginator->next(__('next', true).' >>', array(), null, array('class'=>'disabled'));?>
</div>
<?php echo $paginator->next(__('next', true).' >>', array(), null, array('class'=>'disabled'));?>
</div>
<? echo $form->end(); ?>
<? //debug($jobs);
?>

5
views/jobs/view_report.ctp Normal file
View file

@ -0,0 +1,5 @@
<h3><?=$year?></h3>
<? if(isset($month)):?>
<h4><?=$month?></h4>
<?endif;?>

47
webroot/css/quotenik.css
View file

@ -374,10 +374,9 @@ div.quoteproducts {
padding-top: 3%;
}
/* Tables */
Tables
table {
background: #fff;
background: #fff;
border:1px solid #ccc;
border-right:0;
clear: both;
@ -403,7 +402,7 @@ th a:hover {
color: #333;
text-decoration: none;
}
table tr td {
table tr td {
/* background: #fff; */
border-right: 1px solid #ccc;
text-align: center;
@ -444,6 +443,7 @@ td.PriceSummary {
}
.cake-sql-log table {
background: #f4f4f4;
}
@ -1267,29 +1267,20 @@ span.addLineItem {
}
#grid {
width: 100%;
height: 100%;
overflow: scroll;
}
button.actionButtons {
margin-right: 3em;
margin-bottom: 1em;
}
#jobTable {
table .jobsTable {
height: 900px;
width: 100%;
overflow: scroll;
}
table.jobsTable tbody {
height: 800px;
overflow: scroll;
}
table.jobsTable tr th {
border: 1px solid;
font-size: 70%;
}
@ -1299,9 +1290,6 @@ table.jobsTable tr td {
}
table.jobsTable tr td form {
font-size: 70%;
}
.jobsTable input {
width: 70px;
@ -1317,13 +1305,6 @@ table.jobsTable tr td form {
}
.jobsTable [disabled] {
color:#000;
background-color:#fff
}
select.sale_category {
width: 300px;
@ -1335,7 +1316,7 @@ select.job_status {
.outer {
.jobIndexTable{
height: 650px;
}
@ -1378,4 +1359,10 @@ span.month {
span.year {
cursor: pointer;
}
#fixedHeader {
position: absolute;
top: 20;
}

19
webroot/js/job_index.js
View file

@ -1,5 +1,16 @@
$(function() {
//alert($("#jobTableHead > tr > th").length);
/* var headerCols = $(".jobTableHead > tr > th");
headerCols.each(function(index) {
alert($(this).width);
});*/
$(".editButton").show();
@ -41,9 +52,13 @@ $(function() {
function getEditable(id) {
$.get('/jobs/getEditableRow/'+id+'/editedRowCount', false, function(data) {
$("#"+id).replaceWith(data);
$("#"+id).find("button").button();
var tempHeader = $("#originalHeader").clone();
tempHeader.attr('class', 'tempHeader');
$("#"+id).before(tempHeader);
} );
}
@ -53,7 +68,7 @@ function getViewable(id) {
$("#"+id).replaceWith(data);
$("#"+id).find("button").button();
$('.tempHeader').remove();
} );
}