diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 05b8e98e8ed..870d9ff5805 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -377,7 +377,7 @@ function societe_prepare_head(Societe $object) $head[$h][1] = $langs->trans("Events"); if (isModEnabled('agenda')&& (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) { $nbEvent = 0; - // Enable caching of thirdrparty count actioncomm + // Enable caching of thirdparty count actioncomm require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; $cachekey = 'count_events_thirdparty_'.$object->id; $dataretrieved = dol_getcache($cachekey); @@ -1687,7 +1687,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin //TODO Add limit in nb of results if ($sql) { $sql .= $db->order($sortfield_new, $sortorder); + dol_syslog("company.lib::show_actions_done", LOG_DEBUG); + $resql = $db->query($sql); if ($resql) { $i = 0; @@ -1935,7 +1937,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin $out .= ''; // Date - $out .= ''; + $out .= ''; $out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel'); if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) { $tmpa = dol_getdate($histo[$key]['datestart'], true); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0664bae3f58..0093eda7d5e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12167,7 +12167,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n $out .= '

'; // Author of event - $out .= ''; + $out .= '
'; if ($histo[$key]['userid'] > 0) { if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ? $userstatic->fetch($histo[$key]['userid']); @@ -12175,10 +12175,10 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n } $out .= $userGetNomUrlCache[$histo[$key]['userid']]; } - $out .= ''; + $out .= '
'; // Title - $out .= ' '; + $out .= '
'; if (preg_match('/^TICKET_MSG/', $actionstatic->code)) { $out .= $langs->trans('TicketNewMessage'); @@ -12200,7 +12200,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n } } - $out .= ''; + $out .= '
'; $out .= '

'; diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php index 0c056ddbc2e..5c4826a2dc5 100644 --- a/htdocs/core/lib/memory.lib.php +++ b/htdocs/core/lib/memory.lib.php @@ -68,6 +68,7 @@ $shmoffset = 1000; // Max number of entries found into a language file. If too l function dol_setcache($memoryid, $data, $expire = 0) { global $conf; + $result = 0; if (strpos($memoryid, 'count_') === 0) { // The memoryid key start with 'count_...' @@ -120,6 +121,10 @@ function dol_setcache($memoryid, $data, $expire = 0) } elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) { // This is a really not reliable cache ! Use Memcached instead. // Using shmop $result = dol_setshmop($memoryid, $data, $expire); + } else { + // No intersession cache system available, we use at least the perpage cache + $conf->cache['cachememory_'.$memoryid] = $data; + $result = is_array($data) ? count($data) : (is_scalar($data) ? strlen($data) : 0); } return $result; @@ -193,6 +198,11 @@ function dol_getcache($memoryid) // Using shmop $data = dol_getshmop($memoryid); return $data; + } else { + // No intersession cache system available, we use at least the perpage cache + if (isset($conf->cache['cachememory_'.$memoryid])) { + return $conf->cache['cachememory_'.$memoryid]; + } } return null; diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index b5d01422782..a9f2c592c70 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -199,8 +199,13 @@ if ($socid > 0) { $param .= '&limit='.urlencode($limit); } + // Try to know count of actioncomm from cache + require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; + $cachekey = 'count_events_thirdparty_'.$object->id; + $nbEvent = dol_getcache($cachekey); + // print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, ''); - print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1); + print_barre_liste($langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '('.$nbEvent.')': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1); // List of all actions $filters = array(); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index cbc0a3d5975..941b992bdc8 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -50,6 +50,11 @@ class Societe extends CommonObject { use CommonIncoterm; + /** + * @var string ID of module. + */ + public $module = 'societe'; + /** * @var string ID to identify managed object */ diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php index c73d6ffe0b1..2e7494d7fc3 100644 --- a/htdocs/societe/messaging.php +++ b/htdocs/societe/messaging.php @@ -194,8 +194,13 @@ if ($socid > 0) { $param .= '&limit='.urlencode($limit); } + // Try to know count of actioncomm from cache + require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; + $cachekey = 'count_events_thirdparty_'.$object->id; + $nbEvent = dol_getcache($cachekey); + // print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, ''); - print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1); + print_barre_liste($langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '('.$nbEvent.')' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1); // List of all actions $filters = array(); diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php index 161505f77ea..84d486817b1 100644 --- a/htdocs/theme/eldy/timeline.inc.php +++ b/htdocs/theme/eldy/timeline.inc.php @@ -31,7 +31,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { bottom: 0; width: 4px; background: #ddd; - left: 31px; + left: 25px; margin: 0; border-radius: 2px; } @@ -56,7 +56,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { margin-top: 0; background: #fff; color: #444; - margin-left: 60px; + margin-left: 50px; margin-right: 0px; padding: 0; position: relative; @@ -123,7 +123,7 @@ a.timeline-btn:hover color: #333; border-bottom: 1px solid #f4f4f4; padding: 10px; - font-size: 14px; + font-size: 1em; font-weight: normal; line-height: 1.1; } @@ -148,14 +148,14 @@ a.timeline-btn:hover .timeline > li > .ion { width: 30px; height: 30px; - font-size: 15px; + font-size: 1em; line-height: 30px; position: absolute; color: #666; background: #d2d6de; border-radius: 50%; text-align: center; - left: 18px; + left: 12px; top: 5px; } .timeline > .time-label > span { @@ -211,3 +211,10 @@ a.timeline-btn:hover margin-right: 5px; } +/* Force values for small screen 767 */ +@media only screen and (max-width: 767px) +{ + .messaging-author.inline-block { + padding-bottom: 10px; + } +}