fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into PM-2313

Browse Source
This commit is contained in:
dheeyi
2015-04-17 10:47:51 -04:00
parent 3d4723e5aa e8de49fe69
commit a5897ecfa2
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,17 +356,18 @@ class AppDelegation extends BaseAppDelegation
$aCalendarUID = '';
}
//use the dates class to calculate dates
//Calendar - Use the dates class to calculate dates
$calendar = new calendar();
$arrayCalendarData = array();
if ($calendar->pmCalendarUid == "") {
$calendar->getCalendar(null, $task->getProUid(), $this->getTasUid());
$calendar->getCalendar(null, $this->getProUid(), $this->getTasUid());
$arrayCalendarData = $calendar->getCalendarData();
}
//Due date
/*$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'] //hours or days, ( we only accept this two types or maybe weeks
);*/
$dueDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $aData["TAS_DURATION"], $aData["TAS_TIMEUNIT"], $arrayCalendarData);
@@ -378,10 +379,22 @@ class AppDelegation extends BaseAppDelegation
public function calculateRiskDate($dueDate, $risk)
{
try {
$numDueDate = strtotime($dueDate); //Seconds
$numDueDate = $numDueDate - ($numDueDate * $risk);
$riskTime = strtotime($dueDate) - strtotime($this->getDelDelegateDate()); //Seconds
$riskTime = $riskTime - ($riskTime * $risk);
$riskDate = date("Y-m-d H:i:s", round($numDueDate));
//Calendar - Use the dates class to calculate dates
$calendar = new calendar();
$arrayCalendarData = array();
if ($calendar->pmCalendarUid == "") {
$calendar->getCalendar(null, $this->getProUid(), $this->getTasUid());
$arrayCalendarData = $calendar->getCalendarData();
}
//Risk date
$riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime / (60 * 60)), "HOURS", $arrayCalendarData);
//Return
return $riskDate;

12
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -309,17 +309,9 @@ class Server implements iAuthenticate
if ($returnResponse) {
return $response;
} else {
if ($response->getStatusCode() == 400) {
$msg = $response->getParameter("error_description", "");
$msg = ($msg != "")? $msg : $response->getParameter("error", "");
$response->send();
$rest = new \Maveriks\Extension\Restler();
$rest->setMessage(new \Luracast\Restler\RestException(\ProcessMaker\Services\Api::STAT_APP_EXCEPTION, $msg));
exit(0);
} else {
$response->send();
}
exit(0);
}
}