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

BUG-16676 Default flow no tiene funcionalidad

Browse Source
This commit is contained in:
Brayan Pereyra
2015-02-13 16:15:31 -04:00
parent 2b8bbf57a9
commit ae4d111bfa
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,6 @@ class Derivation
$arrayNextTask = array(); $arrayNextTask = array();
$arrayNextTaskDefault = array(); $arrayNextTaskDefault = array();
$i = 0;
//SELECT * //SELECT *
//FROM APP_DELEGATION AS A //FROM APP_DELEGATION AS A
@@ -211,18 +210,17 @@ class Derivation
} }
if ($flagContinue) { if ($flagContinue) {
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); $arrayNextTask[] = $this->prepareInformationTask($arrayRouteData);
} }
} }
if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) {
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); $arrayNextTask[] = $this->prepareInformationTask($arrayNextTaskDefault);
} }
//Check Task GATEWAYTOGATEWAY //Check Task GATEWAYTOGATEWAY
$arrayNextTaskBk = $arrayNextTask; $arrayNextTaskBk = $arrayNextTask;
$arrayNextTask = array(); $arrayNextTask = array();
$i = 0;
foreach ($arrayNextTaskBk as $value) { foreach ($arrayNextTaskBk as $value) {
$arrayNextTaskData = $value; $arrayNextTaskData = $value;
@@ -231,10 +229,10 @@ class Derivation
$arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]); $arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]);
foreach ($arrayAux as $value2) { foreach ($arrayAux as $value2) {
$arrayNextTask[++$i] = $value2; $arrayNextTask[] = $value2;
} }
} else { } else {
$arrayNextTask[++$i] = $arrayNextTaskData; $arrayNextTask[] = $arrayNextTaskData;
} }
} }

2
workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php
View File

@@ -81,7 +81,7 @@ class ListParticipatedLastMapBuilder
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, true, 255); $tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 20); $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, false, 20);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);

14
workflow/engine/classes/model/om/BaseBpmnFlow.php
View File

@@ -141,7 +141,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent
*/ */
protected $flo_position = 0; protected $flo_position = 0;
/** /**
* @var BpmnProject * @var BpmnProject
*/ */
protected $aBpmnProject; protected $aBpmnProject;
@@ -365,7 +365,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent
/** /**
* Get the [flo_position] column value. * Get the [flo_position] column value.
* *
* @return int * @return int
*/ */
public function getFloPosition() public function getFloPosition()
@@ -374,7 +374,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent
return $this->flo_position; return $this->flo_position;
} }
/* /**
* Set the value of [flo_uid] column. * Set the value of [flo_uid] column.
* *
* @param string $v new value * @param string $v new value
@@ -780,7 +780,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent
/** /**
* Set the value of [flo_position] column. * Set the value of [flo_position] column.
* *
* @param int $v new value * @param int $v new value
* @return void * @return void
*/ */
@@ -794,9 +794,9 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent
} }
if ($this->flo_position !== $v || $v === 0) { if ($this->flo_position !== $v || $v === 0) {
$this->flo_position = $v; $this->flo_position = $v;
$this->modifiedColumns[] = BpmnFlowPeer::FLO_POSITION; $this->modifiedColumns[] = BpmnFlowPeer::FLO_POSITION;
} }
} // setFloPosition() } // setFloPosition()

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

@@ -4015,7 +4015,7 @@
<column name="APP_TITLE" type="VARCHAR" size="255" required="true" default=""/> <column name="APP_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="true" default=""/> <column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="true" default=""/> <column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_STATUS" type="VARCHAR" size="20" required="true" default="0"/> <column name="APP_STATUS" type="VARCHAR" size="20" required="false" default="0"/>
<column name="DEL_INDEX" type="INTEGER" required="true" default="0"/> <column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
<column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/> <column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/>
<column name="DEL_PREVIOUS_USR_USERNAME" type="VARCHAR" size="100" default=""/> <column name="DEL_PREVIOUS_USR_USERNAME" type="VARCHAR" size="100" default=""/>

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

@@ -2263,7 +2263,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`APP_TITLE` VARCHAR(255) default '' NOT NULL, `APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL, `APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL, `APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_STATUS` VARCHAR(20) default '0' NOT NULL, `APP_STATUS` VARCHAR(20) default '0',
`DEL_INDEX` INTEGER default 0 NOT NULL, `DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '', `DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '', `DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',