Added JS to edit jobs to enforce the correct columns. Not 100pc finished

This commit is contained in:
Karl Cordes 2011-04-15 17:34:51 +10:00
parent 539dd2343a
commit aa26dd8a19
10 changed files with 178 additions and 105 deletions

View file

@ -409,15 +409,7 @@ class JobsController extends AppController {
$sale_category_options = array("INDENT"=>"INDENT", "STOCK"=>"STOCK", "COMMISSION"=>"COMMISSION");
$this->set('sale_category_options', $sale_category_options);
$shipment_category_options = array(
"AUSTRALIA"=>"AUSTRALIA",
"EXPORT"=>"EXPORT",
"DIRECT-INTL"=>"DIRECT-INTL",
"DIRECT-AUST"=>"DIRECT-AUST",
"NO-SHIP"=>"NO-SHIP"
);
$this->set('shipment_category_options', $shipment_category_options);
$this->set('shipment_category_options', $this->shipment_category_options());
}
@ -452,30 +444,10 @@ class JobsController extends AppController {
$sale_category_options = array("INDENT"=>"INDENT", "STOCK"=>"STOCK", "COMMISSION"=>"COMMISSION");
$this->set('sale_category_options', $sale_category_options);
$shipment_category_options = array(
"AUSTRALIA"=>"AUSTRALIA",
"EXPORT"=>"EXPORT",
"DIRECT-INTL"=>"DIRECT-INTL",
"DIRECT-AUST"=>"DIRECT-AUST",
"NO-SHIP"=>"NO-SHIP"
);
$this->set('shipment_category_options', $shipment_category_options);
$this->set('shipment_category_options', $this->shipment_category_options());
}
/*
function delete($id = null) {
if (!$id) {
$this->flash(__('Invalid Job', true), array('action'=>'index'));
}
if ($this->Job->del($id)) {
$this->flash(__('Job deleted', true), array('action'=>'index'));
}
}
*/
function __isNotEmptyDate($date) {

View file

@ -32,5 +32,7 @@ class Currency extends AppModel {
);
var $order = "Currency.name ASC";
}
?>

View file

@ -30,7 +30,7 @@ foreach ($freightForwarders as $freightForwarder):
<td class="actions">
<?php echo $html->link(__('View', true), array('action' => 'view', $freightForwarder['FreightForwarder']['id'])); ?>
<?php echo $html->link(__('Edit', true), array('action' => 'edit', $freightForwarder['FreightForwarder']['id'])); ?>
<?php echo $html->link(__('Delete', true), array('action' => 'delete', $freightForwarder['FreightForwarder']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $freightForwarder['FreightForwarder']['id'])); ?>
<?php //echo $html->link(__('Delete', true), array('action' => 'delete', $freightForwarder['FreightForwarder']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $freightForwarder['FreightForwarder']['id'])); ?>
</td>
</tr>
<?php endforeach; ?>

View file

@ -1,11 +1,6 @@
<div class="freightForwarders view">
<h2><?php __('FreightForwarder');?></h2>
<dl><?php $i = 0; $class = ' class="altrow"';?>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $freightForwarder['FreightForwarder']['id']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $freightForwarder['FreightForwarder']['name']; ?>
@ -16,8 +11,5 @@
<div class="actions">
<ul>
<li><?php echo $html->link(__('Edit FreightForwarder', true), array('action' => 'edit', $freightForwarder['FreightForwarder']['id'])); ?> </li>
<li><?php echo $html->link(__('Delete FreightForwarder', true), array('action' => 'delete', $freightForwarder['FreightForwarder']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $freightForwarder['FreightForwarder']['id'])); ?> </li>
<li><?php echo $html->link(__('List FreightForwarders', true), array('action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New FreightForwarder', true), array('action' => 'add')); ?> </li>
</ul>
</div>

View file

@ -5,7 +5,8 @@
$(function() {
/** This could be cleaner. However, this will work with multiple rows being edited */
getSelectIDs();
$('#<?=$job['Job']['id']?>_date_order_received_display').datepicker({
showButtonPanel: true,
dateFormat: 'd M yy',
@ -32,11 +33,92 @@
});
$("#<?=$job['Job']['id']?>_sale_category").change(function() {
getSelectIDs();
});
$("#<?=$job['Job']['id']?>_currency_id").change(function() {
getSelectIDs();
});
function getSelectIDs() {
var catID = getSaleCategoryID();
var currencyID = getCurrencyID();
whichInputsReadOnly(catID, currencyID);
}
function whichInputsReadOnly(catID, currencyID) {
$(".highlighted").removeClass("highlighted");
if(catID < 2) { //Aust Sale.
if(currencyID == 2) { //Aust Sale. AUD
$(".aust_sale_aud").attr("readonly",false);
$(".aust_sale_aud").addClass("highlighted");
$(".aust_sale_fc").attr("readonly",true);
$('.export_sale_fc').attr("readonly",true);
$('.export_sale_aud').attr("readonly",true);
}
else { //Aust Sale, Foreign Currency.
$(".aust_sale_fc").attr("readonly",false);
$(".aust_sale_fc").addClass("highlighted");
$(".aust_sale_aud").attr("readonly",true);
$('.export_sale_fc').attr("readonly",true);
$('.export_sale_aud').attr("readonly",true);
}
}
else { //Export Sale
if(currencyID == 2) {//Export Sale. AUD
$('.export_sale_aud').attr("readonly",false);
$(".export_sale_aud").addClass("highlighted");
$(".aust_sale_fc").attr("readonly",true);
$(".aust_sale_aud").attr("readonly",true);
$('.export_sale_fc').attr("readonly",true);
}
else { //Export Sale. Foreign Currency.
$('.export_sale_fc').attr("readonly",false);
$(".export_sale_fc").addClass("highlighted");
$(".aust_sale_fc").attr("readonly",true);
$(".aust_sale_aud").attr("readonly",true);
$('.export_sale_aud').attr("readonly",true);
}
}
}
function getSaleCategoryID() {
var id;
$("#<?=$job['Job']['id']?>_sale_category :selected").each(function(i, selected) {
id = this.value;
});
return id;
}
function getCurrencyID() {
var id;
$("#<?=$job['Job']['id']?>_currency_id :selected").each(function(i, selected) {
id = this.value;
});
return id;
}
});
</script>
@ -69,7 +151,7 @@ else {
<td><?=$form->input('all_sent', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_sent'], 'class'=>'yesNo'));?></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'));?>
<?=$form->input('sale_category', array('id'=>$job['Job']['id'].'_sale_category', 'options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?>
</td>
<td>
<?=$form->input('job_type', array('options'=>$job_type_options, 'label' => false, 'selected'=>$job['Job']['job_type']));?></td>
@ -117,48 +199,48 @@ else {
<td> <?=$form->input('domestic_freight_paid_by', array('type'=>'select','options'=>$freight_paid_by_options, 'value'=>$job['Job']['domestic_freight_paid_by'], 'label'=>false));?>
</td>
<td>
<?=$form->input('currency_id', array('value'=>$job['Job']['currency_id'], 'type'=>'select', 'options'=>$currencies, 'label'=>false ));?>
<?=$form->input('currency_id', array('id'=>$job['Job']['id']."_currency_id",'value'=>$job['Job']['currency_id'], 'type'=>'select', 'options'=>$currencies, 'label'=>false ));?>
</td>
<td>
<?=$form->input('company_gross_sales_aud', array('value'=>$job['Job']['company_gross_sales_aud'], 'label'=>false));?>
<?=$form->input('company_gross_sales_aud', array('id'=>$job['Job']['id']."_company_gross_sales_aud", 'value'=>$job['Job']['company_gross_sales_aud'], 'label'=>false,'class'=>'aust_sale_aud'));?>
</td>
<td>
<?=$form->input('net_sales_aud', array('value'=>$job['Job']['net_sales_aud'], 'label'=>false));?>
<?=$form->input('net_sales_aud', array('id'=>$job['Job']['id']."_net_sales_aud",'value'=>$job['Job']['net_sales_aud'], 'label'=>false,'class'=>'aust_sale_aud'));?>
</td>
<td> <?=$form->input('gross_profit_aud', array('value'=>$job['Job']['gross_profit_aud'], 'label'=>false ));?>
<td> <?=$form->input('gross_profit_aud', array('id'=>$job['Job']['id']."_gross_profit_aud",'value'=>$job['Job']['gross_profit_aud'], 'label'=>false,'class'=>'aust_sale_aud' ));?>
</td>
<td>
<?=$form->input('net_export_sales_aud', array('value'=>$job['Job']['net_export_sales_aud'], 'label'=>false ));?>
<?=$form->input('net_export_sales_aud', array('id'=>$job['Job']['id']."_net_export_sales_aud",'value'=>$job['Job']['net_export_sales_aud'], 'label'=>false,'class'=>'export_sale_aud' ));?>
</td>
<td>
<?=$form->input('gross_profit_exports_aud', array('value'=>$job['Job']['gross_profit_exports_aud'], 'label'=>false));?>
<?=$form->input('gross_profit_exports_aud', array('id'=>$job['Job']['id']."_gross_profit_exports_aud",'value'=>$job['Job']['gross_profit_exports_aud'], 'label'=>false,'class'=>'export_sale_aud'));?>
</td>
<td>
<?=$form->input('gp_percent', array('value'=>$job['Job']['gp_percent'], 'label'=>false));?>
<?=$form->input('gp_percent', array('id'=>$job['Job']['id']."_gp_percent",'value'=>$job['Job']['gp_percent'], 'label'=>false));?>
</td>
<td>
<?=$form->input('ato_exchange_rate', array('value'=>$job['Job']['ato_exchange_rate'], 'label'=>false ));?>
<?=$form->input('ato_exchange_rate', array('id'=>$job['Job']['id']."_ato_exchange_rate",'value'=>$job['Job']['ato_exchange_rate'], 'label'=>false ));?>
</td>
<td> <?=$form->input('gross_australian_sales_foreign_currency', array('value'=>$job['Job']['gross_australian_sales_foreign_currency'], 'label'=>false));?>
<td> <?=$form->input('gross_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_australian_sales_foreign_currency",'value'=>$job['Job']['gross_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?>
</td>
<td>
<?=$form->input('net_australian_sales_foreign_currency', array('value'=>$job['Job']['net_australian_sales_foreign_currency'], 'label'=>false));?>
<?=$form->input('net_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_net_australian_sales_foreign_currency",'value'=>$job['Job']['net_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?>
</td>
<td> <?=$form->input('gross_profit_value_australian_sales_foreign_currency', array('value'=>$job['Job']['gross_profit_value_australian_sales_foreign_currency'], 'label'=>false));?>
<td> <?=$form->input('gross_profit_value_australian_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_profit_value_australian_sales_foreign_currency",'value'=>$job['Job']['gross_profit_value_australian_sales_foreign_currency'], 'label'=>false, 'class'=>'aust_sale_fc'));?>
</td>
<td>
<?=$form->input('gross_export_sales_foreign_currency', array('value'=>$job['Job']['gross_export_sales_foreign_currency'], 'label'=>false));?>
<?=$form->input('gross_export_sales_foreign_currency', array('id'=>$job['Job']['id']."_gross_export_sales_foreign_currency",'value'=>$job['Job']['gross_export_sales_foreign_currency'], 'label'=>false, 'class'=>'export_sale_fc'));?>
</td>
<td> <?=$form->input('net_export_sales_foreign_currency', array('value'=>$job['Job']['net_export_sales_foreign_currency'], 'label'=>false));?>
<td> <?=$form->input('net_export_sales_foreign_currency', array('id'=>$job['Job']['id']."_net_export_sales_foreign_currency",'value'=>$job['Job']['net_export_sales_foreign_currency'], 'label'=>false,'class'=>'export_sale_fc'));?>
</td>
<td> <?=$form->input('gross_profit_value_after_discount_exports_foreign_currency', array('value'=>$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'], 'label'=>false));?>
<td> <?=$form->input('gross_profit_value_after_discount_exports_foreign_currency', array('id'=>$job['Job']['id']."_gross_profit_value_after_discount_exports_foreign_currency",'value'=>$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'], 'label'=>false, 'class'=>'export_sale_fc'));?>
</td>
<td>
<?=$form->input('gross_commissions', array('value'=>$job['Job']['gross_commissions'], 'label'=>false));?>
<?=$form->input('gross_commissions', array('id'=>$job['Job']['id']."_gross_commissions",'value'=>$job['Job']['gross_commissions'], 'label'=>false));?>
</td>
<td> <?=$form->input('net_commissions', array('value'=>$job['Job']['net_commissions'], 'label'=>false));?>
<td> <?=$form->input('net_commissions', array('id'=>$job['Job']['id']."_net_commissions",'value'=>$job['Job']['net_commissions'], 'label'=>false));?>
</td>
<td><button class="saveButton">Save</button> <button class="cancelButton">Cancel</button></td>
</tr>

View file

@ -52,21 +52,21 @@ echo $paginator->counter(array(
<th><?php echo $paginator->sort('Date Sent to Customer', 'date_sent_to_customer');?></th>
<th><?php echo $paginator->sort('Freight Paid By CMC');?></th>
<th><?php echo $paginator->sort('Sale Currency');?></th>
<th><?php echo $paginator->sort('Gross Sales AUD');?></th>
<th><?php echo $paginator->sort('Net Sales AUD');?></th>
<th><?php echo $paginator->sort('Gross Profit AUD');?></th>
<th><?php echo $paginator->sort('Net Export Sales Converted to Or Invoiced 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('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>
<th><?php echo $paginator->sort('Gross Profit value Australian Sales Foreign Currency');?></th>
<th><?php echo $paginator->sort('Gross Export Sales Foreign Currency');?></th>
<th><?php echo $paginator->sort('Net Export Sales Foreign Currency');?></th>
<th><?php echo $paginator->sort('Gross Profit Value After Discount Exports Foreign Currency');?></th>
<th><?php echo $paginator->sort('Gross Commissions');?></th>
<th><?php echo $paginator->sort('Net Commisions');?></th>
<th class="purple"><?php echo $paginator->sort('Gross Sales AUD');?></th>
<th class="purple"><?php echo $paginator->sort('Net Sales AUD');?></th>
<th class="purple"><?php echo $paginator->sort('Gross Profit AUD');?></th>
<th class="purple"><?php echo $paginator->sort('Net Export Sales Converted to Or Invoiced in AUD');?></th>
<th class="purple"><?php echo $paginator->sort('Gross Profit Value Export in AUD');?></th>
<th class="purple"><?php echo $paginator->sort('GP% Excl Commissions');?></th>
<th class="pink"><?php echo $paginator->sort('ATO Exchange Rate');?></th>
<th class="lightblue"><?php echo $paginator->sort('Gross Australian Sales Foreign Currency');?></th>
<th class="lightblue"><?php echo $paginator->sort('Net Australian Sales Foreign Currency');?></th>
<th class="lightblue"><?php echo $paginator->sort('Gross Profit value Australian Sales Foreign Currency');?></th>
<th class="lightgreen"><?php echo $paginator->sort('Gross Export Sales Foreign Currency');?></th>
<th class="lightgreen"><?php echo $paginator->sort('Net Export Sales Foreign Currency');?></th>
<th class="lightgreen"><?php echo $paginator->sort('Gross Profit Value After Discount Exports Foreign Currency');?></th>
<th class="darkgreen"><?php echo $paginator->sort('Gross Commissions');?></th>
<th class="darkgreen"><?php echo $paginator->sort('Net Commisions');?></th>
<th class="actions"><?php __('Actions');?></th>
</tr>
</thead>

View file

@ -0,0 +1,15 @@
<?php echo $form->create('Shipment');?>
<?php
echo $form->input('box_count');
echo $form->input('freight_forwarder_id');
echo $form->input('date_arrived');
echo $form->input('date_dispatched');
echo $form->input('airway_bill');
echo $form->input('comments');
echo $form->input('Job');
echo $form->input('Principle');
echo $form->input('PurchaseOrder');
?>
<?php echo $form->end('Submit');?>

View file

@ -104,23 +104,7 @@
<div id="dialog-form" title="New Shipment">
<p class="validateTips"></p>
<?php echo $form->create('Shipment');?>
<fieldset>
<legend><?php __('Add Shipment');?></legend>
<?php
echo $form->input('box_count');
echo $form->input('freight_forwarder_id');
echo $form->input('date_arrived');
echo $form->input('date_dispatched');
echo $form->input('airway_bill');
echo $form->input('comments');
echo $form->input('Job');
echo $form->input('Principle');
echo $form->input('PurchaseOrder');
?>
</fieldset>
<h1>OH BABY</h1>
</div>
<?php debug($shipments); ?>

View file

@ -392,13 +392,13 @@ th {
text-align: center;
}
th a {
background:#f2f2f2;
display: block;
padding: 2px 4px;
text-decoration: none;
}
th a:hover {
background: #ccc;
color: #333;
text-decoration: none;
}
@ -1283,6 +1283,28 @@ table.jobsTable tr th {
}
/** Header Colors for Job table to replaced 'Book1'. */
th.purple {
background-color: #8D80FC;
}
th.pink {
background-color: #FFB2ED;
}
th.lightblue {
background-color: #71DAED;
}
th.lightgreen {
background-color: #A5FFDC;
}
th.darkgreen {
background-color: #4DBC6B;
}
table.jobsTable tr td {
border: 1px solid;
@ -1314,6 +1336,11 @@ select.sale_category {
}
input.highlighted {
background-color:#77A7FF;
font-size: 80%;
}
select.yesNo {
width: 50px;
}

View file

@ -1,6 +1,5 @@
$(function() {
// a workaround for a flaw in the demo system (http://dev.jqueryui.com/ticket/4375), ignore!
$( "#dialog:ui-dialog" ).dialog( "destroy" );
var name = $( "#name" ),
email = $( "#email" ),
@ -44,7 +43,7 @@ $(function() {
width: 350,
modal: true,
buttons: {
"Create an account": function() {
"New Shipment": function() {
var bValid = true;
allFields.removeClass( "ui-state-error" );