[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12075] bkbooking: stavanger bugfix
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [12075] bkbooking: stavanger bugfix |
|
Date: |
Fri, 05 Sep 2014 10:52:31 +0000 |
Revision: 12075
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12075
Author: kjell
Date: 2014-09-05 10:52:30 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
bkbooking: stavanger bugfix
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.sobooking.inc.php
branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php
Modified: branches/stavangerkommune/booking/inc/class.sobooking.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.sobooking.inc.php
2014-09-05 10:24:25 UTC (rev 12074)
+++ branches/stavangerkommune/booking/inc/class.sobooking.inc.php
2014-09-05 10:52:30 UTC (rev 12075)
@@ -662,15 +662,15 @@
function get_screen_event($building_id, $start, $end, $resources = '')
{
- $start = $start->format('Y-m-d H:i');
+ $start = $start->format('Y-m-d H:i:s');
$test = $end->format('H:i');
if ($test != '00:00') {
- $end = $end->format('Y-m-d H:i');
+ $end = $end->format('Y-m-d H:i:s');
} else {
- $end = $end->format('Y-m-d').' 24:00';
+ $end = $end->format('Y-m-d').' 24:00:00';
}
$building_id = intval($building_id);
@@ -688,7 +688,13 @@
FROM bb_event
INNER JOIN bb_event_resource ON
(bb_event_resource.event_id = bb_event.id)
INNER JOIN bb_resource ON (bb_resource.id =
bb_event_resource.resource_id)
- WHERE bb_event.from_ > '".$start."' AND bb_event.to_ <
'".$end."'
+ WHERE
+ (
+ (bb_event.from_ >= '".$start."' AND bb_event.to_ <=
'".$end."')
+ OR (bb_event.from_ < '".$start."' AND bb_event.to_ <=
'".$end."' AND bb_event.to_ > '".$start."')
+ OR (bb_event.from_ >='".$start."' AND bb_event.from_ <
'".$end."' AND bb_event.to_ > '".$end."')
+ OR (bb_event.from_ < '".$start."' AND bb_event.to_ >
'".$end."')
+ )
AND bb_resource.building_id = (".$building_id.")
".$resources."
AND bb_event.active = 1
Modified: branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php
2014-09-05 10:24:25 UTC (rev 12074)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php
2014-09-05 10:52:30 UTC (rev 12075)
@@ -20,8 +20,6 @@
$this->resource_bo = CreateObject('booking.boresource');
}
-// TODO: remove debug kode
-
public function information_screen()
{
$today = new DateTime(phpgw::get_var('date', 'GET'), new
DateTimeZone('Europe/Oslo'));
@@ -54,10 +52,7 @@
"Sun" => "Søndag"
);
-// echo "<pre>\n";
$bookings =
$this->booking_bo->building_infoscreen_schedule(phpgw::get_var('id', 'GET'),
$date, $res);
-// print_r($bookings);
-// exit;
$from = clone $date;
$from->setTime(0, 0, 0);
// Make sure $from is a monday
@@ -68,6 +63,19 @@
}
$from = $from->format('d.m.Y');
+ $list = array(
+ 'Mon' => array(),
+ 'Tue' =>array(),
+ 'Wed' =>array(),
+ 'Thu' =>array(),
+ 'Fri' =>array(),
+ 'Sat' =>array(),
+ 'Sun' =>array()
+ );
+ foreach ($list as $key => &$item)
+ {
+ $item = $bookings['results'][$key];
+ }
$time = $timestart;
$html = '<html><head><title>Kalender for
'.$building['name'].'</title>';
@@ -91,7 +99,7 @@
$html .= '<tbody>';
$first = '';
$len = (($timeend-$timestart)*2)+2;
- foreach ($bookings['results'] as $day => $resources) {
+ foreach ($list as $day => $resources) {
if ($first != $day) {
$first = $day;
$html .= '<tr style="background-color: #999; color:
white;">';
@@ -192,8 +200,6 @@
exit;
}
-// TODO: remove debug kode
-
public function schedule()
{
$backend = phpgw::get_var('backend', 'GET');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12075] bkbooking: stavanger bugfix,
Kjell Arne Espedal <=