PM-2576 "Support for Timer-Event (End-points and Backend)"
- Se han implementado los siguientes End-points:
GET /api/1.0/{workspace}/project/{prj_uid}/timer-events
GET /api/1.0/{workspace}/project/{prj_uid}/timer-event/{tmrevn_uid}
GET /api/1.0/{workspace}/project/{prj_uid}/timer-event/event/{evn_uid}
POST /api/1.0/{workspace}/project/{prj_uid}/timer-event
PUT /api/1.0/{workspace}/project/{prj_uid}/timer-event/{tmrevn_uid}
DELETE /api/1.0/{workspace}/project/{prj_uid}/timer-event/{tmrevn_uid}
- Se han implementado la funcionalidad y los metodos necesarios para este nuevo elemento
en el modulo "BPMN-DESIGNER Backend"
- Se han agregado las validaciones necesarias para filtrar los nuevos tipos de tasks en el
listado del "New case"
- Se han agregado los metodos necesarios para este nuevo elemento en los modulos Export and Import
- Se han agregado los metodos necesarios para este nuevo elemento en el modulo "Delete process"
- Se a implementado la funcionalidad para este nuevo elemento en el modulo "Running case"
This commit is contained in:
@@ -855,7 +855,17 @@ class Workflow extends Handler
|
||||
|
||||
$messageEventDefinition->delete($row["MSGED_UID"]);
|
||||
}
|
||||
|
||||
|
||||
//Delete Script-Task
|
||||
$scriptTask = new \ProcessMaker\BusinessModel\ScriptTask();
|
||||
|
||||
$scriptTask->deleteWhere(array(\ScriptTaskPeer::PRJ_UID => array($sProcessUID, \Criteria::EQUAL)));
|
||||
|
||||
//Delete Timer-Event
|
||||
$timerEvent = new \ProcessMaker\BusinessModel\TimerEvent();
|
||||
|
||||
$timerEvent->deleteWhere(array(\TimerEventPeer::PRJ_UID => array($sProcessUID, \Criteria::EQUAL)));
|
||||
|
||||
//Delete Email-Event
|
||||
$emailEvent = new \ProcessMaker\BusinessModel\EmailEvent();
|
||||
$criteria = new \Criteria("workflow");
|
||||
@@ -868,7 +878,7 @@ class Workflow extends Handler
|
||||
$row = $rsCriteria->getRow();
|
||||
$emailEvent->delete($sProcessUID,$row["EMAIL_EVENT_UID"],false);
|
||||
}
|
||||
|
||||
|
||||
//Delete files Manager
|
||||
$filesManager = new \ProcessMaker\BusinessModel\FilesManager();
|
||||
$criteria = new \Criteria("workflow");
|
||||
@@ -882,23 +892,6 @@ class Workflow extends Handler
|
||||
$filesManager->deleteProcessFilesManager($sProcessUID, $row["PRF_UID"]);
|
||||
}
|
||||
|
||||
//Delete Script-Task
|
||||
$scriptTask = new \ProcessMaker\BusinessModel\ScriptTask();
|
||||
|
||||
$criteria = new \Criteria("workflow");
|
||||
|
||||
$criteria->addSelectColumn(\ScriptTaskPeer::SCRTAS_UID);
|
||||
$criteria->add(\ScriptTaskPeer::PRJ_UID, $sProcessUID, \Criteria::EQUAL);
|
||||
|
||||
$rsCriteria = \ScriptTaskPeer::doSelectRS($criteria);
|
||||
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
while ($rsCriteria->next()) {
|
||||
$row = $rsCriteria->getRow();
|
||||
|
||||
$scriptTask->delete($row["SCRTAS_UID"]);
|
||||
}
|
||||
|
||||
//Delete the process
|
||||
try {
|
||||
$oProcess->remove($sProcessUID);
|
||||
@@ -1238,80 +1231,33 @@ class Workflow extends Handler
|
||||
$processUidOld = $arrayUid[0]["old_uid"];
|
||||
$processUid = $arrayUid[0]["new_uid"];
|
||||
|
||||
//Update TASK.TAS_UID
|
||||
foreach ($arrayWorkflowData["tasks"] as $key => $value) {
|
||||
$taskUid = $arrayWorkflowData["tasks"][$key]["TAS_UID"];
|
||||
//Update Table.Field
|
||||
$arrayUpdateTableField = array(
|
||||
"tasks" => array("fieldname" => "TAS_UID", "oldFieldname" => "TAS_UID_OLD"), //Update TASK.TAS_UID
|
||||
"webEntryEvent" => array("fieldname" => "EVN_UID", "oldFieldname" => "EVN_UID_OLD"), //Update WEB_ENTRY_EVENT.EVN_UID
|
||||
"messageEventDefinition" => array("fieldname" => "EVN_UID", "oldFieldname" => "EVN_UID_OLD"), //Update MESSAGE_EVENT_DEFINITION.EVN_UID
|
||||
"scriptTask" => array("fieldname" => "ACT_UID", "oldFieldname" => "ACT_UID_OLD"), //Update SCRIPT_TASK.ACT_UID
|
||||
"timerEvent" => array("fieldname" => "EVN_UID", "oldFieldname" => "EVN_UID_OLD"), //Update TIMER_EVENT.EVN_UID
|
||||
"emailEvent" => array("fieldname" => "EVN_UID", "oldFieldname" => "EVN_UID_OLD") //Update EMAIL_EVENT.EVN_UID
|
||||
);
|
||||
|
||||
foreach ($arrayUid as $value2) {
|
||||
$arrayItem = $value2;
|
||||
foreach ($arrayUpdateTableField as $key => $value) {
|
||||
$table = $key;
|
||||
$fieldname = $value["fieldname"];
|
||||
$oldFieldname = $value["oldFieldname"];
|
||||
|
||||
if ($arrayItem["old_uid"] == $taskUid) {
|
||||
$arrayWorkflowData["tasks"][$key]["TAS_UID_OLD"] = $taskUid;
|
||||
$arrayWorkflowData["tasks"][$key]["TAS_UID"] = $arrayItem["new_uid"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isset($arrayWorkflowData[$table])) {
|
||||
foreach ($arrayWorkflowData[$table] as $key2 => $value2) {
|
||||
$uid = $arrayWorkflowData[$table][$key2][$fieldname];
|
||||
|
||||
//Update WEB_ENTRY_EVENT.EVN_UID
|
||||
if (isset($arrayWorkflowData["webEntryEvent"])) {
|
||||
foreach ($arrayWorkflowData["webEntryEvent"] as $key => $value) {
|
||||
$webEntryEventEventUid = $arrayWorkflowData["webEntryEvent"][$key]["EVN_UID"];
|
||||
foreach ($arrayUid as $value3) {
|
||||
$arrayItem = $value3;
|
||||
|
||||
foreach ($arrayUid as $value2) {
|
||||
$arrayItem = $value2;
|
||||
|
||||
if ($arrayItem["old_uid"] == $webEntryEventEventUid) {
|
||||
$arrayWorkflowData["webEntryEvent"][$key]["EVN_UID"] = $arrayItem["new_uid"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Update MESSAGE_EVENT_DEFINITION.EVN_UID
|
||||
if (isset($arrayWorkflowData["messageEventDefinition"])) {
|
||||
foreach ($arrayWorkflowData["messageEventDefinition"] as $key => $value) {
|
||||
$messageEventDefinitionEventUid = $arrayWorkflowData["messageEventDefinition"][$key]["EVN_UID"];
|
||||
|
||||
foreach ($arrayUid as $value2) {
|
||||
$arrayItem = $value2;
|
||||
|
||||
if ($arrayItem["old_uid"] == $messageEventDefinitionEventUid) {
|
||||
$arrayWorkflowData["messageEventDefinition"][$key]["EVN_UID"] = $arrayItem["new_uid"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Update EMAIL_EVENT.EVN_UID
|
||||
if (isset($arrayWorkflowData["emailEvent"])) {
|
||||
foreach ($arrayWorkflowData["emailEvent"] as $key => $value) {
|
||||
$emailEventEventUid = $arrayWorkflowData["emailEvent"][$key]["EVN_UID"];
|
||||
|
||||
foreach ($arrayUid as $value2) {
|
||||
$arrayItem = $value2;
|
||||
|
||||
if ($arrayItem["old_uid"] == $emailEventEventUid) {
|
||||
$arrayWorkflowData["emailEvent"][$key]["EVN_UID"] = $arrayItem["new_uid"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Update SCRIPT_TASK.ACT_UID
|
||||
if (isset($arrayWorkflowData["scriptTask"])) {
|
||||
foreach ($arrayWorkflowData["scriptTask"] as $key => $value) {
|
||||
$scriptTaskActivityUid = $arrayWorkflowData["scriptTask"][$key]["ACT_UID"];
|
||||
|
||||
foreach ($arrayUid as $value2) {
|
||||
$arrayItem = $value2;
|
||||
|
||||
if ($arrayItem["old_uid"] == $scriptTaskActivityUid) {
|
||||
$arrayWorkflowData["scriptTask"][$key]["ACT_UID"] = $arrayItem["new_uid"];
|
||||
break;
|
||||
if ($arrayItem["old_uid"] == $uid) {
|
||||
$arrayWorkflowData[$table][$key2][$fieldname] = $arrayItem["new_uid"];
|
||||
$arrayWorkflowData[$table][$key2][$oldFieldname] = $uid;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1369,3 +1315,4 @@ class Workflow extends Handler
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user