|
@@ 1579-1589 (lines=11) @@
|
| 1576 |
|
|
| 1577 |
|
$dateCondition = null; |
| 1578 |
|
|
| 1579 |
|
if (!empty($start) && !empty($end)) { |
| 1580 |
|
$dateCondition .= "AND ( |
| 1581 |
|
agenda.start_date BETWEEN '".$start."' AND '".$end."' OR |
| 1582 |
|
agenda.end_date BETWEEN '".$start."' AND '".$end."' OR |
| 1583 |
|
( |
| 1584 |
|
agenda.start_date IS NOT NULL AND agenda.end_date IS NOT NULL AND |
| 1585 |
|
YEAR(agenda.start_date) = YEAR(agenda.end_date) AND |
| 1586 |
|
MONTH('$start') BETWEEN MONTH(agenda.start_date) AND MONTH(agenda.end_date) |
| 1587 |
|
) |
| 1588 |
|
)"; |
| 1589 |
|
} |
| 1590 |
|
|
| 1591 |
|
$sql .= $dateCondition; |
| 1592 |
|
$result = Database::query($sql); |
|
@@ 1747-1757 (lines=11) @@
|
| 1744 |
|
|
| 1745 |
|
$dateCondition = ''; |
| 1746 |
|
|
| 1747 |
|
if (!empty($start) && !empty($end)) { |
| 1748 |
|
$dateCondition .= "AND ( |
| 1749 |
|
start_date BETWEEN '".$start."' AND '".$end."' OR |
| 1750 |
|
end_date BETWEEN '".$start."' AND '".$end."' OR |
| 1751 |
|
( |
| 1752 |
|
start_date IS NOT NULL AND end_date IS NOT NULL AND |
| 1753 |
|
YEAR(start_date) = YEAR(end_date) AND |
| 1754 |
|
MONTH('$start') BETWEEN MONTH(start_date) AND MONTH(end_date) |
| 1755 |
|
) |
| 1756 |
|
)"; |
| 1757 |
|
} |
| 1758 |
|
|
| 1759 |
|
$access_url_id = api_get_current_access_url_id(); |
| 1760 |
|
|