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

PM-2815: I added the dropdwon[Execute Trigger]

Browse Source
This commit is contained in:
Paula V. Quispe
2015-06-10 17:55:47 -04:00
parent 058120f862
commit 138388d9c1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -155,7 +155,8 @@ class Task
"TAS_SELFSERVICE_TIMEOUT" => $arrayDataAux["TAS_SELFSERVICE_TIMEOUT"], "TAS_SELFSERVICE_TIMEOUT" => $arrayDataAux["TAS_SELFSERVICE_TIMEOUT"],
"TAS_SELFSERVICE_TIME" => $arrayDataAux["TAS_SELFSERVICE_TIME"], "TAS_SELFSERVICE_TIME" => $arrayDataAux["TAS_SELFSERVICE_TIME"],
"TAS_SELFSERVICE_TIME_UNIT" => $arrayDataAux["TAS_SELFSERVICE_TIME_UNIT"], "TAS_SELFSERVICE_TIME_UNIT" => $arrayDataAux["TAS_SELFSERVICE_TIME_UNIT"],
"TAS_SELFSERVICE_TRIGGER_UID" => $arrayDataAux["TAS_SELFSERVICE_TRIGGER_UID"] "TAS_SELFSERVICE_TRIGGER_UID" => $arrayDataAux["TAS_SELFSERVICE_TRIGGER_UID"],
"TAS_SELFSERVICE_EXECUTION" => $arrayDataAux["TAS_SELFSERVICE_EXECUTION"]
), ),
$keyCase $keyCase
); );
@@ -277,6 +278,7 @@ class Task
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION");
break; break;
case 'EVALUATE': case 'EVALUATE':
if (empty($arrayProperty["TAS_ASSIGN_VARIABLE"])) { if (empty($arrayProperty["TAS_ASSIGN_VARIABLE"])) {
@@ -287,6 +289,7 @@ class Task
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION");
break; break;
case 'SELF_SERVICE': case 'SELF_SERVICE':
case 'SELF_SERVICE_EVALUATE': case 'SELF_SERVICE_EVALUATE':
@@ -312,10 +315,14 @@ class Task
if (empty($arrayProperty["TAS_SELFSERVICE_TRIGGER_UID"])) { if (empty($arrayProperty["TAS_SELFSERVICE_TRIGGER_UID"])) {
throw (new \Exception("Invalid value specified for 'tas_selfservice_trigger_uid'")); throw (new \Exception("Invalid value specified for 'tas_selfservice_trigger_uid'"));
} }
if (empty($arrayProperty["TAS_SELFSERVICE_EXECUTION"])) {
throw (new \Exception("Invalid value specified for 'tas_selfservice_execution'"));
}
} else { } else {
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION");
} }
break; break;
} }

5
workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
View File

@@ -267,6 +267,11 @@ class ActivityPropertiesStructure
*/ */
public $tas_selfservice_trigger_uid; public $tas_selfservice_trigger_uid;
/**
* @var string {@from body} {@choice EVERY_TIME,ONCE}
*/
public $tas_selfservice_execution;
/** /**
* @var string {@from body} {@choice TRUE,FALSE} * @var string {@from body} {@choice TRUE,FALSE}
*/ */