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

Merged in zeitmaster/processmaker/MT-122 (pull request #4078)

Browse Source 
MT-122
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-11 17:23:38 -04:00
parent 527f9d82aa 58ddaa2347
commit d00f85aa5e
4 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1502,6 +1502,26 @@ class Processes
return $oTask->createRouteRows($aRoutes);
}
/**
* This string replace duplicated routes based on the tasks origin and end
* if the route existed is removed and regenerated since probably the last
* data is an updated version and we need a different functionality than the
* createRouteRows method.
* @param $aRoutes array
* @return $oTask Tasks array
*/
public function replaceRouteRows($aRoutes)
{
foreach ($aRoutes as $routeData) {
$route = new \Route();
foreach ($route->routeExistsFiltered($routeData) as $duplicatedRoute) {
$routeData = array_replace_recursive($duplicatedRoute, $routeData);
$route->remove($duplicatedRoute['ROU_UID']);
}
$route->create($routeData);
}
}
/**
* Update Route Rows from a $aRoutes array data and returns those in an array.
*

25
workflow/engine/classes/model/Route.php
View File

@@ -252,6 +252,31 @@ class Route extends BaseRoute
}
}
public function routeExistsFiltered($aData)
{
$con = Propel::getConnection( RoutePeer::DATABASE_NAME );
try {
if (!empty($aData)) {
$c = new Criteria('workflow');
$c->addSelectColumn("ROUTE.*");
$c->add(RoutePeer::PRO_UID, $aData['PRO_UID'], Criteria::EQUAL);
$c->add(RoutePeer::TAS_UID, $aData['TAS_UID'], Criteria::EQUAL);
$c->add(RoutePeer::ROU_NEXT_TASK, $aData['ROU_NEXT_TASK'], Criteria::EQUAL);
}
$query =$c->toString();
$rs = RoutePeer::doSelectRS($c);
$rs->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$routes = array();
while ($rs->next()) {
$routes[] = $rs->getRow();
}
return $routes;
} catch (Exception $oError) {
throw ($oError);
}
}
/**
* Validate value for a variable that only accepts some determinated values
*

2
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
View File

@@ -150,7 +150,7 @@ class GranularExporter
protected function mergeData($migratorData)
{
$migratorData = $this->verifyConsistenceData($migratorData);
$this->data = array_merge_recursive($this->data, $migratorData);
$this->data = array_replace_recursive($migratorData, $this->data);
}
/**

3
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php
View File

@@ -56,12 +56,13 @@ class ProcessDefinitionMigrator implements Importable, Exportable
//Workflow elements
$this->processes->updateProcessRow($data['workflow']['process']);
$this->processes->createTaskRows($data['workflow']['tasks']);
$this->processes->createTaskUserRows($data['workflow']['taskusers']);
$this->processes->createRouteRows($data['workflow']['routes']);
$this->processes->replaceRouteRows($data['workflow']['routes']);
$this->processes->createLaneRows($data['workflow']['lanes']);
$this->processes->createGatewayRows($data['workflow']['gateways']);
$this->processes->createStepRows($data['workflow']['steps']);
$this->processes->createStepTriggerRows($data['workflow']['steptriggers']);
$this->processes->createTaskUserRows($data['workflow']['taskusers']);
$this->processes->createSubProcessRows($data['workflow']['subProcess']);
$this->processes->createCaseTrackerRows($data['workflow']['caseTracker']);
$this->processes->createCaseTrackerObjectRows($data['workflow']['caseTrackerObject']);