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

Merged release/3.7.0 into bugfix/PMCORE-3451

Browse Source
This commit is contained in:
Paula Quispe
2021-10-29 13:49:02 +00:00
parent e4cd922dfe bd7d2963f3
commit 5d5d2289b1
12 changed files with 585 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.bootstrap.php
View File

@@ -2673,7 +2673,7 @@ class Bootstrap
$context = [
'ip' => G::getIpAddress(),
'workspace' => config('system.workspace', 'Undefined Workspace'),
'timeZone' => DateTime::convertUtcToTimeZone(date('Y-m-d H:m:s')),
'timeZone' => DateTime::convertUtcToTimeZone(date('Y-m-d H:i:s')),
'usrUid' => G::LoadTranslation('UID_UNDEFINED_USER')
];
$context = array_merge($context, $extraParams);

10
resources/assets/js/home/Home.vue
View File

@@ -163,7 +163,9 @@ export default {
that.onUpdatePage(data);
});
eventBus.$on('home::sidebar::click-item', (data) => {
that.OnClickSidebarItem(that.getItemMenuByValue("page",data));
let item = that.getItemMenuByValue("page",data);
that.OnClickSidebarItem(item);
this.$router.push(item.item.href);
});
eventBus.$on('home::update-settings', (data) => {
that.updateSettings(data);
@@ -515,7 +517,7 @@ export default {
addMenuSearchChild(data) {
let newMenu = this.menu;
let advSearch = _.find(newMenu, function(o) {
return o.id === "advanced-search";
return o.id === "CASES_SEARCH";
});
if (advSearch) {
const index = advSearch.child.findIndex(function(o) {
@@ -533,7 +535,7 @@ export default {
title: data.name,
icon: "fas fa-circle",
id: data.id,
page: "/advanced-search",
page: "advanced-search",
});
}
}
@@ -565,7 +567,7 @@ export default {
removeMenuSearchChild(id) {
let newMenu = this.menu;
let advSearch = _.find(newMenu, function(o) {
return o.id === "advanced-search";
return o.id === "CASES_SEARCH";
});
if (advSearch) {
const index = advSearch.child.findIndex(function(o) {

2
resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
View File

@@ -294,7 +294,7 @@ export default {
category: this.category.id,
caseList: this.data[1].id.toLowerCase(),
processes: this.selectedProcesses,
top: this.top,
topTen: this.top,
};
this.category.id == "all" ? delete dt.category : null;
Api.process

977
resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
View File

File diff suppressed because it is too large Load Diff

4
tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/HomeTest.php
View File

@@ -119,7 +119,7 @@ class HomeTest extends TestCase
'PRO_ID' => $process->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-1 year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-1 year"))
]);
$home = new Home($user->USR_UID);
@@ -415,7 +415,7 @@ class HomeTest extends TestCase
'PRO_ID' => $process->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-1 year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-1 year"))
]);
$caseList = factory(CaseList::class)->create([

14
tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/UnassignedTest.php
View File

@@ -84,7 +84,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-$i year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-$i year"))
]);
}
@@ -149,7 +149,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-$i year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-$i year"))
]);
}
@@ -193,7 +193,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-$i year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-$i year"))
]);
}
return $user;
@@ -474,7 +474,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process1->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-1 year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-1 year"))
]);
$task2 = factory(Task::class)->create([
'TAS_ASSIGN_TYPE' => 'SELF_SERVICE',
@@ -494,7 +494,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process2->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-2 year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-2 year"))
]);
$unassigned = new Unassigned();
$unassigned->setUserId($user->USR_ID);
@@ -555,7 +555,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process1->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-1 year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-1 year"))
]);
$task2 = factory(Task::class)->create([
'TAS_ASSIGN_TYPE' => 'SELF_SERVICE',
@@ -575,7 +575,7 @@ class UnassignedTest extends TestCase
'PRO_ID' => $process2->PRO_ID,
'DEL_THREAD_STATUS' => 'OPEN',
'USR_ID' => 0,
'DEL_DELEGATE_DATE' => date('Y-m-d H:m:s', strtotime("-2 year"))
'DEL_DELEGATE_DATE' => date('Y-m-d H:i:s', strtotime("-2 year"))
]);
$unassigned = new Unassigned();
$unassigned->setUserId($user->USR_ID);

20
tests/unit/workflow/engine/src/ProcessMaker/Model/CaseListTest.php
View File

@@ -43,8 +43,8 @@ class CaseListTest extends TestCase
'iconList' => 'deafult.png',
'iconColor' => 'red',
'iconColorScreen' => 'blue',
'createDate' => date('Y-m-d H:m:s'),
'updateDate' => date('Y-m-d H:m:s')
'createDate' => date('Y-m-d H:i:s'),
'updateDate' => date('Y-m-d H:i:s')
];
$array = CaseList::getColumnNameFromAlias($data);
@@ -81,8 +81,8 @@ class CaseListTest extends TestCase
'CAL_ICON_LIST' => 'deafult.png',
'CAL_ICON_COLOR' => 'red',
'CAL_ICON_COLOR_SCREEN' => 'blue',
'CAL_CREATE_DATE' => date('Y-m-d H:m:s'),
'CAL_UPDATE_DATE' => date('Y-m-d H:m:s')
'CAL_CREATE_DATE' => date('Y-m-d H:i:s'),
'CAL_UPDATE_DATE' => date('Y-m-d H:i:s')
];
$array = CaseList::getAliasFromColumnName($data);
@@ -118,8 +118,8 @@ class CaseListTest extends TestCase
'iconList' => 'deafult.png',
'iconColor' => 'red',
'iconColorScreen' => 'blue',
'createDate' => date('Y-m-d H:m:s'),
'updateDate' => date('Y-m-d H:m:s')
'createDate' => date('Y-m-d H:i:s'),
'updateDate' => date('Y-m-d H:i:s')
];
$caseList = CaseList::createSetting($data, $data['userId']);
@@ -152,8 +152,8 @@ class CaseListTest extends TestCase
'iconList' => 'deafult.png',
'iconColor' => 'red',
'iconColorScreen' => 'blue',
'createDate' => date('Y-m-d H:m:s'),
'updateDate' => date('Y-m-d H:m:s')
'createDate' => date('Y-m-d H:i:s'),
'updateDate' => date('Y-m-d H:i:s')
];
$model = CaseList::createSetting($data, $data['userId']);
@@ -194,8 +194,8 @@ class CaseListTest extends TestCase
'iconList' => 'deafult.png',
'iconColor' => 'red',
'iconColorScreen' => 'blue',
'createDate' => date('Y-m-d H:m:s'),
'updateDate' => date('Y-m-d H:m:s')
'createDate' => date('Y-m-d H:i:s'),
'updateDate' => date('Y-m-d H:i:s')
];
$model = CaseList::createSetting($data, $data['userId']);

9
workflow/engine/classes/class.pmScript.php
View File

@@ -649,14 +649,15 @@ class PMScript
Public function evaluateVariable()
{
$process = new Process();
if (!$process->isBpmnProcess($_SESSION['PROCESS'])) {
$proUid = isset($_SESSION['PROCESS']) ? $_SESSION['PROCESS'] : null;
if (!$process->isBpmnProcess($proUid)) {
return;
}
require_once PATH_CORE . 'controllers/pmTablesProxy.php';
$pmTablesProxy = new pmTablesProxy();
$variableModule = new ProcessMaker\BusinessModel\Variable();
$searchTypes = array('checkgroup', 'dropdown', 'suggest');
$processVariables = $pmTablesProxy->getDynaformVariables($_SESSION['PROCESS'], $searchTypes, false);
$processVariables = $pmTablesProxy->getDynaformVariables($proUid, $searchTypes, false);
$variables = $this->affected_fields;
$variables = (is_array($variables)) ? array_unique($variables) : $variables;
$newFields = [];
@@ -678,7 +679,7 @@ class PMScript
}
}
if (sizeof($arrayLabels)) {
$varInfo = $variableModule->getVariableTypeByName($_SESSION['PROCESS'], $var);
$varInfo = $variableModule->getVariableTypeByName($proUid, $var);
if (is_array($varInfo) && sizeof($varInfo)) {
$varType = $varInfo['VAR_FIELD_TYPE'];
switch ($varType) {
@@ -702,7 +703,7 @@ class PMScript
}
}
if (isset($this->aFields[$var]) && is_string($this->aFields[$var])) {
$varInfo = $variableModule->getVariableTypeByName($_SESSION['PROCESS'], $var);
$varInfo = $variableModule->getVariableTypeByName($proUid, $var);
$options = G::json_decode($varInfo["VAR_ACCEPTED_VALUES"]);
$no = count($options);
for ($io = 0; $io < $no; $io++) {

2
workflow/engine/methods/cases/cases_PrintView.php
View File

@@ -71,7 +71,7 @@ try {
$array['APP_TITLE'] = $Fields['TITLE'];
$array['USR_USERNAME'] = $Fields['APP_DATA']['USR_USERNAME'];
$array['USER_ENV'] = $Fields['APP_DATA']['SYS_SYS'];
$array['DATEPRINT'] = date( 'Y-m-d H:m:s' );
$array['DATEPRINT'] = date( 'Y-m-d H:i:s' );
}
$array['APP_PROCESS'] = $sProcess;

2
workflow/engine/methods/tracker/tracker_PrintView.php
View File

@@ -48,7 +48,7 @@ try {
$array['APP_TITLE'] = $Fields['TITLE'];
$array['USR_USERNAME'] = $Fields['APP_DATA']['USR_USERNAME'];
$array['USER_ENV'] = $Fields['APP_DATA']['SYS_SYS'];
$array['DATEPRINT'] = date( 'Y-m-d H:m:s' );
$array['DATEPRINT'] = date( 'Y-m-d H:i:s' );
}
$array['APP_PROCESS'] = $sProcess;

11
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -4140,10 +4140,15 @@ class Cases
// Add the time in the corresponding unit to the delegation date
$delegateDate = calculateDate($delegateDate, $taskSelfServiceTimeUnit, $taskSelfServiceTime);
$datetime = new DateTime($delegateDate);
//please the seconds is variant not must be considered
$delegateDate = $datetime->format('Y-m-d H:i:00');
// Define the current time
$datetime = new DateTime('now');
$currentDate = $datetime->format('Y-m-d H:i:s');
//please the seconds is variant not must be considered
$currentDate = $datetime->format('Y-m-d H:i:00');
$currentDate = UtilDateTime::convertDataToUtc($currentDate);
// Check if the triggers to be executed
if ($currentDate >= $delegateDate && $flagExecuteOnce) {
@@ -4208,8 +4213,10 @@ class Cases
'tasUid' => $taskUid,
'selfServiceTime' => $taskSelfServiceTime,
'selfServiceTimeUnit' => $taskSelfServiceTimeUnit,
'currentDate' => $currentDate,
'delegateDate' => $delegateDate
];
Log::channel(':TriggerExecution')->info('Timeout trigger execution', Bootstrap::context($context));
Log::channel('taskScheduler:executeSelfServiceTimeout')->info('TriggerExecution', Bootstrap::context($context));
}
unset($_SESSION["PROCESS"]);

66
workflow/engine/src/ProcessMaker/TaskScheduler/Task.php
View File

@@ -147,7 +147,7 @@ class Task
public function resendEmails($now, $dateSystem)
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:resendEmails')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($now, $dateSystem, $scheduledTaskIdentifier) {
$this->setExecutionMessage("Resending emails");
@@ -189,7 +189,7 @@ class Task
$context = [
"trace" => $e->getTraceAsString()
];
Log::channel('taskScheduler:taskScheduler')->error($e->getMessage(), Bootstrap::context($context));
Log::channel('taskScheduler:resendEmails')->error($e->getMessage(), Bootstrap::context($context));
$criteria = new Criteria("workflow");
$criteria->clearSelectColumns();
$criteria->addSelectColumn(ConfigurationPeer::CFG_UID);
@@ -212,7 +212,7 @@ class Task
$this->saveLog("resendEmails", "error", "Error Resending Emails: " . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:resendEmails')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -224,7 +224,7 @@ class Task
public function unpauseApplications($now)
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:unpauseApplications')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($now, $scheduledTaskIdentifier) {
$this->setExecutionMessage("Unpausing applications");
@@ -242,7 +242,7 @@ class Task
$this->saveLog('unpauseApplications', 'error', 'Error Unpausing Applications: ' . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:unpauseApplications')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -255,7 +255,7 @@ class Task
function executeCaseSelfService()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:executeCaseSelfService')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
try {
@@ -275,7 +275,7 @@ class Task
$this->saveLog("unassignedCase", "error", "Error in unassigned case: " . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:executeCaseSelfService')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -286,7 +286,7 @@ class Task
public function calculateDuration()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:calculateDuration')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
$this->setExecutionMessage("Calculating Duration");
@@ -303,7 +303,7 @@ class Task
$this->saveLog('calculateDuration', 'error', 'Error Calculating Duration: ' . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:calculateDuration')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -314,7 +314,7 @@ class Task
public function calculateAppDuration()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:calculateAppDuration')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
$this->setExecutionMessage("Calculating Duration by Application");
@@ -331,7 +331,7 @@ class Task
$this->saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:calculateAppDuration')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -342,7 +342,7 @@ class Task
public function cleanSelfServiceTables()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:cleanSelfServiceTables')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
try {
@@ -373,7 +373,7 @@ class Task
$this->saveLog("ExecuteCleanSelfServiceTables", "error", "Error when try to clean self-service tables " . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:cleanSelfServiceTables')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -385,7 +385,7 @@ class Task
public function executePlugins()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:executePlugins')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
$pathCronPlugins = PATH_CORE . 'bin' . PATH_SEP . 'plugins' . PATH_SEP;
@@ -429,7 +429,7 @@ class Task
}
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:executePlugins')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -475,7 +475,7 @@ class Task
public function fillReportByUser($dateInit, $dateFinish)
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:fillReportByUser')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
if ($dateInit == null) {
if ($this->asynchronous === false) {
@@ -484,7 +484,7 @@ class Task
}
if ($this->asynchronous === true) {
$message = 'You must enter the starting date. Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"';
Log::channel('taskScheduler:taskScheduler')->info($message, Bootstrap::context());
Log::channel('taskScheduler:fillReportByUser')->info($message, Bootstrap::context());
}
return false;
}
@@ -506,7 +506,7 @@ class Task
$this->saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:fillReportByUser')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -520,7 +520,7 @@ class Task
public function fillReportByProcess($dateInit, $dateFinish)
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:fillReportByProcess')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
if ($dateInit == null) {
if ($this->asynchronous === false) {
@@ -529,7 +529,7 @@ class Task
}
if ($this->asynchronous === true) {
$message = 'You must enter the starting date. Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"';
Log::channel('taskScheduler:taskScheduler')->info($message, Bootstrap::context());
Log::channel('taskScheduler:fillReportByProcess')->info($message, Bootstrap::context());
}
return false;
}
@@ -551,7 +551,7 @@ class Task
$this->saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:fillReportByProcess')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -563,14 +563,14 @@ class Task
public function ldapcron($debug)
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:ldapcron')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($debug, $scheduledTaskIdentifier) {
require_once(PATH_HOME . 'engine' . PATH_SEP . 'methods' . PATH_SEP . 'services' . PATH_SEP . 'ldapadvanced.php');
$ldapadvancedClassCron = new ldapadvancedClassCron();
$ldapadvancedClassCron->executeCron($debug);
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:ldapcron')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -581,7 +581,7 @@ class Task
function sendNotifications()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:sendNotifications')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
try {
@@ -627,7 +627,7 @@ class Task
$this->saveLog("ExecuteSendNotifications", "error", "Error when sending notifications " . $e->getMessage());
}
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:sendNotifications')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -638,13 +638,13 @@ class Task
public function actionsByEmailResponse()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:actionsByEmailResponse')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
$responseReader = new ResponseReader();
$responseReader->actionsByEmailEmailResponse();
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:actionsByEmailResponse')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -655,13 +655,13 @@ class Task
public function messageeventcron()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:messageeventcron')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use($scheduledTaskIdentifier) {
$messageApplication = new MessageApplication();
$messageApplication->catchMessageEvent(true);
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:messageeventcron')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -675,13 +675,13 @@ class Task
public function timerEventCron($datetime, $frontEnd)
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:timerEventCron')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use ($datetime, $frontEnd, $scheduledTaskIdentifier) {
$timerEvent = new TimerEvent();
$timerEvent->startContinueCaseByTimerEvent($datetime, $frontEnd);
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:timerEventCron')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}
@@ -692,12 +692,12 @@ class Task
public function webEntriesCron()
{
$scheduledTaskIdentifier = uniqid(__FUNCTION__ . "#");
Log::channel('taskScheduler:taskScheduler')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:webEntriesCron')->info("Start {$scheduledTaskIdentifier}", Bootstrap::context());
$job = function() use ($scheduledTaskIdentifier) {
WebEntry::deleteOldWebEntries();
Log::channel('taskScheduler:taskScheduler')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
Log::channel('taskScheduler:webEntriesCron')->info("Finish {$scheduledTaskIdentifier}", Bootstrap::context());
};
$this->runTask($job);
}