Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-09 17:32:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11029 from ATM-Marc/FIX_7.0_sort_events

Browse Source 
FIX: actioncomm: sort events by date after external calendars and hook (into 7.0)
This commit is contained in:
Laurent Destailleur
2019-04-19 13:06:09 +02:00
committed by GitHub
parent 91af1f8702 c0defe3965
commit 11d737f23a
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/comm/action/index.php
View File

@@ -1001,6 +1001,11 @@ if (! empty($hookmanager->resArray['eventarray'])) {
}
}
// Sort events
foreach($eventarray as $keyDate => &$dateeventarray)
{
usort($dateeventarray, 'sort_events_by_date');
}
$maxnbofchar=0;
@@ -1630,3 +1635,22 @@ function dol_color_minus($color, $minus, $minusunit = 16)
}
return $newcolor;
}
/**
* Sort events by date
*
* @param object $a Event A
* @param object $b Event B
* @return int < 0 if event A should be before event B, > 0 otherwise, 0 if they have the exact same time slot
*/
function sort_events_by_date($a, $b)
{
if($a->datep != $b->datep)
{
return $a->datep - $b->datep;
}
// If both events have the same start time, longest first
return $b->datef - $a->datef;
}