fernando/luos
1
0
Fork 0
Code Releases Activity

up conflict

Browse Source
This commit is contained in:
Ronald Q
2016-04-28 08:18:46 -04:00
parent ea7916da8c efe3bdeff9
commit abebd2f2fb
21 changed files with 203 additions and 271 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 array $app_data, Data for case variables
* @param string $dyn_uid, Uid for dynaform
* @param string $del_index, Index for case
* @param string $usr_uid, Uid for user
*
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @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::appUid($app_uid, '$app_uid');
@@ -1771,7 +1772,7 @@ class Cases
$_SESSION['USER_LOGGED'] = $usr_uid;
$case = new \Cases();
$fields = $case->loadCase($app_uid);
$fields = $case->loadCase($app_uid, $del_index);
$_POST['form'] = $app_data;
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']);
$case->updateCase($app_uid, $data);
}

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

@@ -862,19 +862,20 @@ class Cases extends Api
* @param string $app_uid {@min 1}{@max 32}
* @param array $request_data
* @param string $dyn_uid {@from path}
* @param string $del_index {@from path}
*
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia
*
* @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 {
$usr_uid = $this->getUserId();
$cases = new \ProcessMaker\BusinessModel\Cases();
$request_data = \ProcessMaker\Util\DateTime::convertDataToUtc($request_data);
$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) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}

21
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -18,6 +18,7 @@ use \ProcessMaker\Util\DateTime;
class Light extends Api
{
private $regexNull = '/^null$/i';
private $arrayFieldIso8601 = [
// request lists
'newerThan',
@@ -137,6 +138,10 @@ class Light extends Api
$oldestthan =''
) {
try {
if (preg_match($this->regexNull, $newerThan)) {
return [];
}
$dataList['userId'] = $this->getUserId();
$dataList['action'] = 'todo';
$dataList['paged'] = true;
@@ -230,6 +235,10 @@ class Light extends Api
$oldestthan =''
) {
try {
if (preg_match($this->regexNull, $newerThan)) {
return [];
}
$dataList['userId'] = $this->getUserId();
$dataList['action'] = 'draft';
$dataList['paged'] = true;
@@ -325,6 +334,10 @@ class Light extends Api
$oldestthan =''
) {
try {
if (preg_match($this->regexNull, $newerThan)) {
return [];
}
$dataList['userId'] = $this->getUserId();
$dataList['action'] = 'sent';
$dataList['paged'] = $paged;
@@ -426,6 +439,10 @@ class Light extends Api
$oldestthan = ''
) {
try {
if (preg_match($this->regexNull, $newerThan)) {
return [];
}
$dataList['userId'] = $this->getUserId();
$dataList['action'] = 'paused';
$dataList['paged'] = true;
@@ -519,6 +536,10 @@ class Light extends Api
$oldestthan =''
) {
try {
if (preg_match($this->regexNull, $newerThan)) {
return [];
}
$dataList['userId'] = $this->getUserId();
$dataList['action'] = 'unassigned';
$dataList['paged'] = false;