fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into enable-rest-api-from-plugins

Browse Source
This commit is contained in:
erik
2015-04-29 15:43:44 -05:00
parent c9a92b499c 2e23d17e0a
commit decbedd451
44 changed files with 782 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/classes/model/AppDelegation.php
View File

@@ -133,7 +133,7 @@ class AppDelegation extends BaseAppDelegation
//The function return an array now. By JHL
$delTaskDueDate = $this->calculateDueDate($sNextTasParam);
$delRiskDate = $this->calculateRiskDate($delTaskDueDate, $this->getRisk());
$delRiskDate = $this->calculateRiskDate($sNextTasParam, $this->getRisk());
//$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted
$this->setDelTaskDueDate($delTaskDueDate);
@@ -379,8 +379,18 @@ class AppDelegation extends BaseAppDelegation
public function calculateRiskDate($dueDate, $risk)
{
try {
$riskTime = strtotime($dueDate) - strtotime($this->getDelDelegateDate()); //Seconds
$riskTime = $riskTime - ($riskTime * $risk);
$data = array();
if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
$data['TAS_DURATION'] = $sNextTasParam['NEXT_TASK']['TAS_DURATION'];
$data['TAS_TIMEUNIT'] = $sNextTasParam['NEXT_TASK']['TAS_TIMEUNIT'];
} else {
$task = TaskPeer::retrieveByPK( $this->getTasUid() );
$data['TAS_DURATION'] = $task->getTasDuration();
$data['TAS_TIMEUNIT'] = $task->getTasTimeUnit();
}
$riskTime = $data['TAS_DURATION'] - ($data['TAS_DURATION'] * $risk);
//Calendar - Use the dates class to calculate dates
$calendar = new calendar();
@@ -394,9 +404,8 @@ class AppDelegation extends BaseAppDelegation
}
//Risk date
$riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime / (60 * 60)), "HOURS", $arrayCalendarData);
$riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime), $data['TAS_TIMEUNIT'], $arrayCalendarData);
//Return
return $riskDate;
} catch (Exception $e) {
throw $e;

36
workflow/engine/classes/model/DashboardDasInd.php
View File

@@ -108,10 +108,40 @@ class DashboardDasInd extends BaseDashboardDasInd
}
}
public function getOwnerByDashboard ($dasUid)
public function loadOwnerByUserId ($usrId)
{
}
try {
$criteria = new Criteria('workflow');
$criteria->add(DashboardDasIndPeer::OWNER_UID, $usrId);
$criteria->add(DashboardDasIndPeer::OWNER_TYPE, "USER");
$dataset = DashboardDasIndPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$fields = array();
while ($dataset->next()) {
$auxField = $dataset->getRow();
$fields[] = $auxField;
}
$criteria = new Criteria('workflow');
$criteria->add(DashboardDasIndPeer::OWNER_TYPE, "GROUP");
$criteria->add(GroupUserPeer::USR_UID, $usrId);
$criteria->addJoin(GroupUserPeer::GRP_UID, DashboardDasIndPeer::OWNER_UID);
$dataset = DashboardDasIndPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($dataset->next()) {
$auxField = $dataset->getRow();
$fields[] = $auxField;
}
return $fields;
} catch (Exception $error) {
throw $error;
}
}
}

31
workflow/engine/classes/model/ListCompleted.php
View File

@@ -25,6 +25,15 @@ class ListCompleted extends BaseListCompleted
*/
public function create($data)
{
$criteria = new Criteria();
$criteria->addSelectColumn(ListCompletedPeer::APP_UID);
$criteria->add( ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ListCompletedPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($dataset->next()) {
return 1;
}
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
@@ -97,9 +106,27 @@ class ListCompleted extends BaseListCompleted
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'completed');
if ($data['DEL_PREVIOUS'] != 0) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
$criteria = new Criteria();
$criteria->addSelectColumn(TaskPeer::TAS_TYPE);
$criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
$dataset = TaskPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
if ($aRow['TAS_TYPE'] != 'SUBPROCESS') {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
}
} else {
$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
$criteria = new Criteria();
$criteria->addSelectColumn(SubApplicationPeer::APP_UID);
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = SubApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($dataset->next()) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
} else {
$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
}
}
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );