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

BUG 14958 "Perfil por creador de proceso" SOLVED

Browse Source 
- Perfil por creador de proceso.
- Problema resuelto, en el dynaform Edit Process se ha adicionado un dropdown que determina que tipo de proceso se crea
  con dos opciones Public y Private. En la lista de procesos se agrega una nueva columna Type Process que determina
  el tipo de proceso, en el listado se muestra todo los procesos publicos y privados creados por un mismo usuario a si
  tambien se muestrara los procesos publicos creados por otros usuarios. Al importar el proceso este se	importa	como publico.
This commit is contained in:
Luis Fernando Saisa Lopez
2014-09-23 16:40:22 -04:00
parent 80083ffff4
commit 161a5a164f
13 changed files with 195 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/class.processes.php
View File

@@ -3019,6 +3019,7 @@ class Processes
$oData->processVariables = $this->getProcessVariables($sProUid);
$oData->groupwfs = $this->groupwfsMerge($oData->groupwfs, $oData->processUser, "USR_UID");
$oData->process["PRO_TYPE_PROCESS"] = "PUBLIC";
//krumo ($oData);die;
//$oJSON = new Services_JSON();

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

@@ -620,6 +620,7 @@ class Process extends BaseProcess
$oCriteria->addSelectColumn( ProcessPeer::PRO_CREATE_DATE );
$oCriteria->addSelectColumn( ProcessPeer::PRO_CREATE_USER );
$oCriteria->addSelectColumn( ProcessPeer::PRO_DEBUG );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE_PROCESS);
$oCriteria->addSelectColumn( UsersPeer::USR_UID );
$oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
@@ -641,6 +642,10 @@ class Process extends BaseProcess
$oCriteria->addJoin( ProcessPeer::PRO_CREATE_USER, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
$oCriteria->addJoin( ProcessPeer::PRO_CATEGORY, ProcessCategoryPeer::CATEGORY_UID, Criteria::LEFT_JOIN );
$oCriteria->add(
$oCriteria->getNewCriterion(ProcessPeer::PRO_TYPE_PROCESS, "PUBLIC", Criteria::EQUAL)->addOr(
$oCriteria->getNewCriterion(ProcessPeer::PRO_CREATE_USER, $_SESSION["USER_LOGGED"], Criteria::EQUAL))
);
$this->tmpCriteria = clone $oCriteria;
@@ -697,6 +702,7 @@ class Process extends BaseProcess
foreach ($processes as $process) {
$proTitle = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] ) ? $processesDetails[$process['PRO_UID']]['PRO_TITLE'] : '';
$proDescription = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] ) ? $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] : '';
$process["PRO_TYPE_PROCESS"] = ($process["PRO_TYPE_PROCESS"] == "PUBLIC") ? G::LoadTranslation("ID_PUBLIC") : G::LoadTranslation("ID_PRIVATE");
// verify if the title is already set on the current language
if (trim( $proTitle ) == '') {

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

@@ -97,6 +97,8 @@ class ProcessMapBuilder
$tMap->addColumn('PRO_TRI_UNPAUSED', 'ProTriUnpaused', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TYPE_PROCESS', 'ProTypeProcess', '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

@@ -123,6 +123,12 @@ abstract class BaseProcess extends BaseObject implements Persistent
*/
protected $pro_tri_unpaused = '';
/**
* The value for the pro_type_process field.
* @var string
*/
protected $pro_type_process = 'PUBLIC';
/**
* The value for the pro_show_delegate field.
* @var int
@@ -403,6 +409,17 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->pro_tri_unpaused;
}
/**
* Get the [pro_type_process] column value.
*
* @return string
*/
public function getProTypeProcess()
{
return $this->pro_type_process;
}
/**
* Get the [pro_show_delegate] column value.
*
@@ -956,6 +973,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
} // setProTriUnpaused()
/**
* Set the value of [pro_type_process] column.
*
* @param string $v new value
* @return void
*/
public function setProTypeProcess($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_type_process !== $v || $v === 'PUBLIC') {
$this->pro_type_process = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_TYPE_PROCESS;
}
} // setProTypeProcess()
/**
* Set the value of [pro_show_delegate] column.
*
@@ -1349,42 +1388,44 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_tri_unpaused = $rs->getString($startcol + 15);
$this->pro_show_delegate = $rs->getInt($startcol + 16);
$this->pro_type_process = $rs->getString($startcol + 16);
$this->pro_show_dynaform = $rs->getInt($startcol + 17);
$this->pro_show_delegate = $rs->getInt($startcol + 17);
$this->pro_category = $rs->getString($startcol + 18);
$this->pro_show_dynaform = $rs->getInt($startcol + 18);
$this->pro_sub_category = $rs->getString($startcol + 19);
$this->pro_category = $rs->getString($startcol + 19);
$this->pro_industry = $rs->getInt($startcol + 20);
$this->pro_sub_category = $rs->getString($startcol + 20);
$this->pro_update_date = $rs->getTimestamp($startcol + 21, null);
$this->pro_industry = $rs->getInt($startcol + 21);
$this->pro_create_date = $rs->getTimestamp($startcol + 22, null);
$this->pro_update_date = $rs->getTimestamp($startcol + 22, null);
$this->pro_create_user = $rs->getString($startcol + 23);
$this->pro_create_date = $rs->getTimestamp($startcol + 23, null);
$this->pro_height = $rs->getInt($startcol + 24);
$this->pro_create_user = $rs->getString($startcol + 24);
$this->pro_width = $rs->getInt($startcol + 25);
$this->pro_height = $rs->getInt($startcol + 25);
$this->pro_title_x = $rs->getInt($startcol + 26);
$this->pro_width = $rs->getInt($startcol + 26);
$this->pro_title_y = $rs->getInt($startcol + 27);
$this->pro_title_x = $rs->getInt($startcol + 27);
$this->pro_debug = $rs->getInt($startcol + 28);
$this->pro_title_y = $rs->getInt($startcol + 28);
$this->pro_dynaforms = $rs->getString($startcol + 29);
$this->pro_debug = $rs->getInt($startcol + 29);
$this->pro_derivation_screen_tpl = $rs->getString($startcol + 30);
$this->pro_dynaforms = $rs->getString($startcol + 30);
$this->pro_derivation_screen_tpl = $rs->getString($startcol + 31);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 31; // 31 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 32; // 32 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Process object", $e);
@@ -1637,48 +1678,51 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->getProTriUnpaused();
break;
case 16:
return $this->getProShowDelegate();
return $this->getProTypeProcess();
break;
case 17:
return $this->getProShowDynaform();
return $this->getProShowDelegate();
break;
case 18:
return $this->getProCategory();
return $this->getProShowDynaform();
break;
case 19:
return $this->getProSubCategory();
return $this->getProCategory();
break;
case 20:
return $this->getProIndustry();
return $this->getProSubCategory();
break;
case 21:
return $this->getProUpdateDate();
return $this->getProIndustry();
break;
case 22:
return $this->getProCreateDate();
return $this->getProUpdateDate();
break;
case 23:
return $this->getProCreateUser();
return $this->getProCreateDate();
break;
case 24:
return $this->getProHeight();
return $this->getProCreateUser();
break;
case 25:
return $this->getProWidth();
return $this->getProHeight();
break;
case 26:
return $this->getProTitleX();
return $this->getProWidth();
break;
case 27:
return $this->getProTitleY();
return $this->getProTitleX();
break;
case 28:
return $this->getProDebug();
return $this->getProTitleY();
break;
case 29:
return $this->getProDynaforms();
return $this->getProDebug();
break;
case 30:
return $this->getProDynaforms();
break;
case 31:
return $this->getProDerivationScreenTpl();
break;
default:
@@ -1717,21 +1761,22 @@ abstract class BaseProcess extends BaseObject implements Persistent
$keys[13] => $this->getProTriPaused(),
$keys[14] => $this->getProTriReassigned(),
$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(),
$keys[16] => $this->getProTypeProcess(),
$keys[17] => $this->getProShowDelegate(),
$keys[18] => $this->getProShowDynaform(),
$keys[19] => $this->getProCategory(),
$keys[20] => $this->getProSubCategory(),
$keys[21] => $this->getProIndustry(),
$keys[22] => $this->getProUpdateDate(),
$keys[23] => $this->getProCreateDate(),
$keys[24] => $this->getProCreateUser(),
$keys[25] => $this->getProHeight(),
$keys[26] => $this->getProWidth(),
$keys[27] => $this->getProTitleX(),
$keys[28] => $this->getProTitleY(),
$keys[29] => $this->getProDebug(),
$keys[30] => $this->getProDynaforms(),
$keys[31] => $this->getProDerivationScreenTpl(),
);
return $result;
}
@@ -1812,48 +1857,51 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->setProTriUnpaused($value);
break;
case 16:
$this->setProShowDelegate($value);
$this->setProTypeProcess($value);
break;
case 17:
$this->setProShowDynaform($value);
$this->setProShowDelegate($value);
break;
case 18:
$this->setProCategory($value);
$this->setProShowDynaform($value);
break;
case 19:
$this->setProSubCategory($value);
$this->setProCategory($value);
break;
case 20:
$this->setProIndustry($value);
$this->setProSubCategory($value);
break;
case 21:
$this->setProUpdateDate($value);
$this->setProIndustry($value);
break;
case 22:
$this->setProCreateDate($value);
$this->setProUpdateDate($value);
break;
case 23:
$this->setProCreateUser($value);
$this->setProCreateDate($value);
break;
case 24:
$this->setProHeight($value);
$this->setProCreateUser($value);
break;
case 25:
$this->setProWidth($value);
$this->setProHeight($value);
break;
case 26:
$this->setProTitleX($value);
$this->setProWidth($value);
break;
case 27:
$this->setProTitleY($value);
$this->setProTitleX($value);
break;
case 28:
$this->setProDebug($value);
$this->setProTitleY($value);
break;
case 29:
$this->setProDynaforms($value);
$this->setProDebug($value);
break;
case 30:
$this->setProDynaforms($value);
break;
case 31:
$this->setProDerivationScreenTpl($value);
break;
} // switch()
@@ -1944,63 +1992,67 @@ abstract class BaseProcess extends BaseObject implements Persistent
}
if (array_key_exists($keys[16], $arr)) {
$this->setProShowDelegate($arr[$keys[16]]);
$this->setProTypeProcess($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setProShowDynaform($arr[$keys[17]]);
$this->setProShowDelegate($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setProCategory($arr[$keys[18]]);
$this->setProShowDynaform($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setProSubCategory($arr[$keys[19]]);
$this->setProCategory($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setProIndustry($arr[$keys[20]]);
$this->setProSubCategory($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
$this->setProUpdateDate($arr[$keys[21]]);
$this->setProIndustry($arr[$keys[21]]);
}
if (array_key_exists($keys[22], $arr)) {
$this->setProCreateDate($arr[$keys[22]]);
$this->setProUpdateDate($arr[$keys[22]]);
}
if (array_key_exists($keys[23], $arr)) {
$this->setProCreateUser($arr[$keys[23]]);
$this->setProCreateDate($arr[$keys[23]]);
}
if (array_key_exists($keys[24], $arr)) {
$this->setProHeight($arr[$keys[24]]);
$this->setProCreateUser($arr[$keys[24]]);
}
if (array_key_exists($keys[25], $arr)) {
$this->setProWidth($arr[$keys[25]]);
$this->setProHeight($arr[$keys[25]]);
}
if (array_key_exists($keys[26], $arr)) {
$this->setProTitleX($arr[$keys[26]]);
$this->setProWidth($arr[$keys[26]]);
}
if (array_key_exists($keys[27], $arr)) {
$this->setProTitleY($arr[$keys[27]]);
$this->setProTitleX($arr[$keys[27]]);
}
if (array_key_exists($keys[28], $arr)) {
$this->setProDebug($arr[$keys[28]]);
$this->setProTitleY($arr[$keys[28]]);
}
if (array_key_exists($keys[29], $arr)) {
$this->setProDynaforms($arr[$keys[29]]);
$this->setProDebug($arr[$keys[29]]);
}
if (array_key_exists($keys[30], $arr)) {
$this->setProDerivationScreenTpl($arr[$keys[30]]);
$this->setProDynaforms($arr[$keys[30]]);
}
if (array_key_exists($keys[31], $arr)) {
$this->setProDerivationScreenTpl($arr[$keys[31]]);
}
}
@@ -2078,6 +2130,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
$criteria->add(ProcessPeer::PRO_TRI_UNPAUSED, $this->pro_tri_unpaused);
}
if ($this->isColumnModified(ProcessPeer::PRO_TYPE_PROCESS)) {
$criteria->add(ProcessPeer::PRO_TYPE_PROCESS, $this->pro_type_process);
}
if ($this->isColumnModified(ProcessPeer::PRO_SHOW_DELEGATE)) {
$criteria->add(ProcessPeer::PRO_SHOW_DELEGATE, $this->pro_show_delegate);
}
@@ -2222,6 +2278,8 @@ abstract class BaseProcess extends BaseObject implements Persistent
$copyObj->setProTriUnpaused($this->pro_tri_unpaused);
$copyObj->setProTypeProcess($this->pro_type_process);
$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 = 31;
const NUM_COLUMNS = 32;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -79,6 +79,9 @@ abstract class BaseProcessPeer
/** the column name for the PRO_TRI_UNPAUSED field */
const PRO_TRI_UNPAUSED = 'PROCESS.PRO_TRI_UNPAUSED';
/** the column name for the PRO_TYPE_PROCESS field */
const PRO_TYPE_PROCESS = 'PROCESS.PRO_TYPE_PROCESS';
/** the column name for the PRO_SHOW_DELEGATE field */
const PRO_SHOW_DELEGATE = 'PROCESS.PRO_SHOW_DELEGATE';
@@ -135,10 +138,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', '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, )
BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', '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_TYPE_PROCESS, 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_TYPE_PROCESS', '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, 31, )
);
/**
@@ -148,10 +151,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, '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, )
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, 'ProTypeProcess' => 16, 'ProShowDelegate' => 17, 'ProShowDynaform' => 18, 'ProCategory' => 19, 'ProSubCategory' => 20, 'ProIndustry' => 21, 'ProUpdateDate' => 22, 'ProCreateDate' => 23, 'ProCreateUser' => 24, 'ProHeight' => 25, 'ProWidth' => 26, 'ProTitleX' => 27, 'ProTitleY' => 28, 'ProDebug' => 29, 'ProDynaforms' => 30, 'ProDerivationScreenTpl' => 31, ),
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_TYPE_PROCESS => 16, ProcessPeer::PRO_SHOW_DELEGATE => 17, ProcessPeer::PRO_SHOW_DYNAFORM => 18, ProcessPeer::PRO_CATEGORY => 19, ProcessPeer::PRO_SUB_CATEGORY => 20, ProcessPeer::PRO_INDUSTRY => 21, ProcessPeer::PRO_UPDATE_DATE => 22, ProcessPeer::PRO_CREATE_DATE => 23, ProcessPeer::PRO_CREATE_USER => 24, ProcessPeer::PRO_HEIGHT => 25, ProcessPeer::PRO_WIDTH => 26, ProcessPeer::PRO_TITLE_X => 27, ProcessPeer::PRO_TITLE_Y => 28, ProcessPeer::PRO_DEBUG => 29, ProcessPeer::PRO_DYNAFORMS => 30, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 31, ),
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_TYPE_PROCESS' => 16, 'PRO_SHOW_DELEGATE' => 17, 'PRO_SHOW_DYNAFORM' => 18, 'PRO_CATEGORY' => 19, 'PRO_SUB_CATEGORY' => 20, 'PRO_INDUSTRY' => 21, 'PRO_UPDATE_DATE' => 22, 'PRO_CREATE_DATE' => 23, 'PRO_CREATE_USER' => 24, 'PRO_HEIGHT' => 25, 'PRO_WIDTH' => 26, 'PRO_TITLE_X' => 27, 'PRO_TITLE_Y' => 28, 'PRO_DEBUG' => 29, 'PRO_DYNAFORMS' => 30, 'PRO_DERIVATION_SCREEN_TPL' => 31, ),
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, 31, )
);
/**
@@ -284,6 +287,8 @@ abstract class BaseProcessPeer
$criteria->addSelectColumn(ProcessPeer::PRO_TRI_UNPAUSED);
$criteria->addSelectColumn(ProcessPeer::PRO_TYPE_PROCESS);
$criteria->addSelectColumn(ProcessPeer::PRO_SHOW_DELEGATE);
$criteria->addSelectColumn(ProcessPeer::PRO_SHOW_DYNAFORM);

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

@@ -839,6 +839,7 @@
<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_TYPE_PROCESS" type="VARCHAR" size="32" required="true" default="PUBLIC"/>
<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

@@ -907,6 +907,7 @@ CREATE TABLE [PROCESS]
[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_TYPE_PROCESS] VARCHAR(32) default 'PUBLIC' 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

@@ -407,6 +407,7 @@ CREATE TABLE `PROCESS`
`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_TYPE_PROCESS` VARCHAR(32) default 'PUBLIC' 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

@@ -506,6 +506,7 @@ CREATE TABLE "PROCESS"
"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_TYPE_PROCESS" VARCHAR2(32) default 'PUBLIC' 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,

19
workflow/engine/methods/processes/processes_Map.php
View File

@@ -42,6 +42,25 @@ if ($access != 1) {
break;
}
}
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->add(ProcessPeer::PRO_UID, $_GET["PRO_UID"], Criteria::EQUAL);
$criteria->add(
$criteria->getNewCriterion(ProcessPeer::PRO_CREATE_USER, $_SESSION["USER_LOGGED"], Criteria::EQUAL)->addOr(
$criteria->getNewCriterion(ProcessPeer::PRO_TYPE_PROCESS, "PUBLIC", Criteria::EQUAL))
);
$rsCriteria = ProcessPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if (!$rsCriteria->next()) {
echo "You not have privileges to edit this process.";
exit(0);
}
$processUID = $_GET['PRO_UID'];
$_SESSION['PROCESS'] = $processUID;

8
workflow/engine/templates/processes/main.js
View File

@@ -61,7 +61,8 @@ Ext.onReady(function(){
{name : 'CASES_COUNT_TO_DO', type:'float'},
{name : 'CASES_COUNT_COMPLETED', type:'float'},
{name : 'CASES_COUNT_CANCELLED', type:'float'},
{name : 'PROJECT_TYPE', type:'string'}
{name : 'PROJECT_TYPE', type:'string'},
{name : "PRO_TYPE_PROCESS", type: "string"}
]
}),
@@ -216,8 +217,9 @@ Ext.onReady(function(){
{header: _('ID_DRAFT'), dataIndex: 'CASES_COUNT_DRAFT', width: 50, align:'right'},
{header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 70, align:'right'},
{header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 70, align:'right'},
{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 80,renderer:function(v){return "<b>"+v+"</b>";}, align:'right'},
{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}
{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 75,renderer:function(v){return "<b>"+v+"</b>";}, align:'right'},
{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'},
{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"}
]
}),
store: store,

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

@@ -78,6 +78,10 @@
<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="FormLabel" width="{$form_labelWidth}">{$PRO_TYPE_PROCESS}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TYPE_PROCESS}</td>
</tr>
<tr>
<td class="FormButton" colspan="2" align="center"><br/> {$form.SUBMIT} &nbsp; {$form.BTN_CANCEL} </td>
</tr>

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

@@ -54,6 +54,13 @@ WHERE
<option name="">- Don't execute anything -</option>
</en>
</PRO_TRI_UNPAUSED>
<PRO_TYPE_PROCESS type="dropdown" defaultvalue="PUBLIC" colWidth="80" titleAlign="left" align="left">
<en>
Type of process
<option name="PUBLIC">Public</option>
<option name="PRIVATE">Private</option>
</en>
</PRO_TYPE_PROCESS>
<BTN_CANCEL type="button" onclick="cancel();">
<en><![CDATA[Cancel]]></en>
</BTN_CANCEL>