lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX warning picto when next run date passed

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-18 23:25:38 +02:00
parent 014da6c22c
commit 79b248fc67
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/cron/card.php
View File

@ -684,8 +684,8 @@ else
elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');} elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');}
else {print $langs->trans('CronNone');} else {print $langs->trans('CronNone');}
//print '</strong>'; //print '</strong>';
if ($object->maxnbrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("Finished")); if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached"));
if ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late")); elseif ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late"));
print "</td></tr>"; print "</td></tr>";
print '</table>'; print '</table>';

7
htdocs/cron/list.php
View File

@ -242,6 +242,7 @@ $sql.= " t.status,";
$sql.= " t.fk_user_author,"; $sql.= " t.fk_user_author,";
$sql.= " t.fk_user_mod,"; $sql.= " t.fk_user_mod,";
$sql.= " t.note,"; $sql.= " t.note,";
$sql.= " t.maxrun,";
$sql.= " t.nbrun,"; $sql.= " t.nbrun,";
$sql.= " t.libname,"; $sql.= " t.libname,";
$sql.= " t.test"; $sql.= " t.test";
@ -252,12 +253,12 @@ if ($search_status == 2) $sql.= " AND t.status = 2";
//Manage filter //Manage filter
if (is_array($filter) && count($filter)>0) { if (is_array($filter) && count($filter)>0) {
foreach($filter as $key => $value) { foreach($filter as $key => $value) {
$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\''; $sql.= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
} }
} }
$sqlwhere = array(); $sqlwhere = array();
if (!empty($module_name)) { if (!empty($module_name)) {
$sqlwhere[]='(t.module_name='.$module_name.')'; $sqlwhere[]='(t.module_name='.$db->escape($module_name).')';
} }
if (count($sqlwhere)>0) { if (count($sqlwhere)>0) {
$sql.= " WHERE ".implode(' AND ',$sqlwhere); $sql.= " WHERE ".implode(' AND ',$sqlwhere);
@ -523,6 +524,8 @@ if ($num > 0)
if (empty($obj->status)) print '<span class="opacitymedium">'; if (empty($obj->status)) print '<span class="opacitymedium">';
print dol_print_date($db->jdate($obj->datenextrun),'dayhour'); print dol_print_date($db->jdate($obj->datenextrun),'dayhour');
if (empty($obj->status)) print '</span>'; if (empty($obj->status)) print '</span>';
if ($obj->maxrun && $obj->nbrun >= $obj->maxrun) print img_warning($langs->trans("MaxRunReached"));
elseif ($obj->datenextrun && $obj->datenextrun < $now) print img_warning($langs->trans("Late"));
} }
print '</td>'; print '</td>';