fernando/luos
1
0
Fork 0
Code Releases Activity

I solved all issues about List

Browse Source
This commit is contained in:
Paula V. Quispe
2015-02-27 16:27:11 -04:00
parent 53cd8c5409
commit ea92abf6a0
20 changed files with 5001 additions and 4769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,17 @@ class Lists {
$filters['count'] = isset( $dataList['count'] ) ? $dataList['count'] : true;
$filters["category"] = isset( $dataList["category"] ) ? $dataList["category"] : "";
if(empty($filters["category"]) && isset($_GET['category'])){
$filters["category"] = $_GET['category'];
}
$filters["process"] = isset( $dataList["process"] ) ? $dataList["process"] : "";
if(empty($filters["process"]) && isset($_GET['process'])){
$filters["process"] = $_GET['process'];
}
$filters["search"] = isset( $dataList["search"] ) ? $dataList["search"] : "";
if(empty($filters["search"]) && isset($_GET['search'])){
$filters["category"] = $_GET['search'];
}
$filters["filter"] = isset( $dataList["filter"] ) ? $dataList["filter"] : "";
$filters["dateFrom"] = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : "";
$filters["dateTo"] = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : "";
@@ -86,8 +95,9 @@ class Lists {
// Validate filters
$filters["start"] = (int)$filters["start"];
$filters["start"] = abs($filters["start"]);
error_log($filters["start"]);
if ($filters["start"] != 0) {
$filters["start"]--;
$filters["start"]+1;
}
$filters["limit"] = (int)$filters["limit"];
@@ -162,11 +172,10 @@ class Lists {
//$value = array_change_key_case($value, CASE_LOWER);
}
}
$response = array();
if ($filters["paged"]) {
$filtersData = array();
$filtersData['start'] = $filters["start"]+1;
$filtersData['start'] = $filters["start"];
$filtersData['limit'] = $filters["limit"];
$filtersData['sort'] = G::toLower($filters["sort"]);
$filtersData['dir'] = G::toLower($filters["dir"]);
@@ -177,11 +186,10 @@ class Lists {
$filtersData['date_to'] = $filters["dateTo"];
$response['filters'] = $filtersData;
$response['data'] = $result;
$response['totalCount'] = $list->countTotal($userUid, $filters);
$response['totalCount'] = $list->countTotal($userUid, $filtersData);
} else {
$response = $result;
}
return $response;
}
}