Skip to content

Commit cc17bd5

Browse files
tomolimotomolimo
committed
* 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
1 parent 5851f0f commit cc17bd5

File tree

79 files changed

+1980
-356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1980
-356
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ version 4.0.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-1.x (h
1212

1313
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)
1414

15-
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)
15+
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)
1616

17-
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)
17+
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)
1818

19-
This plugin can run classic (ProcessMaker server v2) and BPMN (ProcessMaker server v3 and later) processes
19+
This plugin can run classic (ProcessMaker server v2) and BPMN (ProcessMaker server v3) processes
2020

‎ajax/asynchronousdatas.php

+15-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
-------------------------------------------------------------------------
44
ProcessMaker plugin for GLPI
5-
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
66
77
https://www.araymond.com/
88
-------------------------------------------------------------------------
@@ -53,11 +53,22 @@
5353
$datas = json_decode($request_body, true);
5454

5555
$asyncdata = new PluginProcessmakerCrontaskaction;
56-
if (isset($datas['id']) && $asyncdata->getFromDB( $datas['id'] ) && $asyncdata->fields['state'] == PluginProcessmakerCrontaskaction::WAITING_DATA) {
56+
57+
$ID = 0;
58+
if (isset($_REQUEST['id'])) {
59+
$ID = $_REQUEST['id'];
60+
}
61+
if (isset($datas['id'])) {
62+
$ID = $datas['id'];
63+
}
64+
if ($ID && $asyncdata->getFromDB($ID) && $asyncdata->fields['state'] == PluginProcessmakerCrontaskaction::WAITING_DATA) {
5765
$initialdatas = json_decode($asyncdata->fields['formdata'], true);
58-
$initialdatas['form'] = array_merge( $initialdatas['form'], $datas['form'] );
66+
if (isset($datas['form'])) {
67+
$datas = $datas['form'];
68+
}
69+
$initialdatas['form'] = array_merge( $initialdatas['form'], $datas );
5970
$formdata = json_encode($initialdatas, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE);
60-
$asyncdata->update( [ 'id' => $datas['id'], 'state' => PluginProcessmakerCrontaskaction::DATA_READY, 'formdata' => $formdata ] );
71+
$asyncdata->update( [ 'id' => $ID, 'state' => PluginProcessmakerCrontaskaction::DATA_READY, 'formdata' => $formdata ] );
6172
$ret = [ 'code' => '0', 'message' => 'Done' ];
6273
} else {
6374
$ret = [ 'code' => '2', 'message' => 'Case is not existing, or state is not WAITING_DATA' ];

‎ajax/case.php

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
6+
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
27+
*/
28+
29+
use Glpi\Application\View\TemplateRenderer;
30+
include ("../../../inc/includes.php");
31+
$item = new $_REQUEST['itemtype'];
32+
$item->getFromDB($_REQUEST['items_id']);
33+
$countProcesses = [];
34+
$cases = PluginProcessmakerCase::getAllCases($_REQUEST['itemtype'], $_REQUEST['items_id'], $countProcesses);
35+
echo "<div class='row'>";
36+
echo "<div class='col-auto order-last d-none d-md-block'>";
37+
TemplateRenderer::getInstance()->display(
38+
'components\user\picture.html.twig',
39+
[
40+
'users_id' => Session::getLoginUserID(),
41+
]
42+
);
43+
echo "</div>";
44+
echo "<div class='col'>";
45+
echo "<div class='row timeline-content t-right card mt-4' style='border: 1px solid rgb(65, 133, 244);'>";
46+
echo "<div class='card-body'>";
47+
echo "<div class='clearfix'>";
48+
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'>";
49+
echo "<i class='fa-lg ti ti-x'></i></button></div>";
50+
echo "<div class='newCaseContent'>";
51+
PluginProcessmakerCase::showAddFormForItem($item, rand(), $countProcesses, true);
52+
echo "</div></div></div></div></div>";

‎ajax/dropdownProcesses.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
-------------------------------------------------------------------------
44
ProcessMaker plugin for GLPI
5-
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
66
77
https://www.araymond.com/
88
-------------------------------------------------------------------------

‎ajax/dropdownTaskcategories.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
-------------------------------------------------------------------------
44
ProcessMaker plugin for GLPI
5-
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
66
77
https://www.araymond.com/
88
-------------------------------------------------------------------------

‎ajax/dropdownTicketCategories.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
-------------------------------------------------------------------------
44
ProcessMaker plugin for GLPI
5-
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
66
77
https://www.araymond.com/
88
-------------------------------------------------------------------------

‎ajax/dropdownUsers.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
-------------------------------------------------------------------------
44
ProcessMaker plugin for GLPI
5-
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
66
77
https://www.araymond.com/
88
-------------------------------------------------------------------------
@@ -58,8 +58,7 @@
5858
}
5959

6060
$used = [];
61-
62-
if (isset($_REQUEST['used'])) {
61+
if (isset($_REQUEST['used']) && is_array($_REQUEST['used'])) {
6362
$used = $_REQUEST['used'];
6463
}
6564

@@ -98,7 +97,7 @@
9897
$count = 0;
9998
foreach ($res as $data) {
10099
$users[$data["id"]] = $dbu->formatUserName($data["id"], $data["name"], $data["realname"],
101-
$data["firstname"], 0);
100+
$data["firstname"], 0) . " (" . $data["name"] . ")";
102101
$logins[$data["id"]] = $data["name"];
103102
}
104103

‎ajax/selfservicedrafts.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
-------------------------------------------------------------------------
44
ProcessMaker plugin for GLPI
5-
Copyright (C) 2014-2023 by Raynet SAS a company of A.Raymond Network.
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
66
77
https://www.araymond.com/
88
-------------------------------------------------------------------------

‎ajax/task.php

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2024 by Raynet SAS a company of A.Raymond Network.
6+
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
27+
*/
28+
29+
include ("../../../inc/includes.php");
30+
if( isset($_REQUEST) && !empty($_REQUEST)) {
31+
$Case = new PluginProcessmakerCase;
32+
$Case->getFromDB($_REQUEST['cases_id']);
33+
PluginProcessmakerTask::displayTabContentForItem($Case, $_REQUEST['tabnum']);
34+
}

0 commit comments

Comments
 (0)