diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp index 4ab0a933..efd40e4d 100644 --- a/views/jobs/get_editable_row.ctp +++ b/views/jobs/get_editable_row.ctp @@ -64,15 +64,12 @@ 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('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>'job_status'));?> +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'));?> @@ -133,7 +130,7 @@ else { input('gp_percent', array('value'=>$job['Job']['gp_percent'], 'label'=>false));?> -? Double column? + input('ato_exchange_rate', array('value'=>$job['Job']['ato_exchange_rate'], 'label'=>false ));?> diff --git a/views/jobs/get_viewable_row.ctp b/views/jobs/get_viewable_row.ctp index c2ef5a69..7745d577 100644 --- a/views/jobs/get_viewable_row.ctp +++ b/views/jobs/get_viewable_row.ctp @@ -57,7 +57,7 @@ - ? Double column? + diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp index 7c5853ac..3af05fbc 100644 --- a/views/jobs/index.ctp +++ b/views/jobs/index.ctp @@ -1,5 +1,6 @@ link('jquery.chromatable'); echo $javascript->link('job_index'); ?> @@ -25,12 +26,14 @@ echo $paginator->counter(array( +create('Job', array('action'=>'/jobs/ajax_edit'));?> +
+
+ -
- create('Job', array('action'=>'/jobs/ajax_edit'));?> - - + + @@ -55,7 +58,6 @@ echo $paginator->counter(array( - @@ -78,7 +80,7 @@ echo $paginator->counter(array( + element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?> @@ -135,7 +137,6 @@ echo $paginator->counter(array( - @@ -165,16 +166,14 @@ echo $paginator->counter(array(
Actions sort('Order Received', 'date_order_received');?>sort('Net Export Sales Converted to Or Charged in AUD');?> sort('Gross Profit Value Export in AUD');?> sort('GP% Excl Commissions');?>sort('Company Gross Sales AUD');?> sort('ATO Exchange Rate');?> sort('Gross Australian Sales Foreign Currency');?> sort('Net Australian Sales Foreign Currency');?>
- element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?> @@ -107,10 +109,10 @@ echo $paginator->counter(array( - element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?> + element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?> - element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?> + element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?> ? Double column?
- end(); ?> -
- prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> +
+ + prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> | numbers();?> - next(__('next', true).' >>', array(), null, array('class'=>'disabled'));?> -
+ next(__('next', true).' >>', array(), null, array('class'=>'disabled'));?>
- - +end(); ?> \ No newline at end of file diff --git a/views/jobs/view_report.ctp b/views/jobs/view_report.ctp new file mode 100644 index 00000000..429ee5af --- /dev/null +++ b/views/jobs/view_report.ctp @@ -0,0 +1,5 @@ +

+ + +

+ \ No newline at end of file diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index ea31011c..893d2f04 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -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; } \ No newline at end of file diff --git a/webroot/js/job_index.js b/webroot/js/job_index.js index 79767f48..b460448d 100644 --- a/webroot/js/job_index.js +++ b/webroot/js/job_index.js @@ -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(); } ); }