'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
@@ -1451,14 +1548,19 @@ if (empty($action) || $action == 'show_month') // View by month
$tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);
$minhour = round($tmp[0], 0);
$maxhour = round($tmp[1], 0);
- if ($minhour > 23) $minhour = 23;
- if ($maxhour < 1) $maxhour = 1;
- if ($maxhour <= $minhour) { $maxhour = $minhour + 1; }
+ if ($minhour > 23) {
+ $minhour = 23;
+ }
+ if ($maxhour < 1) {
+ $maxhour = 1;
+ }
+ if ($maxhour <= $minhour) {
+ $maxhour = $minhour + 1;
+ }
$i = 0;
$j = 0;
- while ($i < 24)
- {
+ while ($i < 24) {
echo '
'."\n";
echo '
'.dol_print_date($i * 3600, 'hour', 'gmt').'
';
echo '
'."\n";
@@ -1524,8 +1626,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
$urltoshow = DOL_URL_ROOT.'/comm/action/index.php?action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year.$newparam;
$urltocreate = '';
- if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
- {
+ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
$hourminsec = '100000';
$urltocreate = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
@@ -1534,16 +1635,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
// Line with title of day
print '
'."\n";
- if ($nonew <= 0)
- {
+ if ($nonew <= 0) {
print '
';
- if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
- {
+ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
print '
'; // Explicit link, usefull for nojs interfaces
print img_picto($langs->trans("NewAction"), 'edit_add.png');
print '';
@@ -1551,8 +1653,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '
'."\n";
}
- if ($nonew < 0)
- {
+ if ($nonew < 0) {
print '
';
return;
}
@@ -1572,29 +1673,23 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
$tmpholiday = new Holiday($db);
- foreach ($eventarray as $daykey => $notused)
- {
+ foreach ($eventarray as $daykey => $notused) {
$annee = dol_print_date($daykey, '%Y');
$mois = dol_print_date($daykey, '%m');
$jour = dol_print_date($daykey, '%d');
- if ($day == $jour && $month == $mois && $year == $annee)
- {
- foreach ($eventarray[$daykey] as $index => $event)
- {
- if ($i < $maxprint || $maxprint == 0 || !empty($conf->global->MAIN_JS_SWITCH_AGENDA))
- {
+ if ($day == $jour && $month == $mois && $year == $annee) {
+ foreach ($eventarray[$daykey] as $index => $event) {
+ if ($i < $maxprint || $maxprint == 0 || !empty($conf->global->MAIN_JS_SWITCH_AGENDA)) {
$keysofuserassigned = array_keys($event->userassigned);
$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
// Define $color (Hex string like '0088FF') and $cssclass of event
$color = -1; $cssclass = ''; $colorindex = -1;
- if (in_array($user->id, $keysofuserassigned))
- {
+ if (in_array($user->id, $keysofuserassigned)) {
$cssclass = 'family_mytasks';
- if (empty($cacheusers[$event->userownerid]))
- {
+ if (empty($cacheusers[$event->userownerid])) {
$newuser = new User($db);
$newuser->fetch($event->userownerid);
$cacheusers[$event->userownerid] = $newuser;
@@ -1602,9 +1697,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
//var_dump($cacheusers[$event->userownerid]->color);
// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
- if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
- } elseif ($event->type_code == 'ICALEVENT') // Event come from external ical file
- {
+ if (!empty($cacheusers[$event->userownerid]->color)) {
+ $color = $cacheusers[$event->userownerid]->color;
+ }
+ } elseif ($event->type_code == 'ICALEVENT') { // Event come from external ical file
$numical++;
if (!empty($event->icalname)) {
if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
@@ -1615,37 +1711,37 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$color = ($event->icalcolor ? $event->icalcolor : -1);
$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
- } elseif ($event->type_code == 'BIRTHDAY')
- {
+ } elseif ($event->type_code == 'BIRTHDAY') {
$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday '; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
} else {
$numother++;
$color = ($event->icalcolor ? $event->icalcolor : -1);
$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
- if (empty($cacheusers[$event->userownerid]))
- {
+ if (empty($cacheusers[$event->userownerid])) {
$newuser = new User($db);
$newuser->fetch($event->userownerid);
$cacheusers[$event->userownerid] = $newuser;
}
//var_dump($cacheusers[$event->userownerid]->color);
- // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
- if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+ // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+ if (!empty($cacheusers[$event->userownerid]->color)) {
+ $color = $cacheusers[$event->userownerid]->color;
+ }
}
- if ($color < 0) // Color was not set on user card. Set color according to color index.
- {
+ if ($color < 0) { // Color was not set on user card. Set color according to color index.
// Define color index if not yet defined
$idusertouse = ($event->userownerid ? $event->userownerid : 0);
- if (isset($colorindexused[$idusertouse]))
- {
+ if (isset($colorindexused[$idusertouse])) {
$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
} else {
- $colorindex = $nextindextouse;
- $colorindexused[$idusertouse] = $colorindex;
- if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+ $colorindex = $nextindextouse;
+ $colorindexused[$idusertouse] = $colorindex;
+ if (!empty($theme_datacolor[$nextindextouse + 1])) {
+ $nextindextouse++; // Prepare to use next color
+ }
}
//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'
';
// Define color
@@ -1666,14 +1762,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$tmpyearend = date('Y', $event->date_end_in_calendar);
$tmpmonthend = date('m', $event->date_end_in_calendar);
$tmpdayend = date('d', $event->date_end_in_calendar);
- if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour)
- {
+ if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour) {
$cssclass .= " unmovable";
}
} else {
if ($user->rights->agenda->allactions->create ||
- (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
- {
+ (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
$cssclass .= " movable cursormove";
} else {
$cssclass .= " unmovable";
@@ -1681,8 +1775,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
}
$h = ''; $nowrapontd = 1;
- if ($action == 'show_day') { $h = 'height: 100%; '; $nowrapontd = 0; }
- if ($action == 'show_week') { $h = 'height: 100%; '; $nowrapontd = 0; }
+ if ($action == 'show_day') {
+ $h = 'height: 100%; '; $nowrapontd = 0;
+ }
+ if ($action == 'show_week') {
+ $h = 'height: 100%; '; $nowrapontd = 0;
+ }
// Show event box
print "\n";
@@ -1720,8 +1818,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '" style="'.$h;
$colortouse = $color;
// If colortouse is similar than background, we force to change it.
- if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
- {
+ if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
print 'background: #f0f0f0;';
print 'border-left: 5px solid #'.$colortouse.';';
} else {
@@ -1729,8 +1826,8 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print 'border-left: 5px solid #'.dol_color_minus($colortouse, -3).';';
//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
}
- //print 'background: #'.$colortouse.';';
- //print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
+ //print 'background: #'.$colortouse.';';
+ //print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
//if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
//else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
//print ' -moz-border-radius:4px;"';
@@ -1759,14 +1856,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print $listofusertoshow;
} else { // Other calendar
// Picto
- if (empty($event->fulldayevent))
- {
+ if (empty($event->fulldayevent)) {
//print $event->getNomUrl(2).' ';
}
// Date
- if (empty($event->fulldayevent))
- {
+ if (empty($event->fulldayevent)) {
// Show hours (start ... end)
$tmpyearstart = dol_print_date($event->date_start_in_calendar, '%Y', 'tzuserrel');
$tmpmonthstart = dol_print_date($event->date_start_in_calendar, '%m', 'tzuserrel');
@@ -1776,29 +1871,26 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$tmpdayend = dol_print_date($event->date_end_in_calendar, '%d', 'tzuserrel');
// Hour start
- if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour)
- {
+ if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour) {
$daterange .= dol_print_date($event->date_start_in_calendar, 'hour', 'tzuserrel');
- if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
- {
- if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend)
- $daterange .= '-';
+ if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+ if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend) {
+ $daterange .= '-';
+ }
//else
//print '...';
}
}
- if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
- {
- if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend)
- {
+ if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+ if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend) {
$daterange .= '...';
}
}
// Hour end
- if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
- {
- if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
- $daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+ if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+ if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour) {
+ $daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+ }
}
} else {
if ($showinfo) {
@@ -1824,9 +1916,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
// Loop on each assigned user
$listofusertoshow = '';
$posuserassigned = 0;
- foreach ($event->userassigned as $tmpid => $tmpdata)
- {
- if (!$posuserassigned && $titletoshow) $listofusertoshow .= '
';
+ foreach ($event->userassigned as $tmpid => $tmpdata) {
+ if (!$posuserassigned && $titletoshow) {
+ $listofusertoshow .= '
';
+ }
$posuserassigned++;
if (empty($cacheusers[$tmpid])) {
$newuser = new User($db);
@@ -1840,48 +1933,57 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print $titletoshow;
print $listofusertoshow;
- if ($event->type_code == 'ICALEVENT') print '
('.dol_trunc($event->icalname, $maxnbofchar).')';
+ if ($event->type_code == 'ICALEVENT') {
+ print '
('.dol_trunc($event->icalname, $maxnbofchar).')';
+ }
$thirdparty_id = ($event->thirdparty_id > 0 ? $event->thirdparty_id : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
$contact_id = ($event->contact_id > 0 ? $event->contact_id : ((is_object($event->contact) && $event->contact->id > 0) ? $event->contact->id : 0));
// If action related to company / contact
$linerelatedto = '';
- if ($thirdparty_id > 0)
- {
- if (!isset($cachethirdparties[$thirdparty_id]) || !is_object($cachethirdparties[$thirdparty_id]))
- {
+ if ($thirdparty_id > 0) {
+ if (!isset($cachethirdparties[$thirdparty_id]) || !is_object($cachethirdparties[$thirdparty_id])) {
$thirdparty = new Societe($db);
$thirdparty->fetch($thirdparty_id);
$cachethirdparties[$thirdparty_id] = $thirdparty;
- } else $thirdparty = $cachethirdparties[$thirdparty_id];
- if (!empty($thirdparty->id)) $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
+ } else {
+ $thirdparty = $cachethirdparties[$thirdparty_id];
+ }
+ if (!empty($thirdparty->id)) {
+ $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
+ }
}
- if (!empty($contact_id) && $contact_id > 0)
- {
- if (!is_object($cachecontacts[$contact_id]))
- {
+ if (!empty($contact_id) && $contact_id > 0) {
+ if (!is_object($cachecontacts[$contact_id])) {
$contact = new Contact($db);
$contact->fetch($contact_id);
$cachecontacts[$contact_id] = $contact;
- } else $contact = $cachecontacts[$contact_id];
- if ($linerelatedto) $linerelatedto .= ' ';
- if (!empty($contact->id)) $linerelatedto .= $contact->getNomUrl(1, '', 0);
+ } else {
+ $contact = $cachecontacts[$contact_id];
+ }
+ if ($linerelatedto) {
+ $linerelatedto .= ' ';
+ }
+ if (!empty($contact->id)) {
+ $linerelatedto .= $contact->getNomUrl(1, '', 0);
+ }
}
- if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
- {
+ if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- if ($linerelatedto) $linerelatedto .= '
';
+ if ($linerelatedto) {
+ $linerelatedto .= '
';
+ }
$linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);
}
- if ($linerelatedto) print '
'.$linerelatedto;
+ if ($linerelatedto) {
+ print '
'.$linerelatedto;
+ }
}
// Show location
- if ($showinfo)
- {
- if ($event->location)
- {
+ if ($showinfo) {
+ if ($event->location) {
print '
';
print $langs->trans("Location").': '.$event->location;
}
@@ -1890,14 +1992,18 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '';
// Status - Percent
$withstatus = 0;
- if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT')
- {
+ if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') {
$withstatus = 1;
- if ($event->percentage >= 0) $withstatus = 2;
+ if ($event->percentage >= 0) {
+ $withstatus = 2;
+ }
}
print '
';
- if ($withstatus) print $event->getLibStatut(3, 1);
- else print ' ';
+ if ($withstatus) {
+ print $event->getLibStatut(3, 1);
+ } else {
+ print ' ';
+ }
print ' |