[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6666] added initialization of total-price datatable
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [6666] added initialization of total-price datatable on view/edit contract |
|
Date: |
Thu, 09 Dec 2010 14:19:01 +0000 |
Revision: 6666
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6666
Author: erikhl
Date: 2010-12-09 14:18:56 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
added initialization of total-price datatable on view/edit contract
Modified Paths:
--------------
trunk/rental/templates/base/common.php
trunk/rental/templates/base/contract.php
Modified: trunk/rental/templates/base/common.php
===================================================================
--- trunk/rental/templates/base/common.php 2010-12-09 13:44:04 UTC (rev
6665)
+++ trunk/rental/templates/base/common.php 2010-12-09 14:18:56 UTC (rev
6666)
@@ -31,7 +31,6 @@
} else {
this.disable_left_click = false;
}
-
}
);
}
@@ -120,26 +119,45 @@
};
//... set up a new data table
- this.table = new YAHOO.widget.DataTable(
- this.properties.container,
- this.properties.columns,
- this.source,
- {
- paginator: this.paginator,
- dynamicData: true,
- <?php
- $populate =
phpgw::get_var('populate_form');
- echo isset($populate)? 'initialLoad:
false,':''
- ?>
- <?php
- $initLoad =
phpgw::get_var('initial_load');
- echo ($initLoad == 'no')? 'initialLoad:
false,':''
- ?>
- MSG_EMPTY: '<?php echo
lang("DATATABLE_MSG_EMPTY")?>',
- MSG_ERROR: '<?php echo
lang("DATATABLE_MSG_ERROR")?>',
- MSG_LOADING: '<?php echo
lang("DATATABLE_MSG_LOADING")?>'
- }
- );
+ if(this.properties.tid == 'total_price')
+ {
+ //if the datatable is display of total price on
contract, always initialize
+ this.table = new YAHOO.widget.DataTable(
+ this.properties.container,
+ this.properties.columns,
+ this.source,
+ {
+ paginator: this.paginator,
+ dynamicData: true,
+ MSG_EMPTY: '<?php echo
lang("DATATABLE_MSG_EMPTY")?>',
+ MSG_ERROR: '<?php echo
lang("DATATABLE_MSG_ERROR")?>',
+ MSG_LOADING: '<?php echo
lang("DATATABLE_MSG_LOADING")?>'
+ }
+ );
+ }
+ else
+ {
+ this.table = new YAHOO.widget.DataTable(
+ this.properties.container,
+ this.properties.columns,
+ this.source,
+ {
+ paginator: this.paginator,
+ dynamicData: true,
+ <?php
+ $populate =
phpgw::get_var('populate_form');
+ echo isset($populate)?
'initialLoad: false,':''
+ ?>
+ <?php
+ $initLoad =
phpgw::get_var('initial_load');
+ echo ($initLoad == 'no')?
'initialLoad: false,':''
+ ?>
+ MSG_EMPTY: '<?php echo
lang("DATATABLE_MSG_EMPTY")?>',
+ MSG_ERROR: '<?php echo
lang("DATATABLE_MSG_ERROR")?>',
+ MSG_LOADING: '<?php echo
lang("DATATABLE_MSG_LOADING")?>'
+ }
+ );
+ }
//... set table properties
this.table.related = this.properties.related_datatable;
Modified: trunk/rental/templates/base/contract.php
===================================================================
--- trunk/rental/templates/base/contract.php 2010-12-09 13:44:04 UTC (rev
6665)
+++ trunk/rental/templates/base/contract.php 2010-12-09 14:18:56 UTC (rev
6666)
@@ -134,6 +134,13 @@
}
}
}
+ else if(currTab == 'details'){
+ for(i=0;i<YAHOO.rental.datatables.length;i++){
+ if(YAHOO.rental.datatables[i].tid == 'total_price'){
+ reloadDataSources(YAHOO.rental.datatables[i]);
+ }
+ }
+ }
}
</script>
<div id="contract_tabview" class="yui-navset">
@@ -144,9 +151,11 @@
<li><a href="#parties" onclick="javascript:
loadDatatables('parties');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-address-book.png" alt="icon" /> <?php echo
lang('parties') ?></em></a></li>
<li><a href="#price" onclick="javascript:
loadDatatables('price');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-spreadsheet.png" alt="icon" /> <?php echo
lang('price') ?></em></a></li>
<?php }?>
-
+ <?php if($contract->get_id()>0){?>
+ <li <?php echo (!isset($_POST['add_notification'])) ?
'class="selected"' : "" ?>><a href="#details" onclick="javascript:
loadDatatables('details');" ><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/text-x-generic.png" alt="icon" /> <?php echo
lang('details') ?></em></a></li>
+ <?php }else{?>
<li <?php echo (!isset($_POST['add_notification'])) ?
'class="selected"' : "" ?>><a href="#details"><em><img src="<?php echo
RENTAL_TEMPLATE_PATH ?>images/16x16/mimetypes/text-x-generic.png" alt="icon" />
<?php echo lang('details') ?></em></a></li>
-
+ <?php }?>
<?php if($contract->get_id() > 0) {?>
<li><a href="#invoice" onclick="javascript:
loadDatatables('invoice');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/text-x-generic.png" alt="icon" /> <?php echo
lang('invoice') ?></em></a></li>
<li <?php echo (phpgw::get_var('tab') == 'documents') ?
'class="selected"' : ""?>><a href="#documents" onclick="javascript:
loadDatatables('documents');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/apps/system-file-manager.png" alt="icon" /> <?php echo
lang('documents') ?></em></a></li>
@@ -254,7 +263,7 @@
if($editable &&
(!isset($contract_id) || $contract_id <= 0)) {
?>
- <input
type="hidden" name="location_id" id="location_id" value="<?php echo
$contract->get_location_id() ?>"/>
+ <input
type="hidden" name="location_id" id="location_id" value="<?php echo
$contract->get_location_id() ?>" />
<?php
}
echo
lang($contract->get_contract_type_title());
@@ -392,7 +401,7 @@
<?php
if ($editable) {
?>
- <input type="text"
name="invoice_header" id="invoice_header" value="<?php echo
$contract->get_invoice_header(); ?>"/>
+ <input type="text"
name="invoice_header" id="invoice_header" value="<?php echo
$contract->get_invoice_header(); ?>" />
<?php
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6666] added initialization of total-price datatable on view/edit contract,
Erik Holm-Larsen <=