|
@@ 1564-1574 (lines=11) @@
|
| 1561 |
|
|
| 1562 |
|
$dateCondition = null; |
| 1563 |
|
|
| 1564 |
|
if (!empty($start) && !empty($end)) { |
| 1565 |
|
$dateCondition .= "AND ( |
| 1566 |
|
agenda.start_date BETWEEN '".$start."' AND '".$end."' OR |
| 1567 |
|
agenda.end_date BETWEEN '".$start."' AND '".$end."' OR |
| 1568 |
|
( |
| 1569 |
|
agenda.start_date IS NOT NULL AND agenda.end_date IS NOT NULL AND |
| 1570 |
|
YEAR(agenda.start_date) = YEAR(agenda.end_date) AND |
| 1571 |
|
MONTH('$start') BETWEEN MONTH(agenda.start_date) AND MONTH(agenda.end_date) |
| 1572 |
|
) |
| 1573 |
|
)"; |
| 1574 |
|
} |
| 1575 |
|
|
| 1576 |
|
$sql .= $dateCondition; |
| 1577 |
|
$result = Database::query($sql); |
|
@@ 1732-1742 (lines=11) @@
|
| 1729 |
|
|
| 1730 |
|
$dateCondition = ''; |
| 1731 |
|
|
| 1732 |
|
if (!empty($start) && !empty($end)) { |
| 1733 |
|
$dateCondition .= "AND ( |
| 1734 |
|
start_date BETWEEN '".$start."' AND '".$end."' OR |
| 1735 |
|
end_date BETWEEN '".$start."' AND '".$end."' OR |
| 1736 |
|
( |
| 1737 |
|
start_date IS NOT NULL AND end_date IS NOT NULL AND |
| 1738 |
|
YEAR(start_date) = YEAR(end_date) AND |
| 1739 |
|
MONTH('$start') BETWEEN MONTH(start_date) AND MONTH(end_date) |
| 1740 |
|
) |
| 1741 |
|
)"; |
| 1742 |
|
} |
| 1743 |
|
|
| 1744 |
|
$access_url_id = api_get_current_access_url_id(); |
| 1745 |
|
|