Skip to content

Commit

Permalink
* Bugfix Reminders on task cancelled before delete reminders update w…
Browse files Browse the repository at this point in the history
…as 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
  • Loading branch information
tomolimo committed Jan 14, 2025
1 parent 5851f0f commit cc17bd5
Show file tree
Hide file tree
Showing 79 changed files with 1,980 additions and 356 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ version 4.0.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-1.x (h

version 4.3.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-1.13 (https://github.com/tomolimo/processmaker-server/releases/latest)

version 4.4.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-2.0 (https://github.com/tomolimo/processmaker-server/releases/latest)
version 4.6.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-2.x (https://github.com/tomolimo/processmaker-server/releases/latest)

version 5.0.x is compatible with GLPI 10.0 and needs ProcessMaker 3.3.0-RE-2.0 (https://github.com/tomolimo/processmaker-server/releases/latest)
version 5.1.x is compatible with GLPI 10.0 and needs ProcessMaker 3.3.0-RE-2.0 (https://github.com/tomolimo/processmaker-server/releases/latest)

This plugin can run classic (ProcessMaker server v2) and BPMN (ProcessMaker server v3 and later) processes
This plugin can run classic (ProcessMaker server v2) and BPMN (ProcessMaker server v3) processes

19 changes: 15 additions & 4 deletions ajax/asynchronousdatas.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
-------------------------------------------------------------------------
Expand Down Expand Up @@ -53,11 +53,22 @@
$datas = json_decode($request_body, true);

$asyncdata = new PluginProcessmakerCrontaskaction;
if (isset($datas['id']) && $asyncdata->getFromDB( $datas['id'] ) && $asyncdata->fields['state'] == PluginProcessmakerCrontaskaction::WAITING_DATA) {

$ID = 0;
if (isset($_REQUEST['id'])) {
$ID = $_REQUEST['id'];
}
if (isset($datas['id'])) {
$ID = $datas['id'];
}
if ($ID && $asyncdata->getFromDB($ID) && $asyncdata->fields['state'] == PluginProcessmakerCrontaskaction::WAITING_DATA) {
$initialdatas = json_decode($asyncdata->fields['formdata'], true);
$initialdatas['form'] = array_merge( $initialdatas['form'], $datas['form'] );
if (isset($datas['form'])) {
$datas = $datas['form'];
}
$initialdatas['form'] = array_merge( $initialdatas['form'], $datas );
$formdata = json_encode($initialdatas, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE);
$asyncdata->update( [ 'id' => $datas['id'], 'state' => PluginProcessmakerCrontaskaction::DATA_READY, 'formdata' => $formdata ] );
$asyncdata->update( [ 'id' => $ID, 'state' => PluginProcessmakerCrontaskaction::DATA_READY, 'formdata' => $formdata ] );
$ret = [ 'code' => '0', 'message' => 'Done' ];
} else {
$ret = [ 'code' => '2', 'message' => 'Case is not existing, or state is not WAITING_DATA' ];
Expand Down
52 changes: 52 additions & 0 deletions ajax/case.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?php
/*
-------------------------------------------------------------------------
ProcessMaker plugin for GLPI
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
https://www.araymond.com/
-------------------------------------------------------------------------
LICENSE
This file is part of ProcessMaker plugin for GLPI.
This file is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This plugin is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------
*/

use Glpi\Application\View\TemplateRenderer;
include ("../../../inc/includes.php");
$item = new $_REQUEST['itemtype'];
$item->getFromDB($_REQUEST['items_id']);
$countProcesses = [];
$cases = PluginProcessmakerCase::getAllCases($_REQUEST['itemtype'], $_REQUEST['items_id'], $countProcesses);
echo "<div class='row'>";
echo "<div class='col-auto order-last d-none d-md-block'>";
TemplateRenderer::getInstance()->display(
'components\user\picture.html.twig',
[
'users_id' => Session::getLoginUserID(),
]
);
echo "</div>";
echo "<div class='col'>";
echo "<div class='row timeline-content t-right card mt-4' style='border: 1px solid rgb(65, 133, 244);'>";
echo "<div class='card-body'>";
echo "<div class='clearfix'>";
echo "<button class='btn btn-sm btn-ghost-secondary float-end mb-1 close-new-case-form collapsed' data-bs-toggle='collapse' data-bs-target='#new-CaseForm-block' aria-expanded='false'>";
echo "<i class='fa-lg ti ti-x'></i></button></div>";
echo "<div class='newCaseContent'>";
PluginProcessmakerCase::showAddFormForItem($item, rand(), $countProcesses, true);
echo "</div></div></div></div></div>";
2 changes: 1 addition & 1 deletion ajax/dropdownProcesses.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
-------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownTaskcategories.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
-------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownTicketCategories.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
-------------------------------------------------------------------------
Expand Down
7 changes: 3 additions & 4 deletions ajax/dropdownUsers.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
-------------------------------------------------------------------------
Expand Down Expand Up @@ -58,8 +58,7 @@
}

$used = [];

if (isset($_REQUEST['used'])) {
if (isset($_REQUEST['used']) && is_array($_REQUEST['used'])) {
$used = $_REQUEST['used'];
}

Expand Down Expand Up @@ -98,7 +97,7 @@
$count = 0;
foreach ($res as $data) {
$users[$data["id"]] = $dbu->formatUserName($data["id"], $data["name"], $data["realname"],
$data["firstname"], 0);
$data["firstname"], 0) . " (" . $data["name"] . ")";
$logins[$data["id"]] = $data["name"];
}

Expand Down
2 changes: 1 addition & 1 deletion ajax/selfservicedrafts.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
-------------------------------------------------------------------------
Expand Down
34 changes: 34 additions & 0 deletions ajax/task.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php
/*
-------------------------------------------------------------------------
ProcessMaker plugin for GLPI
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
https://www.araymond.com/
-------------------------------------------------------------------------
LICENSE
This file is part of ProcessMaker plugin for GLPI.
This file is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This plugin is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------
*/

include ("../../../inc/includes.php");
if( isset($_REQUEST) && !empty($_REQUEST)) {
$Case = new PluginProcessmakerCase;
$Case->getFromDB($_REQUEST['cases_id']);
PluginProcessmakerTask::displayTabContentForItem($Case, $_REQUEST['tabnum']);
}
Loading

0 comments on commit cc17bd5

Please sign in to comment.