[Fmsystem-commits] [6523] bkbooking: added search for building on application list

[Kjell Arne Espedal]

Revision: 6523
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6523
Author:   kjell
Date:     2010-10-29 08:30:20 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
bkbooking: added search for building on application list

Modified Paths:
--------------
    trunk/booking/inc/class.soapplication.inc.php
    trunk/booking/inc/class.uiapplication.inc.php
    trunk/booking/setup/setup.inc.php
    trunk/booking/setup/tables_current.inc.php
    trunk/booking/setup/tables_update.inc.php
    trunk/bookingfrontend/setup/setup.inc.php

Modified: trunk/booking/inc/class.soapplication.inc.php
===================================================================
--- trunk/booking/inc/class.soapplication.inc.php       2010-10-28 12:57:47 UTC 
(rev 6522)
+++ trunk/booking/inc/class.soapplication.inc.php       2010-10-29 08:30:20 UTC 
(rev 6523)
@@ -15,6 +15,7 @@
                                        'secret'        => array('type' => 
'string', 'required' => true),
                                        'created'       => array('type' => 
'timestamp'),
                                        'modified'      => array('type' => 
'timestamp'),
+                                       'building_name' => array('type' => 
'string', 'required'=> true, 'query' => true),
                                        'frontend_modified'     => array('type' 
=> 'timestamp'),
                                        'owner_id'      => array('type' => 
'int', 'required' => true),
                                        'case_officer_id'       => array('type' 
=> 'int', 'required' => false),

Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php       2010-10-28 12:57:47 UTC 
(rev 6522)
+++ trunk/booking/inc/class.uiapplication.inc.php       2010-10-29 08:30:20 UTC 
(rev 6523)
@@ -177,6 +177,10 @@
                                                        'label' => 
lang('Status')
                                                ),
                                                array(
+                                                       'key' => 
'building_name',
+                                                       'label' => 
lang('Building')
+                                               ),
+                                               array(
                                                        'key' => 'what',
                                                        'label' => lang('What')
                                                ),

Modified: trunk/booking/setup/setup.inc.php
===================================================================
--- trunk/booking/setup/setup.inc.php   2010-10-28 12:57:47 UTC (rev 6522)
+++ trunk/booking/setup/setup.inc.php   2010-10-29 08:30:20 UTC (rev 6523)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['booking']['name'] = 'booking';
-       $setup_info['booking']['version'] = '0.1.99';
+       $setup_info['booking']['version'] = '0.2.00';
        $setup_info['booking']['app_order'] = 9;
        $setup_info['booking']['enable'] = 1;
        $setup_info['booking']['app_group'] = 'office';

Modified: trunk/booking/setup/tables_current.inc.php
===================================================================
--- trunk/booking/setup/tables_current.inc.php  2010-10-28 12:57:47 UTC (rev 
6522)
+++ trunk/booking/setup/tables_current.inc.php  2010-10-29 08:30:20 UTC (rev 
6523)
@@ -169,6 +169,7 @@
                                'created' => array('type' => 'timestamp', 
'nullable'=> False, 'default' => 'now'),
                                'modified' => array('type' => 'timestamp', 
'nullable'=> False, 'default' => 'now'),
                                'frontend_modified' => array('type' => 
'timestamp', 'nullable'=> True),
+                               'building_name' => array('type' => 'varchar', 
'precision' => 50,'nullable' => False),
                                'activity_id' => array('type' => 
'int','precision' => '4','nullable' => False),
                                'description' => array('type' => 'text', 
'nullable' => False),
                                'contact_name' => array('type' => 'text', 
'nullable' => False),
@@ -195,6 +196,7 @@
                        'fd' => array(
                                'id' => array('type' => 'auto', 'nullable' => 
False),
                                'active' => array('type' => 'int', 'nullable' 
=> False,'precision' => '4', 'default' => 1),
+                               'building_name' => array('type' => 'varchar', 
'precision' => 50,'nullable' => False),
                                'application_id' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'organization_id' => array('type' => 
'int','precision' => '4','nullable' => False),
                                'from_' => array('type' => 
'timestamp','nullable' => False),
@@ -217,6 +219,7 @@
                                'group_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                'from_' => array('type' => 
'timestamp','nullable' => False),
                                'to_' => array('type' => 'timestamp','nullable' 
=> False),
+                               'building_name' => array('type' => 'varchar', 
'precision' => 50,'nullable' => False),
                                'allocation_id' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
                                'season_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                'active' => array('type' => 'int', 'precision' 
=> 4,'nullable' => False,'default' => '1'),

Modified: trunk/booking/setup/tables_update.inc.php
===================================================================
--- trunk/booking/setup/tables_update.inc.php   2010-10-28 12:57:47 UTC (rev 
6522)
+++ trunk/booking/setup/tables_update.inc.php   2010-10-29 08:30:20 UTC (rev 
6523)
@@ -2366,4 +2366,19 @@
                        return $GLOBALS['setup_info']['booking']['currentver'];
                }
        }
+  $test[] = '0.1.99';
+       function booking_upgrade0_1_99()
+       {
 
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->m_odb->query("");
+               $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE 
bb_application SET building_name = b2.name FROM bb_building b2 WHERE EXISTS 
(SELECT 1 FROM bb_building b, bb_application a, bb_application_resource 
ar,bb_resource r WHERE a.activity_id = ar.application_id AND ar.resource_id = 
r.id AND r.building_id = b.id AND b2.id=b.id AND bb_booking.id=bo.id)");
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.00';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+       }
+

Modified: trunk/bookingfrontend/setup/setup.inc.php
===================================================================
--- trunk/bookingfrontend/setup/setup.inc.php   2010-10-28 12:57:47 UTC (rev 
6522)
+++ trunk/bookingfrontend/setup/setup.inc.php   2010-10-29 08:30:20 UTC (rev 
6523)
@@ -21,7 +21,7 @@
 
        $setup_info['bookingfrontend']['depends'][] = array(
                'appname' => 'booking',
-               'versions' => Array('0.1.92', '0.1.93', '0.1.94', '0.1.95', 
'0.1.96', '0.1.97', '0.1.98', '0.1.99')
+               'versions' => Array('0.1.92', '0.1.93', '0.1.94', '0.1.95', 
'0.1.96', '0.1.97', '0.1.98', '0.1.99', '0.2.00')
        );
 
        $setup_info['bookingfrontend']['depends'][] = array(