diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index ce3e9b311..dee9b05e1 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -1771,7 +1771,7 @@ class wsBase
$_SESSION['TASK'] = $taskId;
$_SESSION['INDEX'] = $case['INDEX'];
$_SESSION['USER_LOGGED'] = $userId;
- $_SESSION['USR_USERNAME'] = $case['USR_USERNAME'];
+ $_SESSION['USR_USERNAME'] = (isset($case['USR_USERNAME'])) ? $case['USR_USERNAME'] : '';
$_SESSION['STEP_POSITION'] = 0;
$caseId = $case['APPLICATION'];
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index facbfff0f..8590faeab 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -462,6 +462,10 @@ class workspaceTools
//now check if table APPCACHEVIEW exists, and it have correct number of fields, etc.
$res = $appCache->checkAppCacheView();
+ CLI::logging("-> Update DEL_LAST_INDEX field in APP_DELEGATION table\n");
+ //Update APP_DELEGATION.DEL_LAST_INDEX data
+ $res = $appCache->updateAppDelegationDelLastIndex($lang, $checkOnly);
+
CLI::logging( "-> Creating triggers\n" );
//now check if we have the triggers installed
$triggers = array ();
diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index cbc46f7cf..fa5f9d3af 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -725,9 +725,9 @@ class AppCacheView extends BaseAppCacheView
{
$criteria = $this->addPMFieldsToCriteria('sent');
- $criteria->addAsColumn('MAX_DEL_INDEX', 'MAX(' . AppCacheViewPeer::DEL_INDEX . ')');
+ $criteria->addAsColumn("MAX_DEL_INDEX", AppCacheViewPeer::DEL_INDEX);
//$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
- $criteria->addGroupByColumn(AppCacheViewPeer::APP_UID);
+ $criteria->add(AppCacheViewPeer::DEL_LAST_INDEX, 1);
return $criteria;
//return $this->getSearchCriteria(false);
@@ -756,10 +756,10 @@ class AppCacheView extends BaseAppCacheView
public function getSimpleSearchListCriteria()
{
$criteria = $this->addPMFieldsToCriteria('sent');
- $criteria->addAsColumn('DEL_INDEX', 'MAX(' . AppCacheViewPeer::DEL_INDEX . ')');
+ $criteria->addAsColumn("DEL_INDEX", AppCacheViewPeer::DEL_INDEX);
$criteria->add(AppCacheViewPeer::USR_UID, $_SESSION['USER_LOGGED']);
//$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
- $criteria->addGroupByColumn(AppCacheViewPeer::APP_UID);
+ $criteria->add(AppCacheViewPeer::DEL_LAST_INDEX, 1);
return $criteria;
//return $this->getSearchCriteria(false);
@@ -1288,6 +1288,32 @@ class AppCacheView extends BaseAppCacheView
return array('found' => $found, 'count' => $count);
}
+ /**
+ * Update the field APP_DELEGATION.DEL_LAST_INDEX
+ */
+ public function updateAppDelegationDelLastIndex($lang, $recreate = false)
+ {
+ $cnn = Propel::getConnection("workflow");
+ $stmt = $cnn->createStatement();
+
+ $filenameSql = $this->pathToAppCacheFiles . "app_delegation_del_last_index_update.sql";
+
+ if (!file_exists($filenameSql)) {
+ throw (new Exception("file app_delegation_del_last_index_update.sql does not exist"));
+ }
+
+ //Delete trigger
+ $rs = $stmt->executeQuery("DROP TRIGGER IF EXISTS APP_DELEGATION_UPDATE");
+
+ //Update field
+ $rs = $stmt->executeQuery(file_get_contents($filenameSql));
+
+ //Create trigger
+ $res = $this->triggerAppDelegationUpdate($lang, $recreate);
+
+ return "done updated field in table APP_DELEGATION";
+ }
+
/**
* populate (fill) the table APP_CACHE_VIEW
* @return void
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 0c2c0765f..df107d501 100755
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -78,21 +78,28 @@ class AppDelegation extends BaseAppDelegation
throw (new Exception( 'Column "APP_THREAD" cannot be null.' ));
}
- //get max DEL_INDEX SELECT MAX(DEL_INDEX) AS M FROM APP_DELEGATION WHERE APP_UID="'.$Fields['APP_UID'].'"'
- $c = new Criteria();
- $c->clearSelectColumns();
- $c->addSelectColumn( 'MAX(' . AppDelegationPeer::DEL_INDEX . ') ' );
- $c->add( AppDelegationPeer::APP_UID, $sAppUid );
+ //get max DEL_INDEX
+ $criteria = new Criteria('workflow');
+ $criteria->add( AppDelegationPeer::APP_UID, $sAppUid );
+ $criteria->add( AppDelegationPeer::DEL_LAST_INDEX , 1);
+ //$criteria->addDescendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
+ $criteriaIndex = clone $criteria;
- $rs = AppDelegationPeer::doSelectRS( $c );
+ $rs = AppDelegationPeer::doSelectRS( $criteriaIndex );
$rs->next();
$row = $rs->getRow();
- $delIndex = $row[0] + 1;
+ $delIndex = (isset($row['1'])) ? $row['1'] + 1 : 1;
+
+ // update set
+ $criteriaUpdate = new Criteria('workflow');
+ $criteriaUpdate->add(AppDelegationPeer::DEL_LAST_INDEX, 0);
+ BasePeer::doUpdate($criteria, $criteriaUpdate, Propel::getConnection('workflow'));
$this->setAppUid( $sAppUid );
$this->setProUid( $sProUid );
$this->setTasUid( $sTasUid );
$this->setDelIndex( $delIndex );
+ $this->setDelLastIndex(1);
$this->setDelPrevious( $sPrevious == - 1 ? 0 : $sPrevious );
$this->setUsrUid( $sUsrUid );
$this->setDelType( 'NORMAL' );
diff --git a/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php b/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php
index 7da73dfe4..dc603ce8c 100755
--- a/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php
+++ b/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php
@@ -69,6 +69,8 @@ class AppCacheViewMapBuilder
$tMap->addPrimaryKey('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
+ $tMap->addColumn('DEL_LAST_INDEX', 'DelLastIndex', 'int', CreoleTypes::INTEGER, true, null);
+
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 32);
diff --git a/workflow/engine/classes/model/map/AppDelegationMapBuilder.php b/workflow/engine/classes/model/map/AppDelegationMapBuilder.php
index 8b7e39e0e..38bbf4a68 100755
--- a/workflow/engine/classes/model/map/AppDelegationMapBuilder.php
+++ b/workflow/engine/classes/model/map/AppDelegationMapBuilder.php
@@ -71,6 +71,8 @@ class AppDelegationMapBuilder
$tMap->addColumn('DEL_PREVIOUS', 'DelPrevious', 'int', CreoleTypes::INTEGER, true, null);
+ $tMap->addColumn('DEL_LAST_INDEX', 'DelLastIndex', 'int', CreoleTypes::INTEGER, true, null);
+
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
diff --git a/workflow/engine/classes/model/om/BaseAppCacheView.php b/workflow/engine/classes/model/om/BaseAppCacheView.php
index 522fadb98..8430cb5cb 100755
--- a/workflow/engine/classes/model/om/BaseAppCacheView.php
+++ b/workflow/engine/classes/model/om/BaseAppCacheView.php
@@ -39,6 +39,12 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
*/
protected $del_index = 0;
+ /**
+ * The value for the del_last_index field.
+ * @var int
+ */
+ protected $del_last_index = 0;
+
/**
* The value for the app_number field.
* @var int
@@ -243,6 +249,17 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
return $this->del_index;
}
+ /**
+ * Get the [del_last_index] column value.
+ *
+ * @return int
+ */
+ public function getDelLastIndex()
+ {
+
+ return $this->del_last_index;
+ }
+
/**
* Get the [app_number] column value.
*
@@ -742,6 +759,28 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
} // setDelIndex()
+ /**
+ * Set the value of [del_last_index] column.
+ *
+ * @param int $v new value
+ * @return void
+ */
+ public function setDelLastIndex($v)
+ {
+
+ // Since the native PHP type for this column is integer,
+ // we will cast the input value to an int (if it is not).
+ if ($v !== null && !is_int($v) && is_numeric($v)) {
+ $v = (int) $v;
+ }
+
+ if ($this->del_last_index !== $v || $v === 0) {
+ $this->del_last_index = $v;
+ $this->modifiedColumns[] = AppCacheViewPeer::DEL_LAST_INDEX;
+ }
+
+ } // setDelLastIndex()
+
/**
* Set the value of [app_number] column.
*
@@ -1376,68 +1415,70 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
$this->del_index = $rs->getInt($startcol + 1);
- $this->app_number = $rs->getInt($startcol + 2);
+ $this->del_last_index = $rs->getInt($startcol + 2);
- $this->app_status = $rs->getString($startcol + 3);
+ $this->app_number = $rs->getInt($startcol + 3);
- $this->usr_uid = $rs->getString($startcol + 4);
+ $this->app_status = $rs->getString($startcol + 4);
- $this->previous_usr_uid = $rs->getString($startcol + 5);
+ $this->usr_uid = $rs->getString($startcol + 5);
- $this->tas_uid = $rs->getString($startcol + 6);
+ $this->previous_usr_uid = $rs->getString($startcol + 6);
- $this->pro_uid = $rs->getString($startcol + 7);
+ $this->tas_uid = $rs->getString($startcol + 7);
- $this->del_delegate_date = $rs->getTimestamp($startcol + 8, null);
+ $this->pro_uid = $rs->getString($startcol + 8);
- $this->del_init_date = $rs->getTimestamp($startcol + 9, null);
+ $this->del_delegate_date = $rs->getTimestamp($startcol + 9, null);
- $this->del_task_due_date = $rs->getTimestamp($startcol + 10, null);
+ $this->del_init_date = $rs->getTimestamp($startcol + 10, null);
- $this->del_finish_date = $rs->getTimestamp($startcol + 11, null);
+ $this->del_task_due_date = $rs->getTimestamp($startcol + 11, null);
- $this->del_thread_status = $rs->getString($startcol + 12);
+ $this->del_finish_date = $rs->getTimestamp($startcol + 12, null);
- $this->app_thread_status = $rs->getString($startcol + 13);
+ $this->del_thread_status = $rs->getString($startcol + 13);
- $this->app_title = $rs->getString($startcol + 14);
+ $this->app_thread_status = $rs->getString($startcol + 14);
- $this->app_pro_title = $rs->getString($startcol + 15);
+ $this->app_title = $rs->getString($startcol + 15);
- $this->app_tas_title = $rs->getString($startcol + 16);
+ $this->app_pro_title = $rs->getString($startcol + 16);
- $this->app_current_user = $rs->getString($startcol + 17);
+ $this->app_tas_title = $rs->getString($startcol + 17);
- $this->app_del_previous_user = $rs->getString($startcol + 18);
+ $this->app_current_user = $rs->getString($startcol + 18);
- $this->del_priority = $rs->getString($startcol + 19);
+ $this->app_del_previous_user = $rs->getString($startcol + 19);
- $this->del_duration = $rs->getFloat($startcol + 20);
+ $this->del_priority = $rs->getString($startcol + 20);
- $this->del_queue_duration = $rs->getFloat($startcol + 21);
+ $this->del_duration = $rs->getFloat($startcol + 21);
- $this->del_delay_duration = $rs->getFloat($startcol + 22);
+ $this->del_queue_duration = $rs->getFloat($startcol + 22);
- $this->del_started = $rs->getInt($startcol + 23);
+ $this->del_delay_duration = $rs->getFloat($startcol + 23);
- $this->del_finished = $rs->getInt($startcol + 24);
+ $this->del_started = $rs->getInt($startcol + 24);
- $this->del_delayed = $rs->getInt($startcol + 25);
+ $this->del_finished = $rs->getInt($startcol + 25);
- $this->app_create_date = $rs->getTimestamp($startcol + 26, null);
+ $this->del_delayed = $rs->getInt($startcol + 26);
- $this->app_finish_date = $rs->getTimestamp($startcol + 27, null);
+ $this->app_create_date = $rs->getTimestamp($startcol + 27, null);
- $this->app_update_date = $rs->getTimestamp($startcol + 28, null);
+ $this->app_finish_date = $rs->getTimestamp($startcol + 28, null);
- $this->app_overdue_percentage = $rs->getFloat($startcol + 29);
+ $this->app_update_date = $rs->getTimestamp($startcol + 29, null);
+
+ $this->app_overdue_percentage = $rs->getFloat($startcol + 30);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
- return $startcol + 30; // 30 = AppCacheViewPeer::NUM_COLUMNS - AppCacheViewPeer::NUM_LAZY_LOAD_COLUMNS).
+ return $startcol + 31; // 31 = AppCacheViewPeer::NUM_COLUMNS - AppCacheViewPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AppCacheView object", $e);
@@ -1648,87 +1689,90 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
return $this->getDelIndex();
break;
case 2:
- return $this->getAppNumber();
+ return $this->getDelLastIndex();
break;
case 3:
- return $this->getAppStatus();
+ return $this->getAppNumber();
break;
case 4:
- return $this->getUsrUid();
+ return $this->getAppStatus();
break;
case 5:
- return $this->getPreviousUsrUid();
+ return $this->getUsrUid();
break;
case 6:
- return $this->getTasUid();
+ return $this->getPreviousUsrUid();
break;
case 7:
- return $this->getProUid();
+ return $this->getTasUid();
break;
case 8:
- return $this->getDelDelegateDate();
+ return $this->getProUid();
break;
case 9:
- return $this->getDelInitDate();
+ return $this->getDelDelegateDate();
break;
case 10:
- return $this->getDelTaskDueDate();
+ return $this->getDelInitDate();
break;
case 11:
- return $this->getDelFinishDate();
+ return $this->getDelTaskDueDate();
break;
case 12:
- return $this->getDelThreadStatus();
+ return $this->getDelFinishDate();
break;
case 13:
- return $this->getAppThreadStatus();
+ return $this->getDelThreadStatus();
break;
case 14:
- return $this->getAppTitle();
+ return $this->getAppThreadStatus();
break;
case 15:
- return $this->getAppProTitle();
+ return $this->getAppTitle();
break;
case 16:
- return $this->getAppTasTitle();
+ return $this->getAppProTitle();
break;
case 17:
- return $this->getAppCurrentUser();
+ return $this->getAppTasTitle();
break;
case 18:
- return $this->getAppDelPreviousUser();
+ return $this->getAppCurrentUser();
break;
case 19:
- return $this->getDelPriority();
+ return $this->getAppDelPreviousUser();
break;
case 20:
- return $this->getDelDuration();
+ return $this->getDelPriority();
break;
case 21:
- return $this->getDelQueueDuration();
+ return $this->getDelDuration();
break;
case 22:
- return $this->getDelDelayDuration();
+ return $this->getDelQueueDuration();
break;
case 23:
- return $this->getDelStarted();
+ return $this->getDelDelayDuration();
break;
case 24:
- return $this->getDelFinished();
+ return $this->getDelStarted();
break;
case 25:
- return $this->getDelDelayed();
+ return $this->getDelFinished();
break;
case 26:
- return $this->getAppCreateDate();
+ return $this->getDelDelayed();
break;
case 27:
- return $this->getAppFinishDate();
+ return $this->getAppCreateDate();
break;
case 28:
- return $this->getAppUpdateDate();
+ return $this->getAppFinishDate();
break;
case 29:
+ return $this->getAppUpdateDate();
+ break;
+ case 30:
return $this->getAppOverduePercentage();
break;
default:
@@ -1753,34 +1797,35 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
$result = array(
$keys[0] => $this->getAppUid(),
$keys[1] => $this->getDelIndex(),
- $keys[2] => $this->getAppNumber(),
- $keys[3] => $this->getAppStatus(),
- $keys[4] => $this->getUsrUid(),
- $keys[5] => $this->getPreviousUsrUid(),
- $keys[6] => $this->getTasUid(),
- $keys[7] => $this->getProUid(),
- $keys[8] => $this->getDelDelegateDate(),
- $keys[9] => $this->getDelInitDate(),
- $keys[10] => $this->getDelTaskDueDate(),
- $keys[11] => $this->getDelFinishDate(),
- $keys[12] => $this->getDelThreadStatus(),
- $keys[13] => $this->getAppThreadStatus(),
- $keys[14] => $this->getAppTitle(),
- $keys[15] => $this->getAppProTitle(),
- $keys[16] => $this->getAppTasTitle(),
- $keys[17] => $this->getAppCurrentUser(),
- $keys[18] => $this->getAppDelPreviousUser(),
- $keys[19] => $this->getDelPriority(),
- $keys[20] => $this->getDelDuration(),
- $keys[21] => $this->getDelQueueDuration(),
- $keys[22] => $this->getDelDelayDuration(),
- $keys[23] => $this->getDelStarted(),
- $keys[24] => $this->getDelFinished(),
- $keys[25] => $this->getDelDelayed(),
- $keys[26] => $this->getAppCreateDate(),
- $keys[27] => $this->getAppFinishDate(),
- $keys[28] => $this->getAppUpdateDate(),
- $keys[29] => $this->getAppOverduePercentage(),
+ $keys[2] => $this->getDelLastIndex(),
+ $keys[3] => $this->getAppNumber(),
+ $keys[4] => $this->getAppStatus(),
+ $keys[5] => $this->getUsrUid(),
+ $keys[6] => $this->getPreviousUsrUid(),
+ $keys[7] => $this->getTasUid(),
+ $keys[8] => $this->getProUid(),
+ $keys[9] => $this->getDelDelegateDate(),
+ $keys[10] => $this->getDelInitDate(),
+ $keys[11] => $this->getDelTaskDueDate(),
+ $keys[12] => $this->getDelFinishDate(),
+ $keys[13] => $this->getDelThreadStatus(),
+ $keys[14] => $this->getAppThreadStatus(),
+ $keys[15] => $this->getAppTitle(),
+ $keys[16] => $this->getAppProTitle(),
+ $keys[17] => $this->getAppTasTitle(),
+ $keys[18] => $this->getAppCurrentUser(),
+ $keys[19] => $this->getAppDelPreviousUser(),
+ $keys[20] => $this->getDelPriority(),
+ $keys[21] => $this->getDelDuration(),
+ $keys[22] => $this->getDelQueueDuration(),
+ $keys[23] => $this->getDelDelayDuration(),
+ $keys[24] => $this->getDelStarted(),
+ $keys[25] => $this->getDelFinished(),
+ $keys[26] => $this->getDelDelayed(),
+ $keys[27] => $this->getAppCreateDate(),
+ $keys[28] => $this->getAppFinishDate(),
+ $keys[29] => $this->getAppUpdateDate(),
+ $keys[30] => $this->getAppOverduePercentage(),
);
return $result;
}
@@ -1819,87 +1864,90 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
$this->setDelIndex($value);
break;
case 2:
- $this->setAppNumber($value);
+ $this->setDelLastIndex($value);
break;
case 3:
- $this->setAppStatus($value);
+ $this->setAppNumber($value);
break;
case 4:
- $this->setUsrUid($value);
+ $this->setAppStatus($value);
break;
case 5:
- $this->setPreviousUsrUid($value);
+ $this->setUsrUid($value);
break;
case 6:
- $this->setTasUid($value);
+ $this->setPreviousUsrUid($value);
break;
case 7:
- $this->setProUid($value);
+ $this->setTasUid($value);
break;
case 8:
- $this->setDelDelegateDate($value);
+ $this->setProUid($value);
break;
case 9:
- $this->setDelInitDate($value);
+ $this->setDelDelegateDate($value);
break;
case 10:
- $this->setDelTaskDueDate($value);
+ $this->setDelInitDate($value);
break;
case 11:
- $this->setDelFinishDate($value);
+ $this->setDelTaskDueDate($value);
break;
case 12:
- $this->setDelThreadStatus($value);
+ $this->setDelFinishDate($value);
break;
case 13:
- $this->setAppThreadStatus($value);
+ $this->setDelThreadStatus($value);
break;
case 14:
- $this->setAppTitle($value);
+ $this->setAppThreadStatus($value);
break;
case 15:
- $this->setAppProTitle($value);
+ $this->setAppTitle($value);
break;
case 16:
- $this->setAppTasTitle($value);
+ $this->setAppProTitle($value);
break;
case 17:
- $this->setAppCurrentUser($value);
+ $this->setAppTasTitle($value);
break;
case 18:
- $this->setAppDelPreviousUser($value);
+ $this->setAppCurrentUser($value);
break;
case 19:
- $this->setDelPriority($value);
+ $this->setAppDelPreviousUser($value);
break;
case 20:
- $this->setDelDuration($value);
+ $this->setDelPriority($value);
break;
case 21:
- $this->setDelQueueDuration($value);
+ $this->setDelDuration($value);
break;
case 22:
- $this->setDelDelayDuration($value);
+ $this->setDelQueueDuration($value);
break;
case 23:
- $this->setDelStarted($value);
+ $this->setDelDelayDuration($value);
break;
case 24:
- $this->setDelFinished($value);
+ $this->setDelStarted($value);
break;
case 25:
- $this->setDelDelayed($value);
+ $this->setDelFinished($value);
break;
case 26:
- $this->setAppCreateDate($value);
+ $this->setDelDelayed($value);
break;
case 27:
- $this->setAppFinishDate($value);
+ $this->setAppCreateDate($value);
break;
case 28:
- $this->setAppUpdateDate($value);
+ $this->setAppFinishDate($value);
break;
case 29:
+ $this->setAppUpdateDate($value);
+ break;
+ case 30:
$this->setAppOverduePercentage($value);
break;
} // switch()
@@ -1934,115 +1982,119 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
}
if (array_key_exists($keys[2], $arr)) {
- $this->setAppNumber($arr[$keys[2]]);
+ $this->setDelLastIndex($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
- $this->setAppStatus($arr[$keys[3]]);
+ $this->setAppNumber($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
- $this->setUsrUid($arr[$keys[4]]);
+ $this->setAppStatus($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
- $this->setPreviousUsrUid($arr[$keys[5]]);
+ $this->setUsrUid($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
- $this->setTasUid($arr[$keys[6]]);
+ $this->setPreviousUsrUid($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
- $this->setProUid($arr[$keys[7]]);
+ $this->setTasUid($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
- $this->setDelDelegateDate($arr[$keys[8]]);
+ $this->setProUid($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
- $this->setDelInitDate($arr[$keys[9]]);
+ $this->setDelDelegateDate($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
- $this->setDelTaskDueDate($arr[$keys[10]]);
+ $this->setDelInitDate($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
- $this->setDelFinishDate($arr[$keys[11]]);
+ $this->setDelTaskDueDate($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
- $this->setDelThreadStatus($arr[$keys[12]]);
+ $this->setDelFinishDate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
- $this->setAppThreadStatus($arr[$keys[13]]);
+ $this->setDelThreadStatus($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
- $this->setAppTitle($arr[$keys[14]]);
+ $this->setAppThreadStatus($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
- $this->setAppProTitle($arr[$keys[15]]);
+ $this->setAppTitle($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
- $this->setAppTasTitle($arr[$keys[16]]);
+ $this->setAppProTitle($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
- $this->setAppCurrentUser($arr[$keys[17]]);
+ $this->setAppTasTitle($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
- $this->setAppDelPreviousUser($arr[$keys[18]]);
+ $this->setAppCurrentUser($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
- $this->setDelPriority($arr[$keys[19]]);
+ $this->setAppDelPreviousUser($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
- $this->setDelDuration($arr[$keys[20]]);
+ $this->setDelPriority($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
- $this->setDelQueueDuration($arr[$keys[21]]);
+ $this->setDelDuration($arr[$keys[21]]);
}
if (array_key_exists($keys[22], $arr)) {
- $this->setDelDelayDuration($arr[$keys[22]]);
+ $this->setDelQueueDuration($arr[$keys[22]]);
}
if (array_key_exists($keys[23], $arr)) {
- $this->setDelStarted($arr[$keys[23]]);
+ $this->setDelDelayDuration($arr[$keys[23]]);
}
if (array_key_exists($keys[24], $arr)) {
- $this->setDelFinished($arr[$keys[24]]);
+ $this->setDelStarted($arr[$keys[24]]);
}
if (array_key_exists($keys[25], $arr)) {
- $this->setDelDelayed($arr[$keys[25]]);
+ $this->setDelFinished($arr[$keys[25]]);
}
if (array_key_exists($keys[26], $arr)) {
- $this->setAppCreateDate($arr[$keys[26]]);
+ $this->setDelDelayed($arr[$keys[26]]);
}
if (array_key_exists($keys[27], $arr)) {
- $this->setAppFinishDate($arr[$keys[27]]);
+ $this->setAppCreateDate($arr[$keys[27]]);
}
if (array_key_exists($keys[28], $arr)) {
- $this->setAppUpdateDate($arr[$keys[28]]);
+ $this->setAppFinishDate($arr[$keys[28]]);
}
if (array_key_exists($keys[29], $arr)) {
- $this->setAppOverduePercentage($arr[$keys[29]]);
+ $this->setAppUpdateDate($arr[$keys[29]]);
+ }
+
+ if (array_key_exists($keys[30], $arr)) {
+ $this->setAppOverduePercentage($arr[$keys[30]]);
}
}
@@ -2064,6 +2116,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
$criteria->add(AppCacheViewPeer::DEL_INDEX, $this->del_index);
}
+ if ($this->isColumnModified(AppCacheViewPeer::DEL_LAST_INDEX)) {
+ $criteria->add(AppCacheViewPeer::DEL_LAST_INDEX, $this->del_last_index);
+ }
+
if ($this->isColumnModified(AppCacheViewPeer::APP_NUMBER)) {
$criteria->add(AppCacheViewPeer::APP_NUMBER, $this->app_number);
}
@@ -2242,6 +2298,8 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false)
{
+ $copyObj->setDelLastIndex($this->del_last_index);
+
$copyObj->setAppNumber($this->app_number);
$copyObj->setAppStatus($this->app_status);
diff --git a/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php b/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php
index c0bd27f20..4e2bc1d6d 100755
--- a/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php
+++ b/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php
@@ -3,7 +3,7 @@
require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by AppCacheViewPeer::getOMClass()
-//include_once 'classes/model/AppCacheView.php';
+include_once 'classes/model/AppCacheView.php';
/**
* Base static class for performing query and update operations on the 'APP_CACHE_VIEW' table.
@@ -25,7 +25,7 @@ abstract class BaseAppCacheViewPeer
const CLASS_DEFAULT = 'classes.model.AppCacheView';
/** The total number of columns. */
- const NUM_COLUMNS = 30;
+ const NUM_COLUMNS = 31;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,9 @@ abstract class BaseAppCacheViewPeer
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'APP_CACHE_VIEW.DEL_INDEX';
+ /** the column name for the DEL_LAST_INDEX field */
+ const DEL_LAST_INDEX = 'APP_CACHE_VIEW.DEL_LAST_INDEX';
+
/** the column name for the APP_NUMBER field */
const APP_NUMBER = 'APP_CACHE_VIEW.APP_NUMBER';
@@ -132,10 +135,10 @@ abstract class BaseAppCacheViewPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'AppNumber', 'AppStatus', 'UsrUid', 'PreviousUsrUid', 'TasUid', 'ProUid', 'DelDelegateDate', 'DelInitDate', 'DelTaskDueDate', 'DelFinishDate', 'DelThreadStatus', 'AppThreadStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCurrentUser', 'AppDelPreviousUser', 'DelPriority', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'AppCreateDate', 'AppFinishDate', 'AppUpdateDate', 'AppOverduePercentage', ),
- BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX, AppCacheViewPeer::APP_NUMBER, AppCacheViewPeer::APP_STATUS, AppCacheViewPeer::USR_UID, AppCacheViewPeer::PREVIOUS_USR_UID, AppCacheViewPeer::TAS_UID, AppCacheViewPeer::PRO_UID, AppCacheViewPeer::DEL_DELEGATE_DATE, AppCacheViewPeer::DEL_INIT_DATE, AppCacheViewPeer::DEL_TASK_DUE_DATE, AppCacheViewPeer::DEL_FINISH_DATE, AppCacheViewPeer::DEL_THREAD_STATUS, AppCacheViewPeer::APP_THREAD_STATUS, AppCacheViewPeer::APP_TITLE, AppCacheViewPeer::APP_PRO_TITLE, AppCacheViewPeer::APP_TAS_TITLE, AppCacheViewPeer::APP_CURRENT_USER, AppCacheViewPeer::APP_DEL_PREVIOUS_USER, AppCacheViewPeer::DEL_PRIORITY, AppCacheViewPeer::DEL_DURATION, AppCacheViewPeer::DEL_QUEUE_DURATION, AppCacheViewPeer::DEL_DELAY_DURATION, AppCacheViewPeer::DEL_STARTED, AppCacheViewPeer::DEL_FINISHED, AppCacheViewPeer::DEL_DELAYED, AppCacheViewPeer::APP_CREATE_DATE, AppCacheViewPeer::APP_FINISH_DATE, AppCacheViewPeer::APP_UPDATE_DATE, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE, ),
- BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'APP_NUMBER', 'APP_STATUS', 'USR_UID', 'PREVIOUS_USR_UID', 'TAS_UID', 'PRO_UID', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_TASK_DUE_DATE', 'DEL_FINISH_DATE', 'DEL_THREAD_STATUS', 'APP_THREAD_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CURRENT_USER', 'APP_DEL_PREVIOUS_USER', 'DEL_PRIORITY', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_OVERDUE_PERCENTAGE', ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, )
+ BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelLastIndex', 'AppNumber', 'AppStatus', 'UsrUid', 'PreviousUsrUid', 'TasUid', 'ProUid', 'DelDelegateDate', 'DelInitDate', 'DelTaskDueDate', 'DelFinishDate', 'DelThreadStatus', 'AppThreadStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCurrentUser', 'AppDelPreviousUser', 'DelPriority', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'AppCreateDate', 'AppFinishDate', 'AppUpdateDate', 'AppOverduePercentage', ),
+ BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX, AppCacheViewPeer::DEL_LAST_INDEX, AppCacheViewPeer::APP_NUMBER, AppCacheViewPeer::APP_STATUS, AppCacheViewPeer::USR_UID, AppCacheViewPeer::PREVIOUS_USR_UID, AppCacheViewPeer::TAS_UID, AppCacheViewPeer::PRO_UID, AppCacheViewPeer::DEL_DELEGATE_DATE, AppCacheViewPeer::DEL_INIT_DATE, AppCacheViewPeer::DEL_TASK_DUE_DATE, AppCacheViewPeer::DEL_FINISH_DATE, AppCacheViewPeer::DEL_THREAD_STATUS, AppCacheViewPeer::APP_THREAD_STATUS, AppCacheViewPeer::APP_TITLE, AppCacheViewPeer::APP_PRO_TITLE, AppCacheViewPeer::APP_TAS_TITLE, AppCacheViewPeer::APP_CURRENT_USER, AppCacheViewPeer::APP_DEL_PREVIOUS_USER, AppCacheViewPeer::DEL_PRIORITY, AppCacheViewPeer::DEL_DURATION, AppCacheViewPeer::DEL_QUEUE_DURATION, AppCacheViewPeer::DEL_DELAY_DURATION, AppCacheViewPeer::DEL_STARTED, AppCacheViewPeer::DEL_FINISHED, AppCacheViewPeer::DEL_DELAYED, AppCacheViewPeer::APP_CREATE_DATE, AppCacheViewPeer::APP_FINISH_DATE, AppCacheViewPeer::APP_UPDATE_DATE, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE, ),
+ BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_LAST_INDEX', 'APP_NUMBER', 'APP_STATUS', 'USR_UID', 'PREVIOUS_USR_UID', 'TAS_UID', 'PRO_UID', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_TASK_DUE_DATE', 'DEL_FINISH_DATE', 'DEL_THREAD_STATUS', 'APP_THREAD_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CURRENT_USER', 'APP_DEL_PREVIOUS_USER', 'DEL_PRIORITY', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_OVERDUE_PERCENTAGE', ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, )
);
/**
@@ -145,10 +148,10 @@ abstract class BaseAppCacheViewPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'AppNumber' => 2, 'AppStatus' => 3, 'UsrUid' => 4, 'PreviousUsrUid' => 5, 'TasUid' => 6, 'ProUid' => 7, 'DelDelegateDate' => 8, 'DelInitDate' => 9, 'DelTaskDueDate' => 10, 'DelFinishDate' => 11, 'DelThreadStatus' => 12, 'AppThreadStatus' => 13, 'AppTitle' => 14, 'AppProTitle' => 15, 'AppTasTitle' => 16, 'AppCurrentUser' => 17, 'AppDelPreviousUser' => 18, 'DelPriority' => 19, 'DelDuration' => 20, 'DelQueueDuration' => 21, 'DelDelayDuration' => 22, 'DelStarted' => 23, 'DelFinished' => 24, 'DelDelayed' => 25, 'AppCreateDate' => 26, 'AppFinishDate' => 27, 'AppUpdateDate' => 28, 'AppOverduePercentage' => 29, ),
- BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID => 0, AppCacheViewPeer::DEL_INDEX => 1, AppCacheViewPeer::APP_NUMBER => 2, AppCacheViewPeer::APP_STATUS => 3, AppCacheViewPeer::USR_UID => 4, AppCacheViewPeer::PREVIOUS_USR_UID => 5, AppCacheViewPeer::TAS_UID => 6, AppCacheViewPeer::PRO_UID => 7, AppCacheViewPeer::DEL_DELEGATE_DATE => 8, AppCacheViewPeer::DEL_INIT_DATE => 9, AppCacheViewPeer::DEL_TASK_DUE_DATE => 10, AppCacheViewPeer::DEL_FINISH_DATE => 11, AppCacheViewPeer::DEL_THREAD_STATUS => 12, AppCacheViewPeer::APP_THREAD_STATUS => 13, AppCacheViewPeer::APP_TITLE => 14, AppCacheViewPeer::APP_PRO_TITLE => 15, AppCacheViewPeer::APP_TAS_TITLE => 16, AppCacheViewPeer::APP_CURRENT_USER => 17, AppCacheViewPeer::APP_DEL_PREVIOUS_USER => 18, AppCacheViewPeer::DEL_PRIORITY => 19, AppCacheViewPeer::DEL_DURATION => 20, AppCacheViewPeer::DEL_QUEUE_DURATION => 21, AppCacheViewPeer::DEL_DELAY_DURATION => 22, AppCacheViewPeer::DEL_STARTED => 23, AppCacheViewPeer::DEL_FINISHED => 24, AppCacheViewPeer::DEL_DELAYED => 25, AppCacheViewPeer::APP_CREATE_DATE => 26, AppCacheViewPeer::APP_FINISH_DATE => 27, AppCacheViewPeer::APP_UPDATE_DATE => 28, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE => 29, ),
- BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'APP_NUMBER' => 2, 'APP_STATUS' => 3, 'USR_UID' => 4, 'PREVIOUS_USR_UID' => 5, 'TAS_UID' => 6, 'PRO_UID' => 7, 'DEL_DELEGATE_DATE' => 8, 'DEL_INIT_DATE' => 9, 'DEL_TASK_DUE_DATE' => 10, 'DEL_FINISH_DATE' => 11, 'DEL_THREAD_STATUS' => 12, 'APP_THREAD_STATUS' => 13, 'APP_TITLE' => 14, 'APP_PRO_TITLE' => 15, 'APP_TAS_TITLE' => 16, 'APP_CURRENT_USER' => 17, 'APP_DEL_PREVIOUS_USER' => 18, 'DEL_PRIORITY' => 19, 'DEL_DURATION' => 20, 'DEL_QUEUE_DURATION' => 21, 'DEL_DELAY_DURATION' => 22, 'DEL_STARTED' => 23, 'DEL_FINISHED' => 24, 'DEL_DELAYED' => 25, 'APP_CREATE_DATE' => 26, 'APP_FINISH_DATE' => 27, 'APP_UPDATE_DATE' => 28, 'APP_OVERDUE_PERCENTAGE' => 29, ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, )
+ BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelLastIndex' => 2, 'AppNumber' => 3, 'AppStatus' => 4, 'UsrUid' => 5, 'PreviousUsrUid' => 6, 'TasUid' => 7, 'ProUid' => 8, 'DelDelegateDate' => 9, 'DelInitDate' => 10, 'DelTaskDueDate' => 11, 'DelFinishDate' => 12, 'DelThreadStatus' => 13, 'AppThreadStatus' => 14, 'AppTitle' => 15, 'AppProTitle' => 16, 'AppTasTitle' => 17, 'AppCurrentUser' => 18, 'AppDelPreviousUser' => 19, 'DelPriority' => 20, 'DelDuration' => 21, 'DelQueueDuration' => 22, 'DelDelayDuration' => 23, 'DelStarted' => 24, 'DelFinished' => 25, 'DelDelayed' => 26, 'AppCreateDate' => 27, 'AppFinishDate' => 28, 'AppUpdateDate' => 29, 'AppOverduePercentage' => 30, ),
+ BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID => 0, AppCacheViewPeer::DEL_INDEX => 1, AppCacheViewPeer::DEL_LAST_INDEX => 2, AppCacheViewPeer::APP_NUMBER => 3, AppCacheViewPeer::APP_STATUS => 4, AppCacheViewPeer::USR_UID => 5, AppCacheViewPeer::PREVIOUS_USR_UID => 6, AppCacheViewPeer::TAS_UID => 7, AppCacheViewPeer::PRO_UID => 8, AppCacheViewPeer::DEL_DELEGATE_DATE => 9, AppCacheViewPeer::DEL_INIT_DATE => 10, AppCacheViewPeer::DEL_TASK_DUE_DATE => 11, AppCacheViewPeer::DEL_FINISH_DATE => 12, AppCacheViewPeer::DEL_THREAD_STATUS => 13, AppCacheViewPeer::APP_THREAD_STATUS => 14, AppCacheViewPeer::APP_TITLE => 15, AppCacheViewPeer::APP_PRO_TITLE => 16, AppCacheViewPeer::APP_TAS_TITLE => 17, AppCacheViewPeer::APP_CURRENT_USER => 18, AppCacheViewPeer::APP_DEL_PREVIOUS_USER => 19, AppCacheViewPeer::DEL_PRIORITY => 20, AppCacheViewPeer::DEL_DURATION => 21, AppCacheViewPeer::DEL_QUEUE_DURATION => 22, AppCacheViewPeer::DEL_DELAY_DURATION => 23, AppCacheViewPeer::DEL_STARTED => 24, AppCacheViewPeer::DEL_FINISHED => 25, AppCacheViewPeer::DEL_DELAYED => 26, AppCacheViewPeer::APP_CREATE_DATE => 27, AppCacheViewPeer::APP_FINISH_DATE => 28, AppCacheViewPeer::APP_UPDATE_DATE => 29, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE => 30, ),
+ BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_LAST_INDEX' => 2, 'APP_NUMBER' => 3, 'APP_STATUS' => 4, 'USR_UID' => 5, 'PREVIOUS_USR_UID' => 6, 'TAS_UID' => 7, 'PRO_UID' => 8, 'DEL_DELEGATE_DATE' => 9, 'DEL_INIT_DATE' => 10, 'DEL_TASK_DUE_DATE' => 11, 'DEL_FINISH_DATE' => 12, 'DEL_THREAD_STATUS' => 13, 'APP_THREAD_STATUS' => 14, 'APP_TITLE' => 15, 'APP_PRO_TITLE' => 16, 'APP_TAS_TITLE' => 17, 'APP_CURRENT_USER' => 18, 'APP_DEL_PREVIOUS_USER' => 19, 'DEL_PRIORITY' => 20, 'DEL_DURATION' => 21, 'DEL_QUEUE_DURATION' => 22, 'DEL_DELAY_DURATION' => 23, 'DEL_STARTED' => 24, 'DEL_FINISHED' => 25, 'DEL_DELAYED' => 26, 'APP_CREATE_DATE' => 27, 'APP_FINISH_DATE' => 28, 'APP_UPDATE_DATE' => 29, 'APP_OVERDUE_PERCENTAGE' => 30, ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, )
);
/**
@@ -253,6 +256,8 @@ abstract class BaseAppCacheViewPeer
$criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
+ $criteria->addSelectColumn(AppCacheViewPeer::DEL_LAST_INDEX);
+
$criteria->addSelectColumn(AppCacheViewPeer::APP_NUMBER);
$criteria->addSelectColumn(AppCacheViewPeer::APP_STATUS);
diff --git a/workflow/engine/classes/model/om/BaseAppDelegation.php b/workflow/engine/classes/model/om/BaseAppDelegation.php
index 86d4bf651..a44d52d29 100755
--- a/workflow/engine/classes/model/om/BaseAppDelegation.php
+++ b/workflow/engine/classes/model/om/BaseAppDelegation.php
@@ -45,6 +45,12 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
*/
protected $del_previous = 0;
+ /**
+ * The value for the del_last_index field.
+ * @var int
+ */
+ protected $del_last_index = 0;
+
/**
* The value for the pro_uid field.
* @var string
@@ -206,6 +212,17 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
return $this->del_previous;
}
+ /**
+ * Get the [del_last_index] column value.
+ *
+ * @return int
+ */
+ public function getDelLastIndex()
+ {
+
+ return $this->del_last_index;
+ }
+
/**
* Get the [pro_uid] column value.
*
@@ -565,6 +582,28 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
} // setDelPrevious()
+ /**
+ * Set the value of [del_last_index] column.
+ *
+ * @param int $v new value
+ * @return void
+ */
+ public function setDelLastIndex($v)
+ {
+
+ // Since the native PHP type for this column is integer,
+ // we will cast the input value to an int (if it is not).
+ if ($v !== null && !is_int($v) && is_numeric($v)) {
+ $v = (int) $v;
+ }
+
+ if ($this->del_last_index !== $v || $v === 0) {
+ $this->del_last_index = $v;
+ $this->modifiedColumns[] = AppDelegationPeer::DEL_LAST_INDEX;
+ }
+
+ } // setDelLastIndex()
+
/**
* Set the value of [pro_uid] column.
*
@@ -994,50 +1033,52 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
$this->del_previous = $rs->getInt($startcol + 2);
- $this->pro_uid = $rs->getString($startcol + 3);
+ $this->del_last_index = $rs->getInt($startcol + 3);
- $this->tas_uid = $rs->getString($startcol + 4);
+ $this->pro_uid = $rs->getString($startcol + 4);
- $this->usr_uid = $rs->getString($startcol + 5);
+ $this->tas_uid = $rs->getString($startcol + 5);
- $this->del_type = $rs->getString($startcol + 6);
+ $this->usr_uid = $rs->getString($startcol + 6);
- $this->del_thread = $rs->getInt($startcol + 7);
+ $this->del_type = $rs->getString($startcol + 7);
- $this->del_thread_status = $rs->getString($startcol + 8);
+ $this->del_thread = $rs->getInt($startcol + 8);
- $this->del_priority = $rs->getString($startcol + 9);
+ $this->del_thread_status = $rs->getString($startcol + 9);
- $this->del_delegate_date = $rs->getTimestamp($startcol + 10, null);
+ $this->del_priority = $rs->getString($startcol + 10);
- $this->del_init_date = $rs->getTimestamp($startcol + 11, null);
+ $this->del_delegate_date = $rs->getTimestamp($startcol + 11, null);
- $this->del_task_due_date = $rs->getTimestamp($startcol + 12, null);
+ $this->del_init_date = $rs->getTimestamp($startcol + 12, null);
- $this->del_finish_date = $rs->getTimestamp($startcol + 13, null);
+ $this->del_task_due_date = $rs->getTimestamp($startcol + 13, null);
- $this->del_duration = $rs->getFloat($startcol + 14);
+ $this->del_finish_date = $rs->getTimestamp($startcol + 14, null);
- $this->del_queue_duration = $rs->getFloat($startcol + 15);
+ $this->del_duration = $rs->getFloat($startcol + 15);
- $this->del_delay_duration = $rs->getFloat($startcol + 16);
+ $this->del_queue_duration = $rs->getFloat($startcol + 16);
- $this->del_started = $rs->getInt($startcol + 17);
+ $this->del_delay_duration = $rs->getFloat($startcol + 17);
- $this->del_finished = $rs->getInt($startcol + 18);
+ $this->del_started = $rs->getInt($startcol + 18);
- $this->del_delayed = $rs->getInt($startcol + 19);
+ $this->del_finished = $rs->getInt($startcol + 19);
- $this->del_data = $rs->getString($startcol + 20);
+ $this->del_delayed = $rs->getInt($startcol + 20);
- $this->app_overdue_percentage = $rs->getFloat($startcol + 21);
+ $this->del_data = $rs->getString($startcol + 21);
+
+ $this->app_overdue_percentage = $rs->getFloat($startcol + 22);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
- return $startcol + 22; // 22 = AppDelegationPeer::NUM_COLUMNS - AppDelegationPeer::NUM_LAZY_LOAD_COLUMNS).
+ return $startcol + 23; // 23 = AppDelegationPeer::NUM_COLUMNS - AppDelegationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AppDelegation object", $e);
@@ -1251,60 +1292,63 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
return $this->getDelPrevious();
break;
case 3:
- return $this->getProUid();
+ return $this->getDelLastIndex();
break;
case 4:
- return $this->getTasUid();
+ return $this->getProUid();
break;
case 5:
- return $this->getUsrUid();
+ return $this->getTasUid();
break;
case 6:
- return $this->getDelType();
+ return $this->getUsrUid();
break;
case 7:
- return $this->getDelThread();
+ return $this->getDelType();
break;
case 8:
- return $this->getDelThreadStatus();
+ return $this->getDelThread();
break;
case 9:
- return $this->getDelPriority();
+ return $this->getDelThreadStatus();
break;
case 10:
- return $this->getDelDelegateDate();
+ return $this->getDelPriority();
break;
case 11:
- return $this->getDelInitDate();
+ return $this->getDelDelegateDate();
break;
case 12:
- return $this->getDelTaskDueDate();
+ return $this->getDelInitDate();
break;
case 13:
- return $this->getDelFinishDate();
+ return $this->getDelTaskDueDate();
break;
case 14:
- return $this->getDelDuration();
+ return $this->getDelFinishDate();
break;
case 15:
- return $this->getDelQueueDuration();
+ return $this->getDelDuration();
break;
case 16:
- return $this->getDelDelayDuration();
+ return $this->getDelQueueDuration();
break;
case 17:
- return $this->getDelStarted();
+ return $this->getDelDelayDuration();
break;
case 18:
- return $this->getDelFinished();
+ return $this->getDelStarted();
break;
case 19:
- return $this->getDelDelayed();
+ return $this->getDelFinished();
break;
case 20:
- return $this->getDelData();
+ return $this->getDelDelayed();
break;
case 21:
+ return $this->getDelData();
+ break;
+ case 22:
return $this->getAppOverduePercentage();
break;
default:
@@ -1330,25 +1374,26 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
$keys[0] => $this->getAppUid(),
$keys[1] => $this->getDelIndex(),
$keys[2] => $this->getDelPrevious(),
- $keys[3] => $this->getProUid(),
- $keys[4] => $this->getTasUid(),
- $keys[5] => $this->getUsrUid(),
- $keys[6] => $this->getDelType(),
- $keys[7] => $this->getDelThread(),
- $keys[8] => $this->getDelThreadStatus(),
- $keys[9] => $this->getDelPriority(),
- $keys[10] => $this->getDelDelegateDate(),
- $keys[11] => $this->getDelInitDate(),
- $keys[12] => $this->getDelTaskDueDate(),
- $keys[13] => $this->getDelFinishDate(),
- $keys[14] => $this->getDelDuration(),
- $keys[15] => $this->getDelQueueDuration(),
- $keys[16] => $this->getDelDelayDuration(),
- $keys[17] => $this->getDelStarted(),
- $keys[18] => $this->getDelFinished(),
- $keys[19] => $this->getDelDelayed(),
- $keys[20] => $this->getDelData(),
- $keys[21] => $this->getAppOverduePercentage(),
+ $keys[3] => $this->getDelLastIndex(),
+ $keys[4] => $this->getProUid(),
+ $keys[5] => $this->getTasUid(),
+ $keys[6] => $this->getUsrUid(),
+ $keys[7] => $this->getDelType(),
+ $keys[8] => $this->getDelThread(),
+ $keys[9] => $this->getDelThreadStatus(),
+ $keys[10] => $this->getDelPriority(),
+ $keys[11] => $this->getDelDelegateDate(),
+ $keys[12] => $this->getDelInitDate(),
+ $keys[13] => $this->getDelTaskDueDate(),
+ $keys[14] => $this->getDelFinishDate(),
+ $keys[15] => $this->getDelDuration(),
+ $keys[16] => $this->getDelQueueDuration(),
+ $keys[17] => $this->getDelDelayDuration(),
+ $keys[18] => $this->getDelStarted(),
+ $keys[19] => $this->getDelFinished(),
+ $keys[20] => $this->getDelDelayed(),
+ $keys[21] => $this->getDelData(),
+ $keys[22] => $this->getAppOverduePercentage(),
);
return $result;
}
@@ -1390,60 +1435,63 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
$this->setDelPrevious($value);
break;
case 3:
- $this->setProUid($value);
+ $this->setDelLastIndex($value);
break;
case 4:
- $this->setTasUid($value);
+ $this->setProUid($value);
break;
case 5:
- $this->setUsrUid($value);
+ $this->setTasUid($value);
break;
case 6:
- $this->setDelType($value);
+ $this->setUsrUid($value);
break;
case 7:
- $this->setDelThread($value);
+ $this->setDelType($value);
break;
case 8:
- $this->setDelThreadStatus($value);
+ $this->setDelThread($value);
break;
case 9:
- $this->setDelPriority($value);
+ $this->setDelThreadStatus($value);
break;
case 10:
- $this->setDelDelegateDate($value);
+ $this->setDelPriority($value);
break;
case 11:
- $this->setDelInitDate($value);
+ $this->setDelDelegateDate($value);
break;
case 12:
- $this->setDelTaskDueDate($value);
+ $this->setDelInitDate($value);
break;
case 13:
- $this->setDelFinishDate($value);
+ $this->setDelTaskDueDate($value);
break;
case 14:
- $this->setDelDuration($value);
+ $this->setDelFinishDate($value);
break;
case 15:
- $this->setDelQueueDuration($value);
+ $this->setDelDuration($value);
break;
case 16:
- $this->setDelDelayDuration($value);
+ $this->setDelQueueDuration($value);
break;
case 17:
- $this->setDelStarted($value);
+ $this->setDelDelayDuration($value);
break;
case 18:
- $this->setDelFinished($value);
+ $this->setDelStarted($value);
break;
case 19:
- $this->setDelDelayed($value);
+ $this->setDelFinished($value);
break;
case 20:
- $this->setDelData($value);
+ $this->setDelDelayed($value);
break;
case 21:
+ $this->setDelData($value);
+ break;
+ case 22:
$this->setAppOverduePercentage($value);
break;
} // switch()
@@ -1482,79 +1530,83 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
}
if (array_key_exists($keys[3], $arr)) {
- $this->setProUid($arr[$keys[3]]);
+ $this->setDelLastIndex($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
- $this->setTasUid($arr[$keys[4]]);
+ $this->setProUid($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
- $this->setUsrUid($arr[$keys[5]]);
+ $this->setTasUid($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
- $this->setDelType($arr[$keys[6]]);
+ $this->setUsrUid($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
- $this->setDelThread($arr[$keys[7]]);
+ $this->setDelType($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
- $this->setDelThreadStatus($arr[$keys[8]]);
+ $this->setDelThread($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
- $this->setDelPriority($arr[$keys[9]]);
+ $this->setDelThreadStatus($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
- $this->setDelDelegateDate($arr[$keys[10]]);
+ $this->setDelPriority($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
- $this->setDelInitDate($arr[$keys[11]]);
+ $this->setDelDelegateDate($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
- $this->setDelTaskDueDate($arr[$keys[12]]);
+ $this->setDelInitDate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
- $this->setDelFinishDate($arr[$keys[13]]);
+ $this->setDelTaskDueDate($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
- $this->setDelDuration($arr[$keys[14]]);
+ $this->setDelFinishDate($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
- $this->setDelQueueDuration($arr[$keys[15]]);
+ $this->setDelDuration($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
- $this->setDelDelayDuration($arr[$keys[16]]);
+ $this->setDelQueueDuration($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
- $this->setDelStarted($arr[$keys[17]]);
+ $this->setDelDelayDuration($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
- $this->setDelFinished($arr[$keys[18]]);
+ $this->setDelStarted($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
- $this->setDelDelayed($arr[$keys[19]]);
+ $this->setDelFinished($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
- $this->setDelData($arr[$keys[20]]);
+ $this->setDelDelayed($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
- $this->setAppOverduePercentage($arr[$keys[21]]);
+ $this->setDelData($arr[$keys[21]]);
+ }
+
+ if (array_key_exists($keys[22], $arr)) {
+ $this->setAppOverduePercentage($arr[$keys[22]]);
}
}
@@ -1580,6 +1632,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
$criteria->add(AppDelegationPeer::DEL_PREVIOUS, $this->del_previous);
}
+ if ($this->isColumnModified(AppDelegationPeer::DEL_LAST_INDEX)) {
+ $criteria->add(AppDelegationPeer::DEL_LAST_INDEX, $this->del_last_index);
+ }
+
if ($this->isColumnModified(AppDelegationPeer::PRO_UID)) {
$criteria->add(AppDelegationPeer::PRO_UID, $this->pro_uid);
}
@@ -1724,6 +1780,8 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
$copyObj->setDelPrevious($this->del_previous);
+ $copyObj->setDelLastIndex($this->del_last_index);
+
$copyObj->setProUid($this->pro_uid);
$copyObj->setTasUid($this->tas_uid);
diff --git a/workflow/engine/classes/model/om/BaseAppDelegationPeer.php b/workflow/engine/classes/model/om/BaseAppDelegationPeer.php
index 23cac59ad..c05b45440 100755
--- a/workflow/engine/classes/model/om/BaseAppDelegationPeer.php
+++ b/workflow/engine/classes/model/om/BaseAppDelegationPeer.php
@@ -25,7 +25,7 @@ abstract class BaseAppDelegationPeer
const CLASS_DEFAULT = 'classes.model.AppDelegation';
/** The total number of columns. */
- const NUM_COLUMNS = 22;
+ const NUM_COLUMNS = 23;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -40,6 +40,9 @@ abstract class BaseAppDelegationPeer
/** the column name for the DEL_PREVIOUS field */
const DEL_PREVIOUS = 'APP_DELEGATION.DEL_PREVIOUS';
+ /** the column name for the DEL_LAST_INDEX field */
+ const DEL_LAST_INDEX = 'APP_DELEGATION.DEL_LAST_INDEX';
+
/** the column name for the PRO_UID field */
const PRO_UID = 'APP_DELEGATION.PRO_UID';
@@ -108,10 +111,10 @@ abstract class BaseAppDelegationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelPrevious', 'ProUid', 'TasUid', 'UsrUid', 'DelType', 'DelThread', 'DelThreadStatus', 'DelPriority', 'DelDelegateDate', 'DelInitDate', 'DelTaskDueDate', 'DelFinishDate', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'DelData', 'AppOverduePercentage', ),
- BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX, AppDelegationPeer::DEL_PREVIOUS, AppDelegationPeer::PRO_UID, AppDelegationPeer::TAS_UID, AppDelegationPeer::USR_UID, AppDelegationPeer::DEL_TYPE, AppDelegationPeer::DEL_THREAD, AppDelegationPeer::DEL_THREAD_STATUS, AppDelegationPeer::DEL_PRIORITY, AppDelegationPeer::DEL_DELEGATE_DATE, AppDelegationPeer::DEL_INIT_DATE, AppDelegationPeer::DEL_TASK_DUE_DATE, AppDelegationPeer::DEL_FINISH_DATE, AppDelegationPeer::DEL_DURATION, AppDelegationPeer::DEL_QUEUE_DURATION, AppDelegationPeer::DEL_DELAY_DURATION, AppDelegationPeer::DEL_STARTED, AppDelegationPeer::DEL_FINISHED, AppDelegationPeer::DEL_DELAYED, AppDelegationPeer::DEL_DATA, AppDelegationPeer::APP_OVERDUE_PERCENTAGE, ),
- BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_PREVIOUS', 'PRO_UID', 'TAS_UID', 'USR_UID', 'DEL_TYPE', 'DEL_THREAD', 'DEL_THREAD_STATUS', 'DEL_PRIORITY', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_TASK_DUE_DATE', 'DEL_FINISH_DATE', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'DEL_DATA', 'APP_OVERDUE_PERCENTAGE', ),
- 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, )
+ BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelPrevious', 'DelLastIndex', 'ProUid', 'TasUid', 'UsrUid', 'DelType', 'DelThread', 'DelThreadStatus', 'DelPriority', 'DelDelegateDate', 'DelInitDate', 'DelTaskDueDate', 'DelFinishDate', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'DelData', 'AppOverduePercentage', ),
+ BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX, AppDelegationPeer::DEL_PREVIOUS, AppDelegationPeer::DEL_LAST_INDEX, AppDelegationPeer::PRO_UID, AppDelegationPeer::TAS_UID, AppDelegationPeer::USR_UID, AppDelegationPeer::DEL_TYPE, AppDelegationPeer::DEL_THREAD, AppDelegationPeer::DEL_THREAD_STATUS, AppDelegationPeer::DEL_PRIORITY, AppDelegationPeer::DEL_DELEGATE_DATE, AppDelegationPeer::DEL_INIT_DATE, AppDelegationPeer::DEL_TASK_DUE_DATE, AppDelegationPeer::DEL_FINISH_DATE, AppDelegationPeer::DEL_DURATION, AppDelegationPeer::DEL_QUEUE_DURATION, AppDelegationPeer::DEL_DELAY_DURATION, AppDelegationPeer::DEL_STARTED, AppDelegationPeer::DEL_FINISHED, AppDelegationPeer::DEL_DELAYED, AppDelegationPeer::DEL_DATA, AppDelegationPeer::APP_OVERDUE_PERCENTAGE, ),
+ BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_PREVIOUS', 'DEL_LAST_INDEX', 'PRO_UID', 'TAS_UID', 'USR_UID', 'DEL_TYPE', 'DEL_THREAD', 'DEL_THREAD_STATUS', 'DEL_PRIORITY', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_TASK_DUE_DATE', 'DEL_FINISH_DATE', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'DEL_DATA', 'APP_OVERDUE_PERCENTAGE', ),
+ 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, )
);
/**
@@ -121,10 +124,10 @@ abstract class BaseAppDelegationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelPrevious' => 2, 'ProUid' => 3, 'TasUid' => 4, 'UsrUid' => 5, 'DelType' => 6, 'DelThread' => 7, 'DelThreadStatus' => 8, 'DelPriority' => 9, 'DelDelegateDate' => 10, 'DelInitDate' => 11, 'DelTaskDueDate' => 12, 'DelFinishDate' => 13, 'DelDuration' => 14, 'DelQueueDuration' => 15, 'DelDelayDuration' => 16, 'DelStarted' => 17, 'DelFinished' => 18, 'DelDelayed' => 19, 'DelData' => 20, 'AppOverduePercentage' => 21, ),
- BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID => 0, AppDelegationPeer::DEL_INDEX => 1, AppDelegationPeer::DEL_PREVIOUS => 2, AppDelegationPeer::PRO_UID => 3, AppDelegationPeer::TAS_UID => 4, AppDelegationPeer::USR_UID => 5, AppDelegationPeer::DEL_TYPE => 6, AppDelegationPeer::DEL_THREAD => 7, AppDelegationPeer::DEL_THREAD_STATUS => 8, AppDelegationPeer::DEL_PRIORITY => 9, AppDelegationPeer::DEL_DELEGATE_DATE => 10, AppDelegationPeer::DEL_INIT_DATE => 11, AppDelegationPeer::DEL_TASK_DUE_DATE => 12, AppDelegationPeer::DEL_FINISH_DATE => 13, AppDelegationPeer::DEL_DURATION => 14, AppDelegationPeer::DEL_QUEUE_DURATION => 15, AppDelegationPeer::DEL_DELAY_DURATION => 16, AppDelegationPeer::DEL_STARTED => 17, AppDelegationPeer::DEL_FINISHED => 18, AppDelegationPeer::DEL_DELAYED => 19, AppDelegationPeer::DEL_DATA => 20, AppDelegationPeer::APP_OVERDUE_PERCENTAGE => 21, ),
- BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_PREVIOUS' => 2, 'PRO_UID' => 3, 'TAS_UID' => 4, 'USR_UID' => 5, 'DEL_TYPE' => 6, 'DEL_THREAD' => 7, 'DEL_THREAD_STATUS' => 8, 'DEL_PRIORITY' => 9, 'DEL_DELEGATE_DATE' => 10, 'DEL_INIT_DATE' => 11, 'DEL_TASK_DUE_DATE' => 12, 'DEL_FINISH_DATE' => 13, 'DEL_DURATION' => 14, 'DEL_QUEUE_DURATION' => 15, 'DEL_DELAY_DURATION' => 16, 'DEL_STARTED' => 17, 'DEL_FINISHED' => 18, 'DEL_DELAYED' => 19, 'DEL_DATA' => 20, 'APP_OVERDUE_PERCENTAGE' => 21, ),
- 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, )
+ BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelPrevious' => 2, 'DelLastIndex' => 3, 'ProUid' => 4, 'TasUid' => 5, 'UsrUid' => 6, 'DelType' => 7, 'DelThread' => 8, 'DelThreadStatus' => 9, 'DelPriority' => 10, 'DelDelegateDate' => 11, 'DelInitDate' => 12, 'DelTaskDueDate' => 13, 'DelFinishDate' => 14, 'DelDuration' => 15, 'DelQueueDuration' => 16, 'DelDelayDuration' => 17, 'DelStarted' => 18, 'DelFinished' => 19, 'DelDelayed' => 20, 'DelData' => 21, 'AppOverduePercentage' => 22, ),
+ BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID => 0, AppDelegationPeer::DEL_INDEX => 1, AppDelegationPeer::DEL_PREVIOUS => 2, AppDelegationPeer::DEL_LAST_INDEX => 3, AppDelegationPeer::PRO_UID => 4, AppDelegationPeer::TAS_UID => 5, AppDelegationPeer::USR_UID => 6, AppDelegationPeer::DEL_TYPE => 7, AppDelegationPeer::DEL_THREAD => 8, AppDelegationPeer::DEL_THREAD_STATUS => 9, AppDelegationPeer::DEL_PRIORITY => 10, AppDelegationPeer::DEL_DELEGATE_DATE => 11, AppDelegationPeer::DEL_INIT_DATE => 12, AppDelegationPeer::DEL_TASK_DUE_DATE => 13, AppDelegationPeer::DEL_FINISH_DATE => 14, AppDelegationPeer::DEL_DURATION => 15, AppDelegationPeer::DEL_QUEUE_DURATION => 16, AppDelegationPeer::DEL_DELAY_DURATION => 17, AppDelegationPeer::DEL_STARTED => 18, AppDelegationPeer::DEL_FINISHED => 19, AppDelegationPeer::DEL_DELAYED => 20, AppDelegationPeer::DEL_DATA => 21, AppDelegationPeer::APP_OVERDUE_PERCENTAGE => 22, ),
+ BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_PREVIOUS' => 2, 'DEL_LAST_INDEX' => 3, 'PRO_UID' => 4, 'TAS_UID' => 5, 'USR_UID' => 6, 'DEL_TYPE' => 7, 'DEL_THREAD' => 8, 'DEL_THREAD_STATUS' => 9, 'DEL_PRIORITY' => 10, 'DEL_DELEGATE_DATE' => 11, 'DEL_INIT_DATE' => 12, 'DEL_TASK_DUE_DATE' => 13, 'DEL_FINISH_DATE' => 14, 'DEL_DURATION' => 15, 'DEL_QUEUE_DURATION' => 16, 'DEL_DELAY_DURATION' => 17, 'DEL_STARTED' => 18, 'DEL_FINISHED' => 19, 'DEL_DELAYED' => 20, 'DEL_DATA' => 21, 'APP_OVERDUE_PERCENTAGE' => 22, ),
+ 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, )
);
/**
@@ -231,6 +234,8 @@ abstract class BaseAppDelegationPeer
$criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
+ $criteria->addSelectColumn(AppDelegationPeer::DEL_LAST_INDEX);
+
$criteria->addSelectColumn(AppDelegationPeer::PRO_UID);
$criteria->addSelectColumn(AppDelegationPeer::TAS_UID);
diff --git a/workflow/engine/classes/model/om/BaseAppNotes.php b/workflow/engine/classes/model/om/BaseAppNotes.php
index 1c6d6b2a9..0938a9e53 100755
--- a/workflow/engine/classes/model/om/BaseAppNotes.php
+++ b/workflow/engine/classes/model/om/BaseAppNotes.php
@@ -7,7 +7,7 @@ require_once 'propel/om/Persistent.php';
include_once 'propel/util/Criteria.php';
-//include_once 'classes/model/AppNotesPeer.php';
+include_once 'classes/model/AppNotesPeer.php';
/**
* Base class that represents a row from the 'APP_NOTES' table.
diff --git a/workflow/engine/classes/model/om/BaseAppNotesPeer.php b/workflow/engine/classes/model/om/BaseAppNotesPeer.php
index 384cf797e..2efabc48c 100755
--- a/workflow/engine/classes/model/om/BaseAppNotesPeer.php
+++ b/workflow/engine/classes/model/om/BaseAppNotesPeer.php
@@ -3,7 +3,7 @@
require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by AppNotesPeer::getOMClass()
-//include_once 'classes/model/AppNotes.php';
+include_once 'classes/model/AppNotes.php';
/**
* Base static class for performing query and update operations on the 'APP_NOTES' table.
diff --git a/workflow/engine/classes/model/om/BaseCaseSchedulerPeer.php b/workflow/engine/classes/model/om/BaseCaseSchedulerPeer.php
index ee1e52db0..721e92bce 100755
--- a/workflow/engine/classes/model/om/BaseCaseSchedulerPeer.php
+++ b/workflow/engine/classes/model/om/BaseCaseSchedulerPeer.php
@@ -3,7 +3,7 @@
require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by CaseSchedulerPeer::getOMClass()
-//include_once 'classes/model/CaseScheduler.php';
+include_once 'classes/model/CaseScheduler.php';
/**
* Base static class for performing query and update operations on the 'CASE_SCHEDULER' table.
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 075d45641..e7afdeaba 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -111,6 +111,7 @@
+
@@ -2370,6 +2371,7 @@
+
@@ -2407,6 +2409,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index e0a900625..cee6a5a9e 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -786,6 +786,9 @@ class Installer extends Controller
$appCache->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+ //Update APP_DELEGATION.DEL_LAST_INDEX data
+ $res = $appCache->updateAppDelegationDelLastIndex($lang, true);
+
//APP_DELEGATION INSERT
$res = $appCache->triggerAppDelegationInsert( $lang, true );
diff --git a/workflow/engine/data/mssql/schema.sql b/workflow/engine/data/mssql/schema.sql
index 15b714bb1..385b720d8 100755
--- a/workflow/engine/data/mssql/schema.sql
+++ b/workflow/engine/data/mssql/schema.sql
@@ -57,6 +57,8 @@ CREATE INDEX [indexAppNumber] ON [APPLICATION] ([APP_NUMBER]);
CREATE INDEX [indexAppStatus] ON [APPLICATION] ([APP_STATUS]);
+CREATE INDEX [indexAppCreateDate] ON [APPLICATION] ([APP_CREATE_DATE]);
+
/* ---------------------------------------------------------------------- */
/* APP_DELEGATION */
/* ---------------------------------------------------------------------- */
@@ -93,6 +95,7 @@ CREATE TABLE [APP_DELEGATION]
[APP_UID] VARCHAR(32) default '' NOT NULL,
[DEL_INDEX] INT default 0 NOT NULL,
[DEL_PREVIOUS] INT default 0 NOT NULL,
+ [DEL_LAST_INDEX] INT default 0 NOT NULL,
[PRO_UID] VARCHAR(32) default '' NOT NULL,
[TAS_UID] VARCHAR(32) default '' NOT NULL,
[USR_UID] VARCHAR(32) default '' NOT NULL,
@@ -162,10 +165,10 @@ CREATE TABLE [APP_DOCUMENT]
[APP_DOC_TAGS] NVARCHAR(MAX) NULL,
[APP_DOC_STATUS] VARCHAR(32) default 'ACTIVE' NOT NULL,
[APP_DOC_STATUS_DATE] CHAR(19) NULL,
+ [APP_DOC_FIELDNAME] VARCHAR(150) NULL,
CONSTRAINT APP_DOCUMENT_PK PRIMARY KEY ([APP_DOC_UID],[DOC_VERSION])
);
-
CREATE INDEX [indexAppDocument] ON [APP_DOCUMENT] ([FOLDER_UID],[APP_DOC_UID]);
/* ---------------------------------------------------------------------- */
@@ -217,6 +220,7 @@ CREATE TABLE [APP_MESSAGE]
[APP_MSG_STATUS] VARCHAR(20) NULL,
[APP_MSG_ATTACH] NVARCHAR(MAX) NULL,
[APP_MSG_SEND_DATE] CHAR(19) NOT NULL,
+ [APP_MSG_SHOW_MESSAGE] TINYINT default 1 NOT NULL,
CONSTRAINT APP_MESSAGE_PK PRIMARY KEY ([APP_MSG_UID])
);
@@ -829,6 +833,7 @@ CREATE TABLE [OUTPUT_DOCUMENT]
(
[OUT_DOC_UID] VARCHAR(32) default '' NOT NULL,
[PRO_UID] VARCHAR(32) default '' NOT NULL,
+ [OUT_DOC_REPORT_GENERATOR] VARCHAR(10) default 'HTML2PDF' NOT NULL,
[OUT_DOC_LANDSCAPE] TINYINT default 0 NOT NULL,
[OUT_DOC_MEDIA] VARCHAR(10) default 'Letter' NOT NULL,
[OUT_DOC_LEFT_MARGIN] INT default 30 NULL,
@@ -1266,6 +1271,7 @@ CREATE TABLE [TASK]
[TAS_PRIORITY_VARIABLE] VARCHAR(100) default '' NOT NULL,
[TAS_ASSIGN_TYPE] VARCHAR(30) default 'BALANCED' NOT NULL,
[TAS_ASSIGN_VARIABLE] VARCHAR(100) default '@@SYS_NEXT_USER_TO_BE_ASSIGNED' NOT NULL,
+ [TAS_GROUP_VARIABLE] VARCHAR(100) default '@@SYS_GROUP_TO_BE_ASSIGNED' NULL,
[TAS_MI_INSTANCE_VARIABLE] VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCE' NOT NULL,
[TAS_MI_COMPLETE_VARIABLE] VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE' NOT NULL,
[TAS_ASSIGN_LOCATION] VARCHAR(20) default 'FALSE' NOT NULL,
@@ -1295,6 +1301,10 @@ CREATE TABLE [TASK]
[TAS_EVN_UID] VARCHAR(32) default '' NOT NULL,
[TAS_BOUNDARY] VARCHAR(32) default '' NOT NULL,
[TAS_DERIVATION_SCREEN_TPL] VARCHAR(128) default '' NULL,
+ [TAS_SELFSERVICE_TIMEOUT] INT default 0 NULL,
+ [TAS_SELFSERVICE_TIME] VARCHAR(15) default '' NULL,
+ [TAS_SELFSERVICE_TIME_UNIT] VARCHAR(15) default '' NULL,
+ [TAS_SELFSERVICE_TRIGGER_UID] VARCHAR(32) default '' NULL,
CONSTRAINT TASK_PK PRIMARY KEY ([TAS_UID])
);
@@ -2063,6 +2073,8 @@ CREATE TABLE [LOGIN_LOG]
CONSTRAINT LOGIN_LOG_PK PRIMARY KEY ([LOG_UID])
);
+CREATE INDEX [indexLoginLog] ON [LOGIN_LOG] ([USR_UID],[LOG_INIT_DATE]);
+
/* ---------------------------------------------------------------------- */
/* USERS_PROPERTIES */
/* ---------------------------------------------------------------------- */
@@ -2430,6 +2442,7 @@ CREATE TABLE [APP_CACHE_VIEW]
(
[APP_UID] VARCHAR(32) default '' NOT NULL,
[DEL_INDEX] INT default 0 NOT NULL,
+ [DEL_LAST_INDEX] INT default 0 NOT NULL,
[APP_NUMBER] INT default 0 NOT NULL,
[APP_STATUS] VARCHAR(32) default '' NOT NULL,
[USR_UID] VARCHAR(32) default '' NOT NULL,
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 062c8d185..9eea02130 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -46,6 +46,7 @@ CREATE TABLE `APP_DELEGATION`
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS` INTEGER default 0 NOT NULL,
+ `DEL_LAST_INDEX` INTEGER default 0 NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
@@ -1103,6 +1104,7 @@ CREATE TABLE `APP_CACHE_VIEW`
(
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
+ `DEL_LAST_INDEX` INTEGER default 0 NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_STATUS` VARCHAR(32) default '' NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
diff --git a/workflow/engine/data/oracle/schema.sql b/workflow/engine/data/oracle/schema.sql
index 59b6ef8ea..41d49ce45 100755
--- a/workflow/engine/data/oracle/schema.sql
+++ b/workflow/engine/data/oracle/schema.sql
@@ -19,18 +19,25 @@ CREATE TABLE "APPLICATION"
"APP_PARALLEL" VARCHAR2(32) default 'NO' NOT NULL,
"APP_INIT_USER" VARCHAR2(32) default '' NOT NULL,
"APP_CUR_USER" VARCHAR2(32) default '' NOT NULL,
- "APP_CREATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "APP_INIT_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "APP_FINISH_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "APP_UPDATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "APP_DATA" VARCHAR2(2000) NOT NULL
+ "APP_CREATE_DATE" DATE NOT NULL,
+ "APP_INIT_DATE" DATE NOT NULL,
+ "APP_FINISH_DATE" DATE,
+ "APP_UPDATE_DATE" DATE NOT NULL,
+ "APP_DATA" VARCHAR2(2000) NOT NULL,
+ "APP_PIN" VARCHAR2(32) default '' NOT NULL
);
ALTER TABLE "APPLICATION"
ADD CONSTRAINT "APPLICATION_PK"
PRIMARY KEY ("APP_UID");
-CREATE INDEX "indexApp" ON "APPLICATION" ("PRO_UID","APP_UID");
-CREATE INDEX "indexApp" ON "APPLICATION" ("PRO_UID","APP_UID");
+CREATE INDEX "indexApp" ON "APPLICATION" ("PRO_UID","APP_STATUS","APP_UID");
+CREATE INDEX "indexAppNumber" ON "APPLICATION" ("APP_NUMBER");
+CREATE INDEX "indexAppStatus" ON "APPLICATION" ("APP_STATUS");
+CREATE INDEX "indexAppCreateDate" ON "APPLICATION" ("APP_CREATE_DATE");
+CREATE INDEX "indexApp" ON "APPLICATION" ("PRO_UID","APP_STATUS","APP_UID");
+CREATE INDEX "indexAppNumber" ON "APPLICATION" ("APP_NUMBER");
+CREATE INDEX "indexAppStatus" ON "APPLICATION" ("APP_STATUS");
+CREATE INDEX "indexAppCreateDate" ON "APPLICATION" ("APP_CREATE_DATE");
/* -----------------------------------------------------------------------
@@ -45,17 +52,26 @@ CREATE TABLE "APP_DELEGATION"
"APP_UID" VARCHAR2(32) default '' NOT NULL,
"DEL_INDEX" NUMBER default 0 NOT NULL,
"DEL_PREVIOUS" NUMBER default 0 NOT NULL,
+ "DEL_LAST_INDEX" NUMBER default 0 NOT NULL,
"PRO_UID" VARCHAR2(32) default '' NOT NULL,
"TAS_UID" VARCHAR2(32) default '' NOT NULL,
"USR_UID" VARCHAR2(32) default '' NOT NULL,
"DEL_TYPE" VARCHAR2(32) default 'NORMAL' NOT NULL,
"DEL_THREAD" NUMBER default 0 NOT NULL,
"DEL_THREAD_STATUS" VARCHAR2(32) default 'OPEN' NOT NULL,
- "DEL_PRIORITY" VARCHAR2(32) default '0' NOT NULL,
- "DEL_DELEGATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "DEL_INIT_DATE" DATE NOT NULL,
- "DEL_TASK_DUE_DATE" DATE default '' NOT NULL,
- "DEL_FINISH_DATE" DATE
+ "DEL_PRIORITY" VARCHAR2(32) default '3' NOT NULL,
+ "DEL_DELEGATE_DATE" DATE NOT NULL,
+ "DEL_INIT_DATE" DATE,
+ "DEL_TASK_DUE_DATE" DATE,
+ "DEL_FINISH_DATE" DATE,
+ "DEL_DURATION" FLOAT default 0,
+ "DEL_QUEUE_DURATION" FLOAT default 0,
+ "DEL_DELAY_DURATION" FLOAT default 0,
+ "DEL_STARTED" NUMBER(3,0) default 0,
+ "DEL_FINISHED" NUMBER(3,0) default 0,
+ "DEL_DELAYED" NUMBER(3,0) default 0,
+ "DEL_DATA" VARCHAR2(2000) NOT NULL,
+ "APP_OVERDUE_PERCENTAGE" FLOAT default 0 NOT NULL
);
ALTER TABLE "APP_DELEGATION"
@@ -73,21 +89,29 @@ DROP TABLE "APP_DOCUMENT" CASCADE CONSTRAINTS;
CREATE TABLE "APP_DOCUMENT"
(
"APP_DOC_UID" VARCHAR2(32) default '' NOT NULL,
+ "DOC_VERSION" NUMBER default 1 NOT NULL,
"APP_UID" VARCHAR2(32) default '' NOT NULL,
"DEL_INDEX" NUMBER default 0 NOT NULL,
"DOC_UID" VARCHAR2(32) default '' NOT NULL,
"USR_UID" VARCHAR2(32) default '' NOT NULL,
"APP_DOC_TYPE" VARCHAR2(32) default '' NOT NULL,
- "APP_DOC_CREATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL
+ "APP_DOC_CREATE_DATE" DATE NOT NULL,
+ "APP_DOC_INDEX" NUMBER NOT NULL,
+ "FOLDER_UID" VARCHAR2(32) default '',
+ "APP_DOC_PLUGIN" VARCHAR2(150) default '',
+ "APP_DOC_TAGS" VARCHAR2(2000),
+ "APP_DOC_STATUS" VARCHAR2(32) default 'ACTIVE' NOT NULL,
+ "APP_DOC_STATUS_DATE" DATE,
+ "APP_DOC_FIELDNAME" VARCHAR2(150)
);
ALTER TABLE "APP_DOCUMENT"
ADD CONSTRAINT "APP_DOCUMENT_PK"
- PRIMARY KEY ("APP_DOC_UID");
+ PRIMARY KEY ("APP_DOC_UID","DOC_VERSION");
+CREATE INDEX "indexAppDocument" ON "APP_DOCUMENT" ("FOLDER_UID","APP_DOC_UID");
+CREATE INDEX "indexAppDocument" ON "APP_DOCUMENT" ("FOLDER_UID","APP_DOC_UID");
- CREATE INDEX "indexAppDocument" ON "APP_DOCUMENT" ("FOLDER_UID","APP_DOC_UID");
-
/* -----------------------------------------------------------------------
APP_MESSAGE
----------------------------------------------------------------------- */
@@ -97,19 +121,23 @@ DROP TABLE "APP_MESSAGE" CASCADE CONSTRAINTS;
CREATE TABLE "APP_MESSAGE"
(
- "APP_MSG_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_MSG_UID" VARCHAR2(32) NOT NULL,
"MSG_UID" VARCHAR2(32),
"APP_UID" VARCHAR2(32) default '' NOT NULL,
"DEL_INDEX" NUMBER default 0 NOT NULL,
- "APP_MSG_TYPE" VARCHAR2(100) default 'CUSTOM_MESSAGE' NOT NULL,
+ "APP_MSG_TYPE" VARCHAR2(100) default '' NOT NULL,
"APP_MSG_SUBJECT" VARCHAR2(150) default '' NOT NULL,
"APP_MSG_FROM" VARCHAR2(100) default '' NOT NULL,
"APP_MSG_TO" VARCHAR2(2000) NOT NULL,
"APP_MSG_BODY" VARCHAR2(2000) NOT NULL,
- "APP_MSG_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
+ "APP_MSG_DATE" DATE NOT NULL,
"APP_MSG_CC" VARCHAR2(2000),
"APP_MSG_BCC" VARCHAR2(2000),
- "APP_MSG_ATTACH" VARCHAR2(2000)
+ "APP_MSG_TEMPLATE" VARCHAR2(2000),
+ "APP_MSG_STATUS" VARCHAR2(20),
+ "APP_MSG_ATTACH" VARCHAR2(2000),
+ "APP_MSG_SEND_DATE" DATE NOT NULL,
+ "APP_MSG_SHOW_MESSAGE" NUMBER(3,0) default 1 NOT NULL
);
ALTER TABLE "APP_MESSAGE"
@@ -177,6 +205,8 @@ CREATE TABLE "CONTENT"
ALTER TABLE "CONTENT"
ADD CONSTRAINT "CONTENT_PK"
PRIMARY KEY ("CON_CATEGORY","CON_PARENT","CON_ID","CON_LANG");
+CREATE INDEX "indexUid" ON "CONTENT" ("CON_ID","CON_CATEGORY","CON_LANG");
+CREATE INDEX "indexUid" ON "CONTENT" ("CON_ID","CON_CATEGORY","CON_LANG");
/* -----------------------------------------------------------------------
@@ -192,16 +222,18 @@ CREATE TABLE "DEPARTMENT"
"DEP_PARENT" VARCHAR2(32) default '' NOT NULL,
"DEP_MANAGER" VARCHAR2(32) default '' NOT NULL,
"DEP_LOCATION" NUMBER default 0 NOT NULL,
- "DEP_STATUS" CHAR(1) default 'A' NOT NULL,
- "DEP_TYPE" VARCHAR2(5) default 'INTER' NOT NULL,
- "DEP_REF_CODE" VARCHAR2(10) default '' NOT NULL
+ "DEP_STATUS" VARCHAR2(10) default 'ACTIVE' NOT NULL,
+ "DEP_REF_CODE" VARCHAR2(50) default '' NOT NULL,
+ "DEP_LDAP_DN" VARCHAR2(255) default '' NOT NULL
);
ALTER TABLE "DEPARTMENT"
ADD CONSTRAINT "DEPARTMENT_PK"
PRIMARY KEY ("DEP_UID");
CREATE INDEX "DEP_BYPARENT" ON "DEPARTMENT" ("DEP_PARENT");
+CREATE INDEX "BY_DEP_LDAP_DN" ON "DEPARTMENT" ("DEP_LDAP_DN");
CREATE INDEX "DEP_BYPARENT" ON "DEPARTMENT" ("DEP_PARENT");
+CREATE INDEX "BY_DEP_LDAP_DN" ON "DEPARTMENT" ("DEP_LDAP_DN");
/* -----------------------------------------------------------------------
@@ -234,7 +266,9 @@ DROP TABLE "GROUPWF" CASCADE CONSTRAINTS;
CREATE TABLE "GROUPWF"
(
"GRP_UID" VARCHAR2(32) default '' NOT NULL,
- "GRP_STATUS" CHAR(8) default 'ACTIVE' NOT NULL
+ "GRP_STATUS" CHAR(8) default 'ACTIVE' NOT NULL,
+ "GRP_LDAP_DN" VARCHAR2(255) default '' NOT NULL,
+ "GRP_UX" VARCHAR2(128) default 'NORMAL'
);
ALTER TABLE "GROUPWF"
@@ -295,7 +329,10 @@ CREATE TABLE "INPUT_DOCUMENT"
"PRO_UID" VARCHAR2(32) default '0' NOT NULL,
"INP_DOC_FORM_NEEDED" VARCHAR2(20) default 'REAL' NOT NULL,
"INP_DOC_ORIGINAL" VARCHAR2(20) default 'COPY' NOT NULL,
- "INP_DOC_PUBLISHED" VARCHAR2(20) default 'PRIVATE' NOT NULL
+ "INP_DOC_PUBLISHED" VARCHAR2(20) default 'PRIVATE' NOT NULL,
+ "INP_DOC_VERSIONING" NUMBER(3,0) default 0 NOT NULL,
+ "INP_DOC_DESTINATION_PATH" VARCHAR2(2000),
+ "INP_DOC_TAGS" VARCHAR2(2000)
);
ALTER TABLE "INPUT_DOCUMENT"
@@ -362,58 +399,6 @@ CREATE TABLE "ISO_SUBDIVISION"
PRIMARY KEY ("IC_UID","IS_UID");
-/* -----------------------------------------------------------------------
- KT_APPLICATION
- ----------------------------------------------------------------------- */
-
-DROP TABLE "KT_APPLICATION" CASCADE CONSTRAINTS;
-
-
-CREATE TABLE "KT_APPLICATION"
-(
- "APP_UID" VARCHAR2(32) default '' NOT NULL,
- "KT_FOLDER_ID" NUMBER default 0 NOT NULL,
- "KT_PARENT_ID" NUMBER default 0 NOT NULL,
- "KT_FOLDER_NAME" VARCHAR2(100) default '' NOT NULL,
- "KT_FULL_PATH" VARCHAR2(255) default '' NOT NULL,
- "KT_CREATE_USER" VARCHAR2(32) default '' NOT NULL,
- "KT_CREATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "KT_UPDATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL
-);
-
- ALTER TABLE "KT_APPLICATION"
- ADD CONSTRAINT "KT_APPLICATION_PK"
- PRIMARY KEY ("APP_UID");
-CREATE INDEX "indexApp" ON "KT_APPLICATION" ("KT_FOLDER_ID");
-CREATE INDEX "indexApp" ON "KT_APPLICATION" ("KT_FOLDER_ID");
-
-
-/* -----------------------------------------------------------------------
- KT_PROCESS
- ----------------------------------------------------------------------- */
-
-DROP TABLE "KT_PROCESS" CASCADE CONSTRAINTS;
-
-
-CREATE TABLE "KT_PROCESS"
-(
- "PRO_UID" VARCHAR2(32) default '' NOT NULL,
- "KT_FOLDER_ID" NUMBER default 0 NOT NULL,
- "KT_PARENT_ID" NUMBER default 0 NOT NULL,
- "KT_FOLDER_NAME" VARCHAR2(100) default '' NOT NULL,
- "KT_FULL_PATH" VARCHAR2(255) default '' NOT NULL,
- "KT_CREATE_USER" VARCHAR2(32) default '' NOT NULL,
- "KT_CREATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "KT_UPDATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL
-);
-
- ALTER TABLE "KT_PROCESS"
- ADD CONSTRAINT "KT_PROCESS_PK"
- PRIMARY KEY ("PRO_UID");
-CREATE INDEX "indexApp" ON "KT_PROCESS" ("KT_FOLDER_ID");
-CREATE INDEX "indexApp" ON "KT_PROCESS" ("KT_FOLDER_ID");
-
-
/* -----------------------------------------------------------------------
LANGUAGE
----------------------------------------------------------------------- */
@@ -432,6 +417,10 @@ CREATE TABLE "LANGUAGE"
"LAN_CALENDAR" VARCHAR2(30) default 'GREGORIAN' NOT NULL
);
+ ALTER TABLE "LANGUAGE"
+ ADD CONSTRAINT "LANGUAGE_PK"
+ PRIMARY KEY ("LAN_ID");
+
/* -----------------------------------------------------------------------
LEXICO
@@ -463,7 +452,25 @@ DROP TABLE "OUTPUT_DOCUMENT" CASCADE CONSTRAINTS;
CREATE TABLE "OUTPUT_DOCUMENT"
(
"OUT_DOC_UID" VARCHAR2(32) default '' NOT NULL,
- "PRO_UID" VARCHAR2(32) default '' NOT NULL
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "OUT_DOC_REPORT_GENERATOR" VARCHAR2(10) default 'HTML2PDF' NOT NULL,
+ "OUT_DOC_LANDSCAPE" NUMBER(3,0) default 0 NOT NULL,
+ "OUT_DOC_MEDIA" VARCHAR2(10) default 'Letter' NOT NULL,
+ "OUT_DOC_LEFT_MARGIN" NUMBER default 30,
+ "OUT_DOC_RIGHT_MARGIN" NUMBER default 15,
+ "OUT_DOC_TOP_MARGIN" NUMBER default 15,
+ "OUT_DOC_BOTTOM_MARGIN" NUMBER default 15,
+ "OUT_DOC_GENERATE" VARCHAR2(10) default 'BOTH' NOT NULL,
+ "OUT_DOC_TYPE" VARCHAR2(32) default 'HTML' NOT NULL,
+ "OUT_DOC_CURRENT_REVISION" NUMBER default 0,
+ "OUT_DOC_FIELD_MAPPING" VARCHAR2(2000),
+ "OUT_DOC_VERSIONING" NUMBER(3,0) default 0 NOT NULL,
+ "OUT_DOC_DESTINATION_PATH" VARCHAR2(2000),
+ "OUT_DOC_TAGS" VARCHAR2(2000),
+ "OUT_DOC_PDF_SECURITY_ENABLED" NUMBER(3,0) default 0,
+ "OUT_DOC_PDF_SECURITY_OPEN_PASSWORD" VARCHAR2(32) default '',
+ "OUT_DOC_PDF_SECURITY_OWNER_PASSWORD" VARCHAR2(32) default '',
+ "OUT_DOC_PDF_SECURITY_PERMISSIONS" VARCHAR2(150) default ''
);
ALTER TABLE "OUTPUT_DOCUMENT"
@@ -491,22 +498,25 @@ CREATE TABLE "PROCESS"
"PRO_SHOW_MAP" NUMBER(3,0) default 1 NOT NULL,
"PRO_SHOW_MESSAGE" NUMBER(3,0) default 1 NOT NULL,
"PRO_SUBPROCESS" NUMBER(3,0) default 0 NOT NULL,
- "PRO_TRI_DELETED" VARCHAR(32) default '' NOT NULL,
- "PRO_TRI_CANCELED" VARCHAR(32) default '' NOT NULL,
- "PRO_TRI_PAUSED" VARCHAR(32) default '' NOT NULL,
- "PRO_TRI_REASSIGNED" VARCHAR(32) default '' NOT NULL,
+ "PRO_TRI_DELETED" VARCHAR2(32) default '' NOT NULL,
+ "PRO_TRI_CANCELED" VARCHAR2(32) default '' NOT NULL,
+ "PRO_TRI_PAUSED" VARCHAR2(32) default '' NOT NULL,
+ "PRO_TRI_REASSIGNED" VARCHAR2(32) default '' NOT NULL,
"PRO_SHOW_DELEGATE" NUMBER(3,0) default 1 NOT NULL,
"PRO_SHOW_DYNAFORM" NUMBER(3,0) default 0 NOT NULL,
"PRO_CATEGORY" VARCHAR2(48) default '' NOT NULL,
"PRO_SUB_CATEGORY" VARCHAR2(48) default '' NOT NULL,
"PRO_INDUSTRY" NUMBER default 1 NOT NULL,
- "PRO_UPDATE_DATE" DATE default '',
- "PRO_CREATE_DATE" DATE default '' NOT NULL,
+ "PRO_UPDATE_DATE" DATE,
+ "PRO_CREATE_DATE" DATE NOT NULL,
"PRO_CREATE_USER" VARCHAR2(32) default '' NOT NULL,
"PRO_HEIGHT" NUMBER default 5000 NOT NULL,
"PRO_WIDTH" NUMBER default 10000 NOT NULL,
"PRO_TITLE_X" NUMBER default 0 NOT NULL,
- "PRO_TITLE_Y" NUMBER default 6 NOT NULL
+ "PRO_TITLE_Y" NUMBER default 6 NOT NULL,
+ "PRO_DEBUG" NUMBER default 0 NOT NULL,
+ "PRO_DYNAFORMS" VARCHAR2(2000),
+ "PRO_DERIVATION_SCREEN_TPL" VARCHAR2(128) default ''
);
ALTER TABLE "PROCESS"
@@ -532,6 +542,51 @@ CREATE TABLE "PROCESS_OWNER"
PRIMARY KEY ("OWN_UID","PRO_UID");
+/* -----------------------------------------------------------------------
+ REPORT_TABLE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "REPORT_TABLE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "REPORT_TABLE"
+(
+ "REP_TAB_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "REP_TAB_NAME" VARCHAR2(100) default '' NOT NULL,
+ "REP_TAB_TYPE" VARCHAR2(6) default '' NOT NULL,
+ "REP_TAB_GRID" VARCHAR2(150) default '',
+ "REP_TAB_CONNECTION" VARCHAR2(32) default '' NOT NULL,
+ "REP_TAB_CREATE_DATE" DATE NOT NULL,
+ "REP_TAB_STATUS" CHAR(8) default 'ACTIVE' NOT NULL
+);
+
+ ALTER TABLE "REPORT_TABLE"
+ ADD CONSTRAINT "REPORT_TABLE_PK"
+ PRIMARY KEY ("REP_TAB_UID");
+
+
+/* -----------------------------------------------------------------------
+ REPORT_VAR
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "REPORT_VAR" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "REPORT_VAR"
+(
+ "REP_VAR_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "REP_TAB_UID" VARCHAR2(32) default '' NOT NULL,
+ "REP_VAR_NAME" VARCHAR2(255) default '' NOT NULL,
+ "REP_VAR_TYPE" VARCHAR2(20) default '' NOT NULL
+);
+
+ ALTER TABLE "REPORT_VAR"
+ ADD CONSTRAINT "REPORT_VAR_PK"
+ PRIMARY KEY ("REP_VAR_UID");
+
+
/* -----------------------------------------------------------------------
ROUTE
----------------------------------------------------------------------- */
@@ -548,12 +603,16 @@ CREATE TABLE "ROUTE"
"ROU_NEXT_TASK" VARCHAR2(32) default '0' NOT NULL,
"ROU_CASE" NUMBER default 0 NOT NULL,
"ROU_TYPE" VARCHAR2(25) default 'SEQUENTIAL' NOT NULL,
- "ROU_CONDITION" VARCHAR2(255) default '' NOT NULL,
+ "ROU_CONDITION" VARCHAR2(512) default '' NOT NULL,
"ROU_TO_LAST_USER" VARCHAR2(20) default 'FALSE' NOT NULL,
"ROU_OPTIONAL" VARCHAR2(20) default 'FALSE' NOT NULL,
"ROU_SEND_EMAIL" VARCHAR2(20) default 'TRUE' NOT NULL,
"ROU_SOURCEANCHOR" NUMBER default 1,
- "ROU_TARGETANCHOR" NUMBER default 0
+ "ROU_TARGETANCHOR" NUMBER default 0,
+ "ROU_TO_PORT" NUMBER default 1 NOT NULL,
+ "ROU_FROM_PORT" NUMBER default 2 NOT NULL,
+ "ROU_EVN_UID" VARCHAR2(32) default '' NOT NULL,
+ "GAT_UID" VARCHAR2(32) default '' NOT NULL
);
ALTER TABLE "ROUTE"
@@ -576,7 +635,8 @@ CREATE TABLE "STEP"
"STEP_TYPE_OBJ" VARCHAR2(20) default 'DYNAFORM' NOT NULL,
"STEP_UID_OBJ" VARCHAR2(32) default '0' NOT NULL,
"STEP_CONDITION" VARCHAR2(2000) NOT NULL,
- "STEP_POSITION" NUMBER default 0 NOT NULL
+ "STEP_POSITION" NUMBER default 0 NOT NULL,
+ "STEP_MODE" VARCHAR2(10) default 'EDIT'
);
ALTER TABLE "STEP"
@@ -619,7 +679,10 @@ CREATE TABLE "SWIMLANES_ELEMENTS"
"PRO_UID" VARCHAR2(32) default '' NOT NULL,
"SWI_TYPE" VARCHAR2(20) default 'LINE' NOT NULL,
"SWI_X" NUMBER default 0 NOT NULL,
- "SWI_Y" NUMBER default 0 NOT NULL
+ "SWI_Y" NUMBER default 0 NOT NULL,
+ "SWI_WIDTH" NUMBER default 0 NOT NULL,
+ "SWI_HEIGHT" NUMBER default 0 NOT NULL,
+ "SWI_NEXT_UID" VARCHAR2(32) default ''
);
ALTER TABLE "SWIMLANES_ELEMENTS"
@@ -648,6 +711,9 @@ CREATE TABLE "TASK"
"TAS_PRIORITY_VARIABLE" VARCHAR2(100) default '' NOT NULL,
"TAS_ASSIGN_TYPE" VARCHAR2(30) default 'BALANCED' NOT NULL,
"TAS_ASSIGN_VARIABLE" VARCHAR2(100) default '@@SYS_NEXT_USER_TO_BE_ASSIGNED' NOT NULL,
+ "TAS_GROUP_VARIABLE" VARCHAR2(100) default '@@SYS_GROUP_TO_BE_ASSIGNED',
+ "TAS_MI_INSTANCE_VARIABLE" VARCHAR2(100) default '@@SYS_VAR_TOTAL_INSTANCE' NOT NULL,
+ "TAS_MI_COMPLETE_VARIABLE" VARCHAR2(100) default '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE' NOT NULL,
"TAS_ASSIGN_LOCATION" VARCHAR2(20) default 'FALSE' NOT NULL,
"TAS_ASSIGN_LOCATION_ADHOC" VARCHAR2(20) default 'FALSE' NOT NULL,
"TAS_TRANSFER_FLY" VARCHAR2(20) default 'FALSE' NOT NULL,
@@ -669,7 +735,16 @@ CREATE TABLE "TASK"
"TAS_DERIVATION" VARCHAR2(100) default 'NORMAL' NOT NULL,
"TAS_POSX" NUMBER default 0 NOT NULL,
"TAS_POSY" NUMBER default 0 NOT NULL,
- "TAS_COLOR" VARCHAR2(32) default '' NOT NULL
+ "TAS_WIDTH" NUMBER default 110 NOT NULL,
+ "TAS_HEIGHT" NUMBER default 60 NOT NULL,
+ "TAS_COLOR" VARCHAR2(32) default '' NOT NULL,
+ "TAS_EVN_UID" VARCHAR2(32) default '' NOT NULL,
+ "TAS_BOUNDARY" VARCHAR2(32) default '' NOT NULL,
+ "TAS_DERIVATION_SCREEN_TPL" VARCHAR2(128) default '',
+ "TAS_SELFSERVICE_TIMEOUT" NUMBER default 0,
+ "TAS_SELFSERVICE_TIME" VARCHAR2(15) default '',
+ "TAS_SELFSERVICE_TIME_UNIT" VARCHAR2(15) default '',
+ "TAS_SELFSERVICE_TRIGGER_UID" VARCHAR2(32) default ''
);
ALTER TABLE "TASK"
@@ -709,7 +784,8 @@ CREATE TABLE "TRANSLATION"
"TRN_CATEGORY" VARCHAR2(100) default '' NOT NULL,
"TRN_ID" VARCHAR2(100) default '' NOT NULL,
"TRN_LANG" VARCHAR2(10) default 'en' NOT NULL,
- "TRN_VALUE" VARCHAR2(200) default '' NOT NULL
+ "TRN_VALUE" VARCHAR2(2000) NOT NULL,
+ "TRN_UPDATE_DATE" DATE
);
ALTER TABLE "TRANSLATION"
@@ -729,7 +805,8 @@ CREATE TABLE "TRIGGERS"
"TRI_UID" VARCHAR2(32) default '' NOT NULL,
"PRO_UID" VARCHAR2(32) default '' NOT NULL,
"TRI_TYPE" VARCHAR2(20) default 'SCRIPT' NOT NULL,
- "TRI_WEBBOT" VARCHAR2(2000) NOT NULL
+ "TRI_WEBBOT" VARCHAR2(2000) NOT NULL,
+ "TRI_PARAM" VARCHAR2(2000)
);
ALTER TABLE "TRIGGERS"
@@ -752,10 +829,10 @@ CREATE TABLE "USERS"
"USR_FIRSTNAME" VARCHAR2(50) default '' NOT NULL,
"USR_LASTNAME" VARCHAR2(50) default '' NOT NULL,
"USR_EMAIL" VARCHAR2(100) default '' NOT NULL,
- "USR_DUE_DATE" DATE default '0000-00-00' NOT NULL,
- "USR_CREATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "USR_UPDATE_DATE" DATE default '0000-00-00 00:00:00' NOT NULL,
- "USR_STATUS" NUMBER default 1 NOT NULL,
+ "USR_DUE_DATE" DATE NOT NULL,
+ "USR_CREATE_DATE" DATE NOT NULL,
+ "USR_UPDATE_DATE" DATE NOT NULL,
+ "USR_STATUS" VARCHAR2(32) default 'ACTIVE' NOT NULL,
"USR_COUNTRY" VARCHAR2(3) default '' NOT NULL,
"USR_CITY" VARCHAR2(3) default '' NOT NULL,
"USR_LOCATION" VARCHAR2(3) default '' NOT NULL,
@@ -764,13 +841,959 @@ CREATE TABLE "USERS"
"USR_FAX" VARCHAR2(24) default '' NOT NULL,
"USR_CELLULAR" VARCHAR2(24) default '' NOT NULL,
"USR_ZIP_CODE" VARCHAR2(16) default '' NOT NULL,
- "USR_DEPARTMENT" NUMBER default 0 NOT NULL,
+ "DEP_UID" VARCHAR2(32) default '' NOT NULL,
"USR_POSITION" VARCHAR2(100) default '' NOT NULL,
"USR_RESUME" VARCHAR2(100) default '' NOT NULL,
- "USR_BIRTHDAY" DATE default '0000-00-00' NOT NULL,
- "USR_ROLE" VARCHAR2(32) default 'PROCESSMAKER_ADMIN'
+ "USR_BIRTHDAY" DATE,
+ "USR_ROLE" VARCHAR2(32) default 'PROCESSMAKER_ADMIN',
+ "USR_REPORTS_TO" VARCHAR2(32) default '',
+ "USR_REPLACED_BY" VARCHAR2(32) default '',
+ "USR_UX" VARCHAR2(128) default 'NORMAL'
);
ALTER TABLE "USERS"
ADD CONSTRAINT "USERS_PK"
PRIMARY KEY ("USR_UID");
+
+
+/* -----------------------------------------------------------------------
+ APP_THREAD
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_THREAD" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_THREAD"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_THREAD_INDEX" NUMBER default 0 NOT NULL,
+ "APP_THREAD_PARENT" NUMBER default 0 NOT NULL,
+ "APP_THREAD_STATUS" VARCHAR2(32) default 'OPEN' NOT NULL,
+ "DEL_INDEX" NUMBER default 0 NOT NULL
+);
+
+ ALTER TABLE "APP_THREAD"
+ ADD CONSTRAINT "APP_THREAD_PK"
+ PRIMARY KEY ("APP_UID","APP_THREAD_INDEX");
+
+
+/* -----------------------------------------------------------------------
+ APP_DELAY
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_DELAY" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_DELAY"
+(
+ "APP_DELAY_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '0' NOT NULL,
+ "APP_UID" VARCHAR2(32) default '0' NOT NULL,
+ "APP_THREAD_INDEX" NUMBER default 0 NOT NULL,
+ "APP_DEL_INDEX" NUMBER default 0 NOT NULL,
+ "APP_TYPE" VARCHAR2(20) default '0' NOT NULL,
+ "APP_STATUS" VARCHAR2(20) default '0' NOT NULL,
+ "APP_NEXT_TASK" VARCHAR2(32) default '0',
+ "APP_DELEGATION_USER" VARCHAR2(32) default '0',
+ "APP_ENABLE_ACTION_USER" VARCHAR2(32) default '0' NOT NULL,
+ "APP_ENABLE_ACTION_DATE" DATE NOT NULL,
+ "APP_DISABLE_ACTION_USER" VARCHAR2(32) default '0',
+ "APP_DISABLE_ACTION_DATE" DATE,
+ "APP_AUTOMATIC_DISABLED_DATE" DATE
+);
+
+ ALTER TABLE "APP_DELAY"
+ ADD CONSTRAINT "APP_DELAY_PK"
+ PRIMARY KEY ("APP_DELAY_UID");
+CREATE INDEX "indexAppDelay" ON "APP_DELAY" ("PRO_UID","APP_UID","APP_THREAD_INDEX","APP_DEL_INDEX","APP_NEXT_TASK","APP_DELEGATION_USER","APP_DISABLE_ACTION_USER");
+CREATE INDEX "indexAppDelay" ON "APP_DELAY" ("PRO_UID","APP_UID","APP_THREAD_INDEX","APP_DEL_INDEX","APP_NEXT_TASK","APP_DELEGATION_USER","APP_DISABLE_ACTION_USER");
+
+
+/* -----------------------------------------------------------------------
+ PROCESS_USER
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "PROCESS_USER" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "PROCESS_USER"
+(
+ "PU_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "PU_TYPE" VARCHAR2(20) default '' NOT NULL
+);
+
+ ALTER TABLE "PROCESS_USER"
+ ADD CONSTRAINT "PROCESS_USER_PK"
+ PRIMARY KEY ("PU_UID");
+
+
+/* -----------------------------------------------------------------------
+ SESSION
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "SESSION" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "SESSION"
+(
+ "SES_UID" VARCHAR2(32) default '' NOT NULL,
+ "SES_STATUS" VARCHAR2(16) default 'ACTIVE' NOT NULL,
+ "USR_UID" VARCHAR2(32) default 'ACTIVE' NOT NULL,
+ "SES_REMOTE_IP" VARCHAR2(32) default '0.0.0.0' NOT NULL,
+ "SES_INIT_DATE" VARCHAR2(19) default '' NOT NULL,
+ "SES_DUE_DATE" VARCHAR2(19) default '' NOT NULL,
+ "SES_END_DATE" VARCHAR2(19) default '' NOT NULL
+);
+
+ ALTER TABLE "SESSION"
+ ADD CONSTRAINT "SESSION_PK"
+ PRIMARY KEY ("SES_UID");
+CREATE INDEX "indexSession" ON "SESSION" ("SES_UID");
+CREATE INDEX "indexSession" ON "SESSION" ("SES_UID");
+
+
+/* -----------------------------------------------------------------------
+ DB_SOURCE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "DB_SOURCE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "DB_SOURCE"
+(
+ "DBS_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '0' NOT NULL,
+ "DBS_TYPE" VARCHAR2(8) default '0' NOT NULL,
+ "DBS_SERVER" VARCHAR2(100) default '0' NOT NULL,
+ "DBS_DATABASE_NAME" VARCHAR2(100) default '0' NOT NULL,
+ "DBS_USERNAME" VARCHAR2(32) default '0' NOT NULL,
+ "DBS_PASSWORD" VARCHAR2(32) default '',
+ "DBS_PORT" NUMBER default 0,
+ "DBS_ENCODE" VARCHAR2(32) default ''
+);
+
+ ALTER TABLE "DB_SOURCE"
+ ADD CONSTRAINT "DB_SOURCE_PK"
+ PRIMARY KEY ("DBS_UID","PRO_UID");
+CREATE INDEX "indexDBSource" ON "DB_SOURCE" ("PRO_UID");
+CREATE INDEX "indexDBSource" ON "DB_SOURCE" ("PRO_UID");
+
+
+/* -----------------------------------------------------------------------
+ STEP_SUPERVISOR
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "STEP_SUPERVISOR" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "STEP_SUPERVISOR"
+(
+ "STEP_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '0' NOT NULL,
+ "STEP_TYPE_OBJ" VARCHAR2(20) default 'DYNAFORM' NOT NULL,
+ "STEP_UID_OBJ" VARCHAR2(32) default '0' NOT NULL,
+ "STEP_POSITION" NUMBER default 0 NOT NULL
+);
+
+ ALTER TABLE "STEP_SUPERVISOR"
+ ADD CONSTRAINT "STEP_SUPERVISOR_PK"
+ PRIMARY KEY ("STEP_UID");
+CREATE INDEX "indexStepSupervisor" ON "STEP_SUPERVISOR" ("PRO_UID","STEP_TYPE_OBJ","STEP_UID_OBJ");
+CREATE INDEX "indexStepSupervisor" ON "STEP_SUPERVISOR" ("PRO_UID","STEP_TYPE_OBJ","STEP_UID_OBJ");
+
+
+/* -----------------------------------------------------------------------
+ OBJECT_PERMISSION
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "OBJECT_PERMISSION" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "OBJECT_PERMISSION"
+(
+ "OP_UID" VARCHAR2(32) default '0' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '0' NOT NULL,
+ "TAS_UID" VARCHAR2(32) default '0' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '0' NOT NULL,
+ "OP_USER_RELATION" NUMBER default 0 NOT NULL,
+ "OP_TASK_SOURCE" VARCHAR2(32) default '0',
+ "OP_PARTICIPATE" NUMBER default 0 NOT NULL,
+ "OP_OBJ_TYPE" VARCHAR2(15) default '0' NOT NULL,
+ "OP_OBJ_UID" VARCHAR2(32) default '0' NOT NULL,
+ "OP_ACTION" VARCHAR2(10) default '0' NOT NULL,
+ "OP_CASE_STATUS" VARCHAR2(10) default '0'
+);
+
+ ALTER TABLE "OBJECT_PERMISSION"
+ ADD CONSTRAINT "OBJECT_PERMISSION_PK"
+ PRIMARY KEY ("OP_UID");
+CREATE INDEX "indexObjctPermission" ON "OBJECT_PERMISSION" ("PRO_UID","TAS_UID","USR_UID","OP_TASK_SOURCE","OP_OBJ_UID");
+CREATE INDEX "indexObjctPermission" ON "OBJECT_PERMISSION" ("PRO_UID","TAS_UID","USR_UID","OP_TASK_SOURCE","OP_OBJ_UID");
+
+
+/* -----------------------------------------------------------------------
+ CASE_TRACKER
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CASE_TRACKER" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CASE_TRACKER"
+(
+ "PRO_UID" VARCHAR2(32) default '0' NOT NULL,
+ "CT_MAP_TYPE" VARCHAR2(10) default '0' NOT NULL,
+ "CT_DERIVATION_HISTORY" NUMBER default 0 NOT NULL,
+ "CT_MESSAGE_HISTORY" NUMBER default 0 NOT NULL
+);
+
+ ALTER TABLE "CASE_TRACKER"
+ ADD CONSTRAINT "CASE_TRACKER_PK"
+ PRIMARY KEY ("PRO_UID");
+
+
+/* -----------------------------------------------------------------------
+ CASE_TRACKER_OBJECT
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CASE_TRACKER_OBJECT" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CASE_TRACKER_OBJECT"
+(
+ "CTO_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '0' NOT NULL,
+ "CTO_TYPE_OBJ" VARCHAR2(20) default 'DYNAFORM' NOT NULL,
+ "CTO_UID_OBJ" VARCHAR2(32) default '0' NOT NULL,
+ "CTO_CONDITION" VARCHAR2(2000) NOT NULL,
+ "CTO_POSITION" NUMBER default 0 NOT NULL
+);
+
+ ALTER TABLE "CASE_TRACKER_OBJECT"
+ ADD CONSTRAINT "CASE_TRACKER_OBJECT_PK"
+ PRIMARY KEY ("CTO_UID");
+CREATE INDEX "indexCaseTrackerObject" ON "CASE_TRACKER_OBJECT" ("PRO_UID","CTO_UID_OBJ");
+CREATE INDEX "indexCaseTrackerObject" ON "CASE_TRACKER_OBJECT" ("PRO_UID","CTO_UID_OBJ");
+
+
+/* -----------------------------------------------------------------------
+ STAGE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "STAGE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "STAGE"
+(
+ "STG_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "STG_POSX" NUMBER default 0 NOT NULL,
+ "STG_POSY" NUMBER default 0 NOT NULL,
+ "STG_INDEX" NUMBER default 0 NOT NULL
+);
+
+ ALTER TABLE "STAGE"
+ ADD CONSTRAINT "STAGE_PK"
+ PRIMARY KEY ("STG_UID");
+
+
+/* -----------------------------------------------------------------------
+ SUB_PROCESS
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "SUB_PROCESS" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "SUB_PROCESS"
+(
+ "SP_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_PARENT" VARCHAR2(32) default '' NOT NULL,
+ "TAS_PARENT" VARCHAR2(32) default '' NOT NULL,
+ "SP_TYPE" VARCHAR2(20) default '' NOT NULL,
+ "SP_SYNCHRONOUS" NUMBER default 0 NOT NULL,
+ "SP_SYNCHRONOUS_TYPE" VARCHAR2(20) default '' NOT NULL,
+ "SP_SYNCHRONOUS_WAIT" NUMBER default 0 NOT NULL,
+ "SP_VARIABLES_OUT" VARCHAR2(2000) NOT NULL,
+ "SP_VARIABLES_IN" VARCHAR2(2000),
+ "SP_GRID_IN" VARCHAR2(50) default '' NOT NULL
+);
+
+ ALTER TABLE "SUB_PROCESS"
+ ADD CONSTRAINT "SUB_PROCESS_PK"
+ PRIMARY KEY ("SP_UID");
+CREATE INDEX "indexSubProcess" ON "SUB_PROCESS" ("PRO_UID","PRO_PARENT");
+CREATE INDEX "indexSubProcess" ON "SUB_PROCESS" ("PRO_UID","PRO_PARENT");
+
+
+/* -----------------------------------------------------------------------
+ SUB_APPLICATION
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "SUB_APPLICATION" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "SUB_APPLICATION"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_PARENT" VARCHAR2(32) default '' NOT NULL,
+ "DEL_INDEX_PARENT" NUMBER default 0 NOT NULL,
+ "DEL_THREAD_PARENT" NUMBER default 0 NOT NULL,
+ "SA_STATUS" VARCHAR2(32) default '' NOT NULL,
+ "SA_VALUES_OUT" VARCHAR2(2000) NOT NULL,
+ "SA_VALUES_IN" VARCHAR2(2000),
+ "SA_INIT_DATE" DATE,
+ "SA_FINISH_DATE" DATE
+);
+
+ ALTER TABLE "SUB_APPLICATION"
+ ADD CONSTRAINT "SUB_APPLICATION_PK"
+ PRIMARY KEY ("APP_UID","APP_PARENT","DEL_INDEX_PARENT","DEL_THREAD_PARENT");
+
+
+/* -----------------------------------------------------------------------
+ LOGIN_LOG
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "LOGIN_LOG" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "LOGIN_LOG"
+(
+ "LOG_UID" VARCHAR2(32) default '' NOT NULL,
+ "LOG_STATUS" VARCHAR2(100) default '' NOT NULL,
+ "LOG_IP" VARCHAR2(15) default '' NOT NULL,
+ "LOG_SID" VARCHAR2(100) default '' NOT NULL,
+ "LOG_INIT_DATE" DATE,
+ "LOG_END_DATE" DATE,
+ "LOG_CLIENT_HOSTNAME" VARCHAR2(100) default '' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL
+);
+
+ ALTER TABLE "LOGIN_LOG"
+ ADD CONSTRAINT "LOGIN_LOG_PK"
+ PRIMARY KEY ("LOG_UID");
+CREATE INDEX "indexLoginLog" ON "LOGIN_LOG" ("USR_UID","LOG_INIT_DATE");
+CREATE INDEX "indexLoginLog" ON "LOGIN_LOG" ("USR_UID","LOG_INIT_DATE");
+
+
+/* -----------------------------------------------------------------------
+ USERS_PROPERTIES
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "USERS_PROPERTIES" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "USERS_PROPERTIES"
+(
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "USR_LAST_UPDATE_DATE" DATE,
+ "USR_LOGGED_NEXT_TIME" NUMBER default 0,
+ "USR_PASSWORD_HISTORY" VARCHAR2(2000)
+);
+
+ ALTER TABLE "USERS_PROPERTIES"
+ ADD CONSTRAINT "USERS_PROPERTIES_PK"
+ PRIMARY KEY ("USR_UID");
+
+
+/* -----------------------------------------------------------------------
+ ADDITIONAL_TABLES
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "ADDITIONAL_TABLES" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "ADDITIONAL_TABLES"
+(
+ "ADD_TAB_UID" VARCHAR2(32) default '' NOT NULL,
+ "ADD_TAB_NAME" VARCHAR2(60) default '' NOT NULL,
+ "ADD_TAB_CLASS_NAME" VARCHAR2(100) default '' NOT NULL,
+ "ADD_TAB_DESCRIPTION" VARCHAR2(2000),
+ "ADD_TAB_SDW_LOG_INSERT" NUMBER(3,0) default 0,
+ "ADD_TAB_SDW_LOG_UPDATE" NUMBER(3,0) default 0,
+ "ADD_TAB_SDW_LOG_DELETE" NUMBER(3,0) default 0,
+ "ADD_TAB_SDW_LOG_SELECT" NUMBER(3,0) default 0,
+ "ADD_TAB_SDW_MAX_LENGTH" NUMBER default 0,
+ "ADD_TAB_SDW_AUTO_DELETE" NUMBER(3,0) default 0,
+ "ADD_TAB_PLG_UID" VARCHAR2(32) default '',
+ "DBS_UID" VARCHAR2(32) default '',
+ "PRO_UID" VARCHAR2(32) default '',
+ "ADD_TAB_TYPE" VARCHAR2(32) default '',
+ "ADD_TAB_GRID" VARCHAR2(256) default '',
+ "ADD_TAB_TAG" VARCHAR2(256) default ''
+);
+
+ ALTER TABLE "ADDITIONAL_TABLES"
+ ADD CONSTRAINT "ADDITIONAL_TABLES_PK"
+ PRIMARY KEY ("ADD_TAB_UID");
+
+
+/* -----------------------------------------------------------------------
+ FIELDS
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "FIELDS" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "FIELDS"
+(
+ "FLD_UID" VARCHAR2(32) default '' NOT NULL,
+ "ADD_TAB_UID" VARCHAR2(32) default '' NOT NULL,
+ "FLD_INDEX" NUMBER default 1 NOT NULL,
+ "FLD_NAME" VARCHAR2(60) default '' NOT NULL,
+ "FLD_DESCRIPTION" VARCHAR2(2000) NOT NULL,
+ "FLD_TYPE" VARCHAR2(20) default '' NOT NULL,
+ "FLD_SIZE" NUMBER default 0,
+ "FLD_NULL" NUMBER(3,0) default 1 NOT NULL,
+ "FLD_AUTO_INCREMENT" NUMBER(3,0) default 0 NOT NULL,
+ "FLD_KEY" NUMBER(3,0) default 0 NOT NULL,
+ "FLD_FOREIGN_KEY" NUMBER(3,0) default 0 NOT NULL,
+ "FLD_FOREIGN_KEY_TABLE" VARCHAR2(32) default '' NOT NULL,
+ "FLD_DYN_NAME" VARCHAR2(128) default '',
+ "FLD_DYN_UID" VARCHAR2(128) default '',
+ "FLD_FILTER" NUMBER(3,0) default 0
+);
+
+ ALTER TABLE "FIELDS"
+ ADD CONSTRAINT "FIELDS_PK"
+ PRIMARY KEY ("FLD_UID");
+
+
+/* -----------------------------------------------------------------------
+ SHADOW_TABLE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "SHADOW_TABLE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "SHADOW_TABLE"
+(
+ "SHD_UID" VARCHAR2(32) default '' NOT NULL,
+ "ADD_TAB_UID" VARCHAR2(32) default '' NOT NULL,
+ "SHD_ACTION" VARCHAR2(10) default '' NOT NULL,
+ "SHD_DETAILS" VARCHAR2(2000) NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "SHD_DATE" DATE
+);
+
+ ALTER TABLE "SHADOW_TABLE"
+ ADD CONSTRAINT "SHADOW_TABLE_PK"
+ PRIMARY KEY ("SHD_UID");
+CREATE INDEX "indexShadowTable" ON "SHADOW_TABLE" ("SHD_UID");
+CREATE INDEX "indexShadowTable" ON "SHADOW_TABLE" ("SHD_UID");
+
+
+/* -----------------------------------------------------------------------
+ EVENT
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "EVENT" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "EVENT"
+(
+ "EVN_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "EVN_STATUS" VARCHAR2(16) default 'OPEN' NOT NULL,
+ "EVN_WHEN_OCCURS" VARCHAR2(32) default 'SINGLE',
+ "EVN_RELATED_TO" VARCHAR2(16) default 'SINGLE',
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "EVN_TAS_UID_FROM" VARCHAR2(32) default '',
+ "EVN_TAS_UID_TO" VARCHAR2(32) default '',
+ "EVN_TAS_ESTIMATED_DURATION" FLOAT default 0,
+ "EVN_TIME_UNIT" VARCHAR2(10) default 'DAYS' NOT NULL,
+ "EVN_WHEN" FLOAT default 0 NOT NULL,
+ "EVN_MAX_ATTEMPTS" NUMBER(3,0) default 3 NOT NULL,
+ "EVN_ACTION" VARCHAR2(50) default '' NOT NULL,
+ "EVN_CONDITIONS" VARCHAR2(2000),
+ "EVN_ACTION_PARAMETERS" VARCHAR2(2000),
+ "TRI_UID" VARCHAR2(32) default '',
+ "EVN_POSX" NUMBER default 0 NOT NULL,
+ "EVN_POSY" NUMBER default 0 NOT NULL,
+ "EVN_TYPE" VARCHAR2(32) default '',
+ "TAS_EVN_UID" VARCHAR2(32) default ''
+);
+
+ ALTER TABLE "EVENT"
+ ADD CONSTRAINT "EVENT_PK"
+ PRIMARY KEY ("EVN_UID");
+CREATE INDEX "indexEventTable" ON "EVENT" ("EVN_UID");
+CREATE INDEX "indexEventTable" ON "EVENT" ("EVN_UID");
+
+
+/* -----------------------------------------------------------------------
+ GATEWAY
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "GATEWAY" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "GATEWAY"
+(
+ "GAT_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "GAT_NEXT_TASK" VARCHAR2(32) default '' NOT NULL,
+ "GAT_X" NUMBER default 0 NOT NULL,
+ "GAT_Y" NUMBER default 0 NOT NULL,
+ "GAT_TYPE" VARCHAR2(32) default '' NOT NULL
+);
+
+ ALTER TABLE "GATEWAY"
+ ADD CONSTRAINT "GATEWAY_PK"
+ PRIMARY KEY ("GAT_UID");
+
+
+/* -----------------------------------------------------------------------
+ APP_EVENT
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_EVENT" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_EVENT"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "DEL_INDEX" NUMBER default 0 NOT NULL,
+ "EVN_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_EVN_ACTION_DATE" DATE NOT NULL,
+ "APP_EVN_ATTEMPTS" NUMBER(3,0) default 0 NOT NULL,
+ "APP_EVN_LAST_EXECUTION_DATE" DATE,
+ "APP_EVN_STATUS" VARCHAR2(32) default 'OPEN' NOT NULL
+);
+
+ ALTER TABLE "APP_EVENT"
+ ADD CONSTRAINT "APP_EVENT_PK"
+ PRIMARY KEY ("APP_UID","DEL_INDEX","EVN_UID");
+
+
+/* -----------------------------------------------------------------------
+ APP_CACHE_VIEW
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_CACHE_VIEW" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_CACHE_VIEW"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "DEL_INDEX" NUMBER default 0 NOT NULL,
+ "DEL_LAST_INDEX" NUMBER default 0 NOT NULL,
+ "APP_NUMBER" NUMBER default 0 NOT NULL,
+ "APP_STATUS" VARCHAR2(32) default '' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "PREVIOUS_USR_UID" VARCHAR2(32) default '',
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "DEL_DELEGATE_DATE" DATE NOT NULL,
+ "DEL_INIT_DATE" DATE,
+ "DEL_TASK_DUE_DATE" DATE,
+ "DEL_FINISH_DATE" DATE,
+ "DEL_THREAD_STATUS" VARCHAR2(32) default 'OPEN',
+ "APP_THREAD_STATUS" VARCHAR2(32) default 'OPEN',
+ "APP_TITLE" VARCHAR2(255) default '' NOT NULL,
+ "APP_PRO_TITLE" VARCHAR2(255) default '' NOT NULL,
+ "APP_TAS_TITLE" VARCHAR2(255) default '' NOT NULL,
+ "APP_CURRENT_USER" VARCHAR2(128) default '',
+ "APP_DEL_PREVIOUS_USER" VARCHAR2(128) default '',
+ "DEL_PRIORITY" VARCHAR2(32) default '3' NOT NULL,
+ "DEL_DURATION" FLOAT default 0,
+ "DEL_QUEUE_DURATION" FLOAT default 0,
+ "DEL_DELAY_DURATION" FLOAT default 0,
+ "DEL_STARTED" NUMBER(3,0) default 0 NOT NULL,
+ "DEL_FINISHED" NUMBER(3,0) default 0 NOT NULL,
+ "DEL_DELAYED" NUMBER(3,0) default 0 NOT NULL,
+ "APP_CREATE_DATE" DATE NOT NULL,
+ "APP_FINISH_DATE" DATE,
+ "APP_UPDATE_DATE" DATE NOT NULL,
+ "APP_OVERDUE_PERCENTAGE" FLOAT NOT NULL
+);
+
+ ALTER TABLE "APP_CACHE_VIEW"
+ ADD CONSTRAINT "APP_CACHE_VIEW_PK"
+ PRIMARY KEY ("APP_UID","DEL_INDEX");
+CREATE INDEX "indexAppNumber" ON "APP_CACHE_VIEW" ("APP_NUMBER");
+CREATE INDEX "indexAppUser" ON "APP_CACHE_VIEW" ("USR_UID","APP_STATUS");
+CREATE INDEX "indexAppNumber" ON "APP_CACHE_VIEW" ("APP_NUMBER");
+CREATE INDEX "indexAppUser" ON "APP_CACHE_VIEW" ("USR_UID","APP_STATUS");
+
+
+/* -----------------------------------------------------------------------
+ DIM_TIME_DELEGATE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "DIM_TIME_DELEGATE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "DIM_TIME_DELEGATE"
+(
+ "TIME_ID" VARCHAR2(10) default '' NOT NULL,
+ "MONTH_ID" NUMBER default 0 NOT NULL,
+ "QTR_ID" NUMBER default 0 NOT NULL,
+ "YEAR_ID" NUMBER default 0 NOT NULL,
+ "MONTH_NAME" VARCHAR2(3) default '0' NOT NULL,
+ "MONTH_DESC" VARCHAR2(9) default '' NOT NULL,
+ "QTR_NAME" VARCHAR2(4) default '' NOT NULL,
+ "QTR_DESC" VARCHAR2(9) default '' NOT NULL
+);
+
+ ALTER TABLE "DIM_TIME_DELEGATE"
+ ADD CONSTRAINT "DIM_TIME_DELEGATE_PK"
+ PRIMARY KEY ("TIME_ID");
+
+
+/* -----------------------------------------------------------------------
+ DIM_TIME_COMPLETE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "DIM_TIME_COMPLETE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "DIM_TIME_COMPLETE"
+(
+ "TIME_ID" VARCHAR2(10) default '' NOT NULL,
+ "MONTH_ID" NUMBER default 0 NOT NULL,
+ "QTR_ID" NUMBER default 0 NOT NULL,
+ "YEAR_ID" NUMBER default 0 NOT NULL,
+ "MONTH_NAME" VARCHAR2(3) default '0' NOT NULL,
+ "MONTH_DESC" VARCHAR2(9) default '' NOT NULL,
+ "QTR_NAME" VARCHAR2(4) default '' NOT NULL,
+ "QTR_DESC" VARCHAR2(9) default '' NOT NULL
+);
+
+ ALTER TABLE "DIM_TIME_COMPLETE"
+ ADD CONSTRAINT "DIM_TIME_COMPLETE_PK"
+ PRIMARY KEY ("TIME_ID");
+
+
+/* -----------------------------------------------------------------------
+ APP_HISTORY
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_HISTORY" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_HISTORY"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "DEL_INDEX" NUMBER default 0 NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "DYN_UID" VARCHAR2(32) default '' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_STATUS" VARCHAR2(100) default '' NOT NULL,
+ "HISTORY_DATE" DATE,
+ "HISTORY_DATA" VARCHAR2(2000) NOT NULL
+);
+CREATE INDEX "indexAppHistory" ON "APP_HISTORY" ("APP_UID","TAS_UID","USR_UID");
+CREATE INDEX "indexAppHistory" ON "APP_HISTORY" ("APP_UID","TAS_UID","USR_UID");
+
+
+/* -----------------------------------------------------------------------
+ APP_FOLDER
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_FOLDER" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_FOLDER"
+(
+ "FOLDER_UID" VARCHAR2(32) default '' NOT NULL,
+ "FOLDER_PARENT_UID" VARCHAR2(32) default '' NOT NULL,
+ "FOLDER_NAME" VARCHAR2(2000) NOT NULL,
+ "FOLDER_CREATE_DATE" DATE NOT NULL,
+ "FOLDER_UPDATE_DATE" DATE NOT NULL
+);
+
+ ALTER TABLE "APP_FOLDER"
+ ADD CONSTRAINT "APP_FOLDER_PK"
+ PRIMARY KEY ("FOLDER_UID");
+
+
+/* -----------------------------------------------------------------------
+ FIELD_CONDITION
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "FIELD_CONDITION" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "FIELD_CONDITION"
+(
+ "FCD_UID" VARCHAR2(32) default '' NOT NULL,
+ "FCD_FUNCTION" VARCHAR2(50) NOT NULL,
+ "FCD_FIELDS" VARCHAR2(2000),
+ "FCD_CONDITION" VARCHAR2(2000),
+ "FCD_EVENTS" VARCHAR2(2000),
+ "FCD_EVENT_OWNERS" VARCHAR2(2000),
+ "FCD_STATUS" VARCHAR2(10),
+ "FCD_DYN_UID" VARCHAR2(32) NOT NULL
+);
+
+ ALTER TABLE "FIELD_CONDITION"
+ ADD CONSTRAINT "FIELD_CONDITION_PK"
+ PRIMARY KEY ("FCD_UID");
+
+
+/* -----------------------------------------------------------------------
+ LOG_CASES_SCHEDULER
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "LOG_CASES_SCHEDULER" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "LOG_CASES_SCHEDULER"
+(
+ "LOG_CASE_UID" VARCHAR2(32) default '' NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "USR_NAME" VARCHAR2(32) default '' NOT NULL,
+ "EXEC_DATE" DATE NOT NULL,
+ "EXEC_HOUR" VARCHAR2(32) default '12:00' NOT NULL,
+ "RESULT" VARCHAR2(32) default 'SUCCESS' NOT NULL,
+ "SCH_UID" VARCHAR2(32) default 'OPEN' NOT NULL,
+ "WS_CREATE_CASE_STATUS" VARCHAR2(2000) NOT NULL,
+ "WS_ROUTE_CASE_STATUS" VARCHAR2(2000) NOT NULL
+);
+
+ ALTER TABLE "LOG_CASES_SCHEDULER"
+ ADD CONSTRAINT "LOG_CASES_SCHEDULER_PK"
+ PRIMARY KEY ("LOG_CASE_UID");
+
+
+/* -----------------------------------------------------------------------
+ CASE_SCHEDULER
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CASE_SCHEDULER" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CASE_SCHEDULER"
+(
+ "SCH_UID" VARCHAR2(32) NOT NULL,
+ "SCH_DEL_USER_NAME" VARCHAR2(100) NOT NULL,
+ "SCH_DEL_USER_PASS" VARCHAR2(100) NOT NULL,
+ "SCH_DEL_USER_UID" VARCHAR2(100) NOT NULL,
+ "SCH_NAME" VARCHAR2(100) NOT NULL,
+ "PRO_UID" VARCHAR2(32) default '' NOT NULL,
+ "TAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "SCH_TIME_NEXT_RUN" DATE NOT NULL,
+ "SCH_LAST_RUN_TIME" DATE,
+ "SCH_STATE" VARCHAR2(15) default 'ACTIVE' NOT NULL,
+ "SCH_LAST_STATE" VARCHAR2(60) default '' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "SCH_OPTION" NUMBER(3,0) default 0 NOT NULL,
+ "SCH_START_TIME" DATE NOT NULL,
+ "SCH_START_DATE" DATE NOT NULL,
+ "SCH_DAYS_PERFORM_TASK" CHAR(5) default '' NOT NULL,
+ "SCH_EVERY_DAYS" NUMBER(3,0) default 0,
+ "SCH_WEEK_DAYS" CHAR(14) default '0|0|0|0|0|0|0' NOT NULL,
+ "SCH_START_DAY" CHAR(6) default '' NOT NULL,
+ "SCH_MONTHS" CHAR(24) default '0|0|0|0|0|0|0|0|0|0|0|0' NOT NULL,
+ "SCH_END_DATE" DATE,
+ "SCH_REPEAT_EVERY" VARCHAR2(15) default '' NOT NULL,
+ "SCH_REPEAT_UNTIL" VARCHAR2(15) default '' NOT NULL,
+ "SCH_REPEAT_STOP_IF_RUNNING" NUMBER(3,0) default 0,
+ "CASE_SH_PLUGIN_UID" VARCHAR2(100)
+);
+
+ ALTER TABLE "CASE_SCHEDULER"
+ ADD CONSTRAINT "CASE_SCHEDULER_PK"
+ PRIMARY KEY ("SCH_UID");
+
+
+/* -----------------------------------------------------------------------
+ CALENDAR_DEFINITION
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CALENDAR_DEFINITION" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CALENDAR_DEFINITION"
+(
+ "CALENDAR_UID" VARCHAR2(32) default '' NOT NULL,
+ "CALENDAR_NAME" VARCHAR2(100) default '' NOT NULL,
+ "CALENDAR_CREATE_DATE" DATE NOT NULL,
+ "CALENDAR_UPDATE_DATE" DATE,
+ "CALENDAR_WORK_DAYS" VARCHAR2(100) default '' NOT NULL,
+ "CALENDAR_DESCRIPTION" VARCHAR2(2000) NOT NULL,
+ "CALENDAR_STATUS" VARCHAR2(8) default 'ACTIVE' NOT NULL
+);
+
+ ALTER TABLE "CALENDAR_DEFINITION"
+ ADD CONSTRAINT "CALENDAR_DEFINITION_PK"
+ PRIMARY KEY ("CALENDAR_UID");
+
+
+/* -----------------------------------------------------------------------
+ CALENDAR_BUSINESS_HOURS
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CALENDAR_BUSINESS_HOURS" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CALENDAR_BUSINESS_HOURS"
+(
+ "CALENDAR_UID" VARCHAR2(32) default '' NOT NULL,
+ "CALENDAR_BUSINESS_DAY" VARCHAR2(10) default '' NOT NULL,
+ "CALENDAR_BUSINESS_START" VARCHAR2(10) default '' NOT NULL,
+ "CALENDAR_BUSINESS_END" VARCHAR2(10) default '' NOT NULL
+);
+
+ ALTER TABLE "CALENDAR_BUSINESS_HOURS"
+ ADD CONSTRAINT "CALENDAR_BUSINESS_HOURS_PK"
+ PRIMARY KEY ("CALENDAR_UID","CALENDAR_BUSINESS_DAY","CALENDAR_BUSINESS_START","CALENDAR_BUSINESS_END");
+
+
+/* -----------------------------------------------------------------------
+ CALENDAR_HOLIDAYS
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CALENDAR_HOLIDAYS" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CALENDAR_HOLIDAYS"
+(
+ "CALENDAR_UID" VARCHAR2(32) default '' NOT NULL,
+ "CALENDAR_HOLIDAY_NAME" VARCHAR2(100) default '' NOT NULL,
+ "CALENDAR_HOLIDAY_START" DATE NOT NULL,
+ "CALENDAR_HOLIDAY_END" DATE NOT NULL
+);
+
+ ALTER TABLE "CALENDAR_HOLIDAYS"
+ ADD CONSTRAINT "CALENDAR_HOLIDAYS_PK"
+ PRIMARY KEY ("CALENDAR_UID","CALENDAR_HOLIDAY_NAME");
+
+
+/* -----------------------------------------------------------------------
+ CALENDAR_ASSIGNMENTS
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "CALENDAR_ASSIGNMENTS" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "CALENDAR_ASSIGNMENTS"
+(
+ "OBJECT_UID" VARCHAR2(32) default '' NOT NULL,
+ "CALENDAR_UID" VARCHAR2(32) default '' NOT NULL,
+ "OBJECT_TYPE" VARCHAR2(100) default '' NOT NULL
+);
+
+ ALTER TABLE "CALENDAR_ASSIGNMENTS"
+ ADD CONSTRAINT "CALENDAR_ASSIGNMENTS_PK"
+ PRIMARY KEY ("OBJECT_UID");
+
+
+/* -----------------------------------------------------------------------
+ PROCESS_CATEGORY
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "PROCESS_CATEGORY" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "PROCESS_CATEGORY"
+(
+ "CATEGORY_UID" VARCHAR2(32) default '' NOT NULL,
+ "CATEGORY_PARENT" VARCHAR2(32) default '0' NOT NULL,
+ "CATEGORY_NAME" VARCHAR2(100) default '' NOT NULL,
+ "CATEGORY_ICON" VARCHAR2(100) default ''
+);
+
+ ALTER TABLE "PROCESS_CATEGORY"
+ ADD CONSTRAINT "PROCESS_CATEGORY_PK"
+ PRIMARY KEY ("CATEGORY_UID");
+
+
+/* -----------------------------------------------------------------------
+ APP_NOTES
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_NOTES" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_NOTES"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "USR_UID" VARCHAR2(32) default '' NOT NULL,
+ "NOTE_DATE" DATE NOT NULL,
+ "NOTE_CONTENT" VARCHAR2(2000) NOT NULL,
+ "NOTE_TYPE" VARCHAR2(32) default 'USER' NOT NULL,
+ "NOTE_AVAILABILITY" VARCHAR2(32) default 'PUBLIC' NOT NULL,
+ "NOTE_ORIGIN_OBJ" VARCHAR2(32) default '',
+ "NOTE_AFFECTED_OBJ1" VARCHAR2(32) default '',
+ "NOTE_AFFECTED_OBJ2" VARCHAR2(32) default '' NOT NULL,
+ "NOTE_RECIPIENTS" VARCHAR2(2000)
+);
+CREATE INDEX "indexAppNotesDate" ON "APP_NOTES" ("APP_UID","NOTE_DATE");
+CREATE INDEX "indexAppNotesUser" ON "APP_NOTES" ("APP_UID","USR_UID");
+CREATE INDEX "indexAppNotesDate" ON "APP_NOTES" ("APP_UID","NOTE_DATE");
+CREATE INDEX "indexAppNotesUser" ON "APP_NOTES" ("APP_UID","USR_UID");
+
+
+/* -----------------------------------------------------------------------
+ DASHLET
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "DASHLET" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "DASHLET"
+(
+ "DAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "DAS_CLASS" VARCHAR2(50) default '' NOT NULL,
+ "DAS_TITLE" VARCHAR2(255) default '' NOT NULL,
+ "DAS_DESCRIPTION" VARCHAR2(2000),
+ "DAS_VERSION" VARCHAR2(10) default '1.0' NOT NULL,
+ "DAS_CREATE_DATE" DATE NOT NULL,
+ "DAS_UPDATE_DATE" DATE,
+ "DAS_STATUS" NUMBER(3,0) default 1 NOT NULL
+);
+
+ ALTER TABLE "DASHLET"
+ ADD CONSTRAINT "DASHLET_PK"
+ PRIMARY KEY ("DAS_UID");
+
+
+/* -----------------------------------------------------------------------
+ DASHLET_INSTANCE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "DASHLET_INSTANCE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "DASHLET_INSTANCE"
+(
+ "DAS_INS_UID" VARCHAR2(32) default '' NOT NULL,
+ "DAS_UID" VARCHAR2(32) default '' NOT NULL,
+ "DAS_INS_OWNER_TYPE" VARCHAR2(20) default '' NOT NULL,
+ "DAS_INS_OWNER_UID" VARCHAR2(32) default '',
+ "DAS_INS_ADDITIONAL_PROPERTIES" VARCHAR2(2000),
+ "DAS_INS_CREATE_DATE" DATE NOT NULL,
+ "DAS_INS_UPDATE_DATE" DATE,
+ "DAS_INS_STATUS" NUMBER(3,0) default 1 NOT NULL
+);
+
+ ALTER TABLE "DASHLET_INSTANCE"
+ ADD CONSTRAINT "DASHLET_INSTANCE_PK"
+ PRIMARY KEY ("DAS_INS_UID");
+
+
+/* -----------------------------------------------------------------------
+ APP_SOLR_QUEUE
+ ----------------------------------------------------------------------- */
+
+DROP TABLE "APP_SOLR_QUEUE" CASCADE CONSTRAINTS;
+
+
+CREATE TABLE "APP_SOLR_QUEUE"
+(
+ "APP_UID" VARCHAR2(32) default '' NOT NULL,
+ "APP_UPDATED" NUMBER(3,0) default 1 NOT NULL
+);
+
+ ALTER TABLE "APP_SOLR_QUEUE"
+ ADD CONSTRAINT "APP_SOLR_QUEUE_PK"
+ PRIMARY KEY ("APP_UID");
diff --git a/workflow/engine/methods/setup/appCacheViewAjax.php b/workflow/engine/methods/setup/appCacheViewAjax.php
index 4f2a7dd3c..9fd1ee6ac 100755
--- a/workflow/engine/methods/setup/appCacheViewAjax.php
+++ b/workflow/engine/methods/setup/appCacheViewAjax.php
@@ -150,6 +150,10 @@ switch ($request) {
$appCache = new AppCacheView();
$appCache->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+ //Update APP_DELEGATION.DEL_LAST_INDEX data
+ $res = $appCache->updateAppDelegationDelLastIndex($lang, true);
+ //$result->info[] = array("name" => "update APP_DELEGATION.DEL_LAST_INDEX", "value" => $res);
+
//APP_DELEGATION INSERT
$res = $appCache->triggerAppDelegationInsert( $lang, true );
//$result->info[] = array ('name' => 'Trigger APP_DELEGATION INSERT', 'value'=> $res);
diff --git a/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql b/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
index 909ee71fa..7416765bc 100755
--- a/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
+++ b/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
@@ -2,6 +2,7 @@ CREATE TABLE `APP_CACHE_VIEW`
(
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
+ `DEL_LAST_INDEX` INTEGER default 0 NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_STATUS` VARCHAR(32) default '' NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
diff --git a/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql b/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
index ed26d9208..3f6ad340b 100755
--- a/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
+++ b/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
@@ -33,7 +33,8 @@ SELECT
APPLICATION.APP_CREATE_DATE,
IF (APPLICATION.APP_STATUS = 'COMPLETED', APPLICATION.APP_FINISH_DATE, NULL),
APPLICATION.APP_UPDATE_DATE,
- APP_DELEGATION.APP_OVERDUE_PERCENTAGE
+ APP_DELEGATION.APP_OVERDUE_PERCENTAGE,
+ APP_DELEGATION.DEL_LAST_INDEX
FROM
APPLICATION FORCE INDEX (PRIMARY)
LEFT JOIN APP_DELEGATION ON (APPLICATION.APP_UID=APP_DELEGATION.APP_UID)
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
index 03c1e1578..f884649ba 100755
--- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
@@ -42,6 +42,7 @@ BEGIN
SET @APP_THREAD_STATUS = 'OPEN';
END IF;
SET @TAS_TYPE = (SELECT TAS_TYPE FROM TASK WHERE TAS_UID = NEW.TAS_UID LIMIT 1);
+ UPDATE APP_CACHE_VIEW SET DEL_LAST_INDEX = 0 WHERE APP_UID = NEW.APP_UID;
IF( @TAS_TYPE != 'SUBPROCESS') THEN
INSERT INTO `APP_CACHE_VIEW` (
APP_UID,
@@ -73,7 +74,8 @@ BEGIN
APP_CREATE_DATE,
APP_FINISH_DATE,
APP_UPDATE_DATE,
- APP_OVERDUE_PERCENTAGE
+ APP_OVERDUE_PERCENTAGE,
+ DEL_LAST_INDEX
)
VALUES (
NEW.APP_UID,
@@ -105,7 +107,8 @@ BEGIN
@APP_CREATE_DATE,
NULL,
NOW(),
- NEW.APP_OVERDUE_PERCENTAGE
+ NEW.APP_OVERDUE_PERCENTAGE,
+ NEW.DEL_LAST_INDEX
);
END IF;
END
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
index c8baf5d15..f5592c526 100755
--- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
@@ -70,7 +70,8 @@ BEGIN
DEL_FINISHED = NEW.DEL_FINISHED,
DEL_DELAYED = NEW.DEL_DELAYED,
APP_FINISH_DATE = NULL,
- APP_OVERDUE_PERCENTAGE = NEW.APP_OVERDUE_PERCENTAGE
+ APP_OVERDUE_PERCENTAGE = NEW.APP_OVERDUE_PERCENTAGE,
+ DEL_LAST_INDEX = NEW.DEL_LAST_INDEX
WHERE
APP_UID = NEW.APP_UID
AND DEL_INDEX = NEW.DEL_INDEX;
diff --git a/workflow/engine/xmlform/patterns/patterns_Parallel.html b/workflow/engine/xmlform/patterns/patterns_Parallel.html
index 76cf6a767..8234f4862 100755
--- a/workflow/engine/xmlform/patterns/patterns_Parallel.html
+++ b/workflow/engine/xmlform/patterns/patterns_Parallel.html
@@ -10,6 +10,9 @@
| {$form.action} |
+
+
+ | {$form.LANG} |
| {$form.ROU_UID} |
diff --git a/workflow/engine/xmlform/patterns/patterns_Parallel.xml b/workflow/engine/xmlform/patterns/patterns_Parallel.xml
index 2513b5a19..08ada7a28 100755
--- a/workflow/engine/xmlform/patterns/patterns_Parallel.xml
+++ b/workflow/engine/xmlform/patterns/patterns_Parallel.xml
@@ -30,6 +30,7 @@