diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index b12a2b909cf..566a9c959e9 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -995,17 +995,28 @@ class Cronjob extends CommonObject if (isset($this->status)) { $label .= ' '.$this->getLibStatut(5); } - $label .= '
'.$langs->trans('Ref').': '.$this->ref; + $label .= '
'.$langs->trans('Ref').': '.dol_escape_htmltag($this->ref); $label .= '
'.$langs->trans('Title').': '.$langs->trans($this->label); if ($this->label != $langs->trans($this->label)) { $label .= ' ('.$this->label.')'; } + if (!empty($this->params)) { + $label .= '
'.$langs->trans('Parameters').': '.dol_escape_htmltag($this->params); + } + $label .= '
'; + if (!empty($this->datestart)) { $label .= '
'.$langs->trans('CronDtStart').': '.dol_print_date($this->datestart, 'dayhour', 'tzuserrel'); } if (!empty($this->dateend)) { $label .= '
'.$langs->trans('CronDtEnd').': '.dol_print_date($this->dateend, 'dayhour', 'tzuserrel'); } + if (!empty($this->datelastrun)) { + $label .= '
'.$langs->trans('CronDtLastLaunch').': '.dol_print_date($this->datelastrun, 'dayhour', 'tzuserrel'); + } + if (!empty($this->datenextrun)) { + $label .= '
'.$langs->trans('CronDtNextLaunch').': '.dol_print_date($this->datenextrun, 'dayhour', 'tzuserrel'); + } $url = DOL_URL_ROOT.'/cron/card.php?id='.$this->id; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index aaccb39e68e..fd3f705b7aa 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -509,6 +509,9 @@ if ($num > 0) { $object->datestart = $db->jdate($obj->datestart); $object->dateend = $db->jdate($obj->dateend); $object->module_name = $obj->module_name; + $object->params = $obj->params; + $object->datelastrun = $db->jdate($obj->datelastrun); + $object->datenextrun = $db->jdate($obj->datenextrun); $datelastrun = $db->jdate($obj->datelastrun); $datelastresult = $db->jdate($obj->datelastresult);