fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Victor Saisa Lopez
2014-02-20 17:00:02 -04:00
parent f79e003a37 cad5fcfd80
commit 89fee16ba3
7 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ class BpmnGatewayMapBuilder
$tMap->addColumn('GAT_INSTANTIATE', 'GatInstantiate', 'int', CreoleTypes::TINYINT, false, null);
$tMap->addColumn('GAT_EVENT_GATEWAT_TYPE', 'GatEventGatewatType', 'string', CreoleTypes::VARCHAR, false, 20);
$tMap->addColumn('GAT_EVENT_GATEWAY_TYPE', 'GatEventGatewayType', 'string', CreoleTypes::VARCHAR, false, 20);
$tMap->addColumn('GAT_ACTIVATION_COUNT', 'GatActivationCount', 'int', CreoleTypes::INTEGER, false, null);

38
workflow/engine/classes/model/om/BaseBpmnGateway.php
View File

@@ -70,10 +70,10 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
protected $gat_instantiate = 0;
/**
* The value for the gat_event_gatewat_type field.
* The value for the gat_event_gateway_type field.
* @var string
*/
protected $gat_event_gatewat_type = 'NONE';
protected $gat_event_gateway_type = 'NONE';
/**
* The value for the gat_activation_count field.
@@ -195,14 +195,14 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
}
/**
* Get the [gat_event_gatewat_type] column value.
* Get the [gat_event_gateway_type] column value.
*
* @return string
*/
public function getGatEventGatewatType()
public function getGatEventGatewayType()
{
return $this->gat_event_gatewat_type;
return $this->gat_event_gateway_type;
}
/**
@@ -401,12 +401,12 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
} // setGatInstantiate()
/**
* Set the value of [gat_event_gatewat_type] column.
* Set the value of [gat_event_gateway_type] column.
*
* @param string $v new value
* @return void
*/
public function setGatEventGatewatType($v)
public function setGatEventGatewayType($v)
{
// Since the native PHP type for this column is string,
@@ -415,12 +415,12 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->gat_event_gatewat_type !== $v || $v === 'NONE') {
$this->gat_event_gatewat_type = $v;
$this->modifiedColumns[] = BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE;
if ($this->gat_event_gateway_type !== $v || $v === 'NONE') {
$this->gat_event_gateway_type = $v;
$this->modifiedColumns[] = BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE;
}
} // setGatEventGatewatType()
} // setGatEventGatewayType()
/**
* Set the value of [gat_activation_count] column.
@@ -519,7 +519,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
$this->gat_instantiate = $rs->getInt($startcol + 6);
$this->gat_event_gatewat_type = $rs->getString($startcol + 7);
$this->gat_event_gateway_type = $rs->getString($startcol + 7);
$this->gat_activation_count = $rs->getInt($startcol + 8);
@@ -796,7 +796,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
return $this->getGatInstantiate();
break;
case 7:
return $this->getGatEventGatewatType();
return $this->getGatEventGatewayType();
break;
case 8:
return $this->getGatActivationCount();
@@ -834,7 +834,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
$keys[4] => $this->getGatType(),
$keys[5] => $this->getGatDirection(),
$keys[6] => $this->getGatInstantiate(),
$keys[7] => $this->getGatEventGatewatType(),
$keys[7] => $this->getGatEventGatewayType(),
$keys[8] => $this->getGatActivationCount(),
$keys[9] => $this->getGatWaitingForStart(),
$keys[10] => $this->getGatDefaultFlow(),
@@ -891,7 +891,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
$this->setGatInstantiate($value);
break;
case 7:
$this->setGatEventGatewatType($value);
$this->setGatEventGatewayType($value);
break;
case 8:
$this->setGatActivationCount($value);
@@ -954,7 +954,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
}
if (array_key_exists($keys[7], $arr)) {
$this->setGatEventGatewatType($arr[$keys[7]]);
$this->setGatEventGatewayType($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
@@ -1008,8 +1008,8 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
$criteria->add(BpmnGatewayPeer::GAT_INSTANTIATE, $this->gat_instantiate);
}
if ($this->isColumnModified(BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE)) {
$criteria->add(BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE, $this->gat_event_gatewat_type);
if ($this->isColumnModified(BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE)) {
$criteria->add(BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE, $this->gat_event_gateway_type);
}
if ($this->isColumnModified(BpmnGatewayPeer::GAT_ACTIVATION_COUNT)) {
@@ -1090,7 +1090,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
$copyObj->setGatInstantiate($this->gat_instantiate);
$copyObj->setGatEventGatewatType($this->gat_event_gatewat_type);
$copyObj->setGatEventGatewayType($this->gat_event_gateway_type);
$copyObj->setGatActivationCount($this->gat_activation_count);

18
workflow/engine/classes/model/om/BaseBpmnGatewayPeer.php
View File

@@ -52,8 +52,8 @@ abstract class BaseBpmnGatewayPeer
/** the column name for the GAT_INSTANTIATE field */
const GAT_INSTANTIATE = 'BPMN_GATEWAY.GAT_INSTANTIATE';
/** the column name for the GAT_EVENT_GATEWAT_TYPE field */
const GAT_EVENT_GATEWAT_TYPE = 'BPMN_GATEWAY.GAT_EVENT_GATEWAT_TYPE';
/** the column name for the GAT_EVENT_GATEWAY_TYPE field */
const GAT_EVENT_GATEWAY_TYPE = 'BPMN_GATEWAY.GAT_EVENT_GATEWAY_TYPE';
/** the column name for the GAT_ACTIVATION_COUNT field */
const GAT_ACTIVATION_COUNT = 'BPMN_GATEWAY.GAT_ACTIVATION_COUNT';
@@ -75,9 +75,9 @@ abstract class BaseBpmnGatewayPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('GatUid', 'PrjUid', 'ProUid', 'GatName', 'GatType', 'GatDirection', 'GatInstantiate', 'GatEventGatewatType', 'GatActivationCount', 'GatWaitingForStart', 'GatDefaultFlow', ),
BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID, BpmnGatewayPeer::PRJ_UID, BpmnGatewayPeer::PRO_UID, BpmnGatewayPeer::GAT_NAME, BpmnGatewayPeer::GAT_TYPE, BpmnGatewayPeer::GAT_DIRECTION, BpmnGatewayPeer::GAT_INSTANTIATE, BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE, BpmnGatewayPeer::GAT_ACTIVATION_COUNT, BpmnGatewayPeer::GAT_WAITING_FOR_START, BpmnGatewayPeer::GAT_DEFAULT_FLOW, ),
BasePeer::TYPE_FIELDNAME => array ('GAT_UID', 'PRJ_UID', 'PRO_UID', 'GAT_NAME', 'GAT_TYPE', 'GAT_DIRECTION', 'GAT_INSTANTIATE', 'GAT_EVENT_GATEWAT_TYPE', 'GAT_ACTIVATION_COUNT', 'GAT_WAITING_FOR_START', 'GAT_DEFAULT_FLOW', ),
BasePeer::TYPE_PHPNAME => array ('GatUid', 'PrjUid', 'ProUid', 'GatName', 'GatType', 'GatDirection', 'GatInstantiate', 'GatEventGatewayType', 'GatActivationCount', 'GatWaitingForStart', 'GatDefaultFlow', ),
BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID, BpmnGatewayPeer::PRJ_UID, BpmnGatewayPeer::PRO_UID, BpmnGatewayPeer::GAT_NAME, BpmnGatewayPeer::GAT_TYPE, BpmnGatewayPeer::GAT_DIRECTION, BpmnGatewayPeer::GAT_INSTANTIATE, BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE, BpmnGatewayPeer::GAT_ACTIVATION_COUNT, BpmnGatewayPeer::GAT_WAITING_FOR_START, BpmnGatewayPeer::GAT_DEFAULT_FLOW, ),
BasePeer::TYPE_FIELDNAME => array ('GAT_UID', 'PRJ_UID', 'PRO_UID', 'GAT_NAME', 'GAT_TYPE', 'GAT_DIRECTION', 'GAT_INSTANTIATE', 'GAT_EVENT_GATEWAY_TYPE', 'GAT_ACTIVATION_COUNT', 'GAT_WAITING_FOR_START', 'GAT_DEFAULT_FLOW', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
);
@@ -88,9 +88,9 @@ abstract class BaseBpmnGatewayPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('GatUid' => 0, 'PrjUid' => 1, 'ProUid' => 2, 'GatName' => 3, 'GatType' => 4, 'GatDirection' => 5, 'GatInstantiate' => 6, 'GatEventGatewatType' => 7, 'GatActivationCount' => 8, 'GatWaitingForStart' => 9, 'GatDefaultFlow' => 10, ),
BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID => 0, BpmnGatewayPeer::PRJ_UID => 1, BpmnGatewayPeer::PRO_UID => 2, BpmnGatewayPeer::GAT_NAME => 3, BpmnGatewayPeer::GAT_TYPE => 4, BpmnGatewayPeer::GAT_DIRECTION => 5, BpmnGatewayPeer::GAT_INSTANTIATE => 6, BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE => 7, BpmnGatewayPeer::GAT_ACTIVATION_COUNT => 8, BpmnGatewayPeer::GAT_WAITING_FOR_START => 9, BpmnGatewayPeer::GAT_DEFAULT_FLOW => 10, ),
BasePeer::TYPE_FIELDNAME => array ('GAT_UID' => 0, 'PRJ_UID' => 1, 'PRO_UID' => 2, 'GAT_NAME' => 3, 'GAT_TYPE' => 4, 'GAT_DIRECTION' => 5, 'GAT_INSTANTIATE' => 6, 'GAT_EVENT_GATEWAT_TYPE' => 7, 'GAT_ACTIVATION_COUNT' => 8, 'GAT_WAITING_FOR_START' => 9, 'GAT_DEFAULT_FLOW' => 10, ),
BasePeer::TYPE_PHPNAME => array ('GatUid' => 0, 'PrjUid' => 1, 'ProUid' => 2, 'GatName' => 3, 'GatType' => 4, 'GatDirection' => 5, 'GatInstantiate' => 6, 'GatEventGatewayType' => 7, 'GatActivationCount' => 8, 'GatWaitingForStart' => 9, 'GatDefaultFlow' => 10, ),
BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID => 0, BpmnGatewayPeer::PRJ_UID => 1, BpmnGatewayPeer::PRO_UID => 2, BpmnGatewayPeer::GAT_NAME => 3, BpmnGatewayPeer::GAT_TYPE => 4, BpmnGatewayPeer::GAT_DIRECTION => 5, BpmnGatewayPeer::GAT_INSTANTIATE => 6, BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE => 7, BpmnGatewayPeer::GAT_ACTIVATION_COUNT => 8, BpmnGatewayPeer::GAT_WAITING_FOR_START => 9, BpmnGatewayPeer::GAT_DEFAULT_FLOW => 10, ),
BasePeer::TYPE_FIELDNAME => array ('GAT_UID' => 0, 'PRJ_UID' => 1, 'PRO_UID' => 2, 'GAT_NAME' => 3, 'GAT_TYPE' => 4, 'GAT_DIRECTION' => 5, 'GAT_INSTANTIATE' => 6, 'GAT_EVENT_GATEWAY_TYPE' => 7, 'GAT_ACTIVATION_COUNT' => 8, 'GAT_WAITING_FOR_START' => 9, 'GAT_DEFAULT_FLOW' => 10, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
);
@@ -206,7 +206,7 @@ abstract class BaseBpmnGatewayPeer
$criteria->addSelectColumn(BpmnGatewayPeer::GAT_INSTANTIATE);
$criteria->addSelectColumn(BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE);
$criteria->addSelectColumn(BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE);
$criteria->addSelectColumn(BpmnGatewayPeer::GAT_ACTIVATION_COUNT);

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

@@ -3369,7 +3369,7 @@
<column name="GAT_TYPE" type="VARCHAR" size="30" required="true" default=""/>
<column name="GAT_DIRECTION" type="VARCHAR" size="30" required="false" default="UNSPECIFIED"/>
<column name="GAT_INSTANTIATE" type="TINYINT" required="false" default="0"/>
<column name="GAT_EVENT_GATEWAT_TYPE" type="VARCHAR" size="20" required="false" default="NONE"/>
<column name="GAT_EVENT_GATEWAY_TYPE" type="VARCHAR" size="20" required="false" default="NONE"/>
<column name="GAT_ACTIVATION_COUNT" type="INTEGER" required="false" default="0"/>
<column name="GAT_WAITING_FOR_START" type="TINYINT" required="false" default="1"/>
<column name="GAT_DEFAULT_FLOW" type="VARCHAR" size="32" required="false" default=""/>

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

@@ -1896,7 +1896,7 @@ CREATE TABLE `BPMN_GATEWAY`
`GAT_TYPE` VARCHAR(30) default '' NOT NULL,
`GAT_DIRECTION` VARCHAR(30) default 'UNSPECIFIED',
`GAT_INSTANTIATE` TINYINT default 0,
`GAT_EVENT_GATEWAT_TYPE` VARCHAR(20) default 'NONE',
`GAT_EVENT_GATEWAY_TYPE` VARCHAR(20) default 'NONE',
`GAT_ACTIVATION_COUNT` INTEGER default 0,
`GAT_WAITING_FOR_START` TINYINT default 1,
`GAT_DEFAULT_FLOW` VARCHAR(32) default '',

2
workflow/engine/methods/dynaforms/dynaforms_Editor.php
View File

@@ -68,6 +68,8 @@ if ($dynaform->exists( $DYN_UID )) {
//creating SESSION for redirecting to new bpmn editor after closing Dynaform
if (isset( $_GET['bpmn'] ) && $_GET['bpmn'] == '1') {
$_SESSION['dynaform_editor'] = 'bpmn';
} elseif (isset( $_GET['processMap3'] )) {
$_SESSION['dynaform_editor'] = 'processMap3';
} elseif (! isset( $_GET['bpmn'] )) {
$_SESSION['dynaform_editor'] = 'processmap';
}

36
workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml
View File

@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="dynaforms_Editor" type="xmlform" width="100%" enableTemplate="1">
<toolbar type="toolbar" xmlfile="dynaforms/dynaforms_Toolbar"/>
<URL type="phpvariable"/>
<DYN_UID type="phpvariable"/>
<PRO_UID type="phpvariable"/>
<DYN_EDITOR type="phpvariable"/>
<DYNAFORM_NAME type="phpvariable" defaultValue=""/>
<title type="title" enableHTML="1">
<en><![CDATA[<table cellpadding="0" cellspacing="0" width="100%" style="background-color:transparent"> <tr> <td class=\'FormTitle\'>Preview</td> <td align="right"></td> </tr> </table>]]></en>
</title>
<dynaforms_Preview type="private" defaultValue="../dynaforms/dynaforms_Preview"/>
<dynaforms_Ajax type="private" defaultValue="../dynaforms/dynaforms_Ajax"/>
<processMap type="private" defaultValue="../processes/processes_Map"/>
<processBpmnMap type="private" defaultValue="../bpmn/processmap"/>
<SCRIPT type="javascript" replaceTags="1"><![CDATA[
<toolbar type="toolbar" xmlfile="dynaforms/dynaforms_Toolbar"/>
<URL type="phpvariable"/>
<DYN_UID type="phpvariable"/>
<PRO_UID type="phpvariable"/>
<DYN_EDITOR type="phpvariable"/>
<DYNAFORM_NAME type="phpvariable" defaultValue=""/>
<title type="title" enableHTML="1">
<en><![CDATA[<table cellpadding="0" cellspacing="0" width="100%" style="background-color:transparent"> <tr> <td class='FormTitle'>Preview</td> <td align="right"></td> </tr> </table>]]></en>
</title>
<dynaforms_Preview type="private" defaultValue="../dynaforms/dynaforms_Preview"/>
<dynaforms_Ajax type="private" defaultValue="../dynaforms/dynaforms_Ajax"/>
<processMap type="private" defaultValue="../processes/processes_Map"/>
<processMap3 type="private" defaultValue="../designer"/>
<processBpmnMap type="private" defaultValue="../bpmn/processmap"/>
<SCRIPT type="javascript" replaceTags="1"><![CDATA[
function loadEditor()
{
@@ -43,6 +44,11 @@ function loadEditor()
window.location.href="@G::encryptLink(@#processMap)?PRO_UID=@%PRO_UID";
return true;
}
else if(dynEditorType == 'processMap3')
{
window.location.href="@G::encryptLink(@#processMap3)?pro_uid=@%PRO_UID";
return true;
}
else if(dynEditorType == 'bpmn')
{
window.location.href="@G::encryptLink(@#processBpmnMap)?PRO_UID=@%PRO_UID";
@@ -263,4 +269,4 @@ function saveProperties(){
}
*/
]]></SCRIPT>
</dynaForm>
</dynaForm>