[Fmsystem-commits] [6767] bkbooking: bugfixes

[Kjell Arne Espedal]

Revision: 6767
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6767
Author:   kjell
Date:     2011-01-14 12:42:21 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
bkbooking: bugfixes

Modified Paths:
--------------
    trunk/booking/inc/class.uievent.inc.php
    trunk/bookingfrontend/setup/phpgw_no.lang

Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php     2011-01-14 12:25:19 UTC (rev 
6766)
+++ trunk/booking/inc/class.uievent.inc.php     2011-01-14 12:42:21 UTC (rev 
6767)
@@ -9,6 +9,7 @@
                        'index'                 =>      true,
                        'add'                   =>      true,
                        'edit'                  =>      true,
+                       'info'                  =>      true,
                        'toggle_show_inactive'  =>      true,
                );
                
@@ -23,6 +24,7 @@
                        $this->agegroup_bo = CreateObject('booking.boagegroup');
                        $this->audience_bo = CreateObject('booking.boaudience');
                        $this->organization_bo = 
CreateObject('booking.boorganization');
+                       $this->resource_bo = CreateObject('booking.boresource');
                        self::set_active_menu('booking::applications::events');
                        $this->fields = array('activity_id', 'description',
                                                                                
'resources', 'cost', 'application_id',
@@ -594,4 +596,27 @@
                        self::render_template('event_edit', array('event' => 
$event, 'activities' => $activities, 'agegroups' => $agegroups, 'audience' => 
$audience, 'comments' => $comments));
                }
 
+               public function info()
+               {
+                       $event = 
$this->bo->read_single(intval(phpgw::get_var('id', 'GET')));
+                       $resources = 
$this->resource_bo->so->read(array('filters'=>array('id'=>$event['resources']), 
'sort'=>'name'));
+                       $event['resources'] = $resources['results'];
+                       $res_names = array();
+                       foreach($event['resources'] as $res)
+                       {
+                               $res_names[] = $res['name'];
+                       }
+                       $event['resource'] = phpgw::get_var('resource', 'GET');
+                       $event['resource_info'] = join(', ', $res_names);
+                       $event['building_link'] = self::link(array('menuaction' 
=> 'booking.uibuilding.show', 'id' => $event['resources'][0]['building_id']));
+                       $event['org_link'] = self::link(array('menuaction' => 
'booking.uiorganization.show', 'id' => $event['organization_id']));
+                       $event['add_link'] = self::link(array('menuaction' => 
'booking.uibooking.add', 'allocation_id'=>$event['id'], 
'from_'=>$event['from_'], 'to_'=>$event['to_'], 
'resource'=>$event['resource']));
+                       $event['when'] = pretty_timestamp($event['from_']).' - 
'.pretty_timestamp($event['to_']);
+
+                       $event['edit_link'] = self::link(array('menuaction' => 
'booking.uievent.edit', 'id' => $event['id']));
+
+                       self::render_template('event_info', 
array('event'=>$event));
+                       $GLOBALS['phpgw']->xslttpl->set_output('wml'); // Evil 
hack to disable page chrome
+               }
+
        }

Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang   2011-01-14 12:25:19 UTC (rev 
6766)
+++ trunk/bookingfrontend/setup/phpgw_no.lang   2011-01-14 12:42:21 UTC (rev 
6767)
@@ -323,3 +323,4 @@
 Go back to calendar    bookingfrontend no      Tilbake til kalender
 Agegroups kan not be larger than 9999 peoples  bookingfrontend no      
Estimert antall deltakere kan ikke være større en 9999 personer
 Contact information name is to long. max 50 characters bookingfrontend no      
Navn i kontakt informasjon er for langt. Maks 50 tegn
+Unable to fill report  bookingfrontend no      Greide ikke å fylle ut rapport