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

Merged in mcuiza/processmaker/PM-3409 (pull request #2721)

Browse Source 
PM-3409
This commit is contained in:
Julio Cesar Laura Avendaño
2015-09-04 12:07:23 -04:00
parent a924ea94ba 7ef285aa28
commit fd936836a8
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,6 +120,9 @@ class ListInbox extends BaseListInbox
$users = new Users(); $users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'participated'); $users->refreshTotal($data['USR_UID'], 'add', 'participated');
} }
$data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
$con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
try { try {
$con->begin(); $con->begin();
@@ -249,6 +252,9 @@ class ListInbox extends BaseListInbox
$data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; $data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
$data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
$data['APP_PREVIOUS_USER'] = ''; $data['APP_PREVIOUS_USER'] = '';
if ($data['DEL_PREVIOUS_USR_UID'] != '') { if ($data['DEL_PREVIOUS_USR_UID'] != '') {
$criteria = new Criteria(); $criteria = new Criteria();
@@ -474,5 +480,27 @@ class ListInbox extends BaseListInbox
} }
return $data; return $data;
} }
public function getTaskPriority($taskUid, $proUid, $appUid)
{
$criteria = new Criteria();
$criteria->addSelectColumn(TaskPeer::TAS_PRIORITY_VARIABLE);
$criteria->add( TaskPeer::TAS_UID, $taskUid, Criteria::EQUAL );
$criteria->add( TaskPeer::PRO_UID, $proUid, Criteria::EQUAL );
$dataset = TaskPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$priority = $aRow['TAS_PRIORITY_VARIABLE'];
if(strlen($priority)>2){
$oCase = new Cases();
$aData = $oCase->loadCase( $appUid );
$priorityLabel = substr($priority, 2,strlen($priority));
if (isset( $aData['APP_DATA'][$priorityLabel] )) {
$priority = $aData['APP_DATA'][$priorityLabel];
}
}
return $priority != "" ? $priority : 3;
}
} }