[Fmsystem-commits] [12057] bkbooking: update resource calendar now checks published status on season for view on frontend .

[Kjell Arne Espedal]

Revision: 12057
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12057
Author:   kjell
Date:     2014-08-18 10:20:01 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
bkbooking: update resource calendar now checks published status on season for 
view on frontend.

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.sobooking.inc.php

Modified: branches/stavangerkommune/booking/inc/class.sobooking.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.sobooking.inc.php       
2014-08-14 11:54:15 UTC (rev 12056)
+++ branches/stavangerkommune/booking/inc/class.sobooking.inc.php       
2014-08-18 10:20:01 UTC (rev 12057)
@@ -297,7 +297,7 @@
                        $end = $end->format('Y-m-d H:i');
                        $resource_id = intval($resource_id);
                        $results = array();
-                       $this->db->query("SELECT id FROM bb_allocation JOIN 
bb_allocation_resource ON (allocation_id=id AND resource_id=$resource_id) WHERE 
active=1 AND ((from_ >= '$start' AND from_ < '$end') OR (to_ > '$start' AND to_ 
<= '$end') OR (from_ < '$start' AND to_ > '$end'))", __LINE__, __FILE__);
+                       $this->db->query("SELECT bb_allocation.id AS id FROM 
bb_allocation JOIN bb_allocation_resource ON (allocation_id=id AND 
resource_id=$resource_id) JOIN bb_resource as res ON ( res.id=$resource_id) 
JOIN bb_season ON (bb_allocation.season_id=bb_season.id AND 
bb_allocation.active=1) WHERE bb_season.building_id=res.building_id AND 
bb_season.active=1 AND bb_season.status='PUBLISHED' AND ((bb_allocation.from_ 
>= '$start'AND bb_allocation.from_ < '$end') OR (bb_allocation.to_ > '$start' 
AND bb_allocation.to_ <= '$end') OR (bb_allocation.from_ < '$start' AND 
bb_allocation.to_ > '$end'))", __LINE__, __FILE__);
                        while ($this->db->next_record())
                        {
                                $results[] = 
$this->_unmarshal($this->db->f('id', false), 'int');
@@ -311,7 +311,7 @@
                        $end = $end->format('Y-m-d H:i');
                        $resource_id = intval($resource_id);
                        $results = array();
-                       $this->db->query("SELECT id FROM bb_booking JOIN 
bb_booking_resource ON (booking_id=id AND resource_id=$resource_id) WHERE 
active=1 AND ((from_ >= '$start' AND from_ < '$end') OR (to_ > '$start' AND to_ 
<= '$end') OR (from_ < '$start' AND to_ > '$end'))", __LINE__, __FILE__);
+                       $this->db->query("SELECT bb_booking.id AS id FROM 
bb_booking JOIN bb_booking_resource ON (booking_id=id AND 
resource_id=$resource_id) JOIN bb_resource as res ON ( res.id=$resource_id) 
JOIN bb_season ON (bb_booking.season_id=bb_season.id AND bb_booking.active=1) 
WHERE bb_season.building_id=res.building_id AND bb_season.active=1 AND 
bb_season.status='PUBLISHED' AND ((bb_booking.from_ >= '$start' AND 
bb_booking.from_ < '$end') OR (bb_booking.to_ > '$start' AND bb_booking.to_ <= 
'$end') OR (bb_booking.from_ < '$start' AND bb_booking.to_ > '$end'))", 
__LINE__, __FILE__);
                        while ($this->db->next_record())
                        {
                                $results[] = 
$this->_unmarshal($this->db->f('id', false), 'int');
@@ -592,8 +592,6 @@
                      ".$resources."
                     AND bb_allocation.active = 1
                     ORDER BY building_name, sort, from_;";
-//             print_r($sql);
-//            exit;
             $this->db->query($sql, __LINE__, __FILE__);
             while ($this->db->next_record())
             {
@@ -665,7 +663,16 @@
         function get_screen_event($building_id, $start, $end, $resources = '')
         {
             $start = $start->format('Y-m-d H:i');
-            $end = $end->format('Y-m-d H:i');
+
+            $test = $end->format('H:i');
+
+            if ($test != '00:00') {
+                $end = $end->format('Y-m-d H:i');
+
+            } else {
+                $end = $end->format('Y-m-d').' 24:00';
+            }
+
             $building_id = intval($building_id);
             $results = array();
             $sql = "SELECT