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

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-06-15 08:52:03 -04:00
parent 5abc524709 6b4af36ece
commit 01ee9799bf
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/cron_single.php
View File

@@ -967,7 +967,7 @@ function executeCaseSelfService()
$dueDate = $calendar->calculateDate( $dueDate = $calendar->calculateDate(
$appcacheDelDelegateDate, $appcacheDelDelegateDate,
$taskSelfServiceTime, $taskSelfServiceTime,
$taskSelfServiceTimeUnit //HOURS|DAYS $taskSelfServiceTimeUnit //HOURS|DAYS|MINUTES
//1 //1
); );

2
workflow/engine/classes/class.pmDynaform.php
View File

@@ -219,7 +219,7 @@ class pmDynaform
$cells = array(); $cells = array();
foreach ($json->columns as $column) { foreach ($json->columns as $column) {
//data //data
if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "suggest" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $value === "hidden") { if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "suggest" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $column->type === "hidden") {
array_push($cells, array( array_push($cells, array(
"value" => isset($row[$column->name]) ? $row[$column->name] : "", "value" => isset($row[$column->name]) ? $row[$column->name] : "",
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "") "label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "")

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;
} }

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

@@ -258,7 +258,7 @@ class ActivityPropertiesStructure
public $tas_selfservice_timeout; public $tas_selfservice_timeout;
/** /**
* @var string {@from body} {@choice DAYS,,HOURS} * @var string {@from body} {@choice DAYS,,HOURS,MINUTES}
*/ */
public $tas_selfservice_time_unit; public $tas_selfservice_time_unit;
@@ -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}
*/ */

2
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -28,7 +28,7 @@
<en><![CDATA[Time]]></en> <en><![CDATA[Time]]></en>
</TAS_SELFSERVICE_TIME> </TAS_SELFSERVICE_TIME>
<TAS_SELFSERVICE_TIME_UNIT type="dropdown"> <TAS_SELFSERVICE_TIME_UNIT type="dropdown">
<en><![CDATA[Time unit]]><option name="HOURS"><![CDATA[Hours]]></option><option name="DAYS"><![CDATA[Days]]></option></en> <en><![CDATA[Time unit]]><option name="HOURS"><![CDATA[Hours]]></option><option name="DAYS"><![CDATA[Days]]></option><option name="MINUTES"><![CDATA[Minutes]]></option></en>
</TAS_SELFSERVICE_TIME_UNIT> </TAS_SELFSERVICE_TIME_UNIT>
<TAS_SELFSERVICE_TRIGGER_UID type="dropdown" required="1"><![CDATA[ <TAS_SELFSERVICE_TRIGGER_UID type="dropdown" required="1"><![CDATA[
SELECT TGR.TRI_UID, CON.CON_VALUE SELECT TGR.TRI_UID, CON.CON_VALUE