[Phpgroupware-cvs] property inc/class.uibudget.inc.php templates/b...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/05 09:50:52

Modified files:
        inc            : class.uibudget.inc.php 
        templates/base : budget.xsl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uibudget.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/budget.xsl.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: property/inc/class.uibudget.inc.php
diff -u property/inc/class.uibudget.inc.php:1.12 
property/inc/class.uibudget.inc.php:1.13
--- property/inc/class.uibudget.inc.php:1.12    Fri May  5 09:26:10 2006
+++ property/inc/class.uibudget.inc.php Fri May  5 09:50:52 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage budget
-       * @version $Id: class.uibudget.inc.php,v 1.12 2006/05/05 09:26:10 
sigurdne Exp $
+       * @version $Id: class.uibudget.inc.php,v 1.13 2006/05/05 09:50:52 
sigurdne Exp $
        */
 
        /**
@@ -534,20 +534,22 @@
                                                'grouping'                      
=> $entry['grouping'],
                                                'district_id'                   
=> $entry['district_id'],
                                                'budget_cost'                   
=> number_format($entry['budget_cost'], 0, ',', ' '),
-                                               'hits'                          
=> $entry['hits'],
+                                               'hits'                          
=> number_format($entry['hits'], 0, ',', ' '),
                                                'link_details'                  
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&filter=all&status_id=Bestilt&district_id='
 . $entry['district_id'] . '&b_group=' . $entry['grouping']),
                                                'lang_details_text'             
=> lang('obligation details'),
                                                'text_details'                  
=> lang('details'),
                                        );
                                        $sum = $sum + $entry['budget_cost'];
+                                       $sum_hits = $sum_hits + $entry['hits'];
                                }
                        }
 
                        $sum = number_format($sum, 0, ',', ' ');
+                       $sum_hits = number_format($sum_hits, 0, ',', ' ');
                        
                        $table_header[] = array
                        (
-                               'lang_budget_cost'      => lang('budget cost'),
+                               'lang_budget_cost'      => lang('obligations'),
                                'lang_grouping'         => lang('grouping'),
                                'lang_hits'             => lang('hits'),
                                'lang_details'          => lang('details'),
@@ -647,6 +649,7 @@
                        $data = array
                        (
                                'sum'                                           
=> $sum,
+                               'sum_hits'                                      
=> $sum_hits,
                                'lang_sum'                                      
=> lang('sum'),
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'links'                                         
=> $links,
Index: property/templates/base/budget.xsl
diff -u property/templates/base/budget.xsl:1.9 
property/templates/base/budget.xsl:1.10
--- property/templates/base/budget.xsl:1.9      Fri May  5 07:41:13 2006
+++ property/templates/base/budget.xsl  Fri May  5 09:50:52 2006
@@ -813,6 +813,9 @@
                                        <td>
                                        </td>
                                        <td class="th_text" align="right">
+                                               <xsl:value-of 
select="sum_hits"/>
+                                       </td>
+                                       <td class="th_text" align="right">
                                                <xsl:value-of select="sum"/>
                                        </td>
                                        <td>
@@ -834,11 +837,11 @@
                        <td class="th_text" width="10%" align="left">
                                <a href="{$sort_district_id}"><xsl:value-of 
select="lang_district_id"/></a>
                        </td>
-                       <td class="th_text" width="10%" align="left">
+                       <td class="th_text" width="10%" align="right">
                                <a href="{$sort_hits}"><xsl:value-of 
select="lang_hits"/></a>
                        </td>
 
-                       <td class="th_text" width="5%" align="center">
+                       <td class="th_text" width="5%" align="right">
                                <a href="{$sort_budget_cost}"><xsl:value-of 
select="lang_budget_cost"/></a>
                        </td>
                        <td class="th_text" width="5%" align="center">
@@ -871,7 +874,7 @@
                                <td>
                                        <xsl:value-of select="district_id"/>
                                </td>
-                               <td>
+                               <td align = "right">
                                        <xsl:value-of select="hits"/>
                                </td>