fernando/luos
1
0
Fork 0
Code Releases Activity

Merge changes manually due to conflicts with the upstream master branch.

Browse Source
This commit is contained in:
Gustavo Cruz
2015-03-23 09:25:22 -04:00
parent 0b4e4926ae b4820999be
commit 5ab3033871
21 changed files with 680 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/model/ElementTaskRelation.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
class ElementTaskRelation extends BaseElementTaskRelation
{
}

5
workflow/engine/classes/model/ElementTaskRelationPeer.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
class ElementTaskRelationPeer extends BaseElementTaskRelationPeer
{
}

5
workflow/engine/classes/model/MessageEventTaskRelation.php
View File

@@ -1,5 +0,0 @@
<?php
class MessageEventTaskRelation extends BaseMessageEventTaskRelation
{
}

5
workflow/engine/classes/model/MessageEventTaskRelationPeer.php
View File

@@ -1,5 +0,0 @@
<?php
class MessageEventTaskRelationPeer extends BaseMessageEventTaskRelationPeer
{
}

18
workflow/engine/classes/model/map/MessageEventTaskRelationMapBuilder.php → workflow/engine/classes/model/map/ElementTaskRelationMapBuilder.php
View File

@@ -5,7 +5,7 @@ include_once 'creole/CreoleTypes.php';
/**
* This class adds structure of 'MESSAGE_EVENT_TASK_RELATION' table to 'workflow' DatabaseMap object.
* This class adds structure of 'ELEMENT_TASK_RELATION' table to 'workflow' DatabaseMap object.
*
*
*
@@ -16,13 +16,13 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class MessageEventTaskRelationMapBuilder
class ElementTaskRelationMapBuilder
{
/**
* The (dot-path) name of this class
*/
const CLASS_NAME = 'classes.model.map.MessageEventTaskRelationMapBuilder';
const CLASS_NAME = 'classes.model.map.ElementTaskRelationMapBuilder';
/**
* The database map.
@@ -60,19 +60,21 @@ class MessageEventTaskRelationMapBuilder
{
$this->dbMap = Propel::getDatabaseMap('workflow');
$tMap = $this->dbMap->addTable('MESSAGE_EVENT_TASK_RELATION');
$tMap->setPhpName('MessageEventTaskRelation');
$tMap = $this->dbMap->addTable('ELEMENT_TASK_RELATION');
$tMap->setPhpName('ElementTaskRelation');
$tMap->setUseIdGenerator(false);
$tMap->addPrimaryKey('MSGETR_UID', 'MsgetrUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addPrimaryKey('ETR_UID', 'EtrUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRJ_UID', 'PrjUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('EVN_UID', 'EvnUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('ELEMENT_UID', 'ElementUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('ELEMENT_TYPE', 'ElementType', 'string', CreoleTypes::VARCHAR, true, 50);
$tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
} // doBuild()
} // MessageEventTaskRelationMapBuilder
} // ElementTaskRelationMapBuilder

204
workflow/engine/classes/model/om/BaseMessageEventTaskRelation.php → workflow/engine/classes/model/om/BaseElementTaskRelation.php
View File

File diff suppressed because it is too large Load Diff

145
workflow/engine/classes/model/om/BaseMessageEventTaskRelationPeer.php → workflow/engine/classes/model/om/BaseElementTaskRelationPeer.php
View File

File diff suppressed because it is too large Load Diff

4
workflow/engine/classes/model/om/BaseMessageApplication.php
View File

@@ -61,7 +61,7 @@ abstract class BaseMessageApplication extends BaseObject implements Persistent
* The value for the msgapp_variables field.
* @var string
*/
protected $msgapp_variables = '';
protected $msgapp_variables;
/**
* The value for the msgapp_correlation field.
@@ -378,7 +378,7 @@ abstract class BaseMessageApplication extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->msgapp_variables !== $v || $v === '') {
if ($this->msgapp_variables !== $v) {
$this->msgapp_variables = $v;
$this->modifiedColumns[] = MessageApplicationPeer::MSGAPP_VARIABLES;
}

4
workflow/engine/classes/model/om/BaseMessageEventDefinition.php
View File

@@ -61,7 +61,7 @@ abstract class BaseMessageEventDefinition extends BaseObject implements Persiste
* The value for the msged_variables field.
* @var string
*/
protected $msged_variables = '';
protected $msged_variables;
/**
* The value for the msged_correlation field.
@@ -285,7 +285,7 @@ abstract class BaseMessageEventDefinition extends BaseObject implements Persiste
$v = (string) $v;
}
if ($this->msged_variables !== $v || $v === '') {
if ($this->msged_variables !== $v) {
$this->msged_variables = $v;
$this->modifiedColumns[] = MessageEventDefinitionPeer::MSGED_VARIABLES;
}

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

@@ -4419,25 +4419,6 @@
<column name="EVN_UID_CATCH" type="VARCHAR" size="32" required="true" />
</table>
<table name="MESSAGE_EVENT_TASK_RELATION">
<vendor type="mysql">
<parameter name="Name" value="MESSAGE_EVENT_TASK_RELATION" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
</vendor>
<column name="MSGETR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" />
<column name="PRJ_UID" type="VARCHAR" size="32" required="true" />
<column name="EVN_UID" type="VARCHAR" size="32" required="true" />
<column name="TAS_UID" type="VARCHAR" size="32" required="true" />
</table>
<table name="MESSAGE_APPLICATION">
<vendor type="mysql">
<parameter name="Name" value="MESSAGE_APPLICATION" />
@@ -4465,6 +4446,25 @@
<rule name="validValues" value="READ|UNREAD" message="Please enter a valid value for MSGAPP_STATUS" />
</validator>
</table>
<table name="ELEMENT_TASK_RELATION">
<vendor type="mysql">
<parameter name="Name" value="ELEMENT_TASK_RELATION" />
<parameter name="Engine" value="InnoDB" />
<parameter name="Version" value="10" />
<parameter name="Row_format" value="Dynamic" />
<parameter name="Data_free" value="0" />
<parameter name="Auto_increment" value="" />
<parameter name="Check_time" value="" />
<parameter name="Collation" value="utf8_general_ci" />
<parameter name="Checksum" value="" />
<parameter name="Create_options" value="" />
</vendor>
<column name="ETR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" />
<column name="PRJ_UID" type="VARCHAR" size="32" required="true" />
<column name="ELEMENT_UID" type="VARCHAR" size="32" required="true" />
<column name="ELEMENT_TYPE" type="VARCHAR" size="50" required="true" default=""/>
<column name="TAS_UID" type="VARCHAR" size="32" required="true" />
</table>
<table name="ABE_CONFIGURATION">
<vendor type="mysql">
<parameter name="Name" value="ABE_CONFIGURATION"/>

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

@@ -2562,21 +2562,6 @@ CREATE TABLE `MESSAGE_EVENT_RELATION`
PRIMARY KEY (`MSGER_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- MESSAGE_EVENT_TASK_RELATION
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `MESSAGE_EVENT_TASK_RELATION`;
CREATE TABLE `MESSAGE_EVENT_TASK_RELATION`
(
`MSGETR_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`EVN_UID` VARCHAR(32) NOT NULL,
`TAS_UID` VARCHAR(32) NOT NULL,
PRIMARY KEY (`MSGETR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- MESSAGE_APPLICATION
#-----------------------------------------------------------------------------
@@ -2598,6 +2583,22 @@ CREATE TABLE `MESSAGE_APPLICATION`
PRIMARY KEY (`MSGAPP_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- ELEMENT_TASK_RELATION
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `ELEMENT_TASK_RELATION`;
CREATE TABLE `ELEMENT_TASK_RELATION`
(
`ETR_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`ELEMENT_UID` VARCHAR(32) NOT NULL,
`ELEMENT_TYPE` VARCHAR(50) default '' NOT NULL,
`TAS_UID` VARCHAR(32) NOT NULL,
PRIMARY KEY (`ETR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- ABE_CONFIGURATION
#-----------------------------------------------------------------------------

2
workflow/engine/methods/departments/departments_Ajax.php
View File

@@ -367,7 +367,7 @@ switch ($_POST['action']) {
$dep_manager = $_POST['USR_UID'];
$dep_uid = $_POST['DEP_UID'];
$editDepartment['DEP_UID'] = $dep_uid;
$editDepartment['DEP_MANAGER'] = $dep_manager;
$editDepartment['DEP_MANAGER'] = (!isset($_POST['NO_DEP_MANAGER'])? $dep_manager : '');
$oDept = new Department();
$oDept->update( $editDepartment );
$oDept->updateDepartmentManager( $dep_uid );

2
workflow/engine/methods/services/login_getStarted.php
View File

@@ -42,7 +42,7 @@ $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
$oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
*/
$userName = 'admin';
$userPass = 'The password introduced at the time of installing the application (admin: if you do not put or changed the password)';
$userPass = 'The password introduced at the time of installing the application. (If you did not change the password by default is "admin")';
if(isset($_SESSION['NW_PASSWORD'])){
if($_SESSION['NW_PASSWORD'] != ''){
$userPass = $_SESSION['NW_PASSWORD'];

13
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1991,7 +1991,7 @@ class Cases
}
//Element origin and dest
$messageEventTaskRelation = new \ProcessMaker\BusinessModel\MessageEventTaskRelation();
$elementTaskRelation = new \ProcessMaker\BusinessModel\ElementTaskRelation();
$arrayElement = array(
"elementOrigin" => array("uid" => $elementOriginUid, "type" => "bpmnActivity"),
@@ -1999,16 +1999,17 @@ class Cases
);
foreach ($arrayElement as $key => $value) {
$arrayMessageEventTaskRelationData = $messageEventTaskRelation->getMessageEventTaskRelationWhere(
$arrayElementTaskRelationData = $elementTaskRelation->getElementTaskRelationWhere(
array(
\MessageEventTaskRelationPeer::PRJ_UID => $arrayApplicationData["PRO_UID"],
\MessageEventTaskRelationPeer::TAS_UID => $arrayElement[$key]["uid"]
\ElementTaskRelationPeer::PRJ_UID => $arrayApplicationData["PRO_UID"],
\ElementTaskRelationPeer::ELEMENT_TYPE => "bpmnEvent",
\ElementTaskRelationPeer::TAS_UID => $arrayElement[$key]["uid"]
),
true
);
if (!is_null($arrayMessageEventTaskRelationData)) {
$arrayElement[$key]["uid"] = $arrayMessageEventTaskRelationData["EVN_UID"];
if (!is_null($arrayElementTaskRelationData)) {
$arrayElement[$key]["uid"] = $arrayElementTaskRelationData["ELEMENT_UID"];
$arrayElement[$key]["type"] = "bpmnEvent";
}
}

135
workflow/engine/src/ProcessMaker/BusinessModel/MessageEventTaskRelation.php → workflow/engine/src/ProcessMaker/BusinessModel/ElementTaskRelation.php
View File

File diff suppressed because it is too large Load Diff

5
workflow/engine/src/ProcessMaker/BusinessModel/MessageApplication.php
View File

@@ -340,7 +340,7 @@ class MessageApplication
$criteria->addSelectColumn(\MessageEventDefinitionPeer::MSGED_USR_UID);
$criteria->addSelectColumn(\MessageEventDefinitionPeer::MSGED_VARIABLES);
$criteria->addSelectColumn(\MessageEventDefinitionPeer::MSGED_CORRELATION);
$criteria->addSelectColumn(\MessageEventTaskRelationPeer::TAS_UID);
$criteria->addSelectColumn(\ElementTaskRelationPeer::TAS_UID);
$arrayEventType = array("START", "INTERMEDIATE");
$arrayEventMarker = array("MESSAGECATCH");
@@ -351,7 +351,8 @@ class MessageApplication
$criteria->addJoin(\MessageApplicationPeer::EVN_UID_CATCH, \MessageEventDefinitionPeer::EVN_UID, \Criteria::INNER_JOIN);
$criteria->addJoin(\MessageApplicationPeer::EVN_UID_CATCH, \MessageEventTaskRelationPeer::EVN_UID, \Criteria::INNER_JOIN);
$criteria->addJoin(\MessageApplicationPeer::EVN_UID_CATCH, \ElementTaskRelationPeer::ELEMENT_UID, \Criteria::INNER_JOIN);
$criteria->add(\ElementTaskRelationPeer::ELEMENT_TYPE, "bpmnEvent", \Criteria::EQUAL);
if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["messageApplicationStatus"]) && trim($arrayFilterData["messageApplicationStatus"]) != "") {
$criteria->add(\MessageApplicationPeer::MSGAPP_STATUS, $arrayFilterData["messageApplicationStatus"], \Criteria::EQUAL);

2
workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
View File

@@ -288,7 +288,7 @@ class WebEntryEvent
throw new \Exception(\G::LoadTranslation("ID_EVENT_NOT_EXIST", array($this->arrayFieldNameForException["eventUid"], $arrayData["EVN_UID"])));
}
if ($obj->getEvnType() != "START") {
if (($obj->getEvnType() != "START") || ($obj->getEvnType() == "START" && $obj->getEvnMarker() != "EMPTY")) {
throw new \Exception(\G::LoadTranslation("ID_EVENT_NOT_IS_START_EVENT", array($this->arrayFieldNameForException["eventUid"], $arrayData["EVN_UID"])));
}
}

548
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

File diff suppressed because it is too large Load Diff

32
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -828,9 +828,9 @@ class Workflow extends Handler
$messageEventRelation->deleteWhere(array(\MessageEventRelationPeer::PRJ_UID => $sProcessUID));
//Delete Message-Event-Task-Relation
$messageEventTaskRelation = new \ProcessMaker\BusinessModel\MessageEventTaskRelation();
$elementTaskRelation = new \ProcessMaker\BusinessModel\ElementTaskRelation();
$messageEventTaskRelation->deleteWhere(array(\MessageEventTaskRelationPeer::PRJ_UID => $sProcessUID));
$elementTaskRelation->deleteWhere(array(\ElementTaskRelationPeer::PRJ_UID => $sProcessUID));
//Delete Message-Event-Definition
$messageEventDefinition = new \ProcessMaker\BusinessModel\MessageEventDefinition();
@@ -1286,33 +1286,5 @@ class Workflow extends Handler
throw $e;
}
}
public function deleteTaskByArrayType($processUid, array $arrayTaskType)
{
try {
$task = new \Tasks();
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\TaskPeer::TAS_UID);
$criteria->add(\TaskPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\TaskPeer::TAS_TYPE, $arrayTaskType, \Criteria::IN);
$rsCriteria = \TaskPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$taskUid = $row["TAS_UID"];
$task->deleteTask($taskUid);
}
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
}

3
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -770,7 +770,7 @@ Ext.onReady( function() {
items : [
{
xtype : 'displayfield',
width : 192,
width : 90,
value : ''
},
{
@@ -780,6 +780,7 @@ Ext.onReady( function() {
hideLabel : true,
name : 'label1',
checked : true,
style : 'margin-left: 10px',
boxLabel : _('ID_ACTIVE')
}
]

44
workflow/engine/templates/departments/departmentUsers.js
View File

@@ -71,6 +71,13 @@ Ext.onReady(function(){
disabled: true
});
NoSupervisorButton = new Ext.Action({
text: _('ID_SET_NO_MANAGER'),
iconCls: 'button_menu_ext ss_sprite ss_user_edit',
handler: RemoveSupervisor,
disabled: true
});
backButton = new Ext.Action({
text : _('ID_BACK'),
iconCls: 'button_menu_ext ss_sprite ss_arrow_redo',
@@ -133,12 +140,15 @@ Ext.onReady(function(){
switch(sm.getCount()){
case 0: Ext.getCmp('removeButton').disable();
supervisorButton.disable();
NoSupervisorButton.disable();
break;
case 1: Ext.getCmp('removeButton').enable();
supervisorButton.enable();
NoSupervisorButton.enable();
break;
default: Ext.getCmp('removeButton').enable();
supervisorButton.disable();
NoSupervisorButton.disable();
break;
}
}
@@ -248,7 +258,7 @@ Ext.onReady(function(){
frame : false,
columnLines : false,
viewConfig : {forceFit:true},
tbar: [editMembersButton,'-',supervisorButton,{xtype: 'tbfill'},'-',searchTextP,clearTextButtonP],
tbar: [editMembersButton,'-',supervisorButton, NoSupervisorButton,{xtype: 'tbfill'},'-',searchTextP,clearTextButtonP],
//bbar: [{xtype: 'tbfill'},editMembersButton],
listeners: {rowdblclick: function(){
(availableGrid.hidden)? DoNothing() : RemoveGroupsAction();
@@ -493,6 +503,7 @@ EditMembersAction = function(){
buttonsPanel.show();
editMembersButton.disable();
supervisorButton.disable();
//NoSupervisorButton.disable();
UsersPanel.doLayout();
};
@@ -502,10 +513,14 @@ CancelEditMembersAction = function(){
buttonsPanel.hide();
editMembersButton.enable();
rowsSelected = assignedGrid.getSelectionModel().getSelections();
if (rowsSelected.length == 1)
if (rowsSelected.length == 1){
supervisorButton.enable();
else
supervisorButton.disable();
NoSupervisorButton.enable();
}
else{
supervisorButton.disable();
NoSupervisorButton.disable();
}
UsersPanel.doLayout();
};
@@ -516,6 +531,26 @@ show_user = function(v,i,s){
return sName;
};
//Removes assignment Manager on Department(Desetea)
RemoveSupervisor = function(){
rowsSelected = assignedGrid.getSelectionModel().getSelections();
viewport.getEl().mask(_('ID_PROCESSING'));
Ext.Ajax.request({
url: 'departments_Ajax',
params: {action: 'updateSupervisor', USR_UID: rowsSelected[0].get('USR_UID'), DEP_UID: DEPARTMENT.DEP_UID, NO_DEP_MANAGER:'0'},
success: function(r,o){
viewport.getEl().unmask();
supervisorButton.disable();
NoSupervisorButton.disable();
DoSearchP();
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_NO_SET_MANAGER_SUCCES'));
},
failure: function (r,o){
viewport.getEl().unmask();
}
});
};
//Update Department Supervisor
UpdateSupervisor = function(){
rowsSelected = assignedGrid.getSelectionModel().getSelections();
@@ -526,6 +561,7 @@ UpdateSupervisor = function(){
success: function(r,o){
viewport.getEl().unmask();
supervisorButton.disable();
NoSupervisorButton.disable();
DoSearchP();
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_SET_MANAGER_SUCCESS'));
},