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

Filter all status

Browse Source
This commit is contained in:
Paula Quispe
2017-02-15 18:05:47 -04:00
parent c8e076e325
commit c906642651
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,9 @@ class Applications
$sqlWhere .= " AND APPLICATION.APP_STATUS = 'TO_DO'"; $sqlWhere .= " AND APPLICATION.APP_STATUS = 'TO_DO'";
break; break;
default: //All status default: //All status
$sqlWhere .= " AND APP_DELEGATION.DEL_LAST_INDEX = 1"; $sqlCount.= " LEFT JOIN APPLICATION ON (APP_DELEGATION.APP_NUMBER=APPLICATION.APP_NUMBER)";
$sqlWhere .= " AND ((APPLICATION.APP_STATUS_ID IN (1,2) AND APP_DELEGATION.DEL_THREAD_STATUS='OPEN') ";
$sqlWhere .= " OR (APPLICATION.APP_STATUS_ID IN (3,4) AND APP_DELEGATION.DEL_LAST_INDEX = 1)) ";
break; break;
} }
$sqlJoin .= $sqlJoinUser = " LEFT JOIN USERS ON (APP_DELEGATION.USR_ID=USERS.USR_ID)"; $sqlJoin .= $sqlJoinUser = " LEFT JOIN USERS ON (APP_DELEGATION.USR_ID=USERS.USR_ID)";
@@ -106,7 +108,7 @@ class Applications
$sqlCount = $sqlCount . $sqlJoinPro; $sqlCount = $sqlCount . $sqlJoinPro;
} }
if (!empty($search)) { if (!empty($search)) {
//APP_NUMBER APP_TAS_TITLE APP_TITLE //In the filter search we check in the following columns: APP_NUMBER APP_TAS_TITLE APP_TITLE
$sqlWhere .= " AND (APPLICATION.APP_TITLE LIKE '%{$search}%' OR APPLICATION.APP_NUMBER LIKE '%{$search}%' OR TASK.TAS_TITLE LIKE '%{$search}%')"; $sqlWhere .= " AND (APPLICATION.APP_TITLE LIKE '%{$search}%' OR APPLICATION.APP_NUMBER LIKE '%{$search}%' OR TASK.TAS_TITLE LIKE '%{$search}%')";
} }
if (!empty($dateFrom)) { if (!empty($dateFrom)) {