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

fix actioncomm index

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-02-18 18:45:04 +01:00
parent 354872b47c
commit c7efd68916
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
1 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -836,34 +836,27 @@ if ($showbirthday)
} }
// HOLIDAYS CALENDAR // HOLIDAYS CALENDAR
//if ($conf->global->AGENDA_SHOW_HOLIDAYS)
//{
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status"; $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE u.rowid = x.fk_user"; $sql .= " WHERE u.rowid = x.fk_user";
$sql .= " AND u.statut = '1'"; // Show only active users (0 = inactive user, 1 = active user) $sql .= " AND u.statut = '1'"; // Show only active users (0 = inactive user, 1 = active user)
$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved) $sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
if ($action == 'show_day') if ($action == 'show_day') {
{
// Request only leaves for the current selected day // Request only leaves for the current selected day
$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin"; $sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";
} elseif ($action == 'show_week') } elseif ($action == 'show_week') {
{
// TODO: Add filter to reduce database request // TODO: Add filter to reduce database request
} elseif ($action == 'show_month') } elseif ($action == 'show_month') {
{
// TODO: Add filter to reduce database request // TODO: Add filter to reduce database request
} }
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql) {
{
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num) {
{
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$dateStartArray = dol_getdate(dol_stringtotime($obj->date_start, 1), true); $dateStartArray = dol_getdate(dol_stringtotime($obj->date_start, 1), true);
@ -886,21 +879,17 @@ if ($showbirthday)
$event->date_start_in_calendar = $event->datep; $event->date_start_in_calendar = $event->datep;
$event->date_end_in_calendar = $event->datef; $event->date_end_in_calendar = $event->datef;
if ($obj->status == 3) if ($obj->status == 3) {
{
// Show no symbol for leave with state "leave approved" // Show no symbol for leave with state "leave approved"
$event->percentage = -1; $event->percentage = -1;
} elseif ($obj->status == 2) } elseif ($obj->status == 2) {
{
// Show TO-DO symbol for leave with state "leave wait for approval" // Show TO-DO symbol for leave with state "leave wait for approval"
$event->percentage = 0; $event->percentage = 0;
} }
if ($obj->halfday == 1) if ($obj->halfday == 1) {
{
$event->label = $obj->lastname.' ('.$langs->trans("Morning").')'; $event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
} elseif ($obj->halfday == -1) } elseif ($obj->halfday == -1) {
{
$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')'; $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
} else { } else {
$event->label = $obj->lastname; $event->label = $obj->lastname;
@ -915,14 +904,12 @@ if ($showbirthday)
do { do {
$eventarray[$daykey][] = $event; $eventarray[$daykey][] = $event;
$daykey += 60 * 60 * 24; $daykey += 60 * 60 * 24;
} while ($daykey <= $event->date_end_in_calendar); } while ($daykey <= $event->date_end_in_calendar);
$i++; $i++;
} }
} }
//}
// EXTERNAL CALENDAR // EXTERNAL CALENDAR
// Complete $eventarray with external import Ical // Complete $eventarray with external import Ical