diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 9c3328886..de0c40c80 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -142,7 +142,6 @@ class Derivation $arrayNextTask = array(); $arrayNextTaskDefault = array(); - $i = 0; //SELECT * //FROM APP_DELEGATION AS A @@ -211,18 +210,17 @@ class Derivation } if ($flagContinue) { - $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); + $arrayNextTask[] = $this->prepareInformationTask($arrayRouteData); } } if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { - $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); + $arrayNextTask[] = $this->prepareInformationTask($arrayNextTaskDefault); } //Check Task GATEWAYTOGATEWAY $arrayNextTaskBk = $arrayNextTask; $arrayNextTask = array(); - $i = 0; foreach ($arrayNextTaskBk as $value) { $arrayNextTaskData = $value; @@ -231,10 +229,10 @@ class Derivation $arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]); foreach ($arrayAux as $value2) { - $arrayNextTask[++$i] = $value2; + $arrayNextTask[] = $value2; } } else { - $arrayNextTask[++$i] = $arrayNextTaskData; + $arrayNextTask[] = $arrayNextTaskData; } } diff --git a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php index 10a3e1bf3..78843fad8 100644 --- a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php +++ b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php @@ -81,7 +81,7 @@ class ListParticipatedLastMapBuilder $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); diff --git a/workflow/engine/classes/model/om/BaseBpmnFlow.php b/workflow/engine/classes/model/om/BaseBpmnFlow.php index 15f28a2ad..4badba254 100755 --- a/workflow/engine/classes/model/om/BaseBpmnFlow.php +++ b/workflow/engine/classes/model/om/BaseBpmnFlow.php @@ -141,7 +141,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent */ protected $flo_position = 0; - /** + /** * @var BpmnProject */ protected $aBpmnProject; @@ -365,7 +365,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent /** * Get the [flo_position] column value. - * + * * @return int */ public function getFloPosition() @@ -374,7 +374,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent return $this->flo_position; } - /* + /** * Set the value of [flo_uid] column. * * @param string $v new value @@ -780,7 +780,7 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent /** * Set the value of [flo_position] column. - * + * * @param int $v new value * @return void */ @@ -794,9 +794,9 @@ abstract class BaseBpmnFlow extends BaseObject implements Persistent } if ($this->flo_position !== $v || $v === 0) { - $this->flo_position = $v; - $this->modifiedColumns[] = BpmnFlowPeer::FLO_POSITION; - } + $this->flo_position = $v; + $this->modifiedColumns[] = BpmnFlowPeer::FLO_POSITION; + } } // setFloPosition() diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 411c38c86..6badf1c45 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4015,7 +4015,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index e034b44a1..79ea43eb2 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -2263,7 +2263,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST` `APP_TITLE` VARCHAR(255) default '' NOT NULL, `APP_PRO_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_PREVIOUS_USR_UID` VARCHAR(32) default '', `DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',