lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX full day event compare start date in future

Browse Source
This commit is contained in:
lvessiller 2022-09-30 14:00:06 +02:00
parent 74a2b58e85
commit c268cf379c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/action/list.php
View File

@ -944,16 +944,17 @@ while ($i < $imaxinloop) {
$event_more_class = ''; $event_more_class = '';
$event_start_date_style = ''; $event_start_date_style = '';
$event_start_date_time = $actionstatic->datep; $event_start_date_time = $actionstatic->datep;
if ($event_start_date_time > $now) {
// future event
$event_more_class = 'event-future';
$event_start_date_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
} else {
if ($obj->fulldayevent == 1) { if ($obj->fulldayevent == 1) {
$today_start_date_time = $today_start_time; $today_start_date_time = $today_start_time;
} else { } else {
$today_start_date_time = $now; $today_start_date_time = $now;
} }
if ($event_start_date_time > $today_start_date_time) {
// future event
$event_more_class = 'event-future';
$event_start_date_color = $conf->global->AGENDA_EVENT_FUTURE_COLOR;
} else {
// check event end date // check event end date
$event_end_date_time = $db->jdate($obj->dp2); $event_end_date_time = $db->jdate($obj->dp2);
if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) { if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {