fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-2369-A Kpi Report by process and Report by user does not work and the error is displayed on the taskscheduler log

Browse Source
This commit is contained in:
Roly Gutierrez
2021-09-24 14:29:51 -04:00
parent a1ddfe3b4d
commit acc75b3fd5
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Console/Commands/ScheduleRunCommand.php
View File

@@ -54,6 +54,23 @@ class ScheduleRunCommand extends BaseCommand
if (!$win) {
$body = str_replace(" -c"," " . $user . " -c", $p->body);
}
//for init date and finish date parameters
if (strpos($body, "report_by_user") !== false || strpos($body, "report_by_process") !== false) {
//remove if the command is old and contains an incorrect definition of the date
$body = preg_replace("/\s\+init-date\"[0-9\-\s:]+\"/", "", $body);
$body = preg_replace("/\s\+finish-date\"[0-9\-\s:]+\"/", "", $body);
//the start date must be one month back from the current date.
$currentDate = date("Y-m-d H:i:s");
$oneMonthAgo = $currentDate . " -1 month";
$timestamp = strtotime($oneMonthAgo);
$oneMonthAgo = date("Y-m-d H:i:s", $timestamp);
$body = str_replace("report_by_user", "report_by_user +init-date'{$oneMonthAgo}' +finish-date'{$currentDate}'", $body);
$body = str_replace("report_by_process", "report_by_process +init-date'{$oneMonthAgo}' +finish-date'{$currentDate}'", $body);
}
$schedule = $that->schedule->exec($body)->cron($p->expression)->between($starting, $ending)->timezone($timezone)->when(function () use ($p) {
$now = Carbon::now();
$result = false;