From 36c361c5570968111991817b5dc2c5887ca409dd Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Thu, 16 Apr 2015 12:25:15 -0400 Subject: [PATCH 1/4] PM-2333 Al adicionar una activity ya creado a un lane duplica el mismo --- .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 902e075e8..0235e922c 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -1384,10 +1384,6 @@ class BpmnWorkflow extends Project\Bpmn $activity = $bwp->getActivity($activityData["ACT_UID"]); - if ($activity["BOU_CONTAINER"] != $activityData["BOU_CONTAINER"]) { - $activity = null; - } - if ($forceInsert || is_null($activity)) { if ($generateUid) { //Generate and update UID From 6de4559f1dc034f437bd00ee531f7d2860771aad Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Thu, 16 Apr 2015 16:04:16 -0400 Subject: [PATCH 2/4] PM-2320 "Fix: Add DEL_RISK_DATE field in tables Delegation..." SOLVED Issue: El nuevo campo DEL_RISK_DATE no refleja la fecha correcta Cause: No se tiene de manera completa la formula para el calculo de la fecha Solution: Se a completado la formula --- .../engine/classes/model/AppDelegation.php | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index caf32c9cc..388d48542 100755 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -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; From 4af53d2768d91ad989dc588cdb7e24a0f0f30c33 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Fri, 17 Apr 2015 10:04:59 -0400 Subject: [PATCH 3/4] PM-2112 "Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets.." SOLVED Issue: Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets the HTTP status to 200 (OK) when error Cause: Al obtener un "access token" con informacion erronea, no se define correctamente el response de error Solution: Se revierte el 1er cambio y se aplica un "exit(0);", ya que el status code se sobre escribia --- .../src/ProcessMaker/Services/OAuth2/Server.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php index 9c74bd208..72f288b38 100644 --- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php +++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php @@ -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); } } From 4629ff8add1fa7ce38d8726f6a923948ba2ecd89 Mon Sep 17 00:00:00 2001 From: jennylee Date: Fri, 17 Apr 2015 10:48:39 -0400 Subject: [PATCH 4/4] Fixing a merge error --- workflow/engine/classes/class.calendar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php index 7ec30c177..48f50b77f 100755 --- a/workflow/engine/classes/class.calendar.php +++ b/workflow/engine/classes/class.calendar.php @@ -414,7 +414,7 @@ class calendar extends CalendarDefinition $hoursDuration -= (float)($secondRes/3600); //$dataLog[] = (float)($secondRes/3600); } else { - $newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate))); + $newDate = date("Y-m-d H:i:s", strtotime("+" . round(((float)($hoursDuration)) * 3600) . " seconds", strtotime($newDate))); //$dataLog[] = (float)($hoursDuration); $hoursDuration = 0; }