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

email_event

Browse Source
This commit is contained in:
marcelo.cuiza
2015-06-25 16:41:28 -04:00
parent 5180199058
commit b1a62f2b9f
6 changed files with 5114 additions and 5129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/classes/class.derivation.php
View File

@@ -112,7 +112,7 @@ class Derivation
$arrayTaskData["NEXT_TASK"]["TAS_PARENT"] = ""; $arrayTaskData["NEXT_TASK"]["TAS_PARENT"] = "";
} }
$arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = (!in_array($arrayTaskData["NEXT_TASK"]["TAS_TYPE"], array("GATEWAYTOGATEWAY", "END-MESSAGE-EVENT", "SCRIPT-TASK", "END-EMAIL-EVENT")))? $this->getNextAssignedUser($arrayTaskData) : array("USR_UID" => "", "USR_FULLNAME" => ""); $arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = (!in_array($arrayTaskData["NEXT_TASK"]["TAS_TYPE"], array("GATEWAYTOGATEWAY", "END-MESSAGE-EVENT", "SCRIPT-TASK", "END-EMAIL-EVENT")))? $this->getNextAssignedUser($arrayTaskData) : array("USR_UID" => "", "USR_FULLNAME" => "");
} }
//Return //Return
@@ -728,15 +728,10 @@ class Derivation
if ($canDerivate) { if ($canDerivate) {
//Throw Message-Events //Throw Message-Events
$case = new \ProcessMaker\BusinessModel\Cases(); $case = new \ProcessMaker\BusinessModel\Cases();
<<<<<<< HEAD
$case->throwMessageEventBetweenElementOriginAndElementDest( $case->throwMessageEventBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields);
$currentDelegation["TAS_UID"],
$nextDel["TAS_UID"], //Email Event
$appFields
);
//Email Event
$emailEvent = new \ProcessMaker\BusinessModel\EmailEvent(); $emailEvent = new \ProcessMaker\BusinessModel\EmailEvent();
$emailEvent->emailEventBetweenElementOriginAndElementDest( $emailEvent->emailEventBetweenElementOriginAndElementDest(
@@ -744,14 +739,7 @@ class Derivation
$nextDel["TAS_UID"], $nextDel["TAS_UID"],
$appFields $appFields
); );
//Derivation
$aSP = isset( $aSP ) ? $aSP : null;
$iNewDelIndex = $this->doDerivation( $currentDelegation, $nextDel, $appFields, $aSP );
=======
$case->throwMessageEventBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields);
//Derivate //Derivate
$aSP = isset( $aSP ) ? $aSP : null; $aSP = isset( $aSP ) ? $aSP : null;
@@ -769,7 +757,6 @@ class Derivation
$scriptTask = new \ProcessMaker\BusinessModel\ScriptTask(); $scriptTask = new \ProcessMaker\BusinessModel\ScriptTask();
$appFields = $scriptTask->execScriptByActivityUid($nextDel["TAS_UID"], $appFields); $appFields = $scriptTask->execScriptByActivityUid($nextDel["TAS_UID"], $appFields);
>>>>>>> master
//Create record in table APP_ASSIGN_SELF_SERVICE_VALUE //Create record in table APP_ASSIGN_SELF_SERVICE_VALUE
$task = new Task(); $task = new Task();
@@ -1303,4 +1290,3 @@ class Derivation
} }
} }
} }

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

@@ -5455,4 +5455,4 @@ class ObjectCellection
return false; return false;
} }
} }
} }

4
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -159,7 +159,7 @@ class TaskMapBuilder
$tMap->addColumn('TAS_SELFSERVICE_EXECUTION', 'TasSelfserviceExecution', 'string', CreoleTypes::VARCHAR, false, 15); $tMap->addColumn('TAS_SELFSERVICE_EXECUTION', 'TasSelfserviceExecution', 'string', CreoleTypes::VARCHAR, false, 15);
$tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|END-EMAIL-EVENT', 'Please enter a valid value for TAS_TYPE'); $tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|END-EMAIL-EVENT', 'Please enter a valid value for TAS_TYPE');
$tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.'); $tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.');
@@ -199,4 +199,4 @@ class TaskMapBuilder
} // doBuild() } // doBuild()
} // TaskMapBuilder } // TaskMapBuilder

10207
workflow/engine/config/schema.xml
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/data/mysql/schema.sql
View File

@@ -2863,4 +2863,4 @@ CREATE TABLE `EMAIL_EVENT`
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier # This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;

4
workflow/engine/src/ProcessMaker/Services/api.ini
View File

@@ -42,7 +42,7 @@ debug = 1
web-entry-event = "ProcessMaker\Services\Api\Project\WebEntryEvent" web-entry-event = "ProcessMaker\Services\Api\Project\WebEntryEvent"
message-event-definition = "ProcessMaker\Services\Api\Project\MessageEventDefinition" message-event-definition = "ProcessMaker\Services\Api\Project\MessageEventDefinition"
script-task = "ProcessMaker\Services\Api\Project\ScriptTask" script-task = "ProcessMaker\Services\Api\Project\ScriptTask"
email-event = "ProcessMaker\Services\Api\Project\EmailEvent" email-event = "ProcessMaker\Services\Api\Project\EmailEvent"
[alias: projects] [alias: projects]
project = "ProcessMaker\Services\Api\Project" project = "ProcessMaker\Services\Api\Project"
@@ -111,4 +111,4 @@ debug = 1
dashboard = "ProcessMaker\Services\Api\Dashboard" dashboard = "ProcessMaker\Services\Api\Dashboard"
[alias: catalog] [alias: catalog]
dashboard = "ProcessMaker\Services\Api\Catalog" dashboard = "ProcessMaker\Services\Api\Catalog"