[Fmsystem-commits] [16998] rental: formatting

[sigurdne]

Revision: 16998
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16998
Author:   sigurdne
Date:     2017-08-25 04:56:16 -0400 (Fri, 25 Aug 2017)
Log Message:
-----------
rental: formatting

Modified Paths:
--------------
    trunk/rental/inc/class.uifrontpage.inc.php
    trunk/rental/js/rental/frontpage.index.js

Modified: trunk/rental/inc/class.uifrontpage.inc.php
===================================================================
--- trunk/rental/inc/class.uifrontpage.inc.php  2017-08-23 12:03:49 UTC (rev 
16997)
+++ trunk/rental/inc/class.uifrontpage.inc.php  2017-08-25 08:56:16 UTC (rev 
16998)
@@ -27,9 +27,9 @@
                                array('key' => 'last_updated', 'label' => 
lang('last_updated'), 'sortable' => true),
                                array('key' => 'term_label', 'label' => 
lang('billing_term'), 'sortable' => true,
                                        'className' => 'center'),
-                               array('key' => 'total_price', 'label' => 
lang('total_price'), 'sortable' => false,
+                               array('key' => 'total_price', 'label' => 
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
                                        'className' => 'right', 'formatter' => 
'formatterPrice'),
-                               array('key' => 'rented_area', 'label' => 
lang('area'), 'sortable' => false,
+                               array('key' => 'rented_area', 'label' => 
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
                                        'hidden' => false,
                                        'className' => 'right', 'formatter' => 
'formatterArea'),
                                array('key' => 'contract_status', 'label' => 
lang('contract_status'), 'sortable' => false,
@@ -112,9 +112,9 @@
                                array('key' => 'date_end', 'label' => 
lang('date_end'), 'sortable' => true, 'className' => 'center'),
                                array('key' => 'term_label', 'label' => 
lang('billing_term'), 'sortable' => true,
                                        'className' => 'center'),
-                               array('key' => 'total_price', 'label' => 
lang('total_price'), 'sortable' => false,
+                               array('key' => 'total_price', 'label' => 
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
                                        'className' => 'right', 'formatter' => 
'formatterPrice'),
-                               array('key' => 'rented_area', 'label' => 
lang('area'), 'sortable' => false,
+                               array('key' => 'rented_area', 'label' => 
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
                                        'hidden' => false,
                                        'className' => 'right', 'formatter' => 
'formatterArea'),
                                array('key' => 'contract_status', 'label' => 
lang('contract_status'), 'sortable' => false,
@@ -183,9 +183,9 @@
                                array('key' => 'date_end', 'label' => 
lang('date_end'), 'sortable' => true, 'className' => 'center'),
                                array('key' => 'term_label', 'label' => 
lang('billing_term'), 'sortable' => true,
                                        'className' => 'center'),
-                               array('key' => 'total_price', 'label' => 
lang('total_price'), 'sortable' => false,
+                               array('key' => 'total_price', 'label' => 
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
                                        'className' => 'right', 'formatter' => 
'formatterPrice'),
-                               array('key' => 'rented_area', 'label' => 
lang('area'), 'sortable' => false,
+                               array('key' => 'rented_area', 'label' => 
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
                                        'hidden' => false,
                                        'className' => 'right', 'formatter' => 
'formatterArea'),
                                array('key' => 'contract_status', 'label' => 
lang('contract_status'), 'sortable' => false,
@@ -243,9 +243,9 @@
                                array('key' => 'date_end', 'label' => 
lang('date_end'), 'sortable' => true, 'className' => 'center'),
                                array('key' => 'term_label', 'label' => 
lang('billing_term'), 'sortable' => true,
                                        'className' => 'center'),
-                               array('key' => 'total_price', 'label' => 
lang('total_price'), 'sortable' => false,
+                               array('key' => 'total_price', 'label' => 
lang('total_price') . " ({$this->currency_suffix})", 'sortable' => false,
                                        'className' => 'right', 'formatter' => 
'formatterPrice'),
-                               array('key' => 'rented_area', 'label' => 
lang('area'), 'sortable' => false,
+                               array('key' => 'rented_area', 'label' => 
lang('area') . " ({$this->area_suffix})", 'sortable' => false,
                                        'hidden' => false,
                                        'className' => 'right', 'formatter' => 
'formatterArea'),
                                array('key' => 'contract_status', 'label' => 
lang('contract_status'), 'sortable' => false,

Modified: trunk/rental/js/rental/frontpage.index.js
===================================================================
--- trunk/rental/js/rental/frontpage.index.js   2017-08-23 12:03:49 UTC (rev 
16997)
+++ trunk/rental/js/rental/frontpage.index.js   2017-08-25 08:56:16 UTC (rev 
16998)
@@ -7,13 +7,13 @@
 
 function formatterPrice(key, oData)
 {
-       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator) + ' ' + currency_suffix;
+       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator);
        return amount;
 }
 
 function formatterArea(key, oData)
 {
-       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator) + ' ' + area_suffix;
+       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator);
        return amount;
 }