* Bugfix Reminders on task cancelled before delete reminders update was not deleted
* Bugfix Uncaught ReferenceError: $ is not defined on ITIL Object creation * Delete error message after case cancellation successfully * change minimum version of processmaker server * delete TODO comment * Add possibility to cancel case with multiple tasks * bugfix delete reminder on case's cancel or delete * Add behavior on a claimed task or reasign to the current user for show task in timeline * Fixed issue with default dates settings in reminders for tasks * Added shortcut to select "Me as sender" * Added a test to prevent post-only user to set reminder settings * Updated XML * Fix issue with screen view * Adjusted wordings * Reviewed $new_date computation in cron * Bugfix creating a case in processcase tab doesn't redirect to the case * Adjusted visualization for Reminder * Added an <hr> * Adjusted values in dropdowns when settings are NULL * Added a test to prevent sending of remminders to "ProcessMaker" user * Added view of default and actual reminder settings for a PM task * cronPMReminder reflects changes and send reminders * Re-engineered table fields and search options * Fixed issue with FUP that were no longuer added to timeline. * Added automatic reminders * bugfix on filter * Changed copyrights * added .gitignore * add process category search option + input in process form * Added process categories * bugfixes on helpdesk process * bugfixes html_tags and actiontime * Changed the way the userId of the first task was computed, to be able to have a tobeclaimed task * Added get/set APP_DATA scripts to be able to read/write the APP_DATA in json files * Added a followup when a reminder is sent to task user (or group) Set version 5.2.3
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
-------------------------------------------------------------------------
|
||||
ProcessMaker plugin for GLPI
|
||||
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
|
||||
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
|
||||
|
||||
https://www.araymond.com/
|
||||
-------------------------------------------------------------------------
|
||||
@@ -51,17 +51,20 @@ switch ($_REQUEST["action"]) {
|
||||
|
||||
//$task->getFromDBByQuery(" WHERE `plugin_processmaker_cases_id`=".$case->getID()); // normally there is only one and only one first task
|
||||
//$link .= '&forcetab=PluginProcessmakerTask$'.$task->getID();
|
||||
|
||||
Session::setActiveTab('PluginProcessmakerCase', 'PluginProcessmakerTask$'.$task->fields['id']);
|
||||
$item = new $_REQUEST['itemtype'];
|
||||
$item->getFromDB($_REQUEST['items_id']);
|
||||
unset($_SERVER['REQUEST_URI']); // to prevent use of processmaker.form.php in NavigateList
|
||||
Session::initNavigateListItems('PluginProcessmakerCase',
|
||||
//TRANS : %1$s is the itemtype name,
|
||||
if (!isset($_REQUEST['timeline'])) {
|
||||
Session::setActiveTab('PluginProcessmakerCase', 'PluginProcessmakerTask$'.$task->fields['id']);
|
||||
$item = new $_REQUEST['itemtype'];
|
||||
$item->getFromDB($_REQUEST['items_id']);
|
||||
unset($_SERVER['REQUEST_URI']); // to prevent use of processmaker.form.php in NavigateList
|
||||
Session::initNavigateListItems('PluginProcessmakerCase',
|
||||
//TRANS : %1$s is the itemtype name,
|
||||
// %2$s is the name of the item (used for headings of a list)
|
||||
sprintf('%1$s = %2$s',
|
||||
$_REQUEST['itemtype']::getTypeName(1), $item->fields["name"]));
|
||||
Html::redirect($link);
|
||||
sprintf('%1$s = %2$s',
|
||||
$_REQUEST['itemtype']::getTypeName(1), $item->fields["name"]));
|
||||
Html::redirect($link);
|
||||
} else if ($_REQUEST['timeline']) {
|
||||
Html::back();
|
||||
}
|
||||
}
|
||||
Html::back();
|
||||
} else {
|
||||
@@ -138,7 +141,7 @@ switch ($_REQUEST["action"]) {
|
||||
}
|
||||
}
|
||||
} elseif (isset($_REQUEST['reminder'])) {
|
||||
// send notification remider as requested for this task
|
||||
// send notification reminder as requested for this task
|
||||
|
||||
$locCase = new PluginProcessmakerCase;
|
||||
$locCase->getFromDB($_REQUEST['cases_id']);
|
||||
@@ -151,6 +154,71 @@ switch ($_REQUEST["action"]) {
|
||||
|
||||
// send notification now!
|
||||
$pm_task->sendNotification('task_reminder', $glpi_task, $glpi_item, $locCase);
|
||||
|
||||
// Add a follow-up in the hosting item to indicate the sending of the reminder
|
||||
$fu = new ITILFollowup();
|
||||
$input = $fu->fields;
|
||||
|
||||
$fucontent = sprintf(
|
||||
__("Case: '%s',<br>Task: '%s',<br>A reminder has been sent to:<br>", 'processmaker'),
|
||||
$locCase->fields['name'],
|
||||
Dropdown::getDropdownName("glpi_taskcategories", $glpi_task->fields["taskcategories_id"])
|
||||
);
|
||||
|
||||
if (isset($glpi_task->fields['users_id_tech']) && $glpi_task->fields['users_id_tech'] > 0) {
|
||||
// get infos for user
|
||||
$dbu = new DbUtils;
|
||||
$userinfos = $dbu->getUserName($glpi_task->fields['users_id_tech'], 2);
|
||||
$fucontent .= "-> " . $userinfos['name'] . "<br>";
|
||||
}
|
||||
|
||||
if (isset($glpi_task->fields['groups_id_tech']) && $glpi_task->fields['groups_id_tech'] > 0) {
|
||||
// get infos for group
|
||||
$grp = new Group();
|
||||
$grp->getFromDB($glpi_task->fields['groups_id_tech']);
|
||||
$fucontent .= "-> " . $grp->fields['name'] . "<br>";
|
||||
}
|
||||
|
||||
$input['content'] = $DB->escape($fucontent);
|
||||
$input['is_private'] = 0;
|
||||
//$input['requesttypes_id'] = ;
|
||||
$input['items_id'] = $_REQUEST['items_id'];
|
||||
$input['users_id'] = Session::getLoginUserID(true);
|
||||
$input['itemtype'] = $_REQUEST['itemtype'];
|
||||
|
||||
$fu->add($input);
|
||||
|
||||
} elseif (isset($_REQUEST['reminder_settings'])) {
|
||||
// here we must add/update the taskrecalls
|
||||
$recall = new PluginProcessmakerTaskrecall();
|
||||
// if the new_when is less than glpi_currenttime, then set it to glpi_currenttime
|
||||
// to prevent send of many "after reminders" in case of late cron that missed several "after reminders"
|
||||
// if the new_when is less than glpi_currenttime, then set it to glpi_currenttime
|
||||
$new_when = -1; // by default will delete any records
|
||||
if (isset($_REQUEST['actual_before_time']) && $_REQUEST['actual_before_time'] >= 0) {
|
||||
$new_when = $_REQUEST['next_reminder_before'];
|
||||
} elseif ($_REQUEST['actual_after_time'] >= 0) {
|
||||
$new_when = $_REQUEST['next_reminder_after'];
|
||||
}
|
||||
if ($new_when !== -1 && $_REQUEST['plugin_processmaker_taskrecalls_id'] > 0) {
|
||||
$recall->update([
|
||||
'id' => $_REQUEST['plugin_processmaker_taskrecalls_id'],
|
||||
'before_time' => $_REQUEST['actual_before_time'],
|
||||
'after_time' => $_REQUEST['actual_after_time'],
|
||||
'when' => $new_when,
|
||||
'users_id' => $_REQUEST['actual_users_id']
|
||||
]);
|
||||
} elseif ($new_when !== -1) {
|
||||
$recall->add([
|
||||
'plugin_processmaker_tasks_id' => $_REQUEST['plugin_processmaker_tasks_id'],
|
||||
'before_time' => $_REQUEST['actual_before_time'],
|
||||
'after_time' => $_REQUEST['actual_after_time'],
|
||||
'when' => $new_when,
|
||||
'users_id' => $_REQUEST['actual_users_id']
|
||||
]);
|
||||
} elseif ($_REQUEST['plugin_processmaker_taskrecalls_id'] > 0) {
|
||||
$recall->delete(['id' => $_REQUEST['plugin_processmaker_taskrecalls_id']]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user