fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in qronald/processmaker/PM-3502 (pull request #2845)

Browse Source 
PM-3502
This commit is contained in:
Julio Cesar Laura Avendaño
2015-09-30 02:32:02 -04:00
parent 759c570e6e 773e996d12
commit d678d70151
4 changed files with 97 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/model/ListInbox.php
View File

@@ -358,6 +358,8 @@ class ListInbox extends BaseListInbox
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ""; $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
$newestthan = isset($filters['newestthan'] ) ? $filters['newestthan'] : '';
$oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
if ($filter != '') { if ($filter != '') {
switch ($filter) { switch ($filter) {
@@ -414,6 +416,14 @@ class ListInbox extends BaseListInbox
$criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ); $criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
} }
if ($newestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
}
if ($oldestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
}
if ($filterStatus != '') { if ($filterStatus != '') {
switch ($filterStatus) { switch ($filterStatus) {
case 'ON_TIME': case 'ON_TIME':

10
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -204,6 +204,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ""; $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
$newestthan = isset($filters['newestthan'] ) ? $filters['newestthan'] : '';
$oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
if ($filter != '') { if ($filter != '') {
switch ($filter) { switch ($filter) {
@@ -263,6 +265,14 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->add( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ); $criteria->add( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
} }
if ($newestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
}
if ($oldestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
}
} }
public function countTotal ($usr_uid, $filters = array()) public function countTotal ($usr_uid, $filters = array())

3
workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
View File

@@ -46,6 +46,9 @@ class Lists {
$filters["action"] = isset( $dataList["action"] ) ? $dataList["action"] : ""; $filters["action"] = isset( $dataList["action"] ) ? $dataList["action"] : "";
$filters['newestthan'] = isset( $dataList['newestthan'] ) ? $dataList['newestthan'] : '';
$filters['oldestthan'] = isset( $dataList['oldestthan'] ) ? $dataList['oldestthan'] : '';
// Select list // Select list
switch ($listName) { switch ($listName) {
case 'inbox': case 'inbox':

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

@@ -85,7 +85,7 @@ class Light extends Api
public function doGetCasesListToDo( public function doGetCasesListToDo(
$start = 0, $start = 0,
$limit = 10, $limit = 10,
$sort = 'APP_UPDATE_DATE', $sort = 'DEL_DELEGATE_DATE',
$dir = 'DESC', $dir = 'DESC',
$cat_uid = '', $cat_uid = '',
$pro_uid = '', $pro_uid = '',
@@ -93,7 +93,9 @@ class Light extends Api
$filter = '', $filter = '',
$date_from = '', $date_from = '',
$date_to = '', $date_to = '',
$action = '' $action = '',
$newestthan = '',
$oldestthan =''
) { ) {
try { try {
$dataList['userId'] = $this->getUserId(); $dataList['userId'] = $this->getUserId();
@@ -102,7 +104,7 @@ class Light extends Api
$dataList['start'] = $start; $dataList['start'] = $start;
$dataList['limit'] = $limit; $dataList['limit'] = $limit;
$dataList['sort'] = $sort; $dataList['sort'] = $sort;
$dataList['dir'] = $dir; $dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['category'] = $cat_uid; $dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid; $dataList['process'] = $pro_uid;
$dataList['search'] = $search; $dataList['search'] = $search;
@@ -110,8 +112,14 @@ class Light extends Api
$dataList['dateFrom'] = $date_from; $dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to; $dataList['dateTo'] = $date_to;
$dataList['action'] = $action; $dataList['action'] = $action;
$dataList['newestthan'] = $newestthan;
$dataList['oldestthan'] = $oldestthan;
$lists = new \ProcessMaker\BusinessModel\Lists(); $lists = new \ProcessMaker\BusinessModel\Lists();
$response = $lists->getList('inbox', $dataList); $response = $lists->getList('inbox', $dataList);
if ($newestthan != '') {
$response['data'] = array_reverse($response['data']);
}
$result = $this->parserDataTodo($response['data']); $result = $this->parserDataTodo($response['data']);
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -128,6 +136,7 @@ class Light extends Api
'APP_UPDATE_DATE' => 'date', 'APP_UPDATE_DATE' => 'date',
'DEL_TASK_DUE_DATE' => 'dueDate', 'DEL_TASK_DUE_DATE' => 'dueDate',
'DEL_INDEX' => 'delIndex', 'DEL_INDEX' => 'delIndex',
'DEL_DELEGATE_DATE' => 'delegateDate',
'user' => array( 'user' => array(
'USR_UID' => 'userId' 'USR_UID' => 'userId'
), ),
@@ -161,11 +170,13 @@ class Light extends Api
public function doGetCasesListDraft( public function doGetCasesListDraft(
$start = 0, $start = 0,
$limit = 10, $limit = 10,
$sort = 'APP_CACHE_VIEW.APP_NUMBER', $sort = 'DEL_DELEGATE_DATE',
$dir = 'DESC', $dir = 'DESC',
$cat_uid = '', $cat_uid = '',
$pro_uid = '', $pro_uid = '',
$search = '' $search = '',
$newestthan = '',
$oldestthan =''
) { ) {
try { try {
$dataList['userId'] = $this->getUserId(); $dataList['userId'] = $this->getUserId();
@@ -175,13 +186,18 @@ class Light extends Api
$dataList['start'] = $start; $dataList['start'] = $start;
$dataList['limit'] = $limit; $dataList['limit'] = $limit;
$dataList['sort'] = $sort; $dataList['sort'] = $sort;
$dataList['dir'] = $dir; $dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['category'] = $cat_uid; $dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid; $dataList['process'] = $pro_uid;
$dataList['search'] = $search; $dataList['search'] = $search;
$dataList['newestthan'] = $newestthan;
$dataList['oldestthan'] = $oldestthan;
$oCases = new \ProcessMaker\BusinessModel\Cases(); $oCases = new \ProcessMaker\BusinessModel\Lists();
$response = $oCases->getList($dataList); $response = $oCases->getList('inbox', $dataList);
if ($newestthan != '') {
$response['data'] = array_reverse($response['data']);
}
$result = $this->parserDataDraft($response['data']); $result = $this->parserDataDraft($response['data']);
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -192,29 +208,30 @@ class Light extends Api
public function parserDataDraft ($data) public function parserDataDraft ($data)
{ {
$structure = array( $structure = array(
//'app_uid' => 'mongoId', 'APP_UID' => 'caseId',
'app_uid' => 'caseId', 'APP_TITLE' => 'caseTitle',
'app_title' => 'caseTitle', 'APP_NUMBER' => 'caseNumber',
'app_number' => 'caseNumber', 'APP_UPDATE_DATE' => 'date',
'app_update_date' => 'date', 'DEL_TASK_DUE_DATE' => 'dueDate',
'del_task_due_date' => 'dueDate', 'DEL_INDEX' => 'delIndex',
'del_index' => 'delIndex', 'DEL_DELEGATE_DATE' => 'delegateDate',
//'' => 'status'
'user' => array( 'user' => array(
'usrcr_usr_uid' => 'userId', 'USR_UID' => 'userId'
'usrcr_usr_firstname' => 'firstName', ),
'usrcr_usr_lastname' => 'lastName', 'prevUser' => array(
'usrcr_usr_username' => 'fullName', 'PREVIOUS_USR_UID' => 'userId',
'PREVIOUS_USR_FIRSTNAME' => 'firstName',
'PREVIOUS_USR_LASTNAME' => 'lastName',
'PREVIOUS_USR_USERNAME' => 'fullName',
), ),
'process' => array( 'process' => array(
'pro_uid' => 'processId', 'PRO_UID' => 'processId',
'app_pro_title' => 'name' 'APP_PRO_TITLE' => 'name'
), ),
'task' => array( 'task' => array(
'tas_uid' => 'taskId', 'TAS_UID' => 'taskId',
'app_tas_title' => 'name' 'APP_TAS_TITLE' => 'name'
), )
'inp_doc_uid' => 'documentUid' //Esta opcion es temporal
); );
$response = $this->replaceFields($data, $structure); $response = $this->replaceFields($data, $structure);
@@ -229,33 +246,45 @@ class Light extends Api
* @url GET /participated * @url GET /participated
*/ */
public function doGetCasesListParticipated( public function doGetCasesListParticipated(
$count = true,
$paged = true,
$start = 0, $start = 0,
$limit = 10, $limit = 10,
$sort = 'APP_UPDATE_DATE', $sort = 'DEL_DELEGATE_DATE',
$dir = 'DESC', $dir = 'DESC',
$cat_uid = '', $category = '',
$pro_uid = '', $process = '',
$search = '', $search = '',
$filter = '', $filter = '',
$date_from = '', $date_from = '',
$date_to = '' $date_to = '',
$newestthan = '',
$oldestthan =''
) { ) {
try { try {
$dataList['userId'] = $this->getUserId(); $dataList['userId'] = $this->getUserId();
$dataList['action'] = 'sent'; $dataList['paged'] = $paged;
$dataList['paged'] = true; $dataList['count'] = $count;
$dataList['start'] = $start; $dataList['start'] = $start;
$dataList['limit'] = $limit; $dataList['limit'] = $limit;
$dataList['sort'] = $sort; $dataList['sort'] = $sort;
$dataList['dir'] = $dir; $dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid; $dataList['category'] = $category;
$dataList['process'] = $process;
$dataList['search'] = $search; $dataList['search'] = $search;
$dataList['filter'] = $filter; $dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from; $dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to; $dataList['dateTo'] = $date_to;
$dataList['newestthan'] = $newestthan;
$dataList['oldestthan'] = $oldestthan;
$oCases = new \ProcessMaker\BusinessModel\Lists(); $oCases = new \ProcessMaker\BusinessModel\Lists();
$response = $oCases->getList('participated_last', $dataList); $response = $oCases->getList('participated_last', $dataList);
if ($newestthan != '') {
$response['data'] = array_reverse($response['data']);
}
$result = $this->parserDataParticipated($response['data']); $result = $this->parserDataParticipated($response['data']);
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -266,13 +295,13 @@ class Light extends Api
public function parserDataParticipated ($data) public function parserDataParticipated ($data)
{ {
$structure = array( $structure = array(
//'app_uid' => 'mongoId',
'APP_UID' => 'caseId', 'APP_UID' => 'caseId',
'APP_TITLE' => 'caseTitle', 'APP_TITLE' => 'caseTitle',
'APP_NUMBER' => 'caseNumber', 'APP_NUMBER' => 'caseNumber',
'APP_UPDATE_DATE' => 'date', 'APP_UPDATE_DATE' => 'date',
'DEL_TASK_DUE_DATE' => 'dueDate', 'DEL_TASK_DUE_DATE' => 'dueDate',
'DEL_INDEX' => 'delIndex', 'DEL_INDEX' => 'delIndex',
'DEL_DELEGATE_DATE' => 'delegateDate',
'currentUser' => array( 'currentUser' => array(
'USR_UID' => 'userId', 'USR_UID' => 'userId',
'USR_FIRSTNAME' => 'firstName', 'USR_FIRSTNAME' => 'firstName',
@@ -351,6 +380,7 @@ class Light extends Api
'APP_UPDATE_DATE' => 'date', 'APP_UPDATE_DATE' => 'date',
'DEL_TASK_DUE_DATE' => 'dueDate', 'DEL_TASK_DUE_DATE' => 'dueDate',
'DEL_INDEX' => 'delIndex', 'DEL_INDEX' => 'delIndex',
'DEL_DELEGATE_DATE' => 'delegateDate',
'currentUser' => array( 'currentUser' => array(
'USR_UID' => 'userId', 'USR_UID' => 'userId',
'DEL_CURRENT_USR_FIRSTNAME' => 'firstName', 'DEL_CURRENT_USR_FIRSTNAME' => 'firstName',
@@ -391,7 +421,9 @@ class Light extends Api
$dir = 'DESC', $dir = 'DESC',
$cat_uid = '', $cat_uid = '',
$pro_uid = '', $pro_uid = '',
$search = '' $search = '',
$newestthan = '',
$oldestthan =''
) { ) {
try { try {
$dataList['userId'] = $this->getUserId(); $dataList['userId'] = $this->getUserId();
@@ -401,10 +433,12 @@ class Light extends Api
$dataList['start'] = $start; $dataList['start'] = $start;
$dataList['limit'] = $limit; $dataList['limit'] = $limit;
$dataList['sort'] = $sort; $dataList['sort'] = $sort;
$dataList['dir'] = $dir; $dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['category'] = $cat_uid; $dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid; $dataList['process'] = $pro_uid;
$dataList['search'] = $search; $dataList['search'] = $search;
$dataList['newestthan'] = $newestthan;
$dataList['oldestthan'] = $oldestthan;
$oCases = new \ProcessMaker\BusinessModel\Cases(); $oCases = new \ProcessMaker\BusinessModel\Cases();
$response = $oCases->getList($dataList); $response = $oCases->getList($dataList);
$result = $this->parserDataUnassigned($response); $result = $this->parserDataUnassigned($response);
@@ -417,13 +451,13 @@ class Light extends Api
public function parserDataUnassigned ($data) public function parserDataUnassigned ($data)
{ {
$structure = array( $structure = array(
//'app_uid' => 'mongoId',
'app_uid' => 'caseId', 'app_uid' => 'caseId',
'app_title' => 'caseTitle', 'app_title' => 'caseTitle',
'app_number' => 'caseNumber', 'app_number' => 'caseNumber',
'app_update_date' => 'date', 'app_update_date' => 'date',
'del_task_due_date' => 'dueDate', 'del_task_due_date' => 'dueDate',
'del_index' => 'delIndex', 'del_index' => 'delIndex',
'del_delegate_date' => 'delegateDate',
'currentUser' => array( 'currentUser' => array(
'usrcr_usr_uid' => 'userId', 'usrcr_usr_uid' => 'userId',
'usrcr_usr_firstname' => 'firstName', 'usrcr_usr_firstname' => 'firstName',