[Fmsystem-commits] [14663] more on booking

[Sigurd Nes]

Revision: 14663
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14663
Author:   sigurdne
Date:     2016-01-19 19:53:25 +0000 (Tue, 19 Jan 2016)
Log Message:
-----------
more on booking

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.soresource.inc.php
    branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
    branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
    branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/search.xsl

Modified: branches/dev-syncromind/booking/inc/class.soresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.soresource.inc.php        
2016-01-19 14:35:29 UTC (rev 14662)
+++ branches/dev-syncromind/booking/inc/class.soresource.inc.php        
2016-01-19 19:53:25 UTC (rev 14663)
@@ -180,11 +180,11 @@
 
                                        
if(isset($custom_condition_arr[$activity_top_level]))
                                        {
-                                               $_conditions[] = '(' 
.$conditions . ' AND (activity_id IN ('. implode(',', 
$activity_ids[$activity_top_level]) . ') AND' . implode(' OR ', 
$custom_condition_arr[$activity_top_level]) . '))';
+                                               $_conditions[] = '(' 
.$conditions . ' AND (bb_resource.activity_id IN ('. implode(',', 
$activity_ids[$activity_top_level]) . ') AND' . implode(' OR ', 
$custom_condition_arr[$activity_top_level]) . '))';
                                        }
                                        else
                                        {
-                                               $_conditions[] = '(' . 
$conditions . ' AND activity_id IN ('. implode(',', 
$activity_ids[$activity_top_level]) . '))';
+                                               $_conditions[] = '(' . 
$conditions . ' AND bb_resource.activity_id IN ('. implode(',', 
$activity_ids[$activity_top_level]) . '))';
                                        }
                                        $activity_ids[$activity_top_level] = 
array();
                                }
@@ -199,7 +199,7 @@
 
                        if($__activity_ids)
                        {
-                               $_conditions[] = '(' . $conditions . ' AND 
activity_id IN ('. implode(',', $__activity_ids) . '))';
+                               $_conditions[] = '(' . $conditions . ' AND 
bb_resource.activity_id IN ('. implode(',', $__activity_ids) . '))';
                        }
 
                        if(!$_conditions)

Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2016-01-19 14:35:29 UTC (rev 14662)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2016-01-19 19:53:25 UTC (rev 14663)
@@ -815,12 +815,6 @@
 
                                array_set_default($application, 'resources', 
$resources);
                        }
-                       if(!$activity_id)
-                       {
-                               $_building = 
$this->building_bo->so->read_single(phpgw::get_var('building_id', 'int'));
-                               $activity_id     = $_building['activity_id'];
-                       }
-
                        array_set_default($application, 'building_id', 
phpgw::get_var('building_id', 'int'));
 
                        array_set_default($application, 'building_name', 
phpgw::get_var('building_name', 'string'));
@@ -845,12 +839,22 @@
                        $this->flash_form_errors($errors);
                        $application['resources_json']                   = 
json_encode(array_map('intval', $application['resources']));
                        $application['accepted_documents_json']  = 
json_encode($application['accepted_documents']);
+                       $top_level_activity = false;
                        if(!$activity_id)
                        {
+                               $_building = 
$this->building_bo->so->read_single(phpgw::get_var('building_id', 'int'));
+                               $activity_id     = $_building['activity_id'];
+                               $top_level_activity      = $activity_id;
+                       }
+                       if(!$activity_id)
+                       {
                                $activity_id = phpgw::get_var('activity_id', 
'int', 'REQUEST', -1);
                        }
-                       $activity_path           = 
$this->activity_bo->get_path($activity_id);
-                       $top_level_activity      = $activity_path ? 
$activity_path[0]['id'] : -1;
+                       if(!$top_level_activity)
+                       {
+                               $activity_path           = 
$this->activity_bo->get_path($activity_id);
+                               $top_level_activity      = $activity_path ? 
$activity_path[0]['id'] : -1;
+                       }
                        $filter_activity_top = 0;
                        if($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'booking')
                        {

Modified: 
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js   
2016-01-19 14:35:29 UTC (rev 14662)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js   
2016-01-19 19:53:25 UTC (rev 14663)
@@ -3,8 +3,6 @@
 
 $(document).ready(function () {
        JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/', 
{menuaction: 'bookingfrontend.uibuilding.index'}, true), 'field_building_name', 
'field_building_id', 'building_container');
-//    
JqueryPortico.autocompleteHelper('bookingfrontend/?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
-//                                                  'field_building_name', 
'field_building_id', 'building_container');
 
        $("#field_activity").change(function () {
                var building_id = $('#field_building_id').val();

Modified: 
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl  
2016-01-19 14:35:29 UTC (rev 14662)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl  
2016-01-19 19:53:25 UTC (rev 14663)
@@ -93,7 +93,7 @@
                                                </p>
                                                </xsl:if-->
                                                <dt>
-                                                       <label 
for="field_activity">
+                                                       <label 
for="field_agegroups">
                                                                <xsl:value-of 
select="php:function('lang', 'Estimated number of participants')" />
                                                        </label>
                                                </dt>

Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl   
2016-01-19 14:35:29 UTC (rev 14662)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl   
2016-01-19 19:53:25 UTC (rev 14663)
@@ -180,22 +180,24 @@
                        </div>
 
                </div>
-
-               <div id="no_result">
-                       <xsl:if test="not(search)">
-                               <div id="cloud">
-                                       <div class="frontpagetext">
-                                               <xsl:value-of 
disable-output-escaping="yes" select="frontpagetext"/>
+               <div class="pure-g">
+                       <div class="pure-u-1  pure-u-lg-1-1" id="no_result">
+                               <xsl:if test="not(search)">
+                                       <div id="cloud">
+                                               <div class="frontpagetext">
+                                                       <xsl:value-of 
disable-output-escaping="yes" select="frontpagetext"/>
+                                               </div>
                                        </div>
-                               </div>
-                               <div style="text-align:center;">
-                                       <img alt="" >
-                                               <xsl:attribute name="src">
-                                                       <xsl:value-of 
select="frontimage"/>
-                                               </xsl:attribute>
-                                       </img>
-                               </div>
-                       </xsl:if>
+                                       <div style="text-align:center;">
+                                               <img alt="" >
+                                                       <xsl:attribute 
name="src">
+                                                               <xsl:value-of 
select="frontimage"/>
+                                                       </xsl:attribute>
+                                               </img>
+                                       </div>
+                               </xsl:if>
+                       </div>
                </div>
+
        </div>
 </xsl:template>