HOR-1328 Agregar los campos que se guardan en la tabla CONTENT relacionados a la tabla TASK
pmfunction change content by task remove lang in pmfunction add languaje by compatibility
This commit is contained in:
@@ -199,23 +199,13 @@ class Cases
|
||||
|
||||
$c = new Criteria();
|
||||
$c->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$c->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$c->addSelectColumn(TaskPeer::PRO_UID);
|
||||
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
|
||||
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
|
||||
$c->addAlias('C1', '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);
|
||||
$c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
|
||||
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
|
||||
$c->addAscendingOrderByColumn('PRO_TITLE');
|
||||
$c->addAscendingOrderByColumn('TAS_TITLE');
|
||||
$c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
|
||||
$rs = TaskPeer::doSelectRS($c);
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$rs->next();
|
||||
@@ -294,10 +284,9 @@ class Cases
|
||||
|
||||
$c = new Criteria();
|
||||
$c->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$c->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$c->addSelectColumn(TaskPeer::PRO_UID);
|
||||
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
|
||||
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
|
||||
$c->addAlias('C1', 'CONTENT');
|
||||
if ($typeView == 'category') {
|
||||
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
|
||||
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
|
||||
@@ -311,15 +300,6 @@ class Cases
|
||||
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
|
||||
}
|
||||
|
||||
$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);
|
||||
$c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
|
||||
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
|
||||
|
||||
@@ -428,19 +408,9 @@ class Cases
|
||||
|
||||
$c = new Criteria();
|
||||
$c->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$c->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$c->addSelectColumn(TaskPeer::PRO_UID);
|
||||
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
|
||||
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
|
||||
$c->addAlias('C1', '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);
|
||||
$c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
|
||||
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
|
||||
$c->addAscendingOrderByColumn('PRO_TITLE');
|
||||
@@ -722,35 +692,23 @@ class Cases
|
||||
for ($r = count($currentDelegations) - 1; $r >= 0; $r--) {
|
||||
$c = new Criteria();
|
||||
$c->clearSelectColumns();
|
||||
$c->addSelectColumn(ContentPeer::CON_CATEGORY);
|
||||
$c->addSelectColumn(ContentPeer::CON_VALUE);
|
||||
$c->add(ContentPeer::CON_ID, $currentDelegations[$r]->getTasUid());
|
||||
$c->add(ContentPeer::CON_LANG, $lang);
|
||||
$c->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
|
||||
$c->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
|
||||
$c->add(TaskPeer::TAS_UID, $currentDelegations[$r]->getTasUid());
|
||||
$rs = TaskPeer::doSelectRS($c);
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$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();
|
||||
while ($rs->next()) {
|
||||
$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;
|
||||
@@ -789,71 +747,51 @@ class Cases
|
||||
while (is_array($rowCri)) {
|
||||
$c = new Criteria();
|
||||
$c->clearSelectColumns();
|
||||
$c->addSelectColumn(ContentPeer::CON_CATEGORY);
|
||||
$c->addSelectColumn(ContentPeer::CON_VALUE);
|
||||
$c->add(ContentPeer::CON_ID, $rowCri['TAS_UID']);
|
||||
$c->add(ContentPeer::CON_LANG, $lang);
|
||||
$c->add(ContentPeer::CON_CATEGORY, array("TAS_DEF_TITLE", "TAS_DEF_DESCRIPTION"), Criteria::IN);
|
||||
$c->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
|
||||
$c->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
|
||||
$c->add(TaskPeer::TAS_UID, $rowCri['TAS_UID']);
|
||||
$rs = TaskPeer::doSelectRS($c);
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
while ($rs->next()) {
|
||||
$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']) {
|
||||
case 'TAS_DEF_TITLE':
|
||||
if ($bUpdatedDefTitle) {
|
||||
break;
|
||||
}
|
||||
$tasDefTitle = trim($row['CON_VALUE']);
|
||||
if ($tasDefTitle != '') {
|
||||
$newAppTitle = G::replaceDataField($tasDefTitle, $aAppData);
|
||||
$res['APP_TITLE'] = $newAppTitle;
|
||||
if (isset($fields['APP_TITLE']) && $fields['APP_TITLE'] == $newAppTitle) {
|
||||
break;
|
||||
}
|
||||
$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);
|
||||
|
||||
// update set
|
||||
$c2 = new Criteria('workflow');
|
||||
$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;
|
||||
// update set
|
||||
$c2 = new Criteria('workflow');
|
||||
$c2->add(ContentPeer::CON_VALUE, $newAppTitle);
|
||||
BasePeer::doUpdate($c1, $c2, $con);
|
||||
}
|
||||
}
|
||||
$tasDefDescription = trim($row['TAS_DEF_DESCRIPTION']);
|
||||
if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
|
||||
$newAppDescription = G::replaceDataField($tasDefDescription, $aAppData);
|
||||
$res['APP_DESCRIPTION'] = $newAppDescription;
|
||||
if (!(isset($fields['APP_DESCRIPTION']) && $fields['APP_DESCRIPTION'] == $newAppDescription)) {
|
||||
$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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$rsCri->next();
|
||||
$rowCri = $rsCri->getRow();
|
||||
}
|
||||
@@ -2736,7 +2674,7 @@ class Cases
|
||||
$c->addSelectColumn(ApplicationPeer::APP_STATUS);
|
||||
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
|
||||
$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', "CONCAT(APP_LAST_USER.USR_LASTNAME,
|
||||
@@ -2746,7 +2684,6 @@ class Cases
|
||||
|
||||
$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_LAST_USER", 'USERS');
|
||||
|
||||
@@ -2770,12 +2707,6 @@ class Cases
|
||||
$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(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
|
||||
$prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
|
||||
@@ -2980,11 +2911,10 @@ class Cases
|
||||
$c->addSelectColumn(ApplicationPeer::APP_STATUS);
|
||||
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
|
||||
|
||||
$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(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
@@ -3005,12 +2935,6 @@ class Cases
|
||||
$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::TAS_UID, $aTasks, Criteria::IN);
|
||||
@@ -3147,7 +3071,7 @@ class Cases
|
||||
if ($titles) {
|
||||
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
|
||||
$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(
|
||||
@@ -3156,7 +3080,6 @@ class Cases
|
||||
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_LAST_USER", 'USERS');
|
||||
@@ -3181,12 +3104,6 @@ class Cases
|
||||
$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();
|
||||
@@ -3246,14 +3163,13 @@ class Cases
|
||||
$c->addSelectColumn(ApplicationPeer::APP_STATUS);
|
||||
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
|
||||
$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', "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_LAST_USER", 'USERS');
|
||||
|
||||
@@ -3277,12 +3193,6 @@ class Cases
|
||||
$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(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
|
||||
$prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
|
||||
@@ -6824,7 +6734,7 @@ class Cases
|
||||
$c->addSelectColumn(ApplicationPeer::APP_STATUS);
|
||||
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
|
||||
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
|
||||
$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', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"
|
||||
@@ -6832,7 +6742,6 @@ class Cases
|
||||
|
||||
$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_LAST_USER", 'USERS');
|
||||
|
||||
@@ -6856,12 +6765,6 @@ class Cases
|
||||
$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(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
|
||||
$prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
|
||||
|
||||
@@ -2984,7 +2984,7 @@ function PMFSaveCurrentData ()
|
||||
* @name PMFTasksListByProcessId
|
||||
* @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 | $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
|
||||
*/
|
||||
function PMFTasksListByProcessId($processId, $lang = 'en')
|
||||
@@ -2992,11 +2992,7 @@ function PMFTasksListByProcessId($processId, $lang = 'en')
|
||||
$result = array();
|
||||
$criteria = new Criteria("workflow");
|
||||
$criteria->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
|
||||
$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->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$criteria->add(TaskPeer::PRO_UID, $processId, Criteria::EQUAL);
|
||||
$ds = TaskPeer::doSelectRS($criteria);
|
||||
$ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
@@ -3170,14 +3166,18 @@ function PMFDynaFormFields($dynUid, $appUid = false, $delIndex = 0)
|
||||
* @name PMFGetTaskName
|
||||
* @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 | $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
|
||||
*/
|
||||
function PMFGetTaskName($taskUid, $lang = SYS_LANG) {
|
||||
if (empty($taskUid)) {
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -98,34 +98,29 @@ class processMap
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn(TaskPeer::PRO_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_POSX);
|
||||
$oCriteria->addSelectColumn(TaskPeer::TAS_POSY);
|
||||
$oCriteria->addSelectColumn(TaskPeer::TAS_COLOR);
|
||||
$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);
|
||||
$oDataset = TaskPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
|
||||
while ($aRow1 = $oDataset->getRow()) {
|
||||
$oTask = new StdClass();
|
||||
$oTask = new stdClass();
|
||||
$oTask->uid = $aRow1['TAS_UID'];
|
||||
$oTask->task_type = $aRow1['TAS_TYPE'];
|
||||
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
|
||||
$oTask1 = new Task();
|
||||
$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 {
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$del = DBAdapter::getStringDelimiter();
|
||||
@@ -153,10 +148,10 @@ class processMap
|
||||
}
|
||||
}
|
||||
$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->y = (int) $aRow1['TAS_POSY'];
|
||||
$oTask->derivation = new StdClass();
|
||||
$oTask->derivation = new stdClass();
|
||||
$oTask->derivation->type = '';
|
||||
$oTask->derivation->to = array();
|
||||
$oCriteria = new Criteria('workflow');
|
||||
@@ -189,7 +184,7 @@ class processMap
|
||||
$aRow2['ROU_TYPE'] = 8;
|
||||
break;
|
||||
}
|
||||
$oTo = new StdClass();
|
||||
$oTo = new stdClass();
|
||||
$oTo->task = $aRow2['ROU_NEXT_TASK'];
|
||||
$oTo->condition = $aRow2['ROU_CONDITION'];
|
||||
$oTo->executant = $aRow2['ROU_TO_LAST_USER'];
|
||||
@@ -1356,7 +1351,7 @@ class processMap
|
||||
{
|
||||
try {
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn('TAS_UID');
|
||||
$oCriteria->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
|
||||
$oDataset = TaskPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
@@ -1366,50 +1361,29 @@ class processMap
|
||||
|
||||
while ($oDataset->next()) {
|
||||
$aRow = $oDataset->getRow();
|
||||
|
||||
$aTasks[] = $aRow["TAS_UID"];
|
||||
$iTaskNumber = $iTaskNumber + 1;
|
||||
}
|
||||
|
||||
if ($iTaskNumber > 0) {
|
||||
$criteria = new Criteria("workflow");
|
||||
|
||||
$criteria->addSelectColumn(ContentPeer::CON_LANG);
|
||||
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
|
||||
$criteria->add(ContentPeer::CON_ID, $aTasks, Criteria::IN);
|
||||
$criteria->add(ContentPeer::CON_CATEGORY, "TAS_TITLE");
|
||||
|
||||
$rsSQLCON = ContentPeer::doSelectRS($criteria);
|
||||
$criteria->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$criteria->add(TaskPeer::TAS_UID, $aTasks, Criteria::IN);
|
||||
$rsSQLCON = TaskPeer::doSelectRS($criteria);
|
||||
$rsSQLCON->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
$numMaxLang = 0;
|
||||
$numMax = 0;
|
||||
|
||||
while ($rsSQLCON->next()) {
|
||||
$row = $rsSQLCON->getRow();
|
||||
|
||||
$conLang = $row["CON_LANG"];
|
||||
$conValue = $row["CON_VALUE"];
|
||||
|
||||
$conValue = $row["TAS_TITLE"];
|
||||
if (preg_match("/^\S+\s(\d+)$/", $conValue, $matches)) {
|
||||
$n = intval($matches[1]);
|
||||
|
||||
if ($conLang == SYS_LANG) {
|
||||
if ($n > $numMaxLang) {
|
||||
$numMaxLang = $n;
|
||||
}
|
||||
} else {
|
||||
if ($n > $numMax) {
|
||||
$numMax = $n;
|
||||
}
|
||||
if ($n > $numMax) {
|
||||
$numMax = $n;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($numMaxLang > 0) {
|
||||
$numMax = $numMaxLang;
|
||||
}
|
||||
|
||||
if ($numMax > 0 && $numMax > $iTaskNumber) {
|
||||
$iTaskNumber = $numMax + 1;
|
||||
} else {
|
||||
@@ -1420,7 +1394,7 @@ class processMap
|
||||
}
|
||||
|
||||
$oTask = new Task();
|
||||
$oNewTask = new StdClass();
|
||||
$oNewTask = new stdClass();
|
||||
$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->statusIcons = array();
|
||||
@@ -4781,25 +4755,22 @@ class processMap
|
||||
$c = new Criteria();
|
||||
$c->clearSelectColumns();
|
||||
$c->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$c->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$c->addSelectColumn(TaskPeer::PRO_UID);
|
||||
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
|
||||
$c->add(TaskPeer::TAS_START, 'TRUE');
|
||||
$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);
|
||||
$rs = TaskPeer::doSelectRS($c);
|
||||
$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' );
|
||||
foreach ($tasks as $key => $val) {
|
||||
$tasTitle = Content::load('TAS_TITLE', '', $val['TAS_UID'], SYS_LANG);
|
||||
$proTitle = Content::load('PRO_TITLE', '', $val['PRO_UID'], SYS_LANG);
|
||||
while ($rs->next()) {
|
||||
$row = $rs->getRow();
|
||||
$proTitle = $row['PRO_TITLE'];
|
||||
$tasTitle = $row['TAS_TITLE'];
|
||||
$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;
|
||||
}
|
||||
@@ -6613,19 +6584,13 @@ class processMap
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn(TaskPeer::PRO_UID);
|
||||
$oCriteria->addSelectColumn(TaskPeer::TAS_UID);
|
||||
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
|
||||
$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->addSelectColumn(TaskPeer::TAS_TITLE);
|
||||
$oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
|
||||
$oDataset = TaskPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
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();
|
||||
}
|
||||
$aUsersGroups = array();
|
||||
|
||||
@@ -194,29 +194,17 @@ class Report
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$del = DBAdapter::getStringDelimiter();
|
||||
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
|
||||
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
$oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
$oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
|
||||
$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->addGroupByColumn( AppDelegationPeer::PRO_UID );
|
||||
$oCriteria->addGroupByColumn( 'C.CON_VALUE' );
|
||||
$oCriteria->addGroupByColumn( TaskPeer::TAS_TITLE );
|
||||
|
||||
$oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
@@ -359,25 +347,13 @@ class Report
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$del = DBAdapter::getStringDelimiter();
|
||||
$oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
|
||||
$oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
$oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
$oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
$oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
|
||||
|
||||
$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 ) ) );
|
||||
|
||||
if ($startedby != '') {
|
||||
@@ -387,7 +363,7 @@ class Report
|
||||
$oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID );
|
||||
|
||||
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
|
||||
$oCriteria->addGroupByColumn( 'C.CON_VALUE' );
|
||||
$oCriteria->addGroupByColumn( TaskPeer::TAS_TITLE );
|
||||
|
||||
return $oCriteria;
|
||||
}
|
||||
|
||||
@@ -87,21 +87,16 @@ class Tasks
|
||||
{
|
||||
try {
|
||||
$aTasks = array();
|
||||
$sDelimiter = @DBAdapter::getStringDelimiter();
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
|
||||
$oCriteria->add(TaskPeer::PRO_UID, $sProUid);
|
||||
$aConditions = array();
|
||||
$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);
|
||||
$oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
|
||||
$oDataset = TaskPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
$oTask = new Task();
|
||||
$aTasks[] = $oTask->Load($aRow['TAS_UID']);
|
||||
$aTasks[] = $oTask->load($aRow['TAS_UID']);
|
||||
$oDataset->next();
|
||||
}
|
||||
return $aTasks;
|
||||
@@ -703,6 +698,7 @@ class Tasks
|
||||
try {
|
||||
$aTasks = array();
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
|
||||
$oCriteria->add(TaskPeer::PRO_UID, $sProUid);
|
||||
//$oCriteria->add(TaskPeer::TAS_USER, $sUsrUid);
|
||||
$oCriteria->add(TaskPeer::TAS_START, 'TRUE');
|
||||
@@ -711,7 +707,7 @@ class Tasks
|
||||
$oDataset->next();
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
$oTask = new Task();
|
||||
$aTasks[] = $oTask->Load($aRow['TAS_UID']);
|
||||
$aTasks[] = $oTask->load($aRow['TAS_UID']);
|
||||
$oDataset->next();
|
||||
}
|
||||
return $aTasks;
|
||||
|
||||
@@ -846,7 +846,7 @@ class wsBase
|
||||
public function taskList ($userId)
|
||||
{
|
||||
try {
|
||||
g::loadClass( 'groups' );
|
||||
G::LoadClass( 'groups' );
|
||||
$oGroup = new Groups();
|
||||
$aGroups = $oGroup->getActiveGroupsForAnUser( $userId );
|
||||
|
||||
@@ -855,19 +855,9 @@ class wsBase
|
||||
$del = DBAdapter::getStringDelimiter();
|
||||
$oCriteria->addSelectColumn( TaskPeer::PRO_UID );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_START );
|
||||
$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->addOr( TaskUserPeer::USR_UID, $userId );
|
||||
$oCriteria->addOr( TaskUserPeer::USR_UID, $aGroups, Criteria::IN );
|
||||
@@ -1960,7 +1950,7 @@ class wsBase
|
||||
$pro = $oProcesses->processExists( $processId );
|
||||
|
||||
if (! $pro) {
|
||||
$result = new wsResponse( 11, G::loadTranslation( 'ID_INVALID_PROCESS' ) . " " . $processId );
|
||||
$result = new wsResponse( 11, G::LoadTranslation( 'ID_INVALID_PROCESS' ) . " " . $processId );
|
||||
|
||||
$g->sessionVarRestore();
|
||||
|
||||
@@ -1992,7 +1982,7 @@ class wsBase
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
@@ -2005,7 +1995,7 @@ class wsBase
|
||||
$arrayTaskTypeToExclude = array("START-TIMER-EVENT");
|
||||
|
||||
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();
|
||||
|
||||
@@ -2054,7 +2044,7 @@ class wsBase
|
||||
}
|
||||
|
||||
//Response
|
||||
$result = new wsResponse( 0, G::loadTranslation( 'ID_STARTED_SUCCESSFULLY' ) );
|
||||
$result = new wsResponse( 0, G::LoadTranslation( 'ID_STARTED_SUCCESSFULLY' ) );
|
||||
$result->caseId = $caseId;
|
||||
$result->caseNumber = $caseNr;
|
||||
|
||||
@@ -2201,7 +2191,7 @@ class wsBase
|
||||
$oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -2216,13 +2206,13 @@ class wsBase
|
||||
$appdel = $oAppDel->Load( $caseId, $delIndex );
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -2240,7 +2230,7 @@ class wsBase
|
||||
|
||||
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'] != '') {
|
||||
$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;
|
||||
}
|
||||
@@ -2378,19 +2368,19 @@ class wsBase
|
||||
|
||||
if (isset($derive[1])) {
|
||||
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;
|
||||
}
|
||||
} 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;
|
||||
}
|
||||
|
||||
foreach ($derive as $key => $val) {
|
||||
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;
|
||||
}
|
||||
@@ -2536,7 +2526,7 @@ class wsBase
|
||||
$appFields, $nextDelegations, $nextIndex, $delIndex);
|
||||
}
|
||||
} 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
|
||||
|
||||
|
||||
@@ -20,22 +20,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_title = '';
|
||||
protected $tas_title_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_title column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasTitle()
|
||||
public function getTasTitleContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception("Error in getTasTitle, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasTitle($v)
|
||||
public function setTasTitleContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_title !== $v || $v === "") {
|
||||
$this->tas_title = $v;
|
||||
if ($this->tas_title_content !== $v || $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;
|
||||
}
|
||||
@@ -68,22 +68,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_description = '';
|
||||
protected $tas_description_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_description column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasDescription()
|
||||
public function getTasDescriptionContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception( "Error in getTasDescription, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasDescription($v)
|
||||
public function setTasDescriptionContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_description !== $v || $v === "") {
|
||||
$this->tas_description = $v;
|
||||
if ($this->tas_description_content !== $v || $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;
|
||||
}
|
||||
@@ -116,22 +116,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_def_title = '';
|
||||
protected $tas_def_title_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_def_title column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasDefTitle()
|
||||
public function getTasDefTitleContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception( "Error in getTasDefTitle, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasDefTitle($v)
|
||||
public function setTasDefTitleContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_def_title !== $v || $v === "") {
|
||||
$this->tas_def_title = $v;
|
||||
if ($this->tas_def_title_content !== $v || $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;
|
||||
}
|
||||
@@ -164,22 +164,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_def_description = '';
|
||||
protected $tas_def_description_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_def_description column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasDefDescription()
|
||||
public function getTasDefDescriptionContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception( "Error in getTasDefDescription, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasDefDescription($v)
|
||||
public function setTasDefDescriptionContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_def_description !== $v || $v === "") {
|
||||
$this->tas_def_description = $v;
|
||||
if ($this->tas_def_description_content !== $v || $v === "") {
|
||||
$this->tas_def_description_content = $v;
|
||||
|
||||
$res = Content::addContent('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang, $v);
|
||||
return $res;
|
||||
@@ -211,22 +211,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_def_proc_code = '';
|
||||
protected $tas_def_proc_code_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_def_proc_code column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasDefProcCode()
|
||||
public function getTasDefProcCodeContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception( "Error in getTasDefProcCode, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasDefProcCode($v)
|
||||
public function setTasDefProcCodeContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_def_proc_code !== $v || $v === "") {
|
||||
$this->tas_def_proc_code = $v;
|
||||
if ($this->tas_def_proc_code_content !== $v || $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;
|
||||
}
|
||||
@@ -259,22 +259,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_def_message = '';
|
||||
protected $tas_def_message_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_def_message column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasDefMessage()
|
||||
public function getTasDefMessageContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception( "Error in getTasDefMessage, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasDefMessage($v)
|
||||
public function setTasDefMessageContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_def_message !== $v || $v === "") {
|
||||
$this->tas_def_message = $v;
|
||||
if ($this->tas_def_message_content !== $v || $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;
|
||||
}
|
||||
@@ -306,22 +306,22 @@ class Task extends BaseTask
|
||||
* This value goes in the content table
|
||||
* @var string
|
||||
*/
|
||||
protected $tas_def_subject_message = '';
|
||||
protected $tas_def_subject_message_content = '';
|
||||
|
||||
/**
|
||||
* Get the tas_def_message column value.
|
||||
* @return string
|
||||
*/
|
||||
public function getTasDefSubjectMessage()
|
||||
public function getTasDefSubjectMessageContent()
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
throw (new Exception("Error in getTasDefSubjectMessage, the getTasUid() can't be blank"));
|
||||
}
|
||||
|
||||
$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
|
||||
* @return void
|
||||
*/
|
||||
public function setTasDefSubjectMessage($v)
|
||||
public function setTasDefSubjectMessageContent($v)
|
||||
{
|
||||
if ($this->getTasUid() == "") {
|
||||
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) : '';
|
||||
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
|
||||
|
||||
if ($this->tas_def_subject_message !== $v || $v === "") {
|
||||
$this->tas_def_subject_message = $v;
|
||||
if ($this->tas_def_subject_message_content !== $v || $v === "") {
|
||||
$this->tas_def_subject_message_content = $v;
|
||||
|
||||
$res = Content::addContent('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang, $v);
|
||||
|
||||
@@ -370,6 +370,13 @@ class Task extends BaseTask
|
||||
$con->begin();
|
||||
$this->setProUid($aData['PRO_UID']);
|
||||
$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->setTasDuration("1");
|
||||
$this->setTasDelayType("");
|
||||
@@ -405,16 +412,15 @@ class Task extends BaseTask
|
||||
$this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
|
||||
|
||||
if ($this->validate()) {
|
||||
$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->setTasTitleContent((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: ''));
|
||||
$this->setTasDescriptionContent((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: ''));
|
||||
$this->setTasDefTitleContent("");
|
||||
$this->setTasDefDescriptionContent("");
|
||||
$this->setTasDefProcCodeContent("");
|
||||
$this->setTasDefMessageContent("");
|
||||
$this->setTasDefSubjectMessageContent("");
|
||||
$this->save();
|
||||
$con->commit();
|
||||
|
||||
return $sTaskUID;
|
||||
} else {
|
||||
$con->rollback();
|
||||
@@ -458,19 +464,6 @@ class Task extends BaseTask
|
||||
//Populating attributes
|
||||
$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");
|
||||
$indicator = new indicatorsCalculator();
|
||||
@@ -503,52 +496,36 @@ class Task extends BaseTask
|
||||
$this->validateAssignType($fields,$oldValues);
|
||||
|
||||
if ($this->validate()) {
|
||||
$taskDefTitlePrevious = null;
|
||||
|
||||
$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"];
|
||||
}
|
||||
$taskDefTitlePrevious = $oldValues["TAS_DEF_TITLE"];
|
||||
|
||||
$contentResult = 0;
|
||||
|
||||
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)) {
|
||||
$contentResult += $this->setTasDescription($fields["TAS_DESCRIPTION"]);
|
||||
$contentResult += $this->setTasDescriptionContent($fields["TAS_DESCRIPTION"]);
|
||||
}
|
||||
|
||||
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)) {
|
||||
$contentResult += $this->setTasDefDescription($fields["TAS_DEF_DESCRIPTION"]);
|
||||
$contentResult += $this->setTasDefDescriptionContent($fields["TAS_DEF_DESCRIPTION"]);
|
||||
}
|
||||
|
||||
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)) {
|
||||
$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)) {
|
||||
$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)) {
|
||||
@@ -693,15 +670,15 @@ class Task extends BaseTask
|
||||
$this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
|
||||
|
||||
if ($this->validate()) {
|
||||
$this->setTasTitle((isset($aData['TAS_TITLE'])? $aData['TAS_TITLE'] : ''));
|
||||
$this->setTasDescription((isset($aData['TAS_DESCRIPTION'])? $aData['TAS_DESCRIPTION'] : ''));
|
||||
$this->setTasDefTitle((isset($aData['TAS_DEF_TITLE'])? $aData['TAS_DEF_TITLE'] : ''));
|
||||
$this->setTasDefDescription((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
|
||||
$this->setTasDefProcCode((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
|
||||
$this->setTasDefMessage((isset($aData['TAS_DEF_MESSAGE'])? $aData['TAS_DEF_MESSAGE'] : ''));
|
||||
$this->setTasTitleContent((isset($aData['TAS_TITLE'])? $aData['TAS_TITLE'] : ''));
|
||||
$this->setTasDescriptionContent((isset($aData['TAS_DESCRIPTION'])? $aData['TAS_DESCRIPTION'] : ''));
|
||||
$this->setTasDefTitleContent((isset($aData['TAS_DEF_TITLE'])? $aData['TAS_DEF_TITLE'] : ''));
|
||||
$this->setTasDefDescriptionContent((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
|
||||
$this->setTasDefProcCodeContent((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
|
||||
$this->setTasDefMessageContent((isset($aData['TAS_DEF_MESSAGE'])? $aData['TAS_DEF_MESSAGE'] : ''));
|
||||
|
||||
$strAux = isset($aData['TAS_DEF_SUBJECT_MESSAGE'])? $aData['TAS_DEF_SUBJECT_MESSAGE'] : '';
|
||||
$this->setTasDefSubjectMessage($strAux);
|
||||
$this->setTasDefSubjectMessageContent($strAux);
|
||||
|
||||
$this->save();
|
||||
$con->commit();
|
||||
|
||||
@@ -69,6 +69,20 @@ class TaskMapBuilder
|
||||
|
||||
$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_DURATION', 'TasDuration', 'double', CreoleTypes::DOUBLE, true, null);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,7 +25,7 @@ abstract class BaseTaskPeer
|
||||
const CLASS_DEFAULT = 'classes.model.Task';
|
||||
|
||||
/** The total number of columns. */
|
||||
const NUM_COLUMNS = 47;
|
||||
const NUM_COLUMNS = 54;
|
||||
|
||||
/** The number of lazy-loaded columns. */
|
||||
const NUM_LAZY_LOAD_COLUMNS = 0;
|
||||
@@ -37,6 +37,27 @@ abstract class BaseTaskPeer
|
||||
/** the column name for the TAS_UID field */
|
||||
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 */
|
||||
const TAS_TYPE = 'TASK.TAS_TYPE';
|
||||
|
||||
@@ -183,10 +204,10 @@ abstract class BaseTaskPeer
|
||||
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
|
||||
*/
|
||||
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_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_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_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_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_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_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, 47, 48, 49, 50, 51, 52, 53, )
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -196,10 +217,10 @@ abstract class BaseTaskPeer
|
||||
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
|
||||
*/
|
||||
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_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_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_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_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_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_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, 47, 48, 49, 50, 51, 52, 53, )
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -304,6 +325,20 @@ abstract class BaseTaskPeer
|
||||
|
||||
$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_DURATION);
|
||||
|
||||
@@ -1251,6 +1251,15 @@
|
||||
</vendor>
|
||||
<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_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_DURATION" type="DOUBLE" required="true" default="0"/>
|
||||
<column name="TAS_DELAY_TYPE" type="VARCHAR" size="30" required="true" default=""/>
|
||||
|
||||
@@ -601,6 +601,13 @@ CREATE TABLE `TASK`
|
||||
(
|
||||
`PRO_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_DURATION` DOUBLE default 0 NOT NULL,
|
||||
`TAS_DELAY_TYPE` VARCHAR(30) default '' NOT NULL,
|
||||
|
||||
@@ -19,10 +19,8 @@ $usrUid = $_SESSION["USER_LOGGED"];
|
||||
$oCriteria = new Criteria("workflow");
|
||||
$oCriteria->addSelectColumn("*");
|
||||
$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->addAnd(ContentPeer::CON_CATEGORY, "TAS_TITLE");
|
||||
$oCriteria->addAnd(ContentPeer::CON_LANG, "en");
|
||||
|
||||
$params = array(); //This will be filled with the parameters
|
||||
$sql = BasePeer::createSelectSql($oCriteria, $params);
|
||||
|
||||
@@ -183,34 +183,25 @@ function lookinginforContentProcess ($sproUid)
|
||||
|
||||
$oC = new Criteria( 'workflow' );
|
||||
$oC->addSelectColumn( TaskPeer::TAS_UID );
|
||||
$oC->addSelectColumn( TaskPeer::TAS_TITLE );
|
||||
$oC->add( TaskPeer::PRO_UID, $sproUid );
|
||||
$oDataset1 = TaskPeer::doSelectRS( $oC );
|
||||
$oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
|
||||
while ($oDataset1->next()) {
|
||||
$aRow1 = $oDataset1->getRow();
|
||||
|
||||
$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'] );
|
||||
Content::insertContent( 'TAS_TITLE', '', $aRow1['TAS_UID'], 'en', $aRow1['TAS_TITLE'] );
|
||||
}
|
||||
$oC2 = new Criteria( 'workflow' );
|
||||
$oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
|
||||
$oC2->add( ContentPeer::CON_LANG, SYS_LANG );
|
||||
$oC2->add( ContentPeer::CON_ID, $sproUid );
|
||||
$oDataset3 = ContentPeer::doSelectRS( $oC2 );
|
||||
$oC2->addSelectColumn(ProcessPeer::PRO_UID);
|
||||
$oC2->addSelectColumn(ProcessPeer::PRO_TITLE);
|
||||
$oC2->add( ProcessPeer::PRO_UID, $sproUid );
|
||||
$oDataset3 = ProcessPeer::doSelectRS( $oC2 );
|
||||
$oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset3->next();
|
||||
$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;
|
||||
|
||||
@@ -407,14 +407,9 @@ try {
|
||||
$oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
|
||||
$oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE );
|
||||
$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->addSelectColumn( TaskPeer::TAS_TITLE );
|
||||
$oCriteria->add( TaskPeer::STG_UID, $oData->stg_uid );
|
||||
$oCriteria->addAscendingOrderByColumn( 'TAS_TITLE' );
|
||||
$oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
|
||||
global $G_PUBLISH;
|
||||
$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) );
|
||||
@@ -425,15 +420,10 @@ try {
|
||||
require_once 'classes/model/Task.php';
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
|
||||
$oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE );
|
||||
$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->addSelectColumn( TaskPeer::TAS_TITLE );
|
||||
$oCriteria->add( TaskPeer::PRO_UID, $_POST['PRO_UID'] );
|
||||
$oCriteria->add( TaskPeer::STG_UID, '' );
|
||||
$oCriteria->addAscendingOrderByColumn( 'TAS_TITLE' );
|
||||
$oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
|
||||
global $G_PUBLISH;
|
||||
$G_PUBLISH = new Publisher();
|
||||
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_AvailableStageTasks', $oCriteria, array ('STG_UID' => $_POST['STG_UID']) );
|
||||
|
||||
@@ -2071,8 +2071,8 @@ class Cases
|
||||
$criteria = new \Criteria("workflow");
|
||||
|
||||
$criteria->addSelectColumn(\TaskPeer::TAS_UID);
|
||||
$criteria->addAsColumn("TAS_TITLE", "CT.CON_VALUE");
|
||||
$criteria->addAsColumn("TAS_DESCRIPTION", "CD.CON_VALUE");
|
||||
$criteria->addSelectColumn(\TaskPeer::TAS_TITLE);
|
||||
$criteria->addSelectColumn(\TaskPeer::TAS_DESCRIPTION);
|
||||
$criteria->addSelectColumn(\TaskPeer::TAS_START);
|
||||
$criteria->addSelectColumn(\TaskPeer::TAS_TYPE);
|
||||
$criteria->addSelectColumn(\TaskPeer::TAS_DERIVATION);
|
||||
@@ -2082,21 +2082,6 @@ class Cases
|
||||
$criteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
|
||||
$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->add(\TaskPeer::PRO_UID, $processUid, \Criteria::EQUAL);
|
||||
@@ -2120,24 +2105,9 @@ class Cases
|
||||
$criteria2 = new \Criteria("workflow");
|
||||
|
||||
$criteria2->addSelectColumn(\SubProcessPeer::PRO_UID);
|
||||
$criteria2->addAsColumn("TAS_TITLE", "CT.CON_VALUE");
|
||||
$criteria2->addAsColumn("TAS_DESCRIPTION", "CD.CON_VALUE");
|
||||
|
||||
$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->addSelectColumn(\TaskPeer::TAS_TITLE);
|
||||
$criteria2->addSelectColumn(\TaskPeer::TAS_DESCRIPTION);
|
||||
$criteria2->addJoin(\SubProcessPeer::TAS_PARENT, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN);
|
||||
$criteria2->add(\SubProcessPeer::PRO_PARENT, $processUid);
|
||||
$criteria2->add(\SubProcessPeer::TAS_PARENT, $row["TAS_UID"]);
|
||||
|
||||
@@ -2640,6 +2610,7 @@ class Cases
|
||||
$c = new \Criteria();
|
||||
$c->clearSelectColumns();
|
||||
$c->addSelectColumn(\TaskPeer::TAS_UID);
|
||||
$c->addSelectColumn(\TaskPeer::TAS_TITLE);
|
||||
$c->addSelectColumn(\TaskPeer::PRO_UID);
|
||||
$c->addSelectColumn(\ProcessPeer::PRO_TITLE);
|
||||
$c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN);
|
||||
@@ -2649,20 +2620,6 @@ class Cases
|
||||
$c->add(\TaskUserPeer::USR_UID, $groups, \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 );
|
||||
|
||||
if ($typeView == 'category') {
|
||||
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
|
||||
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
|
||||
|
||||
@@ -327,39 +327,26 @@ class Light
|
||||
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next();
|
||||
$aRow = $oDataset->getRow();
|
||||
if (! is_array( $aRow )) {
|
||||
|
||||
$oC = new \Criteria( 'workflow' );
|
||||
$oC->addSelectColumn( \TaskPeer::TAS_UID );
|
||||
$oC->add( \TaskPeer::PRO_UID, $sproUid );
|
||||
$oDataset1 = \TaskPeer::doSelectRS( $oC );
|
||||
$oDataset1->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
|
||||
|
||||
if (!is_array($aRow)) {
|
||||
$oC = new \Criteria('workflow');
|
||||
$oC->addSelectColumn(\TaskPeer::TAS_UID);
|
||||
$oC->addSelectColumn(\TaskPeer::TAS_TITLE);
|
||||
$oC->add(\TaskPeer::PRO_UID, $sproUid);
|
||||
$oDataset1 = \TaskPeer::doSelectRS($oC);
|
||||
$oDataset1->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||
while ($oDataset1->next()) {
|
||||
$aRow1 = $oDataset1->getRow();
|
||||
|
||||
$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'] );
|
||||
\Content::insertContent('TAS_TITLE', '', $aRow1['TAS_UID'], 'en', $aRow1['TAS_TITLE']);
|
||||
}
|
||||
$oC2 = new Criteria( 'workflow' );
|
||||
$oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
|
||||
$oC2->add( ContentPeer::CON_LANG, SYS_LANG );
|
||||
$oC2->add( ContentPeer::CON_ID, $sproUid );
|
||||
$oDataset3 = ContentPeer::doSelectRS( $oC2 );
|
||||
$oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oC2 = new Criteria('workflow');
|
||||
$oC2->addSelectColumn(\ProcessPeer::PRO_UID);
|
||||
$oC2->addSelectColumn(\ProcessPeer::PRO_TITLE);
|
||||
$oC2->add(\ProcessPeer::PRO_UID, $sproUid);
|
||||
$oDataset3 = \ProcessPeer::doSelectRS($oC2);
|
||||
$oDataset3->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset3->next();
|
||||
$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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user