[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14820] number formatting
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14820] number formatting |
|
Date: |
Tue, 08 Mar 2016 14:35:38 +0000 |
Revision: 14820
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14820
Author: sigurdne
Date: 2016-03-08 14:35:37 +0000 (Tue, 08 Mar 2016)
Log Message:
-----------
number formatting
Modified Paths:
--------------
trunk/property/inc/class.uiwo_hour.inc.php
trunk/property/js/portico/wo_hour.index.js
Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php 2016-03-08 09:52:58 UTC (rev
14819)
+++ trunk/property/inc/class.uiwo_hour.inc.php 2016-03-08 14:35:37 UTC (rev
14820)
@@ -685,6 +685,7 @@
{
return $this->query();
}
+ phpgwapi_jquery::load_widget('numberformat');
$appname = lang('Workorder');
$function_msg = lang('list hours');
@@ -918,6 +919,16 @@
'sortable' => ($uicols['sortable'][$k])
? true : false,
'hidden' => ($uicols['input_type'][$k]
== 'hidden') ? true : false
);
+ switch ($uicols['name'][$k])
+ {
+ case 'billperae':
+ case 'cost':
+ case 'deviation':
+ case 'result':
+ case 'quantity':
+ $params['formatter'] =
'JqueryPortico.FormatterAmount2';
+ break;
+ }
array_push($data['datatable']['field'],
$params);
}
@@ -1351,8 +1362,8 @@
$proc = new XSLTProcessor;
$proc->registerPHPFunctions(); // enable php
functions
$proc->importStyleSheet($xsl); // attach the
xsl rules
- $css = file_get_contents( PHPGW_SERVER_ROOT
. "/phpgwapi/templates/pure/css/pure-min.css");
- $css .= file_get_contents( PHPGW_SERVER_ROOT
. "/phpgwapi/templates/pure/css/pure-extension.css");
+ $css = file_get_contents(PHPGW_SERVER_ROOT .
"/phpgwapi/templates/pure/css/pure-min.css");
+ $css .= file_get_contents(PHPGW_SERVER_ROOT .
"/phpgwapi/templates/pure/css/pure-extension.css");
$header = <<<HTML
<!DOCTYPE HTML>
Modified: trunk/property/js/portico/wo_hour.index.js
===================================================================
--- trunk/property/js/portico/wo_hour.index.js 2016-03-08 09:52:58 UTC (rev
14819)
+++ trunk/property/js/portico/wo_hour.index.js 2016-03-08 14:35:37 UTC (rev
14820)
@@ -3,17 +3,17 @@
var api = oTable.api();
var data = api.ajax.json();
- $('#value_sum_calculation').html(data.table_sum.value_sum_calculation);
- $('#sum_deviation').html(data.table_sum.sum_deviation);
- $('#sum_result').html(data.table_sum.sum_result);
+
$('#value_sum_calculation').html($.number(data.table_sum.value_sum_calculation,
2, ',', '.'));
+ $('#sum_deviation').html($.number(data.table_sum.sum_deviation, 2, ',',
'.'));
+ $('#sum_result').html($.number(data.table_sum.sum_result, 2, ',', '.'));
- $('#value_addition_rs').html(data.table_sum.value_addition_rs);
+ $('#value_addition_rs').html($.number(data.table_sum.value_addition_rs,
2, ',', '.'));
-
$('#value_addition_percentage').html(data.table_sum.value_addition_percentage);
+
$('#value_addition_percentage').html($.number(data.table_sum.value_addition_percentage,
2, ',', '.'));
- $('#value_sum_tax').html(data.table_sum.value_sum_tax);
+ $('#value_sum_tax').html($.number(data.table_sum.value_sum_tax, 2, ',',
'.'));
- $('#value_total_sum').html(data.table_sum.value_total_sum);
+ $('#value_total_sum').html($.number(data.table_sum.value_total_sum, 2,
',', '.'));
var project_id = data.workorder_data.project_id;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14820] number formatting,
Sigurd Nes <=