[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15642] refine test for overlap
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15642] refine test for overlap |
Date: |
Fri, 9 Sep 2016 15:30:19 +0000 (UTC) |
Revision: 15642
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15642
Author: sigurdne
Date: 2016-09-09 15:30:19 +0000 (Fri, 09 Sep 2016)
Log Message:
-----------
refine test for overlap
Modified Paths:
--------------
trunk/booking/inc/class.sobooking.inc.php
Modified: trunk/booking/inc/class.sobooking.inc.php
===================================================================
--- trunk/booking/inc/class.sobooking.inc.php 2016-09-09 15:29:31 UTC (rev
15641)
+++ trunk/booking/inc/class.sobooking.inc.php 2016-09-09 15:30:19 UTC (rev
15642)
@@ -170,7 +170,7 @@
$this->db->query("SELECT e.id FROM bb_event e
WHERE
e.active = 1 AND
e.id IN
(SELECT event_id FROM bb_event_resource WHERE resource_id IN ($rids)) AND
-
((e.from_ > '$start' AND e.from_ < '$end') OR
+
((e.from_ >= '$start' AND e.from_ < '$end') OR
(e.to_
> '$start' AND e.to_ < '$end') OR
(e.from_ < '$start' AND e.to_ > '$end'))", __LINE__, __FILE__);
if ($this->db->next_record())
@@ -181,7 +181,7 @@
$this->db->query("SELECT a.id FROM
bb_allocation a
WHERE
a.active = 1 AND a.id<>$allocation_id AND
a.id IN
(SELECT allocation_id FROM bb_allocation_resource WHERE resource_id IN ($rids))
AND
-
((a.from_ > '$start' AND a.from_ < '$end') OR
+
((a.from_ >= '$start' AND a.from_ < '$end') OR
(a.to_
> '$start' AND a.to_ < '$end') OR
(a.from_ < '$start' AND a.to_ > '$end'))", __LINE__, __FILE__);
if ($this->db->next_record())
@@ -193,7 +193,7 @@
$this->db->query("SELECT b.id FROM bb_booking b
WHERE
b.active = 1 AND b.id<>$booking_id AND
b.id IN
(SELECT booking_id FROM bb_booking_resource WHERE resource_id IN ($rids)) AND
-
((b.from_ > '$start' AND b.from_ < '$end') OR
+
((b.from_ >= '$start' AND b.from_ < '$end') OR
(b.to_
> '$start' AND b.to_ < '$end') OR
(b.from_ < '$start' AND b.to_ > '$end'))", __LINE__, __FILE__);
if ($this->db->next_record())
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15642] refine test for overlap,
sigurdne <=