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

Merged in qronald/processmaker/3.0.1-GA (pull request #2595)

Browse Source 
change method list
This commit is contained in:
Julio Cesar Laura Avendaño
2015-08-18 15:00:24 -04:00
parent 419f9a100c 0102be35aa
commit b42e8be92e
2 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -54,33 +54,41 @@ class Light
$task = new \ProcessMaker\BusinessModel\Task();
$task->setFormatFieldNameInUppercase(false);
$task->setArrayParamException(array("taskUid" => "act_uid", "stepUid" => "step_uid"));
$webEntryEvent = new \ProcessMaker\BusinessModel\WebEntryEvent();
$webEntryEvent->setFormatFieldNameInUppercase(false);
$webEntryEvent->setArrayFieldNameForException(array("processUid" => "prj_uid"));
$step = new \ProcessMaker\Services\Api\Project\Activity\Step();
$response = array();
foreach ($processList as $key => $processInfo) {
$tempTreeChildren = array ();
foreach ($processList[$key] as $keyChild => $processInfoChild) {
$tempTreeChild['text'] = htmlentities($keyChild, ENT_QUOTES, 'UTF-8'); //ellipsis ( $keyChild, 50 );
$tempTreeChild['processId'] = $processInfoChild['pro_uid'];
$tempTreeChild['taskId'] = $processInfoChild['uid'];
$forms = $task->getSteps($processInfoChild['uid']);
$newForm = array();
$c = 0;
foreach ($forms as $k => $form) {
if ($form['step_type_obj'] == "DYNAFORM") {
$newForm[$c]['formId'] = $form['step_uid_obj'];
$newForm[$c]['index'] = $c+1;
$newForm[$c]['title'] = $form['obj_title'];
$newForm[$c]['description'] = $form['obj_description'];
$newForm[$c]['stepId'] = $form["step_uid"];
$newForm[$c]['stepMode'] = $form['step_mode'];
$trigger = $this->statusTriggers($step->doGetActivityStepTriggers($form["step_uid"], $tempTreeChild['taskId'], $tempTreeChild['processId']));
$newForm[$c]["triggers"] = $trigger;
$c++;
$webEntryEventStart = $webEntryEvent->getWebEntryEvents($processInfoChild['pro_uid']);
if(empty($webEntryEventStart)){
$tempTreeChild['text'] = htmlentities($keyChild, ENT_QUOTES, 'UTF-8'); //ellipsis ( $keyChild, 50 );
$tempTreeChild['processId'] = $processInfoChild['pro_uid'];
$tempTreeChild['taskId'] = $processInfoChild['uid'];
$forms = $task->getSteps($processInfoChild['uid']);
$newForm = array();
$c = 0;
foreach ($forms as $k => $form) {
if ($form['step_type_obj'] == "DYNAFORM") {
$newForm[$c]['formId'] = $form['step_uid_obj'];
$newForm[$c]['index'] = $c+1;
$newForm[$c]['title'] = $form['obj_title'];
$newForm[$c]['description'] = $form['obj_description'];
$newForm[$c]['stepId'] = $form["step_uid"];
$newForm[$c]['stepMode'] = $form['step_mode'];
$trigger = $this->statusTriggers($step->doGetActivityStepTriggers($form["step_uid"], $tempTreeChild['taskId'], $tempTreeChild['processId']));
$newForm[$c]["triggers"] = $trigger;
$c++;
}
}
$tempTreeChild['forms'] = $newForm;
if (isset( $proData[$processInfoChild['pro_uid']] )) {
$tempTreeChildren[] = $tempTreeChild;
}
}
$tempTreeChild['forms'] = $newForm;
if (isset( $proData[$processInfoChild['pro_uid']] )) {
$tempTreeChildren[] = $tempTreeChild;
}
}
$response = array_merge($response, $tempTreeChildren);

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

@@ -85,11 +85,15 @@ class Light extends Api
public function doGetCasesListToDo(
$start = 0,
$limit = 10,
$sort = 'APP_CACHE_VIEW.APP_NUMBER',
$sort = 'APP_UPDATE_DATE',
$dir = 'DESC',
$cat_uid = '',
$pro_uid = '',
$search = ''
$search = '',
$filter = '',
$date_from = '',
$date_to = '',
$action = ''
) {
try {
$dataList['userId'] = $this->getUserId();
@@ -102,9 +106,12 @@ class Light extends Api
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid;
$dataList['search'] = $search;
$oCases = new \ProcessMaker\BusinessModel\Cases();
$response = $oCases->getList($dataList);
$dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$dataList['action'] = $action;
$lists = new \ProcessMaker\BusinessModel\Lists();
$response = $lists->getList('inbox', $dataList);
$result = $this->parserDataTodo($response['data']);
return $result;
} catch (\Exception $e) {
@@ -115,35 +122,29 @@ class Light extends Api
public function parserDataTodo ($data)
{
$structure = array(
//'app_uid' => 'mongoId',
'app_uid' => 'caseId',
'app_title' => 'caseTitle',
'app_number' => 'caseNumber',
'app_update_date' => 'date',
'del_task_due_date' => 'dueDate',
'del_index' => 'delIndex',
//'' => 'status'
'APP_UID' => 'caseId',
'APP_TITLE' => 'caseTitle',
'APP_NUMBER' => 'caseNumber',
'APP_UPDATE_DATE' => 'date',
'DEL_TASK_DUE_DATE' => 'dueDate',
'DEL_INDEX' => 'delIndex',
'user' => array(
'usrcr_usr_uid' => 'userId',
'usrcr_usr_firstname' => 'firstName',
'usrcr_usr_lastname' => 'lastName',
'usrcr_usr_username' => 'fullName',
'USR_UID' => 'userId'
),
'prevUser' => array(
'previous_usr_uid' => 'userId',
'previous_usr_firstname' => 'firstName',
'previous_usr_lastname' => 'lastName',
'previous_usr_username' => 'fullName',
'PREVIOUS_USR_UID' => 'userId',
'PREVIOUS_USR_FIRSTNAME' => 'firstName',
'PREVIOUS_USR_LASTNAME' => 'lastName',
'PREVIOUS_USR_USERNAME' => 'fullName',
),
'process' => array(
'pro_uid' => 'processId',
'app_pro_title' => 'name'
'PRO_UID' => 'processId',
'APP_PRO_TITLE' => 'name'
),
'task' => array(
'tas_uid' => 'taskId',
'app_tas_title' => 'name'
),
'inp_doc_uid' => 'documentUid' //Esta opcion es temporal
'TAS_UID' => 'taskId',
'APP_TAS_TITLE' => 'name'
)
);
$response = $this->replaceFields($data, $structure);
@@ -230,11 +231,14 @@ class Light extends Api
public function doGetCasesListParticipated(
$start = 0,
$limit = 10,
$sort = 'APP_CACHE_VIEW.APP_NUMBER',
$sort = 'APP_UPDATE_DATE',
$dir = 'DESC',
$cat_uid = '',
$pro_uid = '',
$search = ''
$search = '',
$filter = '',
$date_from = '',
$date_to = ''
) {
try {
$dataList['userId'] = $this->getUserId();
@@ -247,8 +251,11 @@ class Light extends Api
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid;
$dataList['search'] = $search;
$oCases = new \ProcessMaker\BusinessModel\Cases();
$response = $oCases->getList($dataList);
$dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$oCases = new \ProcessMaker\BusinessModel\Lists();
$response = $oCases->getList('participated_last', $dataList);
$result = $this->parserDataParticipated($response['data']);
return $result;
} catch (\Exception $e) {
@@ -260,31 +267,31 @@ class Light extends Api
{
$structure = array(
//'app_uid' => 'mongoId',
'app_uid' => 'caseId',
'app_title' => 'caseTitle',
'app_number' => 'caseNumber',
'app_update_date' => 'date',
'del_task_due_date' => 'dueDate',
'del_index' => 'delIndex',
'APP_UID' => 'caseId',
'APP_TITLE' => 'caseTitle',
'APP_NUMBER' => 'caseNumber',
'APP_UPDATE_DATE' => 'date',
'DEL_TASK_DUE_DATE' => 'dueDate',
'DEL_INDEX' => 'delIndex',
'currentUser' => array(
'usrcr_usr_uid' => 'userId',
'usrcr_usr_firstname' => 'firstName',
'usrcr_usr_lastname' => 'lastName',
'usrcr_usr_username' => 'fullName',
'USR_UID' => 'userId',
'USR_FIRSTNAME' => 'firstName',
'USR_LASTNAME' => 'lastName',
'USR_USERNAME' => 'fullName',
),
'prevUser' => array(
'previous_usr_uid' => 'userId',
'previous_usr_firstname' => 'firstName',
'previous_usr_lastname' => 'lastName',
'previous_usr_username' => 'fullName',
'PREVIOUS_USR_UID' => 'userId',
'PREVIOUS_USR_FIRSTNAME' => 'firstName',
'PREVIOUS_USR_LASTNAME' => 'lastName',
'PREVIOUS_USR_USERNAME' => 'fullName',
),
'process' => array(
'pro_uid' => 'processId',
'app_pro_title' => 'name'
'PRO_UID' => 'processId',
'APP_PRO_TITLE' => 'name'
),
'task' => array(
'tas_uid' => 'taskId',
'app_tas_title' => 'name'
'TAS_UID' => 'taskId',
'APP_TAS_TITLE' => 'name'
)
);
@@ -302,11 +309,14 @@ class Light extends Api
public function doGetCasesListPaused(
$start = 0,
$limit = 10,
$sort = 'APP_CACHE_VIEW.APP_NUMBER',
$sort = 'APP_PAUSED_DATE',
$dir = 'DESC',
$cat_uid = '',
$pro_uid = '',
$search = ''
$search = '',
$filter = '',
$date_from = '',
$date_to = ''
) {
try {
$dataList['userId'] = $this->getUserId();
@@ -320,8 +330,11 @@ class Light extends Api
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid;
$dataList['search'] = $search;
$oCases = new \ProcessMaker\BusinessModel\Cases();
$response = $oCases->getList($dataList);
$dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$lists = new \ProcessMaker\BusinessModel\Lists();
$response = $lists->getList('paused', $dataList);
$result = $this->parserDataParticipated($response['data']);
return $result;
} catch (\Exception $e) {
@@ -332,32 +345,31 @@ class Light extends Api
public function parserDataPaused ($data)
{
$structure = array(
//'app_uid' => 'mongoId',
'app_uid' => 'caseId',
'app_title' => 'caseTitle',
'app_number' => 'caseNumber',
'app_update_date' => 'date',
'del_task_due_date' => 'dueDate',
'del_index' => 'delIndex',
'APP_UID' => 'caseId',
'APP_TITLE' => 'caseTitle',
'APP_NUMBER' => 'caseNumber',
'APP_UPDATE_DATE' => 'date',
'DEL_TASK_DUE_DATE' => 'dueDate',
'DEL_INDEX' => 'delIndex',
'currentUser' => array(
'usrcr_usr_uid' => 'userId',
'usrcr_usr_firstname' => 'firstName',
'usrcr_usr_lastname' => 'lastName',
'usrcr_usr_username' => 'fullName',
'USR_UID' => 'userId',
'DEL_CURRENT_USR_FIRSTNAME' => 'firstName',
'DEL_CURRENT_USR_LASTNAME' => 'lastName',
'DEL_CURRENT_USR_USERNAME' => 'fullName',
),
'prevUser' => array(
'previous_usr_uid' => 'userId',
'previous_usr_firstname' => 'firstName',
'previous_usr_lastname' => 'lastName',
'previous_usr_username' => 'fullName',
'DEL_PREVIOUS_USR_UID' => 'userId',
'DEL_PREVIOUS_USR_FIRSTNAME' => 'firstName',
'DEL_PREVIOUS_USR_LASTNAME' => 'lastName',
'DEL_PREVIOUS_USR_USERNAME' => 'fullName',
),
'process' => array(
'pro_uid' => 'processId',
'app_pro_title' => 'name'
'PRO_UID' => 'processId',
'APP_PRO_TITLE' => 'name'
),
'task' => array(
'tas_uid' => 'taskId',
'app_tas_title' => 'name'
'TAS_UID' => 'taskId',
'APP_TAS_TITLE' => 'name'
)
);