[Fmsystem-commits] [15208] list cost history

[sigurdne]

Revision: 15208
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15208
Author:   sigurdne
Date:     2016-05-26 18:26:46 +0000 (Thu, 26 May 2016)
Log Message:
-----------
list cost history

Modified Paths:
--------------
    trunk/booking/inc/class.uiallocation.inc.php
    trunk/booking/inc/class.uibooking.inc.php
    trunk/booking/inc/class.uievent.inc.php
    trunk/booking/setup/phpgw_no.lang
    trunk/booking/templates/base/allocation.xsl

Modified: trunk/booking/inc/class.uiallocation.inc.php
===================================================================
--- trunk/booking/inc/class.uiallocation.inc.php        2016-05-26 18:26:15 UTC 
(rev 15207)
+++ trunk/booking/inc/class.uiallocation.inc.php        2016-05-26 18:26:46 UTC 
(rev 15208)
@@ -109,6 +109,15 @@
                                                        'label' => lang('To')
                                                ),
                                                array(
+                                                       'key' => 'cost',
+                                                       'label' => lang('cost')
+                                               ),
+                                               array(
+                                                       'key' => 'cost_history',
+                                                       'label' => lang('cost 
history'),
+                                                       'sortable' => false,
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -188,6 +197,7 @@
                        {
                                $allocation['from_'] = 
pretty_timestamp($allocation['from_']);
                                $allocation['to_'] = 
pretty_timestamp($allocation['to_']);
+                               $allocation['cost_history'] = 
count($this->bo->so->get_ordered_costs($allocation['id']));
                        }
 
                        return $this->jquery_results($allocations);

Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php   2016-05-26 18:26:15 UTC (rev 
15207)
+++ trunk/booking/inc/class.uibooking.inc.php   2016-05-26 18:26:46 UTC (rev 
15208)
@@ -120,6 +120,11 @@
                                                        'label' => lang('Cost')
                                                ),
                                                array(
+                                                       'key' => 'cost_history',
+                                                       'label' => lang('cost 
history'),
+                                                       'sortable' => false,
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -199,6 +204,7 @@
                                $booking['building_name'] = $building['name'];
                                $booking['from_'] = 
pretty_timestamp($booking['from_']);
                                $booking['to_'] = 
pretty_timestamp($booking['to_']);
+                               $booking['cost_history'] = 
count($this->bo->so->get_ordered_costs($booking['id']));
                        }
 
                        array_walk($bookings["results"], array($this, 
"_add_links"), "booking.uibooking.show");

Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php     2016-05-26 18:26:15 UTC (rev 
15207)
+++ trunk/booking/inc/class.uievent.inc.php     2016-05-26 18:26:46 UTC (rev 
15208)
@@ -111,6 +111,15 @@
                                                        'label' => 
lang('Active')
                                                ),
                                                array(
+                                                       'key' => 'cost',
+                                                       'label' => lang('Cost')
+                                               ),
+                                               array(
+                                                       'key' => 'cost_history',
+                                                       'label' => lang('cost 
history'),
+                                                       'sortable' => false,
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -172,6 +181,7 @@
                        {
                                $event['from_'] = 
pretty_timestamp($event['from_']);
                                $event['to_'] = pretty_timestamp($event['to_']);
+                               $event['cost_history'] = 
count($this->bo->so->get_ordered_costs($event['id']));
                        }
 
                        array_walk($events["results"], array($this, 
"_add_links"), "booking.uievent.edit");

Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang   2016-05-26 18:26:15 UTC (rev 15207)
+++ trunk/booking/setup/phpgw_no.lang   2016-05-26 18:26:46 UTC (rev 15208)
@@ -681,4 +681,5 @@
 Subject caseofficer    booking no      Emne Saksbehandler
 Mail text for comment added    booking no      Ekstra epost tekst for kommentar
 organzations_ids_description   booking no      Her kan du legge inn en komma 
separert liste med organisasjons IDer som vil få epost viss noen avbestiller 
denne ressursen.
-organzations_ids       booking no      Organisasjons IDer
\ No newline at end of file
+organzations_ids       booking no      Organisasjons IDer
+cost history   booking no      Prishistorikk
\ No newline at end of file

Modified: trunk/booking/templates/base/allocation.xsl
===================================================================
--- trunk/booking/templates/base/allocation.xsl 2016-05-26 18:26:15 UTC (rev 
15207)
+++ trunk/booking/templates/base/allocation.xsl 2016-05-26 18:26:46 UTC (rev 
15208)
@@ -21,6 +21,12 @@
                                        <xsl:value-of 
select="php:function('pretty_timestamp', allocation/to_)"/>
                                </div>
                                <div class="pure-control-group">
+                                       <label for="field_cost">
+                                               <xsl:value-of 
select="php:function('lang', 'Cost')" />
+                                       </label>
+                                       <xsl:value-of select="allocation/cost"/>
+                               </div>
+                               <div class="pure-control-group">
                                        <label>
                                                <xsl:value-of 
select="php:function('lang', 'Season')" />
                                        </label>