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

Merged in luisfernandosl/processmaker/BUG-15412 (pull request #692)

Browse Source 
BUG 15412 "Unable to send notification when..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-08-21 12:12:46 -04:00
parent 18129212d3 9937328bc5
commit cd86f26b75
11 changed files with 174 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.case.php
View File

@@ -3893,6 +3893,8 @@ class Cases
if ($this->appSolr != null) {
$this->appSolr->updateApplicationSearchIndex($sApplicationUID);
}
$this->getExecuteTriggerProcess($sApplicationUID, "UNPAUSE");
}
/*

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

@@ -864,7 +864,11 @@ class Process extends BaseProcess
case 'REASSIGNED':
$var = ProcessPeer::PRO_TRI_REASSIGNED;
break;
case "UNPAUSE":
$var = ProcessPeer::PRO_TRI_UNPAUSED;
break;
}
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( $var );
$oCriteria->addSelectColumn( TriggersPeer::TRI_WEBBOT );
@@ -877,6 +881,7 @@ class Process extends BaseProcess
$row = $oDataSet->getRow();
$webBotTrigger = $row['TRI_WEBBOT'];
}
return $webBotTrigger;
}

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

@@ -95,6 +95,8 @@ class ProcessMapBuilder
$tMap->addColumn('PRO_TRI_REASSIGNED', 'ProTriReassigned', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TRI_UNPAUSED', 'ProTriUnpaused', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_SHOW_DELEGATE', 'ProShowDelegate', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('PRO_SHOW_DYNAFORM', 'ProShowDynaform', 'int', CreoleTypes::TINYINT, true, null);

206
workflow/engine/classes/model/om/BaseProcess.php
View File

@@ -117,6 +117,12 @@ abstract class BaseProcess extends BaseObject implements Persistent
*/
protected $pro_tri_reassigned = '';
/**
* The value for the pro_tri_unpaused field.
* @var string
*/
protected $pro_tri_unpaused = '';
/**
* The value for the pro_show_delegate field.
* @var int
@@ -386,6 +392,17 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->pro_tri_reassigned;
}
/**
* Get the [pro_tri_unpaused] column value.
*
* @return string
*/
public function getProTriUnpaused()
{
return $this->pro_tri_unpaused;
}
/**
* Get the [pro_show_delegate] column value.
*
@@ -917,6 +934,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
} // setProTriReassigned()
/**
* Set the value of [pro_tri_unpaused] column.
*
* @param string $v new value
* @return void
*/
public function setProTriUnpaused($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->pro_tri_unpaused !== $v || $v === '') {
$this->pro_tri_unpaused = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_TRI_UNPAUSED;
}
} // setProTriUnpaused()
/**
* Set the value of [pro_show_delegate] column.
*
@@ -1308,42 +1347,44 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_tri_reassigned = $rs->getString($startcol + 14);
$this->pro_show_delegate = $rs->getInt($startcol + 15);
$this->pro_tri_unpaused = $rs->getString($startcol + 15);
$this->pro_show_dynaform = $rs->getInt($startcol + 16);
$this->pro_show_delegate = $rs->getInt($startcol + 16);
$this->pro_category = $rs->getString($startcol + 17);
$this->pro_show_dynaform = $rs->getInt($startcol + 17);
$this->pro_sub_category = $rs->getString($startcol + 18);
$this->pro_category = $rs->getString($startcol + 18);
$this->pro_industry = $rs->getInt($startcol + 19);
$this->pro_sub_category = $rs->getString($startcol + 19);
$this->pro_update_date = $rs->getTimestamp($startcol + 20, null);
$this->pro_industry = $rs->getInt($startcol + 20);
$this->pro_create_date = $rs->getTimestamp($startcol + 21, null);
$this->pro_update_date = $rs->getTimestamp($startcol + 21, null);
$this->pro_create_user = $rs->getString($startcol + 22);
$this->pro_create_date = $rs->getTimestamp($startcol + 22, null);
$this->pro_height = $rs->getInt($startcol + 23);
$this->pro_create_user = $rs->getString($startcol + 23);
$this->pro_width = $rs->getInt($startcol + 24);
$this->pro_height = $rs->getInt($startcol + 24);
$this->pro_title_x = $rs->getInt($startcol + 25);
$this->pro_width = $rs->getInt($startcol + 25);
$this->pro_title_y = $rs->getInt($startcol + 26);
$this->pro_title_x = $rs->getInt($startcol + 26);
$this->pro_debug = $rs->getInt($startcol + 27);
$this->pro_title_y = $rs->getInt($startcol + 27);
$this->pro_dynaforms = $rs->getString($startcol + 28);
$this->pro_debug = $rs->getInt($startcol + 28);
$this->pro_derivation_screen_tpl = $rs->getString($startcol + 29);
$this->pro_dynaforms = $rs->getString($startcol + 29);
$this->pro_derivation_screen_tpl = $rs->getString($startcol + 30);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 30; // 30 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 31; // 31 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Process object", $e);
@@ -1593,48 +1634,51 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->getProTriReassigned();
break;
case 15:
return $this->getProShowDelegate();
return $this->getProTriUnpaused();
break;
case 16:
return $this->getProShowDynaform();
return $this->getProShowDelegate();
break;
case 17:
return $this->getProCategory();
return $this->getProShowDynaform();
break;
case 18:
return $this->getProSubCategory();
return $this->getProCategory();
break;
case 19:
return $this->getProIndustry();
return $this->getProSubCategory();
break;
case 20:
return $this->getProUpdateDate();
return $this->getProIndustry();
break;
case 21:
return $this->getProCreateDate();
return $this->getProUpdateDate();
break;
case 22:
return $this->getProCreateUser();
return $this->getProCreateDate();
break;
case 23:
return $this->getProHeight();
return $this->getProCreateUser();
break;
case 24:
return $this->getProWidth();
return $this->getProHeight();
break;
case 25:
return $this->getProTitleX();
return $this->getProWidth();
break;
case 26:
return $this->getProTitleY();
return $this->getProTitleX();
break;
case 27:
return $this->getProDebug();
return $this->getProTitleY();
break;
case 28:
return $this->getProDynaforms();
return $this->getProDebug();
break;
case 29:
return $this->getProDynaforms();
break;
case 30:
return $this->getProDerivationScreenTpl();
break;
default:
@@ -1672,21 +1716,22 @@ abstract class BaseProcess extends BaseObject implements Persistent
$keys[12] => $this->getProTriCanceled(),
$keys[13] => $this->getProTriPaused(),
$keys[14] => $this->getProTriReassigned(),
$keys[15] => $this->getProShowDelegate(),
$keys[16] => $this->getProShowDynaform(),
$keys[17] => $this->getProCategory(),
$keys[18] => $this->getProSubCategory(),
$keys[19] => $this->getProIndustry(),
$keys[20] => $this->getProUpdateDate(),
$keys[21] => $this->getProCreateDate(),
$keys[22] => $this->getProCreateUser(),
$keys[23] => $this->getProHeight(),
$keys[24] => $this->getProWidth(),
$keys[25] => $this->getProTitleX(),
$keys[26] => $this->getProTitleY(),
$keys[27] => $this->getProDebug(),
$keys[28] => $this->getProDynaforms(),
$keys[29] => $this->getProDerivationScreenTpl(),
$keys[15] => $this->getProTriUnpaused(),
$keys[16] => $this->getProShowDelegate(),
$keys[17] => $this->getProShowDynaform(),
$keys[18] => $this->getProCategory(),
$keys[19] => $this->getProSubCategory(),
$keys[20] => $this->getProIndustry(),
$keys[21] => $this->getProUpdateDate(),
$keys[22] => $this->getProCreateDate(),
$keys[23] => $this->getProCreateUser(),
$keys[24] => $this->getProHeight(),
$keys[25] => $this->getProWidth(),
$keys[26] => $this->getProTitleX(),
$keys[27] => $this->getProTitleY(),
$keys[28] => $this->getProDebug(),
$keys[29] => $this->getProDynaforms(),
$keys[30] => $this->getProDerivationScreenTpl(),
);
return $result;
}
@@ -1764,48 +1809,51 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->setProTriReassigned($value);
break;
case 15:
$this->setProShowDelegate($value);
$this->setProTriUnpaused($value);
break;
case 16:
$this->setProShowDynaform($value);
$this->setProShowDelegate($value);
break;
case 17:
$this->setProCategory($value);
$this->setProShowDynaform($value);
break;
case 18:
$this->setProSubCategory($value);
$this->setProCategory($value);
break;
case 19:
$this->setProIndustry($value);
$this->setProSubCategory($value);
break;
case 20:
$this->setProUpdateDate($value);
$this->setProIndustry($value);
break;
case 21:
$this->setProCreateDate($value);
$this->setProUpdateDate($value);
break;
case 22:
$this->setProCreateUser($value);
$this->setProCreateDate($value);
break;
case 23:
$this->setProHeight($value);
$this->setProCreateUser($value);
break;
case 24:
$this->setProWidth($value);
$this->setProHeight($value);
break;
case 25:
$this->setProTitleX($value);
$this->setProWidth($value);
break;
case 26:
$this->setProTitleY($value);
$this->setProTitleX($value);
break;
case 27:
$this->setProDebug($value);
$this->setProTitleY($value);
break;
case 28:
$this->setProDynaforms($value);
$this->setProDebug($value);
break;
case 29:
$this->setProDynaforms($value);
break;
case 30:
$this->setProDerivationScreenTpl($value);
break;
} // switch()
@@ -1892,63 +1940,67 @@ abstract class BaseProcess extends BaseObject implements Persistent
}
if (array_key_exists($keys[15], $arr)) {
$this->setProShowDelegate($arr[$keys[15]]);
$this->setProTriUnpaused($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setProShowDynaform($arr[$keys[16]]);
$this->setProShowDelegate($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setProCategory($arr[$keys[17]]);
$this->setProShowDynaform($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setProSubCategory($arr[$keys[18]]);
$this->setProCategory($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setProIndustry($arr[$keys[19]]);
$this->setProSubCategory($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setProUpdateDate($arr[$keys[20]]);
$this->setProIndustry($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
$this->setProCreateDate($arr[$keys[21]]);
$this->setProUpdateDate($arr[$keys[21]]);
}
if (array_key_exists($keys[22], $arr)) {
$this->setProCreateUser($arr[$keys[22]]);
$this->setProCreateDate($arr[$keys[22]]);
}
if (array_key_exists($keys[23], $arr)) {
$this->setProHeight($arr[$keys[23]]);
$this->setProCreateUser($arr[$keys[23]]);
}
if (array_key_exists($keys[24], $arr)) {
$this->setProWidth($arr[$keys[24]]);
$this->setProHeight($arr[$keys[24]]);
}
if (array_key_exists($keys[25], $arr)) {
$this->setProTitleX($arr[$keys[25]]);
$this->setProWidth($arr[$keys[25]]);
}
if (array_key_exists($keys[26], $arr)) {
$this->setProTitleY($arr[$keys[26]]);
$this->setProTitleX($arr[$keys[26]]);
}
if (array_key_exists($keys[27], $arr)) {
$this->setProDebug($arr[$keys[27]]);
$this->setProTitleY($arr[$keys[27]]);
}
if (array_key_exists($keys[28], $arr)) {
$this->setProDynaforms($arr[$keys[28]]);
$this->setProDebug($arr[$keys[28]]);
}
if (array_key_exists($keys[29], $arr)) {
$this->setProDerivationScreenTpl($arr[$keys[29]]);
$this->setProDynaforms($arr[$keys[29]]);
}
if (array_key_exists($keys[30], $arr)) {
$this->setProDerivationScreenTpl($arr[$keys[30]]);
}
}
@@ -2022,6 +2074,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
$criteria->add(ProcessPeer::PRO_TRI_REASSIGNED, $this->pro_tri_reassigned);
}
if ($this->isColumnModified(ProcessPeer::PRO_TRI_UNPAUSED)) {
$criteria->add(ProcessPeer::PRO_TRI_UNPAUSED, $this->pro_tri_unpaused);
}
if ($this->isColumnModified(ProcessPeer::PRO_SHOW_DELEGATE)) {
$criteria->add(ProcessPeer::PRO_SHOW_DELEGATE, $this->pro_show_delegate);
}
@@ -2164,6 +2220,8 @@ abstract class BaseProcess extends BaseObject implements Persistent
$copyObj->setProTriReassigned($this->pro_tri_reassigned);
$copyObj->setProTriUnpaused($this->pro_tri_unpaused);
$copyObj->setProShowDelegate($this->pro_show_delegate);
$copyObj->setProShowDynaform($this->pro_show_dynaform);

23
workflow/engine/classes/model/om/BaseProcessPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseProcessPeer
const CLASS_DEFAULT = 'classes.model.Process';
/** The total number of columns. */
const NUM_COLUMNS = 30;
const NUM_COLUMNS = 31;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -76,6 +76,9 @@ abstract class BaseProcessPeer
/** the column name for the PRO_TRI_REASSIGNED field */
const PRO_TRI_REASSIGNED = 'PROCESS.PRO_TRI_REASSIGNED';
/** the column name for the PRO_TRI_UNPAUSED field */
const PRO_TRI_UNPAUSED = 'PROCESS.PRO_TRI_UNPAUSED';
/** the column name for the PRO_SHOW_DELEGATE field */
const PRO_SHOW_DELEGATE = 'PROCESS.PRO_SHOW_DELEGATE';
@@ -132,10 +135,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, )
BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, )
);
/**
@@ -145,10 +148,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProParent' => 1, 'ProTime' => 2, 'ProTimeunit' => 3, 'ProStatus' => 4, 'ProTypeDay' => 5, 'ProType' => 6, 'ProAssignment' => 7, 'ProShowMap' => 8, 'ProShowMessage' => 9, 'ProSubprocess' => 10, 'ProTriDeleted' => 11, 'ProTriCanceled' => 12, 'ProTriPaused' => 13, 'ProTriReassigned' => 14, 'ProShowDelegate' => 15, 'ProShowDynaform' => 16, 'ProCategory' => 17, 'ProSubCategory' => 18, 'ProIndustry' => 19, 'ProUpdateDate' => 20, 'ProCreateDate' => 21, 'ProCreateUser' => 22, 'ProHeight' => 23, 'ProWidth' => 24, 'ProTitleX' => 25, 'ProTitleY' => 26, 'ProDebug' => 27, 'ProDynaforms' => 28, 'ProDerivationScreenTpl' => 29, ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_PARENT => 1, ProcessPeer::PRO_TIME => 2, ProcessPeer::PRO_TIMEUNIT => 3, ProcessPeer::PRO_STATUS => 4, ProcessPeer::PRO_TYPE_DAY => 5, ProcessPeer::PRO_TYPE => 6, ProcessPeer::PRO_ASSIGNMENT => 7, ProcessPeer::PRO_SHOW_MAP => 8, ProcessPeer::PRO_SHOW_MESSAGE => 9, ProcessPeer::PRO_SUBPROCESS => 10, ProcessPeer::PRO_TRI_DELETED => 11, ProcessPeer::PRO_TRI_CANCELED => 12, ProcessPeer::PRO_TRI_PAUSED => 13, ProcessPeer::PRO_TRI_REASSIGNED => 14, ProcessPeer::PRO_SHOW_DELEGATE => 15, ProcessPeer::PRO_SHOW_DYNAFORM => 16, ProcessPeer::PRO_CATEGORY => 17, ProcessPeer::PRO_SUB_CATEGORY => 18, ProcessPeer::PRO_INDUSTRY => 19, ProcessPeer::PRO_UPDATE_DATE => 20, ProcessPeer::PRO_CREATE_DATE => 21, ProcessPeer::PRO_CREATE_USER => 22, ProcessPeer::PRO_HEIGHT => 23, ProcessPeer::PRO_WIDTH => 24, ProcessPeer::PRO_TITLE_X => 25, ProcessPeer::PRO_TITLE_Y => 26, ProcessPeer::PRO_DEBUG => 27, ProcessPeer::PRO_DYNAFORMS => 28, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 29, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_PARENT' => 1, 'PRO_TIME' => 2, 'PRO_TIMEUNIT' => 3, 'PRO_STATUS' => 4, 'PRO_TYPE_DAY' => 5, 'PRO_TYPE' => 6, 'PRO_ASSIGNMENT' => 7, 'PRO_SHOW_MAP' => 8, 'PRO_SHOW_MESSAGE' => 9, 'PRO_SUBPROCESS' => 10, 'PRO_TRI_DELETED' => 11, 'PRO_TRI_CANCELED' => 12, 'PRO_TRI_PAUSED' => 13, 'PRO_TRI_REASSIGNED' => 14, 'PRO_SHOW_DELEGATE' => 15, 'PRO_SHOW_DYNAFORM' => 16, 'PRO_CATEGORY' => 17, 'PRO_SUB_CATEGORY' => 18, 'PRO_INDUSTRY' => 19, 'PRO_UPDATE_DATE' => 20, 'PRO_CREATE_DATE' => 21, 'PRO_CREATE_USER' => 22, 'PRO_HEIGHT' => 23, 'PRO_WIDTH' => 24, 'PRO_TITLE_X' => 25, 'PRO_TITLE_Y' => 26, 'PRO_DEBUG' => 27, 'PRO_DYNAFORMS' => 28, 'PRO_DERIVATION_SCREEN_TPL' => 29, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, )
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProParent' => 1, 'ProTime' => 2, 'ProTimeunit' => 3, 'ProStatus' => 4, 'ProTypeDay' => 5, 'ProType' => 6, 'ProAssignment' => 7, 'ProShowMap' => 8, 'ProShowMessage' => 9, 'ProSubprocess' => 10, 'ProTriDeleted' => 11, 'ProTriCanceled' => 12, 'ProTriPaused' => 13, 'ProTriReassigned' => 14, 'ProTriUnpaused' => 15, 'ProShowDelegate' => 16, 'ProShowDynaform' => 17, 'ProCategory' => 18, 'ProSubCategory' => 19, 'ProIndustry' => 20, 'ProUpdateDate' => 21, 'ProCreateDate' => 22, 'ProCreateUser' => 23, 'ProHeight' => 24, 'ProWidth' => 25, 'ProTitleX' => 26, 'ProTitleY' => 27, 'ProDebug' => 28, 'ProDynaforms' => 29, 'ProDerivationScreenTpl' => 30, ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_PARENT => 1, ProcessPeer::PRO_TIME => 2, ProcessPeer::PRO_TIMEUNIT => 3, ProcessPeer::PRO_STATUS => 4, ProcessPeer::PRO_TYPE_DAY => 5, ProcessPeer::PRO_TYPE => 6, ProcessPeer::PRO_ASSIGNMENT => 7, ProcessPeer::PRO_SHOW_MAP => 8, ProcessPeer::PRO_SHOW_MESSAGE => 9, ProcessPeer::PRO_SUBPROCESS => 10, ProcessPeer::PRO_TRI_DELETED => 11, ProcessPeer::PRO_TRI_CANCELED => 12, ProcessPeer::PRO_TRI_PAUSED => 13, ProcessPeer::PRO_TRI_REASSIGNED => 14, ProcessPeer::PRO_TRI_UNPAUSED => 15, ProcessPeer::PRO_SHOW_DELEGATE => 16, ProcessPeer::PRO_SHOW_DYNAFORM => 17, ProcessPeer::PRO_CATEGORY => 18, ProcessPeer::PRO_SUB_CATEGORY => 19, ProcessPeer::PRO_INDUSTRY => 20, ProcessPeer::PRO_UPDATE_DATE => 21, ProcessPeer::PRO_CREATE_DATE => 22, ProcessPeer::PRO_CREATE_USER => 23, ProcessPeer::PRO_HEIGHT => 24, ProcessPeer::PRO_WIDTH => 25, ProcessPeer::PRO_TITLE_X => 26, ProcessPeer::PRO_TITLE_Y => 27, ProcessPeer::PRO_DEBUG => 28, ProcessPeer::PRO_DYNAFORMS => 29, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 30, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_PARENT' => 1, 'PRO_TIME' => 2, 'PRO_TIMEUNIT' => 3, 'PRO_STATUS' => 4, 'PRO_TYPE_DAY' => 5, 'PRO_TYPE' => 6, 'PRO_ASSIGNMENT' => 7, 'PRO_SHOW_MAP' => 8, 'PRO_SHOW_MESSAGE' => 9, 'PRO_SUBPROCESS' => 10, 'PRO_TRI_DELETED' => 11, 'PRO_TRI_CANCELED' => 12, 'PRO_TRI_PAUSED' => 13, 'PRO_TRI_REASSIGNED' => 14, 'PRO_TRI_UNPAUSED' => 15, 'PRO_SHOW_DELEGATE' => 16, 'PRO_SHOW_DYNAFORM' => 17, 'PRO_CATEGORY' => 18, 'PRO_SUB_CATEGORY' => 19, 'PRO_INDUSTRY' => 20, 'PRO_UPDATE_DATE' => 21, 'PRO_CREATE_DATE' => 22, 'PRO_CREATE_USER' => 23, 'PRO_HEIGHT' => 24, 'PRO_WIDTH' => 25, 'PRO_TITLE_X' => 26, 'PRO_TITLE_Y' => 27, 'PRO_DEBUG' => 28, 'PRO_DYNAFORMS' => 29, 'PRO_DERIVATION_SCREEN_TPL' => 30, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, )
);
/**
@@ -279,6 +282,8 @@ abstract class BaseProcessPeer
$criteria->addSelectColumn(ProcessPeer::PRO_TRI_REASSIGNED);
$criteria->addSelectColumn(ProcessPeer::PRO_TRI_UNPAUSED);
$criteria->addSelectColumn(ProcessPeer::PRO_SHOW_DELEGATE);
$criteria->addSelectColumn(ProcessPeer::PRO_SHOW_DYNAFORM);

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

@@ -835,6 +835,7 @@
<column name="PRO_TRI_CANCELED" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_TRI_PAUSED" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_TRI_REASSIGNED" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_TRI_UNPAUSED" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_SHOW_DELEGATE" type="TINYINT" required="true" default="1"/>
<column name="PRO_SHOW_DYNAFORM" type="TINYINT" required="true" default="0"/>
<column name="PRO_CATEGORY" type="VARCHAR" size="48" required="true" default=""/>

1
workflow/engine/data/mssql/schema.sql
View File

@@ -904,6 +904,7 @@ CREATE TABLE [PROCESS]
[PRO_TRI_CANCELED] VARCHAR(32) default '' NOT NULL,
[PRO_TRI_PAUSED] VARCHAR(32) default '' NOT NULL,
[PRO_TRI_REASSIGNED] VARCHAR(32) default '' NOT NULL,
[PRO_TRI_UNPAUSED] VARCHAR(32) default '' NOT NULL,
[PRO_SHOW_DELEGATE] TINYINT default 1 NOT NULL,
[PRO_SHOW_DYNAFORM] TINYINT default 0 NOT NULL,
[PRO_CATEGORY] VARCHAR(48) default '' NOT NULL,

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

@@ -403,6 +403,7 @@ CREATE TABLE `PROCESS`
`PRO_TRI_CANCELED` VARCHAR(32) default '' NOT NULL,
`PRO_TRI_PAUSED` VARCHAR(32) default '' NOT NULL,
`PRO_TRI_REASSIGNED` VARCHAR(32) default '' NOT NULL,
`PRO_TRI_UNPAUSED` VARCHAR(32) default '' NOT NULL,
`PRO_SHOW_DELEGATE` TINYINT default 1 NOT NULL,
`PRO_SHOW_DYNAFORM` TINYINT default 0 NOT NULL,
`PRO_CATEGORY` VARCHAR(48) default '' NOT NULL,

1
workflow/engine/data/oracle/schema.sql
View File

@@ -503,6 +503,7 @@ CREATE TABLE "PROCESS"
"PRO_TRI_CANCELED" VARCHAR2(32) default '' NOT NULL,
"PRO_TRI_PAUSED" VARCHAR2(32) default '' NOT NULL,
"PRO_TRI_REASSIGNED" VARCHAR2(32) default '' NOT NULL,
"PRO_TRI_UNPAUSED" VARCHAR2(32) default '' NOT NULL,
"PRO_SHOW_DELEGATE" NUMBER(3,0) default 1 NOT NULL,
"PRO_SHOW_DYNAFORM" NUMBER(3,0) default 0 NOT NULL,
"PRO_CATEGORY" VARCHAR2(48) default '' NOT NULL,

5
workflow/engine/xmlform/processes/processes_Edit.html
View File

@@ -58,7 +58,6 @@
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_SUBPROCESS}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_SUBPROCESS}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_TRI_DELETED}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TRI_DELETED}</td>
@@ -75,6 +74,10 @@
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_TRI_REASSIGNED}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TRI_REASSIGNED}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_TRI_UNPAUSED}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TRI_UNPAUSED}</td>
</tr>
<tr>
<td class="FormButton" colspan="2" align="center"><br/> {$form.SUBMIT} &nbsp; {$form.BTN_CANCEL} </td>
</tr>

11
workflow/engine/xmlform/processes/processes_Edit.xml
View File

@@ -43,6 +43,17 @@ WHERE
<PRO_TRI_CANCELED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is cancelled]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_CANCELED>
<PRO_TRI_PAUSED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is paused]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_PAUSED>
<PRO_TRI_REASSIGNED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is reassigned]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_REASSIGNED>
<PRO_TRI_UNPAUSED type="dropdown" required="0" readonly="0" optgroup="0" mode="edit">
<![CDATA[
SELECT TRI_UID, CON_VALUE
FROM TRIGGERS LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG')
WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC
]]>
<en>
Execute a trigger when a case is unpaused
<option name="">- Don't execute anything -</option>
</en>
</PRO_TRI_UNPAUSED>
<BTN_CANCEL type="button" onclick="cancel();">
<en><![CDATA[Cancel]]></en>
</BTN_CANCEL>