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

Revert "PMCORE-1542 (pull request #7355)"

Browse Source 
This reverts pull request #7355.

> PMCORE-1542
This commit is contained in:
Paula Quispe
2020-06-08 20:21:26 +00:00
parent bf9ec3e2c4
commit c01ae1a4a7
15 changed files with 14 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/classes/WsBase.php
View File

@@ -3420,17 +3420,16 @@ class WsBase
/**
* Add case note
*
* @param string $caseUid, ID of the case.
* @param string $processUid, ID of the process.
* @param string $taskUid, ID of the task.
* @param string $userUid, The unique ID of the user who will add note case.
* @param string $note, Note of the case.
* @param int $sendMail, Optional parameter. If set to 1, will send an email to all participants in the case.
* @param array $files, Optional parameter. This is an array of files.
* @param string caseUid : ID of the case.
* @param string processUid : ID of the process.
* @param string taskUid : ID of the task.
* @param string userUid : The unique ID of the user who will add note case.
* @param string note : Note of the case.
* @param int sendMail : Optional parameter. If set to 1, will send an email to all participants in the case.
*
* @return object
* @return $result will return an object
*/
public function addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1, $files = [])
public function addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1)
{
try {
if (empty($caseUid)) {
@@ -3476,7 +3475,7 @@ class WsBase
//Add note case
$appNote = new AppNotes();
$response = $appNote->addCaseNote($caseUid, $userUid, $note, $sendMail, $files);
$response = $appNote->addCaseNote($caseUid, $userUid, $note, $sendMail);
//Response
$result = new WsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));

6
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2887,15 +2887,13 @@ function PMFUnpauseCase ($caseUid, $delIndex, $userUid)
* @param string(32) | $userUid | ID user | The unique ID of the user who will add note case.
* @param string | $note | Note of the case | Note of the case.
* @param int | $sendMail = 1 | Send mail | Optional parameter. If set to 1, will send an email to all participants in the case.
* @param array | $files | Array of files | An array of files (full paths) to be attached to the case notes.
*
* @return int | $result | Result of the add a case note | Returns 1 if the note has been added to the case.; otherwise, returns 0 if an error occurred.
*
*/
function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1, $files = [])
function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1)
{
$ws = new WsBase();
$result = $ws->addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail, $files);
$result = $ws->addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail);
if ($result->status_code == 0) {
return 1;

17
workflow/engine/classes/model/AppNotes.php
View File

@@ -260,25 +260,10 @@ class AppNotes extends BaseAppNotes
}
}
/**
* Add a note in the case and send an email
*
* @param string $applicationUid
* @param string $userUid
* @param string $note
* @param bool $sendMail
* @param array $files
*
* @return array
*/
public function addCaseNote($applicationUid, $userUid, $note, $sendMail, $files)
public function addCaseNote($applicationUid, $userUid, $note, $sendMail)
{
$response = $this->postNewNote($applicationUid, $userUid, $note, false);
// Check the files to upload
$case = new Cases();
$res = $case->uploadFilesInCaseNotes($userUid, $applicationUid, $files, null);
if ($sendMail == 1) {
$case = new Cases();

2
workflow/engine/classes/model/map/AppDocumentMapBuilder.php
View File

@@ -127,7 +127,7 @@ class AppDocumentMapBuilder
$tMap->addValidator('USR_UID', 'required', 'propel.validator.RequiredValidator', '', 'User UID is required.');
$tMap->addValidator('APP_DOC_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'INPUT|OUTPUT|ATTACHED|CASE_NOTE', 'Please select a valid document type.');
$tMap->addValidator('APP_DOC_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'INPUT|OUTPUT|ATTACHED', 'Please select a valid document type.');
$tMap->addValidator('APP_DOC_TYPE', 'required', 'propel.validator.RequiredValidator', '', 'Application Document Type is required.');