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

HOR-2780

Browse Source
This commit is contained in:
Paula Quispe
2017-02-23 18:01:40 -04:00
parent bb7ee02339
commit eafb55de87
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ class Applications
$con = Propel::getConnection(AppDelegationPeer::DATABASE_NAME); $con = Propel::getConnection(AppDelegationPeer::DATABASE_NAME);
$con->begin(); $con->begin();
$sqlCount = "SELECT STRAIGHT_JOIN COUNT(*) AS TOTAL FROM APP_DELEGATION";
$sql = "SELECT $sql = "SELECT
STRAIGHT_JOIN APPLICATION.APP_NUMBER, STRAIGHT_JOIN APPLICATION.APP_NUMBER,
APPLICATION.APP_UID, APPLICATION.APP_UID,
@@ -55,11 +54,11 @@ class Applications
PROCESS.PRO_TITLE AS APP_PRO_TITLE PROCESS.PRO_TITLE AS APP_PRO_TITLE
FROM APP_DELEGATION FROM APP_DELEGATION
"; ";
$sqlCount = "SELECT STRAIGHT_JOIN COUNT(*) AS TOTAL FROM APP_DELEGATION";
$sqlJoin = " LEFT JOIN APPLICATION ON (APP_DELEGATION.APP_NUMBER=APPLICATION.APP_NUMBER)";
$sqlCount.= " LEFT JOIN TASK ON (APP_DELEGATION.TAS_ID=TASK.TAS_ID)"; $sqlCount.= " LEFT JOIN TASK ON (APP_DELEGATION.TAS_ID=TASK.TAS_ID)";
if (in_array($status, array(1, 2, 3, 4)) || !empty($search)) { $sqlJoin = " LEFT JOIN APPLICATION ON (APP_DELEGATION.APP_NUMBER=APPLICATION.APP_NUMBER)";
if (in_array($status, array(1, 2, 3, 4)) || !empty($search) || empty($status)) {
$sqlCount .= $sqlJoin; $sqlCount .= $sqlJoin;
} }
@@ -86,7 +85,6 @@ class Applications
$sqlWhere .= " AND APPLICATION.APP_STATUS = 'TO_DO'"; $sqlWhere .= " AND APPLICATION.APP_STATUS = 'TO_DO'";
break; break;
default: //All status default: //All status
$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 .= " 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)) "; $sqlWhere .= " OR (APPLICATION.APP_STATUS_ID IN (3,4) AND APP_DELEGATION.DEL_LAST_INDEX = 1)) ";
break; break;