Debug v17
This commit is contained in:
Laurent Destailleur
parent
767b1d60d9
commit
196184ca3f
@ -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 .= '</td>';
|
||||
|
||||
// Date
|
||||
$out .= '<td class="center nowrap">';
|
||||
$out .= '<td class="center nowraponall">';
|
||||
$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);
|
||||
|
||||
@ -12167,7 +12167,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
|
||||
$out .= '<h3 class="timeline-header">';
|
||||
|
||||
// Author of event
|
||||
$out .= '<span class="messaging-author">';
|
||||
$out .= '<div class="messaging-author inline-block">';
|
||||
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 .= '</span>';
|
||||
$out .= '</div>';
|
||||
|
||||
// Title
|
||||
$out .= ' <span class="messaging-title">';
|
||||
$out .= ' <div class="messaging-title inline-block">';
|
||||
|
||||
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 .= '</span>';
|
||||
$out .= '</div>';
|
||||
|
||||
$out .= '</h3>';
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
|
||||
|
||||
// List of all actions
|
||||
$filters = array();
|
||||
|
||||
@ -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
|
||||
*/
|
||||
|
||||
@ -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) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
|
||||
|
||||
// List of all actions
|
||||
$filters = array();
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user