[Fmsystem-commits] [14825] number formatting

[Sigurd Nes]

Revision: 14825
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14825
Author:   sigurdne
Date:     2016-03-11 07:59:57 +0000 (Fri, 11 Mar 2016)
Log Message:
-----------
number formatting

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/js/portico/tts.view.js

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-03-10 15:25:26 UTC (rev 
14824)
+++ trunk/property/inc/class.uitts.inc.php      2016-03-11 07:59:57 UTC (rev 
14825)
@@ -2408,7 +2408,7 @@
                                'ColumnDefs' => array(array('key' => 'period', 
'label' => lang('period'), 'sortable' => true,
                                                'resizeable' => true),
                                        array('key' => 'amount', 'label' => 
lang('amount'), 'sortable' => true, 'resizeable' => true,
-                                               'formatter' => 
'FormatterAmount2'),
+                                               'formatter' => 
'JqueryPortico.FormatterAmount2'),
                                        array('key' => 'remark', 'label' => 
lang('remark'), 'sortable' => false, 'resizeable' => true)),
                                'data' => json_encode($budgets),
                                'config' => array(
@@ -2424,7 +2424,7 @@
                                'ColumnDefs' => array(array('key' => 'period', 
'label' => lang('period'), 'sortable' => true,
                                                'resizeable' => true),
                                        array('key' => 'amount', 'label' => 
lang('amount'), 'sortable' => true, 'resizeable' => true,
-                                               'formatter' => 
'FormatterAmount2'),
+                                               'formatter' => 
'JqueryPortico.FormatterAmount2'),
                                        array('key' => 'remark', 'label' => 
lang('remark'), 'sortable' => false, 'resizeable' => true)),
                                'data' => json_encode($payments),
                                'config' => array(
@@ -2641,6 +2641,7 @@
                                'tabs' => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab)
                        );
 
+                       phpgwapi_jquery::load_widget('numberformat');
                        self::add_javascript('property', 'portico', 
'tts.view.js');
 
                        $this->_insert_custom_js();

Modified: trunk/property/js/portico/tts.view.js
===================================================================
--- trunk/property/js/portico/tts.view.js       2016-03-10 15:25:26 UTC (rev 
14824)
+++ trunk/property/js/portico/tts.view.js       2016-03-11 07:59:57 UTC (rev 
14825)
@@ -25,7 +25,7 @@
                                return intVal(a) + intVal(b);
                        }) : 0;
 
-               $(api.column(col).footer()).html("<div align=\"right\">" + 
pageTotal + "</div>");
+               $(api.column(col).footer()).html("<div align=\"right\">" + 
$.number(pageTotal, 2, ',', '.') + "</div>");
        });
 
 };
@@ -53,7 +53,7 @@
                                return intVal(a) + intVal(b);
                        }) : 0;
 
-               $(api.column(col).footer()).html("<div align=\"right\">" + 
pageTotal + "</div>");
+               $(api.column(col).footer()).html("<div align=\"right\">" + 
$.number(pageTotal, 2, ',', '.') + "</div>");
        });
 
 };
@@ -64,10 +64,6 @@
        return "<center>" + oData[key] + "</center>";
 };
 
-var FormatterAmount2 = function (key, oData)
-{
-       return "<div align=\"right\">" + oData[key] + "</div>";
-};
 
 
/********************************************************************************/