fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in qronald/processmaker/HOR-845 (pull request #4147)

Browse Source 
HOR-845
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-27 15:49:52 -04:00
parent 4872273ea1 a0c6bb091d
commit d9d24734a2
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1728,12 +1728,13 @@ class Cases
* @param string $app_uid, Uid for case * @param string $app_uid, Uid for case
* @param array $app_data, Data for case variables * @param array $app_data, Data for case variables
* @param string $dyn_uid, Uid for dynaform * @param string $dyn_uid, Uid for dynaform
* @param string $del_index, Index for case
* @param string $usr_uid, Uid for user * @param string $usr_uid, Uid for user
* *
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia * @copyright Colosa - Bolivia
*/ */
public function setCaseVariables($app_uid, $app_data, $dyn_uid = null, $usr_uid) public function setCaseVariables($app_uid, $app_data, $dyn_uid = null, $usr_uid ,$del_index = 0)
{ {
Validator::isString($app_uid, '$app_uid'); Validator::isString($app_uid, '$app_uid');
Validator::appUid($app_uid, '$app_uid'); Validator::appUid($app_uid, '$app_uid');
@@ -1771,7 +1772,7 @@ class Cases
$_SESSION['USER_LOGGED'] = $usr_uid; $_SESSION['USER_LOGGED'] = $usr_uid;
$case = new \Cases(); $case = new \Cases();
$fields = $case->loadCase($app_uid); $fields = $case->loadCase($app_uid, $del_index);
$_POST['form'] = $app_data; $_POST['form'] = $app_data;
if (!is_null($dyn_uid) && $dyn_uid != '') { if (!is_null($dyn_uid) && $dyn_uid != '') {
@@ -1783,6 +1784,17 @@ class Cases
} }
} }
if (!is_null($dyn_uid) && $del_index > 0) {
//save data
$data = array();
$data['APP_NUMBER'] = $fields['APP_NUMBER'];
$data['APP_DATA'] = $fields['APP_DATA'];
$data['DEL_INDEX'] = $del_index;
$data['TAS_UID'] = $fields['TAS_UID'];;
$data['CURRENT_DYNAFORM'] = $dyn_uid;
$data['USER_UID'] = $usr_uid;
$data['PRO_UID'] = $fields['PRO_UID'];
}
$data['APP_DATA'] = array_merge($fields['APP_DATA'], $_POST['form']); $data['APP_DATA'] = array_merge($fields['APP_DATA'], $_POST['form']);
$case->updateCase($app_uid, $data); $case->updateCase($app_uid, $data);
} }

5
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -862,18 +862,19 @@ class Cases extends Api
* @param string $app_uid {@min 1}{@max 32} * @param string $app_uid {@min 1}{@max 32}
* @param array $request_data * @param array $request_data
* @param string $dyn_uid {@from path} * @param string $dyn_uid {@from path}
* @param string $del_index {@from path}
* *
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia * @copyright Colosa - Bolivia
* *
* @url PUT /:app_uid/variable * @url PUT /:app_uid/variable
*/ */
public function doPutCaseVariables($app_uid, $request_data, $dyn_uid = '') public function doPutCaseVariables($app_uid, $request_data, $dyn_uid = '', $del_index = 0)
{ {
try { try {
$usr_uid = $this->getUserId(); $usr_uid = $this->getUserId();
$cases = new \ProcessMaker\BusinessModel\Cases(); $cases = new \ProcessMaker\BusinessModel\Cases();
$cases->setCaseVariables($app_uid, $request_data, $dyn_uid, $usr_uid); $cases->setCaseVariables($app_uid, $request_data, $dyn_uid, $usr_uid, $del_index);
} catch (\Exception $e) { } catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
} }