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

Solving conflicts with branch 3.1-CONTENT

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-20 16:28:13 -04:00
parent 7592f29485 44a7f81750
commit 001901314b
74 changed files with 2694 additions and 2826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -270,6 +270,19 @@ CLI::taskArg('workspace', true, true);
CLI::taskRun("run_migrate_list_unassigned"); CLI::taskRun("run_migrate_list_unassigned");
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
CLI::taskName('migrate-content');
CLI::taskDescription(<<<EOT
Migrating the content schema to match the latest version
  Specify the WORKSPACE to migrate from a existing workspace.
If no workspace is specified, then the tables schema will be upgraded or
migrate on all available workspaces.
EOT
);
CLI::taskArg('workspace', true, true);
CLI::taskRun("run_migrate_content");
/** /**
* Function run_info * Function run_info
* access public * access public
@@ -845,3 +858,22 @@ function migrate_list_unassigned($command, $args, $opts) {
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
function run_migrate_content($args, $opts) {
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$args = $filter->xssFilterHard($args);
$workspaces = get_workspaces_from_args($args);
$lang = array_key_exists("lang", $opts) ? $opts['lang'] : SYS_LANG;
$start = microtime(true);
CLI::logging("> Optimizing content data...\n");
foreach ($workspaces as $workspace) {
if (!defined('SYS_SYS')) {
define('SYS_SYS', $workspace->name);
}
print_r('Regenerating content in: ' . pakeColor::colorize($workspace->name, 'INFO') . "\n");
CLI::logging("-> Regenerating content \n");
$workspace->migrateContentRun($workspace->name, $lang);
}
$stop = microtime(true);
CLI::logging("<*> Optimizing content data Process took " . ($stop - $start) . " seconds.\n");
}

118
workflow/engine/classes/class.AppSolr.php
View File

@@ -834,7 +834,7 @@ class AppSolr
$c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME'); $c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME');
$c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID'); $c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID');
$c->addAsColumn ('APP_TAS_TITLE', 'ctastitle.CON_VALUE'); $c->addAsColumn ('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
$c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS'); $c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS');
$c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE); $c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE);
@@ -853,7 +853,6 @@ class AppSolr
$c->addAlias ('u', 'USERS'); $c->addAlias ('u', 'USERS');
$c->addAlias ('uprev', 'USERS'); $c->addAlias ('uprev', 'USERS');
$c->addAlias ('adprev', 'APP_DELEGATION'); $c->addAlias ('adprev', 'APP_DELEGATION');
$c->addAlias ('ctastitle', 'CONTENT');
$c->addAlias ('at', 'APP_THREAD'); $c->addAlias ('at', 'APP_THREAD');
$aConditions = array (); $aConditions = array ();
@@ -880,14 +879,9 @@ class AppSolr
'adprev.DEL_INDEX' 'adprev.DEL_INDEX'
); );
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$aConditions = array (); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID);
$aConditions [] = array (
AppDelegationPeer::TAS_UID,
'ctastitle.CON_ID'
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$aConditions = array (); $aConditions = array ();
$aConditions [] = array ( $aConditions [] = array (
'adprev.USR_UID', 'adprev.USR_UID',
@@ -908,10 +902,7 @@ class AppSolr
$c->add (AppDelegationPeer::APP_UID, $aappUIDs, Criteria::IN ); $c->add (AppDelegationPeer::APP_UID, $aappUIDs, Criteria::IN );
//$c->add (AppDelegationPeer::DEL_INDEX, $delIndex); //$c->add (AppDelegationPeer::DEL_INDEX, $delIndex);
$c->add ('ctastitle.CON_CATEGORY', 'TAS_TITLE');
$c->add ('ctastitle.CON_LANG', 'en');
$rs = AppDelegationPeer::doSelectRS ($c); $rs = AppDelegationPeer::doSelectRS ($c);
$rs->setFetchmode (ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
// echo $c->toString(); // echo $c->toString();
@@ -954,7 +945,7 @@ class AppSolr
$c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME'); $c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME');
$c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID'); $c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID');
$c->addAsColumn ('APP_TAS_TITLE', 'ctastitle.CON_VALUE'); $c->addAsColumn ('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
$c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS'); $c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS');
$c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE); $c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE);
@@ -973,7 +964,6 @@ class AppSolr
$c->addAlias ('u', 'USERS'); $c->addAlias ('u', 'USERS');
$c->addAlias ('uprev', 'USERS'); $c->addAlias ('uprev', 'USERS');
$c->addAlias ('adprev', 'APP_DELEGATION'); $c->addAlias ('adprev', 'APP_DELEGATION');
$c->addAlias ('ctastitle', 'CONTENT');
$c->addAlias ('at', 'APP_THREAD'); $c->addAlias ('at', 'APP_THREAD');
$aConditions = array (); $aConditions = array ();
@@ -993,14 +983,9 @@ class AppSolr
'adprev.DEL_INDEX' 'adprev.DEL_INDEX'
); );
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$aConditions = array (); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID);
$aConditions [] = array (
AppDelegationPeer::TAS_UID,
'ctastitle.CON_ID'
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$aConditions = array (); $aConditions = array ();
$aConditions [] = array ( $aConditions [] = array (
'adprev.USR_UID', 'adprev.USR_UID',
@@ -1021,10 +1006,7 @@ class AppSolr
$c->add (AppDelegationPeer::APP_UID, $appUID); $c->add (AppDelegationPeer::APP_UID, $appUID);
$c->add (AppDelegationPeer::DEL_INDEX, $delIndex); $c->add (AppDelegationPeer::DEL_INDEX, $delIndex);
$c->add ('ctastitle.CON_CATEGORY', 'TAS_TITLE');
$c->add ('ctastitle.CON_LANG', 'en');
$rs = AppDelegationPeer::doSelectRS ($c); $rs = AppDelegationPeer::doSelectRS ($c);
$rs->setFetchmode (ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
// echo $c->toString(); // echo $c->toString();
@@ -2609,6 +2591,7 @@ class AppSolr
$c = new Criteria (); $c = new Criteria ();
$c->addSelectColumn (ApplicationPeer::APP_UID); $c->addSelectColumn (ApplicationPeer::APP_UID);
$c->addSelectColumn (ApplicationPeer::APP_TITLE);
$c->addSelectColumn (ApplicationPeer::APP_NUMBER); $c->addSelectColumn (ApplicationPeer::APP_NUMBER);
$c->addSelectColumn (ApplicationPeer::APP_STATUS); $c->addSelectColumn (ApplicationPeer::APP_STATUS);
$c->addSelectColumn (ApplicationPeer::PRO_UID); $c->addSelectColumn (ApplicationPeer::PRO_UID);
@@ -2616,10 +2599,9 @@ class AppSolr
$c->addSelectColumn (ApplicationPeer::APP_FINISH_DATE); $c->addSelectColumn (ApplicationPeer::APP_FINISH_DATE);
$c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn (ApplicationPeer::APP_DATA); $c->addSelectColumn (ApplicationPeer::APP_DATA);
$c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE'); $c->addSelectColumn (ProcessPeer::PRO_TITLE);
$c->addAsColumn ('PRO_TITLE', 'cpro.CON_VALUE');
$c->addSelectColumn ('ad.DEL_INDEX'); $c->addSelectColumn ('ad.DEL_INDEX');
$c->addSelectColumn ('ad.DEL_PREVIOUS'); $c->addSelectColumn ('ad.DEL_PREVIOUS');
$c->addSelectColumn ('ad.TAS_UID'); $c->addSelectColumn ('ad.TAS_UID');
@@ -2644,43 +2626,12 @@ class AppSolr
$c->addSelectColumn ('at.APP_THREAD_PARENT'); $c->addSelectColumn ('at.APP_THREAD_PARENT');
$c->addSelectColumn ('at.APP_THREAD_STATUS'); $c->addSelectColumn ('at.APP_THREAD_STATUS');
$c->addAlias ('capp', 'CONTENT');
$c->addAlias ('cpro', 'CONTENT');
$c->addAlias ('ad', 'APP_DELEGATION'); $c->addAlias ('ad', 'APP_DELEGATION');
$c->addAlias ('at', 'APP_THREAD'); $c->addAlias ('at', 'APP_THREAD');
$aConditions = array (); $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions [] = array (
ApplicationPeer::APP_UID,
'capp.CON_ID'
);
$aConditions [] = array (
'capp.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'APP_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'capp.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$aConditions = array ();
$aConditions [] = array (
ApplicationPeer::PRO_UID,
'cpro.CON_ID'
);
$aConditions [] = array (
'cpro.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'PRO_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'cpro.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN); $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);
$aConditions = array (); $aConditions = array ();
$aConditions [] = array ( $aConditions [] = array (
'ad.APP_UID', 'ad.APP_UID',
@@ -2725,6 +2676,7 @@ class AppSolr
$c = new Criteria (); $c = new Criteria ();
$c->addSelectColumn (ApplicationPeer::APP_UID); $c->addSelectColumn (ApplicationPeer::APP_UID);
$c->addSelectColumn (ApplicationPeer::APP_TITLE);
$c->addSelectColumn (ApplicationPeer::APP_NUMBER); $c->addSelectColumn (ApplicationPeer::APP_NUMBER);
$c->addSelectColumn (ApplicationPeer::APP_STATUS); $c->addSelectColumn (ApplicationPeer::APP_STATUS);
$c->addSelectColumn (ApplicationPeer::PRO_UID); $c->addSelectColumn (ApplicationPeer::PRO_UID);
@@ -2733,8 +2685,7 @@ class AppSolr
$c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn (ApplicationPeer::APP_DATA); $c->addSelectColumn (ApplicationPeer::APP_DATA);
$c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE'); $c->addSelectColumn ('pro.PRO_TITLE');
$c->addAsColumn ('PRO_TITLE', 'cpro.CON_VALUE');
$c->addSelectColumn ('ad.DEL_INDEX'); $c->addSelectColumn ('ad.DEL_INDEX');
$c->addSelectColumn ('ad.DEL_PREVIOUS'); $c->addSelectColumn ('ad.DEL_PREVIOUS');
@@ -2766,43 +2717,12 @@ class AppSolr
$c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY"); $c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY");
$c->addAlias ('capp', 'CONTENT');
$c->addAlias ('cpro', 'CONTENT');
$c->addAlias ('ad', 'APP_DELEGATION'); $c->addAlias ('ad', 'APP_DELEGATION');
$c->addAlias ('at', 'APP_THREAD'); $c->addAlias ('at', 'APP_THREAD');
$c->addAlias ('ade', 'APP_DELAY'); $c->addAlias ('ade', 'APP_DELAY');
$c->addAlias ("pro", ProcessPeer::TABLE_NAME); $c->addAlias ("pro", ProcessPeer::TABLE_NAME);
$aConditions = array (); $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions [] = array (
ApplicationPeer::APP_UID,
'capp.CON_ID'
);
$aConditions [] = array (
'capp.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'APP_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'capp.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$aConditions = array ();
$aConditions [] = array (
ApplicationPeer::PRO_UID,
'cpro.CON_ID'
);
$aConditions [] = array (
'cpro.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'PRO_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'cpro.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN); $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);
$aConditions = array (); $aConditions = array ();

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

@@ -200,32 +200,13 @@ class Cases
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::TAS_TITLE);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); $c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE'); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addAlias('C1', 'CONTENT');
$c->addAlias('C2', 'CONTENT');
$aConditions = array();
$aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
$aConditions[] = array(
'C1.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
$aConditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
$c->addAscendingOrderByColumn('PRO_TITLE'); $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$c->addAscendingOrderByColumn('TAS_TITLE'); $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();
@@ -304,11 +285,9 @@ class Cases
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::TAS_TITLE);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); $c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$c->addAlias('C1', 'CONTENT');
$c->addAlias('C2', 'CONTENT');
if ($typeView == 'category') { if ($typeView == 'category') {
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY'); $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME'); $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
@@ -322,28 +301,11 @@ class Cases
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
} }
$aConditions = array(); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
$aConditions[] = array(
'C1.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
$aConditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
$c->addAscendingOrderByColumn('PRO_TITLE'); $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$c->addAscendingOrderByColumn('TAS_TITLE'); $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -447,32 +409,13 @@ class Cases
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::TAS_TITLE);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); $c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE'); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addAlias('C1', 'CONTENT');
$c->addAlias('C2', 'CONTENT');
$aConditions = array();
$aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
$aConditions[] = array(
'C1.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
$aConditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
$c->addAscendingOrderByColumn('PRO_TITLE'); $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$c->addAscendingOrderByColumn('TAS_TITLE'); $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();
@@ -750,35 +693,23 @@ class Cases
for ($r = count($currentDelegations) - 1; $r >= 0; $r--) { for ($r = count($currentDelegations) - 1; $r >= 0; $r--) {
$c = new Criteria(); $c = new Criteria();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ContentPeer::CON_CATEGORY); $c->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
$c->addSelectColumn(ContentPeer::CON_VALUE); $c->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
$c->add(ContentPeer::CON_ID, $currentDelegations[$r]->getTasUid()); $c->add(TaskPeer::TAS_UID, $currentDelegations[$r]->getTasUid());
$c->add(ContentPeer::CON_LANG, $lang);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); while ($rs->next()) {
$row = $rs->getRow();
while (is_array($row)) {
switch ($row['CON_CATEGORY']) {
case 'TAS_DEF_TITLE':
$tasDefTitle = $row['CON_VALUE'];
if ($tasDefTitle != '' && !$bUpdatedDefTitle) {
$res['APP_TITLE'] = G::replaceDataField($tasDefTitle, $aAppData);
$bUpdatedDefTitle = true;
}
break;
case 'TAS_DEF_DESCRIPTION':
$tasDefDescription = $row['CON_VALUE'];
$tasDefDescription = $row['CON_VALUE'];
if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
$res['APP_DESCRIPTION'] = G::replaceDataField($tasDefDescription, $aAppData);
$bUpdatedDefDescription = true;
}
break;
}
$rs->next();
$row = $rs->getRow(); $row = $rs->getRow();
$tasDefTitle = $row['TAS_DEF_TITLE'];
if ($tasDefTitle != '' && !$bUpdatedDefTitle) {
$res['APP_TITLE'] = G::replaceDataField($tasDefTitle, $aAppData);
$bUpdatedDefTitle = true;
}
$tasDefDescription = $row['TAS_DEF_DESCRIPTION'];
if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
$res['APP_DESCRIPTION'] = G::replaceDataField($tasDefDescription, $aAppData);
$bUpdatedDefDescription = true;
}
} }
} }
return $res; return $res;
@@ -817,71 +748,51 @@ class Cases
while (is_array($rowCri)) { while (is_array($rowCri)) {
$c = new Criteria(); $c = new Criteria();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ContentPeer::CON_CATEGORY); $c->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
$c->addSelectColumn(ContentPeer::CON_VALUE); $c->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
$c->add(ContentPeer::CON_ID, $rowCri['TAS_UID']); $c->add(TaskPeer::TAS_UID, $rowCri['TAS_UID']);
$c->add(ContentPeer::CON_LANG, $lang);
$c->add(ContentPeer::CON_CATEGORY, array("TAS_DEF_TITLE", "TAS_DEF_DESCRIPTION"), Criteria::IN);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();
$tasDefTitle = trim($row['TAS_DEF_TITLE']);
if ($tasDefTitle != '' && !$bUpdatedDefTitle) {
$newAppTitle = G::replaceDataField($tasDefTitle, $aAppData);
$res['APP_TITLE'] = $newAppTitle;
if (!(isset($fields['APP_TITLE']) && $fields['APP_TITLE'] == $newAppTitle)) {
$bUpdatedDefTitle = true;
/// updating the value in content for row (APP_TITLE,$lan)
$con = Propel::getConnection('workflow');
$c1 = new Criteria('workflow');
$c1->add(ContentPeer::CON_CATEGORY, 'APP_TITLE');
$c1->add(ContentPeer::CON_ID, $sAppUid);
$c1->add(ContentPeer::CON_LANG, $lang);
switch ($row['CON_CATEGORY']) { // update set
case 'TAS_DEF_TITLE': $c2 = new Criteria('workflow');
if ($bUpdatedDefTitle) { $c2->add(ContentPeer::CON_VALUE, $newAppTitle);
break; BasePeer::doUpdate($c1, $c2, $con);
} }
$tasDefTitle = trim($row['CON_VALUE']); }
if ($tasDefTitle != '') { $tasDefDescription = trim($row['TAS_DEF_DESCRIPTION']);
$newAppTitle = G::replaceDataField($tasDefTitle, $aAppData); if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
$res['APP_TITLE'] = $newAppTitle; $newAppDescription = G::replaceDataField($tasDefDescription, $aAppData);
if (isset($fields['APP_TITLE']) && $fields['APP_TITLE'] == $newAppTitle) { $res['APP_DESCRIPTION'] = $newAppDescription;
break; if (!(isset($fields['APP_DESCRIPTION']) && $fields['APP_DESCRIPTION'] == $newAppDescription)) {
} $bUpdatedDefDescription = true;
$bUpdatedDefTitle = true; /// updating the value in content for row (APP_TITLE,$lan)
/// updating the value in content for row (APP_TITLE,$lan) $con = Propel::getConnection('workflow');
$con = Propel::getConnection('workflow'); $c1 = new Criteria('workflow');
$c1 = new Criteria('workflow'); $c1->add(ContentPeer::CON_CATEGORY, 'APP_DESCRIPTION');
$c1->add(ContentPeer::CON_CATEGORY, 'APP_TITLE'); $c1->add(ContentPeer::CON_ID, $sAppUid);
$c1->add(ContentPeer::CON_ID, $sAppUid); $c1->add(ContentPeer::CON_LANG, $lang);
$c1->add(ContentPeer::CON_LANG, $lang); // update set
$c2 = new Criteria('workflow');
// update set $c2->add(ContentPeer::CON_VALUE, $newAppDescription);
$c2 = new Criteria('workflow'); BasePeer::doUpdate($c1, $c2, $con);
$c2->add(ContentPeer::CON_VALUE, $newAppTitle); }
BasePeer::doUpdate($c1, $c2, $con);
}
break;
case 'TAS_DEF_DESCRIPTION':
if ($bUpdatedDefDescription) {
break;
}
$tasDefDescription = trim($row['CON_VALUE']);
if ($tasDefDescription != '') {
$newAppDescription = G::replaceDataField($tasDefDescription, $aAppData);
$res['APP_DESCRIPTION'] = $newAppDescription;
if (isset($fields['APP_DESCRIPTION']) &&
$fields['APP_DESCRIPTION'] == $newAppDescription) {
break;
}
$bUpdatedDefDescription = true;
/// updating the value in content for row (APP_TITLE,$lan)
$con = Propel::getConnection('workflow');
$c1 = new Criteria('workflow');
$c1->add(ContentPeer::CON_CATEGORY, 'APP_DESCRIPTION');
$c1->add(ContentPeer::CON_ID, $sAppUid);
$c1->add(ContentPeer::CON_LANG, $lang);
// update set
$c2 = new Criteria('workflow');
$c2->add(ContentPeer::CON_VALUE, $newAppDescription);
BasePeer::doUpdate($c1, $c2, $con);
}
break;
} }
} }
$rsCri->next(); $rsCri->next();
$rowCri = $rsCri->getRow(); $rowCri = $rsCri->getRow();
} }
@@ -2615,7 +2526,6 @@ class Cases
public function getTransferHistoryCriteria($sAppUid) public function getTransferHistoryCriteria($sAppUid)
{ {
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->addAsColumn('TAS_TITLE', 'TAS_TITLE.CON_VALUE');
$c->addSelectColumn(UsersPeer::USR_FIRSTNAME); $c->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$c->addSelectColumn(UsersPeer::USR_LASTNAME); $c->addSelectColumn(UsersPeer::USR_LASTNAME);
$c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE); $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -2639,6 +2549,7 @@ class Cases
$c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE); $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
$c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE); $c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE);
$c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE); $c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE);
$c->addSelectColumn(TaskPeer::TAS_TITLE);
//APP_DELEGATION LEFT JOIN USERS //APP_DELEGATION LEFT JOIN USERS
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
@@ -2651,14 +2562,8 @@ class Cases
$app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID); $app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID);
$c->addJoinMC($app, Criteria::LEFT_JOIN); $c->addJoinMC($app, Criteria::LEFT_JOIN);
//LEFT JOIN CONTENT TAS_TITLE //LEFT JOIN TASK TAS_TITLE
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$appTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$appTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
//WHERE //WHERE
$c->add(AppDelegationPeer::APP_UID, $sAppUid); $c->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -2742,6 +2647,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(ApplicationPeer::PRO_UID); $c->addSelectColumn(ApplicationPeer::PRO_UID);
@@ -2766,9 +2672,8 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
$c->addAsColumn( $c->addAsColumn(
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME,
@@ -2776,38 +2681,17 @@ class Cases
APP_LAST_USER.USR_FIRSTNAME)" APP_LAST_USER.USR_FIRSTNAME)"
); );
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT');
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
$c->addAlias("APP_LAST_USER", 'USERS'); $c->addAlias("APP_LAST_USER", 'USERS');
$c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
$c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
$appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
$c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
$proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
$tasTitleConds = array();
$tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$prevConds = array(); $prevConds = array();
$prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID'); $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
$prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS); $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
@@ -2991,6 +2875,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(ApplicationPeer::PRO_UID); $c->addSelectColumn(ApplicationPeer::PRO_UID);
@@ -3010,40 +2895,17 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT');
$c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
$c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
$appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
$c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
//
$proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
$proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
//
$tasTitleConds = array();
$tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$c->add(AppDelegationPeer::USR_UID, ''); $c->add(AppDelegationPeer::USR_UID, '');
$c->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN); $c->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
break; break;
@@ -3177,19 +3039,14 @@ class Cases
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
if ($titles) { if ($titles) {
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE'); $c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
} }
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
$c->addAsColumn( $c->addAsColumn(
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"); 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
if ($titles) {
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT');
}
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
$c->addAlias("APP_LAST_USER", 'USERS'); $c->addAlias("APP_LAST_USER", 'USERS');
@@ -3201,24 +3058,7 @@ class Cases
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
if ($titles) { if ($titles) {
$del = DBAdapter::getStringDelimiter(); $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
$proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
$tasTitleConds = array();
$tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
} }
$prevConds = array(); $prevConds = array();
@@ -3260,6 +3100,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY); $c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY);
@@ -3276,45 +3117,23 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
$c->addAsColumn( $c->addAsColumn(
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"); 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT');
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
$c->addAlias("APP_LAST_USER", 'USERS'); $c->addAlias("APP_LAST_USER", 'USERS');
$c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
$c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
$appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
$c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
$proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
$tasTitleConds = array();
$tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$prevConds = array(); $prevConds = array();
$prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID'); $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
$prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS); $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
@@ -5492,7 +5311,9 @@ class Cases
$appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $aTask['DEL_INDEX']); $appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $aTask['DEL_INDEX']);
if (!is_null($appDelegation)) { if (!is_null($appDelegation)) {
$arrayData2['TAS_TITLE'] = Content::load('TAS_TITLE', '', $appDelegation->getTasUid(), SYS_LANG); $oTask = new Task();
$aTask = $oTask->load($appDelegation->getTasUid());
$arrayData2['TAS_TITLE'] = $aTask['TAS_TITLE'];
$arrayData2['DEL_TASK_DUE_DATE'] = $appDelegation->getDelTaskDueDate(); $arrayData2['DEL_TASK_DUE_DATE'] = $appDelegation->getDelTaskDueDate();
} }
} else { } else {
@@ -6840,6 +6661,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY); $c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY);
@@ -6854,46 +6676,24 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
$c->addAsColumn( $c->addAsColumn(
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)" 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"
); );
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT');
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
$c->addAlias("APP_LAST_USER", 'USERS'); $c->addAlias("APP_LAST_USER", 'USERS');
$c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
$c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
$appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
$c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
$proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
$tasTitleConds = array();
$tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$prevConds = array(); $prevConds = array();
$prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID'); $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
$prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS); $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);

18
workflow/engine/classes/class.groups.php
View File

@@ -209,17 +209,11 @@ class Groups
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_UID, $gUIDs, Criteria::NOT_IN); $oCriteria->add(GroupwfPeer::GRP_UID, $gUIDs, Criteria::NOT_IN);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
if ($filter != '') { if ($filter != '') {
$oCriteria->add(ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE); $oCriteria->add(GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE);
} }
return $oCriteria; return $oCriteria;
} catch (exception $e) { } catch (exception $e) {
throw $e; throw $e;
@@ -240,18 +234,12 @@ class Groups
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN); $oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN);
$oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupUserPeer::USR_UID, $sUserUid, Criteria::EQUAL); $oCriteria->add(GroupUserPeer::USR_UID, $sUserUid, Criteria::EQUAL);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
if ($filter != '') { if ($filter != '') {
$oCriteria->add(ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE); $oCriteria->add(GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE);
} }
return $oCriteria; return $oCriteria;
} catch (exception $e) { } catch (exception $e) {
throw $e; throw $e;
@@ -261,7 +249,7 @@ class Groups
public function getGroupsForUser($usrUid) public function getGroupsForUser($usrUid)
{ {
$criteria = $this->getAssignedGroupsCriteria($usrUid); $criteria = $this->getAssignedGroupsCriteria($usrUid);
$criteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE); $criteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
$dataset = GroupwfPeer::doSelectRS($criteria); $dataset = GroupwfPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();

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

@@ -132,7 +132,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
$departmentInstance = new Department(); $departmentInstance = new Department();
try { try {
$department = $departmentInstance->load( $row['DAS_INS_OWNER_UID'] ); $department = $departmentInstance->load( $row['DAS_INS_OWNER_UID'] );
$row['DAS_INS_OWNER_TITLE'] = $department['DEPO_TITLE']; $row['DAS_INS_OWNER_TITLE'] = $department['DEP_TITLE'];
} catch (Exception $error) { } catch (Exception $error) {
$this->remove( $row['DAS_INS_UID'] ); $this->remove( $row['DAS_INS_UID'] );
$row['DAS_INS_UID'] = ''; $row['DAS_INS_UID'] = '';

53
workflow/engine/classes/class.pmFunctions.php
View File

@@ -1897,20 +1897,20 @@ function PMFGenerateOutputDocument ($outputID, $sApplication = null, $index = nu
* @label PMF Group List * @label PMF Group List
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFGroupList.28.29 * @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFGroupList.28.29
* *
* @param string | $regex = null | String to search | Optional parameter.
* @param int | $start = null | Start | Optional parameter.
* @param int | $limit = null | Limit | Optional parameter.
* @return array | $rows | List of groups | An array of groups * @return array | $rows | List of groups | An array of groups
* *
*/ */
function PMFGroupList () //its test was successfull function PMFGroupList ($regex = null, $start = null, $limit = null) //its test was successfull
{ {
G::LoadClass( 'wsBase' ); G::LoadClass( 'wsBase' );
$ws = new wsBase(); $ws = new wsBase();
$result = $ws->groupList(); $result = $ws->groupList($regex, $start, $limit);
$rows = Array (); $rows = array();
$i = 1;
if (isset( $result )) { if (isset( $result )) {
foreach ($result as $item) { $rows = array_combine(range(1, count($result)), array_values($result));
$rows[$i ++] = $item;
}
} }
return $rows; return $rows;
} }
@@ -2984,7 +2984,7 @@ function PMFSaveCurrentData ()
* @name PMFTasksListByProcessId * @name PMFTasksListByProcessId
* @label PMF Tasks List By Process Id * @label PMF Tasks List By Process Id
* @param string | $processId | ID Process | To get the current process id, use the system variable @@PROCESS * @param string | $processId | ID Process | To get the current process id, use the system variable @@PROCESS
* @param string | $lang | Language | Is the language of the text, that must be the same to the column: "CON_LANG" of the CONTENT table * @param string | $lang | Language | This parameter actually is not used, the same is kept by backward compatibility.Is the language of the text, that must be the same to the column: "CON_LANG" of the CONTENT table
* @return array | $result | Array result | Array of associative arrays which contain the unique task ID and title * @return array | $result | Array result | Array of associative arrays which contain the unique task ID and title
*/ */
function PMFTasksListByProcessId($processId, $lang = 'en') function PMFTasksListByProcessId($processId, $lang = 'en')
@@ -2992,11 +2992,7 @@ function PMFTasksListByProcessId($processId, $lang = 'en')
$result = array(); $result = array();
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(TaskPeer::TAS_UID); $criteria->addSelectColumn(TaskPeer::TAS_UID);
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->addSelectColumn(ContentPeer::CON_LANG);
$criteria->addJoin(TaskPeer::TAS_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN);
$criteria->add(ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL);
$criteria->add(ContentPeer::CON_LANG, $lang, Criteria::EQUAL);
$criteria->add(TaskPeer::PRO_UID, $processId, Criteria::EQUAL); $criteria->add(TaskPeer::PRO_UID, $processId, Criteria::EQUAL);
$ds = TaskPeer::doSelectRS($criteria); $ds = TaskPeer::doSelectRS($criteria);
$ds->setFetchmode(ResultSet::FETCHMODE_ASSOC); $ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -3033,12 +3029,8 @@ function PMFGetProcessUidByName($processName = '')
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(ProcessPeer::PRO_UID); $criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->add(ProcessPeer::PRO_TITLE, $processName, Criteria::EQUAL);
$criteria->addJoin(ContentPeer::CON_ID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $rsCriteria = ProcessPeer::doSelectRS($criteria);
$criteria->add(ContentPeer::CON_VALUE, $processName, Criteria::EQUAL);
$criteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL);
$rsCriteria = ContentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) { if ($rsCriteria->next()) {
@@ -3174,14 +3166,18 @@ function PMFDynaFormFields($dynUid, $appUid = false, $delIndex = 0)
* @name PMFGetTaskName * @name PMFGetTaskName
* @label PMF Get Task Title Text * @label PMF Get Task Title Text
* @param string | $taskUid | ID Task | Is the identifier of task, that must be the same to the column: "TAS_UID" of the TASK table * @param string | $taskUid | ID Task | Is the identifier of task, that must be the same to the column: "TAS_UID" of the TASK table
* @param string | $lang | Language | Is the language of the text, that must be the same to the column: "CON_LANG" of the CONTENT table * @param string | $lang | Language | This parameter actually is not used, the same is kept by backward compatibility. Is the language of the text, that must be the same to the column: "CON_LANG"
* of the CONTENT table
* @return string | $text | Translated text | the translated text of a string in Content * @return string | $text | Translated text | the translated text of a string in Content
*/ */
function PMFGetTaskName($taskUid, $lang = SYS_LANG) { function PMFGetTaskName($taskUid, $lang = SYS_LANG) {
if (empty($taskUid)) { if (empty($taskUid)) {
return false; return false;
} }
return PMFGeti18nText($taskUid, 'TAS_TITLE', $lang); $oTask = new \Task();
$aTasks = $oTask->load($taskUid);
$text = isset($aTasks["TAS_TITLE"]) ? $aTasks["TAS_TITLE"] : false;
return $text;
} }
/** /**
@@ -3256,7 +3252,20 @@ function PMFGetGroupUID($groupName)
*/ */
function PMFGetTaskUID($taskName, $proUid = null) function PMFGetTaskUID($taskName, $proUid = null)
{ {
return PMFGetUidFromText($taskName, 'TAS_TITLE', $proUid); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(TaskPeer::TAS_UID);
$oCriteria->add(TaskPeer::TAS_TITLE, $taskName);
if(!is_null($proUid)){
$oCriteria->add(TaskPeer::PRO_UID, $proUid);
}
$oDataset = TaskPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$uids = array();
while ($row = $oDataset->getRow()) {
$uids[] = $row['TAS_UID'];
$oDataset->next();
}
return $uids;
} }
/** /**

292
workflow/engine/classes/class.processMap.php
View File

@@ -98,48 +98,34 @@ class processMap
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(TaskPeer::PRO_UID); $oCriteria->addSelectColumn(TaskPeer::PRO_UID);
$oCriteria->addSelectColumn(TaskPeer::TAS_UID); $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
$oCriteria->addSelectColumn(TaskPeer::TAS_START); $oCriteria->addSelectColumn(TaskPeer::TAS_START);
$oCriteria->addSelectColumn(TaskPeer::TAS_POSX); $oCriteria->addSelectColumn(TaskPeer::TAS_POSX);
$oCriteria->addSelectColumn(TaskPeer::TAS_POSY); $oCriteria->addSelectColumn(TaskPeer::TAS_POSY);
$oCriteria->addSelectColumn(TaskPeer::TAS_COLOR); $oCriteria->addSelectColumn(TaskPeer::TAS_COLOR);
$oCriteria->addSelectColumn(TaskPeer::TAS_TYPE); $oCriteria->addSelectColumn(TaskPeer::TAS_TYPE);
$aConditions = array();
$aConditions[] = array(0 => TaskPeer::TAS_UID, 1 => ContentPeer::CON_ID);
$aConditions[] = array(0 => ContentPeer::CON_CATEGORY, 1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter() );
$aConditions[] = array(0 => ContentPeer::CON_LANG, 1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(TaskPeer::PRO_UID, $sProcessUID); $oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
$oDataset = TaskPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDataset = TaskPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow1 = $oDataset->getRow()) { while ($aRow1 = $oDataset->getRow()) {
$oTask = new StdClass(); $oTask = new stdClass();
$oTask->uid = $aRow1['TAS_UID']; $oTask->uid = $aRow1['TAS_UID'];
$oTask->task_type = $aRow1['TAS_TYPE']; $oTask->task_type = $aRow1['TAS_TYPE'];
if ($aRow1['TAS_TYPE'] == 'NORMAL') { if ($aRow1['TAS_TYPE'] == 'NORMAL') {
if (($aRow1['CON_VALUE'] == "")) { if (($aRow1['TAS_TITLE'] == "")) {
//There is no Label in Current SYS_LANG language so try to find in English - by default //There is no Label in Current SYS_LANG language so try to find in English - by default
$oTask1 = new Task(); $oTask1 = new Task();
$aFields1 = $oTask1->load($oTask->uid); $aFields1 = $oTask1->load($oTask->uid);
$aRow1['CON_VALUE'] = $oTask1->getTasTitle(); $aRow1['TAS_TITLE'] = $oTask1->getTasTitle();
} }
$oTask->label = htmlentities($aRow1['CON_VALUE'], ENT_QUOTES, 'UTF-8'); $oTask->label = htmlentities($aRow1['TAS_TITLE'], ENT_QUOTES, 'UTF-8');
} else { } else {
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$del = DBAdapter::getStringDelimiter();
$oCriteria->add(SubProcessPeer::PRO_PARENT, $aRow1['PRO_UID']); $oCriteria->add(SubProcessPeer::PRO_PARENT, $aRow1['PRO_UID']);
$oCriteria->add(SubProcessPeer::TAS_PARENT, $aRow1['TAS_UID']); $oCriteria->add(SubProcessPeer::TAS_PARENT, $aRow1['TAS_UID']);
$oCriteria->addJoin(SubProcessPeer::TAS_PARENT, TaskPeer::TAS_UID);
$oCriteria->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
$oCriteria->addAlias("C1", 'CONTENT');
$tasTitleConds = array();
$tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
$tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
$tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del);
$oCriteria->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$oDatasetX = SubProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDatasetX = SubProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDatasetX->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDatasetX->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDatasetX->next(); $oDatasetX->next();
@@ -153,10 +139,10 @@ class processMap
} }
} }
$oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false); $oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false);
$oTask->position = new StdClass(); $oTask->position = new stdClass();
$oTask->position->x = (int) $aRow1['TAS_POSX']; $oTask->position->x = (int) $aRow1['TAS_POSX'];
$oTask->position->y = (int) $aRow1['TAS_POSY']; $oTask->position->y = (int) $aRow1['TAS_POSY'];
$oTask->derivation = new StdClass(); $oTask->derivation = new stdClass();
$oTask->derivation->type = ''; $oTask->derivation->type = '';
$oTask->derivation->to = array(); $oTask->derivation->to = array();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
@@ -189,7 +175,7 @@ class processMap
$aRow2['ROU_TYPE'] = 8; $aRow2['ROU_TYPE'] = 8;
break; break;
} }
$oTo = new StdClass(); $oTo = new stdClass();
$oTo->task = $aRow2['ROU_NEXT_TASK']; $oTo->task = $aRow2['ROU_NEXT_TASK'];
$oTo->condition = $aRow2['ROU_CONDITION']; $oTo->condition = $aRow2['ROU_CONDITION'];
$oTo->executant = $aRow2['ROU_TO_LAST_USER']; $oTo->executant = $aRow2['ROU_TO_LAST_USER'];
@@ -967,13 +953,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID' );
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter );
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
@@ -983,7 +963,9 @@ class processMap
if (($aRow['INP_DOC_TITLE'] == null) || ($aRow['INP_DOC_TITLE'] == "")) { if (($aRow['INP_DOC_TITLE'] == null) || ($aRow['INP_DOC_TITLE'] == "")) {
// There is no transaltion for this Document name, try to get/regenerate the label // There is no transaltion for this Document name, try to get/regenerate the label
$aRow['INP_DOC_TITLE'] = Content::Load("INP_DOC_TITLE", "", $aRow['INP_DOC_UID'], SYS_LANG); $oInputDocument = new InputDocument;
$row = $oInputDocument->load($aRow['INP_DOC_UID']);
$aRow['INP_DOC_TITLE'] = $row['INP_DOC_TITLE'];
} }
$aBB[] = array('STEP_UID' => $aRow['INP_DOC_UID'], 'STEP_TITLE' => $aRow['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow['INP_DOC_UID'] . '">' ); $aBB[] = array('STEP_UID' => $aRow['INP_DOC_UID'], 'STEP_TITLE' => $aRow['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow['INP_DOC_UID'] . '">' );
$oDataset->next(); $oDataset->next();
@@ -1356,7 +1338,7 @@ class processMap
{ {
try { try {
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn('TAS_UID'); $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
$oCriteria->add(TaskPeer::PRO_UID, $sProcessUID); $oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
$oDataset = TaskPeer::doSelectRS($oCriteria); $oDataset = TaskPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -1366,50 +1348,29 @@ class processMap
while ($oDataset->next()) { while ($oDataset->next()) {
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
$aTasks[] = $aRow["TAS_UID"]; $aTasks[] = $aRow["TAS_UID"];
$iTaskNumber = $iTaskNumber + 1; $iTaskNumber = $iTaskNumber + 1;
} }
if ($iTaskNumber > 0) { if ($iTaskNumber > 0) {
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->addSelectColumn(ContentPeer::CON_LANG); $criteria->add(TaskPeer::TAS_UID, $aTasks, Criteria::IN);
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $rsSQLCON = TaskPeer::doSelectRS($criteria);
$criteria->add(ContentPeer::CON_ID, $aTasks, Criteria::IN);
$criteria->add(ContentPeer::CON_CATEGORY, "TAS_TITLE");
$rsSQLCON = ContentPeer::doSelectRS($criteria);
$rsSQLCON->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsSQLCON->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$numMaxLang = 0;
$numMax = 0; $numMax = 0;
while ($rsSQLCON->next()) { while ($rsSQLCON->next()) {
$row = $rsSQLCON->getRow(); $row = $rsSQLCON->getRow();
$conValue = $row["TAS_TITLE"];
$conLang = $row["CON_LANG"];
$conValue = $row["CON_VALUE"];
if (preg_match("/^\S+\s(\d+)$/", $conValue, $matches)) { if (preg_match("/^\S+\s(\d+)$/", $conValue, $matches)) {
$n = intval($matches[1]); $n = intval($matches[1]);
if ($n > $numMax) {
if ($conLang == SYS_LANG) { $numMax = $n;
if ($n > $numMaxLang) {
$numMaxLang = $n;
}
} else {
if ($n > $numMax) {
$numMax = $n;
}
} }
} }
} }
if ($numMaxLang > 0) {
$numMax = $numMaxLang;
}
if ($numMax > 0 && $numMax > $iTaskNumber) { if ($numMax > 0 && $numMax > $iTaskNumber) {
$iTaskNumber = $numMax + 1; $iTaskNumber = $numMax + 1;
} else { } else {
@@ -1420,7 +1381,7 @@ class processMap
} }
$oTask = new Task(); $oTask = new Task();
$oNewTask = new StdClass(); $oNewTask = new stdClass();
$oNewTask->label = G::LoadTranslation('ID_TASK') . ' ' . $iTaskNumber; $oNewTask->label = G::LoadTranslation('ID_TASK') . ' ' . $iTaskNumber;
$oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_WIDTH' => $iWidth, 'TAS_HEIGHT' => $iHeight )); $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_WIDTH' => $iWidth, 'TAS_HEIGHT' => $iHeight ));
$oNewTask->statusIcons = array(); $oNewTask->statusIcons = array();
@@ -2149,24 +2110,11 @@ class processMap
public function getInputDocumentsCriteria($sProcessUID = '') public function getInputDocumentsCriteria($sProcessUID = '')
{ {
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('INP_DOC_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAlias('C1', 'CONTENT');
$oCriteria->addAlias('C2', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C1.CON_ID' );
$aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter );
$aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C2.CON_ID' );
$aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'INP_DOC_DESCRIPTION' . $sDelimiter );
$aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
@@ -3198,17 +3146,11 @@ class processMap
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION);
@@ -3304,17 +3246,10 @@ class processMap
$aUIDS[] = $aRow['STEP_UID_OBJ']; $aUIDS[] = $aRow['STEP_UID_OBJ'];
$oDataset->next(); $oDataset->next();
} }
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN);
return $oCriteria; return $oCriteria;
@@ -3474,16 +3409,10 @@ class processMap
); );
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
$aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter());
$aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_UID, $aGRUS, Criteria::NOT_IN); $oCriteria->add(GroupwfPeer::GRP_UID, $aGRUS, Criteria::NOT_IN);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE); $oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
$oDataset = GroupwfPeer::doSelectRS($oCriteria); $oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -4068,14 +3997,9 @@ class processMap
$usersGroups = '<select pm:dependent="0" pm:label="' . G::LoadTranslation('ID_GROUP_USERS') . '" name="form[GROUP_USER]" id="form[GROUP_USER]" class="module_app_input___gray">'; $usersGroups = '<select pm:dependent="0" pm:label="' . G::LoadTranslation('ID_GROUP_USERS') . '" name="form[GROUP_USER]" id="form[GROUP_USER]" class="module_app_input___gray">';
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$aConditions = array();
$aConditions[] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
$aConditions[] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter());
$aConditions[] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oCriteria->addAscendingOrderByColumn('GRP_TITLE'); $oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
$oDataset = GroupwfPeer::doSelectRS($oCriteria); $oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -4325,13 +4249,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -4647,7 +4565,7 @@ class processMap
{ {
try { try {
$oTask = new Task(); $oTask = new Task();
$oNewTask = new StdClass(); $oNewTask = new stdClass();
$oNewTask->label = G::LoadTranslation('ID_SUBPROCESS'); $oNewTask->label = G::LoadTranslation('ID_SUBPROCESS');
$oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' )); $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' ));
//$oJSON = new Services_JSON(); //$oJSON = new Services_JSON();
@@ -4726,18 +4644,13 @@ class processMap
//print'<hr>';print_r($_DBArray['NewCase']);print'<hr>'; //print'<hr>';print_r($_DBArray['NewCase']);print'<hr>';
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn(TaskPeer::TAS_UID);
$oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
$oCriteria->addSelectColumn(SubProcessPeer::SP_VARIABLES_OUT);
$oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID); $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID);
$oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID); $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID);
$oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID); $oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID);
$oCriteria->addJoin(SubProcessPeer::TAS_PARENT, TaskPeer::TAS_UID);
$oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE');
$oCriteria->addAlias("C1", 'CONTENT');
$tasTitleConds = array();
$tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
$tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
$tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del );
$oCriteria->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$oDataset = SubProcessPeer::doSelectRS($oCriteria); $oDataset = SubProcessPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -4746,8 +4659,7 @@ class processMap
$aRow['TASKS'] = $aRow['TAS_UID']; $aRow['TASKS'] = $aRow['TAS_UID'];
//print "<hr>".$aRow['TASKS']."<hr>"; //print "<hr>".$aRow['TASKS']."<hr>";
//$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
$aRow['TAS_TITLE'] = $aRow['CON_VALUE']; $aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
$aRow['SPROCESS_NAME'] = $aRow['CON_VALUE'];
$SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']); $SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']);
if (is_array($SP_VARIABLES_OUT)) { if (is_array($SP_VARIABLES_OUT)) {
$i = 1; $i = 1;
@@ -4792,25 +4704,22 @@ class processMap
$c = new Criteria(); $c = new Criteria();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::TAS_TITLE);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->add(TaskPeer::TAS_START, 'TRUE'); $c->add(TaskPeer::TAS_START, 'TRUE');
$c->add(TaskPeer::PRO_UID, $aUIDS, Criteria::NOT_IN); $c->add(TaskPeer::PRO_UID, $aUIDS, Criteria::NOT_IN);
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
//$c->add(TaskPeer::PRO_UID, $sProcessUID, Criteria::NOT_EQUAL); //$c->add(TaskPeer::PRO_UID, $sProcessUID, Criteria::NOT_EQUAL);
$rs = TaskPeer::doSelectRS($c); $rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
$row = $rs->getRow();
while (is_array($row)) {
$tasks[] = array('TAS_UID' => $row['TAS_UID'], 'PRO_UID' => $row['PRO_UID'] );
$rs->next();
$row = $rs->getRow();
}
$rows[] = array('uid' => 'char', 'value' => 'char', 'pro_uid' => 'char' ); $rows[] = array('uid' => 'char', 'value' => 'char', 'pro_uid' => 'char' );
foreach ($tasks as $key => $val) { while ($rs->next()) {
$tasTitle = Content::load('TAS_TITLE', '', $val['TAS_UID'], SYS_LANG); $row = $rs->getRow();
$proTitle = Content::load('PRO_TITLE', '', $val['PRO_UID'], SYS_LANG); $proTitle = $row['PRO_TITLE'];
$tasTitle = $row['TAS_TITLE'];
$title = " $proTitle ($tasTitle)"; $title = " $proTitle ($tasTitle)";
$rows[] = array('uid' => $val['TAS_UID'], 'value' => $title, 'pro_uid' => $val['PRO_UID'] ); $rows[] = array('uid' => $row['TAS_UID'], 'value' => $title, 'pro_uid' => $row['PRO_UID'] );
} }
return $rows; return $rows;
} }
@@ -5362,13 +5271,7 @@ class processMap
$sDelimiter = DBAdapter::getStringDelimiter(); $sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(GroupwfPeer::GRP_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN); $oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN);
//$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL); //$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL);
@@ -5487,13 +5390,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -5973,26 +5870,13 @@ class processMap
public function getExtInputDocumentsCriteria($start, $limit, $sProcessUID = '') public function getExtInputDocumentsCriteria($start, $limit, $sProcessUID = '')
{ {
$aTasks = $this->getAllInputDocsByTask($sProcessUID); $aTasks = $this->getAllInputDocsByTask($sProcessUID);
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_VERSIONING); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_VERSIONING);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESTINATION_PATH); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESTINATION_PATH);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('INP_DOC_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAlias('C1', 'CONTENT');
$oCriteria->addAlias('C2', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C1.CON_ID');
$aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C2.CON_ID');
$aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'INP_DOC_DESCRIPTION' . $sDelimiter);
$aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$this->tmpCriteria = clone $oCriteria; $this->tmpCriteria = clone $oCriteria;
@@ -6138,17 +6022,13 @@ class processMap
} }
//print'<hr>';print_r($_DBArray['NewCase']);print'<hr>'; //print'<hr>';print_r($_DBArray['NewCase']);print'<hr>';
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$del = DBAdapter::getStringDelimiter(); $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
$oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID); $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID);
$oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID); $oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID);
$oCriteria->addJoin(SubProcessPeer::TAS_PARENT, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE'); $oCriteria->addJoin(SubProcessPeer::PRO_PARENT, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$oCriteria->addAlias("C1", 'CONTENT');
$tasTitleConds = array();
$tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID');
$tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del);
$oCriteria->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
$oDataset = SubProcessPeer::doSelectRS($oCriteria); $oDataset = SubProcessPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -6166,11 +6046,7 @@ class processMap
$aRow['TASKS'] = $aRow['TAS_UID']; $aRow['TASKS'] = $aRow['TAS_UID'];
//print "<hr>".$aRow['TASKS']."<hr>"; //print "<hr>".$aRow['TASKS']."<hr>";
//$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
$aRow['TAS_TITLE'] = $aRow['CON_VALUE']; $aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
$aRow['SPROCESS_NAME'] = $aRow['CON_VALUE'];
$lang = defined('SYS_LANG') ? SYS_LANG : 'en';
$aRow['PRO_TITLE'] = Content::load('PRO_TITLE', '', $aRow['PRO_UID'], $lang);
if ($sType == 0) { if ($sType == 0) {
$SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']); $SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']);
if (is_array($SP_VARIABLES_OUT)) { if (is_array($SP_VARIABLES_OUT)) {
@@ -6471,17 +6347,11 @@ class processMap
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION);
@@ -6525,16 +6395,7 @@ class processMap
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID'
);
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter
);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter
);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -6630,31 +6491,20 @@ class processMap
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(TaskPeer::PRO_UID); $oCriteria->addSelectColumn(TaskPeer::PRO_UID);
$oCriteria->addSelectColumn(TaskPeer::TAS_UID); $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
$aConditions = array();
$aConditions[] = array(0 => TaskPeer::TAS_UID, 1 => ContentPeer::CON_ID );
$aConditions[] = array(0 => ContentPeer::CON_CATEGORY, 1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter() );
$aConditions[] = array(0 => ContentPeer::CON_LANG, 1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(TaskPeer::PRO_UID, $sProcessUID); $oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
$oDataset = TaskPeer::doSelectRS($oCriteria); $oDataset = TaskPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$aAllTasks[] = array('UID' => $aRow['TAS_UID'], 'LABEL' => $aRow['CON_VALUE'] $aAllTasks[] = array('UID' => $aRow['TAS_UID'], 'LABEL' => $aRow['TAS_TITLE']);
);
$oDataset->next(); $oDataset->next();
} }
$aUsersGroups = array(); $aUsersGroups = array();
$aUsersGroups[] = array('UID' => 'char', 'LABEL' => 'char' ); $aUsersGroups[] = array('UID' => 'char', 'LABEL' => 'char' );
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$aConditions = array();
$aConditions[] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID );
$aConditions[] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter() );
$aConditions[] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oDataset = GroupwfPeer::doSelectRS($oCriteria); $oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -6887,13 +6737,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -7004,13 +6848,7 @@ class processMap
$sDelimiter = DBAdapter::getStringDelimiter(); $sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(GroupwfPeer::GRP_UID, 'C.CON_ID' );
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN); $oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN);
//$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL); //$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL);
@@ -7176,8 +7014,12 @@ class processMap
$aFields['OP_ACTION'] = $aRows['OP_ACTION']; $aFields['OP_ACTION'] = $aRows['OP_ACTION'];
$lang = defined('SYS_LANG') ? SYS_LANG : 'en'; $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
$aFields['TASK_TARGET_NAME'] = Content::load('TAS_TITLE', '', $aRows['TAS_UID'], $lang); $oTask = new Task();
$aFields['TASK_SOURCE_NAME'] = Content::load('TAS_TITLE', '', $aRows['OP_TASK_SOURCE'], $lang); $aTask = $oTask->load($aRows['TAS_UID']);
$aFields['TASK_TARGET_NAME'] = $aTask['TAS_TITLE'];
$oTask = new Task();
$aTask = $oTask->load($aRows['OP_TASK_SOURCE']);
$aFields['TASK_SOURCE_NAME'] = $aTask['TAS_TITLE'];
$oUser = UsersPeer::retrieveByPK($aRows['USR_UID']); $oUser = UsersPeer::retrieveByPK($aRows['USR_UID']);
if (!is_null($oUser)) { if (!is_null($oUser)) {
$aFields['USR_FULLNAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); $aFields['USR_FULLNAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();

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

@@ -1935,7 +1935,7 @@ class Processes
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$oInput = new InputDocument(); $oInput = new InputDocument();
$aInput[] = $oInput->Load($aRow['INP_DOC_UID']); $aInput[] = $oInput->load($aRow['INP_DOC_UID']);
$oDataset->next(); $oDataset->next();
} }
return $aInput; return $aInput;
@@ -4326,10 +4326,7 @@ class Processes
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$criteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$criteria->add(ContentPeer::CON_CATEGORY, "GRP_TITLE", Criteria::EQUAL);
$criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL);
$rsCriteria = GroupwfPeer::doSelectRS($criteria); $rsCriteria = GroupwfPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4349,7 +4346,7 @@ class Processes
foreach ($arrayGroupwf as $key2 => $value2) { foreach ($arrayGroupwf as $key2 => $value2) {
$groupwfRecord = $value2; $groupwfRecord = $value2;
if ($groupwfRecord["CON_VALUE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) { if ($groupwfRecord["GRP_TITLE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
//Update unique id //Update unique id
$uidOld = $data->groupwfs[$key]["GRP_UID"]; $uidOld = $data->groupwfs[$key]["GRP_UID"];
@@ -4763,12 +4760,8 @@ class Processes
$aGroupwf = array(); $aGroupwf = array();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_ID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
$oDataset = ContentPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
@@ -4779,7 +4772,7 @@ class Processes
if (is_array($sGroupList)) { if (is_array($sGroupList)) {
foreach ($aGroupwf as $groupBase) { foreach ($aGroupwf as $groupBase) {
foreach ($sGroupList as $group) { foreach ($sGroupList as $group) {
if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) { if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
$oPro = GroupwfPeer::retrieveByPk( $group['GRP_UID'] ); $oPro = GroupwfPeer::retrieveByPk( $group['GRP_UID'] );
if(is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') { if(is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
$group['GRP_UID'] = G::generateUniqueID(); $group['GRP_UID'] = G::generateUniqueID();
@@ -4843,12 +4836,8 @@ class Processes
{ {
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_ID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, 'en');
$oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
$oDataset = ContentPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
@@ -4859,7 +4848,7 @@ class Processes
foreach ($sGroupList as $group) { foreach ($sGroupList as $group) {
$merged = false; $merged = false;
foreach ($aGroupwf as $groupBase) { foreach ($aGroupwf as $groupBase) {
if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) { if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
$group['GRP_UID'] = $groupBase['CON_ID']; $group['GRP_UID'] = $groupBase['CON_ID'];
$mergedGroupList[] = $group; $mergedGroupList[] = $group;
$merged = true; $merged = true;
@@ -5942,13 +5931,7 @@ class Processes
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(ProcessPeer::PRO_UID); $criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->addAsColumn("PRO_TITLE", ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$arrayCondition = array();
$arrayCondition[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::EQUAL);
$arrayCondition[] = array(ContentPeer::CON_CATEGORY, $delimiter . "PRO_TITLE" . $delimiter, Criteria::EQUAL);
$arrayCondition[] = array(ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
if (!is_null($processUid)) { if (!is_null($processUid)) {
$criteria->add(ProcessPeer::PRO_UID, $processUid, Criteria::EQUAL); $criteria->add(ProcessPeer::PRO_UID, $processUid, Criteria::EQUAL);

87
workflow/engine/classes/class.report.php
View File

@@ -53,24 +53,15 @@ class Report
require_once 'classes/model/AppDelegation.php'; require_once 'classes/model/AppDelegation.php';
require_once 'classes/model/Application.php'; require_once 'classes/model/Application.php';
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$oCriteria->addAlias( "C1", 'CONTENT' );
$proTitleConds = array ();
$proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
);
$proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
);
$proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addGroupByColumn( 'C1.CON_VALUE' ); $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE);
$oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
@@ -119,20 +110,12 @@ class Report
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( UsersPeer::USR_UID ); $oCriteria->addSelectColumn( UsersPeer::USR_UID );
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); $oCriteria->addJoin (AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$oCriteria->addAlias( "C1", 'CONTENT' );
$proTitleConds = array ();
$proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
);
$proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
);
$proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
$oCriteria->addJoin( AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
//$oCriteria->add(AppDelegationPeer::DEL_DURATION, $from, Criteria::GREATER_EQUAL); //$oCriteria->add(AppDelegationPeer::DEL_DURATION, $from, Criteria::GREATER_EQUAL);
//$oCriteria->add(AppDelegationPeer::DEL_DURATION, $to, Criteria::LESS_EQUAL); //$oCriteria->add(AppDelegationPeer::DEL_DURATION, $to, Criteria::LESS_EQUAL);
@@ -144,7 +127,7 @@ class Report
} }
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addGroupByColumn( 'C1.CON_VALUE' ); $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE);
$oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
@@ -194,29 +177,17 @@ class Report
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN );
$oCriteria->addAsColumn( 'TAS_TITLE', 'C.CON_VALUE' );
$oCriteria->addAlias( "C", 'CONTENT' );
$proContentConds = array ();
$proContentConds[] = array (AppDelegationPeer::TAS_UID,'C.CON_ID'
);
$proContentConds[] = array ('C.CON_CATEGORY',$del . 'TAS_TITLE' . $del
);
$proContentConds[] = array ('C.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $proContentConds, Criteria::LEFT_JOIN );
$oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID ); $oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID );
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addGroupByColumn( 'C.CON_VALUE' ); $oCriteria->addGroupByColumn( TaskPeer::TAS_TITLE );
$oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
@@ -257,18 +228,10 @@ class Report
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); $oCriteria->addJoin (AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$oCriteria->addAlias( "C1", 'CONTENT' );
$proTitleConds = array ();
$proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
);
$proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
);
$proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
$oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
@@ -359,25 +322,13 @@ class Report
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN );
$oCriteria->addAsColumn( 'TAS_TITLE', 'C.CON_VALUE' );
$oCriteria->addAlias( "C", 'CONTENT' );
$proContentConds = array ();
$proContentConds[] = array (AppDelegationPeer::TAS_UID,'C.CON_ID'
);
$proContentConds[] = array ('C.CON_CATEGORY',$del . 'TAS_TITLE' . $del
);
$proContentConds[] = array ('C.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $proContentConds, Criteria::LEFT_JOIN );
$oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) ); $oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );
if ($startedby != '') { if ($startedby != '') {
@@ -387,7 +338,7 @@ class Report
$oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID ); $oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID );
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addGroupByColumn( 'C.CON_VALUE' ); $oCriteria->addGroupByColumn( TaskPeer::TAS_TITLE );
return $oCriteria; return $oCriteria;
} }
@@ -413,20 +364,12 @@ class Report
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
$oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$oCriteria->addAlias( "C1", 'CONTENT' );
$proTitleConds = array ();
$proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
);
$proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
);
$proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addGroupByColumn( 'C1.CON_VALUE' ); $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE);
$oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) ); $oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );

14
workflow/engine/classes/class.tasks.php
View File

@@ -87,21 +87,16 @@ class Tasks
{ {
try { try {
$aTasks = array(); $aTasks = array();
$sDelimiter = @DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->add(TaskPeer::PRO_UID, $sProUid); $oCriteria->add(TaskPeer::PRO_UID, $sProUid);
$aConditions = array(); $oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
$aConditions[] = array(TaskPeer::TAS_UID, ContentPeer::CON_ID);
$aConditions[] = array(ContentPeer::CON_CATEGORY, $sDelimiter . 'TAS_TITLE' . $sDelimiter);
$aConditions[] = array(ContentPeer::CON_LANG, $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$oDataset = TaskPeer::doSelectRS($oCriteria); $oDataset = TaskPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$oTask = new Task(); $oTask = new Task();
$aTasks[] = $oTask->Load($aRow['TAS_UID']); $aTasks[] = $oTask->load($aRow['TAS_UID']);
$oDataset->next(); $oDataset->next();
} }
return $aTasks; return $aTasks;
@@ -703,6 +698,7 @@ class Tasks
try { try {
$aTasks = array(); $aTasks = array();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->add(TaskPeer::PRO_UID, $sProUid); $oCriteria->add(TaskPeer::PRO_UID, $sProUid);
//$oCriteria->add(TaskPeer::TAS_USER, $sUsrUid); //$oCriteria->add(TaskPeer::TAS_USER, $sUsrUid);
$oCriteria->add(TaskPeer::TAS_START, 'TRUE'); $oCriteria->add(TaskPeer::TAS_START, 'TRUE');
@@ -711,7 +707,7 @@ class Tasks
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$oTask = new Task(); $oTask = new Task();
$aTasks[] = $oTask->Load($aRow['TAS_UID']); $aTasks[] = $oTask->load($aRow['TAS_UID']);
$oDataset->next(); $oDataset->next();
} }
return $aTasks; return $aTasks;

102
workflow/engine/classes/class.wsBase.php
View File

@@ -178,7 +178,7 @@ class wsBase
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$oProcess = new Process(); $oProcess = new Process();
$arrayProcess = $oProcess->Load( $aRow['PRO_UID'] ); $arrayProcess = $oProcess->load( $aRow['PRO_UID'] );
$result[] = array ('guid' => $aRow['PRO_UID'],'name' => $arrayProcess['PRO_TITLE'] $result[] = array ('guid' => $aRow['PRO_UID'],'name' => $arrayProcess['PRO_TITLE']
); );
$oDataset->next(); $oDataset->next();
@@ -229,32 +229,40 @@ class wsBase
/** /**
* get all groups * get all groups
* *
* @param none * @param null $search
* @return $result will return an object * @param null $regex
* @param null $start
* @param null $limit
* @return array|stdClass
*/ */
public function groupList () public function groupList($regex = null, $start = null, $limit = null)
{ {
try { try {
$result = array (); $criteria = new Criteria('workflow');
$oCriteria = new Criteria( 'workflow' ); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' ); $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oDataset = GroupwfPeer::doSelectRS( $oCriteria ); $criteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $criteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
$oDataset->next(); if ($regex) {
$regex = GroupwfPeer::GRP_TITLE . " REGEXP '" . $regex . "'";
while ($aRow = $oDataset->getRow()) { $criteria->add(GroupwfPeer::GRP_TITLE, $regex, Criteria::CUSTOM);
$oGroupwf = new Groupwf(); }
$arrayGroupwf = $oGroupwf->Load( $aRow['GRP_UID'] ); if ($start) {
$result[] = array ('guid' => $aRow['GRP_UID'],'name' => $arrayGroupwf['GRP_TITLE'] $criteria->setOffset($start);
); }
$oDataset->next(); if ($limit) {
$criteria->setLimit($limit);
}
$rs = GroupwfPeer::doSelectRS($criteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result = array();
while ($rs->next()) {
$rows = $rs->getRow();
$result[] = array('guid' => $rows['GRP_UID'], 'name' => $rows['GRP_TITLE']);
} }
return $result; return $result;
} catch (Exception $e) { } catch (Exception $e) {
$result[] = array ('guid' => $e->getMessage(),'name' => $e->getMessage() $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage());
);
return $result; return $result;
} }
} }
@@ -279,7 +287,7 @@ class wsBase
$oDepartment = new Department(); $oDepartment = new Department();
$aDepartment = $oDepartment->Load( $aRow['DEP_UID'] ); $aDepartment = $oDepartment->Load( $aRow['DEP_UID'] );
$node['guid'] = $aRow['DEP_UID']; $node['guid'] = $aRow['DEP_UID'];
$node['name'] = $aDepartment['DEPO_TITLE']; $node['name'] = $aDepartment['DEP_TITLE'];
$node['parentUID'] = $aDepartment['DEP_PARENT']; $node['parentUID'] = $aDepartment['DEP_PARENT'];
$node['dn'] = $aDepartment['DEP_LDAP_DN']; $node['dn'] = $aDepartment['DEP_LDAP_DN'];
@@ -838,7 +846,7 @@ class wsBase
public function taskList ($userId) public function taskList ($userId)
{ {
try { try {
g::loadClass( 'groups' ); G::LoadClass( 'groups' );
$oGroup = new Groups(); $oGroup = new Groups();
$aGroups = $oGroup->getActiveGroupsForAnUser( $userId ); $aGroups = $oGroup->getActiveGroupsForAnUser( $userId );
@@ -847,19 +855,9 @@ class wsBase
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( TaskPeer::PRO_UID ); $oCriteria->addSelectColumn( TaskPeer::PRO_UID );
$oCriteria->addSelectColumn( TaskPeer::TAS_UID ); $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
$oCriteria->addSelectColumn( TaskPeer::TAS_START ); $oCriteria->addSelectColumn( TaskPeer::TAS_START );
$oCriteria->setDistinct(); $oCriteria->setDistinct();
$oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
$oCriteria->addAlias( "C1", 'CONTENT' );
$tasTitleConds = array ();
$tasTitleConds[] = array (TaskPeer::TAS_UID,'C1.CON_ID'
);
$tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del
);
$tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $tasTitleConds, Criteria::LEFT_JOIN );
$oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN );
$oCriteria->addOr( TaskUserPeer::USR_UID, $userId ); $oCriteria->addOr( TaskUserPeer::USR_UID, $userId );
$oCriteria->addOr( TaskUserPeer::USR_UID, $aGroups, Criteria::IN ); $oCriteria->addOr( TaskUserPeer::USR_UID, $aGroups, Criteria::IN );
@@ -1952,7 +1950,7 @@ class wsBase
$pro = $oProcesses->processExists( $processId ); $pro = $oProcesses->processExists( $processId );
if (! $pro) { if (! $pro) {
$result = new wsResponse( 11, G::loadTranslation( 'ID_INVALID_PROCESS' ) . " " . $processId ); $result = new wsResponse( 11, G::LoadTranslation( 'ID_INVALID_PROCESS' ) . " " . $processId );
$g->sessionVarRestore(); $g->sessionVarRestore();
@@ -1984,7 +1982,7 @@ class wsBase
} }
if ($tasksInThisProcess > 1) { if ($tasksInThisProcess > 1) {
$result = new wsResponse( 13, G::loadTranslation( 'ID_MULTIPLE_STARTING_TASKS' ) ); $result = new wsResponse( 13, G::LoadTranslation( 'ID_MULTIPLE_STARTING_TASKS' ) );
$g->sessionVarRestore(); $g->sessionVarRestore();
@@ -1997,7 +1995,7 @@ class wsBase
$arrayTaskTypeToExclude = array("START-TIMER-EVENT"); $arrayTaskTypeToExclude = array("START-TIMER-EVENT");
if (!is_null($task) && !in_array($task->getTasType(), $arrayTaskTypeToExclude) && $founded == "") { if (!is_null($task) && !in_array($task->getTasType(), $arrayTaskTypeToExclude) && $founded == "") {
$result = new wsResponse( 14, G::loadTranslation( 'ID_TASK_INVALID_USER_NOT_ASSIGNED_TASK' ) ); $result = new wsResponse( 14, G::LoadTranslation( 'ID_TASK_INVALID_USER_NOT_ASSIGNED_TASK' ) );
$g->sessionVarRestore(); $g->sessionVarRestore();
@@ -2046,7 +2044,7 @@ class wsBase
} }
//Response //Response
$result = new wsResponse( 0, G::loadTranslation( 'ID_STARTED_SUCCESSFULLY' ) ); $result = new wsResponse( 0, G::LoadTranslation( 'ID_STARTED_SUCCESSFULLY' ) );
$result->caseId = $caseId; $result->caseId = $caseId;
$result->caseNumber = $caseNr; $result->caseNumber = $caseNr;
@@ -2193,7 +2191,7 @@ class wsBase
$oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
if (AppDelegationPeer::doCount( $oCriteria ) > 1) { if (AppDelegationPeer::doCount( $oCriteria ) > 1) {
$result = new wsResponse( 20, G::loadTranslation( 'ID_SPECIFY_DELEGATION_INDEX' ) ); $result = new wsResponse( 20, G::LoadTranslation( 'ID_SPECIFY_DELEGATION_INDEX' ) );
return $result; return $result;
} }
@@ -2208,13 +2206,13 @@ class wsBase
$appdel = $oAppDel->Load( $caseId, $delIndex ); $appdel = $oAppDel->Load( $caseId, $delIndex );
if ($userId != $appdel['USR_UID']) { if ($userId != $appdel['USR_UID']) {
$result = new wsResponse( 17, G::loadTranslation( 'ID_CASE_ASSIGNED_ANOTHER_USER' ) ); $result = new wsResponse( 17, G::LoadTranslation( 'ID_CASE_ASSIGNED_ANOTHER_USER' ) );
return $result; return $result;
} }
if ($appdel['DEL_FINISH_DATE'] != null) { if ($appdel['DEL_FINISH_DATE'] != null) {
$result = new wsResponse( 18, G::loadTranslation( 'ID_CASE_DELEGATION_ALREADY_CLOSED' ) ); $result = new wsResponse( 18, G::LoadTranslation( 'ID_CASE_DELEGATION_ALREADY_CLOSED' ) );
return $result; return $result;
} }
@@ -2232,7 +2230,7 @@ class wsBase
if (is_array( $aRow )) { if (is_array( $aRow )) {
if (isset( $aRow['APP_DISABLE_ACTION_USER'] ) && $aRow['APP_DISABLE_ACTION_USER'] != 0 && isset( $aRow['APP_DISABLE_ACTION_DATE'] ) && $aRow['APP_DISABLE_ACTION_DATE'] != '') { if (isset( $aRow['APP_DISABLE_ACTION_USER'] ) && $aRow['APP_DISABLE_ACTION_USER'] != 0 && isset( $aRow['APP_DISABLE_ACTION_DATE'] ) && $aRow['APP_DISABLE_ACTION_DATE'] != '') {
$result = new wsResponse( 19, G::loadTranslation( 'ID_CASE_IN_STATUS' ) . " " . $aRow['APP_TYPE'] ); $result = new wsResponse( 19, G::LoadTranslation( 'ID_CASE_IN_STATUS' ) . " " . $aRow['APP_TYPE'] );
return $result; return $result;
} }
@@ -2370,19 +2368,19 @@ class wsBase
if (isset($derive[1])) { if (isset($derive[1])) {
if ($derive[1]['ROU_TYPE'] == 'SELECT') { if ($derive[1]['ROU_TYPE'] == 'SELECT') {
$result = new wsResponse(21, G::loadTranslation('ID_CAN_NOT_ROUTE_CASE_USING_WEBSERVICES')); $result = new wsResponse(21, G::LoadTranslation('ID_CAN_NOT_ROUTE_CASE_USING_WEBSERVICES'));
return $result; return $result;
} }
} else { } else {
$result = new wsResponse(22, G::loadTranslation('ID_TASK_DOES_NOT_HAVE_ROUTING_RULE')); $result = new wsResponse(22, G::LoadTranslation('ID_TASK_DOES_NOT_HAVE_ROUTING_RULE'));
return $result; return $result;
} }
foreach ($derive as $key => $val) { foreach ($derive as $key => $val) {
if ($val['NEXT_TASK']['TAS_ASSIGN_TYPE'] == 'MANUAL') { if ($val['NEXT_TASK']['TAS_ASSIGN_TYPE'] == 'MANUAL') {
$result = new wsResponse(15, G::loadTranslation('ID_TASK_DEFINED_MANUAL_ASSIGNMENT')); $result = new wsResponse(15, G::LoadTranslation('ID_TASK_DEFINED_MANUAL_ASSIGNMENT'));
return $result; return $result;
} }
@@ -2528,7 +2526,7 @@ class wsBase
$appFields, $nextDelegations, $nextIndex, $delIndex); $appFields, $nextDelegations, $nextIndex, $delIndex);
} }
} catch (Exception $e) { } catch (Exception $e) {
\G::log(G::loadTranslation( 'ID_NOTIFICATION_ERROR' ) . '|' . $e->getMessage() , PATH_DATA, "mobile.log"); \G::log(G::LoadTranslation( 'ID_NOTIFICATION_ERROR' ) . '|' . $e->getMessage() , PATH_DATA, "mobile.log");
} }
// Send notifications Mobile - End // Send notifications Mobile - End
@@ -2768,18 +2766,10 @@ class wsBase
$result = array (); $result = array ();
try { try {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX ); $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
$oCriteria->addSelectColumn( AppDelegationPeer::TAS_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::TAS_UID );
$oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
$oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' ); $oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID);
$oCriteria->addAlias( "C1", 'CONTENT' );
$tasTitleConds = array ();
$tasTitleConds[] = array (AppDelegationPeer::TAS_UID,'C1.CON_ID');
$tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del);
$oCriteria->addJoinMC( $tasTitleConds, Criteria::LEFT_JOIN );
$oCriteria->add( AppDelegationPeer::APP_UID, $caseId ); $oCriteria->add( AppDelegationPeer::APP_UID, $caseId );
$oCriteria->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' ); $oCriteria->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
$oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );

109
workflow/engine/classes/class.wsTools.php
View File

@@ -123,6 +123,12 @@ class workspaceTools
$this->processFilesUpgrade(); $this->processFilesUpgrade();
$stop = microtime(true); $stop = microtime(true);
CLI::logging("<*> Updating Files Manager took " . ($stop - $start) . " seconds.\n"); CLI::logging("<*> Updating Files Manager took " . ($stop - $start) . " seconds.\n");
$start = microtime(true);
CLI::logging("> Optimizing content data...\n");
$this->migrateContent($workSpace, $lang);
$stop = microtime(true);
CLI::logging("<*> Optimizing content data took " . ($stop - $start) . " seconds.\n");
} }
/** /**
@@ -3191,4 +3197,107 @@ class workspaceTools
return $response; return $response;
} }
public function migrateContent($workspace, $lang = SYS_LANG) {
if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
define('MEMCACHED_ENABLED', false);
}
$this->initPropel(true);
$conf = new Configuration();
if (!$conf->exists('MIGRATED_CONTENT', 'content')) {
$data["CFG_UID"] ='MIGRATED_CONTENT';
$data["OBJ_UID"] ='content';
$data["CFG_VALUE"]='true';
$data["PRO_UID"] ='';
$data["USR_UID"] ='';
$data["APP_UID"] ='';
$this->migrateContentRun($workspace, $lang);
$conf->create($data);
}
}
/**
* Migrate this workspace table Content.
*
* @param $className
* @param $fields
* @param mixed|string $lang
* @throws Exception
*/
public function migrateContentWorkspace($className, $fields, $lang = SYS_LANG)
{
try {
$this->initPropel(true);
$fieldUidName = $fields['uid'];
$oCriteria = new Criteria();
$oCriteria->clearSelectColumns();
$oCriteria->addAsColumn($fieldUidName, ContentPeer::CON_ID);
$oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->add(ContentPeer::CON_CATEGORY, $fields['fields'], Criteria::IN);
$oCriteria->add(ContentPeer::CON_LANG, $lang);
$oDataset = ContentPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$methods = $fields['methods'];
while ($oDataset->next()) {
$row = $oDataset->getRow();
$fieldName = $row['CON_CATEGORY'];
$fieldName = isset($fields['alias']) && isset($fields['alias'][$fieldName]) ? $fields['alias'][$fieldName] : $fieldName;
unset($row['CON_CATEGORY']);
$fieldValue = $row['CON_VALUE'];
unset($row['CON_VALUE']);
$row[$fieldName] = $fieldValue;
$oTable = new $className();
$mExists = $methods['exists'];
if ($oTable->$mExists($row[$fieldUidName])){
$oTable->update($row);
}
}
$classNamePeer = $className . 'Peer';
CLI::logging("|--> Add content data in table " . $classNamePeer::TABLE_NAME . "\n");
} catch (Exception $e) {
throw ($e);
}
}
public function migrateContentRun($workspace, $lang = SYS_LANG) {
if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
define('MEMCACHED_ENABLED', false);
}
$content = array(
'Groupwf' => array(
'uid' => 'GRP_UID',
'fields' => array('GRP_TITLE'),
'methods' => array('exists' => 'GroupwfExists')
),
'Process' => array(
'uid' => 'PRO_UID',
'fields' => array('PRO_TITLE', 'PRO_DESCRIPTION'),
'methods' => array('exists' => 'exists')
),
'Department' => array(
'uid' => 'DEP_UID',
'fields' => array('DEPO_TITLE'),
'alias' => array('DEPO_TITLE' => 'DEP_TITLE'),
'methods' => array('exists' => 'existsDepartment')
),
'Task' => array(
'uid' => 'TAS_UID',
'fields' => array('TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION'),
'methods' => array('exists' => 'taskExists')
),
'InputDocument' => array(
'uid' => 'INP_DOC_UID',
'fields' => array('INP_DOC_TITLE', 'INP_DOC_DESCRIPTION'),
'methods' => array('exists' => 'InputExists')
),
'Application' => array(
'uid' => 'APP_UID',
'fields' => array('APP_TITLE', 'APP_DESCRIPTION'),
'methods' => array('exists' => 'exists')
)
);
foreach ($content as $className => $fields) {
$this->migrateContentWorkspace($className, $fields, $lang);
}
}
} }

9
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -1055,15 +1055,14 @@ class AdditionalTables extends BaseAdditionalTables
//now get the labels for all process, using an array of Uids, //now get the labels for all process, using an array of Uids,
$c = new Criteria('workflow'); $c = new Criteria('workflow');
//$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); //$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
$c->add(ContentPeer::CON_LANG, defined('SYS_LANG') ? SYS_LANG : 'en', Criteria::EQUAL); $c->add(ProcessPeer::PRO_UID, $proUids, Criteria::IN);
$c->add(ContentPeer::CON_ID, $proUids, Criteria::IN); $dt = ProcessPeer::doSelectRS($c);
$dt = ContentPeer::doSelectRS($c);
$dt->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dt->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($dt->next()) { while ($dt->next()) {
$row = $dt->getRow(); $row = $dt->getRow();
$procDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE']; $procDetails[$row['PRO_UID']]['PRO_TITLE'] = $row['PRO_TITLE'];
$procDetails[$row['PRO_UID']]['PRO_DESCRIPTION'] = $row['PRO_DESCRIPTION'];
} }
foreach ($addTables as $i => $addTable) { foreach ($addTables as $i => $addTable) {

39
workflow/engine/classes/model/AppEvent.php
View File

@@ -125,14 +125,11 @@ class AppEvent extends BaseAppEvent
$oCriteria->addSelectColumn( EventPeer::PRO_UID ); $oCriteria->addSelectColumn( EventPeer::PRO_UID );
$oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS ); $oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS );
$oCriteria->addSelectColumn( EventPeer::EVN_ACTION ); $oCriteria->addSelectColumn( EventPeer::EVN_ACTION );
$oCriteria->addSelectColumn( ApplicationPeer::APP_TITLE );
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' ); $oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' );
$oCriteria->addAsColumn( 'TAS_TITLE', 'C2.CON_VALUE' );
$oCriteria->addAsColumn( 'APP_TITLE', 'C3.CON_VALUE' );
$oCriteria->addAsColumn( 'PRO_TITLE', 'C4.CON_VALUE' );
$oCriteria->addAlias( 'C1', 'CONTENT' ); $oCriteria->addAlias( 'C1', 'CONTENT' );
$oCriteria->addAlias( 'C2', 'CONTENT' );
$oCriteria->addAlias( 'C3', 'CONTENT' );
$oCriteria->addAlias( 'C4', 'CONTENT' );
$oCriteria->addJoin( AppEventPeer::EVN_UID, EventPeer::EVN_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( AppEventPeer::EVN_UID, EventPeer::EVN_UID, Criteria::LEFT_JOIN );
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$aConditions = array (); $aConditions = array ();
@@ -149,31 +146,9 @@ class AppEvent extends BaseAppEvent
$aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX $aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX
); );
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$aConditions = array (); $oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$aConditions[] = array (AppDelegationPeer::TAS_UID,'C2.CON_ID' $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
); $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions[] = array ('C2.CON_CATEGORY',$del . 'TAS_TITLE' . $del
);
$aConditions[] = array ('C2.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$aConditions = array ();
$aConditions[] = array (AppDelegationPeer::APP_UID,'C3.CON_ID'
);
$aConditions[] = array ('C3.CON_CATEGORY',$del . 'APP_TITLE' . $del
);
$aConditions[] = array ('C3.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$aConditions = array ();
$aConditions[] = array (AppDelegationPeer::PRO_UID,'C4.CON_ID'
);
$aConditions[] = array ('C4.CON_CATEGORY',$del . 'PRO_TITLE' . $del
);
$aConditions[] = array ('C4.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL ); $oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL );
if ($sProcessUid != '') { if ($sProcessUid != '') {
$oCriteria->add( EventPeer::PRO_UID, $sProcessUid ); $oCriteria->add( EventPeer::PRO_UID, $sProcessUid );
@@ -305,7 +280,7 @@ class AppEvent extends BaseAppEvent
$oPMScript = new PMScript(); $oPMScript = new PMScript();
$task = new Task(); $task = new Task();
$taskFields = $task->Load( $aRow['TAS_UID'] ); $taskFields = $task->load( $aRow['TAS_UID'] );
$aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER']; $aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER'];
$aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE']; $aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE'];
$aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE']; $aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE'];

206
workflow/engine/classes/model/Application.php
View File

@@ -46,15 +46,15 @@ class Application extends BaseApplication
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $app_title = ''; protected $app_title_content = '';
protected $app_description = ''; protected $app_description_content = '';
//protected $app_proc_code = ''; //protected $app_proc_code = '';
/** /**
* Get the [app_title] column value. * Get the [app_title_content] column value.
* @return string * @return string
*/ */
public function getAppTitle() public function getAppTitleContent()
{ {
$oApplication = new Application; $oApplication = new Application;
if (!$oApplication->exists($this->getAppUid())) { if (!$oApplication->exists($this->getAppUid())) {
@@ -62,25 +62,25 @@ class Application extends BaseApplication
} }
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw (new Exception( "Error in getAppTitle, the APP_UID can't be blank")); throw (new Exception( "Error in getAppTitleContent, the APP_UID can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->app_title = Content::load('APP_TITLE', '', $this->getAppUid(), $lang); $this->app_title_content = Content::load('APP_TITLE', '', $this->getAppUid(), $lang);
return $this->app_title; return $this->app_title_content;
} }
/** /**
* Set the [app_title] column value. * Set the [app_title_content] column value.
* *
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setAppTitle($v) public function setAppTitleContent($v)
{ {
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank")); throw (new Exception( "Error in setAppTitleContent, the APP_UID can't be blank"));
} }
//Since the native PHP type for this column is string, //Since the native PHP type for this column is string,
@@ -89,166 +89,39 @@ class Application extends BaseApplication
$v = (string) $v; $v = (string) $v;
} }
if ($this->app_title !== $v || $v === '') { if ($this->app_title_content !== $v || $v === '') {
$this->app_title = $v; $this->app_title_content = $v;
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title); $res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title_content);
} }
} // set() } // set()
/** /**
* Get the [app_description] column value. * Get the [app_description_content] column value.
* @return string * @return string
*/ */
public function getAppDescription() public function getAppDescriptionContent()
{ {
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank")); throw (new Exception( "Error in getAppDescriptionContent, the APP_UID can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->app_description = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang); $this->app_description_content = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang);
return $this->app_description; return $this->app_description_content;
}
public function isEmptyInContent($content, $field, $lang)
{
if (isset($content[$field][$lang])) {
if (trim($content[$field][$lang]) != '') {
return false;
}
}
return true;
}
public function updateInsertContent($content, $field, $value)
{
if (isset($content[$field]['en'])) {
//update
$con = ContentPeer::retrieveByPK($field, '', $this->getAppUid(), 'en');
$con->setConValue($value);
if ($con->validate()) {
$res = $con->save();
}
} else {
//insert
$con = new Content();
$con->setConCategory($field);
$con->setConParent('');
$con->setConId($this->getAppUid());
$con->setConLang('en');
$con->setConValue($value);
if ($con->validate()) {
$res = $con->save();
}
}
}
public function normalizeContent($content, $field, $lang)
{
$value = '';
//if the lang row is not empty, update in 'en' row and continue
if (!$this->isEmptyInContent($content, $field, $lang)) {
//update/insert only if this lang is != 'en', with this always we will have an en row with last value
$value = $content[$field][$lang];
if ($lang != 'en') {
$this->updateInsertContent($content, $field, $value);
}
} else {
//if the lang row is empty, and 'en' row is not empty return 'en' value
if (!$this->isEmptyInContent($content, $field, 'en')) {
$value = $content[$field]['en'];
}
//if the lang row is empty, and 'en' row is empty get value for 'other' row and update in 'en'
//row and continue
if ($this->isEmptyInContent($content, $field, 'en')) {
if (isset($content[$field]) && is_array($content[$field])) {
foreach ($content[$field] as $lan => $val) {
if (trim($val) != '') {
$value = $val;
if ($lan != 'en') {
$this->updateInsertContent($content, $field , $value);
continue;
}
}
}
} else {
$this->updateInsertContent($content, $field, '');
}
}
}
return $value;
} }
/** /**
* Get the [app_description] , [app_title] column values. * Set the [app_description_content] column value.
* @return array of string
*/
public function getContentFields()
{
if ($this->getAppUid() == '') {
throw (new Exception("Error in getContentFields, the APP_UID can't be blank"));
}
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn(ContentPeer::CON_CATEGORY);
$c->addSelectColumn(ContentPeer::CON_LANG);
$c->addSelectColumn(ContentPeer::CON_VALUE);
$c->add(ContentPeer::CON_ID, $this->getAppUid());
//$c->add(ContentPeer::CON_LANG, $lang);
$c->addAscendingOrderByColumn('CON_CATEGORY');
$c->addAscendingOrderByColumn('CON_LANG');
$rs = ContentPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
$content = array();
while ($row = $rs->getRow()) {
$conCategory = $row['CON_CATEGORY'];
$conLang = $row['CON_LANG'];
if (!isset($content[$conCategory])) {
$content[$conCategory] = array();
}
if (!isset($content[$conCategory][$conLang])) {
$content[$conCategory][$conLang] = array();
}
$content[$conCategory][$conLang] = $row['CON_VALUE'];
$rs->next();
$row = $rs->getRow();
}
$appTitle = $this->normalizeContent($content, 'APP_TITLE', $lang);
$appDescription = $this->normalizeContent($content, 'APP_DESCRIPTION', $lang);
$res['APP_TITLE'] = $appTitle;
$res['APP_DESCRIPTION'] = $appDescription;
return $res;
}
/**
* Set the [app_description] column value.
* *
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setAppDescription($v) public function setAppDescriptionContent($v)
{ {
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") ); throw ( new Exception( "Error in setAppDescriptionContent, the APP_UID can't be blank") );
} }
// Since the native PHP type for this column is string, // Since the native PHP type for this column is string,
@@ -257,10 +130,10 @@ class Application extends BaseApplication
$v = (string) $v; $v = (string) $v;
} }
if ($this->app_description !== $v || $v === '') { if ($this->app_description_content !== $v || $v === '') {
$this->app_description = $v; $this->app_description_content = $v;
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$res = Content::addContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, $this->app_description); $res = Content::addContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, $this->app_description_content);
} }
} // set() } // set()
@@ -315,23 +188,13 @@ class Application extends BaseApplication
$con = Propel::getConnection(ApplicationPeer::DATABASE_NAME); $con = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
try { try {
$oApplication = ApplicationPeer::retrieveByPk( $AppUid ); $oApplication = ApplicationPeer::retrieveByPK( $AppUid );
if (!$oApplication) { if (!$oApplication) {
return false; return false;
} }
if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) { if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) {
$aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME); $aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($aFields, BasePeer::TYPE_FIELDNAME); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
//this is the new function to optimize content queries
$aContentFields = $oApplication->getContentFields();
$aFields['APP_TITLE'] = $aContentFields['APP_TITLE'];
$aFields['APP_DESCRIPTION'] = $aContentFields['APP_DESCRIPTION'];
$this->app_title = $aFields['APP_TITLE'];
$this->app_description = $aFields['APP_DESCRIPTION'];
//$aFields['APP_PROC_CODE'] = $oApplication->getAppProcCode(); //$aFields['APP_PROC_CODE'] = $oApplication->getAppProcCode();
//$this->setAppProcCode($oApplication->getAppProcCode()); //$this->setAppProcCode($oApplication->getAppProcCode());
@@ -383,16 +246,17 @@ class Application extends BaseApplication
$this->setAppNumber($maxNumber); $this->setAppNumber($maxNumber);
$this->setAppData(serialize(['APP_NUMBER' => $maxNumber, 'PIN' => $pin])); $this->setAppData(serialize(['APP_NUMBER' => $maxNumber, 'PIN' => $pin]));
$this->setAppTitle('#' . $maxNumber);
$this->setAppDescription('');
if ($this->validate()) { if ($this->validate()) {
$con->begin(); $con->begin();
$res = $this->save(); $res = $this->save();
$con->commit(); $con->commit();
$this->setAppTitleContent('#' . $maxNumber);
$this->setAppDescriptionContent('');
//to do: ID_CASE in translation $this->setAppTitle(G::LoadTranslation('ID_CASE') . $maxNumber); //to do: ID_CASE in translation $this->setAppTitle(G::LoadTranslation('ID_CASE') . $maxNumber);
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
Content::insertContent('APP_TITLE', '', $this->getAppUid(), $lang, '#' . $maxNumber);
Content::insertContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, '');
//Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, ''); //Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, '');
$con->commit(); $con->commit();
@@ -431,10 +295,10 @@ class Application extends BaseApplication
if ($oApp->validate()) { if ($oApp->validate()) {
if (isset($aData['APP_TITLE'])) { if (isset($aData['APP_TITLE'])) {
$oApp->setAppTitle($aData['APP_TITLE']); $oApp->setAppTitleContent($aData['APP_TITLE']);
} }
if (isset($aData['APP_DESCRIPTION'])) { if (isset($aData['APP_DESCRIPTION'])) {
$oApp->setAppDescription($aData['APP_DESCRIPTION']); $oApp->setAppDescriptionContent($aData['APP_DESCRIPTION']);
} }
//if ( isset ( $aData['APP_PROC_CODE'] ) ) //if ( isset ( $aData['APP_PROC_CODE'] ) )
@@ -447,7 +311,7 @@ class Application extends BaseApplication
} else { } else {
$msg = ''; $msg = '';
foreach ($this->getValidationFailures() as $objValidationFailure) { foreach ($oApp->getValidationFailures() as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "<br/>"; $msg .= $objValidationFailure->getMessage() . "<br/>";
} }
@@ -511,6 +375,8 @@ class Application extends BaseApplication
$this->setAppUid(G::generateUniqueID()); $this->setAppUid(G::generateUniqueID());
$this->setAppNumber($maxNumber); $this->setAppNumber($maxNumber);
$this->setAppTitle('');
$this->setAppDescription('');
$this->setAppParent(isset($aData['APP_PARENT'])? $aData['APP_PARENT'] : 0); $this->setAppParent(isset($aData['APP_PARENT'])? $aData['APP_PARENT'] : 0);
$this->setAppStatus(isset($aData['APP_STATUS'])? $aData['APP_STATUS'] : 'DRAFT'); $this->setAppStatus(isset($aData['APP_STATUS'])? $aData['APP_STATUS'] : 'DRAFT');
$this->setProUid($aData['PRO_UID']); $this->setProUid($aData['PRO_UID']);
@@ -558,8 +424,8 @@ class Application extends BaseApplication
if ($this->validate()) { if ($this->validate()) {
$res = $this->save(); $res = $this->save();
$this->setAppTitle(''); $this->setAppTitleContent('');
$this->setAppDescription(''); $this->setAppDescriptionContent('');
$this->setAppProcCode(''); $this->setAppProcCode('');
} else { } else {
// Something went wrong. We can now get the validationFailures and handle them. // Something went wrong. We can now get the validationFailures and handle them.

50
workflow/engine/classes/model/Department.php
View File

@@ -105,8 +105,10 @@ class Department extends BaseDepartment
if (isset( $aData['DEP_TITLE'] )) { if (isset( $aData['DEP_TITLE'] )) {
$this->setDepTitle( $aData['DEP_TITLE'] ); $this->setDepTitle( $aData['DEP_TITLE'] );
$this->setDepTitleContent( $aData['DEP_TITLE'] );
} else { } else {
$this->setDepTitle( '' ); $this->setDepTitle( '' );
$this->setDepTitleContent( '' );
} }
if ($this->validate()) { if ($this->validate()) {
@@ -138,7 +140,7 @@ class Department extends BaseDepartment
* *
* @return string * @return string
*/ */
public function getDepTitle () public function getDepTitleContent ()
{ {
if ($this->getDepUid() == '') { if ($this->getDepUid() == '') {
throw (new Exception( "Error in getDepTitle, the DEP_UID can't be blank" )); throw (new Exception( "Error in getDepTitle, the DEP_UID can't be blank" ));
@@ -154,7 +156,7 @@ class Department extends BaseDepartment
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setDepTitle ($v) public function setDepTitleContent ($v)
{ {
if ($this->getDepUid() == '') { if ($this->getDepUid() == '') {
throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" )); throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" ));
@@ -188,7 +190,6 @@ class Department extends BaseDepartment
if (is_object( $oDept ) && get_class( $oDept ) == 'Department') { if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
$aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME );
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
$aFields['DEPO_TITLE'] = $oDept->getDepTitle();
return $aFields; return $aFields;
} else { } else {
throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" )); throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" ));
@@ -217,6 +218,7 @@ class Department extends BaseDepartment
if ($oPro->validate()) { if ($oPro->validate()) {
if (isset( $aData['DEPO_TITLE'] )) { if (isset( $aData['DEPO_TITLE'] )) {
$oPro->setDepTitle( $aData['DEPO_TITLE'] ); $oPro->setDepTitle( $aData['DEPO_TITLE'] );
$oPro->setDepTitleContent( $aData['DEPO_TITLE'] );
} }
if (isset( $aData['DEP_STATUS'] )) { if (isset( $aData['DEP_STATUS'] )) {
$oPro->setDepStatus( $aData['DEP_STATUS'] ); $oPro->setDepStatus( $aData['DEP_STATUS'] );
@@ -290,7 +292,7 @@ class Department extends BaseDepartment
Content::removeContent( 'DEPO_TITLE', '', $oPro->getDepUid() ); Content::removeContent( 'DEPO_TITLE', '', $oPro->getDepUid() );
Content::removeContent( 'DEPO_DESCRIPTION', '', $oPro->getDepUid() ); Content::removeContent( 'DEPO_DESCRIPTION', '', $oPro->getDepUid() );
G::auditLog("DeleteDepartament", "Departament Name: ".$dptoTitle['DEPO_TITLE']." Departament ID: (".$oPro->getDepUid().") "); G::auditLog("DeleteDepartament", "Departament Name: ".$dptoTitle['DEP_TITLE']." Departament ID: (".$oPro->getDepUid().") ");
return $oPro->delete(); return $oPro->delete();
} else { } else {
throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" )); throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -371,7 +373,7 @@ class Department extends BaseDepartment
$user = $oUser->loadDetailed ($managerId); $user = $oUser->loadDetailed ($managerId);
if (is_object( $oDept ) && get_class( $oDept ) == 'Department') { if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
$dptoTitle = $oDept->Load($depId); $dptoTitle = $oDept->Load($depId);
G::auditLog("AssignManagerToDepartament", "Assign Manager ".$user['USR_USERNAME']." (".$managerId.") to ".$dptoTitle['DEPO_TITLE']." (".$depId.") "); G::auditLog("AssignManagerToDepartament", "Assign Manager ".$user['USR_USERNAME']." (".$managerId.") to ".$dptoTitle['DEP_TITLE']." (".$depId.") ");
} }
} }
// get children departments to update the reportsTo of these children // get children departments to update the reportsTo of these children
@@ -403,7 +405,7 @@ class Department extends BaseDepartment
if (is_object( $oUser ) && get_class( $oUser ) == 'Users') { if (is_object( $oUser ) && get_class( $oUser ) == 'Users') {
$oUser->setDepUid( $depId ); $oUser->setDepUid( $depId );
$oUser->save(); $oUser->save();
G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEPO_TITLE']." (".$depId.") "); G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEP_TITLE']." (".$depId.") ");
} }
//if the user is a manager update Department Table //if the user is a manager update Department Table
@@ -496,14 +498,10 @@ class Department extends BaseDepartment
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->clearSelectColumns(); $oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
$oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$oCriteria->addJoin( ContentPeer::CON_ID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN ); $oCriteria->add( DepartmentPeer::DEP_TITLE, $departmentName );
$oCriteria->add( ContentPeer::CON_VALUE, $departmentName );
$oCriteria->add( DepartmentPeer::DEP_UID, $departmentUID, Criteria::NOT_EQUAL ); $oCriteria->add( DepartmentPeer::DEP_UID, $departmentUID, Criteria::NOT_EQUAL );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( DepartmentPeer::DEP_PARENT, $parentUID ); $oCriteria->add( DepartmentPeer::DEP_PARENT, $parentUID );
$oDataset = DepartmentPeer::doSelectRS( $oCriteria ); $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
@@ -585,7 +583,7 @@ class Department extends BaseDepartment
$oUser->setUsrReportsTo( '' ); $oUser->setUsrReportsTo( '' );
$oUser->save(); $oUser->save();
G::auditLog("RemoveUsersFromDepartament", "Remove user ".$user['USR_USERNAME']."( ".$UsrUid.") from departament ".$dptoTitle['DEPO_TITLE']." (".$DepUid.") "); G::auditLog("RemoveUsersFromDepartament", "Remove user ".$user['USR_USERNAME']."( ".$UsrUid.") from departament ".$dptoTitle['DEP_TITLE']." (".$DepUid.") ");
} }
} catch (exception $oError) { } catch (exception $oError) {
throw ($oError); throw ($oError);
@@ -641,12 +639,8 @@ class Department extends BaseDepartment
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn( ContentPeer::CON_CATEGORY ); $c->addSelectColumn(DepartmentPeer::DEP_TITLE);
$c->addSelectColumn( ContentPeer::CON_VALUE ); $c->add(DepartmentPeer::DEP_TITLE, $Groupname);
$c->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
$c->add( ContentPeer::CON_VALUE, $Groupname );
$c->add( ContentPeer::CON_LANG, SYS_LANG );
return $c; return $c;
} }
@@ -655,10 +649,8 @@ class Department extends BaseDepartment
{ {
$c = new Criteria( 'workflow' ); $c = new Criteria( 'workflow' );
$c->addSelectColumn( UsersPeer::USR_UID ); $c->addSelectColumn( UsersPeer::USR_UID );
$c->addAsColumn( 'DEP_TITLE', ContentPeer::CON_VALUE ); $c->addSelectColumn( DepartmentPeer::DEP_TITLE );
$c->add( ContentPeer::CON_LANG, defined( SYS_LANG ) ? SYS_LANG : 'en' ); $c->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::INNER_JOIN );
$c->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
$c->addJoin( UsersPeer::DEP_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN );
$Dat = UsersPeer::doSelectRS( $c ); $Dat = UsersPeer::doSelectRS( $c );
$Dat->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $Dat->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$aRows = Array (); $aRows = Array ();
@@ -673,18 +665,8 @@ class Department extends BaseDepartment
{ {
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( UsersPeer::DEP_UID ); $criteria->addSelectColumn( UsersPeer::DEP_UID );
$criteria->addAsColumn( 'DEP_TITLE', 'C.CON_VALUE' ); $criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$criteria->addAlias( 'C', 'CONTENT' );
$criteria->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN ); $criteria->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN );
$delimiter = DBAdapter::getStringDelimiter();
$conditions = array ();
$conditions[] = array (DepartmentPeer::DEP_UID,'C.CON_ID'
);
$conditions[] = array ('C.CON_CATEGORY',$delimiter . 'DEPO_TITLE' . $delimiter
);
$conditions[] = array ('C.CON_LANG',$delimiter . SYS_LANG . $delimiter
);
$criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
$criteria->add( UsersPeer::USR_UID, $userUid ); $criteria->add( UsersPeer::USR_UID, $userUid );
$criteria->add( UsersPeer::DEP_UID, '', Criteria::NOT_EQUAL ); $criteria->add( UsersPeer::DEP_UID, '', Criteria::NOT_EQUAL );
$dataset = DepartmentPeer::doSelectRS( $criteria ); $dataset = DepartmentPeer::doSelectRS( $criteria );

100
workflow/engine/classes/model/Groupwf.php
View File

@@ -41,36 +41,15 @@ require_once 'classes/model/Content.php';
*/ */
class Groupwf extends BaseGroupwf class Groupwf extends BaseGroupwf
{ {
/**
* This value goes in the content table
*
* @var string
*/
//protected $grp_title = '';
protected $grp_title = '';
/**
* Get the [grp_title] column value.
*
* @return string
*/
public function getGrpTitle ()
{
if ($this->getGrpUid() == '') {
throw (new Exception( "Error in getGrpTitle, the GRP_UID can't be blank" ));
}
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$this->grp_title = Content::load( 'GRP_TITLE', '', $this->getGrpUid(), $lang );
return $this->grp_title;
}
protected $grp_title_content = '';
/** /**
* Set the [grp_title] column value. * Set the [grp_title] column value.
* *
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setGrpTitle ($v) public function setGrpTitleContent ($v)
{ {
if ($this->getGrpUid() == '') { if ($this->getGrpUid() == '') {
throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" )); throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" ));
@@ -81,15 +60,14 @@ class Groupwf extends BaseGroupwf
$v = (string) $v; $v = (string) $v;
} }
if ($this->grp_title !== $v || $v === '') { if ($this->grp_title_content !== $v || $v === '') {
$this->grp_title = $v; $this->grp_title_content = $v;
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$res = Content::addContent( 'GRP_TITLE', '', $this->getGrpUid(), $lang, $this->grp_title ); $res = Content::addContent( 'GRP_TITLE', '', $this->getGrpUid(), $lang, $this->grp_title_content );
} }
} // set() } // set()
/** /**
* Creates the Group * Creates the Group
* *
@@ -107,6 +85,12 @@ class Groupwf extends BaseGroupwf
$this->setGrpUid( G::generateUniqueID() ); $this->setGrpUid( G::generateUniqueID() );
} }
if (isset( $aData['GRP_TITLE'] )) {
$this->setGrpTitle( $aData['GRP_TITLE'] );
} else {
$this->setGrpTitle( 'Default Group Title' );
}
if (isset( $aData['GRP_STATUS'] )) { if (isset( $aData['GRP_STATUS'] )) {
$this->setGrpStatus( $aData['GRP_STATUS'] ); $this->setGrpStatus( $aData['GRP_STATUS'] );
} else { } else {
@@ -124,9 +108,9 @@ class Groupwf extends BaseGroupwf
$res = $this->save(); $res = $this->save();
if (isset( $aData['GRP_TITLE'] )) { if (isset( $aData['GRP_TITLE'] )) {
$this->setGrpTitle( $aData['GRP_TITLE'] ); $this->setGrpTitleContent( $aData['GRP_TITLE'] );
} else { } else {
$this->setGrpTitle( 'Default Group Title' ); $this->setGrpTitleContent( 'Default Group Title' );
} }
$con->commit(); $con->commit();
@@ -160,8 +144,6 @@ class Groupwf extends BaseGroupwf
if (is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') { if (is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
$aFields = $oPro->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oPro->toArray( BasePeer::TYPE_FIELDNAME );
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
$aFields['GRP_TITLE'] = $oPro->getGrpTitle();
$this->setGrpTitle( $oPro->getGrpTitle() );
return $aFields; return $aFields;
} else { } else {
throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" )); throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -188,7 +170,7 @@ class Groupwf extends BaseGroupwf
$oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
if ($oPro->validate()) { if ($oPro->validate()) {
if (isset( $aData['GRP_TITLE'] )) { if (isset( $aData['GRP_TITLE'] )) {
$oPro->setGrpTitle( $aData['GRP_TITLE'] ); $oPro->setGrpTitleContent( $aData['GRP_TITLE'] );
} }
$res = $oPro->save(); $res = $oPro->save();
$con->commit(); $con->commit();
@@ -226,7 +208,6 @@ class Groupwf extends BaseGroupwf
$oPro = GroupwfPeer::retrieveByPK( $ProUid ); $oPro = GroupwfPeer::retrieveByPK( $ProUid );
if (! is_null( $oPro )) { if (! is_null( $oPro )) {
Content::removeContent( 'GRP_TITLE', '', $oPro->getGrpUid() ); Content::removeContent( 'GRP_TITLE', '', $oPro->getGrpUid() );
Content::removeContent( 'GRP_DESCRIPTION', '', $oPro->getGrpUid() );
return $oPro->delete(); return $oPro->delete();
} else { } else {
throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" )); throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -263,12 +244,8 @@ class Groupwf extends BaseGroupwf
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn( ContentPeer::CON_CATEGORY ); $c->addSelectColumn( GroupwfPeer::GRP_TITLE );
$c->addSelectColumn( ContentPeer::CON_VALUE ); $c->add( GroupwfPeer::GRP_TITLE, $Groupname );
$c->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$c->add( ContentPeer::CON_VALUE, $Groupname );
$c->add( ContentPeer::CON_LANG, SYS_LANG );
return $c; return $c;
} }
@@ -297,17 +274,15 @@ class Groupwf extends BaseGroupwf
$totalCount = 0; $totalCount = 0;
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( GroupwfPeer::GRP_UID );
$criteria->addSelectColumn( GroupwfPeer::GRP_TITLE );
$criteria->addSelectColumn( GroupwfPeer::GRP_STATUS ); $criteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
$criteria->addSelectColumn( GroupwfPeer::GRP_LDAP_DN ); $criteria->addSelectColumn( GroupwfPeer::GRP_LDAP_DN );
$criteria->addSelectColumn( ContentPeer::CON_VALUE ); $criteria->addSelectColumn( ContentPeer::CON_VALUE );
$criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' ); $criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
$criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->addAscendingOrderByColumn( GroupwfPeer::GRP_TITLE );
$criteria->add( ContentPeer::CON_LANG, SYS_LANG );
$criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
if ($search) { if ($search) {
$criteria->add( ContentPeer::CON_VALUE, '%' . $search . '%', Criteria::LIKE ); $criteria->add( GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE );
} }
$c = clone $criteria; $c = clone $criteria;
@@ -349,33 +324,15 @@ class Groupwf extends BaseGroupwf
require_once 'classes/model/TaskUser.php'; require_once 'classes/model/TaskUser.php';
require_once 'classes/model/GroupUser.php'; require_once 'classes/model/GroupUser.php';
$sDelimiter = DBAdapter::getStringDelimiter(); $sDelimiter = DBAdapter::getStringDelimiter();
$aConditions = [
[GroupwfPeer::GRP_UID, 'C.CON_ID'],
['C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter],
['C.CON_LANG', 'if((SELECT COUNT(S.CON_ID) FROM CONTENT AS S WHERE S.CON_ID=C.CON_ID AND S.CON_CATEGORY=C.CON_CATEGORY AND S.CON_LANG=' . $sDelimiter . SYS_LANG . $sDelimiter . ')>0,' . $sDelimiter . SYS_LANG . $sDelimiter . ',' . $sDelimiter . 'en' . $sDelimiter . ')']
];
$totalCount = 0;
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addAlias('C', 'CONTENT');
$criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
if ($search) {
$criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE);
}
$totalRows = GroupwfPeer::doCount($criteria);
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$criteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(GroupwfPeer::GRP_UX); $criteria->addSelectColumn(GroupwfPeer::GRP_UX);
$criteria->addAlias('C', 'CONTENT');
$criteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
$criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
if (is_null($sortField) || trim($sortField) == "") { if (is_null($sortField) || trim($sortField) == "") {
$sortField = 'GRP_TITLE'; $sortField = GroupwfPeer::GRP_TITLE;
} }
if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") { if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") {
@@ -393,7 +350,7 @@ class Groupwf extends BaseGroupwf
} }
if ($search) { if ($search) {
$criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE); $criteria->add(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
} }
$oDataset = GroupwfPeer::doSelectRS($criteria); $oDataset = GroupwfPeer::doSelectRS($criteria);
@@ -406,7 +363,7 @@ class Groupwf extends BaseGroupwf
$groups[] = $oDataset->getRow(); $groups[] = $oDataset->getRow();
} }
return array('rows' => $groups, 'totalCount' => $totalRows); return array('rows' => $groups, 'totalCount' => count($groups));
} }
public function filterGroup ($filter, $start, $limit) public function filterGroup ($filter, $start, $limit)
@@ -426,11 +383,8 @@ class Groupwf extends BaseGroupwf
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( GroupwfPeer::GRP_UID ); $oCriteria->addSelectColumn( GroupwfPeer::GRP_UID );
$oCriteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
if ($filter != '') { if ($filter != '') {
$oCriteria->add( ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE ); $oCriteria->add( GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE );
} }
$totalRows = GroupwfPeer::doCount( $oCriteria ); $totalRows = GroupwfPeer::doCount( $oCriteria );
@@ -438,14 +392,10 @@ class Groupwf extends BaseGroupwf
$oCriteria->clearSelectColumns(); $oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn( GroupwfPeer::GRP_UID ); $oCriteria->addSelectColumn( GroupwfPeer::GRP_UID );
$oCriteria->addSelectColumn( GroupwfPeer::GRP_STATUS ); $oCriteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
$oCriteria->addAsColumn( 'GRP_TASKS', 0 ); $oCriteria->addAsColumn( 'GRP_TASKS', 0 );
$oCriteria->addAsColumn( 'GRP_USERS', 0 ); $oCriteria->addAsColumn( 'GRP_USERS', 0 );
$oCriteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
if ($filter != '') { if ($filter != '') {
$oCriteria->add( ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE ); $oCriteria->add( GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE );
} }
$oCriteria->setOffset( $start ); $oCriteria->setOffset( $start );
$oCriteria->setLimit( $limit ); $oCriteria->setLimit( $limit );

92
workflow/engine/classes/model/InputDocument.php
View File

@@ -47,14 +47,14 @@ class InputDocument extends BaseInputDocument
* *
* @var string * @var string
*/ */
protected $inp_doc_title = ''; protected $inp_doc_title_content = '';
/** /**
* This value goes in the content table * This value goes in the content table
* *
* @var string * @var string
*/ */
protected $inp_doc_description = ''; protected $inp_doc_description_content = '';
/* /*
* Load the application document registry * Load the application document registry
@@ -67,9 +67,7 @@ class InputDocument extends BaseInputDocument
$oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid ); $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
if (! is_null( $oInputDocument )) { if (! is_null( $oInputDocument )) {
$aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['INP_DOC_TITLE'] = $oInputDocument->getInpDocTitle(); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
$aFields['INP_DOC_DESCRIPTION'] = $oInputDocument->getInpDocDescription();
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
return $aFields; return $aFields;
} else { } else {
throw (new Exception( 'This row doesn\'t exist!' )); throw (new Exception( 'This row doesn\'t exist!' ));
@@ -88,8 +86,6 @@ class InputDocument extends BaseInputDocument
} }
$aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['INP_DOC_TITLE'] = $oInputDocument->getInpDocTitle();
$aFields['INP_DOC_DESCRIPTION'] = $oInputDocument->getInpDocDescription();
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
return $aFields; return $aFields;
} catch (Exception $oError) { } catch (Exception $oError) {
@@ -119,10 +115,10 @@ class InputDocument extends BaseInputDocument
if ($oInputDocument->validate()) { if ($oInputDocument->validate()) {
$oConnection->begin(); $oConnection->begin();
if (isset( $aData['INP_DOC_TITLE'] )) { if (isset( $aData['INP_DOC_TITLE'] )) {
$oInputDocument->setInpDocTitle( $aData['INP_DOC_TITLE'] ); $oInputDocument->setInpDocTitleContent( $aData['INP_DOC_TITLE'] );
} }
if (isset( $aData['INP_DOC_DESCRIPTION'] )) { if (isset( $aData['INP_DOC_DESCRIPTION'] )) {
$oInputDocument->setInpDocDescription( $aData['INP_DOC_DESCRIPTION'] ); $oInputDocument->setInpDocDescriptionContent( $aData['INP_DOC_DESCRIPTION'] );
} }
$iResult = $oInputDocument->save(); $iResult = $oInputDocument->save();
$oConnection->commit(); $oConnection->commit();
@@ -193,31 +189,37 @@ class InputDocument extends BaseInputDocument
if ($oInputDocument->validate()) { if ($oInputDocument->validate()) {
$oConnection->begin(); $oConnection->begin();
if (isset( $aData['INP_DOC_TITLE'] )) { if (isset( $aData['INP_DOC_TITLE'] )) {
$oInputDocument->setInpDocTitle( $aData['INP_DOC_TITLE'] ); $oInputDocument->setInpDocTitleContent( $aData['INP_DOC_TITLE'] );
} }
if (isset( $aData['INP_DOC_DESCRIPTION'] )) { if (isset( $aData['INP_DOC_DESCRIPTION'] )) {
$oInputDocument->setInpDocDescription( $aData['INP_DOC_DESCRIPTION'] ); $oInputDocument->setInpDocDescriptionContent( $aData['INP_DOC_DESCRIPTION'] );
} }
$iResult = $oInputDocument->save(); $iResult = $oInputDocument->save();
$oConnection->commit(); $oConnection->commit();
//Add Audit Log //Add Audit Log
switch ($aData['INP_DOC_FORM_NEEDED']){ $docType = '';
case 'VIRTUAL': if(!empty($aData['INP_DOC_FORM_NEEDED'])) {
$docType = 'Digital'; switch ($aData['INP_DOC_FORM_NEEDED']) {
break; case 'VIRTUAL':
case 'REAL': $docType = 'Digital';
$docType = 'Printed'; break;
break; case 'REAL':
case 'VREAL': $docType = 'Printed';
$docType = 'Digital/Printed'; break;
break; case 'VREAL':
$docType = 'Digital/Printed';
break;
}
} }
if(isset($aData['INP_DOC_VERSIONING']) && $aData['INP_DOC_VERSIONING'] == 1){ if(isset($aData['INP_DOC_VERSIONING']) && $aData['INP_DOC_VERSIONING'] == 1){
$enableVersion = 'Yes'; $enableVersion = 'Yes';
}else{ }else{
$enableVersion = 'No'; $enableVersion = 'No';
} }
$description = "Input Document Title: ".$aData['INP_DOC_TITLE'].", Input Document Uid: ".$aData['INP_DOC_UID'].", Document Type: ".$docType; $description = '';
if (!empty( $aData['INP_DOC_TITLE'] )) {
$description = "Input Document Title: ".$aData['INP_DOC_TITLE'].", Input Document Uid: ".$aData['INP_DOC_UID'].", Document Type: ".$docType;
}
if(!empty($aData['INP_DOC_DESCRIPTION'])){ if(!empty($aData['INP_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['INP_DOC_DESCRIPTION']; $description .= ", Description: ".$aData['INP_DOC_DESCRIPTION'];
} }
@@ -266,16 +268,14 @@ class InputDocument extends BaseInputDocument
try { try {
$oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid ); $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
if (! is_null( $oInputDocument )) { if (! is_null( $oInputDocument )) {
$nameInput = $this->getInpDocTitle(); $nameInput = $oInputDocument->getInpDocTitle();
$descInput = $this->getInpDocDescription(); $descInput = $oInputDocument->getInpDocDescription();
$oConnection->begin(); $oConnection->begin();
Content::removeContent( 'INP_DOC_TITLE', '', $oInputDocument->getInpDocUid() ); Content::removeContent( 'INP_DOC_TITLE', '', $oInputDocument->getInpDocUid() );
Content::removeContent( 'INP_DOC_DESCRIPTION', '', $oInputDocument->getInpDocUid() ); Content::removeContent( 'INP_DOC_DESCRIPTION', '', $oInputDocument->getInpDocUid() );
$iResult = $oInputDocument->delete(); $iResult = $oInputDocument->delete();
$oConnection->commit(); $oConnection->commit();
//Add Audit Log //Add Audit Log
$nameInput = $this->getInpDocTitle();
$descInput = $this->getInpDocDescription();
G::auditLog("DeleteInputDocument", "Input Document Name: ".$nameInput.", Input Document Uid: ".$sInpDocUid.", Description: ".$descInput); G::auditLog("DeleteInputDocument", "Input Document Name: ".$nameInput.", Input Document Uid: ".$sInpDocUid.", Description: ".$descInput);
return $iResult; return $iResult;
@@ -289,40 +289,40 @@ class InputDocument extends BaseInputDocument
} }
/** /**
* Get the [inp_doc_title] column value. * Get the [inp_doc_title_content] column value.
* *
* @return string * @return string
*/ */
public function getInpDocTitle () public function getInpDocTitleContent ()
{ {
if ($this->inp_doc_title == '') { if ($this->inp_doc_title_content == '') {
try { try {
$this->inp_doc_title = Content::load( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') ); $this->inp_doc_title_content = Content::load( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
} catch (Exception $oError) { } catch (Exception $oError) {
throw ($oError); throw ($oError);
} }
} }
return $this->inp_doc_title; return $this->inp_doc_title_content;
} }
/** /**
* Set the [inp_doc_title] column value. * Set the [inp_doc_title_content] column value.
* *
* @param string $sValue new value * @param string $sValue new value
* @return void * @return void
*/ */
public function setInpDocTitle ($sValue) public function setInpDocTitleContent ($sValue)
{ {
if ($sValue !== null && ! is_string( $sValue )) { if ($sValue !== null && ! is_string( $sValue )) {
$sValue = (string) $sValue; $sValue = (string) $sValue;
} }
if ($this->inp_doc_title !== $sValue || $sValue === '') { if ($this->inp_doc_title_content !== $sValue || $sValue === '') {
try { try {
$this->inp_doc_title = $sValue; $this->inp_doc_title_content = $sValue;
$iResult = Content::addContent( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_title ); $iResult = Content::addContent( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_title_content );
} catch (Exception $oError) { } catch (Exception $oError) {
$this->inp_doc_title = ''; $this->inp_doc_title_content = '';
throw ($oError); throw ($oError);
} }
} }
@@ -333,16 +333,16 @@ class InputDocument extends BaseInputDocument
* *
* @return string * @return string
*/ */
public function getInpDocDescription () public function getInpDocDescriptionContent ()
{ {
if ($this->inp_doc_description == '') { if ($this->inp_doc_description_content == '') {
try { try {
$this->inp_doc_description = Content::load( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') ); $this->inp_doc_description_content = Content::load( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
} catch (Exception $oError) { } catch (Exception $oError) {
throw ($oError); throw ($oError);
} }
} }
return $this->inp_doc_description; return $this->inp_doc_description_content;
} }
/** /**
@@ -351,18 +351,18 @@ class InputDocument extends BaseInputDocument
* @param string $sValue new value * @param string $sValue new value
* @return void * @return void
*/ */
public function setInpDocDescription ($sValue) public function setInpDocDescriptionContent ($sValue)
{ {
if ($sValue !== null && ! is_string( $sValue )) { if ($sValue !== null && ! is_string( $sValue )) {
$sValue = (string) $sValue; $sValue = (string) $sValue;
} }
if ($this->inp_doc_description !== $sValue || $sValue === '') { if ($this->inp_doc_description_content !== $sValue || $sValue === '') {
try { try {
$this->inp_doc_description = $sValue; $this->inp_doc_description_content = $sValue;
$iResult = Content::addContent( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_description ); $iResult = Content::addContent( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_description_content );
} catch (Exception $oError) { } catch (Exception $oError) {
$this->inp_doc_description = ''; $this->inp_doc_description_content = '';
throw ($oError); throw ($oError);
} }
} }

34
workflow/engine/classes/model/ListCanceled.php
View File

@@ -25,26 +25,22 @@ class ListCanceled extends BaseListCanceled {
public function create($data) public function create($data)
{ {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $dataset = ApplicationPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE']; $data['APP_TITLE'] = $aRow['APP_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
$criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); $dataset = ProcessPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(AppDelegationPeer::TAS_UID); $criteria->addSelectColumn(AppDelegationPeer::TAS_UID);
@@ -54,7 +50,7 @@ class ListCanceled extends BaseListCanceled {
$criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
$criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria); $dataset = AppDelegationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
@@ -68,22 +64,20 @@ class ListCanceled extends BaseListCanceled {
$criteria->addSelectColumn(AppDelegationPeer::USR_UID); $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
$criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria); $dataset = AppDelegationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID']; $data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
$criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); $dataset = TaskPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);

30
workflow/engine/classes/model/ListCompleted.php
View File

@@ -35,39 +35,33 @@ class ListCompleted extends BaseListCompleted
} }
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $dataset = ApplicationPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE']; $data['APP_TITLE'] = $aRow['APP_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
$criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); $dataset = ProcessPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
$criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); $dataset = TaskPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();

49
workflow/engine/classes/model/ListInbox.php
View File

@@ -258,55 +258,38 @@ class ListInbox extends BaseListInbox
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); $criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
$criteria->add( ContentPeer::CON_CATEGORY, 'TAS_DEF_TITLE', Criteria::EQUAL ); $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); $dataset = TaskPeer::doSelectRS($criteria);
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
if ($aRow['CON_VALUE'] == '') { if ($aRow['TAS_DEF_TITLE'] == '') {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $dataset = ApplicationPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRowApp = $dataset->getRow();
$aRow['TAS_DEF_TITLE'] = $aRowApp['APP_TITLE'];
} }
$data['APP_TITLE'] = $aRow['CON_VALUE']; $data['APP_TITLE'] = $aRow['TAS_DEF_TITLE'];
$data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); $dataset = ProcessPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
$data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]); $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
$data['APP_PREVIOUS_USER'] = ''; $data['APP_PREVIOUS_USER'] = '';
if($data['DEL_PREVIOUS_USR_UID'] === ''){ if($data['DEL_PREVIOUS_USR_UID'] === ''){
global $RBAC; global $RBAC;

34
workflow/engine/classes/model/ListPaused.php
View File

@@ -25,26 +25,22 @@ class ListPaused extends BaseListPaused {
public function create($data) public function create($data)
{ {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $dataset = ApplicationPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE']; $data['APP_TITLE'] = $aRow['APP_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); $dataset = ProcessPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(AppDelegationPeer::USR_UID); $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
@@ -55,7 +51,7 @@ class ListPaused extends BaseListPaused {
$criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
$criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria); $dataset = AppDelegationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
@@ -70,7 +66,7 @@ class ListPaused extends BaseListPaused {
$criteria->addSelectColumn(AppDelegationPeer::USR_UID); $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
$criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria); $dataset = AppDelegationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
@@ -90,15 +86,13 @@ class ListPaused extends BaseListPaused {
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); $dataset = TaskPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);

34
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -103,6 +103,7 @@ class ListUnassigned extends BaseListUnassigned
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
$criteria->addSelectColumn( ApplicationPeer::APP_TITLE );
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE ); $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria); $dataset = ApplicationPeer::doSelectRS($criteria);
@@ -111,41 +112,24 @@ class ListUnassigned extends BaseListUnassigned
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data = array_merge($data, $aRow); $data = array_merge($data, $aRow);
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $dataset = ProcessPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE']; $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); $dataset = TaskPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
$data['APP_PREVIOUS_USER'] = ''; $data['APP_PREVIOUS_USER'] = '';

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

@@ -47,7 +47,7 @@ class Process extends BaseProcess
* *
* @var string * @var string
*/ */
protected $pro_title = ''; protected $pro_title_content = '';
public $dir = 'ASC'; public $dir = 'ASC';
public $sort = 'PRO_TITLE'; public $sort = 'PRO_TITLE';
@@ -56,14 +56,14 @@ class Process extends BaseProcess
* *
* @return string * @return string
*/ */
public function getProTitle () public function getProTitleContent ()
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in getProTitle, the PRO_UID can't be blank" )); throw (new Exception( "Error in getProTitle, the PRO_UID can't be blank" ));
} }
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$this->pro_title = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang ); $this->pro_title_content = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang );
return $this->pro_title; return $this->pro_title_content;
} }
/** /**
@@ -72,7 +72,7 @@ class Process extends BaseProcess
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setProTitle ($v) public function setProTitleContent ($v)
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in setProTitle, the PRO_UID can't be blank" . print_r( debug_backtrace(), 1 ) )); throw (new Exception( "Error in setProTitle, the PRO_UID can't be blank" . print_r( debug_backtrace(), 1 ) ));
@@ -83,11 +83,11 @@ class Process extends BaseProcess
$v = (string) $v; $v = (string) $v;
} }
if ($this->pro_title !== $v || $v === '') { if ($this->pro_title_content !== $v || $v === '') {
$this->pro_title = $v; $this->pro_title_content = $v;
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title ); $res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title_content );
} }
} // set() } // set()
@@ -98,21 +98,21 @@ class Process extends BaseProcess
* *
* @var string * @var string
*/ */
protected $pro_description = ''; protected $pro_description_content = '';
/** /**
* Get the [Pro_description] column value. * Get the [Pro_description] column value.
* *
* @return string * @return string
*/ */
public function getProDescription () public function getProDescriptionContent ()
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in getProDescription, the PRO_UID can't be blank" )); throw (new Exception( "Error in getProDescription, the PRO_UID can't be blank" ));
} }
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$this->pro_description = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang ); $this->pro_description_content = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang );
return $this->pro_description; return $this->pro_description_content;
} }
/** /**
@@ -121,7 +121,7 @@ class Process extends BaseProcess
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setProDescription ($v) public function setProDescriptionContent ($v)
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in setProDescription, the PRO_UID can't be blank" )); throw (new Exception( "Error in setProDescription, the PRO_UID can't be blank" ));
@@ -132,11 +132,11 @@ class Process extends BaseProcess
$v = (string) $v; $v = (string) $v;
} }
if ($this->pro_description !== $v || $v === '') { if ($this->pro_description_content !== $v || $v === '') {
$this->pro_description = $v; $this->pro_description_content = $v;
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description ); $res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description_content );
} }
} // set() } // set()
@@ -168,6 +168,8 @@ class Process extends BaseProcess
} }
$this->setProUid( $sNewProUid ); $this->setProUid( $sNewProUid );
$this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
$this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
$this->setProParent( $sNewProUid ); $this->setProParent( $sNewProUid );
$this->setProTime( 1 ); $this->setProTime( 1 );
$this->setProTimeunit( 'DAYS' ); $this->setProTimeunit( 'DAYS' );
@@ -196,15 +198,15 @@ class Process extends BaseProcess
$res = $this->save(); $res = $this->save();
if (isset( $aData['PRO_TITLE'] )) { if (isset( $aData['PRO_TITLE'] )) {
$this->setProTitle( $aData['PRO_TITLE'] ); $this->setProTitleContent( $aData['PRO_TITLE'] );
} else { } else {
$this->setProTitle( 'Default Process Title' ); $this->setProTitleContent( 'Default Process Title' );
} }
if (isset( $aData['PRO_DESCRIPTION'] )) { if (isset( $aData['PRO_DESCRIPTION'] )) {
$this->setProDescription( $aData['PRO_DESCRIPTION'] ); $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
} else { } else {
$this->setProDescription( 'Default Process Description' ); $this->setProDescriptionContent( 'Default Process Description' );
} }
$con->commit(); $con->commit();
@@ -265,52 +267,6 @@ class Process extends BaseProcess
// $this->pro_title = $aFields['PRO_TITLE']; // $this->pro_title = $aFields['PRO_TITLE'];
// $this->pro_description = $aFields['PRO_DESCRIPTION']; // $this->pro_description = $aFields['PRO_DESCRIPTION'];
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn( ContentPeer::CON_CATEGORY );
$c->addSelectColumn( ContentPeer::CON_VALUE );
$c->add( ContentPeer::CON_ID, $ProUid );
if (! $getAllLang) {
$c->add( ContentPeer::CON_LANG, $lang );
}
$rs = ProcessPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rs->next();
$row = $rs->getRow();
while (is_array( $row )) {
switch ($row['CON_CATEGORY']) {
case 'PRO_TITLE':
$aFields['PRO_TITLE'] = $row['CON_VALUE'];
$this->pro_title = $row['CON_VALUE'];
if ($row['CON_VALUE'] !== '') {
$this->setProTitle( $aFields['PRO_TITLE'] );
}
break;
case 'PRO_DESCRIPTION':
$aFields['PRO_DESCRIPTION'] = $row['CON_VALUE'];
$this->pro_description = $row['CON_VALUE'];
if ($row['CON_VALUE'] !== '') {
$this->setProDescription( $aFields['PRO_DESCRIPTION'] );
}
break;
}
$rs->next();
$row = $rs->getRow();
}
//If the prev script doesn't return anithing try to create the values based on EN
if (! isset( $aFields['PRO_TITLE'] )) {
$aFields['PRO_TITLE'] = $oPro->getProTitle();
$this->setProTitle( $aFields['PRO_TITLE'] );
}
if (! isset( $aFields['PRO_DESCRIPTION'] )) {
$aFields['PRO_DESCRIPTION'] = $oPro->getProDescription();
$this->setProDescription( $aFields['PRO_DESCRIPTION'] );
}
//the following code is to copy the parent in old process, when the parent was empty. //the following code is to copy the parent in old process, when the parent was empty.
if ($oPro->getProParent() == '') { if ($oPro->getProParent() == '') {
$oPro->setProParent( $oPro->getProUid() ); $oPro->setProParent( $oPro->getProUid() );
@@ -344,6 +300,8 @@ class Process extends BaseProcess
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
$oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT ); $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
$oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS ); $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
$oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY ); $oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY );
@@ -365,39 +323,11 @@ class Process extends BaseProcess
$processes[] = $row; $processes[] = $row;
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID']; $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
} }
//process details will have the info about the processes
$processesDetails = Array ();
//now get the labels for all process, using an array of Uids,
$c = new Criteria( 'workflow' );
//$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
$c->add( ContentPeer::CON_LANG, defined( 'SYS_LANG' ) ? SYS_LANG : 'en', Criteria::EQUAL );
$c->add( ContentPeer::CON_ID, $uids, Criteria::IN );
$dt = ContentPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
$dt->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($dt->next()) {
$row = $dt->getRow();
$processesDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
}
G::loadClass( 'configuration' ); G::loadClass( 'configuration' );
$oConf = new Configurations(); $oConf = new Configurations();
$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
foreach ($processes as $i => $process) {
$processes[$i]['PRO_TITLE'] = $processes[$i]['PRO_DESCRIPTION'] = '';
if (isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] )) {
$processes[$i]['PRO_TITLE'] = $processesDetails[$process['PRO_UID']]['PRO_TITLE'];
}
if (isset( $processesDetails[$process['PRO_UID']] )) {
$processes[$i]['PRO_DESCRIPTION'] = $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'];
}
}
if ($this->dir=='ASC') { if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") ); usort( $processes, array($this, "ordProcessAsc") );
} else { } else {
@@ -428,10 +358,10 @@ class Process extends BaseProcess
$oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
if ($oPro->validate()) { if ($oPro->validate()) {
if (isset( $aData['PRO_TITLE'] )) { if (isset( $aData['PRO_TITLE'] )) {
$oPro->setProTitle( $aData['PRO_TITLE'] ); $oPro->setProTitleContent( $aData['PRO_TITLE'] );
} }
if (isset( $aData['PRO_DESCRIPTION'] )) { if (isset( $aData['PRO_DESCRIPTION'] )) {
$oPro->setProDescription( $aData['PRO_DESCRIPTION'] ); $oPro->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
} }
$res = $oPro->save(); $res = $oPro->save();
$con->commit(); $con->commit();
@@ -468,6 +398,8 @@ class Process extends BaseProcess
$con = Propel::getConnection( ProcessPeer::DATABASE_NAME ); $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
//$con->begin(); //does not allow dual BEGIN //$con->begin(); //does not allow dual BEGIN
$this->setProUid( $aData['PRO_UID'] ); $this->setProUid( $aData['PRO_UID'] );
$this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
$this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
$this->setProParent( $aData['PRO_PARENT'] ); $this->setProParent( $aData['PRO_PARENT'] );
$this->setProTime( $aData['PRO_TIME'] ); $this->setProTime( $aData['PRO_TIME'] );
$this->setProTimeunit( $aData['PRO_TIMEUNIT'] ); $this->setProTimeunit( $aData['PRO_TIMEUNIT'] );
@@ -513,14 +445,14 @@ class Process extends BaseProcess
$res = $this->save(); $res = $this->save();
if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') { if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') {
$this->setProTitle( $aData['PRO_TITLE'] ); $this->setProTitleContent( $aData['PRO_TITLE'] );
} else { } else {
$this->setProTitle( 'Default Process Title' ); $this->setProTitleContent( 'Default Process Title' );
} }
if (isset( $aData['PRO_DESCRIPTION'] )) { if (isset( $aData['PRO_DESCRIPTION'] )) {
$this->setProDescription( $aData['PRO_DESCRIPTION'] ); $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
} else { } else {
$this->setProDescription( 'Default Process Description' ); $this->setProDescriptionContent( 'Default Process Description' );
} }
$con->commit(); $con->commit();
@@ -555,9 +487,7 @@ class Process extends BaseProcess
if (! is_null( $oPro )) { if (! is_null( $oPro )) {
Content::removeContent( 'PRO_TITLE', '', $oPro->getProUid() ); Content::removeContent( 'PRO_TITLE', '', $oPro->getProUid() );
Content::removeContent( 'PRO_DESCRIPTION', '', $oPro->getProUid() ); Content::removeContent( 'PRO_DESCRIPTION', '', $oPro->getProUid() );
$this->memcachedDelete(); $this->memcachedDelete();
return $oPro->delete(); return $oPro->delete();
} else { } else {
throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" )); throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" ));
@@ -576,61 +506,44 @@ class Process extends BaseProcess
public static function existsByProTitle ($proTitle) public static function existsByProTitle ($proTitle)
{ {
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addSelectColumn("COUNT(" . ContentPeer::CON_ID . ") AS NUM_REC"); $oCriteria->add( ProcessPeer::PRO_TITLE, $proTitle );
$oDataset = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( ContentPeer::CON_VALUE, $proTitle );
$oDataset = ContentPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
return ($aRow)? true : false;
return ((int)($aRow["NUM_REC"]) > 0)? true : false;
} }
public static function getByProTitle($proTitle) { public static function getByProTitle($proTitle)
{
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle);
$oCriteria->addSelectColumn(ContentPeer::CON_ID); $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oCriteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->add(ContentPeer::CON_VALUE, $proTitle);
$oDataset = ContentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
$oProcess = new Process(); return isset($aRow) ? $aRow : null;
return isset($aRow["CON_ID"]) ? $oProcess->load($aRow["CON_ID"]) : null;
} }
public static function getNextTitle($proTitle) { public static function getNextTitle($proTitle)
{
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle . '-%', Criteria::LIKE);
$oCriteria->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE'); $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->add(ContentPeer::CON_VALUE, $proTitle . '-%', Criteria::LIKE);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$oDataset = ContentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$data = array(); $data = array();
$may = 0; $may = 0;
while ($oDataset->next()) { while ($oDataset->next()) {
$row = $oDataset->getRow(); $row = $oDataset->getRow();
$number = explode("-", $row["CON_VALUE"]); $number = explode("-", $row["PRO_TITLE"]);
$number = $number[count($number) - 1] + 0; $number = $number[count($number) - 1] + 0;
if ($number > $may) { if ($number > $may) {
$may = $number; $may = $number;
} }
$row["CON_VALUE"] = $number; $row["PRO_TITLE"] = $number;
$data[] = $row; $data[] = $row;
} }
return $proTitle . "-" . ($may + 1); return $proTitle . "-" . ($may + 1);
@@ -664,6 +577,8 @@ class Process extends BaseProcess
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
$oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT ); $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
$oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS ); $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE); $oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE);
@@ -743,30 +658,13 @@ class Process extends BaseProcess
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID']; $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
} }
//process details will have the info about the processes
$processesDetails = Array ();
//now get the labels for all process, using an array of Uids,
$c = new Criteria( 'workflow' );
//$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
$c->add( ContentPeer::CON_LANG, defined( 'SYS_LANG' ) ? SYS_LANG : 'en', Criteria::EQUAL );
$c->add( ContentPeer::CON_ID, $uids, Criteria::IN );
$dt = ContentPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
$dt->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($dt->next()) {
$row = $dt->getRow();
$processesDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
}
G::loadClass( 'configuration' ); G::loadClass( 'configuration' );
$oConf = new Configurations(); $oConf = new Configurations();
$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
foreach ($processes as $process) { foreach ($processes as $process) {
$proTitle = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] ) ? $processesDetails[$process['PRO_UID']]['PRO_TITLE'] : ''; $proTitle = isset($process['PRO_TITLE'])? $process['PRO_TITLE'] : '';
$proDescription = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] ) ? $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] : ''; $proDescription = isset($process['PRO_DESCRIPTION']) ? $process['PRO_DESCRIPTION'] : '';
$process["PRO_TYPE_PROCESS"] = ($process["PRO_TYPE_PROCESS"] == "PUBLIC") ? G::LoadTranslation("ID_PUBLIC") : G::LoadTranslation("ID_PRIVATE"); $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 // verify if the title is already set on the current language

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

@@ -418,14 +418,12 @@ class Step extends BaseStep
$res = array(); $res = array();
$oCriteria = new Criteria(); $oCriteria = new Criteria();
$oCriteria->addSelectColumn( StepPeer::TAS_UID ); $oCriteria->addSelectColumn( StepPeer::TAS_UID );
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
$oCriteria->addSelectColumn( StepPeer::STEP_POSITION ); $oCriteria->addSelectColumn( StepPeer::STEP_POSITION );
$oCriteria->addAsColumn('CON_VALUE', TaskPeer::TAS_TITLE);
$oCriteria->add( StepPeer::PRO_UID, $proUid ); $oCriteria->add( StepPeer::PRO_UID, $proUid );
$oCriteria->add( StepPeer::STEP_UID_OBJ, $dynUid ); $oCriteria->add( StepPeer::STEP_UID_OBJ, $dynUid );
$oCriteria->add( StepPeer::STEP_TYPE_OBJ, 'DYNAFORM' ); $oCriteria->add( StepPeer::STEP_TYPE_OBJ, 'DYNAFORM' );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE'); $oCriteria->addJoin( StepPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::INNER_JOIN);
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->addJoin( StepPeer::TAS_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN);
$oDataset = StepPeer::doSelectRS( $oCriteria ); $oDataset = StepPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while($oDataset->next()) { while($oDataset->next()) {

189
workflow/engine/classes/model/Task.php
View File

@@ -20,22 +20,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_title = ''; protected $tas_title_content = '';
/** /**
* Get the tas_title column value. * Get the tas_title column value.
* @return string * @return string
*/ */
public function getTasTitle() public function getTasTitleContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in getTasTitle, the getTasUid() can't be blank")); throw (new Exception("Error in getTasTitle, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_title = Content::load('TAS_TITLE', '', $this->getTasUid(), $lang); $this->tas_title_content = Content::load('TAS_TITLE', '', $this->getTasUid(), $lang);
return $this->tas_title; return $this->tas_title_content;
} }
/** /**
@@ -44,7 +44,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasTitle($v) public function setTasTitleContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in setTasTitle, the getTasUid() can't be blank")); throw (new Exception("Error in setTasTitle, the getTasUid() can't be blank"));
@@ -53,10 +53,10 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_title !== $v || $v === "") { if ($this->tas_title_content !== $v || $v === "") {
$this->tas_title = $v; $this->tas_title_content = $v;
$res = Content::addContent('TAS_TITLE', '', $this->getTasUid(), $lang, $this->tas_title); $res = Content::addContent('TAS_TITLE', '', $this->getTasUid(), $lang, $this->tas_title_content);
return $res; return $res;
} }
@@ -68,22 +68,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_description = ''; protected $tas_description_content = '';
/** /**
* Get the tas_description column value. * Get the tas_description column value.
* @return string * @return string
*/ */
public function getTasDescription() public function getTasDescriptionContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception( "Error in getTasDescription, the getTasUid() can't be blank")); throw (new Exception( "Error in getTasDescription, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_description = Content::load('TAS_DESCRIPTION', '', $this->getTasUid(), $lang); $this->tas_description_content = Content::load('TAS_DESCRIPTION', '', $this->getTasUid(), $lang);
return $this->tas_description; return $this->tas_description_content;
} }
/** /**
@@ -92,7 +92,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasDescription($v) public function setTasDescriptionContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in setTasDescription, the getTasUid() can't be blank")); throw (new Exception("Error in setTasDescription, the getTasUid() can't be blank"));
@@ -101,10 +101,10 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_description !== $v || $v === "") { if ($this->tas_description_content !== $v || $v === "") {
$this->tas_description = $v; $this->tas_description_content = $v;
$res = Content::addContent('TAS_DESCRIPTION', '', $this->getTasUid(), $lang, $this->tas_description); $res = Content::addContent('TAS_DESCRIPTION', '', $this->getTasUid(), $lang, $this->tas_description_content);
return $res; return $res;
} }
@@ -116,22 +116,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_def_title = ''; protected $tas_def_title_content = '';
/** /**
* Get the tas_def_title column value. * Get the tas_def_title column value.
* @return string * @return string
*/ */
public function getTasDefTitle() public function getTasDefTitleContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception( "Error in getTasDefTitle, the getTasUid() can't be blank")); throw (new Exception( "Error in getTasDefTitle, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_def_title = Content::load('TAS_DEF_TITLE', '', $this->getTasUid(), $lang); $this->tas_def_title_content = Content::load('TAS_DEF_TITLE', '', $this->getTasUid(), $lang);
return $this->tas_def_title; return $this->tas_def_title_content;
} }
/** /**
@@ -140,7 +140,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasDefTitle($v) public function setTasDefTitleContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in setTasDefTitle, the getTasUid() can't be blank")); throw (new Exception("Error in setTasDefTitle, the getTasUid() can't be blank"));
@@ -149,10 +149,10 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_def_title !== $v || $v === "") { if ($this->tas_def_title_content !== $v || $v === "") {
$this->tas_def_title = $v; $this->tas_def_title_content = $v;
$res = Content::addContent('TAS_DEF_TITLE', '', $this->getTasUid(), $lang, $this->tas_def_title); $res = Content::addContent('TAS_DEF_TITLE', '', $this->getTasUid(), $lang, $this->tas_def_title_content);
return $res; return $res;
} }
@@ -164,22 +164,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_def_description = ''; protected $tas_def_description_content = '';
/** /**
* Get the tas_def_description column value. * Get the tas_def_description column value.
* @return string * @return string
*/ */
public function getTasDefDescription() public function getTasDefDescriptionContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception( "Error in getTasDefDescription, the getTasUid() can't be blank")); throw (new Exception( "Error in getTasDefDescription, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_def_description = Content::load('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang); $this->tas_def_description_content = Content::load('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang);
return $this->tas_def_description; return $this->tas_def_description_content;
} }
/** /**
@@ -188,7 +188,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasDefDescription($v) public function setTasDefDescriptionContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in setTasDefDescription, the getTasUid() can't be blank")); throw (new Exception("Error in setTasDefDescription, the getTasUid() can't be blank"));
@@ -197,8 +197,8 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_def_description !== $v || $v === "") { if ($this->tas_def_description_content !== $v || $v === "") {
$this->tas_def_description = $v; $this->tas_def_description_content = $v;
$res = Content::addContent('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang, $v); $res = Content::addContent('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang, $v);
return $res; return $res;
@@ -211,22 +211,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_def_proc_code = ''; protected $tas_def_proc_code_content = '';
/** /**
* Get the tas_def_proc_code column value. * Get the tas_def_proc_code column value.
* @return string * @return string
*/ */
public function getTasDefProcCode() public function getTasDefProcCodeContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception( "Error in getTasDefProcCode, the getTasUid() can't be blank")); throw (new Exception( "Error in getTasDefProcCode, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_def_proc_code = Content::load('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang); $this->tas_def_proc_code_content = Content::load('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang);
return $this->tas_def_proc_code; return $this->tas_def_proc_code_content;
} }
/** /**
@@ -235,7 +235,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasDefProcCode($v) public function setTasDefProcCodeContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in setTasDefProcCode, the getTasUid() can't be blank")); throw (new Exception("Error in setTasDefProcCode, the getTasUid() can't be blank"));
@@ -244,10 +244,10 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_def_proc_code !== $v || $v === "") { if ($this->tas_def_proc_code_content !== $v || $v === "") {
$this->tas_def_proc_code = $v; $this->tas_def_proc_code_content = $v;
$res = Content::addContent('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang, $this->tas_def_proc_code); $res = Content::addContent('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang, $this->tas_def_proc_code_content);
return $res; return $res;
} }
@@ -259,22 +259,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_def_message = ''; protected $tas_def_message_content = '';
/** /**
* Get the tas_def_message column value. * Get the tas_def_message column value.
* @return string * @return string
*/ */
public function getTasDefMessage() public function getTasDefMessageContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception( "Error in getTasDefMessage, the getTasUid() can't be blank")); throw (new Exception( "Error in getTasDefMessage, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_def_message = Content::load('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang); $this->tas_def_message_content = Content::load('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang);
return $this->tas_def_message; return $this->tas_def_message_content;
} }
/** /**
@@ -283,7 +283,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasDefMessage($v) public function setTasDefMessageContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in setTasDefMessage, the getTasUid() can't be blank")); throw (new Exception("Error in setTasDefMessage, the getTasUid() can't be blank"));
@@ -291,10 +291,10 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_def_message !== $v || $v === "") { if ($this->tas_def_message_content !== $v || $v === "") {
$this->tas_def_message = $v; $this->tas_def_message_content = $v;
$res = Content::addContent('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang, $this->tas_def_message); $res = Content::addContent('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang, $this->tas_def_message_content);
return $res; return $res;
} }
@@ -306,22 +306,22 @@ class Task extends BaseTask
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $tas_def_subject_message = ''; protected $tas_def_subject_message_content = '';
/** /**
* Get the tas_def_message column value. * Get the tas_def_message column value.
* @return string * @return string
*/ */
public function getTasDefSubjectMessage() public function getTasDefSubjectMessageContent()
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception("Error in getTasDefSubjectMessage, the getTasUid() can't be blank")); throw (new Exception("Error in getTasDefSubjectMessage, the getTasUid() can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->tas_def_subject_message = Content::load('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang); $this->tas_def_subject_message_content = Content::load('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang);
return $this->tas_def_subject_message; return $this->tas_def_subject_message_content;
} }
/** /**
@@ -330,7 +330,7 @@ class Task extends BaseTask
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setTasDefSubjectMessage($v) public function setTasDefSubjectMessageContent($v)
{ {
if ($this->getTasUid() == "") { if ($this->getTasUid() == "") {
throw (new Exception( "Error in setTasDefSubjectMessage, the getTasUid() can't be blank")); throw (new Exception( "Error in setTasDefSubjectMessage, the getTasUid() can't be blank"));
@@ -339,8 +339,8 @@ class Task extends BaseTask
$v = isset($v)? ((string)$v) : ''; $v = isset($v)? ((string)$v) : '';
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
if ($this->tas_def_subject_message !== $v || $v === "") { if ($this->tas_def_subject_message_content !== $v || $v === "") {
$this->tas_def_subject_message = $v; $this->tas_def_subject_message_content = $v;
$res = Content::addContent('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang, $v); $res = Content::addContent('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang, $v);
@@ -370,6 +370,13 @@ class Task extends BaseTask
$con->begin(); $con->begin();
$this->setProUid($aData['PRO_UID']); $this->setProUid($aData['PRO_UID']);
$this->setTasUid($sTaskUID); $this->setTasUid($sTaskUID);
$this->setTasTitle((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: ''));
$this->setTasDescription((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: ''));
$this->setTasDefTitle("");
$this->setTasDefDescription("");
$this->setTasDefProcCode("");
$this->setTasDefMessage("");
$this->setTasDefSubjectMessage("");
$this->setTasType("NORMAL"); $this->setTasType("NORMAL");
$this->setTasDuration("1"); $this->setTasDuration("1");
$this->setTasDelayType(""); $this->setTasDelayType("");
@@ -405,16 +412,15 @@ class Task extends BaseTask
$this->fromArray($aData,BasePeer::TYPE_FIELDNAME); $this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
if ($this->validate()) { if ($this->validate()) {
$this->setTasTitle((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: '')); $this->setTasTitleContent((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: ''));
$this->setTasDescription((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: '')); $this->setTasDescriptionContent((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: ''));
$this->setTasDefTitle(""); $this->setTasDefTitleContent("");
$this->setTasDefDescription(""); $this->setTasDefDescriptionContent("");
$this->setTasDefProcCode(""); $this->setTasDefProcCodeContent("");
$this->setTasDefMessage(""); $this->setTasDefMessageContent("");
$this->setTasDefSubjectMessage(""); $this->setTasDefSubjectMessageContent("");
$this->save(); $this->save();
$con->commit(); $con->commit();
return $sTaskUID; return $sTaskUID;
} else { } else {
$con->rollback(); $con->rollback();
@@ -458,19 +464,6 @@ class Task extends BaseTask
//Populating attributes //Populating attributes
$this->setNew(false); $this->setNew(false);
///////
//Create new records for TASK in CONTENT for the current language, this if is necesary
//Populating others attributes
$this->setTasUid($TasUid);
$aFields["TAS_TITLE"] = $this->getTasTitle();
$aFields["TAS_DESCRIPTION"] = $this->getTasDescription();
$aFields["TAS_DEF_TITLE"] = $this->getTasDefTitle();
$aFields["TAS_DEF_DESCRIPTION"] = $this->getTasDefDescription();
$aFields["TAS_DEF_PROC_CODE"] = $this->getTasDefProcCode();
$aFields["TAS_DEF_MESSAGE"] = $this->getTasDefMessage();
$aFields["TAS_DEF_SUBJECT_MESSAGE"] = $this->getTasDefSubjectMessage();
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
G::LoadClass("indicatorsCalculator"); G::LoadClass("indicatorsCalculator");
$indicator = new indicatorsCalculator(); $indicator = new indicatorsCalculator();
@@ -503,52 +496,36 @@ class Task extends BaseTask
$this->validateAssignType($fields,$oldValues); $this->validateAssignType($fields,$oldValues);
if ($this->validate()) { if ($this->validate()) {
$taskDefTitlePrevious = null; $taskDefTitlePrevious = $oldValues["TAS_DEF_TITLE"];
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add(ContentPeer::CON_CATEGORY, "TAS_DEF_TITLE");
$criteria->add(ContentPeer::CON_ID, $fields["TAS_UID"]);
$criteria->add(ContentPeer::CON_LANG, SYS_LANG);
$rsCriteria = ContentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$taskDefTitlePrevious = $row["CON_VALUE"];
}
$contentResult = 0; $contentResult = 0;
if (array_key_exists("TAS_TITLE", $fields)) { if (array_key_exists("TAS_TITLE", $fields)) {
$contentResult += $this->setTasTitle($fields["TAS_TITLE"]); $contentResult += $this->setTasTitleContent($fields["TAS_TITLE"]);
} }
if (array_key_exists("TAS_DESCRIPTION", $fields)) { if (array_key_exists("TAS_DESCRIPTION", $fields)) {
$contentResult += $this->setTasDescription($fields["TAS_DESCRIPTION"]); $contentResult += $this->setTasDescriptionContent($fields["TAS_DESCRIPTION"]);
} }
if (array_key_exists("TAS_DEF_TITLE", $fields)) { if (array_key_exists("TAS_DEF_TITLE", $fields)) {
$contentResult += $this->setTasDefTitle($fields["TAS_DEF_TITLE"]); $contentResult += $this->setTasDefTitleContent($fields["TAS_DEF_TITLE"]);
} }
if (array_key_exists("TAS_DEF_DESCRIPTION", $fields)) { if (array_key_exists("TAS_DEF_DESCRIPTION", $fields)) {
$contentResult += $this->setTasDefDescription($fields["TAS_DEF_DESCRIPTION"]); $contentResult += $this->setTasDefDescriptionContent($fields["TAS_DEF_DESCRIPTION"]);
} }
if (array_key_exists("TAS_DEF_PROC_CODE", $fields)) { if (array_key_exists("TAS_DEF_PROC_CODE", $fields)) {
$contentResult += $this->setTasDefProcCode($fields["TAS_DEF_PROC_CODE"]); $contentResult += $this->setTasDefProcCodeContent($fields["TAS_DEF_PROC_CODE"]);
} }
if (array_key_exists("TAS_DEF_MESSAGE", $fields)) { if (array_key_exists("TAS_DEF_MESSAGE", $fields)) {
$contentResult += $this->setTasDefMessage(trim($fields["TAS_DEF_MESSAGE"])); $contentResult += $this->setTasDefMessageContent(trim($fields["TAS_DEF_MESSAGE"]));
} }
if (array_key_exists("TAS_DEF_SUBJECT_MESSAGE", $fields)) { if (array_key_exists("TAS_DEF_SUBJECT_MESSAGE", $fields)) {
$contentResult += $this->setTasDefSubjectMessage(trim($fields["TAS_DEF_SUBJECT_MESSAGE"])); $contentResult += $this->setTasDefSubjectMessageContent(trim($fields["TAS_DEF_SUBJECT_MESSAGE"]));
} }
if (array_key_exists("TAS_CALENDAR", $fields)) { if (array_key_exists("TAS_CALENDAR", $fields)) {
@@ -693,15 +670,15 @@ class Task extends BaseTask
$this->fromArray($aData,BasePeer::TYPE_FIELDNAME); $this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
if ($this->validate()) { if ($this->validate()) {
$this->setTasTitle((isset($aData['TAS_TITLE'])? $aData['TAS_TITLE'] : '')); $this->setTasTitleContent((isset($aData['TAS_TITLE'])? $aData['TAS_TITLE'] : ''));
$this->setTasDescription((isset($aData['TAS_DESCRIPTION'])? $aData['TAS_DESCRIPTION'] : '')); $this->setTasDescriptionContent((isset($aData['TAS_DESCRIPTION'])? $aData['TAS_DESCRIPTION'] : ''));
$this->setTasDefTitle((isset($aData['TAS_DEF_TITLE'])? $aData['TAS_DEF_TITLE'] : '')); $this->setTasDefTitleContent((isset($aData['TAS_DEF_TITLE'])? $aData['TAS_DEF_TITLE'] : ''));
$this->setTasDefDescription((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : '')); $this->setTasDefDescriptionContent((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
$this->setTasDefProcCode((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : '')); $this->setTasDefProcCodeContent((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
$this->setTasDefMessage((isset($aData['TAS_DEF_MESSAGE'])? $aData['TAS_DEF_MESSAGE'] : '')); $this->setTasDefMessageContent((isset($aData['TAS_DEF_MESSAGE'])? $aData['TAS_DEF_MESSAGE'] : ''));
$strAux = isset($aData['TAS_DEF_SUBJECT_MESSAGE'])? $aData['TAS_DEF_SUBJECT_MESSAGE'] : ''; $strAux = isset($aData['TAS_DEF_SUBJECT_MESSAGE'])? $aData['TAS_DEF_SUBJECT_MESSAGE'] : '';
$this->setTasDefSubjectMessage($strAux); $this->setTasDefSubjectMessageContent($strAux);
$this->save(); $this->save();
$con->commit(); $con->commit();

4
workflow/engine/classes/model/map/ApplicationMapBuilder.php
View File

@@ -67,6 +67,10 @@ class ApplicationMapBuilder
$tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('APP_DESCRIPTION', 'AppDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32);

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

@@ -67,6 +67,8 @@ class DepartmentMapBuilder
$tMap->addPrimaryKey('DEP_UID', 'DepUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('DEP_UID', 'DepUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEP_TITLE', 'DepTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('DEP_PARENT', 'DepParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('DEP_PARENT', 'DepParent', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEP_MANAGER', 'DepManager', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('DEP_MANAGER', 'DepManager', 'string', CreoleTypes::VARCHAR, true, 32);

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

@@ -67,6 +67,8 @@ class GroupwfMapBuilder
$tMap->addPrimaryKey('GRP_UID', 'GrpUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('GRP_UID', 'GrpUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('GRP_TITLE', 'GrpTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('GRP_STATUS', 'GrpStatus', 'string', CreoleTypes::CHAR, true, 8); $tMap->addColumn('GRP_STATUS', 'GrpStatus', 'string', CreoleTypes::CHAR, true, 8);
$tMap->addColumn('GRP_LDAP_DN', 'GrpLdapDn', 'string', CreoleTypes::VARCHAR, true, 255); $tMap->addColumn('GRP_LDAP_DN', 'GrpLdapDn', 'string', CreoleTypes::VARCHAR, true, 255);

4
workflow/engine/classes/model/map/InputDocumentMapBuilder.php
View File

@@ -69,6 +69,10 @@ class InputDocumentMapBuilder
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('INP_DOC_TITLE', 'InpDocTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('INP_DOC_DESCRIPTION', 'InpDocDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('INP_DOC_FORM_NEEDED', 'InpDocFormNeeded', 'string', CreoleTypes::VARCHAR, true, 20); $tMap->addColumn('INP_DOC_FORM_NEEDED', 'InpDocFormNeeded', 'string', CreoleTypes::VARCHAR, true, 20);
$tMap->addColumn('INP_DOC_ORIGINAL', 'InpDocOriginal', 'string', CreoleTypes::VARCHAR, true, 20); $tMap->addColumn('INP_DOC_ORIGINAL', 'InpDocOriginal', 'string', CreoleTypes::VARCHAR, true, 20);

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

@@ -67,6 +67,10 @@ class ProcessMapBuilder
$tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TITLE', 'ProTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('PRO_DESCRIPTION', 'ProDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('PRO_PARENT', 'ProParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_PARENT', 'ProParent', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TIME', 'ProTime', 'double', CreoleTypes::DOUBLE, true, null); $tMap->addColumn('PRO_TIME', 'ProTime', 'double', CreoleTypes::DOUBLE, true, null);

14
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -69,6 +69,20 @@ class TaskMapBuilder
$tMap->addPrimaryKey('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('TAS_TITLE', 'TasTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('TAS_DESCRIPTION', 'TasDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('TAS_DEF_TITLE', 'TasDefTitle', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('TAS_DEF_SUBJECT_MESSAGE', 'TasDefSubjectMessage', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('TAS_DEF_PROC_CODE', 'TasDefProcCode', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('TAS_DEF_MESSAGE', 'TasDefMessage', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('TAS_DEF_DESCRIPTION', 'TasDefDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('TAS_TYPE', 'TasType', 'string', CreoleTypes::VARCHAR, true, 50); $tMap->addColumn('TAS_TYPE', 'TasType', 'string', CreoleTypes::VARCHAR, true, 50);
$tMap->addColumn('TAS_DURATION', 'TasDuration', 'double', CreoleTypes::DOUBLE, true, null); $tMap->addColumn('TAS_DURATION', 'TasDuration', 'double', CreoleTypes::DOUBLE, true, null);

294
workflow/engine/classes/model/om/BaseApplication.php
View File

@@ -33,6 +33,18 @@ abstract class BaseApplication extends BaseObject implements Persistent
*/ */
protected $app_uid = ''; protected $app_uid = '';
/**
* The value for the app_title field.
* @var string
*/
protected $app_title;
/**
* The value for the app_description field.
* @var string
*/
protected $app_description;
/** /**
* The value for the app_number field. * The value for the app_number field.
* @var int * @var int
@@ -166,6 +178,28 @@ abstract class BaseApplication extends BaseObject implements Persistent
return $this->app_uid; return $this->app_uid;
} }
/**
* Get the [app_title] column value.
*
* @return string
*/
public function getAppTitle()
{
return $this->app_title;
}
/**
* Get the [app_description] column value.
*
* @return string
*/
public function getAppDescription()
{
return $this->app_description;
}
/** /**
* Get the [app_number] column value. * Get the [app_number] column value.
* *
@@ -470,6 +504,50 @@ abstract class BaseApplication extends BaseObject implements Persistent
} // setAppUid() } // setAppUid()
/**
* Set the value of [app_title] column.
*
* @param string $v new value
* @return void
*/
public function setAppTitle($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->app_title !== $v) {
$this->app_title = $v;
$this->modifiedColumns[] = ApplicationPeer::APP_TITLE;
}
} // setAppTitle()
/**
* Set the value of [app_description] column.
*
* @param string $v new value
* @return void
*/
public function setAppDescription($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->app_description !== $v) {
$this->app_description = $v;
$this->modifiedColumns[] = ApplicationPeer::APP_DESCRIPTION;
}
} // setAppDescription()
/** /**
* Set the value of [app_number] column. * Set the value of [app_number] column.
* *
@@ -901,48 +979,52 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->app_uid = $rs->getString($startcol + 0); $this->app_uid = $rs->getString($startcol + 0);
$this->app_number = $rs->getInt($startcol + 1); $this->app_title = $rs->getString($startcol + 1);
$this->app_parent = $rs->getString($startcol + 2); $this->app_description = $rs->getString($startcol + 2);
$this->app_status = $rs->getString($startcol + 3); $this->app_number = $rs->getInt($startcol + 3);
$this->pro_uid = $rs->getString($startcol + 4); $this->app_parent = $rs->getString($startcol + 4);
$this->app_proc_status = $rs->getString($startcol + 5); $this->app_status = $rs->getString($startcol + 5);
$this->app_proc_code = $rs->getString($startcol + 6); $this->pro_uid = $rs->getString($startcol + 6);
$this->app_parallel = $rs->getString($startcol + 7); $this->app_proc_status = $rs->getString($startcol + 7);
$this->app_init_user = $rs->getString($startcol + 8); $this->app_proc_code = $rs->getString($startcol + 8);
$this->app_cur_user = $rs->getString($startcol + 9); $this->app_parallel = $rs->getString($startcol + 9);
$this->app_create_date = $rs->getTimestamp($startcol + 10, null); $this->app_init_user = $rs->getString($startcol + 10);
$this->app_init_date = $rs->getTimestamp($startcol + 11, null); $this->app_cur_user = $rs->getString($startcol + 11);
$this->app_finish_date = $rs->getTimestamp($startcol + 12, null); $this->app_create_date = $rs->getTimestamp($startcol + 12, null);
$this->app_update_date = $rs->getTimestamp($startcol + 13, null); $this->app_init_date = $rs->getTimestamp($startcol + 13, null);
$this->app_data = $rs->getString($startcol + 14); $this->app_finish_date = $rs->getTimestamp($startcol + 14, null);
$this->app_pin = $rs->getString($startcol + 15); $this->app_update_date = $rs->getTimestamp($startcol + 15, null);
$this->app_duration = $rs->getFloat($startcol + 16); $this->app_data = $rs->getString($startcol + 16);
$this->app_delay_duration = $rs->getFloat($startcol + 17); $this->app_pin = $rs->getString($startcol + 17);
$this->app_drive_folder_uid = $rs->getString($startcol + 18); $this->app_duration = $rs->getFloat($startcol + 18);
$this->app_delay_duration = $rs->getFloat($startcol + 19);
$this->app_drive_folder_uid = $rs->getString($startcol + 20);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 19; // 19 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 21; // 21 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Application object", $e); throw new PropelException("Error populating Application object", $e);
@@ -1150,57 +1232,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
return $this->getAppUid(); return $this->getAppUid();
break; break;
case 1: case 1:
return $this->getAppNumber(); return $this->getAppTitle();
break; break;
case 2: case 2:
return $this->getAppParent(); return $this->getAppDescription();
break; break;
case 3: case 3:
return $this->getAppStatus(); return $this->getAppNumber();
break; break;
case 4: case 4:
return $this->getProUid(); return $this->getAppParent();
break; break;
case 5: case 5:
return $this->getAppProcStatus(); return $this->getAppStatus();
break; break;
case 6: case 6:
return $this->getAppProcCode(); return $this->getProUid();
break; break;
case 7: case 7:
return $this->getAppParallel(); return $this->getAppProcStatus();
break; break;
case 8: case 8:
return $this->getAppInitUser(); return $this->getAppProcCode();
break; break;
case 9: case 9:
return $this->getAppCurUser(); return $this->getAppParallel();
break; break;
case 10: case 10:
return $this->getAppCreateDate(); return $this->getAppInitUser();
break; break;
case 11: case 11:
return $this->getAppInitDate(); return $this->getAppCurUser();
break; break;
case 12: case 12:
return $this->getAppFinishDate(); return $this->getAppCreateDate();
break; break;
case 13: case 13:
return $this->getAppUpdateDate(); return $this->getAppInitDate();
break; break;
case 14: case 14:
return $this->getAppData(); return $this->getAppFinishDate();
break; break;
case 15: case 15:
return $this->getAppPin(); return $this->getAppUpdateDate();
break; break;
case 16: case 16:
return $this->getAppDuration(); return $this->getAppData();
break; break;
case 17: case 17:
return $this->getAppDelayDuration(); return $this->getAppPin();
break; break;
case 18: case 18:
return $this->getAppDuration();
break;
case 19:
return $this->getAppDelayDuration();
break;
case 20:
return $this->getAppDriveFolderUid(); return $this->getAppDriveFolderUid();
break; break;
default: default:
@@ -1224,24 +1312,26 @@ abstract class BaseApplication extends BaseObject implements Persistent
$keys = ApplicationPeer::getFieldNames($keyType); $keys = ApplicationPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getAppUid(), $keys[0] => $this->getAppUid(),
$keys[1] => $this->getAppNumber(), $keys[1] => $this->getAppTitle(),
$keys[2] => $this->getAppParent(), $keys[2] => $this->getAppDescription(),
$keys[3] => $this->getAppStatus(), $keys[3] => $this->getAppNumber(),
$keys[4] => $this->getProUid(), $keys[4] => $this->getAppParent(),
$keys[5] => $this->getAppProcStatus(), $keys[5] => $this->getAppStatus(),
$keys[6] => $this->getAppProcCode(), $keys[6] => $this->getProUid(),
$keys[7] => $this->getAppParallel(), $keys[7] => $this->getAppProcStatus(),
$keys[8] => $this->getAppInitUser(), $keys[8] => $this->getAppProcCode(),
$keys[9] => $this->getAppCurUser(), $keys[9] => $this->getAppParallel(),
$keys[10] => $this->getAppCreateDate(), $keys[10] => $this->getAppInitUser(),
$keys[11] => $this->getAppInitDate(), $keys[11] => $this->getAppCurUser(),
$keys[12] => $this->getAppFinishDate(), $keys[12] => $this->getAppCreateDate(),
$keys[13] => $this->getAppUpdateDate(), $keys[13] => $this->getAppInitDate(),
$keys[14] => $this->getAppData(), $keys[14] => $this->getAppFinishDate(),
$keys[15] => $this->getAppPin(), $keys[15] => $this->getAppUpdateDate(),
$keys[16] => $this->getAppDuration(), $keys[16] => $this->getAppData(),
$keys[17] => $this->getAppDelayDuration(), $keys[17] => $this->getAppPin(),
$keys[18] => $this->getAppDriveFolderUid(), $keys[18] => $this->getAppDuration(),
$keys[19] => $this->getAppDelayDuration(),
$keys[20] => $this->getAppDriveFolderUid(),
); );
return $result; return $result;
} }
@@ -1277,57 +1367,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->setAppUid($value); $this->setAppUid($value);
break; break;
case 1: case 1:
$this->setAppNumber($value); $this->setAppTitle($value);
break; break;
case 2: case 2:
$this->setAppParent($value); $this->setAppDescription($value);
break; break;
case 3: case 3:
$this->setAppStatus($value); $this->setAppNumber($value);
break; break;
case 4: case 4:
$this->setProUid($value); $this->setAppParent($value);
break; break;
case 5: case 5:
$this->setAppProcStatus($value); $this->setAppStatus($value);
break; break;
case 6: case 6:
$this->setAppProcCode($value); $this->setProUid($value);
break; break;
case 7: case 7:
$this->setAppParallel($value); $this->setAppProcStatus($value);
break; break;
case 8: case 8:
$this->setAppInitUser($value); $this->setAppProcCode($value);
break; break;
case 9: case 9:
$this->setAppCurUser($value); $this->setAppParallel($value);
break; break;
case 10: case 10:
$this->setAppCreateDate($value); $this->setAppInitUser($value);
break; break;
case 11: case 11:
$this->setAppInitDate($value); $this->setAppCurUser($value);
break; break;
case 12: case 12:
$this->setAppFinishDate($value); $this->setAppCreateDate($value);
break; break;
case 13: case 13:
$this->setAppUpdateDate($value); $this->setAppInitDate($value);
break; break;
case 14: case 14:
$this->setAppData($value); $this->setAppFinishDate($value);
break; break;
case 15: case 15:
$this->setAppPin($value); $this->setAppUpdateDate($value);
break; break;
case 16: case 16:
$this->setAppDuration($value); $this->setAppData($value);
break; break;
case 17: case 17:
$this->setAppDelayDuration($value); $this->setAppPin($value);
break; break;
case 18: case 18:
$this->setAppDuration($value);
break;
case 19:
$this->setAppDelayDuration($value);
break;
case 20:
$this->setAppDriveFolderUid($value); $this->setAppDriveFolderUid($value);
break; break;
} // switch() } // switch()
@@ -1358,75 +1454,83 @@ abstract class BaseApplication extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setAppNumber($arr[$keys[1]]); $this->setAppTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setAppParent($arr[$keys[2]]); $this->setAppDescription($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setAppStatus($arr[$keys[3]]); $this->setAppNumber($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setProUid($arr[$keys[4]]); $this->setAppParent($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setAppProcStatus($arr[$keys[5]]); $this->setAppStatus($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setAppProcCode($arr[$keys[6]]); $this->setProUid($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setAppParallel($arr[$keys[7]]); $this->setAppProcStatus($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setAppInitUser($arr[$keys[8]]); $this->setAppProcCode($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setAppCurUser($arr[$keys[9]]); $this->setAppParallel($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setAppCreateDate($arr[$keys[10]]); $this->setAppInitUser($arr[$keys[10]]);
} }
if (array_key_exists($keys[11], $arr)) { if (array_key_exists($keys[11], $arr)) {
$this->setAppInitDate($arr[$keys[11]]); $this->setAppCurUser($arr[$keys[11]]);
} }
if (array_key_exists($keys[12], $arr)) { if (array_key_exists($keys[12], $arr)) {
$this->setAppFinishDate($arr[$keys[12]]); $this->setAppCreateDate($arr[$keys[12]]);
} }
if (array_key_exists($keys[13], $arr)) { if (array_key_exists($keys[13], $arr)) {
$this->setAppUpdateDate($arr[$keys[13]]); $this->setAppInitDate($arr[$keys[13]]);
} }
if (array_key_exists($keys[14], $arr)) { if (array_key_exists($keys[14], $arr)) {
$this->setAppData($arr[$keys[14]]); $this->setAppFinishDate($arr[$keys[14]]);
} }
if (array_key_exists($keys[15], $arr)) { if (array_key_exists($keys[15], $arr)) {
$this->setAppPin($arr[$keys[15]]); $this->setAppUpdateDate($arr[$keys[15]]);
} }
if (array_key_exists($keys[16], $arr)) { if (array_key_exists($keys[16], $arr)) {
$this->setAppDuration($arr[$keys[16]]); $this->setAppData($arr[$keys[16]]);
} }
if (array_key_exists($keys[17], $arr)) { if (array_key_exists($keys[17], $arr)) {
$this->setAppDelayDuration($arr[$keys[17]]); $this->setAppPin($arr[$keys[17]]);
} }
if (array_key_exists($keys[18], $arr)) { if (array_key_exists($keys[18], $arr)) {
$this->setAppDriveFolderUid($arr[$keys[18]]); $this->setAppDuration($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setAppDelayDuration($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setAppDriveFolderUid($arr[$keys[20]]);
} }
} }
@@ -1444,6 +1548,14 @@ abstract class BaseApplication extends BaseObject implements Persistent
$criteria->add(ApplicationPeer::APP_UID, $this->app_uid); $criteria->add(ApplicationPeer::APP_UID, $this->app_uid);
} }
if ($this->isColumnModified(ApplicationPeer::APP_TITLE)) {
$criteria->add(ApplicationPeer::APP_TITLE, $this->app_title);
}
if ($this->isColumnModified(ApplicationPeer::APP_DESCRIPTION)) {
$criteria->add(ApplicationPeer::APP_DESCRIPTION, $this->app_description);
}
if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) { if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) {
$criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number); $criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number);
} }
@@ -1570,6 +1682,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setAppTitle($this->app_title);
$copyObj->setAppDescription($this->app_description);
$copyObj->setAppNumber($this->app_number); $copyObj->setAppNumber($this->app_number);
$copyObj->setAppParent($this->app_parent); $copyObj->setAppParent($this->app_parent);

28
workflow/engine/classes/model/om/BaseApplicationPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseApplicationPeer
const CLASS_DEFAULT = 'classes.model.Application'; const CLASS_DEFAULT = 'classes.model.Application';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 19; const NUM_COLUMNS = 21;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseApplicationPeer
/** the column name for the APP_UID field */ /** the column name for the APP_UID field */
const APP_UID = 'APPLICATION.APP_UID'; const APP_UID = 'APPLICATION.APP_UID';
/** the column name for the APP_TITLE field */
const APP_TITLE = 'APPLICATION.APP_TITLE';
/** the column name for the APP_DESCRIPTION field */
const APP_DESCRIPTION = 'APPLICATION.APP_DESCRIPTION';
/** the column name for the APP_NUMBER field */ /** the column name for the APP_NUMBER field */
const APP_NUMBER = 'APPLICATION.APP_NUMBER'; const APP_NUMBER = 'APPLICATION.APP_NUMBER';
@@ -99,10 +105,10 @@ abstract class BaseApplicationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', 'AppDriveFolderUid', ), BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppTitle', 'AppDescription', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', 'AppDriveFolderUid', ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ApplicationPeer::APP_DRIVE_FOLDER_UID, ), BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_TITLE, ApplicationPeer::APP_DESCRIPTION, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ApplicationPeer::APP_DRIVE_FOLDER_UID, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', 'APP_DRIVE_FOLDER_UID', ), BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_TITLE', 'APP_DESCRIPTION', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', 'APP_DRIVE_FOLDER_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) 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, )
); );
/** /**
@@ -112,10 +118,10 @@ abstract class BaseApplicationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppNumber' => 1, 'AppParent' => 2, 'AppStatus' => 3, 'ProUid' => 4, 'AppProcStatus' => 5, 'AppProcCode' => 6, 'AppParallel' => 7, 'AppInitUser' => 8, 'AppCurUser' => 9, 'AppCreateDate' => 10, 'AppInitDate' => 11, 'AppFinishDate' => 12, 'AppUpdateDate' => 13, 'AppData' => 14, 'AppPin' => 15, 'AppDuration' => 16, 'AppDelayDuration' => 17, 'AppDriveFolderUid' => 18, ), BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppTitle' => 1, 'AppDescription' => 2, 'AppNumber' => 3, 'AppParent' => 4, 'AppStatus' => 5, 'ProUid' => 6, 'AppProcStatus' => 7, 'AppProcCode' => 8, 'AppParallel' => 9, 'AppInitUser' => 10, 'AppCurUser' => 11, 'AppCreateDate' => 12, 'AppInitDate' => 13, 'AppFinishDate' => 14, 'AppUpdateDate' => 15, 'AppData' => 16, 'AppPin' => 17, 'AppDuration' => 18, 'AppDelayDuration' => 19, 'AppDriveFolderUid' => 20, ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_NUMBER => 1, ApplicationPeer::APP_PARENT => 2, ApplicationPeer::APP_STATUS => 3, ApplicationPeer::PRO_UID => 4, ApplicationPeer::APP_PROC_STATUS => 5, ApplicationPeer::APP_PROC_CODE => 6, ApplicationPeer::APP_PARALLEL => 7, ApplicationPeer::APP_INIT_USER => 8, ApplicationPeer::APP_CUR_USER => 9, ApplicationPeer::APP_CREATE_DATE => 10, ApplicationPeer::APP_INIT_DATE => 11, ApplicationPeer::APP_FINISH_DATE => 12, ApplicationPeer::APP_UPDATE_DATE => 13, ApplicationPeer::APP_DATA => 14, ApplicationPeer::APP_PIN => 15, ApplicationPeer::APP_DURATION => 16, ApplicationPeer::APP_DELAY_DURATION => 17, ApplicationPeer::APP_DRIVE_FOLDER_UID => 18, ), BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_TITLE => 1, ApplicationPeer::APP_DESCRIPTION => 2, ApplicationPeer::APP_NUMBER => 3, ApplicationPeer::APP_PARENT => 4, ApplicationPeer::APP_STATUS => 5, ApplicationPeer::PRO_UID => 6, ApplicationPeer::APP_PROC_STATUS => 7, ApplicationPeer::APP_PROC_CODE => 8, ApplicationPeer::APP_PARALLEL => 9, ApplicationPeer::APP_INIT_USER => 10, ApplicationPeer::APP_CUR_USER => 11, ApplicationPeer::APP_CREATE_DATE => 12, ApplicationPeer::APP_INIT_DATE => 13, ApplicationPeer::APP_FINISH_DATE => 14, ApplicationPeer::APP_UPDATE_DATE => 15, ApplicationPeer::APP_DATA => 16, ApplicationPeer::APP_PIN => 17, ApplicationPeer::APP_DURATION => 18, ApplicationPeer::APP_DELAY_DURATION => 19, ApplicationPeer::APP_DRIVE_FOLDER_UID => 20, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_NUMBER' => 1, 'APP_PARENT' => 2, 'APP_STATUS' => 3, 'PRO_UID' => 4, 'APP_PROC_STATUS' => 5, 'APP_PROC_CODE' => 6, 'APP_PARALLEL' => 7, 'APP_INIT_USER' => 8, 'APP_CUR_USER' => 9, 'APP_CREATE_DATE' => 10, 'APP_INIT_DATE' => 11, 'APP_FINISH_DATE' => 12, 'APP_UPDATE_DATE' => 13, 'APP_DATA' => 14, 'APP_PIN' => 15, 'APP_DURATION' => 16, 'APP_DELAY_DURATION' => 17, 'APP_DRIVE_FOLDER_UID' => 18, ), BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_TITLE' => 1, 'APP_DESCRIPTION' => 2, 'APP_NUMBER' => 3, 'APP_PARENT' => 4, 'APP_STATUS' => 5, 'PRO_UID' => 6, 'APP_PROC_STATUS' => 7, 'APP_PROC_CODE' => 8, 'APP_PARALLEL' => 9, 'APP_INIT_USER' => 10, 'APP_CUR_USER' => 11, 'APP_CREATE_DATE' => 12, 'APP_INIT_DATE' => 13, 'APP_FINISH_DATE' => 14, 'APP_UPDATE_DATE' => 15, 'APP_DATA' => 16, 'APP_PIN' => 17, 'APP_DURATION' => 18, 'APP_DELAY_DURATION' => 19, 'APP_DRIVE_FOLDER_UID' => 20, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) 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, )
); );
/** /**
@@ -218,6 +224,10 @@ abstract class BaseApplicationPeer
$criteria->addSelectColumn(ApplicationPeer::APP_UID); $criteria->addSelectColumn(ApplicationPeer::APP_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->addSelectColumn(ApplicationPeer::APP_DESCRIPTION);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
$criteria->addSelectColumn(ApplicationPeer::APP_PARENT); $criteria->addSelectColumn(ApplicationPeer::APP_PARENT);

116
workflow/engine/classes/model/om/BaseDepartment.php
View File

@@ -33,6 +33,12 @@ abstract class BaseDepartment extends BaseObject implements Persistent
*/ */
protected $dep_uid = ''; protected $dep_uid = '';
/**
* The value for the dep_title field.
* @var string
*/
protected $dep_title;
/** /**
* The value for the dep_parent field. * The value for the dep_parent field.
* @var string * @var string
@@ -94,6 +100,17 @@ abstract class BaseDepartment extends BaseObject implements Persistent
return $this->dep_uid; return $this->dep_uid;
} }
/**
* Get the [dep_title] column value.
*
* @return string
*/
public function getDepTitle()
{
return $this->dep_title;
}
/** /**
* Get the [dep_parent] column value. * Get the [dep_parent] column value.
* *
@@ -182,6 +199,28 @@ abstract class BaseDepartment extends BaseObject implements Persistent
} // setDepUid() } // setDepUid()
/**
* Set the value of [dep_title] column.
*
* @param string $v new value
* @return void
*/
public function setDepTitle($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->dep_title !== $v) {
$this->dep_title = $v;
$this->modifiedColumns[] = DepartmentPeer::DEP_TITLE;
}
} // setDepTitle()
/** /**
* Set the value of [dep_parent] column. * Set the value of [dep_parent] column.
* *
@@ -333,24 +372,26 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$this->dep_uid = $rs->getString($startcol + 0); $this->dep_uid = $rs->getString($startcol + 0);
$this->dep_parent = $rs->getString($startcol + 1); $this->dep_title = $rs->getString($startcol + 1);
$this->dep_manager = $rs->getString($startcol + 2); $this->dep_parent = $rs->getString($startcol + 2);
$this->dep_location = $rs->getInt($startcol + 3); $this->dep_manager = $rs->getString($startcol + 3);
$this->dep_status = $rs->getString($startcol + 4); $this->dep_location = $rs->getInt($startcol + 4);
$this->dep_ref_code = $rs->getString($startcol + 5); $this->dep_status = $rs->getString($startcol + 5);
$this->dep_ldap_dn = $rs->getString($startcol + 6); $this->dep_ref_code = $rs->getString($startcol + 6);
$this->dep_ldap_dn = $rs->getString($startcol + 7);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 7; // 7 = DepartmentPeer::NUM_COLUMNS - DepartmentPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 8; // 8 = DepartmentPeer::NUM_COLUMNS - DepartmentPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Department object", $e); throw new PropelException("Error populating Department object", $e);
@@ -558,21 +599,24 @@ abstract class BaseDepartment extends BaseObject implements Persistent
return $this->getDepUid(); return $this->getDepUid();
break; break;
case 1: case 1:
return $this->getDepParent(); return $this->getDepTitle();
break; break;
case 2: case 2:
return $this->getDepManager(); return $this->getDepParent();
break; break;
case 3: case 3:
return $this->getDepLocation(); return $this->getDepManager();
break; break;
case 4: case 4:
return $this->getDepStatus(); return $this->getDepLocation();
break; break;
case 5: case 5:
return $this->getDepRefCode(); return $this->getDepStatus();
break; break;
case 6: case 6:
return $this->getDepRefCode();
break;
case 7:
return $this->getDepLdapDn(); return $this->getDepLdapDn();
break; break;
default: default:
@@ -596,12 +640,13 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$keys = DepartmentPeer::getFieldNames($keyType); $keys = DepartmentPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getDepUid(), $keys[0] => $this->getDepUid(),
$keys[1] => $this->getDepParent(), $keys[1] => $this->getDepTitle(),
$keys[2] => $this->getDepManager(), $keys[2] => $this->getDepParent(),
$keys[3] => $this->getDepLocation(), $keys[3] => $this->getDepManager(),
$keys[4] => $this->getDepStatus(), $keys[4] => $this->getDepLocation(),
$keys[5] => $this->getDepRefCode(), $keys[5] => $this->getDepStatus(),
$keys[6] => $this->getDepLdapDn(), $keys[6] => $this->getDepRefCode(),
$keys[7] => $this->getDepLdapDn(),
); );
return $result; return $result;
} }
@@ -637,21 +682,24 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$this->setDepUid($value); $this->setDepUid($value);
break; break;
case 1: case 1:
$this->setDepParent($value); $this->setDepTitle($value);
break; break;
case 2: case 2:
$this->setDepManager($value); $this->setDepParent($value);
break; break;
case 3: case 3:
$this->setDepLocation($value); $this->setDepManager($value);
break; break;
case 4: case 4:
$this->setDepStatus($value); $this->setDepLocation($value);
break; break;
case 5: case 5:
$this->setDepRefCode($value); $this->setDepStatus($value);
break; break;
case 6: case 6:
$this->setDepRefCode($value);
break;
case 7:
$this->setDepLdapDn($value); $this->setDepLdapDn($value);
break; break;
} // switch() } // switch()
@@ -682,27 +730,31 @@ abstract class BaseDepartment extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setDepParent($arr[$keys[1]]); $this->setDepTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setDepManager($arr[$keys[2]]); $this->setDepParent($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setDepLocation($arr[$keys[3]]); $this->setDepManager($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setDepStatus($arr[$keys[4]]); $this->setDepLocation($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setDepRefCode($arr[$keys[5]]); $this->setDepStatus($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setDepLdapDn($arr[$keys[6]]); $this->setDepRefCode($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setDepLdapDn($arr[$keys[7]]);
} }
} }
@@ -720,6 +772,10 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$criteria->add(DepartmentPeer::DEP_UID, $this->dep_uid); $criteria->add(DepartmentPeer::DEP_UID, $this->dep_uid);
} }
if ($this->isColumnModified(DepartmentPeer::DEP_TITLE)) {
$criteria->add(DepartmentPeer::DEP_TITLE, $this->dep_title);
}
if ($this->isColumnModified(DepartmentPeer::DEP_PARENT)) { if ($this->isColumnModified(DepartmentPeer::DEP_PARENT)) {
$criteria->add(DepartmentPeer::DEP_PARENT, $this->dep_parent); $criteria->add(DepartmentPeer::DEP_PARENT, $this->dep_parent);
} }
@@ -798,6 +854,8 @@ abstract class BaseDepartment extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setDepTitle($this->dep_title);
$copyObj->setDepParent($this->dep_parent); $copyObj->setDepParent($this->dep_parent);
$copyObj->setDepManager($this->dep_manager); $copyObj->setDepManager($this->dep_manager);

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

@@ -25,7 +25,7 @@ abstract class BaseDepartmentPeer
const CLASS_DEFAULT = 'classes.model.Department'; const CLASS_DEFAULT = 'classes.model.Department';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 7; const NUM_COLUMNS = 8;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseDepartmentPeer
/** the column name for the DEP_UID field */ /** the column name for the DEP_UID field */
const DEP_UID = 'DEPARTMENT.DEP_UID'; const DEP_UID = 'DEPARTMENT.DEP_UID';
/** the column name for the DEP_TITLE field */
const DEP_TITLE = 'DEPARTMENT.DEP_TITLE';
/** the column name for the DEP_PARENT field */ /** the column name for the DEP_PARENT field */
const DEP_PARENT = 'DEPARTMENT.DEP_PARENT'; const DEP_PARENT = 'DEPARTMENT.DEP_PARENT';
@@ -63,10 +66,10 @@ abstract class BaseDepartmentPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('DepUid', 'DepParent', 'DepManager', 'DepLocation', 'DepStatus', 'DepRefCode', 'DepLdapDn', ), BasePeer::TYPE_PHPNAME => array ('DepUid', 'DepTitle', 'DepParent', 'DepManager', 'DepLocation', 'DepStatus', 'DepRefCode', 'DepLdapDn', ),
BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID, DepartmentPeer::DEP_PARENT, DepartmentPeer::DEP_MANAGER, DepartmentPeer::DEP_LOCATION, DepartmentPeer::DEP_STATUS, DepartmentPeer::DEP_REF_CODE, DepartmentPeer::DEP_LDAP_DN, ), BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID, DepartmentPeer::DEP_TITLE, DepartmentPeer::DEP_PARENT, DepartmentPeer::DEP_MANAGER, DepartmentPeer::DEP_LOCATION, DepartmentPeer::DEP_STATUS, DepartmentPeer::DEP_REF_CODE, DepartmentPeer::DEP_LDAP_DN, ),
BasePeer::TYPE_FIELDNAME => array ('DEP_UID', 'DEP_PARENT', 'DEP_MANAGER', 'DEP_LOCATION', 'DEP_STATUS', 'DEP_REF_CODE', 'DEP_LDAP_DN', ), BasePeer::TYPE_FIELDNAME => array ('DEP_UID', 'DEP_TITLE', 'DEP_PARENT', 'DEP_MANAGER', 'DEP_LOCATION', 'DEP_STATUS', 'DEP_REF_CODE', 'DEP_LDAP_DN', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
); );
/** /**
@@ -76,10 +79,10 @@ abstract class BaseDepartmentPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('DepUid' => 0, 'DepParent' => 1, 'DepManager' => 2, 'DepLocation' => 3, 'DepStatus' => 4, 'DepRefCode' => 5, 'DepLdapDn' => 6, ), BasePeer::TYPE_PHPNAME => array ('DepUid' => 0, 'DepTitle' => 1, 'DepParent' => 2, 'DepManager' => 3, 'DepLocation' => 4, 'DepStatus' => 5, 'DepRefCode' => 6, 'DepLdapDn' => 7, ),
BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID => 0, DepartmentPeer::DEP_PARENT => 1, DepartmentPeer::DEP_MANAGER => 2, DepartmentPeer::DEP_LOCATION => 3, DepartmentPeer::DEP_STATUS => 4, DepartmentPeer::DEP_REF_CODE => 5, DepartmentPeer::DEP_LDAP_DN => 6, ), BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID => 0, DepartmentPeer::DEP_TITLE => 1, DepartmentPeer::DEP_PARENT => 2, DepartmentPeer::DEP_MANAGER => 3, DepartmentPeer::DEP_LOCATION => 4, DepartmentPeer::DEP_STATUS => 5, DepartmentPeer::DEP_REF_CODE => 6, DepartmentPeer::DEP_LDAP_DN => 7, ),
BasePeer::TYPE_FIELDNAME => array ('DEP_UID' => 0, 'DEP_PARENT' => 1, 'DEP_MANAGER' => 2, 'DEP_LOCATION' => 3, 'DEP_STATUS' => 4, 'DEP_REF_CODE' => 5, 'DEP_LDAP_DN' => 6, ), BasePeer::TYPE_FIELDNAME => array ('DEP_UID' => 0, 'DEP_TITLE' => 1, 'DEP_PARENT' => 2, 'DEP_MANAGER' => 3, 'DEP_LOCATION' => 4, 'DEP_STATUS' => 5, 'DEP_REF_CODE' => 6, 'DEP_LDAP_DN' => 7, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
); );
/** /**
@@ -182,6 +185,8 @@ abstract class BaseDepartmentPeer
$criteria->addSelectColumn(DepartmentPeer::DEP_UID); $criteria->addSelectColumn(DepartmentPeer::DEP_UID);
$criteria->addSelectColumn(DepartmentPeer::DEP_TITLE);
$criteria->addSelectColumn(DepartmentPeer::DEP_PARENT); $criteria->addSelectColumn(DepartmentPeer::DEP_PARENT);
$criteria->addSelectColumn(DepartmentPeer::DEP_MANAGER); $criteria->addSelectColumn(DepartmentPeer::DEP_MANAGER);

92
workflow/engine/classes/model/om/BaseGroupwf.php
View File

@@ -31,7 +31,13 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
* The value for the grp_uid field. * The value for the grp_uid field.
* @var string * @var string
*/ */
protected $grp_uid = ''; protected $grp_uid;
/**
* The value for the grp_title field.
* @var string
*/
protected $grp_title;
/** /**
* The value for the grp_status field. * The value for the grp_status field.
@@ -76,6 +82,17 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
return $this->grp_uid; return $this->grp_uid;
} }
/**
* Get the [grp_title] column value.
*
* @return string
*/
public function getGrpTitle()
{
return $this->grp_title;
}
/** /**
* Get the [grp_status] column value. * Get the [grp_status] column value.
* *
@@ -124,13 +141,35 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
$v = (string) $v; $v = (string) $v;
} }
if ($this->grp_uid !== $v || $v === '') { if ($this->grp_uid !== $v) {
$this->grp_uid = $v; $this->grp_uid = $v;
$this->modifiedColumns[] = GroupwfPeer::GRP_UID; $this->modifiedColumns[] = GroupwfPeer::GRP_UID;
} }
} // setGrpUid() } // setGrpUid()
/**
* Set the value of [grp_title] column.
*
* @param string $v new value
* @return void
*/
public function setGrpTitle($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->grp_title !== $v) {
$this->grp_title = $v;
$this->modifiedColumns[] = GroupwfPeer::GRP_TITLE;
}
} // setGrpTitle()
/** /**
* Set the value of [grp_status] column. * Set the value of [grp_status] column.
* *
@@ -216,18 +255,20 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
$this->grp_uid = $rs->getString($startcol + 0); $this->grp_uid = $rs->getString($startcol + 0);
$this->grp_status = $rs->getString($startcol + 1); $this->grp_title = $rs->getString($startcol + 1);
$this->grp_ldap_dn = $rs->getString($startcol + 2); $this->grp_status = $rs->getString($startcol + 2);
$this->grp_ux = $rs->getString($startcol + 3); $this->grp_ldap_dn = $rs->getString($startcol + 3);
$this->grp_ux = $rs->getString($startcol + 4);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 4; // 4 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 5; // 5 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Groupwf object", $e); throw new PropelException("Error populating Groupwf object", $e);
@@ -435,12 +476,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
return $this->getGrpUid(); return $this->getGrpUid();
break; break;
case 1: case 1:
return $this->getGrpStatus(); return $this->getGrpTitle();
break; break;
case 2: case 2:
return $this->getGrpLdapDn(); return $this->getGrpStatus();
break; break;
case 3: case 3:
return $this->getGrpLdapDn();
break;
case 4:
return $this->getGrpUx(); return $this->getGrpUx();
break; break;
default: default:
@@ -464,9 +508,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
$keys = GroupwfPeer::getFieldNames($keyType); $keys = GroupwfPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getGrpUid(), $keys[0] => $this->getGrpUid(),
$keys[1] => $this->getGrpStatus(), $keys[1] => $this->getGrpTitle(),
$keys[2] => $this->getGrpLdapDn(), $keys[2] => $this->getGrpStatus(),
$keys[3] => $this->getGrpUx(), $keys[3] => $this->getGrpLdapDn(),
$keys[4] => $this->getGrpUx(),
); );
return $result; return $result;
} }
@@ -502,12 +547,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
$this->setGrpUid($value); $this->setGrpUid($value);
break; break;
case 1: case 1:
$this->setGrpStatus($value); $this->setGrpTitle($value);
break; break;
case 2: case 2:
$this->setGrpLdapDn($value); $this->setGrpStatus($value);
break; break;
case 3: case 3:
$this->setGrpLdapDn($value);
break;
case 4:
$this->setGrpUx($value); $this->setGrpUx($value);
break; break;
} // switch() } // switch()
@@ -538,15 +586,19 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setGrpStatus($arr[$keys[1]]); $this->setGrpTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setGrpLdapDn($arr[$keys[2]]); $this->setGrpStatus($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setGrpUx($arr[$keys[3]]); $this->setGrpLdapDn($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setGrpUx($arr[$keys[4]]);
} }
} }
@@ -564,6 +616,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
$criteria->add(GroupwfPeer::GRP_UID, $this->grp_uid); $criteria->add(GroupwfPeer::GRP_UID, $this->grp_uid);
} }
if ($this->isColumnModified(GroupwfPeer::GRP_TITLE)) {
$criteria->add(GroupwfPeer::GRP_TITLE, $this->grp_title);
}
if ($this->isColumnModified(GroupwfPeer::GRP_STATUS)) { if ($this->isColumnModified(GroupwfPeer::GRP_STATUS)) {
$criteria->add(GroupwfPeer::GRP_STATUS, $this->grp_status); $criteria->add(GroupwfPeer::GRP_STATUS, $this->grp_status);
} }
@@ -630,6 +686,8 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setGrpTitle($this->grp_title);
$copyObj->setGrpStatus($this->grp_status); $copyObj->setGrpStatus($this->grp_status);
$copyObj->setGrpLdapDn($this->grp_ldap_dn); $copyObj->setGrpLdapDn($this->grp_ldap_dn);
@@ -639,7 +697,7 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
$copyObj->setNew(true); $copyObj->setNew(true);
$copyObj->setGrpUid(''); // this is a pkey column, so set to default value $copyObj->setGrpUid(NULL); // this is a pkey column, so set to default value
} }

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

@@ -25,7 +25,7 @@ abstract class BaseGroupwfPeer
const CLASS_DEFAULT = 'classes.model.Groupwf'; const CLASS_DEFAULT = 'classes.model.Groupwf';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 4; const NUM_COLUMNS = 5;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseGroupwfPeer
/** the column name for the GRP_UID field */ /** the column name for the GRP_UID field */
const GRP_UID = 'GROUPWF.GRP_UID'; const GRP_UID = 'GROUPWF.GRP_UID';
/** the column name for the GRP_TITLE field */
const GRP_TITLE = 'GROUPWF.GRP_TITLE';
/** the column name for the GRP_STATUS field */ /** the column name for the GRP_STATUS field */
const GRP_STATUS = 'GROUPWF.GRP_STATUS'; const GRP_STATUS = 'GROUPWF.GRP_STATUS';
@@ -54,10 +57,10 @@ abstract class BaseGroupwfPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ), BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpTitle', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ),
BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ), BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_TITLE, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ),
BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ), BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_TITLE', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
); );
/** /**
@@ -67,10 +70,10 @@ abstract class BaseGroupwfPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpStatus' => 1, 'GrpLdapDn' => 2, 'GrpUx' => 3, ), BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpTitle' => 1, 'GrpStatus' => 2, 'GrpLdapDn' => 3, 'GrpUx' => 4, ),
BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_STATUS => 1, GroupwfPeer::GRP_LDAP_DN => 2, GroupwfPeer::GRP_UX => 3, ), BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_TITLE => 1, GroupwfPeer::GRP_STATUS => 2, GroupwfPeer::GRP_LDAP_DN => 3, GroupwfPeer::GRP_UX => 4, ),
BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_STATUS' => 1, 'GRP_LDAP_DN' => 2, 'GRP_UX' => 3, ), BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_TITLE' => 1, 'GRP_STATUS' => 2, 'GRP_LDAP_DN' => 3, 'GRP_UX' => 4, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
); );
/** /**
@@ -173,6 +176,8 @@ abstract class BaseGroupwfPeer
$criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$criteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN); $criteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);

204
workflow/engine/classes/model/om/BaseInputDocument.php
View File

@@ -39,6 +39,18 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
*/ */
protected $pro_uid = '0'; protected $pro_uid = '0';
/**
* The value for the inp_doc_title field.
* @var string
*/
protected $inp_doc_title;
/**
* The value for the inp_doc_description field.
* @var string
*/
protected $inp_doc_description;
/** /**
* The value for the inp_doc_form_needed field. * The value for the inp_doc_form_needed field.
* @var string * @var string
@@ -129,6 +141,28 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
return $this->pro_uid; return $this->pro_uid;
} }
/**
* Get the [inp_doc_title] column value.
*
* @return string
*/
public function getInpDocTitle()
{
return $this->inp_doc_title;
}
/**
* Get the [inp_doc_description] column value.
*
* @return string
*/
public function getInpDocDescription()
{
return $this->inp_doc_description;
}
/** /**
* Get the [inp_doc_form_needed] column value. * Get the [inp_doc_form_needed] column value.
* *
@@ -272,6 +306,50 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
} // setProUid() } // setProUid()
/**
* Set the value of [inp_doc_title] column.
*
* @param string $v new value
* @return void
*/
public function setInpDocTitle($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->inp_doc_title !== $v) {
$this->inp_doc_title = $v;
$this->modifiedColumns[] = InputDocumentPeer::INP_DOC_TITLE;
}
} // setInpDocTitle()
/**
* Set the value of [inp_doc_description] column.
*
* @param string $v new value
* @return void
*/
public function setInpDocDescription($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->inp_doc_description !== $v) {
$this->inp_doc_description = $v;
$this->modifiedColumns[] = InputDocumentPeer::INP_DOC_DESCRIPTION;
}
} // setInpDocDescription()
/** /**
* Set the value of [inp_doc_form_needed] column. * Set the value of [inp_doc_form_needed] column.
* *
@@ -491,30 +569,34 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$this->pro_uid = $rs->getString($startcol + 1); $this->pro_uid = $rs->getString($startcol + 1);
$this->inp_doc_form_needed = $rs->getString($startcol + 2); $this->inp_doc_title = $rs->getString($startcol + 2);
$this->inp_doc_original = $rs->getString($startcol + 3); $this->inp_doc_description = $rs->getString($startcol + 3);
$this->inp_doc_published = $rs->getString($startcol + 4); $this->inp_doc_form_needed = $rs->getString($startcol + 4);
$this->inp_doc_versioning = $rs->getInt($startcol + 5); $this->inp_doc_original = $rs->getString($startcol + 5);
$this->inp_doc_destination_path = $rs->getString($startcol + 6); $this->inp_doc_published = $rs->getString($startcol + 6);
$this->inp_doc_tags = $rs->getString($startcol + 7); $this->inp_doc_versioning = $rs->getInt($startcol + 7);
$this->inp_doc_type_file = $rs->getString($startcol + 8); $this->inp_doc_destination_path = $rs->getString($startcol + 8);
$this->inp_doc_max_filesize = $rs->getInt($startcol + 9); $this->inp_doc_tags = $rs->getString($startcol + 9);
$this->inp_doc_max_filesize_unit = $rs->getString($startcol + 10); $this->inp_doc_type_file = $rs->getString($startcol + 10);
$this->inp_doc_max_filesize = $rs->getInt($startcol + 11);
$this->inp_doc_max_filesize_unit = $rs->getString($startcol + 12);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 11; // 11 = InputDocumentPeer::NUM_COLUMNS - InputDocumentPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 13; // 13 = InputDocumentPeer::NUM_COLUMNS - InputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating InputDocument object", $e); throw new PropelException("Error populating InputDocument object", $e);
@@ -725,30 +807,36 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
return $this->getProUid(); return $this->getProUid();
break; break;
case 2: case 2:
return $this->getInpDocFormNeeded(); return $this->getInpDocTitle();
break; break;
case 3: case 3:
return $this->getInpDocOriginal(); return $this->getInpDocDescription();
break; break;
case 4: case 4:
return $this->getInpDocPublished(); return $this->getInpDocFormNeeded();
break; break;
case 5: case 5:
return $this->getInpDocVersioning(); return $this->getInpDocOriginal();
break; break;
case 6: case 6:
return $this->getInpDocDestinationPath(); return $this->getInpDocPublished();
break; break;
case 7: case 7:
return $this->getInpDocTags(); return $this->getInpDocVersioning();
break; break;
case 8: case 8:
return $this->getInpDocTypeFile(); return $this->getInpDocDestinationPath();
break; break;
case 9: case 9:
return $this->getInpDocMaxFilesize(); return $this->getInpDocTags();
break; break;
case 10: case 10:
return $this->getInpDocTypeFile();
break;
case 11:
return $this->getInpDocMaxFilesize();
break;
case 12:
return $this->getInpDocMaxFilesizeUnit(); return $this->getInpDocMaxFilesizeUnit();
break; break;
default: default:
@@ -773,15 +861,17 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$result = array( $result = array(
$keys[0] => $this->getInpDocUid(), $keys[0] => $this->getInpDocUid(),
$keys[1] => $this->getProUid(), $keys[1] => $this->getProUid(),
$keys[2] => $this->getInpDocFormNeeded(), $keys[2] => $this->getInpDocTitle(),
$keys[3] => $this->getInpDocOriginal(), $keys[3] => $this->getInpDocDescription(),
$keys[4] => $this->getInpDocPublished(), $keys[4] => $this->getInpDocFormNeeded(),
$keys[5] => $this->getInpDocVersioning(), $keys[5] => $this->getInpDocOriginal(),
$keys[6] => $this->getInpDocDestinationPath(), $keys[6] => $this->getInpDocPublished(),
$keys[7] => $this->getInpDocTags(), $keys[7] => $this->getInpDocVersioning(),
$keys[8] => $this->getInpDocTypeFile(), $keys[8] => $this->getInpDocDestinationPath(),
$keys[9] => $this->getInpDocMaxFilesize(), $keys[9] => $this->getInpDocTags(),
$keys[10] => $this->getInpDocMaxFilesizeUnit(), $keys[10] => $this->getInpDocTypeFile(),
$keys[11] => $this->getInpDocMaxFilesize(),
$keys[12] => $this->getInpDocMaxFilesizeUnit(),
); );
return $result; return $result;
} }
@@ -820,30 +910,36 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$this->setProUid($value); $this->setProUid($value);
break; break;
case 2: case 2:
$this->setInpDocFormNeeded($value); $this->setInpDocTitle($value);
break; break;
case 3: case 3:
$this->setInpDocOriginal($value); $this->setInpDocDescription($value);
break; break;
case 4: case 4:
$this->setInpDocPublished($value); $this->setInpDocFormNeeded($value);
break; break;
case 5: case 5:
$this->setInpDocVersioning($value); $this->setInpDocOriginal($value);
break; break;
case 6: case 6:
$this->setInpDocDestinationPath($value); $this->setInpDocPublished($value);
break; break;
case 7: case 7:
$this->setInpDocTags($value); $this->setInpDocVersioning($value);
break; break;
case 8: case 8:
$this->setInpDocTypeFile($value); $this->setInpDocDestinationPath($value);
break; break;
case 9: case 9:
$this->setInpDocMaxFilesize($value); $this->setInpDocTags($value);
break; break;
case 10: case 10:
$this->setInpDocTypeFile($value);
break;
case 11:
$this->setInpDocMaxFilesize($value);
break;
case 12:
$this->setInpDocMaxFilesizeUnit($value); $this->setInpDocMaxFilesizeUnit($value);
break; break;
} // switch() } // switch()
@@ -878,39 +974,47 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setInpDocFormNeeded($arr[$keys[2]]); $this->setInpDocTitle($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setInpDocOriginal($arr[$keys[3]]); $this->setInpDocDescription($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setInpDocPublished($arr[$keys[4]]); $this->setInpDocFormNeeded($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setInpDocVersioning($arr[$keys[5]]); $this->setInpDocOriginal($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setInpDocDestinationPath($arr[$keys[6]]); $this->setInpDocPublished($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setInpDocTags($arr[$keys[7]]); $this->setInpDocVersioning($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setInpDocTypeFile($arr[$keys[8]]); $this->setInpDocDestinationPath($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setInpDocMaxFilesize($arr[$keys[9]]); $this->setInpDocTags($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setInpDocMaxFilesizeUnit($arr[$keys[10]]); $this->setInpDocTypeFile($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setInpDocMaxFilesize($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setInpDocMaxFilesizeUnit($arr[$keys[12]]);
} }
} }
@@ -932,6 +1036,14 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$criteria->add(InputDocumentPeer::PRO_UID, $this->pro_uid); $criteria->add(InputDocumentPeer::PRO_UID, $this->pro_uid);
} }
if ($this->isColumnModified(InputDocumentPeer::INP_DOC_TITLE)) {
$criteria->add(InputDocumentPeer::INP_DOC_TITLE, $this->inp_doc_title);
}
if ($this->isColumnModified(InputDocumentPeer::INP_DOC_DESCRIPTION)) {
$criteria->add(InputDocumentPeer::INP_DOC_DESCRIPTION, $this->inp_doc_description);
}
if ($this->isColumnModified(InputDocumentPeer::INP_DOC_FORM_NEEDED)) { if ($this->isColumnModified(InputDocumentPeer::INP_DOC_FORM_NEEDED)) {
$criteria->add(InputDocumentPeer::INP_DOC_FORM_NEEDED, $this->inp_doc_form_needed); $criteria->add(InputDocumentPeer::INP_DOC_FORM_NEEDED, $this->inp_doc_form_needed);
} }
@@ -1024,6 +1136,10 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$copyObj->setProUid($this->pro_uid); $copyObj->setProUid($this->pro_uid);
$copyObj->setInpDocTitle($this->inp_doc_title);
$copyObj->setInpDocDescription($this->inp_doc_description);
$copyObj->setInpDocFormNeeded($this->inp_doc_form_needed); $copyObj->setInpDocFormNeeded($this->inp_doc_form_needed);
$copyObj->setInpDocOriginal($this->inp_doc_original); $copyObj->setInpDocOriginal($this->inp_doc_original);

28
workflow/engine/classes/model/om/BaseInputDocumentPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseInputDocumentPeer
const CLASS_DEFAULT = 'classes.model.InputDocument'; const CLASS_DEFAULT = 'classes.model.InputDocument';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 11; const NUM_COLUMNS = 13;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,12 @@ abstract class BaseInputDocumentPeer
/** the column name for the PRO_UID field */ /** the column name for the PRO_UID field */
const PRO_UID = 'INPUT_DOCUMENT.PRO_UID'; const PRO_UID = 'INPUT_DOCUMENT.PRO_UID';
/** the column name for the INP_DOC_TITLE field */
const INP_DOC_TITLE = 'INPUT_DOCUMENT.INP_DOC_TITLE';
/** the column name for the INP_DOC_DESCRIPTION field */
const INP_DOC_DESCRIPTION = 'INPUT_DOCUMENT.INP_DOC_DESCRIPTION';
/** the column name for the INP_DOC_FORM_NEEDED field */ /** the column name for the INP_DOC_FORM_NEEDED field */
const INP_DOC_FORM_NEEDED = 'INPUT_DOCUMENT.INP_DOC_FORM_NEEDED'; const INP_DOC_FORM_NEEDED = 'INPUT_DOCUMENT.INP_DOC_FORM_NEEDED';
@@ -75,10 +81,10 @@ abstract class BaseInputDocumentPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('InpDocUid', 'ProUid', 'InpDocFormNeeded', 'InpDocOriginal', 'InpDocPublished', 'InpDocVersioning', 'InpDocDestinationPath', 'InpDocTags', 'InpDocTypeFile', 'InpDocMaxFilesize', 'InpDocMaxFilesizeUnit', ), BasePeer::TYPE_PHPNAME => array ('InpDocUid', 'ProUid', 'InpDocTitle', 'InpDocDescription', 'InpDocFormNeeded', 'InpDocOriginal', 'InpDocPublished', 'InpDocVersioning', 'InpDocDestinationPath', 'InpDocTags', 'InpDocTypeFile', 'InpDocMaxFilesize', 'InpDocMaxFilesizeUnit', ),
BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID, InputDocumentPeer::PRO_UID, InputDocumentPeer::INP_DOC_FORM_NEEDED, InputDocumentPeer::INP_DOC_ORIGINAL, InputDocumentPeer::INP_DOC_PUBLISHED, InputDocumentPeer::INP_DOC_VERSIONING, InputDocumentPeer::INP_DOC_DESTINATION_PATH, InputDocumentPeer::INP_DOC_TAGS, InputDocumentPeer::INP_DOC_TYPE_FILE, InputDocumentPeer::INP_DOC_MAX_FILESIZE, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT, ), BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID, InputDocumentPeer::PRO_UID, InputDocumentPeer::INP_DOC_TITLE, InputDocumentPeer::INP_DOC_DESCRIPTION, InputDocumentPeer::INP_DOC_FORM_NEEDED, InputDocumentPeer::INP_DOC_ORIGINAL, InputDocumentPeer::INP_DOC_PUBLISHED, InputDocumentPeer::INP_DOC_VERSIONING, InputDocumentPeer::INP_DOC_DESTINATION_PATH, InputDocumentPeer::INP_DOC_TAGS, InputDocumentPeer::INP_DOC_TYPE_FILE, InputDocumentPeer::INP_DOC_MAX_FILESIZE, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT, ),
BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID', 'PRO_UID', 'INP_DOC_FORM_NEEDED', 'INP_DOC_ORIGINAL', 'INP_DOC_PUBLISHED', 'INP_DOC_VERSIONING', 'INP_DOC_DESTINATION_PATH', 'INP_DOC_TAGS', 'INP_DOC_TYPE_FILE', 'INP_DOC_MAX_FILESIZE', 'INP_DOC_MAX_FILESIZE_UNIT', ), BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID', 'PRO_UID', 'INP_DOC_TITLE', 'INP_DOC_DESCRIPTION', 'INP_DOC_FORM_NEEDED', 'INP_DOC_ORIGINAL', 'INP_DOC_PUBLISHED', 'INP_DOC_VERSIONING', 'INP_DOC_DESTINATION_PATH', 'INP_DOC_TAGS', 'INP_DOC_TYPE_FILE', 'INP_DOC_MAX_FILESIZE', 'INP_DOC_MAX_FILESIZE_UNIT', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
); );
/** /**
@@ -88,10 +94,10 @@ abstract class BaseInputDocumentPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('InpDocUid' => 0, 'ProUid' => 1, 'InpDocFormNeeded' => 2, 'InpDocOriginal' => 3, 'InpDocPublished' => 4, 'InpDocVersioning' => 5, 'InpDocDestinationPath' => 6, 'InpDocTags' => 7, 'InpDocTypeFile' => 8, 'InpDocMaxFilesize' => 9, 'InpDocMaxFilesizeUnit' => 10, ), BasePeer::TYPE_PHPNAME => array ('InpDocUid' => 0, 'ProUid' => 1, 'InpDocTitle' => 2, 'InpDocDescription' => 3, 'InpDocFormNeeded' => 4, 'InpDocOriginal' => 5, 'InpDocPublished' => 6, 'InpDocVersioning' => 7, 'InpDocDestinationPath' => 8, 'InpDocTags' => 9, 'InpDocTypeFile' => 10, 'InpDocMaxFilesize' => 11, 'InpDocMaxFilesizeUnit' => 12, ),
BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID => 0, InputDocumentPeer::PRO_UID => 1, InputDocumentPeer::INP_DOC_FORM_NEEDED => 2, InputDocumentPeer::INP_DOC_ORIGINAL => 3, InputDocumentPeer::INP_DOC_PUBLISHED => 4, InputDocumentPeer::INP_DOC_VERSIONING => 5, InputDocumentPeer::INP_DOC_DESTINATION_PATH => 6, InputDocumentPeer::INP_DOC_TAGS => 7, InputDocumentPeer::INP_DOC_TYPE_FILE => 8, InputDocumentPeer::INP_DOC_MAX_FILESIZE => 9, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT => 10, ), BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID => 0, InputDocumentPeer::PRO_UID => 1, InputDocumentPeer::INP_DOC_TITLE => 2, InputDocumentPeer::INP_DOC_DESCRIPTION => 3, InputDocumentPeer::INP_DOC_FORM_NEEDED => 4, InputDocumentPeer::INP_DOC_ORIGINAL => 5, InputDocumentPeer::INP_DOC_PUBLISHED => 6, InputDocumentPeer::INP_DOC_VERSIONING => 7, InputDocumentPeer::INP_DOC_DESTINATION_PATH => 8, InputDocumentPeer::INP_DOC_TAGS => 9, InputDocumentPeer::INP_DOC_TYPE_FILE => 10, InputDocumentPeer::INP_DOC_MAX_FILESIZE => 11, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT => 12, ),
BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID' => 0, 'PRO_UID' => 1, 'INP_DOC_FORM_NEEDED' => 2, 'INP_DOC_ORIGINAL' => 3, 'INP_DOC_PUBLISHED' => 4, 'INP_DOC_VERSIONING' => 5, 'INP_DOC_DESTINATION_PATH' => 6, 'INP_DOC_TAGS' => 7, 'INP_DOC_TYPE_FILE' => 8, 'INP_DOC_MAX_FILESIZE' => 9, 'INP_DOC_MAX_FILESIZE_UNIT' => 10, ), BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID' => 0, 'PRO_UID' => 1, 'INP_DOC_TITLE' => 2, 'INP_DOC_DESCRIPTION' => 3, 'INP_DOC_FORM_NEEDED' => 4, 'INP_DOC_ORIGINAL' => 5, 'INP_DOC_PUBLISHED' => 6, 'INP_DOC_VERSIONING' => 7, 'INP_DOC_DESTINATION_PATH' => 8, 'INP_DOC_TAGS' => 9, 'INP_DOC_TYPE_FILE' => 10, 'INP_DOC_MAX_FILESIZE' => 11, 'INP_DOC_MAX_FILESIZE_UNIT' => 12, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
); );
/** /**
@@ -196,6 +202,10 @@ abstract class BaseInputDocumentPeer
$criteria->addSelectColumn(InputDocumentPeer::PRO_UID); $criteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_FORM_NEEDED); $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_FORM_NEEDED);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_ORIGINAL); $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_ORIGINAL);

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

@@ -33,6 +33,18 @@ abstract class BaseProcess extends BaseObject implements Persistent
*/ */
protected $pro_uid = ''; protected $pro_uid = '';
/**
* The value for the pro_title field.
* @var string
*/
protected $pro_title;
/**
* The value for the pro_description field.
* @var string
*/
protected $pro_description;
/** /**
* The value for the pro_parent field. * The value for the pro_parent field.
* @var string * @var string
@@ -268,6 +280,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->pro_uid; return $this->pro_uid;
} }
/**
* Get the [pro_title] column value.
*
* @return string
*/
public function getProTitle()
{
return $this->pro_title;
}
/**
* Get the [pro_description] column value.
*
* @return string
*/
public function getProDescription()
{
return $this->pro_description;
}
/** /**
* Get the [pro_parent] column value. * Get the [pro_parent] column value.
* *
@@ -717,6 +751,50 @@ abstract class BaseProcess extends BaseObject implements Persistent
} // setProUid() } // setProUid()
/**
* Set the value of [pro_title] column.
*
* @param string $v new value
* @return void
*/
public function setProTitle($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_title !== $v) {
$this->pro_title = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_TITLE;
}
} // setProTitle()
/**
* Set the value of [pro_description] column.
*
* @param string $v new value
* @return void
*/
public function setProDescription($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_description !== $v) {
$this->pro_description = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_DESCRIPTION;
}
} // setProDescription()
/** /**
* Set the value of [pro_parent] column. * Set the value of [pro_parent] column.
* *
@@ -1508,73 +1586,77 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_uid = $rs->getString($startcol + 0); $this->pro_uid = $rs->getString($startcol + 0);
$this->pro_parent = $rs->getString($startcol + 1); $this->pro_title = $rs->getString($startcol + 1);
$this->pro_time = $rs->getFloat($startcol + 2); $this->pro_description = $rs->getString($startcol + 2);
$this->pro_timeunit = $rs->getString($startcol + 3); $this->pro_parent = $rs->getString($startcol + 3);
$this->pro_status = $rs->getString($startcol + 4); $this->pro_time = $rs->getFloat($startcol + 4);
$this->pro_type_day = $rs->getString($startcol + 5); $this->pro_timeunit = $rs->getString($startcol + 5);
$this->pro_type = $rs->getString($startcol + 6); $this->pro_status = $rs->getString($startcol + 6);
$this->pro_assignment = $rs->getString($startcol + 7); $this->pro_type_day = $rs->getString($startcol + 7);
$this->pro_show_map = $rs->getInt($startcol + 8); $this->pro_type = $rs->getString($startcol + 8);
$this->pro_show_message = $rs->getInt($startcol + 9); $this->pro_assignment = $rs->getString($startcol + 9);
$this->pro_subprocess = $rs->getInt($startcol + 10); $this->pro_show_map = $rs->getInt($startcol + 10);
$this->pro_tri_open = $rs->getString($startcol + 11); $this->pro_show_message = $rs->getInt($startcol + 11);
$this->pro_tri_deleted = $rs->getString($startcol + 12); $this->pro_subprocess = $rs->getInt($startcol + 12);
$this->pro_tri_canceled = $rs->getString($startcol + 13); $this->pro_tri_open = $rs->getString($startcol + 13);
$this->pro_tri_paused = $rs->getString($startcol + 14); $this->pro_tri_deleted = $rs->getString($startcol + 14);
$this->pro_tri_reassigned = $rs->getString($startcol + 15); $this->pro_tri_canceled = $rs->getString($startcol + 15);
$this->pro_tri_unpaused = $rs->getString($startcol + 16); $this->pro_tri_paused = $rs->getString($startcol + 16);
$this->pro_type_process = $rs->getString($startcol + 17); $this->pro_tri_reassigned = $rs->getString($startcol + 17);
$this->pro_show_delegate = $rs->getInt($startcol + 18); $this->pro_tri_unpaused = $rs->getString($startcol + 18);
$this->pro_show_dynaform = $rs->getInt($startcol + 19); $this->pro_type_process = $rs->getString($startcol + 19);
$this->pro_category = $rs->getString($startcol + 20); $this->pro_show_delegate = $rs->getInt($startcol + 20);
$this->pro_sub_category = $rs->getString($startcol + 21); $this->pro_show_dynaform = $rs->getInt($startcol + 21);
$this->pro_industry = $rs->getInt($startcol + 22); $this->pro_category = $rs->getString($startcol + 22);
$this->pro_update_date = $rs->getTimestamp($startcol + 23, null); $this->pro_sub_category = $rs->getString($startcol + 23);
$this->pro_create_date = $rs->getTimestamp($startcol + 24, null); $this->pro_industry = $rs->getInt($startcol + 24);
$this->pro_create_user = $rs->getString($startcol + 25); $this->pro_update_date = $rs->getTimestamp($startcol + 25, null);
$this->pro_height = $rs->getInt($startcol + 26); $this->pro_create_date = $rs->getTimestamp($startcol + 26, null);
$this->pro_width = $rs->getInt($startcol + 27); $this->pro_create_user = $rs->getString($startcol + 27);
$this->pro_title_x = $rs->getInt($startcol + 28); $this->pro_height = $rs->getInt($startcol + 28);
$this->pro_title_y = $rs->getInt($startcol + 29); $this->pro_width = $rs->getInt($startcol + 29);
$this->pro_debug = $rs->getInt($startcol + 30); $this->pro_title_x = $rs->getInt($startcol + 30);
$this->pro_dynaforms = $rs->getString($startcol + 31); $this->pro_title_y = $rs->getInt($startcol + 31);
$this->pro_derivation_screen_tpl = $rs->getString($startcol + 32); $this->pro_debug = $rs->getInt($startcol + 32);
$this->pro_cost = $rs->getFloat($startcol + 33); $this->pro_dynaforms = $rs->getString($startcol + 33);
$this->pro_unit_cost = $rs->getString($startcol + 34); $this->pro_derivation_screen_tpl = $rs->getString($startcol + 34);
$this->pro_cost = $rs->getFloat($startcol + 35);
$this->pro_unit_cost = $rs->getString($startcol + 36);
$this->pro_itee = $rs->getString($startcol + 35); $this->pro_itee = $rs->getString($startcol + 35);
@@ -1583,7 +1665,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 36; // 36 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 37; // 37 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Process object", $e); throw new PropelException("Error populating Process object", $e);
@@ -1791,105 +1873,111 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->getProUid(); return $this->getProUid();
break; break;
case 1: case 1:
return $this->getProParent(); return $this->getProTitle();
break; break;
case 2: case 2:
return $this->getProTime(); return $this->getProDescription();
break; break;
case 3: case 3:
return $this->getProTimeunit(); return $this->getProParent();
break; break;
case 4: case 4:
return $this->getProStatus(); return $this->getProTime();
break; break;
case 5: case 5:
return $this->getProTypeDay(); return $this->getProTimeunit();
break; break;
case 6: case 6:
return $this->getProType(); return $this->getProStatus();
break; break;
case 7: case 7:
return $this->getProAssignment(); return $this->getProTypeDay();
break; break;
case 8: case 8:
return $this->getProShowMap(); return $this->getProType();
break; break;
case 9: case 9:
return $this->getProShowMessage(); return $this->getProAssignment();
break; break;
case 10: case 10:
return $this->getProSubprocess(); return $this->getProShowMap();
break; break;
case 11: case 11:
return $this->getProTriOpen(); return $this->getProShowMessage();
break; break;
case 12: case 12:
return $this->getProTriDeleted(); return $this->getProSubprocess();
break; break;
case 13: case 13:
return $this->getProTriCanceled(); return $this->getProTriOpen();
break; break;
case 14: case 14:
return $this->getProTriPaused(); return $this->getProTriDeleted();
break; break;
case 15: case 15:
return $this->getProTriReassigned(); return $this->getProTriCanceled();
break; break;
case 16: case 16:
return $this->getProTriUnpaused(); return $this->getProTriPaused();
break; break;
case 17: case 17:
return $this->getProTypeProcess(); return $this->getProTriReassigned();
break; break;
case 18: case 18:
return $this->getProShowDelegate(); return $this->getProTriUnpaused();
break; break;
case 19: case 19:
return $this->getProShowDynaform(); return $this->getProTypeProcess();
break; break;
case 20: case 20:
return $this->getProCategory(); return $this->getProShowDelegate();
break; break;
case 21: case 21:
return $this->getProSubCategory(); return $this->getProShowDynaform();
break; break;
case 22: case 22:
return $this->getProIndustry(); return $this->getProCategory();
break; break;
case 23: case 23:
return $this->getProUpdateDate(); return $this->getProSubCategory();
break; break;
case 24: case 24:
return $this->getProCreateDate(); return $this->getProIndustry();
break; break;
case 25: case 25:
return $this->getProCreateUser(); return $this->getProUpdateDate();
break; break;
case 26: case 26:
return $this->getProHeight(); return $this->getProCreateDate();
break; break;
case 27: case 27:
return $this->getProWidth(); return $this->getProCreateUser();
break; break;
case 28: case 28:
return $this->getProTitleX(); return $this->getProHeight();
break; break;
case 29: case 29:
return $this->getProTitleY(); return $this->getProWidth();
break; break;
case 30: case 30:
return $this->getProDebug(); return $this->getProTitleX();
break; break;
case 31: case 31:
return $this->getProDynaforms(); return $this->getProTitleY();
break; break;
case 32: case 32:
return $this->getProDerivationScreenTpl(); return $this->getProDebug();
break; break;
case 33: case 33:
return $this->getProCost(); return $this->getProDynaforms();
break; break;
case 34: case 34:
return $this->getProDerivationScreenTpl();
break;
case 35:
return $this->getProCost();
break;
case 36:
return $this->getProUnitCost(); return $this->getProUnitCost();
break; break;
case 35: case 35:
@@ -1916,41 +2004,43 @@ abstract class BaseProcess extends BaseObject implements Persistent
$keys = ProcessPeer::getFieldNames($keyType); $keys = ProcessPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getProUid(), $keys[0] => $this->getProUid(),
$keys[1] => $this->getProParent(), $keys[1] => $this->getProTitle(),
$keys[2] => $this->getProTime(), $keys[2] => $this->getProDescription(),
$keys[3] => $this->getProTimeunit(), $keys[3] => $this->getProParent(),
$keys[4] => $this->getProStatus(), $keys[4] => $this->getProTime(),
$keys[5] => $this->getProTypeDay(), $keys[5] => $this->getProTimeunit(),
$keys[6] => $this->getProType(), $keys[6] => $this->getProStatus(),
$keys[7] => $this->getProAssignment(), $keys[7] => $this->getProTypeDay(),
$keys[8] => $this->getProShowMap(), $keys[8] => $this->getProType(),
$keys[9] => $this->getProShowMessage(), $keys[9] => $this->getProAssignment(),
$keys[10] => $this->getProSubprocess(), $keys[10] => $this->getProShowMap(),
$keys[11] => $this->getProTriOpen(), $keys[11] => $this->getProShowMessage(),
$keys[12] => $this->getProTriDeleted(), $keys[12] => $this->getProSubprocess(),
$keys[13] => $this->getProTriCanceled(), $keys[13] => $this->getProTriOpen(),
$keys[14] => $this->getProTriPaused(), $keys[14] => $this->getProTriDeleted(),
$keys[15] => $this->getProTriReassigned(), $keys[15] => $this->getProTriCanceled(),
$keys[16] => $this->getProTriUnpaused(), $keys[16] => $this->getProTriPaused(),
$keys[17] => $this->getProTypeProcess(), $keys[17] => $this->getProTriReassigned(),
$keys[18] => $this->getProShowDelegate(), $keys[18] => $this->getProTriUnpaused(),
$keys[19] => $this->getProShowDynaform(), $keys[19] => $this->getProTypeProcess(),
$keys[20] => $this->getProCategory(), $keys[20] => $this->getProShowDelegate(),
$keys[21] => $this->getProSubCategory(), $keys[21] => $this->getProShowDynaform(),
$keys[22] => $this->getProIndustry(), $keys[22] => $this->getProCategory(),
$keys[23] => $this->getProUpdateDate(), $keys[23] => $this->getProSubCategory(),
$keys[24] => $this->getProCreateDate(), $keys[24] => $this->getProIndustry(),
$keys[25] => $this->getProCreateUser(), $keys[25] => $this->getProUpdateDate(),
$keys[26] => $this->getProHeight(), $keys[26] => $this->getProCreateDate(),
$keys[27] => $this->getProWidth(), $keys[27] => $this->getProCreateUser(),
$keys[28] => $this->getProTitleX(), $keys[28] => $this->getProHeight(),
$keys[29] => $this->getProTitleY(), $keys[29] => $this->getProWidth(),
$keys[30] => $this->getProDebug(), $keys[30] => $this->getProTitleX(),
$keys[31] => $this->getProDynaforms(), $keys[31] => $this->getProTitleY(),
$keys[32] => $this->getProDerivationScreenTpl(), $keys[32] => $this->getProDebug(),
$keys[33] => $this->getProCost(), $keys[33] => $this->getProDynaforms(),
$keys[34] => $this->getProUnitCost(), $keys[34] => $this->getProDerivationScreenTpl(),
$keys[35] => $this->getProItee(), $keys[35] => $this->getProCost(),
$keys[36] => $this->getProUnitCost(),
$keys[37] => $this->getProItee(),
); );
return $result; return $result;
} }
@@ -1986,105 +2076,111 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->setProUid($value); $this->setProUid($value);
break; break;
case 1: case 1:
$this->setProParent($value); $this->setProTitle($value);
break; break;
case 2: case 2:
$this->setProTime($value); $this->setProDescription($value);
break; break;
case 3: case 3:
$this->setProTimeunit($value); $this->setProParent($value);
break; break;
case 4: case 4:
$this->setProStatus($value); $this->setProTime($value);
break; break;
case 5: case 5:
$this->setProTypeDay($value); $this->setProTimeunit($value);
break; break;
case 6: case 6:
$this->setProType($value); $this->setProStatus($value);
break; break;
case 7: case 7:
$this->setProAssignment($value); $this->setProTypeDay($value);
break; break;
case 8: case 8:
$this->setProShowMap($value); $this->setProType($value);
break; break;
case 9: case 9:
$this->setProShowMessage($value); $this->setProAssignment($value);
break; break;
case 10: case 10:
$this->setProSubprocess($value); $this->setProShowMap($value);
break; break;
case 11: case 11:
$this->setProTriOpen($value); $this->setProShowMessage($value);
break; break;
case 12: case 12:
$this->setProTriDeleted($value); $this->setProSubprocess($value);
break; break;
case 13: case 13:
$this->setProTriCanceled($value); $this->setProTriOpen($value);
break; break;
case 14: case 14:
$this->setProTriPaused($value); $this->setProTriDeleted($value);
break; break;
case 15: case 15:
$this->setProTriReassigned($value); $this->setProTriCanceled($value);
break; break;
case 16: case 16:
$this->setProTriUnpaused($value); $this->setProTriPaused($value);
break; break;
case 17: case 17:
$this->setProTypeProcess($value); $this->setProTriReassigned($value);
break; break;
case 18: case 18:
$this->setProShowDelegate($value); $this->setProTriUnpaused($value);
break; break;
case 19: case 19:
$this->setProShowDynaform($value); $this->setProTypeProcess($value);
break; break;
case 20: case 20:
$this->setProCategory($value); $this->setProShowDelegate($value);
break; break;
case 21: case 21:
$this->setProSubCategory($value); $this->setProShowDynaform($value);
break; break;
case 22: case 22:
$this->setProIndustry($value); $this->setProCategory($value);
break; break;
case 23: case 23:
$this->setProUpdateDate($value); $this->setProSubCategory($value);
break; break;
case 24: case 24:
$this->setProCreateDate($value); $this->setProIndustry($value);
break; break;
case 25: case 25:
$this->setProCreateUser($value); $this->setProUpdateDate($value);
break; break;
case 26: case 26:
$this->setProHeight($value); $this->setProCreateDate($value);
break; break;
case 27: case 27:
$this->setProWidth($value); $this->setProCreateUser($value);
break; break;
case 28: case 28:
$this->setProTitleX($value); $this->setProHeight($value);
break; break;
case 29: case 29:
$this->setProTitleY($value); $this->setProWidth($value);
break; break;
case 30: case 30:
$this->setProDebug($value); $this->setProTitleX($value);
break; break;
case 31: case 31:
$this->setProDynaforms($value); $this->setProTitleY($value);
break; break;
case 32: case 32:
$this->setProDerivationScreenTpl($value); $this->setProDebug($value);
break; break;
case 33: case 33:
$this->setProCost($value); $this->setProDynaforms($value);
break; break;
case 34: case 34:
$this->setProDerivationScreenTpl($value);
break;
case 35:
$this->setProCost($value);
break;
case 36:
$this->setProUnitCost($value); $this->setProUnitCost($value);
break; break;
case 35: case 35:
@@ -2118,139 +2214,147 @@ abstract class BaseProcess extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setProParent($arr[$keys[1]]); $this->setProTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setProTime($arr[$keys[2]]); $this->setProDescription($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setProTimeunit($arr[$keys[3]]); $this->setProParent($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setProStatus($arr[$keys[4]]); $this->setProTime($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setProTypeDay($arr[$keys[5]]); $this->setProTimeunit($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setProType($arr[$keys[6]]); $this->setProStatus($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setProAssignment($arr[$keys[7]]); $this->setProTypeDay($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setProShowMap($arr[$keys[8]]); $this->setProType($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setProShowMessage($arr[$keys[9]]); $this->setProAssignment($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setProSubprocess($arr[$keys[10]]); $this->setProShowMap($arr[$keys[10]]);
} }
if (array_key_exists($keys[11], $arr)) { if (array_key_exists($keys[11], $arr)) {
$this->setProTriOpen($arr[$keys[11]]); $this->setProShowMessage($arr[$keys[11]]);
} }
if (array_key_exists($keys[12], $arr)) { if (array_key_exists($keys[12], $arr)) {
$this->setProTriDeleted($arr[$keys[12]]); $this->setProSubprocess($arr[$keys[12]]);
} }
if (array_key_exists($keys[13], $arr)) { if (array_key_exists($keys[13], $arr)) {
$this->setProTriCanceled($arr[$keys[13]]); $this->setProTriOpen($arr[$keys[13]]);
} }
if (array_key_exists($keys[14], $arr)) { if (array_key_exists($keys[14], $arr)) {
$this->setProTriPaused($arr[$keys[14]]); $this->setProTriDeleted($arr[$keys[14]]);
} }
if (array_key_exists($keys[15], $arr)) { if (array_key_exists($keys[15], $arr)) {
$this->setProTriReassigned($arr[$keys[15]]); $this->setProTriCanceled($arr[$keys[15]]);
} }
if (array_key_exists($keys[16], $arr)) { if (array_key_exists($keys[16], $arr)) {
$this->setProTriUnpaused($arr[$keys[16]]); $this->setProTriPaused($arr[$keys[16]]);
} }
if (array_key_exists($keys[17], $arr)) { if (array_key_exists($keys[17], $arr)) {
$this->setProTypeProcess($arr[$keys[17]]); $this->setProTriReassigned($arr[$keys[17]]);
} }
if (array_key_exists($keys[18], $arr)) { if (array_key_exists($keys[18], $arr)) {
$this->setProShowDelegate($arr[$keys[18]]); $this->setProTriUnpaused($arr[$keys[18]]);
} }
if (array_key_exists($keys[19], $arr)) { if (array_key_exists($keys[19], $arr)) {
$this->setProShowDynaform($arr[$keys[19]]); $this->setProTypeProcess($arr[$keys[19]]);
} }
if (array_key_exists($keys[20], $arr)) { if (array_key_exists($keys[20], $arr)) {
$this->setProCategory($arr[$keys[20]]); $this->setProShowDelegate($arr[$keys[20]]);
} }
if (array_key_exists($keys[21], $arr)) { if (array_key_exists($keys[21], $arr)) {
$this->setProSubCategory($arr[$keys[21]]); $this->setProShowDynaform($arr[$keys[21]]);
} }
if (array_key_exists($keys[22], $arr)) { if (array_key_exists($keys[22], $arr)) {
$this->setProIndustry($arr[$keys[22]]); $this->setProCategory($arr[$keys[22]]);
} }
if (array_key_exists($keys[23], $arr)) { if (array_key_exists($keys[23], $arr)) {
$this->setProUpdateDate($arr[$keys[23]]); $this->setProSubCategory($arr[$keys[23]]);
} }
if (array_key_exists($keys[24], $arr)) { if (array_key_exists($keys[24], $arr)) {
$this->setProCreateDate($arr[$keys[24]]); $this->setProIndustry($arr[$keys[24]]);
} }
if (array_key_exists($keys[25], $arr)) { if (array_key_exists($keys[25], $arr)) {
$this->setProCreateUser($arr[$keys[25]]); $this->setProUpdateDate($arr[$keys[25]]);
} }
if (array_key_exists($keys[26], $arr)) { if (array_key_exists($keys[26], $arr)) {
$this->setProHeight($arr[$keys[26]]); $this->setProCreateDate($arr[$keys[26]]);
} }
if (array_key_exists($keys[27], $arr)) { if (array_key_exists($keys[27], $arr)) {
$this->setProWidth($arr[$keys[27]]); $this->setProCreateUser($arr[$keys[27]]);
} }
if (array_key_exists($keys[28], $arr)) { if (array_key_exists($keys[28], $arr)) {
$this->setProTitleX($arr[$keys[28]]); $this->setProHeight($arr[$keys[28]]);
} }
if (array_key_exists($keys[29], $arr)) { if (array_key_exists($keys[29], $arr)) {
$this->setProTitleY($arr[$keys[29]]); $this->setProWidth($arr[$keys[29]]);
} }
if (array_key_exists($keys[30], $arr)) { if (array_key_exists($keys[30], $arr)) {
$this->setProDebug($arr[$keys[30]]); $this->setProTitleX($arr[$keys[30]]);
} }
if (array_key_exists($keys[31], $arr)) { if (array_key_exists($keys[31], $arr)) {
$this->setProDynaforms($arr[$keys[31]]); $this->setProTitleY($arr[$keys[31]]);
} }
if (array_key_exists($keys[32], $arr)) { if (array_key_exists($keys[32], $arr)) {
$this->setProDerivationScreenTpl($arr[$keys[32]]); $this->setProDebug($arr[$keys[32]]);
} }
if (array_key_exists($keys[33], $arr)) { if (array_key_exists($keys[33], $arr)) {
$this->setProCost($arr[$keys[33]]); $this->setProDynaforms($arr[$keys[33]]);
} }
if (array_key_exists($keys[34], $arr)) { if (array_key_exists($keys[34], $arr)) {
$this->setProUnitCost($arr[$keys[34]]); $this->setProDerivationScreenTpl($arr[$keys[34]]);
}
if (array_key_exists($keys[35], $arr)) {
$this->setProCost($arr[$keys[35]]);
}
if (array_key_exists($keys[36], $arr)) {
$this->setProUnitCost($arr[$keys[36]]);
} }
if (array_key_exists($keys[35], $arr)) { if (array_key_exists($keys[35], $arr)) {
@@ -2272,6 +2376,14 @@ abstract class BaseProcess extends BaseObject implements Persistent
$criteria->add(ProcessPeer::PRO_UID, $this->pro_uid); $criteria->add(ProcessPeer::PRO_UID, $this->pro_uid);
} }
if ($this->isColumnModified(ProcessPeer::PRO_TITLE)) {
$criteria->add(ProcessPeer::PRO_TITLE, $this->pro_title);
}
if ($this->isColumnModified(ProcessPeer::PRO_DESCRIPTION)) {
$criteria->add(ProcessPeer::PRO_DESCRIPTION, $this->pro_description);
}
if ($this->isColumnModified(ProcessPeer::PRO_PARENT)) { if ($this->isColumnModified(ProcessPeer::PRO_PARENT)) {
$criteria->add(ProcessPeer::PRO_PARENT, $this->pro_parent); $criteria->add(ProcessPeer::PRO_PARENT, $this->pro_parent);
} }
@@ -2466,6 +2578,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setProTitle($this->pro_title);
$copyObj->setProDescription($this->pro_description);
$copyObj->setProParent($this->pro_parent); $copyObj->setProParent($this->pro_parent);
$copyObj->setProTime($this->pro_time); $copyObj->setProTime($this->pro_time);

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

@@ -25,7 +25,7 @@ abstract class BaseProcessPeer
const CLASS_DEFAULT = 'classes.model.Process'; const CLASS_DEFAULT = 'classes.model.Process';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 35; const NUM_COLUMNS = 37;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseProcessPeer
/** the column name for the PRO_UID field */ /** the column name for the PRO_UID field */
const PRO_UID = 'PROCESS.PRO_UID'; const PRO_UID = 'PROCESS.PRO_UID';
/** the column name for the PRO_TITLE field */
const PRO_TITLE = 'PROCESS.PRO_TITLE';
/** the column name for the PRO_DESCRIPTION field */
const PRO_DESCRIPTION = 'PROCESS.PRO_DESCRIPTION';
/** the column name for the PRO_PARENT field */ /** the column name for the PRO_PARENT field */
const PRO_PARENT = 'PROCESS.PRO_PARENT'; const PRO_PARENT = 'PROCESS.PRO_PARENT';
@@ -150,10 +156,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', 'ProItee', ), BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', 'ProItee', ),
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_OPEN, 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, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ProcessPeer::PRO_ITEE, ), BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, 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_OPEN, 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, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ProcessPeer::PRO_ITEE, ),
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_OPEN', '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', 'PRO_COST', 'PRO_UNIT_COST', 'PRO_ITEE', ), BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_TITLE', 'PRO_DESCRIPTION', '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_OPEN', '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', 'PRO_COST', 'PRO_UNIT_COST', 'PRO_ITEE', ),
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, 32, 33, 34, 35, ) 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, 32, 33, 34, 35, 36, 37, )
); );
/** /**
@@ -163,10 +169,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( 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, 'ProTriOpen' => 11, 'ProTriDeleted' => 12, 'ProTriCanceled' => 13, 'ProTriPaused' => 14, 'ProTriReassigned' => 15, 'ProTriUnpaused' => 16, 'ProTypeProcess' => 17, 'ProShowDelegate' => 18, 'ProShowDynaform' => 19, 'ProCategory' => 20, 'ProSubCategory' => 21, 'ProIndustry' => 22, 'ProUpdateDate' => 23, 'ProCreateDate' => 24, 'ProCreateUser' => 25, 'ProHeight' => 26, 'ProWidth' => 27, 'ProTitleX' => 28, 'ProTitleY' => 29, 'ProDebug' => 30, 'ProDynaforms' => 31, 'ProDerivationScreenTpl' => 32, 'ProCost' => 33, 'ProUnitCost' => 34, 'ProItee' => 35, ), BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProTitle' => 1, 'ProDescription' => 2, 'ProParent' => 3, 'ProTime' => 4, 'ProTimeunit' => 5, 'ProStatus' => 6, 'ProTypeDay' => 7, 'ProType' => 8, 'ProAssignment' => 9, 'ProShowMap' => 10, 'ProShowMessage' => 11, 'ProSubprocess' => 12, 'ProTriOpen' => 13, 'ProTriDeleted' => 14, 'ProTriCanceled' => 15, 'ProTriPaused' => 16, 'ProTriReassigned' => 17, 'ProTriUnpaused' => 18, 'ProTypeProcess' => 19, 'ProShowDelegate' => 20, 'ProShowDynaform' => 21, 'ProCategory' => 22, 'ProSubCategory' => 23, 'ProIndustry' => 24, 'ProUpdateDate' => 25, 'ProCreateDate' => 26, 'ProCreateUser' => 27, 'ProHeight' => 28, 'ProWidth' => 29, 'ProTitleX' => 30, 'ProTitleY' => 31, 'ProDebug' => 32, 'ProDynaforms' => 33, 'ProDerivationScreenTpl' => 34, 'ProCost' => 35, 'ProUnitCost' => 36, 'ProItee' => 37, ),
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_OPEN => 11, ProcessPeer::PRO_TRI_DELETED => 12, ProcessPeer::PRO_TRI_CANCELED => 13, ProcessPeer::PRO_TRI_PAUSED => 14, ProcessPeer::PRO_TRI_REASSIGNED => 15, ProcessPeer::PRO_TRI_UNPAUSED => 16, ProcessPeer::PRO_TYPE_PROCESS => 17, ProcessPeer::PRO_SHOW_DELEGATE => 18, ProcessPeer::PRO_SHOW_DYNAFORM => 19, ProcessPeer::PRO_CATEGORY => 20, ProcessPeer::PRO_SUB_CATEGORY => 21, ProcessPeer::PRO_INDUSTRY => 22, ProcessPeer::PRO_UPDATE_DATE => 23, ProcessPeer::PRO_CREATE_DATE => 24, ProcessPeer::PRO_CREATE_USER => 25, ProcessPeer::PRO_HEIGHT => 26, ProcessPeer::PRO_WIDTH => 27, ProcessPeer::PRO_TITLE_X => 28, ProcessPeer::PRO_TITLE_Y => 29, ProcessPeer::PRO_DEBUG => 30, ProcessPeer::PRO_DYNAFORMS => 31, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 32, ProcessPeer::PRO_COST => 33, ProcessPeer::PRO_UNIT_COST => 34, ProcessPeer::PRO_ITEE => 35, ), BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_TITLE => 1, ProcessPeer::PRO_DESCRIPTION => 2, ProcessPeer::PRO_PARENT => 3, ProcessPeer::PRO_TIME => 4, ProcessPeer::PRO_TIMEUNIT => 5, ProcessPeer::PRO_STATUS => 6, ProcessPeer::PRO_TYPE_DAY => 7, ProcessPeer::PRO_TYPE => 8, ProcessPeer::PRO_ASSIGNMENT => 9, ProcessPeer::PRO_SHOW_MAP => 10, ProcessPeer::PRO_SHOW_MESSAGE => 11, ProcessPeer::PRO_SUBPROCESS => 12, ProcessPeer::PRO_TRI_OPEN => 13, ProcessPeer::PRO_TRI_DELETED => 14, ProcessPeer::PRO_TRI_CANCELED => 15, ProcessPeer::PRO_TRI_PAUSED => 16, ProcessPeer::PRO_TRI_REASSIGNED => 17, ProcessPeer::PRO_TRI_UNPAUSED => 18, ProcessPeer::PRO_TYPE_PROCESS => 19, ProcessPeer::PRO_SHOW_DELEGATE => 20, ProcessPeer::PRO_SHOW_DYNAFORM => 21, ProcessPeer::PRO_CATEGORY => 22, ProcessPeer::PRO_SUB_CATEGORY => 23, ProcessPeer::PRO_INDUSTRY => 24, ProcessPeer::PRO_UPDATE_DATE => 25, ProcessPeer::PRO_CREATE_DATE => 26, ProcessPeer::PRO_CREATE_USER => 27, ProcessPeer::PRO_HEIGHT => 28, ProcessPeer::PRO_WIDTH => 29, ProcessPeer::PRO_TITLE_X => 30, ProcessPeer::PRO_TITLE_Y => 31, ProcessPeer::PRO_DEBUG => 32, ProcessPeer::PRO_DYNAFORMS => 33, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 34, ProcessPeer::PRO_COST => 35, ProcessPeer::PRO_UNIT_COST => 36, ProcessPeer::PRO_ITEE => 37, ),
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_OPEN' => 11, 'PRO_TRI_DELETED' => 12, 'PRO_TRI_CANCELED' => 13, 'PRO_TRI_PAUSED' => 14, 'PRO_TRI_REASSIGNED' => 15, 'PRO_TRI_UNPAUSED' => 16, 'PRO_TYPE_PROCESS' => 17, 'PRO_SHOW_DELEGATE' => 18, 'PRO_SHOW_DYNAFORM' => 19, 'PRO_CATEGORY' => 20, 'PRO_SUB_CATEGORY' => 21, 'PRO_INDUSTRY' => 22, 'PRO_UPDATE_DATE' => 23, 'PRO_CREATE_DATE' => 24, 'PRO_CREATE_USER' => 25, 'PRO_HEIGHT' => 26, 'PRO_WIDTH' => 27, 'PRO_TITLE_X' => 28, 'PRO_TITLE_Y' => 29, 'PRO_DEBUG' => 30, 'PRO_DYNAFORMS' => 31, 'PRO_DERIVATION_SCREEN_TPL' => 32, 'PRO_COST' => 33, 'PRO_UNIT_COST' => 34, 'PRO_ITEE' => 35, ), BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_TITLE' => 1, 'PRO_DESCRIPTION' => 2, 'PRO_PARENT' => 3, 'PRO_TIME' => 4, 'PRO_TIMEUNIT' => 5, 'PRO_STATUS' => 6, 'PRO_TYPE_DAY' => 7, 'PRO_TYPE' => 8, 'PRO_ASSIGNMENT' => 9, 'PRO_SHOW_MAP' => 10, 'PRO_SHOW_MESSAGE' => 11, 'PRO_SUBPROCESS' => 12, 'PRO_TRI_OPEN' => 13, 'PRO_TRI_DELETED' => 14, 'PRO_TRI_CANCELED' => 15, 'PRO_TRI_PAUSED' => 16, 'PRO_TRI_REASSIGNED' => 17, 'PRO_TRI_UNPAUSED' => 18, 'PRO_TYPE_PROCESS' => 19, 'PRO_SHOW_DELEGATE' => 20, 'PRO_SHOW_DYNAFORM' => 21, 'PRO_CATEGORY' => 22, 'PRO_SUB_CATEGORY' => 23, 'PRO_INDUSTRY' => 24, 'PRO_UPDATE_DATE' => 25, 'PRO_CREATE_DATE' => 26, 'PRO_CREATE_USER' => 27, 'PRO_HEIGHT' => 28, 'PRO_WIDTH' => 29, 'PRO_TITLE_X' => 30, 'PRO_TITLE_Y' => 31, 'PRO_DEBUG' => 32, 'PRO_DYNAFORMS' => 33, 'PRO_DERIVATION_SCREEN_TPL' => 34, 'PRO_COST' => 35, 'PRO_UNIT_COST' => 36, 'PRO_ITEE' => 37, ),
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, 32, 33, 34, 35, ) 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, 32, 33, 34, 35, 36, 37, )
); );
/** /**
@@ -269,6 +275,10 @@ abstract class BaseProcessPeer
$criteria->addSelectColumn(ProcessPeer::PRO_UID); $criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
$criteria->addSelectColumn(ProcessPeer::PRO_PARENT); $criteria->addSelectColumn(ProcessPeer::PRO_PARENT);
$criteria->addSelectColumn(ProcessPeer::PRO_TIME); $criteria->addSelectColumn(ProcessPeer::PRO_TIME);

854
workflow/engine/classes/model/om/BaseTask.php
View File

File diff suppressed because it is too large Load Diff

53
workflow/engine/classes/model/om/BaseTaskPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseTaskPeer
const CLASS_DEFAULT = 'classes.model.Task'; const CLASS_DEFAULT = 'classes.model.Task';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 47; const NUM_COLUMNS = 54;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,27 @@ abstract class BaseTaskPeer
/** the column name for the TAS_UID field */ /** the column name for the TAS_UID field */
const TAS_UID = 'TASK.TAS_UID'; const TAS_UID = 'TASK.TAS_UID';
/** the column name for the TAS_TITLE field */
const TAS_TITLE = 'TASK.TAS_TITLE';
/** the column name for the TAS_DESCRIPTION field */
const TAS_DESCRIPTION = 'TASK.TAS_DESCRIPTION';
/** the column name for the TAS_DEF_TITLE field */
const TAS_DEF_TITLE = 'TASK.TAS_DEF_TITLE';
/** the column name for the TAS_DEF_SUBJECT_MESSAGE field */
const TAS_DEF_SUBJECT_MESSAGE = 'TASK.TAS_DEF_SUBJECT_MESSAGE';
/** the column name for the TAS_DEF_PROC_CODE field */
const TAS_DEF_PROC_CODE = 'TASK.TAS_DEF_PROC_CODE';
/** the column name for the TAS_DEF_MESSAGE field */
const TAS_DEF_MESSAGE = 'TASK.TAS_DEF_MESSAGE';
/** the column name for the TAS_DEF_DESCRIPTION field */
const TAS_DEF_DESCRIPTION = 'TASK.TAS_DEF_DESCRIPTION';
/** the column name for the TAS_TYPE field */ /** the column name for the TAS_TYPE field */
const TAS_TYPE = 'TASK.TAS_TYPE'; const TAS_TYPE = 'TASK.TAS_TYPE';
@@ -183,10 +204,10 @@ abstract class BaseTaskPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', 'TasSelfserviceTimeout', 'TasSelfserviceTime', 'TasSelfserviceTimeUnit', 'TasSelfserviceTriggerUid', 'TasSelfserviceExecution', ), BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasTitle', 'TasDescription', 'TasDefTitle', 'TasDefSubjectMessage', 'TasDefProcCode', 'TasDefMessage', 'TasDefDescription', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', 'TasSelfserviceTimeout', 'TasSelfserviceTime', 'TasSelfserviceTimeUnit', 'TasSelfserviceTriggerUid', 'TasSelfserviceExecution', ),
BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, TaskPeer::TAS_SELFSERVICE_TIMEOUT, TaskPeer::TAS_SELFSERVICE_TIME, TaskPeer::TAS_SELFSERVICE_TIME_UNIT, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID, TaskPeer::TAS_SELFSERVICE_EXECUTION, ), BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TITLE, TaskPeer::TAS_DESCRIPTION, TaskPeer::TAS_DEF_TITLE, TaskPeer::TAS_DEF_SUBJECT_MESSAGE, TaskPeer::TAS_DEF_PROC_CODE, TaskPeer::TAS_DEF_MESSAGE, TaskPeer::TAS_DEF_DESCRIPTION, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, TaskPeer::TAS_SELFSERVICE_TIMEOUT, TaskPeer::TAS_SELFSERVICE_TIME, TaskPeer::TAS_SELFSERVICE_TIME_UNIT, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID, TaskPeer::TAS_SELFSERVICE_EXECUTION, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', 'TAS_SELFSERVICE_TIMEOUT', 'TAS_SELFSERVICE_TIME', 'TAS_SELFSERVICE_TIME_UNIT', 'TAS_SELFSERVICE_TRIGGER_UID', 'TAS_SELFSERVICE_EXECUTION', ), BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', 'TAS_SELFSERVICE_TIMEOUT', 'TAS_SELFSERVICE_TIME', 'TAS_SELFSERVICE_TIME_UNIT', 'TAS_SELFSERVICE_TRIGGER_UID', 'TAS_SELFSERVICE_EXECUTION', ),
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, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ) 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, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, )
); );
/** /**
@@ -196,10 +217,10 @@ abstract class BaseTaskPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasType' => 2, 'TasDuration' => 3, 'TasDelayType' => 4, 'TasTemporizer' => 5, 'TasTypeDay' => 6, 'TasTimeunit' => 7, 'TasAlert' => 8, 'TasPriorityVariable' => 9, 'TasAssignType' => 10, 'TasAssignVariable' => 11, 'TasGroupVariable' => 12, 'TasMiInstanceVariable' => 13, 'TasMiCompleteVariable' => 14, 'TasAssignLocation' => 15, 'TasAssignLocationAdhoc' => 16, 'TasTransferFly' => 17, 'TasLastAssigned' => 18, 'TasUser' => 19, 'TasCanUpload' => 20, 'TasViewUpload' => 21, 'TasViewAdditionalDocumentation' => 22, 'TasCanCancel' => 23, 'TasOwnerApp' => 24, 'StgUid' => 25, 'TasCanPause' => 26, 'TasCanSendMessage' => 27, 'TasCanDeleteDocs' => 28, 'TasSelfService' => 29, 'TasStart' => 30, 'TasToLastUser' => 31, 'TasSendLastEmail' => 32, 'TasDerivation' => 33, 'TasPosx' => 34, 'TasPosy' => 35, 'TasWidth' => 36, 'TasHeight' => 37, 'TasColor' => 38, 'TasEvnUid' => 39, 'TasBoundary' => 40, 'TasDerivationScreenTpl' => 41, 'TasSelfserviceTimeout' => 42, 'TasSelfserviceTime' => 43, 'TasSelfserviceTimeUnit' => 44, 'TasSelfserviceTriggerUid' => 45, 'TasSelfserviceExecution' => 46, ), BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasTitle' => 2, 'TasDescription' => 3, 'TasDefTitle' => 4, 'TasDefSubjectMessage' => 5, 'TasDefProcCode' => 6, 'TasDefMessage' => 7, 'TasDefDescription' => 8, 'TasType' => 9, 'TasDuration' => 10, 'TasDelayType' => 11, 'TasTemporizer' => 12, 'TasTypeDay' => 13, 'TasTimeunit' => 14, 'TasAlert' => 15, 'TasPriorityVariable' => 16, 'TasAssignType' => 17, 'TasAssignVariable' => 18, 'TasGroupVariable' => 19, 'TasMiInstanceVariable' => 20, 'TasMiCompleteVariable' => 21, 'TasAssignLocation' => 22, 'TasAssignLocationAdhoc' => 23, 'TasTransferFly' => 24, 'TasLastAssigned' => 25, 'TasUser' => 26, 'TasCanUpload' => 27, 'TasViewUpload' => 28, 'TasViewAdditionalDocumentation' => 29, 'TasCanCancel' => 30, 'TasOwnerApp' => 31, 'StgUid' => 32, 'TasCanPause' => 33, 'TasCanSendMessage' => 34, 'TasCanDeleteDocs' => 35, 'TasSelfService' => 36, 'TasStart' => 37, 'TasToLastUser' => 38, 'TasSendLastEmail' => 39, 'TasDerivation' => 40, 'TasPosx' => 41, 'TasPosy' => 42, 'TasWidth' => 43, 'TasHeight' => 44, 'TasColor' => 45, 'TasEvnUid' => 46, 'TasBoundary' => 47, 'TasDerivationScreenTpl' => 48, 'TasSelfserviceTimeout' => 49, 'TasSelfserviceTime' => 50, 'TasSelfserviceTimeUnit' => 51, 'TasSelfserviceTriggerUid' => 52, 'TasSelfserviceExecution' => 53, ),
BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TYPE => 2, TaskPeer::TAS_DURATION => 3, TaskPeer::TAS_DELAY_TYPE => 4, TaskPeer::TAS_TEMPORIZER => 5, TaskPeer::TAS_TYPE_DAY => 6, TaskPeer::TAS_TIMEUNIT => 7, TaskPeer::TAS_ALERT => 8, TaskPeer::TAS_PRIORITY_VARIABLE => 9, TaskPeer::TAS_ASSIGN_TYPE => 10, TaskPeer::TAS_ASSIGN_VARIABLE => 11, TaskPeer::TAS_GROUP_VARIABLE => 12, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 13, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 14, TaskPeer::TAS_ASSIGN_LOCATION => 15, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 16, TaskPeer::TAS_TRANSFER_FLY => 17, TaskPeer::TAS_LAST_ASSIGNED => 18, TaskPeer::TAS_USER => 19, TaskPeer::TAS_CAN_UPLOAD => 20, TaskPeer::TAS_VIEW_UPLOAD => 21, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 22, TaskPeer::TAS_CAN_CANCEL => 23, TaskPeer::TAS_OWNER_APP => 24, TaskPeer::STG_UID => 25, TaskPeer::TAS_CAN_PAUSE => 26, TaskPeer::TAS_CAN_SEND_MESSAGE => 27, TaskPeer::TAS_CAN_DELETE_DOCS => 28, TaskPeer::TAS_SELF_SERVICE => 29, TaskPeer::TAS_START => 30, TaskPeer::TAS_TO_LAST_USER => 31, TaskPeer::TAS_SEND_LAST_EMAIL => 32, TaskPeer::TAS_DERIVATION => 33, TaskPeer::TAS_POSX => 34, TaskPeer::TAS_POSY => 35, TaskPeer::TAS_WIDTH => 36, TaskPeer::TAS_HEIGHT => 37, TaskPeer::TAS_COLOR => 38, TaskPeer::TAS_EVN_UID => 39, TaskPeer::TAS_BOUNDARY => 40, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 41, TaskPeer::TAS_SELFSERVICE_TIMEOUT => 42, TaskPeer::TAS_SELFSERVICE_TIME => 43, TaskPeer::TAS_SELFSERVICE_TIME_UNIT => 44, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID => 45, TaskPeer::TAS_SELFSERVICE_EXECUTION => 46, ), BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TITLE => 2, TaskPeer::TAS_DESCRIPTION => 3, TaskPeer::TAS_DEF_TITLE => 4, TaskPeer::TAS_DEF_SUBJECT_MESSAGE => 5, TaskPeer::TAS_DEF_PROC_CODE => 6, TaskPeer::TAS_DEF_MESSAGE => 7, TaskPeer::TAS_DEF_DESCRIPTION => 8, TaskPeer::TAS_TYPE => 9, TaskPeer::TAS_DURATION => 10, TaskPeer::TAS_DELAY_TYPE => 11, TaskPeer::TAS_TEMPORIZER => 12, TaskPeer::TAS_TYPE_DAY => 13, TaskPeer::TAS_TIMEUNIT => 14, TaskPeer::TAS_ALERT => 15, TaskPeer::TAS_PRIORITY_VARIABLE => 16, TaskPeer::TAS_ASSIGN_TYPE => 17, TaskPeer::TAS_ASSIGN_VARIABLE => 18, TaskPeer::TAS_GROUP_VARIABLE => 19, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 20, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 21, TaskPeer::TAS_ASSIGN_LOCATION => 22, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 23, TaskPeer::TAS_TRANSFER_FLY => 24, TaskPeer::TAS_LAST_ASSIGNED => 25, TaskPeer::TAS_USER => 26, TaskPeer::TAS_CAN_UPLOAD => 27, TaskPeer::TAS_VIEW_UPLOAD => 28, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 29, TaskPeer::TAS_CAN_CANCEL => 30, TaskPeer::TAS_OWNER_APP => 31, TaskPeer::STG_UID => 32, TaskPeer::TAS_CAN_PAUSE => 33, TaskPeer::TAS_CAN_SEND_MESSAGE => 34, TaskPeer::TAS_CAN_DELETE_DOCS => 35, TaskPeer::TAS_SELF_SERVICE => 36, TaskPeer::TAS_START => 37, TaskPeer::TAS_TO_LAST_USER => 38, TaskPeer::TAS_SEND_LAST_EMAIL => 39, TaskPeer::TAS_DERIVATION => 40, TaskPeer::TAS_POSX => 41, TaskPeer::TAS_POSY => 42, TaskPeer::TAS_WIDTH => 43, TaskPeer::TAS_HEIGHT => 44, TaskPeer::TAS_COLOR => 45, TaskPeer::TAS_EVN_UID => 46, TaskPeer::TAS_BOUNDARY => 47, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 48, TaskPeer::TAS_SELFSERVICE_TIMEOUT => 49, TaskPeer::TAS_SELFSERVICE_TIME => 50, TaskPeer::TAS_SELFSERVICE_TIME_UNIT => 51, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID => 52, TaskPeer::TAS_SELFSERVICE_EXECUTION => 53, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TYPE' => 2, 'TAS_DURATION' => 3, 'TAS_DELAY_TYPE' => 4, 'TAS_TEMPORIZER' => 5, 'TAS_TYPE_DAY' => 6, 'TAS_TIMEUNIT' => 7, 'TAS_ALERT' => 8, 'TAS_PRIORITY_VARIABLE' => 9, 'TAS_ASSIGN_TYPE' => 10, 'TAS_ASSIGN_VARIABLE' => 11, 'TAS_GROUP_VARIABLE' => 12, 'TAS_MI_INSTANCE_VARIABLE' => 13, 'TAS_MI_COMPLETE_VARIABLE' => 14, 'TAS_ASSIGN_LOCATION' => 15, 'TAS_ASSIGN_LOCATION_ADHOC' => 16, 'TAS_TRANSFER_FLY' => 17, 'TAS_LAST_ASSIGNED' => 18, 'TAS_USER' => 19, 'TAS_CAN_UPLOAD' => 20, 'TAS_VIEW_UPLOAD' => 21, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 22, 'TAS_CAN_CANCEL' => 23, 'TAS_OWNER_APP' => 24, 'STG_UID' => 25, 'TAS_CAN_PAUSE' => 26, 'TAS_CAN_SEND_MESSAGE' => 27, 'TAS_CAN_DELETE_DOCS' => 28, 'TAS_SELF_SERVICE' => 29, 'TAS_START' => 30, 'TAS_TO_LAST_USER' => 31, 'TAS_SEND_LAST_EMAIL' => 32, 'TAS_DERIVATION' => 33, 'TAS_POSX' => 34, 'TAS_POSY' => 35, 'TAS_WIDTH' => 36, 'TAS_HEIGHT' => 37, 'TAS_COLOR' => 38, 'TAS_EVN_UID' => 39, 'TAS_BOUNDARY' => 40, 'TAS_DERIVATION_SCREEN_TPL' => 41, 'TAS_SELFSERVICE_TIMEOUT' => 42, 'TAS_SELFSERVICE_TIME' => 43, 'TAS_SELFSERVICE_TIME_UNIT' => 44, 'TAS_SELFSERVICE_TRIGGER_UID' => 45, 'TAS_SELFSERVICE_EXECUTION' => 46, ), BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TITLE' => 2, 'TAS_DESCRIPTION' => 3, 'TAS_DEF_TITLE' => 4, 'TAS_DEF_SUBJECT_MESSAGE' => 5, 'TAS_DEF_PROC_CODE' => 6, 'TAS_DEF_MESSAGE' => 7, 'TAS_DEF_DESCRIPTION' => 8, 'TAS_TYPE' => 9, 'TAS_DURATION' => 10, 'TAS_DELAY_TYPE' => 11, 'TAS_TEMPORIZER' => 12, 'TAS_TYPE_DAY' => 13, 'TAS_TIMEUNIT' => 14, 'TAS_ALERT' => 15, 'TAS_PRIORITY_VARIABLE' => 16, 'TAS_ASSIGN_TYPE' => 17, 'TAS_ASSIGN_VARIABLE' => 18, 'TAS_GROUP_VARIABLE' => 19, 'TAS_MI_INSTANCE_VARIABLE' => 20, 'TAS_MI_COMPLETE_VARIABLE' => 21, 'TAS_ASSIGN_LOCATION' => 22, 'TAS_ASSIGN_LOCATION_ADHOC' => 23, 'TAS_TRANSFER_FLY' => 24, 'TAS_LAST_ASSIGNED' => 25, 'TAS_USER' => 26, 'TAS_CAN_UPLOAD' => 27, 'TAS_VIEW_UPLOAD' => 28, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 29, 'TAS_CAN_CANCEL' => 30, 'TAS_OWNER_APP' => 31, 'STG_UID' => 32, 'TAS_CAN_PAUSE' => 33, 'TAS_CAN_SEND_MESSAGE' => 34, 'TAS_CAN_DELETE_DOCS' => 35, 'TAS_SELF_SERVICE' => 36, 'TAS_START' => 37, 'TAS_TO_LAST_USER' => 38, 'TAS_SEND_LAST_EMAIL' => 39, 'TAS_DERIVATION' => 40, 'TAS_POSX' => 41, 'TAS_POSY' => 42, 'TAS_WIDTH' => 43, 'TAS_HEIGHT' => 44, 'TAS_COLOR' => 45, 'TAS_EVN_UID' => 46, 'TAS_BOUNDARY' => 47, 'TAS_DERIVATION_SCREEN_TPL' => 48, 'TAS_SELFSERVICE_TIMEOUT' => 49, 'TAS_SELFSERVICE_TIME' => 50, 'TAS_SELFSERVICE_TIME_UNIT' => 51, 'TAS_SELFSERVICE_TRIGGER_UID' => 52, 'TAS_SELFSERVICE_EXECUTION' => 53, ),
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, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, ) 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, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, )
); );
/** /**
@@ -304,6 +325,20 @@ abstract class BaseTaskPeer
$criteria->addSelectColumn(TaskPeer::TAS_UID); $criteria->addSelectColumn(TaskPeer::TAS_UID);
$criteria->addSelectColumn(TaskPeer::TAS_TITLE);
$criteria->addSelectColumn(TaskPeer::TAS_DESCRIPTION);
$criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
$criteria->addSelectColumn(TaskPeer::TAS_DEF_SUBJECT_MESSAGE);
$criteria->addSelectColumn(TaskPeer::TAS_DEF_PROC_CODE);
$criteria->addSelectColumn(TaskPeer::TAS_DEF_MESSAGE);
$criteria->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
$criteria->addSelectColumn(TaskPeer::TAS_TYPE); $criteria->addSelectColumn(TaskPeer::TAS_TYPE);
$criteria->addSelectColumn(TaskPeer::TAS_DURATION); $criteria->addSelectColumn(TaskPeer::TAS_DURATION);

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

@@ -22,6 +22,8 @@
<parameter name="Comment" value="The application"/> <parameter name="Comment" value="The application"/>
</vendor> </vendor>
<column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="APP_TITLE" type="LONGVARCHAR" required="true"/>
<column name="APP_DESCRIPTION" type="LONGVARCHAR"/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/> <column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
<column name="APP_PARENT" type="VARCHAR" size="32" required="true" default="0"/> <column name="APP_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
<column name="APP_STATUS" type="VARCHAR" size="100" required="true" default=""/> <column name="APP_STATUS" type="VARCHAR" size="100" required="true" default=""/>
@@ -436,6 +438,7 @@
<parameter name="Comment" value="Departments"/> <parameter name="Comment" value="Departments"/>
</vendor> </vendor>
<column name="DEP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="DEP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="DEP_TITLE" type="LONGVARCHAR" required="true"/>
<column name="DEP_PARENT" type="VARCHAR" size="32" required="true" default=""/> <column name="DEP_PARENT" type="VARCHAR" size="32" required="true" default=""/>
<column name="DEP_MANAGER" type="VARCHAR" size="32" required="true" default=""/> <column name="DEP_MANAGER" type="VARCHAR" size="32" required="true" default=""/>
<column name="DEP_LOCATION" type="INTEGER" required="true" default="0"/> <column name="DEP_LOCATION" type="INTEGER" required="true" default="0"/>
@@ -532,6 +535,7 @@
<parameter name="Comment" value=""/> <parameter name="Comment" value=""/>
</vendor> </vendor>
<column name="GRP_UID" type="VARCHAR" size="32" required="true" primaryKey="true"/> <column name="GRP_UID" type="VARCHAR" size="32" required="true" primaryKey="true"/>
<column name="GRP_TITLE" type="LONGVARCHAR" required="true"/>
<column name="GRP_STATUS" type="CHAR" size="8" required="true" default="ACTIVE"/> <column name="GRP_STATUS" type="CHAR" size="8" required="true" default="ACTIVE"/>
<column name="GRP_LDAP_DN" type="VARCHAR" size="255" required="true" default=""/> <column name="GRP_LDAP_DN" type="VARCHAR" size="255" required="true" default=""/>
<column name="GRP_UX" type="VARCHAR" size="128" default="NORMAL"/> <column name="GRP_UX" type="VARCHAR" size="128" default="NORMAL"/>
@@ -620,6 +624,8 @@
</vendor> </vendor>
<column name="INP_DOC_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="INP_DOC_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default="0"/> <column name="PRO_UID" type="VARCHAR" size="32" required="true" default="0"/>
<column name="INP_DOC_TITLE" type="LONGVARCHAR" required="true"/>
<column name="INP_DOC_DESCRIPTION" type="LONGVARCHAR"/>
<column name="INP_DOC_FORM_NEEDED" type="VARCHAR" size="20" required="true" default="REAL"/> <column name="INP_DOC_FORM_NEEDED" type="VARCHAR" size="20" required="true" default="REAL"/>
<column name="INP_DOC_ORIGINAL" type="VARCHAR" size="20" required="true" default="COPY"/> <column name="INP_DOC_ORIGINAL" type="VARCHAR" size="20" required="true" default="COPY"/>
<column name="INP_DOC_PUBLISHED" type="VARCHAR" size="20" required="true" default="PRIVATE"/> <column name="INP_DOC_PUBLISHED" type="VARCHAR" size="20" required="true" default="PRIVATE"/>
@@ -870,6 +876,8 @@
<parameter name="Comment" value="Store process Information"/> <parameter name="Comment" value="Store process Information"/>
</vendor> </vendor>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="PRO_TITLE" type="LONGVARCHAR" required="true"/>
<column name="PRO_DESCRIPTION" type="LONGVARCHAR"/>
<column name="PRO_PARENT" type="VARCHAR" size="32" required="true" default="0"/> <column name="PRO_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
<column name="PRO_TIME" type="DOUBLE" required="true" default="1"/> <column name="PRO_TIME" type="DOUBLE" required="true" default="1"/>
<column name="PRO_TIMEUNIT" type="VARCHAR" size="20" required="true" null="yes" default="DAYS"/> <column name="PRO_TIMEUNIT" type="VARCHAR" size="20" required="true" null="yes" default="DAYS"/>
@@ -1249,6 +1257,15 @@
</vendor> </vendor>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/> <column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="TAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="TAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="TAS_TITLE" type="LONGVARCHAR" required="true"/>
<column name="TAS_DESCRIPTION" type="LONGVARCHAR"/>
<column name="TAS_DEF_TITLE" type="LONGVARCHAR"/>
<column name="TAS_DEF_SUBJECT_MESSAGE" type="LONGVARCHAR"/>
<column name="TAS_DEF_PROC_CODE" type="LONGVARCHAR"/>
<column name="TAS_DEF_MESSAGE" type="LONGVARCHAR"/>
<column name="TAS_DEF_DESCRIPTION" type="LONGVARCHAR"/>
<column name="TAS_TYPE" type="VARCHAR" size="50" required="true" default="NORMAL"/> <column name="TAS_TYPE" type="VARCHAR" size="50" required="true" default="NORMAL"/>
<column name="TAS_DURATION" type="DOUBLE" required="true" default="0"/> <column name="TAS_DURATION" type="DOUBLE" required="true" default="0"/>
<column name="TAS_DELAY_TYPE" type="VARCHAR" size="30" required="true" default=""/> <column name="TAS_DELAY_TYPE" type="VARCHAR" size="30" required="true" default=""/>

11
workflow/engine/controllers/appProxy.php
View File

@@ -98,9 +98,10 @@ class AppProxy extends HttpProxyController
$appNotes = new AppNotes(); $appNotes = new AppNotes();
$response = $appNotes->getNotesList( $appUid, '', $httpData->start, $httpData->limit ); $response = $appNotes->getNotesList( $appUid, '', $httpData->start, $httpData->limit );
require_once ("classes/model/Content.php"); require_once ("classes/model/Application.php");
$content = new Content(); $oApplication = new Application();
$response['array']['appTitle'] = $content->load('APP_TITLE', '', $appUid, SYS_LANG); $aApplication = $oApplication->Load($appUid);
$response['array']['appTitle'] = $aApplication['APP_TITLE'];
return $response['array']; return $response['array'];
} }
@@ -292,7 +293,9 @@ class AppProxy extends HttpProxyController
// note added by krlos pacha carlos[at]colosa[dot]com // note added by krlos pacha carlos[at]colosa[dot]com
//getting this field if it doesn't exist. Related 7994 bug //getting this field if it doesn't exist. Related 7994 bug
$taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : Content::Load( "TAS_TITLE", "", $applicationFields['TAS_UID'], SYS_LANG ); $oTask = new \Task();
$aTasks = $oTask->load($applicationFields['TAS_UID']);
$taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : $aTasks["TAS_TITLE"];
$data[] = array ("label" => $labelsCurrentTaskProperties["TAS_TITLE"], "value" => htmlentities($taskData["TAS_TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labelTitleCurrentTasks["TITLE2"]); $data[] = array ("label" => $labelsCurrentTaskProperties["TAS_TITLE"], "value" => htmlentities($taskData["TAS_TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labelTitleCurrentTasks["TITLE2"]);
$data[] = array ('label' => $labelsCurrentTaskProperties['CURRENT_USER'],'value' => $currentUser,'section' => $labelTitleCurrentTasks['TITLE2']); $data[] = array ('label' => $labelsCurrentTaskProperties['CURRENT_USER'],'value' => $currentUser,'section' => $labelTitleCurrentTasks['TITLE2']);
$data[] = array ('label' => $labelsCurrentTaskProperties['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']); $data[] = array ('label' => $labelsCurrentTaskProperties['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']);

32
workflow/engine/controllers/dashboard.php
View File

@@ -354,27 +354,14 @@ class Dashboard extends Controller
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->setDistinct(); $criteria->setDistinct();
$criteria->addSelectColumn( DepartmentPeer::DEP_UID ); $criteria->addSelectColumn( DepartmentPeer::DEP_UID );
$criteria->addSelectColumn( ContentPeer::CON_VALUE ); $criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
//FROM
$conditions = array ();
$conditions[] = array (DepartmentPeer::DEP_UID,ContentPeer::CON_ID
);
$conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'DEPO_TITLE' . DBAdapter::getStringDelimiter()
);
$conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
);
$criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
//WHERE
$criteria->add( DepartmentPeer::DEP_STATUS, 'ACTIVE' ); $criteria->add( DepartmentPeer::DEP_STATUS, 'ACTIVE' );
//ORDER BY $criteria->addAscendingOrderByColumn( DepartmentPeer::DEP_TITLE );
$criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
$dataset = DepartmentPeer::doSelectRS( $criteria ); $dataset = DepartmentPeer::doSelectRS( $criteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$dataset->next(); $dataset->next();
while ($row = $dataset->getRow()) { while ($row = $dataset->getRow()) {
$departments[] = array ('OWNER_UID' => $row['DEP_UID'],'OWNER_NAME' => $row['CON_VALUE'] $departments[] = array('OWNER_UID' => $row['DEP_UID'], 'OWNER_NAME' => $row['DEP_TITLE']);
);
$dataset->next(); $dataset->next();
} }
@@ -390,20 +377,11 @@ class Dashboard extends Controller
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->setDistinct(); $criteria->setDistinct();
$criteria->addSelectColumn( GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( GroupwfPeer::GRP_UID );
$criteria->addSelectColumn( ContentPeer::CON_VALUE ); $criteria->addSelectColumn( GroupwfPeer::GRP_TITLE );
//FROM
$conditions = array ();
$conditions[] = array (GroupwfPeer::GRP_UID,ContentPeer::CON_ID
);
$conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter()
);
$conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
);
$criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
//WHERE //WHERE
$criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' ); $criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
//ORDER BY //ORDER BY
$criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE ); $criteria->addAscendingOrderByColumn( GroupwfPeer::GRP_TITLE );
$dataset = GroupwfPeer::doSelectRS( $criteria ); $dataset = GroupwfPeer::doSelectRS( $criteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );

12
workflow/engine/controllers/home.php
View File

@@ -714,15 +714,7 @@ class Home extends Controller
$cProcess = new Criteria("workflow"); $cProcess = new Criteria("workflow");
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_UID); $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
$cProcess->addSelectColumn(ContentPeer::CON_VALUE); $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
$del = DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
$conds[] = array(ContentPeer::CON_CATEGORY, $del . "PRO_TITLE" . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE"); $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
@@ -730,7 +722,7 @@ class Home extends Controller
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$processes[] = array($aRow["PRO_UID"], $aRow["CON_VALUE"]); $processes[] = array($aRow["PRO_UID"], $aRow["PRO_TITLE"]);
$oDataset->next(); $oDataset->next();
} }

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

@@ -13,6 +13,8 @@ DROP TABLE IF EXISTS `APPLICATION`;
CREATE TABLE `APPLICATION` CREATE TABLE `APPLICATION`
( (
`APP_UID` VARCHAR(32) default '' NOT NULL, `APP_UID` VARCHAR(32) default '' NOT NULL,
`APP_TITLE` MEDIUMTEXT NOT NULL,
`APP_DESCRIPTION` MEDIUMTEXT,
`APP_NUMBER` INTEGER default 0 NOT NULL, `APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_PARENT` VARCHAR(32) default '0' NOT NULL, `APP_PARENT` VARCHAR(32) default '0' NOT NULL,
`APP_STATUS` VARCHAR(100) default '' NOT NULL, `APP_STATUS` VARCHAR(100) default '' NOT NULL,
@@ -37,7 +39,6 @@ CREATE TABLE `APPLICATION`
KEY `indexAppStatus`(`APP_STATUS`), KEY `indexAppStatus`(`APP_STATUS`),
KEY `indexAppCreateDate`(`APP_CREATE_DATE`) KEY `indexAppCreateDate`(`APP_CREATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The application'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The application';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- APP_SEQUENCE #-- APP_SEQUENCE
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -205,6 +206,7 @@ DROP TABLE IF EXISTS `DEPARTMENT`;
CREATE TABLE `DEPARTMENT` CREATE TABLE `DEPARTMENT`
( (
`DEP_UID` VARCHAR(32) default '' NOT NULL, `DEP_UID` VARCHAR(32) default '' NOT NULL,
`DEP_TITLE` MEDIUMTEXT NOT NULL,
`DEP_PARENT` VARCHAR(32) default '' NOT NULL, `DEP_PARENT` VARCHAR(32) default '' NOT NULL,
`DEP_MANAGER` VARCHAR(32) default '' NOT NULL, `DEP_MANAGER` VARCHAR(32) default '' NOT NULL,
`DEP_LOCATION` INTEGER default 0 NOT NULL, `DEP_LOCATION` INTEGER default 0 NOT NULL,
@@ -244,6 +246,7 @@ DROP TABLE IF EXISTS `GROUPWF`;
CREATE TABLE `GROUPWF` CREATE TABLE `GROUPWF`
( (
`GRP_UID` VARCHAR(32) NOT NULL, `GRP_UID` VARCHAR(32) NOT NULL,
`GRP_TITLE` MEDIUMTEXT NOT NULL,
`GRP_STATUS` CHAR(8) default 'ACTIVE' NOT NULL, `GRP_STATUS` CHAR(8) default 'ACTIVE' NOT NULL,
`GRP_LDAP_DN` VARCHAR(255) default '' NOT NULL, `GRP_LDAP_DN` VARCHAR(255) default '' NOT NULL,
`GRP_UX` VARCHAR(128) default 'NORMAL', `GRP_UX` VARCHAR(128) default 'NORMAL',
@@ -287,6 +290,8 @@ CREATE TABLE `INPUT_DOCUMENT`
( (
`INP_DOC_UID` VARCHAR(32) default '' NOT NULL, `INP_DOC_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '0' NOT NULL, `PRO_UID` VARCHAR(32) default '0' NOT NULL,
`INP_DOC_TITLE` MEDIUMTEXT NOT NULL,
`INP_DOC_DESCRIPTION` MEDIUMTEXT,
`INP_DOC_FORM_NEEDED` VARCHAR(20) default 'REAL' NOT NULL, `INP_DOC_FORM_NEEDED` VARCHAR(20) default 'REAL' NOT NULL,
`INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL, `INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL,
`INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL, `INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL,
@@ -418,6 +423,8 @@ DROP TABLE IF EXISTS `PROCESS`;
CREATE TABLE `PROCESS` CREATE TABLE `PROCESS`
( (
`PRO_UID` VARCHAR(32) default '' NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL,
`PRO_TITLE` MEDIUMTEXT NOT NULL,
`PRO_DESCRIPTION` MEDIUMTEXT,
`PRO_PARENT` VARCHAR(32) default '0' NOT NULL, `PRO_PARENT` VARCHAR(32) default '0' NOT NULL,
`PRO_TIME` DOUBLE default 1 NOT NULL, `PRO_TIME` DOUBLE default 1 NOT NULL,
`PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL, `PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL,
@@ -599,6 +606,13 @@ CREATE TABLE `TASK`
( (
`PRO_UID` VARCHAR(32) default '' NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL, `TAS_UID` VARCHAR(32) default '' NOT NULL,
`TAS_TITLE` MEDIUMTEXT NOT NULL,
`TAS_DESCRIPTION` MEDIUMTEXT,
`TAS_DEF_TITLE` MEDIUMTEXT,
`TAS_DEF_SUBJECT_MESSAGE` MEDIUMTEXT,
`TAS_DEF_PROC_CODE` MEDIUMTEXT,
`TAS_DEF_MESSAGE` MEDIUMTEXT,
`TAS_DEF_DESCRIPTION` MEDIUMTEXT,
`TAS_TYPE` VARCHAR(50) default 'NORMAL' NOT NULL, `TAS_TYPE` VARCHAR(50) default 'NORMAL' NOT NULL,
`TAS_DURATION` DOUBLE default 0 NOT NULL, `TAS_DURATION` DOUBLE default 0 NOT NULL,
`TAS_DELAY_TYPE` VARCHAR(30) default '' NOT NULL, `TAS_DELAY_TYPE` VARCHAR(30) default '' NOT NULL,

14
workflow/engine/methods/cases/casesConsolidatedListExtJs.php
View File

@@ -19,10 +19,8 @@ $usrUid = $_SESSION["USER_LOGGED"];
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn("*"); $oCriteria->addSelectColumn("*");
$oCriteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID); $oCriteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID);
$oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,ContentPeer::CON_ID, Criteria::LEFT_JOIN); $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
$oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$oCriteria->addAnd(ContentPeer::CON_CATEGORY, "TAS_TITLE");
$oCriteria->addAnd(ContentPeer::CON_LANG, "en");
$params = array(); //This will be filled with the parameters $params = array(); //This will be filled with the parameters
$sql = BasePeer::createSelectSql($oCriteria, $params); $sql = BasePeer::createSelectSql($oCriteria, $params);
@@ -211,22 +209,16 @@ function getProcessArray($action, $userUid)
$cProcess = new Criteria("workflow"); $cProcess = new Criteria("workflow");
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_UID); $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
$cProcess->addSelectColumn(ContentPeer::CON_VALUE); $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
$conds[] = array(ContentPeer::CON_CATEGORY, $del . "PRO_TITLE" . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE"); $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$processes[] = array($aRow["PRO_UID"], $aRow["CON_VALUE"]); $processes[] = array($aRow["PRO_UID"], $aRow["PRO_TITLE"]);
$oDataset->next(); $oDataset->next();
} }

8
workflow/engine/methods/cases/casesDemo.php
View File

@@ -79,7 +79,9 @@ try {
$Fields['APP_PIN'] = $appFields['APP_PIN']; $Fields['APP_PIN'] = $appFields['APP_PIN'];
$Fields['APP_PROC_CODE'] = $appFields['APP_PROC_CODE']; $Fields['APP_PROC_CODE'] = $appFields['APP_PROC_CODE'];
$Fields['PRO_TITLE'] = Content::load( 'PRO_TITLE', '', $appFields['PRO_UID'], SYS_LANG ); $objProc = new Process();
$aProc = $objProc->load($appFields['PRO_UID']);
$Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
$oUser = new Users(); $oUser = new Users();
$oUser->load( $appFields['APP_CUR_USER'] ); $oUser->load( $appFields['APP_CUR_USER'] );
$Fields['CUR_USER'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); $Fields['CUR_USER'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
@@ -91,7 +93,9 @@ try {
$Fields['CANT_APP_DATA'] = count( $Fields['APP_DATA'] ); $Fields['CANT_APP_DATA'] = count( $Fields['APP_DATA'] );
$delegations = $oCase->GetAllDelegations( $appFields['APP_UID'] ); $delegations = $oCase->GetAllDelegations( $appFields['APP_UID'] );
foreach ($delegations as $key => $val) { foreach ($delegations as $key => $val) {
$delegations[$key]['TAS_TITLE'] = Content::load( 'TAS_TITLE', '', $val['TAS_UID'], SYS_LANG ); $objTask = new Task();
$aTask = $objTask->load($val['TAS_UID']);
$delegations[$key]['TAS_TITLE'] = $aTask['TAS_TITLE'];
if ($val['USR_UID'] != - 1) { if ($val['USR_UID'] != - 1) {
$oUser->load( $val['USR_UID'] ); $oUser->load( $val['USR_UID'] );
$delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); $delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();

11
workflow/engine/methods/cases/casesList_Ajax.php
View File

@@ -131,25 +131,20 @@ if ($actionAjax == "processListExtJs") {
//get the processes for this user in this action //get the processes for this user in this action
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_UID); $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
$cProcess->addAsColumn('PRO_TITLE', ContentPeer::CON_VALUE); $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
if ($categoryUid) { if ($categoryUid) {
$cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid); $cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid);
} }
$del = \DBAdapter::getStringDelimiter(); $del = \DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
$conds[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE'); $cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
if (!is_null($query)) { if (!is_null($query)) {
$filters = $cProcess->getNewCriterion(ContentPeer::CON_VALUE, '%' . $query . '%', Criteria::LIKE); $filters = $cProcess->getNewCriterion(ProcessPeer::PRO_TITLE, '%' . $query . '%', Criteria::LIKE);
$cProcess->addAnd($filters); $cProcess->addAnd($filters);
} }
$cProcess->addAscendingOrderByColumn(ContentPeer::CON_VALUE); $cProcess->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);

29
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -172,10 +172,8 @@ function lookinginforContentProcess ($sproUid)
$oContent = new Content(); $oContent = new Content();
///we are looking for a pro title for this process $sproUid ///we are looking for a pro title for this process $sproUid
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' ); $oCriteria->add( ProcessPeer::PRO_UID, $sproUid );
$oCriteria->add( ContentPeer::CON_LANG, 'en' ); $oDataset = ProcessPeer::doSelectRS( $oCriteria );
$oCriteria->add( ContentPeer::CON_ID, $sproUid );
$oDataset = ContentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
@@ -183,34 +181,25 @@ function lookinginforContentProcess ($sproUid)
$oC = new Criteria( 'workflow' ); $oC = new Criteria( 'workflow' );
$oC->addSelectColumn( TaskPeer::TAS_UID ); $oC->addSelectColumn( TaskPeer::TAS_UID );
$oC->addSelectColumn( TaskPeer::TAS_TITLE );
$oC->add( TaskPeer::PRO_UID, $sproUid ); $oC->add( TaskPeer::PRO_UID, $sproUid );
$oDataset1 = TaskPeer::doSelectRS( $oC ); $oDataset1 = TaskPeer::doSelectRS( $oC );
$oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($oDataset1->next()) { while ($oDataset1->next()) {
$aRow1 = $oDataset1->getRow(); $aRow1 = $oDataset1->getRow();
Content::insertContent( 'TAS_TITLE', '', $aRow1['TAS_UID'], 'en', $aRow1['TAS_TITLE'] );
$oCriteria1 = new Criteria( 'workflow' );
$oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE' );
$oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria1->add( ContentPeer::CON_ID, $aRow1['TAS_UID'] );
$oDataset2 = ContentPeer::doSelectRS( $oCriteria1 );
$oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset2->next();
$aRow2 = $oDataset2->getRow();
Content::insertContent( 'TAS_TITLE', '', $aRow2['CON_ID'], 'en', $aRow2['CON_VALUE'] );
} }
$oC2 = new Criteria( 'workflow' ); $oC2 = new Criteria( 'workflow' );
$oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' ); $oC2->addSelectColumn(ProcessPeer::PRO_UID);
$oC2->add( ContentPeer::CON_LANG, SYS_LANG ); $oC2->addSelectColumn(ProcessPeer::PRO_TITLE);
$oC2->add( ContentPeer::CON_ID, $sproUid ); $oC2->add( ProcessPeer::PRO_UID, $sproUid );
$oDataset3 = ContentPeer::doSelectRS( $oC2 ); $oDataset3 = ProcessPeer::doSelectRS( $oC2 );
$oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset3->next(); $oDataset3->next();
$aRow3 = $oDataset3->getRow(); $aRow3 = $oDataset3->getRow();
Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] ); Content::insertContent( 'PRO_TITLE', '', $aRow3['PRO_UID'], 'en', $aRow3['PRO_TITLE'] );
} }
return 1; return 1;

5
workflow/engine/methods/cases/cases_SchedulerGetProcesses.php
View File

@@ -11,14 +11,11 @@ G::LoadClass( 'Content' );
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
$oCriteria->setDistinct(); $oCriteria->setDistinct();
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE ); $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addJoin( ProcessPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( ProcessPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN );
$oCriteria->addJoin( ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN );
$oCriteria->add( TaskUserPeer::USR_UID, $oUserId ); $oCriteria->add( TaskUserPeer::USR_UID, $oUserId );
$oCriteria->add( TaskPeer::TAS_START, 'true' ); $oCriteria->add( TaskPeer::TAS_START, 'true' );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->addAnd( ProcessPeer::PRO_UID, $process ); $oCriteria->addAnd( ProcessPeer::PRO_UID, $process );
$resultSet = TaskUserPeer::doSelectRS( $oCriteria ); $resultSet = TaskUserPeer::doSelectRS( $oCriteria );

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

@@ -72,7 +72,7 @@ switch ($_POST['action']) {
case 'showUsers': case 'showUsers':
global $G_PUBLISH; global $G_PUBLISH;
$oDept = new Department(); $oDept = new Department();
$aFields = $oDept->load( $_POST['sDptoUID'] ); $aFields = $oDept->Load( $_POST['sDptoUID'] );
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'departments/departments_Edit', '', $aFields, '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'departments/departments_Edit', '', $aFields, '' );
@@ -82,7 +82,7 @@ switch ($_POST['action']) {
//$G_PUBLISH->AddContent('propeltable', 'paged-table', 'departments/departments_UsersList', $criteria, $aFields); //$G_PUBLISH->AddContent('propeltable', 'paged-table', 'departments/departments_UsersList', $criteria, $aFields);
$oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptCode( "groupname='{$aFields["DEPO_TITLE"]}';" ); $oHeadPublisher->addScriptCode( "groupname='{$aFields["DEP_TITLE"]}';" );
$oHeadPublisher->addScriptCode( "depUid='{$aFields["DEP_UID"]}';" ); $oHeadPublisher->addScriptCode( "depUid='{$aFields["DEP_UID"]}';" );
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
@@ -153,13 +153,9 @@ switch ($_POST['action']) {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->clearSelectColumns(); $oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
$oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$oCriteria->addJoin( ContentPeer::CON_ID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN ); $oCriteria->add( DepartmentPeer::DEP_TITLE, $dep_name );
$oCriteria->add( ContentPeer::CON_VALUE, $dep_name );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( DepartmentPeer::DEP_PARENT, $parent ); $oCriteria->add( DepartmentPeer::DEP_PARENT, $parent );
$oDataset = DepartmentPeer::doSelectRS( $oCriteria ); $oDataset = DepartmentPeer::doSelectRS( $oCriteria );

38
workflow/engine/methods/inputdocs/inputdocs_Save.php
View File

@@ -54,26 +54,14 @@ try {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( InputDocumentPeer::INP_DOC_UID ); $oCriteria->addSelectColumn( InputDocumentPeer::INP_DOC_UID );
$oCriteria->add( InputDocumentPeer::PRO_UID, $sPRO_UID ); $oCriteria->add( InputDocumentPeer::PRO_UID, $sPRO_UID );
$oCriteria->add( InputDocumentPeer::INP_DOC_TITLE, $snameInput );
$oDataset = InputDocumentPeer::doSelectRS( $oCriteria ); $oDataset = InputDocumentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$flag = true; $flag = true;
while ($oDataset->next() && $flag) { $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
if ($aRow) {
$oCriteria1 = new Criteria( 'workflow' ); $flag = false;
$oCriteria1->addSelectColumn( 'COUNT(*) AS INPUTS' );
$oCriteria1->add( ContentPeer::CON_CATEGORY, 'INP_DOC_TITLE' );
$oCriteria1->add( ContentPeer::CON_ID, $aRow['INP_DOC_UID'] );
$oCriteria1->add( ContentPeer::CON_VALUE, $snameInput );
$oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
$oDataset1 = ContentPeer::doSelectRS( $oCriteria1 );
$oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset1->next();
$aRow1 = $oDataset1->getRow();
if ($aRow1['INPUTS']) {
$flag = false;
}
} }
print $flag; print $flag;
break; break;
@@ -88,16 +76,16 @@ try {
$aData = $_POST; $aData = $_POST;
} }
//Validating the format of the allowed extentions //Validating the format of the allowed extentions
//Allowed Types has to have this format -> *.pdf, .xls, *.docx, *.* or .* to all. //Allowed Types has to have this format -> *.pdf, .xls, *.docx, *.* or .* to all.
$allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']); $allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']);
foreach ($allowedTypes as $types => $val) { foreach ($allowedTypes as $types => $val) {
if ((preg_match("/^.*\.?[a-zA-Z0-9]{2,15}$/", $val)) || ($val == "*.*") || ($val == ".*")) { if ((preg_match("/^.*\.?[a-zA-Z0-9]{2,15}$/", $val)) || ($val == "*.*") || ($val == ".*")) {
}else { }else {
$message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' ); $message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' );
G::SendMessageText( $message, "ERROR" ); G::SendMessageText( $message, "ERROR" );
die(); die();
} }
} }
if ($aData['INP_DOC_UID'] == '') { if ($aData['INP_DOC_UID'] == '') {

15
workflow/engine/methods/mails/emailsAjax.php
View File

@@ -83,9 +83,7 @@ switch($req){
$criteria->addSelectColumn(ApplicationPeer::PRO_UID); $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$criteria->addAlias('C2', 'CONTENT');
if ($emailStatus != '') { if ($emailStatus != '') {
$criteria->add( AppMessagePeer::APP_MSG_STATUS, $emailStatus); $criteria->add( AppMessagePeer::APP_MSG_STATUS, $emailStatus);
@@ -129,16 +127,7 @@ switch($req){
$criteria->setOffset($start); $criteria->setOffset($start);
} }
$criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID); $criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID);
$criteria->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID);
$conditions = array();
$conditions[] = array(ApplicationPeer::PRO_UID, 'C2.CON_ID');
$conditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$conditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$criteria->addJoinMC($conditions, Criteria::LEFT_JOIN);
$result = AppMessagePeer::doSelectRS($criteria); $result = AppMessagePeer::doSelectRS($criteria);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$data = Array(); $data = Array();

4
workflow/engine/methods/processes/processes_Save.php
View File

@@ -40,9 +40,7 @@ switch ($function) {
$snameProcess = urldecode( $_POST['NAMEPROCESS'] ); $snameProcess = urldecode( $_POST['NAMEPROCESS'] );
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( 'COUNT(*) AS PROCESS' ); $oCriteria->addSelectColumn( 'COUNT(*) AS PROCESS' );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' ); $oCriteria->add(ProcessPeer::PRO_TITLE, $snameProcess);
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( ContentPeer::CON_VALUE, $snameProcess );
$oDataset = ContentPeer::doSelectRS( $oCriteria ); $oDataset = ContentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();

11
workflow/engine/methods/setup/language_Ajax.php
View File

@@ -147,16 +147,13 @@ try {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
//$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')'); //$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')');
$oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY ); $oCriteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE ); $oDataset = ApplicationPeer::doSelectRS( $oCriteria );
$oCriteria->add( ContentPeer::CON_LANG, $locale ); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oCriteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
$oDataset = ContentPeer::doSelectRS( $oCriteria );
$oDataset->next(); $oDataset->next();
$oContent = new Content();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
$oContent = new Content();
if($locale != "en"){ //Default Lengage 'en' if($locale != "en"){ //Default Lengage 'en'
if($locale != SYS_LANG){ //Current lenguage if($locale != SYS_LANG){ //Current lenguage
//THERE IS NO ANY CASE STARTED FROM THES LANGUAGE //THERE IS NO ANY CASE STARTED FROM THES LANGUAGE

18
workflow/engine/methods/tracker/tracker_Ajax.php
View File

@@ -407,14 +407,9 @@ try {
$oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) ); $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( TaskPeer::TAS_UID ); $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE ); $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
$aConditions = array ();
$aConditions[] = array (0 => TaskPeer::TAS_UID,1 => ContentPeer::CON_ID);
$aConditions[] = array (0 => ContentPeer::CON_CATEGORY,1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter());
$aConditions[] = array (0 => ContentPeer::CON_LANG,1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->add( TaskPeer::STG_UID, $oData->stg_uid ); $oCriteria->add( TaskPeer::STG_UID, $oData->stg_uid );
$oCriteria->addAscendingOrderByColumn( 'TAS_TITLE' ); $oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_StageTasks', $oCriteria, array ('PRO_UID' => $oData->pro_uid,'STG_UID' => $oData->stg_uid) ); $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_StageTasks', $oCriteria, array ('PRO_UID' => $oData->pro_uid,'STG_UID' => $oData->stg_uid) );
@@ -425,15 +420,10 @@ try {
require_once 'classes/model/Task.php'; require_once 'classes/model/Task.php';
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( TaskPeer::TAS_UID ); $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE ); $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
$aConditions = array ();
$aConditions[] = array (0 => TaskPeer::TAS_UID,1 => ContentPeer::CON_ID );
$aConditions[] = array (0 => ContentPeer::CON_CATEGORY,1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter());
$aConditions[] = array (0 => ContentPeer::CON_LANG,1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->add( TaskPeer::PRO_UID, $_POST['PRO_UID'] ); $oCriteria->add( TaskPeer::PRO_UID, $_POST['PRO_UID'] );
$oCriteria->add( TaskPeer::STG_UID, '' ); $oCriteria->add( TaskPeer::STG_UID, '' );
$oCriteria->addAscendingOrderByColumn( 'TAS_TITLE' ); $oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_AvailableStageTasks', $oCriteria, array ('STG_UID' => $_POST['STG_UID']) ); $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_AvailableStageTasks', $oCriteria, array ('STG_UID' => $_POST['STG_UID']) );

8
workflow/engine/methods/users/myInfo_Edit.php
View File

@@ -55,8 +55,8 @@ try {
$userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME ); $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME']; $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
try { try {
$depFields = $oDepInfo->load( $userFields['DEP_UID'] . 'xy<' ); $depFields = $oDepInfo->Load( $userFields['DEP_UID'] . 'xy<' );
$aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")"; $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
} catch (Exception $e) { } catch (Exception $e) {
} }
} else { } else {
@@ -64,8 +64,8 @@ try {
} }
try { try {
$depFields = $oDepInfo->load( $aFields['DEP_UID'] ); $depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
$aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE']; $aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
} catch (Exception $e) { } catch (Exception $e) {
$oUser = UsersPeer::retrieveByPk( $_SESSION['USER_LOGGED'] ); $oUser = UsersPeer::retrieveByPk( $_SESSION['USER_LOGGED'] );
$oUser->setDepUid( '' ); $oUser->setDepUid( '' );

10
workflow/engine/methods/users/users_Ajax.php
View File

@@ -210,17 +210,15 @@ try {
$objectPermision = $doSelectRS->getRow(); $objectPermision = $doSelectRS->getRow();
if (isset($objectPermision["USR_UID"])) { if (isset($objectPermision["USR_UID"])) {
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL); $criteria->add(ProcessPeer::PRO_UID, $objectPermision["PRO_UID"], Criteria::EQUAL);
$criteria->add(ContentPeer::CON_ID, $objectPermision["PRO_UID"], Criteria::EQUAL); $doSelectRS = ProcessPeer::doSelectRS($criteria);
$criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL);
$doSelectRS = ContentPeer::doSelectRS($criteria);
$doSelectRS->setFetchmode(ResultSet::FETCHMODE_ASSOC); $doSelectRS->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$doSelectRS->next(); $doSelectRS->next();
$content = $doSelectRS->getRow(); $content = $doSelectRS->getRow();
echo G::json_encode(array( echo G::json_encode(array(
"status" => 'ERROR', "status" => 'ERROR',
"message" => G::LoadTranslation('ID_USER_CANT_BE_DELETED_FOR_THE_PROCESS', array('processTitle' => isset($content["CON_VALUE"]) ? $content["CON_VALUE"] : $objectPermision['PRO_UID'])) "message" => G::LoadTranslation('ID_USER_CANT_BE_DELETED_FOR_THE_PROCESS', array('processTitle' => isset($content["PRO_TITLE"]) ? $content["PRO_TITLE"] : $objectPermision['PRO_UID']))
)); ));
break; break;
} }

284
workflow/engine/methods/users/users_Edit.php
View File

@@ -1,155 +1,155 @@
<?php <?php
/** /**
* users_Edit.php * users_Edit.php
* *
* ProcessMaker Open Source Edition * ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23 * Copyright (C) 2004 - 2008 Colosa Inc.23
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the * published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version. * License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* For more information, contact Colosa Inc, 2566 Le Jeune Rd., * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com. * Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/ */
try { try {
global $RBAC; global $RBAC;
$RBAC->requirePermissions( 'PM_USERS' ); $RBAC->requirePermissions( 'PM_USERS' );
// deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
// the use of the external xmlfield_Image is highly discouraged // the use of the external xmlfield_Image is highly discouraged
if (! class_exists( 'XmlForm_Field_Image' )) { if (! class_exists( 'XmlForm_Field_Image' )) {
G::LoadClass( 'xmlfield_Image' ); G::LoadClass( 'xmlfield_Image' );
} }
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
require_once 'classes/model/Department.php'; require_once 'classes/model/Department.php';
$_SESSION['CURRENT_USER'] = $_GET['USR_UID']; $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
$oUser = new Users(); $oUser = new Users();
$aFields = $oUser->load( $_GET['USR_UID'] ); $aFields = $oUser->load( $_GET['USR_UID'] );
$aFields['USR_PASSWORD'] = '********'; $aFields['USR_PASSWORD'] = '********';
$aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!'; $aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!';
$aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) ); $aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) );
$aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) ); $aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) );
$aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) ); $aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) );
$aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) ); $aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) );
$aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) ); $aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) );
$aFields['MESSAGE6'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) ); $aFields['MESSAGE6'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) );
$aFields['START_DATE'] = date( 'Y-m-d' ); $aFields['START_DATE'] = date( 'Y-m-d' );
$aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) ); $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
$G_MAIN_MENU = 'processmaker'; $G_MAIN_MENU = 'processmaker';
$G_SUB_MENU = 'users'; $G_SUB_MENU = 'users';
$G_ID_MENU_SELECTED = 'USERS'; $G_ID_MENU_SELECTED = 'USERS';
$G_ID_SUB_MENU_SELECTED = 'USERS'; $G_ID_SUB_MENU_SELECTED = 'USERS';
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
//getting the user and department //getting the user and department
$oDepInfo = new Department(); $oDepInfo = new Department();
$oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] ); $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
if ($oUser != '') if ($oUser != '')
if (get_class( $oUser ) == 'Users') { if (get_class( $oUser ) == 'Users') {
$userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME ); $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME']; $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
try { try {
$depFields = $oDepInfo->load( $userFields['DEP_UID'] ); $depFields = $oDepInfo->Load( $userFields['DEP_UID'] );
$aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")"; $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
} catch (Exception $e) { } catch (Exception $e) {
} }
} else { } else {
$aFields['USR_REPORTS_TO'] = ' '; $aFields['USR_REPORTS_TO'] = ' ';
} }
try { try {
$depFields = $oDepInfo->load( $aFields['DEP_UID'] ); $depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
$aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE']; $aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
} catch (Exception $e) { } catch (Exception $e) {
$oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] ); $oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
$oUser->setDepUid( '' ); $oUser->setDepUid( '' );
$oUser->save(); $oUser->save();
} }
//Load Calendar options and falue for this user //Load Calendar options and falue for this user
G::LoadClass( 'calendar' ); G::LoadClass( 'calendar' );
$calendar = new Calendar(); $calendar = new Calendar();
$calendarObj = $calendar->getCalendarList( true, true ); $calendarObj = $calendar->getCalendarList( true, true );
global $_DBArray; global $_DBArray;
$_DBArray['availableCalendars'] = $calendarObj['array']; $_DBArray['availableCalendars'] = $calendarObj['array'];
$_SESSION['_DBArray'] = $_DBArray; $_SESSION['_DBArray'] = $_DBArray;
$calendarInfo = $calendar->getCalendarFor( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] ); $calendarInfo = $calendar->getCalendarFor( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] );
//If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
$aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : ""; $aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
$aFields['RANDOM'] = rand(); $aFields['RANDOM'] = rand();
///////////////////////// /////////////////////////
//SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
$oCriteria = new Criteria(); $oCriteria = new Criteria();
$oCriteria->addSelectColumn( UsersPeer::USR_UID ); $oCriteria->addSelectColumn( UsersPeer::USR_UID );
$oCriteria->addSelectColumn( UsersPeer::USR_USERNAME ); $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
$oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME ); $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
$oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME ); $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
$oCriteria->addSelectColumn( UsersPeer::USR_EMAIL ); $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
$oCriteria->add( UsersPeer::USR_STATUS, 'ACTIVE' ); $oCriteria->add( UsersPeer::USR_STATUS, 'ACTIVE' );
$oCriteria->add( UsersPeer::USR_UID, $_GET['USR_UID'], Criteria::NOT_EQUAL ); $oCriteria->add( UsersPeer::USR_UID, $_GET['USR_UID'], Criteria::NOT_EQUAL );
$oDataset = UsersPeer::doSelectRS( $oCriteria ); $oDataset = UsersPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
/////////////////////// ///////////////////////
G::loadClass( 'configuration' ); G::loadClass( 'configuration' );
$oConf = new Configurations(); $oConf = new Configurations();
$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
$defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : ''; $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
$aUserInfo = array (); $aUserInfo = array ();
$aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char' $aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char'
); );
while ($oDataset->next()) { while ($oDataset->next()) {
$aRow1 = $oDataset->getRow(); $aRow1 = $oDataset->getRow();
$infoUser = G::getFormatUserList( $defaultOption, $aRow1 ); $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
$aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
); );
} }
//calculating the max upload file size; //calculating the max upload file size;
$POST_MAX_SIZE = ini_get( 'post_max_size' ); $POST_MAX_SIZE = ini_get( 'post_max_size' );
$mul = substr( $POST_MAX_SIZE, - 1 ); $mul = substr( $POST_MAX_SIZE, - 1 );
$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
$postMaxSize = (int) $POST_MAX_SIZE * $mul; $postMaxSize = (int) $POST_MAX_SIZE * $mul;
$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' ); $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
$mul = substr( $UPLOAD_MAX_SIZE, - 1 ); $mul = substr( $UPLOAD_MAX_SIZE, - 1 );
$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
$uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul; $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
if ($postMaxSize < $uploadMaxSize) if ($postMaxSize < $uploadMaxSize)
$uploadMaxSize = $postMaxSize; $uploadMaxSize = $postMaxSize;
$aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") "; $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
global $_DBArray; global $_DBArray;
$_DBArray['aUserInfo'] = $aUserInfo; $_DBArray['aUserInfo'] = $aUserInfo;
$_SESSION['_DBArray'] = $_DBArray; $_SESSION['_DBArray'] = $_DBArray;
if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') { if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') {
//always show this form users_EditRT.xml. //always show this form users_EditRT.xml.
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
} else { } else {
//for users ldap always show this form users_EditLDAP.xml. //for users ldap always show this form users_EditLDAP.xml.
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
} }
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); die( $oException->getMessage() );
} }

11
workflow/engine/methods/users/users_ReassignCases.php
View File

@@ -73,16 +73,9 @@ try {
require_once 'classes/model/AppDelegation.php'; require_once 'classes/model/AppDelegation.php';
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addSelectColumn( 'COUNT(' . AppDelegationPeer::PRO_UID . ') AS CANTITY' ); $oCriteria->addSelectColumn( 'COUNT(' . AppDelegationPeer::PRO_UID . ') AS CANTITY' );
$oCriteria->addAsColumn( 'PRO_TITLE', ContentPeer::CON_VALUE ); $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID);
$aConditions = array ();
$aConditions[] = array (AppDelegationPeer::PRO_UID,ContentPeer::CON_ID
);
$aConditions[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del
);
$aConditions[] = array (ContentPeer::CON_LANG,$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->add( AppDelegationPeer::USR_UID, $_POST['USR_UID'] ); $oCriteria->add( AppDelegationPeer::USR_UID, $_POST['USR_UID'] );
$oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );

24
workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php
View File

@@ -200,24 +200,8 @@ class CaseTracker
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayInputDocumentUid, \Criteria::NOT_IN); $criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayInputDocumentUid, \Criteria::NOT_IN);
@@ -229,7 +213,9 @@ class CaseTracker
if ($row["INP_DOC_TITLE"] . "" == "") { if ($row["INP_DOC_TITLE"] . "" == "") {
//There is no transaltion for this Document name, try to get/regenerate the label //There is no transaltion for this Document name, try to get/regenerate the label
$row["INP_DOC_TITLE"] = \Content::Load("INP_DOC_TITLE", "", $row["INP_DOC_UID"], SYS_LANG); $inputDocument = new \InputDocument();
$inputDocumentObj = $inputDocument->load($row['INP_DOC_UID']);
$row["INP_DOC_TITLE"] = $inputDocumentObj['INP_DOC_TITLE'];
} }
$arrayCaseTrackerObject[] = array( $arrayCaseTrackerObject[] = array(

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

@@ -710,13 +710,8 @@ class Cases
$oCriteria->addSelectColumn( \AppDelegationPeer::TAS_UID ); $oCriteria->addSelectColumn( \AppDelegationPeer::TAS_UID );
$oCriteria->addSelectColumn(\AppDelegationPeer::DEL_INIT_DATE); $oCriteria->addSelectColumn(\AppDelegationPeer::DEL_INIT_DATE);
$oCriteria->addSelectColumn(\AppDelegationPeer::DEL_TASK_DUE_DATE); $oCriteria->addSelectColumn(\AppDelegationPeer::DEL_TASK_DUE_DATE);
$oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' ); $oCriteria->addSelectColumn(\TaskPeer::TAS_TITLE);
$oCriteria->addAlias( "C1", 'CONTENT' ); $oCriteria->addJoin(\AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID);
$tasTitleConds = array ();
$tasTitleConds[] = array (\AppDelegationPeer::TAS_UID,'C1.CON_ID');
$tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del);
$oCriteria->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
$oCriteria->add( \AppDelegationPeer::APP_UID, $applicationUid ); $oCriteria->add( \AppDelegationPeer::APP_UID, $applicationUid );
$oCriteria->add( \AppDelegationPeer::USR_UID, $userUid ); $oCriteria->add( \AppDelegationPeer::USR_UID, $userUid );
$oCriteria->add( \AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' ); $oCriteria->add( \AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
@@ -2071,8 +2066,8 @@ class Cases
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\TaskPeer::TAS_UID); $criteria->addSelectColumn(\TaskPeer::TAS_UID);
$criteria->addAsColumn("TAS_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\TaskPeer::TAS_TITLE);
$criteria->addAsColumn("TAS_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\TaskPeer::TAS_DESCRIPTION);
$criteria->addSelectColumn(\TaskPeer::TAS_START); $criteria->addSelectColumn(\TaskPeer::TAS_START);
$criteria->addSelectColumn(\TaskPeer::TAS_TYPE); $criteria->addSelectColumn(\TaskPeer::TAS_TYPE);
$criteria->addSelectColumn(\TaskPeer::TAS_DERIVATION); $criteria->addSelectColumn(\TaskPeer::TAS_DERIVATION);
@@ -2082,21 +2077,6 @@ class Cases
$criteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
$criteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $criteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\TaskPeer::TAS_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "TAS_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\TaskPeer::TAS_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "TAS_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->addJoin(\TaskPeer::TAS_LAST_ASSIGNED, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN); $criteria->addJoin(\TaskPeer::TAS_LAST_ASSIGNED, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
$criteria->add(\TaskPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\TaskPeer::PRO_UID, $processUid, \Criteria::EQUAL);
@@ -2120,24 +2100,9 @@ class Cases
$criteria2 = new \Criteria("workflow"); $criteria2 = new \Criteria("workflow");
$criteria2->addSelectColumn(\SubProcessPeer::PRO_UID); $criteria2->addSelectColumn(\SubProcessPeer::PRO_UID);
$criteria2->addAsColumn("TAS_TITLE", "CT.CON_VALUE"); $criteria2->addSelectColumn(\TaskPeer::TAS_TITLE);
$criteria2->addAsColumn("TAS_DESCRIPTION", "CD.CON_VALUE"); $criteria2->addSelectColumn(\TaskPeer::TAS_DESCRIPTION);
$criteria2->addJoin(\SubProcessPeer::TAS_PARENT, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN);
$criteria2->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria2->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\SubProcessPeer::TAS_PARENT, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "TAS_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria2->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\SubProcessPeer::TAS_PARENT, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "TAS_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria2->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria2->add(\SubProcessPeer::PRO_PARENT, $processUid); $criteria2->add(\SubProcessPeer::PRO_PARENT, $processUid);
$criteria2->add(\SubProcessPeer::TAS_PARENT, $row["TAS_UID"]); $criteria2->add(\SubProcessPeer::TAS_PARENT, $row["TAS_UID"]);
@@ -2640,7 +2605,9 @@ class Cases
$c = new \Criteria(); $c = new \Criteria();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(\TaskPeer::TAS_UID); $c->addSelectColumn(\TaskPeer::TAS_UID);
$c->addSelectColumn(\TaskPeer::TAS_TITLE);
$c->addSelectColumn(\TaskPeer::PRO_UID); $c->addSelectColumn(\TaskPeer::PRO_UID);
$c->addSelectColumn(\ProcessPeer::PRO_TITLE);
$c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN); $c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN);
$c->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN); $c->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN);
$c->add(\ProcessPeer::PRO_STATUS, 'ACTIVE'); $c->add(\ProcessPeer::PRO_STATUS, 'ACTIVE');
@@ -2648,34 +2615,6 @@ class Cases
$c->add(\TaskUserPeer::USR_UID, $groups, \Criteria::IN); $c->add(\TaskUserPeer::USR_UID, $groups, \Criteria::IN);
$c->add(\TaskPeer::TAS_UID, $bookmark, \Criteria::IN); $c->add(\TaskPeer::TAS_UID, $bookmark, \Criteria::IN);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
$c->addAlias("C1", 'CONTENT');
$tasTitleConds = array();
$tasTitleConds[] = array(\TaskPeer::TAS_UID, 'C1.CON_ID');
$tasTitleConds[] = array(
'C1.CON_CATEGORY',
\DBAdapter::getStringDelimiter() . 'TAS_TITLE' . \DBAdapter::getStringDelimiter()
);
$tasTitleConds[] = array(
'C1.CON_LANG',
\DBAdapter::getStringDelimiter() . SYS_LANG . \DBAdapter::getStringDelimiter()
);
$c->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$c->addAlias("C2", 'CONTENT');
$proTitleConds = array();
$proTitleConds[] = array(\ProcessPeer::PRO_UID, 'C2.CON_ID');
$proTitleConds[] = array(
'C2.CON_CATEGORY',
\DBAdapter::getStringDelimiter() . 'PRO_TITLE' . \DBAdapter::getStringDelimiter()
);
$proTitleConds[] = array(
'C2.CON_LANG',
\DBAdapter::getStringDelimiter() . SYS_LANG . \DBAdapter::getStringDelimiter()
);
$c->addJoinMC( $proTitleConds, \Criteria::LEFT_JOIN );
if ($typeView == 'category') { if ($typeView == 'category') {
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY'); $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME'); $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');

15
workflow/engine/src/ProcessMaker/BusinessModel/Department.php
View File

@@ -22,25 +22,16 @@ class Department
public function existsTitle($departmentTitle, $departmentUidExclude = "") public function existsTitle($departmentTitle, $departmentUidExclude = "")
{ {
try { try {
$delimiter = \DBAdapter::getStringDelimiter();
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\DepartmentPeer::DEP_UID); $criteria->addSelectColumn(\DepartmentPeer::DEP_UID);
$criteria->addSelectColumn(\DepartmentPeer::DEP_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\DepartmentPeer::DEP_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DEPO_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
if ($departmentUidExclude != "") { if ($departmentUidExclude != "") {
$criteria->add(\DepartmentPeer::DEP_UID, $departmentUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\DepartmentPeer::DEP_UID, $departmentUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $departmentTitle, \Criteria::EQUAL); $criteria->add(\DepartmentPeer::DEP_TITLE, $departmentTitle, \Criteria::EQUAL);
$rsCriteria = \DepartmentPeer::doSelectRS($criteria); $rsCriteria = \DepartmentPeer::doSelectRS($criteria);
@@ -476,7 +467,7 @@ class Department
$oDept->updateDepartmentManager( $dep_uid ); $oDept->updateDepartmentManager( $dep_uid );
$oDept = new \Department(); $oDept = new \Department();
$oDept->load($dep_uid); $oDept->Load($dep_uid);
$oDept->addUserToDepartment($dep_uid, $usr_uid, ($oDept->getDepManager() == "")? true : false, false); $oDept->addUserToDepartment($dep_uid, $usr_uid, ($oDept->getDepManager() == "")? true : false, false);
$oDept->updateDepartmentManager($dep_uid); $oDept->updateDepartmentManager($dep_uid);
} }

19
workflow/engine/src/ProcessMaker/BusinessModel/Group.php
View File

@@ -102,20 +102,13 @@ class Group
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\GroupwfPeer::GRP_UID); $criteria->addSelectColumn(\GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(\GroupwfPeer::GRP_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\GroupwfPeer::GRP_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
if ($groupUidExclude != "") { if ($groupUidExclude != "") {
$criteria->add(\GroupwfPeer::GRP_UID, $groupUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\GroupwfPeer::GRP_UID, $groupUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $groupTitle, \Criteria::EQUAL); $criteria->add(\GroupwfPeer::GRP_TITLE, $groupTitle, \Criteria::EQUAL);
$rsCriteria = \GroupwfPeer::doSelectRS($criteria); $rsCriteria = \GroupwfPeer::doSelectRS($criteria);
@@ -314,14 +307,10 @@ class Group
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\GroupwfPeer::GRP_UID); $criteria->addSelectColumn(\GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(\GroupwfPeer::GRP_TITLE);
$criteria->addSelectColumn(\GroupwfPeer::GRP_STATUS); $criteria->addSelectColumn(\GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(\GroupwfPeer::GRP_LDAP_DN); $criteria->addSelectColumn(\GroupwfPeer::GRP_LDAP_DN);
$criteria->addSelectColumn(\GroupwfPeer::GRP_UX); $criteria->addSelectColumn(\GroupwfPeer::GRP_UX);
$criteria->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
$criteria->addJoin(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN);
$criteria->add(\ContentPeer::CON_CATEGORY, "GRP_TITLE", \Criteria::EQUAL);
$criteria->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL);
return $criteria; return $criteria;
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
@@ -508,7 +497,7 @@ class Group
$search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""]; $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
$criteria->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE); $criteria->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
} }
//Number records total //Number records total

34
workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
View File

@@ -110,22 +110,14 @@ class InputDocument
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
if ($inputDocumentUidExclude != "") { if ($inputDocumentUidExclude != "") {
$criteria->add(\InputDocumentPeer::INP_DOC_UID, $inputDocumentUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\InputDocumentPeer::INP_DOC_UID, $inputDocumentUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $inputDocumentTitle, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::INP_DOC_TITLE, $inputDocumentTitle, \Criteria::EQUAL);
$rsCriteria = \InputDocumentPeer::doSelectRS($criteria); $rsCriteria = \InputDocumentPeer::doSelectRS($criteria);
@@ -461,13 +453,11 @@ class InputDocument
public function getInputDocumentCriteria() public function getInputDocumentCriteria()
{ {
try { try {
$delimiter = \DBAdapter::getStringDelimiter();
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_FORM_NEEDED); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_FORM_NEEDED);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_ORIGINAL); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_ORIGINAL);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_PUBLISHED); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_PUBLISHED);
@@ -477,22 +467,6 @@ class InputDocument
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TYPE_FILE); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TYPE_FILE);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
return $criteria; return $criteria;
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;

80
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -176,7 +176,6 @@ class Light
public function getTransferHistoryCriteria($sAppUid) public function getTransferHistoryCriteria($sAppUid)
{ {
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->addAsColumn('TAS_TITLE', 'TAS_TITLE.CON_VALUE');
$c->addSelectColumn(UsersPeer::USR_FIRSTNAME); $c->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$c->addSelectColumn(UsersPeer::USR_LASTNAME); $c->addSelectColumn(UsersPeer::USR_LASTNAME);
$c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE); $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -200,6 +199,7 @@ class Light
$c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE); $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
$c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE); $c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE);
$c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE); $c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE);
$c->addSelectColumn(\TaskPeer::TAS_TITLE);
//APP_DELEGATION LEFT JOIN USERS //APP_DELEGATION LEFT JOIN USERS
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
@@ -212,14 +212,8 @@ class Light
$app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID); $app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID);
$c->addJoinMC($app, Criteria::LEFT_JOIN); $c->addJoinMC($app, Criteria::LEFT_JOIN);
//LEFT JOIN CONTENT TAS_TITLE //LEFT JOIN TASK TAS_TITLE
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addJoin(AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$del = \DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$appTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$appTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
//WHERE //WHERE
$c->add(AppDelegationPeer::APP_UID, $sAppUid); $c->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -320,46 +314,31 @@ class Light
$oContent = new \Content(); $oContent = new \Content();
///we are looking for a pro title for this process $sproUid ///we are looking for a pro title for this process $sproUid
$oCriteria = new \Criteria( 'workflow' ); $oCriteria = new \Criteria( 'workflow' );
$oCriteria->add( \ContentPeer::CON_CATEGORY, 'PRO_TITLE' ); $oCriteria->add(\ProcessPeer::PRO_UID, $sproUid);
$oCriteria->add( \ContentPeer::CON_LANG, 'en' ); $oDataset = \ProcessPeer::doSelectRS( $oCriteria );
$oCriteria->add( \ContentPeer::CON_ID, $sproUid ); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset = \ContentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
if (! is_array( $aRow )) { if (!is_array($aRow)) {
$oC = new \Criteria('workflow');
$oC = new \Criteria( 'workflow' ); $oC->addSelectColumn(\TaskPeer::TAS_UID);
$oC->addSelectColumn( \TaskPeer::TAS_UID ); $oC->addSelectColumn(\TaskPeer::TAS_TITLE);
$oC->add( \TaskPeer::PRO_UID, $sproUid ); $oC->add(\TaskPeer::PRO_UID, $sproUid);
$oDataset1 = \TaskPeer::doSelectRS( $oC ); $oDataset1 = \TaskPeer::doSelectRS($oC);
$oDataset1->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); $oDataset1->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($oDataset1->next()) { while ($oDataset1->next()) {
$aRow1 = $oDataset1->getRow(); $aRow1 = $oDataset1->getRow();
\Content::insertContent('TAS_TITLE', '', $aRow1['TAS_UID'], 'en', $aRow1['TAS_TITLE']);
$oCriteria1 = new \Criteria( 'workflow' );
$oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE' );
$oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria1->add( ContentPeer::CON_ID, $aRow1['TAS_UID'] );
$oDataset2 = ContentPeer::doSelectRS( $oCriteria1 );
$oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset2->next();
$aRow2 = $oDataset2->getRow();
Content::insertContent( 'TAS_TITLE', '', $aRow2['CON_ID'], 'en', $aRow2['CON_VALUE'] );
} }
$oC2 = new Criteria( 'workflow' ); $oC2 = new Criteria('workflow');
$oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' ); $oC2->addSelectColumn(\ProcessPeer::PRO_UID);
$oC2->add( ContentPeer::CON_LANG, SYS_LANG ); $oC2->addSelectColumn(\ProcessPeer::PRO_TITLE);
$oC2->add( ContentPeer::CON_ID, $sproUid ); $oC2->add(\ProcessPeer::PRO_UID, $sproUid);
$oDataset3 = ContentPeer::doSelectRS( $oC2 ); $oDataset3 = \ProcessPeer::doSelectRS($oC2);
$oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset3->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset3->next(); $oDataset3->next();
$aRow3 = $oDataset3->getRow(); $aRow3 = $oDataset3->getRow();
\Content::insertContent('PRO_TITLE', '', $aRow3['PRO_UID'], 'en', $aRow3['PRO_TITLE']);
Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] );
} }
return 1; return 1;
@@ -1098,26 +1077,19 @@ class Light
$cProcess = new Criteria( 'workflow' ); $cProcess = new Criteria( 'workflow' );
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn( \ProcessPeer::PRO_UID ); $cProcess->addSelectColumn( \ProcessPeer::PRO_UID );
$cProcess->addSelectColumn( \ContentPeer::CON_VALUE ); $cProcess->addSelectColumn( \ProcessPeer::PRO_TITLE );
if ($categoryUid) { if ($categoryUid) {
$cProcess->add( \ProcessPeer::PRO_CATEGORY, $categoryUid ); $cProcess->add( \ProcessPeer::PRO_CATEGORY, $categoryUid );
} }
$del = DBAdapter::getStringDelimiter();
$conds = array ();
$conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID);
$conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del);
$conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del);
$cProcess->addJoinMC( $conds, Criteria::LEFT_JOIN );
$cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' ); $cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' );
$cProcess->addAscendingOrderByColumn(ContentPeer::CON_VALUE); $cProcess->addAscendingOrderByColumn(\ProcessPeer::PRO_TITLE);
$oDataset = ProcessPeer::doSelectRS( $cProcess ); $oDataset = \ProcessPeer::doSelectRS( $cProcess );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$processes[] = array ($aRow['PRO_UID'],$aRow['CON_VALUE'] $processes[] = array ($aRow['PRO_UID'],$aRow['PRO_TITLE']);
);
$oDataset->next(); $oDataset->next();
} }
return print G::json_encode( $processes ); return print G::json_encode( $processes );

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

@@ -129,20 +129,13 @@ class Process
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\ProcessPeer::PRO_UID); $criteria->addSelectColumn(\ProcessPeer::PRO_UID);
$criteria->addSelectColumn(\ProcessPeer::PRO_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\ProcessPeer::PRO_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "PRO_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
if ($processUidExclude != "") { if ($processUidExclude != "") {
$criteria->add(\ProcessPeer::PRO_UID, $processUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\ProcessPeer::PRO_UID, $processUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $processTitle, \Criteria::EQUAL); $criteria->add(\ProcessPeer::PRO_TITLE, $processTitle, \Criteria::EQUAL);
$rsCriteria = \ProcessPeer::doSelectRS($criteria); $rsCriteria = \ProcessPeer::doSelectRS($criteria);
@@ -1463,7 +1456,7 @@ class Process
$criteria = $inputDocument->getInputDocumentCriteria(); $criteria = $inputDocument->getInputDocumentCriteria();
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->addAscendingOrderByColumn("INP_DOC_TITLE"); $criteria->addAscendingOrderByColumn(\InputDocumentPeer::INP_DOC_TITLE);
$rsCriteria = \InputDocumentPeer::doSelectRS($criteria); $rsCriteria = \InputDocumentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);

73
workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
View File

@@ -111,7 +111,7 @@ class ProcessSupervisor
$criteriaGroup = new \Criteria("workflow"); $criteriaGroup = new \Criteria("workflow");
$criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID); $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID);
$criteriaGroup->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE); $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_TITLE);
switch ($option) { switch ($option) {
case "ASSIGNED": case "ASSIGNED":
@@ -122,12 +122,6 @@ class ProcessSupervisor
$arrayCondition[] = array(\GroupwfPeer::GRP_STATUS, $delimiter . "ACTIVE" . $delimiter, \Criteria::EQUAL); $arrayCondition[] = array(\GroupwfPeer::GRP_STATUS, $delimiter . "ACTIVE" . $delimiter, \Criteria::EQUAL);
$criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::EQUAL);
$arrayCondition[] = array(\ContentPeer::CON_CATEGORY, $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array(\ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteriaGroup->add(\ProcessUserPeer::PU_TYPE, "GROUP_SUPERVISOR", \Criteria::EQUAL); $criteriaGroup->add(\ProcessUserPeer::PU_TYPE, "GROUP_SUPERVISOR", \Criteria::EQUAL);
$criteriaGroup->add(\ProcessUserPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteriaGroup->add(\ProcessUserPeer::PRO_UID, $processUid, \Criteria::EQUAL);
break; break;
@@ -145,12 +139,6 @@ class ProcessSupervisor
" . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . " " . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . "
"; ";
$arrayCondition = array();
$arrayCondition[] = array(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::EQUAL);
$arrayCondition[] = array(\ContentPeer::CON_CATEGORY, $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array(\ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteriaGroup->add( $criteriaGroup->add(
$criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_UID, $arrayGroupUid, \Criteria::NOT_IN)->addAnd( $criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_UID, $arrayGroupUid, \Criteria::NOT_IN)->addAnd(
$criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL))->addAnd( $criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL))->addAnd(
@@ -168,7 +156,7 @@ class ProcessSupervisor
$search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""]; $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
$criteriaGroup->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE); $criteriaGroup->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
} }
//Number records total //Number records total
@@ -655,13 +643,7 @@ class ProcessSupervisor
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN); $oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN);
$oDataset = \StepSupervisorPeer::doSelectRS($oCriteria); $oDataset = \StepSupervisorPeer::doSelectRS($oCriteria);
@@ -734,17 +716,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION);
@@ -835,17 +811,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION);
@@ -890,17 +860,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_UID, $sPuiUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID, $sPuiUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
@@ -938,17 +902,10 @@ class ProcessSupervisor
foreach ($oCriteria as $oCriteria => $value) { foreach ($oCriteria as $oCriteria => $value) {
$aUIDS[] = $value["input_doc_uid"]; $aUIDS[] = $value["input_doc_uid"];
} }
$sDelimiter = \DBAdapter::getStringDelimiter();
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN); $oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN);
$oDataset = \StepSupervisorPeer::doSelectRS($oCriteria); $oDataset = \StepSupervisorPeer::doSelectRS($oCriteria);
@@ -1150,17 +1107,11 @@ class ProcessSupervisor
$sDelimiter = \DBAdapter::getStringDelimiter(); $sDelimiter = \DBAdapter::getStringDelimiter();
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
@@ -1185,17 +1136,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');

12
workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php
View File

@@ -21,15 +21,7 @@ class Subprocess
$del = \DBAdapter::getStringDelimiter(); $del = \DBAdapter::getStringDelimiter();
$oCriteria->add(SubProcessPeer::PRO_PARENT, $pro_uid); $oCriteria->add(SubProcessPeer::PRO_PARENT, $pro_uid);
$oCriteria->add(SubProcessPeer::TAS_PARENT, $tas_uid); $oCriteria->add(SubProcessPeer::TAS_PARENT, $tas_uid);
$oCriteria->addJoin(SubProcessPeer::TAS_PARENT, \TaskPeer::TAS_UID);
$oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE');
$oCriteria->addAlias("C1", 'CONTENT');
$tasTitleConds = array();
$tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
$tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
$tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del );
$oCriteria->addJoinMC($tasTitleConds, \Criteria::LEFT_JOIN);
$oDataset = SubProcessPeer::doSelectRS($oCriteria); $oDataset = SubProcessPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -41,7 +33,7 @@ class Subprocess
$response['spr_tas_parent'] = $aRow['tas_parent']; $response['spr_tas_parent'] = $aRow['tas_parent'];
$response['spr_pro'] = $aRow['pro_uid']; $response['spr_pro'] = $aRow['pro_uid'];
$response['spr_tas'] = $aRow['tas_uid']; $response['spr_tas'] = $aRow['tas_uid'];
$response['spr_name'] = $aRow['con_value']; $response['spr_name'] = $aRow['tas_title'];
$response['spr_synchronous'] = $aRow['sp_synchronous']; $response['spr_synchronous'] = $aRow['sp_synchronous'];
$response['spr_variables_out'] = unserialize($aRow['sp_variables_out']); $response['spr_variables_out'] = unserialize($aRow['sp_variables_out']);
if ((int)$response['spr_synchronous'] === 1) { if ((int)$response['spr_synchronous'] === 1) {

46
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -574,24 +574,8 @@ class Task
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayUid, \Criteria::NOT_IN); $criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayUid, \Criteria::NOT_IN);
@@ -603,7 +587,9 @@ class Task
if ($row["INP_DOC_TITLE"] . "" == "") { if ($row["INP_DOC_TITLE"] . "" == "") {
//There is no transaltion for this Document name, try to get/regenerate the label //There is no transaltion for this Document name, try to get/regenerate the label
$row["INP_DOC_TITLE"] = \Content::Load("INP_DOC_TITLE", "", $row["INP_DOC_UID"], SYS_LANG); $oInputDocument = new \InputDocument;
$aRow = $oInputDocument->load($row['INP_DOC_UID']);
$row['INP_DOC_TITLE'] = $aRow['INP_DOC_TITLE'];
} }
$arraydbStep[] = array( $arraydbStep[] = array(
@@ -909,7 +895,7 @@ class Task
$criteriaGroup = new \Criteria("workflow"); $criteriaGroup = new \Criteria("workflow");
$criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID); $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID);
$criteriaGroup->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE); $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_TITLE);
switch ($option) { switch ($option) {
case "ASSIGNEE": case "ASSIGNEE":
@@ -923,10 +909,6 @@ class Task
break; break;
} }
$criteriaGroup->addJoin(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN);
$criteriaGroup->add(\ContentPeer::CON_CATEGORY, "GRP_TITLE", \Criteria::EQUAL);
$criteriaGroup->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL);
if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]) && trim($arrayFilterData["filter"]) != "") { if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]) && trim($arrayFilterData["filter"]) != "") {
$arraySearch = array( $arraySearch = array(
"" => "%" . $arrayFilterData["filter"] . "%", "" => "%" . $arrayFilterData["filter"] . "%",
@@ -936,7 +918,7 @@ class Task
$search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""]; $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
$criteriaGroup->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE); $criteriaGroup->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
} }
$criteriaGroup->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL); $criteriaGroup->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL);
@@ -1212,12 +1194,9 @@ class Task
$criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
$criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UX ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
$criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE ); $criteria->addSelectColumn( \GroupwfPeer::GRP_TITLE );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID); $criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); $criteria->addAscendingOrderByColumn( \GroupwfPeer::GRP_TITLE );
$oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset = \GroupwfPeer::doSelectRS( $criteria );
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$groups = array (); $groups = array ();
@@ -1434,14 +1413,11 @@ class Task
} }
$criteria = new \Criteria( 'workflow' ); $criteria = new \Criteria( 'workflow' );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
$criteria->addSelectColumn( \GroupwfPeer::GRP_TITLE );
$criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UX ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
$criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID); $criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); $criteria->addAscendingOrderByColumn( \GroupwfPeer::GRP_TITLE );
$oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset = \GroupwfPeer::doSelectRS( $criteria );
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$groups = array (); $groups = array ();