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

update

Browse Source
This commit is contained in:
Paula Quispe
2017-02-09 19:12:40 -04:00
parent 7514535098
commit f26610e18b
4 changed files with 42 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,51 +403,17 @@ class ListInbox extends BaseListInbox
$criteria->addJoinMC($aConditions, Criteria::INNER_JOIN); $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
} }
if ($dateFrom != "") { switch ($filterStatus) {
if ($dateTo != "") { case 'ON_TIME':
if ($dateFrom == $dateTo) { $criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
$dateSame = $dateFrom; break;
$dateFrom = $dateSame . " 00:00:00"; case 'AT_RISK':
$dateTo = $dateSame . " 23:59:59"; $criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
} else { $criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) > 0", Criteria::CUSTOM);
$dateFrom = $dateFrom . " 00:00:00"; break;
$dateTo = $dateTo . " 23:59:59"; case 'OVERDUE':
} $criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
break;
$criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
addAnd( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
} else {
$dateFrom = $dateFrom . " 00:00:00";
$criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
}
} elseif ($dateTo != "") {
$dateTo = $dateTo . " 23:59:59";
$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 != '') {
switch ($filterStatus) {
case 'ON_TIME':
$criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
break;
case 'AT_RISK':
$criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
$criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) > 0", Criteria::CUSTOM);
break;
case 'OVERDUE':
$criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
break;
}
} }
} }

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

@@ -209,11 +209,11 @@ class ListParticipatedLast extends BaseListParticipatedLast
$oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : ''; $oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
switch ($filter) { switch ($filter) {
case 'read': case 'started':
$criteria->add( ListParticipatedLastPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL ); $criteria->add(ListParticipatedLastPeer::DEL_INDEX, 1, Criteria::EQUAL);
break; break;
case 'unread': case 'completed':
$criteria->add( ListParticipatedLastPeer::DEL_INIT_DATE, null, Criteria::ISNULL ); $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
break; break;
} }
@@ -226,8 +226,17 @@ class ListParticipatedLast extends BaseListParticipatedLast
)))); ))));
} }
if($filterStatus != ''){ switch ($filterStatus) {
$criteria->add(ListParticipatedLastPeer::APP_STATUS, '%' . $filterStatus . '%', Criteria::LIKE ); case 'ON_TIME':
$criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
break;
case 'AT_RISK':
$criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
$criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) > 0", Criteria::CUSTOM);
break;
case 'OVERDUE':
$criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
break;
} }
if ($process != '') { if ($process != '') {
@@ -242,22 +251,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
$aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'"); $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
$criteria->addJoinMC($aConditions, Criteria::INNER_JOIN); $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
} }
if (!empty($dateFrom)) {
$criteria->add(ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
}
if (!empty($dateTo)) {
$dateTo = $dateTo . " 23:59:59";
$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 loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '') public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '')

24
workflow/engine/methods/cases/proxyNewCasesList.php
View File

@@ -190,21 +190,21 @@ try {
); );
$filtersData = array(); $filtersData = array();
$filtersData['start'] = $filters['start']; $filtersData['start'] = $filters['start'];
$filtersData['limit'] = $filters['limit']; $filtersData['limit'] = $filters['limit'];
$filtersData['sort'] = G::toLower($filters['sort']); $filtersData['sort'] = G::toLower($filters['sort']);
$filtersData['dir'] = G::toLower($filters['dir']); $filtersData['dir'] = G::toLower($filters['dir']);
$filtersData['cat_uid'] = $filters['category']; $filtersData['cat_uid'] = $filters['category'];
$filtersData['pro_uid'] = $filters['process']; $filtersData['pro_uid'] = $filters['process'];
$filtersData['search'] = $filters['search']; $filtersData['search'] = $filters['search'];
$filtersData['date_from'] = $filters['dateFrom']; $filtersData['date_from'] = $filters['dateFrom'];
$filtersData['date_to'] = $filters['dateTo']; $filtersData['date_to'] = $filters['dateTo'];
$filtersData["action"] = $filters["action"]; $filtersData["action"] = $filters["action"];
$filtersData["filterStatus"] = $filters['filterStatus']; $filtersData["filterStatus"] = $filters['filterStatus'];
$response = array(); $response = array();
$response['filters'] = $filtersData; $response['filters'] = $filtersData;
$response['totalCount'] = $list->countTotal($userUid, $filtersData); $response['totalCount'] = $list->getCountList($userUid, $filtersData);
$response = $filter->xssFilterHard($response); $response = $filter->xssFilterHard($response);

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

@@ -201,7 +201,7 @@ class Lists {
} }
if ($total) { if ($total) {
$total = $list->countTotal($userUid, $filters); $total = $list->getCountList($userUid, $filters);
return $total; return $total;
} }
@@ -249,7 +249,7 @@ class Lists {
$response['filters'] = $filtersData; $response['filters'] = $filtersData;
$response['data'] = $result; $response['data'] = $result;
$filtersData['action'] = $filters["action"]; $filtersData['action'] = $filters["action"];
$response['totalCount'] = $list->countTotal($userUid, $filtersData); $response['totalCount'] = $list->getCountList($userUid, $filtersData);
} else { } else {
$response = $result; $response = $result;
} }
@@ -267,8 +267,8 @@ class Lists {
$response = array(); $response = array();
foreach ($list as $listObject => $item) { foreach ($list as $listObject => $item) {
switch ($listObject) { switch ($listObject) {
case 'ListInbox': case 'ListDraft':
$total = $this->$listObject->getCountList($userId, 'TO_DO'); $total = $this->$listObject->getCountList($userId, array('action'=>'draft'));
array_push($response, (array('count' => $total, 'item' => $item))); array_push($response, (array('count' => $total, 'item' => $item)));
break; break;
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/