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

HOR-359-A-3018 "List of cases UnAssigned is getting a inverse..." SOLVED

Browse Source 
HOR-359-A "List of cases UnAssigned is getting a inverse..." SOLVED

HOR-359-A "List of cases UnAssigned is getting a inverse..." SOLVED
This commit is contained in:
Luis Fernando Saisa Lopez
2016-03-08 14:48:37 -04:00
parent 1cbc999ac6
commit 6ff92539b7
3 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
workflow/engine/classes/class.applications.php
View File

@@ -18,7 +18,9 @@ class Applications
$sort = "APP_CACHE_VIEW.APP_NUMBER",
$category = null,
$configuration = true,
$paged = true
$paged = true,
$newerThan = '',
$oldestThan = ''
) {
$callback = isset($callback)? $callback : "stcCallback1001";
$dir = isset($dir)? $dir : "DESC";
@@ -301,7 +303,7 @@ class Applications
}
$Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
$CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
$CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
} else {
$dateFrom = $dateFrom . " 00:00:00";
@@ -315,6 +317,27 @@ class Applications
$CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
}
if ($newerThan != '') {
if ($oldestThan != '') {
$Criteria->add(
$Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN)->addAnd(
$Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN))
);
$CriteriaCount->add(
$CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN)->addAnd(
$CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN))
);
} else {
$Criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN);
$CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN);
}
} else {
if ($oldestThan != '') {
$Criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN);
$CriteriaCount->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN);
}
}
//add the filter
if ($filter != '') {
switch ($filter) {

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

@@ -157,6 +157,8 @@ class Cases
$type = "extjs";
$dateFrom = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : "";
$dateTo = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : "";
$newerThan = (!empty($dataList['newerThan']))? $dataList['newerThan'] : '';
$oldestThan = (!empty($dataList['oldestthan']))? $dataList['oldestthan'] : '';
$first = isset( $dataList["first"] ) ? true :false;
$u = new \ProcessMaker\BusinessModel\User();
@@ -198,7 +200,7 @@ class Cases
}
$dir = G::toUpper($dir);
if (!($dir == 'DESC' || $dir == 'ASC')) {
$dir = 'DESC';
$dir = 'ASC';
}
if ($process != '') {
Validator::proUid($process, '$pro_uid');
@@ -290,7 +292,9 @@ class Cases
(strpos($sort, ".") !== false)? $sort : "APP_CACHE_VIEW." . $sort,
$category,
true,
$paged
$paged,
$newerThan,
$oldestThan
);
}
if (!empty($result['data'])) {

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

@@ -20,7 +20,7 @@ class Light extends Api
private $arrayFieldIso8601 = [
// request lists
'newestthan',
'newerThan',
'oldestthan',
//return lists
'date',
@@ -132,7 +132,7 @@ class Light extends Api
$filter = '',
$date_from = '',
$date_to = '',
$newestthan = '',
$newerThan = '',
$oldestthan =''
) {
try {
@@ -142,15 +142,15 @@ class Light extends Api
$dataList['start'] = $start;
$dataList['limit'] = $limit;
$dataList['sort'] = $sort;
$dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['dir'] = $dir;
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid;
$dataList['search'] = $search;
$dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$dataList['newestthan'] = $newestthan;
$dataList['oldestthan'] = $oldestthan;
$dataList['newerThan'] = $newerThan;
$dataList['oldestthan'] = $oldestthan;
Validator::throwExceptionIfDataNotMetIso8601Format($dataList, $this->arrayFieldIso8601);
$dataList = DateTime::convertDataToUtc($dataList, $this->arrayFieldIso8601);
@@ -169,7 +169,7 @@ class Light extends Api
}
/*----------------------------------********---------------------------------*/
if ($newestthan != '') {
if ($newerThan != '') {
$response['data'] = array_reverse($response['data']);
}
$result = $this->parserDataTodo($response['data']);
@@ -227,7 +227,7 @@ class Light extends Api
$cat_uid = '',
$pro_uid = '',
$search = '',
$newestthan = '',
$newerThan = '',
$oldestthan =''
) {
try {
@@ -238,12 +238,12 @@ class Light extends Api
$dataList['start'] = $start;
$dataList['limit'] = $limit;
$dataList['sort'] = $sort;
$dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['dir'] = $dir;
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid;
$dataList['search'] = $search;
$dataList['newestthan'] = $newestthan;
$dataList['oldestthan'] = $oldestthan;
$dataList['newerThan'] = $newerThan;
$dataList['oldestthan'] = $oldestthan;
Validator::throwExceptionIfDataNotMetIso8601Format($dataList, $this->arrayFieldIso8601);
$dataList = DateTime::convertDataToUtc($dataList, $this->arrayFieldIso8601);
@@ -262,7 +262,7 @@ class Light extends Api
}
/*----------------------------------********---------------------------------*/
if ($newestthan != '') {
if ($newerThan != '') {
$response['data'] = array_reverse($response['data']);
}
$result = $this->parserDataDraft($response['data']);
@@ -325,7 +325,7 @@ class Light extends Api
$filter = '',
$date_from = '',
$date_to = '',
$newestthan = '',
$newerThan = '',
$oldestthan =''
) {
try {
@@ -337,7 +337,7 @@ class Light extends Api
$dataList['start'] = $start;
$dataList['limit'] = $limit;
$dataList['sort'] = $sort;
$dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['dir'] = $dir;
$dataList['category'] = $category;
$dataList['process'] = $process;
@@ -345,7 +345,7 @@ class Light extends Api
$dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$dataList['newestthan'] = $newestthan;
$dataList['newerThan'] = $newerThan;
$dataList['oldestthan'] = $oldestthan;
Validator::throwExceptionIfDataNotMetIso8601Format($dataList, $this->arrayFieldIso8601);
@@ -365,7 +365,7 @@ class Light extends Api
}
/*----------------------------------********---------------------------------*/
if ($newestthan != '') {
if ($newerThan != '') {
$response['data'] = array_reverse($response['data']);
}
$result = $this->parserDataParticipated($response['data']);
@@ -428,7 +428,9 @@ class Light extends Api
$search = '',
$filter = '',
$date_from = '',
$date_to = ''
$date_to = '',
$newerThan = '',
$oldestthan = ''
) {
try {
$dataList['userId'] = $this->getUserId();
@@ -445,6 +447,8 @@ class Light extends Api
$dataList['filter'] = $filter;
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$dataList['newerThan'] = $newerThan;
$dataList['oldestthan'] = $oldestthan;
/*----------------------------------********---------------------------------*/
if (true) {
@@ -518,7 +522,7 @@ class Light extends Api
$cat_uid = '',
$pro_uid = '',
$search = '',
$newestthan = '',
$newerThan = '',
$oldestthan =''
) {
try {
@@ -529,11 +533,11 @@ class Light extends Api
$dataList['start'] = $start;
$dataList['limit'] = $limit;
$dataList['sort'] = $sort;
$dataList['dir'] = ($newestthan != '') ? 'ASC':$dir;
$dataList['dir'] = $dir;
$dataList['category'] = $cat_uid;
$dataList['process'] = $pro_uid;
$dataList['search'] = $search;
$dataList['newestthan'] = $newestthan;
$dataList['newerThan'] = $newerThan;
$dataList['oldestthan'] = $oldestthan;
Validator::throwExceptionIfDataNotMetIso8601Format($dataList, $this->arrayFieldIso8601);
$dataList = DateTime::convertDataToUtc($dataList, $this->arrayFieldIso8601);