';
+
$viewmode .= ''; // To add a space before the navigation tools
@@ -614,7 +616,7 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on
$default = '';
}
- $s .= '
';
+ $s .= '
';
}
}
@@ -1009,9 +1011,13 @@ if ($mode == 'show_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"; // date_debut and date_fin are date without time
} elseif ($mode == 'show_week') {
- // TODO: Add filter to reduce database request
+ // Restrict on current month (we get more, but we will filter later)
+ $sql .= " AND date_debut < '".dol_get_last_day($year, $month)."'";
+ $sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
} elseif ($mode == 'show_month') {
- // TODO: Add filter to reduce database request
+ // Restrict on current month
+ $sql .= " AND date_debut <= '".dol_get_last_day($year, $month)."'";
+ $sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
}
$resql = $db->query($sql);
@@ -1082,8 +1088,11 @@ if (count($listofextcals)) {
$colorcal = $extcal['color'];
$buggedfile = $extcal['buggedfile'];
+ $pathforcachefile = dol_sanitizePathName($conf->user->dir_temp).'/'.dol_sanitizeFileName('extcal_'.$namecal.'_user'.$user->id).'.cache';
+ //var_dump($pathforcachefile);exit;
+
$ical = new ICal();
- $ical->parse($url);
+ $ical->parse($url, $pathforcachefile, $DELAYFORCACHE);
// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
//var_dump($ical->cal); exit;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 4be3195561e..ab2037d5f76 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -600,7 +600,7 @@ $num = $db->num_rows($resql);
$arrayofselected = is_array($toselect) ? $toselect : array();
// Local calendar
-$newtitle = '
';
+ // cache of user list (owners)
+ if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+ $userstatic = new User($db);
+ $res = $userstatic->fetch($obj->fk_user_action);
+ if ($res > 0) {
+ $cache_user_list[$obj->fk_user_action] = $userstatic;
+ }
+ }
+
+ // get event style for user owner
+ $event_owner_style = '';
+ // 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 ($cache_user_list[$obj->fk_user_action]->color != '') {
+ $event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
+ }
+
+ // get event style for start and end date
+ $event_more_class = '';
+ $event_start_date_css = '';
+ $event_end_date_css = '';
+ $event_start_date_time = $actionstatic->datep;
+ if ($event_start_date_time > $now) {
+ // future event
+ $event_more_class = 'event-future';
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+ } else {
+ if ($obj->fulldayevent == 1) {
+ $today_start_date_time = $today_start_time;
+ } else {
+ $today_start_date_time = $now;
+ }
+
+ // check event end date
+ $event_end_date_time = $db->jdate($obj->dp2);
+ if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {
+ // past event
+ $event_more_class = 'event-past';
+ } elseif ($event_end_date_time == null && $event_start_date_time < $today_start_date_time) {
+ // past event
+ $event_more_class = 'event-past';
+ } else {
+ // current event
+ $event_more_class = 'event-current';
+ }
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+ }
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+
+ print '
';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '
';
@@ -955,10 +1005,16 @@ while ($i < $imaxinloop) {
// User owner
if (!empty($arrayfields['owner']['checked'])) {
- print '
'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
- if ($obj->fk_user_action > 0) {
- $userstatic->fetch($obj->fk_user_action);
- print $userstatic->getNomUrl(-1);
+ print '
'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
+ if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+ $userstatic = new User($db);
+ $res = $userstatic->fetch($obj->fk_user_action);
+ if ($res > 0) {
+ $cache_user_list[$obj->fk_user_action] = $userstatic;
+ }
+ }
+ if (isset($cache_user_list[$obj->fk_user_action])) {
+ print $cache_user_list[$obj->fk_user_action]->getNomUrl(-1);
} else {
print ' ';
}
@@ -1006,13 +1062,14 @@ while ($i < $imaxinloop) {
// Start date
if (!empty($arrayfields['a.datep']['checked'])) {
- print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // Action column
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
}
- print '';
- }
- print '
';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['p.ref']['checked'])) {
- print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // Date modification
+ if (!empty($arrayfields['p.tms']['checked'])) {
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($objecttmp->id, $arrayofselected)) {
- $selected = 1;
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($objecttmp->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
}
- print '';
+ print '
';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($objecttmp->id, $arrayofselected)) {
- $selected = 1;
+ print '
';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($objecttmp->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print '