Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-2820

gulliver/system/class.database_mysql.php

@@ -207,12 +207,16 @@ class database extends database_base
             }
         }
         if (isset( $aParameters['AutoIncrement'] ) && $aParameters['AutoIncrement']) {
-            $sSQL .= ' AUTO_INCREMENT PRIMARY KEY';
+            $sSQL .= ' AUTO_INCREMENT';
         }
-        /*if ($aParameters['Key'] == 'PRI') {
+        if (isset( $aParameters['PrimaryKey'] ) && $aParameters['PrimaryKey']) {
-         $sKeys .= 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter .
+            $sSQL .= ' PRIMARY KEY';
-                ' ADD PRIMARY KEY (' . $this->sQuoteCharacter . $sColumn . $this->sQuoteCharacter . ')' . $this->sEndLine;
+        }
-         }*/
+        if (isset( $aParameters['Unique'] ) && $aParameters['Unique']) {
+            $sSQL .= ' UNIQUE';
+        }
+
+        //we need to check the property AI
         if (isset( $aParameters['AI'] )) {
             if ($aParameters['AI'] == 1) {
                 $sSQL .= ' AUTO_INCREMENT';

workflow/engine/bin/tasks/cliListIds.php

@@ -0,0 +1,33 @@
+<?php
+
+function cliListIds($command, $args)
+{
+    G::LoadClass("wsTools");
+    CLI::logging("list-ids INIT\n");
+
+    $workspaces = get_workspaces_from_args($command);
+
+    foreach ($workspaces as $index => $workspace) {
+        $hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']);
+        $hostPort = $hostPort1[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : "");
+        $connectionString = sprintf(
+            "%s:host=%s;dbname=%s",
+            $workspace->dbInfo['DB_ADAPTER'],
+            $hostPort,
+            $workspace->dbInfo['DB_NAME']
+        );
+        $dbh = new PDO(
+            $connectionString,
+            $workspace->dbInfo['DB_USER'],
+            $workspace->dbInfo['DB_PASS']
+        );
+        foreach (workspaceTools::$populateIdsQueries as $query) {
+            echo ".";
+            $dbh->query($query);
+        }
+        echo "\n";
+    }
+
+    //Done
+    CLI::logging("list-ids DONE\n");
+}

workflow/engine/bin/tasks/cliWorkspaces.php

@@ -276,6 +276,18 @@ CLI::taskArg('workspace', true, true);
 CLI::taskRun("run_migrate_list_unassigned");
 /*----------------------------------********---------------------------------*/
 
+CLI::taskName('migrate-indexing-acv');
+CLI::taskDescription(<<<EOT
+  Migrate and populate the indexes for the new relation fields to avoid the use of APP_CACHE_VIEW table
+
+  Specify the workspace, the self-service cases in this workspace will be updated.
+
+  If no workspace is specified, the command will be running in all workspaces.
+EOT
+);
+CLI::taskArg('workspace', true, true);
+CLI::taskRun("run_migrate_indexing_acv");
+
 CLI::taskName('migrate-content');
 CLI::taskDescription(<<<EOT
   Migrating the content schema to match the latest version
@@ -301,6 +313,21 @@ EOT
 CLI::taskArg('workspace', true, true);
 CLI::taskRun("run_migrate_self_service_value");
 
+/**
+ * Complete the PRO_ID and USR_ID in the LIST_* tables.
+ *
+ * It calls the list_ids@cliListIds.php
+ */
+CLI::taskName('list-ids');
+CLI::taskDescription(<<<EOT
+    Complete the PRO_ID and USR_ID in the LIST_* tables.
+EOT
+);
+CLI::taskOpt("lang", "", "lLANG", "lang=LANG");
+CLI::taskArg('workspace');
+CLI::taskRun("cliListIds");
+/*----------------------------------********---------------------------------*/
+
   /**
    * Function run_info
    * access public
@@ -935,3 +962,18 @@ function run_migrate_self_service_value($args, $opts) {
     $stop = microtime(true);
     CLI::logging("<*>   Migrating Self-Service records Process took " . ($stop - $start) . " seconds.\n");
 }
+
+function run_migrate_indexing_acv($args, $opts) {
+    G::LoadSystem('inputfilter');
+    $filter = new InputFilter();
+    $args = $filter->xssFilterHard($args);
+    $workspaces = get_workspaces_from_args($args);
+    $start = microtime(true);
+    CLI::logging("> Migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...\n");
+    foreach ($workspaces as $workspace) {
+        print_r('Indexing for APP_CACHE_VIEW: ' . pakeColor::colorize($workspace->name, 'INFO') . "\n");
+        $workspace->migratePopulateIndexingACV($workspace->name);
+    }
+    $stop = microtime(true);
+    CLI::logging("<*>   Migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
+}

workflow/engine/classes/class.applications.php

@@ -1,6 +1,194 @@
 <?php
 class Applications
 {
+    /**
+     * This function return information by searching cases
+     *
+     * The query is related to advanced search with diferents filters
+     * We can search by process, status of case, category of process, users, delegate date from and to
+     *
+     * @param string $userUid
+     * @param integer $start for the pagination
+     * @param integer $limit for the pagination
+     * @param string $search
+     * @param integer $process the pro_id
+     * @param integer $status of the case
+     * @param string $dir if the order is DESC or ASC
+     * @param string $sort name of column by sort
+     * @param string $category uid for the process
+     * @param date $dateFrom
+     * @param date $dateTo
+     * @return array $result result of the query
+     */
+    public function searchAll(
+        $userUid,
+        $start = null,
+        $limit = null,
+        $search = null,
+        $process = null,
+        $status = null,
+        $dir = null,
+        $sort = null,
+        $category = null,
+        $dateFrom = null,
+        $dateTo = null
+    ) {
+        //Exclude the Task Dummies in the delegations
+        $arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
+
+        //Start the connection to database
+        $con = Propel::getConnection(AppDelegationPeer::DATABASE_NAME);
+        $con->begin();
+        $stmt = $con->createStatement();
+
+        $sqlData = "SELECT
+                    STRAIGHT_JOIN APPLICATION.APP_NUMBER,
+                    APPLICATION.APP_UID,
+                    APPLICATION.APP_STATUS,
+                    APPLICATION.APP_STATUS AS APP_STATUS_LABEL,
+                    APPLICATION.PRO_UID,
+                    APPLICATION.APP_CREATE_DATE,
+                    APPLICATION.APP_FINISH_DATE,
+                    APPLICATION.APP_UPDATE_DATE,
+                    APPLICATION.APP_TITLE,
+                    APP_DELEGATION.USR_UID,
+                    APP_DELEGATION.TAS_UID,
+                    APP_DELEGATION.DEL_INDEX,
+                    APP_DELEGATION.DEL_LAST_INDEX,
+                    APP_DELEGATION.DEL_DELEGATE_DATE,
+                    APP_DELEGATION.DEL_INIT_DATE,
+                    APP_DELEGATION.DEL_FINISH_DATE,
+                    APP_DELEGATION.DEL_TASK_DUE_DATE,
+                    APP_DELEGATION.DEL_RISK_DATE,
+                    APP_DELEGATION.DEL_THREAD_STATUS,
+                    APP_DELEGATION.DEL_PRIORITY,
+                    APP_DELEGATION.DEL_DURATION,
+                    APP_DELEGATION.DEL_QUEUE_DURATION,
+                    APP_DELEGATION.DEL_STARTED,
+                    APP_DELEGATION.DEL_DELAY_DURATION,
+                    APP_DELEGATION.DEL_FINISHED,
+                    APP_DELEGATION.DEL_DELAYED,
+                    APP_DELEGATION.DEL_DELAY_DURATION,
+                    TASK.TAS_TITLE AS APP_TAS_TITLE,
+                    USERS.USR_LASTNAME,
+                    USERS.USR_FIRSTNAME,
+                    USERS.USR_USERNAME,
+                    PROCESS.PRO_TITLE AS APP_PRO_TITLE
+                FROM APP_DELEGATION
+        ";
+        $sqlData .= " LEFT JOIN APPLICATION ON (APP_DELEGATION.APP_NUMBER = APPLICATION.APP_NUMBER)";
+        $sqlData .= " LEFT JOIN TASK ON (APP_DELEGATION.TAS_ID = TASK.TAS_ID)";
+        $sqlData .= " LEFT JOIN USERS ON (APP_DELEGATION.USR_ID = USERS.USR_ID)";
+        $sqlData .= " LEFT JOIN PROCESS ON (APP_DELEGATION.PRO_ID = PROCESS.PRO_ID)";
+
+        $sqlData .= " WHERE TASK.TAS_TYPE NOT IN ('" . implode("','",$arrayTaskTypeToExclude) . "')";
+        switch ($status) {
+            case 1: //DRAFT
+                $sqlData .= " AND APP_DELEGATION.DEL_THREAD_STATUS='OPEN'";
+                $sqlData .= " AND APPLICATION.APP_STATUS_ID = 1";
+                break;
+            case 2: //TO_DO
+                $sqlData .= " AND APP_DELEGATION.DEL_THREAD_STATUS='OPEN'";
+                $sqlData .= " AND APPLICATION.APP_STATUS_ID = 2";
+                break;
+            case 3: //COMPLETED
+                $sqlData .= " AND APPLICATION.APP_STATUS_ID = 3";
+                $sqlData .= " AND APP_DELEGATION.DEL_LAST_INDEX = 1";
+                break;
+            case 4: //CANCELLED
+                $sqlData .= " AND APPLICATION.APP_STATUS_ID = 4";
+                $sqlData .= " AND APP_DELEGATION.DEL_LAST_INDEX = 1";
+                break;
+            case "PAUSED": //This status is not considered in the search, maybe we can add in the new versions
+                $sqlData .= " AND APPLICATION.APP_STATUS = 'TO_DO'";
+                break;
+            default: //All status
+                $sqlData .= " AND (APP_DELEGATION.DEL_THREAD_STATUS = 'OPEN' ";
+                $sqlData .= " OR (APP_DELEGATION.DEL_THREAD_STATUS = 'CLOSED' AND APP_DELEGATION.DEL_LAST_INDEX = 1)) ";
+                break;
+        }
+
+        if (!empty($userUid)) {
+            $sqlData .= " AND APP_DELEGATION.USR_ID = " . $userUid;
+        }
+
+        if (!empty($process)) {
+            $sqlData .= " AND APP_DELEGATION.PRO_ID = " . $process;
+        }
+
+        if (!empty($category)) {
+            $category = mysql_real_escape_string($category);
+            $sqlData .= " AND PROCESS.PRO_CATEGORY = '{$category}'";
+        }
+
+        if (!empty($search)) {
+            //In the filter search we check in the following columns: APP_NUMBER APP_TAS_TITLE APP_TITLE
+            $sqlData .= " AND (APPLICATION.APP_TITLE LIKE '%{$search}%' OR APP_DELEGATION.APP_NUMBER LIKE '%{$search}%' OR TASK.TAS_TITLE LIKE '%{$search}%')";
+        }
+
+        if (!empty($dateFrom)) {
+            $sqlData .= " AND APP_DELEGATION.DEL_DELEGATE_DATE >= '{$dateFrom}'";
+        }
+
+        if (!empty($dateTo)) {
+            $dateTo = $dateTo . " 23:59:59";
+            $sqlData .= " AND APP_DELEGATION.DEL_DELEGATE_DATE <= '{$dateTo}'";
+        }
+
+        //Add the additional filters
+        if (!empty($sort)) {
+            switch ($sort) {
+                case 'APP_NUMBER':
+                    //The order by APP_DELEGATION.APP_NUMBER is must be fast than APPLICATION.APP_NUMBER
+                    $sort = 'APP_DELEGATION.APP_NUMBER';
+                    break;
+                case 'APP_CURRENT_USER':
+                    //The column APP_CURRENT_USER is result of concat those fields
+                    $sort = 'USR_LASTNAME, USR_FIRSTNAME';
+                    break;
+            }
+            $sqlData .= " ORDER BY " . $sort;
+        }
+
+        //Sorts the records in descending order by default
+        if (!empty($dir)) {
+            $sqlData .= "  " . $dir;
+        }
+
+        //Define the number of records by return
+        if (!empty($start)) {
+            $sqlData .= " LIMIT $start, " . $limit;
+        } else {
+            $sqlData .= " LIMIT " . $limit;
+        }
+
+        $oDataset = $stmt->executeQuery($sqlData);
+        $result = array ();
+        //By performance enable always the pagination
+        $result['totalCount'] = $start + $limit + 1;
+        $rows = array();
+        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        while ($oDataset->next()) {
+            $aRow = $oDataset->getRow();
+            if (isset( $aRow['APP_STATUS'] )) {
+                $aRow['APP_STATUS_LABEL'] = G::LoadTranslation( "ID_{$aRow['APP_STATUS']}" );
+            }
+            if (isset( $aRow['DEL_PRIORITY'] )) {
+                $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+            }
+            $aRow["APP_CURRENT_USER"] = $aRow["USR_LASTNAME"].' '.$aRow["USR_FIRSTNAME"];
+            $aRow["APPDELCR_APP_TAS_TITLE"] = '';
+            $aRow["USRCR_USR_UID"] = $aRow["USR_UID"];
+            $aRow["USRCR_USR_FIRSTNAME"] = $aRow["USR_FIRSTNAME"];
+            $aRow["USRCR_USR_LASTNAME"] = $aRow["USR_LASTNAME"];
+            $aRow["USRCR_USR_USERNAME"] = $aRow["USR_USERNAME"];
+            $aRow["APP_OVERDUE_PERCENTAGE"] = '';
+            $rows[] = $aRow;
+        }
+        $result['data'] = $rows;
+        return $result;
+    }
+
     public function getAll(
         $userUid,
         $start = null,

workflow/engine/classes/class.case.php

@@ -514,10 +514,8 @@ class Cases
                 $aFields['DEL_TASK_DUE_DATE'] = $aAppDel['DEL_TASK_DUE_DATE'];
                 $aFields['DEL_FINISH_DATE'] = $aAppDel['DEL_FINISH_DATE'];
                 $aFields['CURRENT_USER_UID'] = $aAppDel['USR_UID'];
+                $aFields['PRO_ID'] = $aAppDel['PRO_ID'];
                 try {
-                    //$oCurUser = new Users();
-                    //$oCurUser->load($aAppDel['USR_UID']);
-                    //$aFields['CURRENT_USER'] = $oCurUser->getUsrFirstname() . ' ' . $oCurUser->getUsrLastname();
                     $oCurUser = new Users();
                     if ($jump != '') {
                         $aCases = $oAppDel->LoadParallel($sAppUid);
@@ -1195,9 +1193,12 @@ class Cases
     public function setCatchUser($sAppUid, $iDelIndex, $usrId)
     {
         try {
+            $user = UsersPeer::retrieveByPk($usrId);
+
             $oAppDel = AppDelegationPeer::retrieveByPk($sAppUid, $iDelIndex);
             $oAppDel->setDelInitDate("now");
             $oAppDel->setUsrUid($usrId);
+            $oAppDel->setUsrId($user->getUsrId());
             $oAppDel->save();
 
             //update searchindex
@@ -1657,16 +1658,38 @@ class Cases
      * @param string $iPriority
      * @param string $sDelType
      * @param string $iAppThreadIndex
+     * @param string $nextDel
+     * @param boolean $flagControl
+     * @param boolean $flagControlMulInstance
+     * @param int $delPrevious
+     * @param int $appNumber
+     * @param int $proId
+     * @param int $tasId
      * @return void
      */
 
-    public function newAppDelegation($sProUid, $sAppUid, $sTasUid, $sUsrUid, $sPrevious, $iPriority, $sDelType, $iAppThreadIndex = 1, $nextDel = null, $flagControl = false, $flagControlMulInstance = false, $delPrevious = 0)
+    public function newAppDelegation($sProUid, $sAppUid, $sTasUid, $sUsrUid, $sPrevious, $iPriority, $sDelType, $iAppThreadIndex = 1, $nextDel = null, $flagControl = false, $flagControlMulInstance = false, $delPrevious = 0, $appNumber = 0, $proId = 0, $tasId = 0)
     {
         try {
+            $user = UsersPeer::retrieveByPK($sUsrUid);
             $appDel = new AppDelegation();
             $result = $appDel->createAppDelegation(
-                    $sProUid, $sAppUid, $sTasUid, $sUsrUid, $iAppThreadIndex, $iPriority, false, $sPrevious, $nextDel, $flagControl,
+                $sProUid,
-                    $flagControlMulInstance, $delPrevious
+                $sAppUid,
+                $sTasUid,
+                $sUsrUid,
+                $iAppThreadIndex,
+                $iPriority,
+                false,
+                $sPrevious,
+                $nextDel,
+                $flagControl,
+                $flagControlMulInstance,
+                $delPrevious,
+                $appNumber,
+                $tasId,
+                (empty($user)) ? 0 : $user->getUsrId(),
+                $proId
             );
             //update searchindex
             if ($this->appSolr != null) {
@@ -1869,6 +1892,7 @@ class Cases
      * @param string $sAppUid,
      * @param string $iNewDelIndex
      * @param string $iAppParent
+     * @param string $appNumber
      * @return $iAppThreadIndex $iNewDelIndex, $iAppThreadIndex );
      */
 
@@ -2020,6 +2044,7 @@ class Cases
         if ($sTasUid != '') {
             try {
                 $task = TaskPeer::retrieveByPK($sTasUid);
+                $user = UsersPeer::retrieveByPK($sUsrUid);
 
                 if (is_null($task)) {
                     throw new Exception(G::LoadTranslation("ID_TASK_NOT_EXIST", array("TAS_UID", $sTasUid)));
@@ -2046,7 +2071,23 @@ class Cases
                 $iAppThreadIndex = 1; // Start Thread
                 $iAppDelPrio = 3; // Priority
                 $iDelIndex = $AppDelegation->createAppDelegation(
-                        $sProUid, $sAppUid, $sTasUid, $sUsrUid, $iAppThreadIndex, $iAppDelPrio, $isSubprocess
+                    $sProUid,
+                    $sAppUid,
+                    $sTasUid,
+                    $sUsrUid,
+                    $iAppThreadIndex,
+                    $iAppDelPrio,
+                    $isSubprocess,
+                    -1,
+                    null,
+                    false,
+                    false,
+                    0,
+                    $Application->getAppNumber(),
+                    $task->getTasId(),
+                    (empty($user)) ? 0 : $user->getUsrId(),
+                    $this->Process->getProId()
+
                 );
 
                 //appThread
@@ -2077,8 +2118,24 @@ class Cases
                             $AppDelegation = new AppDelegation;
                             $iAppThreadIndex ++; // Start Thread
                             $iAppDelPrio = 3; // Priority
+                            $user = UsersPeer::retrieveByPK($rowUser["USR_UID"]);
                             $iDelIndex1 = $AppDelegation->createAppDelegation(
-                                   $sProUid, $sAppUid, $sTasUid, $rowUser["USR_UID"], $iAppThreadIndex, $iAppDelPrio, $isSubprocess
+                                $sProUid,
+                                $sAppUid,
+                                $sTasUid,
+                                $rowUser["USR_UID"],
+                                $iAppThreadIndex,
+                                $iAppDelPrio,
+                                $isSubprocess,
+                                -1,
+                                null,
+                                false,
+                                false,
+                                0,
+                                $Application->getAppNumber(),
+                                $task->getTasId(),
+                                (empty($user)) ? 0 : $user->getUsrId(),
+                                $this->Process->getProId()
                            );
                            //appThread
                            $AppThread = new AppThread;
@@ -3963,6 +4020,7 @@ class Cases
         $aData['APP_ENABLE_ACTION_USER'] = $sUserUID;
         $aData['APP_ENABLE_ACTION_DATE'] = date('Y-m-d H:i:s');
         $aData['APP_DISABLE_ACTION_DATE'] = $sUnpauseDate;
+        $aData['APP_NUMBER'] = $oApplication->getAppNumber();
         $oAppDelay = new AppDelay();
         $oAppDelay->create($aData);
 
@@ -4011,6 +4069,7 @@ class Cases
 
         //get information about current $iDelegation row
         $oAppDelegation = new AppDelegation();
+        $user = UsersPeer::retrieveByPK($sUserUID);
         $aFieldsDel = $oAppDelegation->Load($sApplicationUID, $iDelegation);
         //and creates a new AppDelegation row with the same user, task, process, etc.
         $proUid = $aFieldsDel['PRO_UID'];
@@ -4018,7 +4077,24 @@ class Cases
         $tasUid = $aFieldsDel['TAS_UID'];
         $usrUid = $aFieldsDel['USR_UID'];
         $delThread = $aFieldsDel['DEL_THREAD'];
-        $iIndex = $oAppDelegation->createAppDelegation($proUid, $appUid, $tasUid, $usrUid, $delThread);
+        $iIndex = $oAppDelegation->createAppDelegation(
+            $proUid,
+            $appUid,
+            $tasUid,
+            $usrUid,
+            $delThread,
+            3,
+            false,
+            -1,
+            null,
+            false,
+            false,
+            0,
+            $aFieldsDel['APP_NUMBER'],
+            $aFieldsDel['TAS_ID'],
+            (empty($user)) ? 0 : $user->getUsrId(),
+            $aFieldsDel['PRO_ID']
+        );
 
         //update other fields in the recent new appDelegation
         $aData = array();
@@ -4154,6 +4230,7 @@ class Cases
         $array['APP_DELEGATION_USER'] = $user_logged;
         $array['APP_ENABLE_ACTION_USER'] = $user_logged;
         $array['APP_ENABLE_ACTION_DATE'] = date('Y-m-d H:i:s');
+        $array['APP_NUMBER'] = $oApplication->getAppNumber();
         $delay->create($array);
 
         //Before cancel a case verify if is a child case
@@ -4367,10 +4444,26 @@ class Cases
     public function reassignCase($sApplicationUID, $iDelegation, $sUserUID, $newUserUID, $sType = 'REASSIGN')
     {
         $this->CloseCurrentDelegation($sApplicationUID, $iDelegation);
+        $user = UsersPeer::retrieveByPK($newUserUID);
         $oAppDelegation = new AppDelegation();
         $aFieldsDel = $oAppDelegation->Load($sApplicationUID, $iDelegation);
         $iIndex = $oAppDelegation->createAppDelegation(
-                $aFieldsDel['PRO_UID'], $aFieldsDel['APP_UID'], $aFieldsDel['TAS_UID'], $aFieldsDel['USR_UID'], $aFieldsDel['DEL_THREAD']
+            $aFieldsDel['PRO_UID'],
+            $aFieldsDel['APP_UID'],
+            $aFieldsDel['TAS_UID'],
+            (empty($user)) ? 0 : $user->getUsrId(),
+            $aFieldsDel['DEL_THREAD'],
+            3,
+            false,
+            -1,
+            null,
+            false,
+            false,
+            0,
+            $aFieldsDel['APP_NUMBER'],
+            $aFieldsDel['TAS_ID'],
+            (empty($user)) ? 0 : $user->getUsrId(),
+            $aFieldsDel['PRO_ID']
         );
         $newDelIndex = $iIndex;
         $aData = array();
@@ -4383,6 +4476,7 @@ class Cases
         $aData['USR_UID'] = $newUserUID;
         $aData['DEL_INIT_DATE'] = null;
         $aData['DEL_FINISH_DATE'] = null;
+        $aData['USR_ID'] = (empty($user)) ? 0 : $user->getUsrId();
         $oAppDelegation->update($aData);
         $oAppThread = new AppThread();
         $oAppThread->update(
@@ -4404,6 +4498,7 @@ class Cases
         $aData['APP_DELEGATION_USER'] = $sUserUID;
         $aData['APP_ENABLE_ACTION_USER'] = $sUserUID;
         $aData['APP_ENABLE_ACTION_DATE'] = date('Y-m-d H:i:s');
+        $aData['APP_NUMBER'] = $aFieldsDel['APP_NUMBER'];
         $oAppDelay = new AppDelay();
         $oAppDelay->create($aData);
 

workflow/engine/classes/class.derivation.php

@@ -985,6 +985,7 @@ class Derivation
                 default:
                     //Get all siblingThreads
                     $canDerivate = false;
+                    $nextDel['TAS_ID'] = $taskNextDel->getTasId();
 
                     switch ($currentDelegation['TAS_ASSIGN_TYPE']) {
                         case 'CANCEL_MI':
@@ -1345,9 +1346,22 @@ class Derivation
                     //Incrementing the Del_thread First so that new delegation has new del_thread
                     $iNewAppThreadIndex += 1;
                     //Creating new delegation according to users in group
-                    $iMIDelIndex = $this->case->newAppDelegation( $appFields['PRO_UID'], $currentDelegation['APP_UID'], $nextDel['TAS_UID'], (isset( $aValue['USR_UID'] ) ? $aValue['USR_UID'] : ''), $currentDelegation['DEL_INDEX'], $nextDel['DEL_PRIORITY'], $delType, $iNewAppThreadIndex, $nextDel );
+                    $iMIDelIndex = $this->case->newAppDelegation(
+                        $appFields['PRO_UID'],
+                        $currentDelegation['APP_UID'],
+                        $nextDel['TAS_UID'],
+                        (isset( $aValue['USR_UID'] ) ? $aValue['USR_UID'] : ''),
+                        $currentDelegation['DEL_INDEX'],
+                        $nextDel['DEL_PRIORITY'],
+                        $delType,
+                        $iNewAppThreadIndex,
+                        $nextDel,
+                        $appFields['APP_NUMBER'],
+                        $appFields['PRO_ID'],
+                        $nextDel['TAS_ID']
+                    );
 
-                    $iNewThreadIndex = $this->case->newAppThread( $currentDelegation['APP_UID'], $iMIDelIndex, $iAppThreadIndex );
+                    $iNewThreadIndex = $this->case->newAppThread( $currentDelegation['APP_UID'], $iMIDelIndex, $iAppThreadIndex);
 
                     //Setting the del Index for Updating the AppThread delIndex
                     if ($key == 0) {
@@ -1371,7 +1385,23 @@ class Derivation
                     $delPrevious = $row['DEL_PREVIOUS'];
                 }
                 // Create new delegation
-                $iNewDelIndex = $this->case->newAppDelegation( $appFields['PRO_UID'], $currentDelegation['APP_UID'], $nextDel['TAS_UID'], (isset( $nextDel['USR_UID'] ) ? $nextDel['USR_UID'] : ''), $currentDelegation['DEL_INDEX'], $nextDel['DEL_PRIORITY'], $delType, $iAppThreadIndex, $nextDel, $this->flagControl, $this->flagControlMulInstance, $delPrevious);
+                $iNewDelIndex = $this->case->newAppDelegation(
+                    $appFields['PRO_UID'],
+                    $currentDelegation['APP_UID'],
+                    $nextDel['TAS_UID'],
+                    (isset( $nextDel['USR_UID'] ) ? $nextDel['USR_UID'] : ''),
+                    $currentDelegation['DEL_INDEX'],
+                    $nextDel['DEL_PRIORITY'],
+                    $delType,
+                    $iAppThreadIndex,
+                    $nextDel,
+                    $this->flagControl,
+                    $this->flagControlMulInstance,
+                    $delPrevious,
+                    $appFields['APP_NUMBER'],
+                    $appFields['PRO_ID'],
+                    $nextDel['TAS_ID']
+                );
                 break;
         }
 
@@ -1396,7 +1426,7 @@ class Derivation
             case 'PARALLEL-BY-EVALUATION':
                 $this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex );
                 $iNewThreadIndex = $this->case->newAppThread( $currentDelegation['APP_UID'], $iNewDelIndex, $iAppThreadIndex );
-                $this->case->updateAppDelegation( $currentDelegation['APP_UID'], $iNewDelIndex, $iNewThreadIndex );
+                $this->case->updateAppDelegation( $currentDelegation['APP_UID'], $iNewDelIndex, $iNewThreadIndex, $appFields['APP_NUMBER'] );
                 break;
             default:
                 $this->case->updateAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex, $iNewDelIndex );

workflow/engine/classes/class.processes.php

@@ -1160,7 +1160,9 @@ class Processes
     public function getProcessRow($sProUid, $getAllLang = false)
     {
         $oProcess = new Process();
-        return $oProcess->Load($sProUid, $getAllLang);
+        $pProcess = $oProcess->Load( $sProUid, $getAllLang );
+        unset($pProcess['PRO_ID']);
+        return $pProcess;
     }
 
     /**
@@ -1192,6 +1194,8 @@ class Processes
     {
         $oProcess = new Process();
         if ($oProcess->processExists($row['PRO_UID'])) {
+            $processRow = $oProcess->load($row['PRO_UID']);
+            $row['PRO_ID'] = $processRow['PRO_ID'];
             $oProcess->update($row);
         } else {
             $oProcess->create($row);
@@ -5594,6 +5598,119 @@ class Processes
         $this->createFilesManager($arrayProcessData["PRO_UID"], (isset($oData->filesManager)) ? $oData->filesManager : array());
     }
 
+    /**
+     *
+     * @param type $oData
+     */
+    public function loadIdsFromData($oData)
+    {
+        if (is_array($oData)) {
+            $oData['process'] = $this->loadIdsFor(
+                Process::class,
+                ProcessPeer::PRO_UID,
+                ProcessPeer::PRO_ID,
+                $oData['process']
+            );
+            $oData['tasks'] = $this->loadIdsFor(
+                Task::class,
+                TaskPeer::TAS_UID,
+                TaskPeer::TAS_ID,
+                $oData['tasks']
+            );
+        } else {
+            $oData->process = $this->loadIdsFor(
+                Process::class,
+                ProcessPeer::PRO_UID,
+                ProcessPeer::PRO_ID,
+                $oData->process
+            );
+            $oData->tasks = $this->loadIdsFor(
+                Task::class,
+                TaskPeer::TAS_UID,
+                TaskPeer::TAS_ID,
+                $oData->tasks
+            );
+        }
+        /**
+         * @todo The following code matches the Models and the correspondent Property
+         *   in the imported data object, so it could be used to change the UID
+         *   fields by ID on the other tables.
+         * $this->loadIdsFor(ProcessCategory::class, ProcessCategoryPeer::CATEGORY_UID, ?, $oData->processCategory);
+         * $this->loadIdsFor(SwimlanesElements::class, ?, ?, $oData->lanes);
+         * $this->loadIdsFor(Gateway::class, GatewayPeer::GAT_UID, ?, $oData->gateways);
+         * $this->loadIdsFor(Dynaform::class, $oData->dynaforms);
+         * $this->loadIdsFor(InputDocument::class, $oData->inputs);
+         * $this->loadIdsFor(OutputDocument::class, $oData->outputs);
+         * $this->loadIdsFor(Step::class, $oData->steps);
+         * $this->loadIdsFor(StepSupervisor::class, $oData->stepSupervisor);
+         * $this->loadIdsFor(Triggers::class, $oData->triggers);
+         * $this->loadIdsFor(StepTrigger::class, $oData->steptriggers);
+         * $this->loadIdsFor(TaskUser::class, ?, ?, $oData->taskusers);
+         * $this->loadIdsFor(Groupwf::class, $oData->groupwfs);
+         * $this->loadIdsFor(DbSource::class, $oData->dbconnections);
+         * $this->loadIdsFor(ReportTables::class, $oData->reportTablesVars);
+         * $this->loadIdsFor(SubProcess::class, $oData->subProcess);
+         * $this->loadIdsFor(CaseTracker::class, $oData->caseTracker);
+         * $this->loadIdsFor(CaseTrackerObject::class, $oData->caseTrackerObject);
+         * $this->loadIdsFor(ObjectPermission::class, $oData->objectPermissions);
+         * $this->loadIdsFor(Stage::class, $oData->stage);
+         * $this->loadIdsFor(FieldCondition::class, $oData->fieldCondition);
+         * $this->loadIdsFor(Event::class, $oData->event);
+         * $this->loadIdsFor(CaseScheduler::class, $oData->caseScheduler);
+         * $this->loadIdsFor(Configuration::class, $oData->taskExtraProperties);
+         * $this->loadIdsFor(ProcessUser::class, $oData->processUser);
+         * $this->loadIdsFor(ProcessVariables::class, $oData->processVariables);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\WebEntry::class, $arrayProcessData["PRO_UID"], $arrayProcessData["PRO_CREATE_USER"], $oData->webEntry);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\WebEntryEvent::class, $arrayProcessData["PRO_UID"], $arrayProcessData["PRO_CREATE_USER"], $oData->webEntryEvent);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\MessageType::class, $oData->messageType);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\MessageType\Variable::class, $oData->messageTypeVariable);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\MessageEventDefinition::class, $arrayProcessData["PRO_UID"], $oData->messageEventDefinition);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\ScriptTask::class, $arrayProcessData["PRO_UID"], $oData->scriptTask);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\TimerEvent::class, $arrayProcessData["PRO_UID"], $oData->timerEvent);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\EmailEvent::class, $arrayProcessData["PRO_UID"], $oData->emailEvent);
+         * $this->loadIdsFor(AbeConfiguration::class, $arrayProcessData["PRO_UID"], $oData->abeConfiguration);
+         * $this->loadIdsFor(\ProcessMaker\BusinessModel\FilesManager::class, $arrayProcessData["PRO_UID"], $oData->filesManager);
+         */
+        return $oData;
+    }
+
+    private function loadIdsFor($modelClass, $uidTableField, $idTableField,
+                                &$data)
+    {
+        if (empty($data)) {
+            return $data;
+        }
+        if (!is_array($data)) {
+            throw new Exception("Invalid input data form $modelClass($key)".G::json_encode($data));
+        }
+        $uidTableFieldArray = explode('.', $uidTableField);
+        $idTableFieldArray = explode('.', $idTableField);
+        if (count($uidTableFieldArray) !== 2) {
+            throw new Exception('Invalid argument $uidTableField, expected a "TABLE.COLUMN" string');
+        }
+        if (count($idTableFieldArray) !== 2) {
+            throw new Exception('Invalid argument $idTableField, expected a "TABLE.COLUMN" string');
+        }
+        $uidField = $uidTableFieldArray[1];
+        $idField = $idTableFieldArray[1];
+        if (isset($data[$uidField])) {
+            //$data is an single row
+            $model = new $modelClass();
+            $row = $model->load($data[$uidField]);
+            $data[$idField] = $model->getByName($idTableField,
+                                                BasePeer::TYPE_COLNAME);
+        } else {
+            //$data is an array of row
+            foreach ($data as $i => $dataRow) {
+                $model = new $modelClass();
+                $row = $model->load($dataRow[$uidField]);
+                $data[$i][$idField] = $model->getByName($idTableField,
+                                                       BasePeer::TYPE_COLNAME);
+            }
+        }
+        return $data;
+    }
+
     /**
      * this function creates a new Process, defined in the object $oData
      *
@@ -5602,6 +5719,7 @@ class Processes
      */
     public function updateProcessFromData($oData, $pmFilename)
     {
+        $oData = $this->loadIdsFromData($oData);
         $this->updateProcessRow($oData->process);
         $this->removeProcessRows($oData->process['PRO_UID']);
         $this->removeAllFieldCondition($oData->dynaforms);

workflow/engine/classes/class.system.php

@@ -808,6 +808,7 @@ class System
                 $required = (in_array(strtolower($required), array('1', 'true'
                 )));
                 $autoIncrement = $oColumn->hasAttribute('autoIncrement') ? $oColumn->hasAttribute('autoIncrement') : false;
+                $unique = $oColumn->hasAttribute('unique') ? $oColumn->hasAttribute('unique') : false;
                 $default = $oColumn->hasAttribute('default') ? $oColumn->getAttribute('default') : null;
 
                 $primaryKey = $oColumn->hasAttribute('primaryKey') ? $oColumn->getAttribute('primaryKey') : null;
@@ -817,8 +818,15 @@ class System
                 if ($primaryKey) {
                     $aPrimaryKeys[] = $sColumName;
                 }
-                $aSchema[$sTableName][$sColumName] = array('Field' => $sColumName, 'Type' => $type,
+                $aSchema[$sTableName][$sColumName] = array(
-                    'Null' => $required ? "NO" : "YES", 'Default' => $default, 'AutoIncrement' => $autoIncrement);
+                    'Field' => $sColumName,
+                    'Type' => $type,
+                    'Null' => $required ? "NO" : "YES",
+                    'Default' => $default,
+                    'AutoIncrement' => $autoIncrement,
+                    'Unique' => $unique,
+                    'PrimaryKey' => $primaryKey
+                );
             }
 
             if (is_array($aPrimaryKeys) && count($aPrimaryKeys) > 0) {

workflow/engine/classes/class.tasks.php

@@ -96,7 +96,9 @@ class Tasks
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
                 $oTask = new Task();
-                $aTasks[] = $oTask->load($aRow['TAS_UID']);
+                $pTask = $oTask->load($aRow['TAS_UID']);
+                unset($pTask['TAS_ID']);
+                $aTasks[] = $pTask;
                 $oDataset->next();
             }
             return $aTasks;

workflow/engine/classes/class.wsTools.php

@@ -24,6 +24,41 @@ class workspaceTools
     public $dbInfoRegExp = "/( *define *\( *'(?P<key>.*?)' *, *\n* *')(?P<value>.*?)(' *\) *;.*)/";
     public $initPropel = false;
     public $initPropelRoot = false;
+    public static $populateIdsQueries = [
+        'UPDATE LIST_CANCELED SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID)',
+        'UPDATE LIST_COMPLETED SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)',
+        'UPDATE LIST_INBOX SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID)',
+        'UPDATE LIST_MY_INBOX SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID),'
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID)',
+        'UPDATE LIST_PARTICIPATED_HISTORY SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID)',
+        'UPDATE LIST_PARTICIPATED_LAST SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID)',
+        'UPDATE LIST_PAUSED SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID),'
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID),'
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID)',
+        'UPDATE LIST_UNASSIGNED SET '
+            . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), '
+            . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID)',
+        'UPDATE LIST_UNASSIGNED_GROUP SET '
+            . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)',
+    ];
 
     /**
      * Create a workspace tools object.
@@ -111,13 +146,6 @@ class workspaceTools
         $final = $stop - $start;
         CLI::logging("<*>   Check Mafe Requirements Process took $final seconds.\n");
 
-        $start = microtime(true);
-        CLI::logging("> Updating cache view...\n");
-        $this->upgradeCacheView($buildCacheView, true, $lang);
-        $stop = microtime(true);
-        $final = $stop - $start;
-        CLI::logging("<*>   Updating cache view Process took $final seconds.\n");
-
         $start = microtime(true);
         CLI::logging("> Backup log files...\n");
         $this->backupLogFiles();
@@ -157,6 +185,12 @@ class workspaceTools
         $this->migrateSelfServiceRecordsRun($workSpace);
         $stop = microtime(true);
         CLI::logging("<*>   Migrating Self-Service records Process took " . ($stop - $start) . " seconds.\n");
+
+        $start = microtime(true);
+        CLI::logging("> Migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...\n");
+        $this->migratePopulateIndexingACV($workSpace);
+        $stop = microtime(true);
+        CLI::logging("<*>   Migrating an populating indexing for avoiding the use of table APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
     }
 
     /**
@@ -1577,8 +1611,11 @@ class workspaceTools
      * workspace, or overwriting a previous one
      *
      * @param string $filename the backup filename
-     * @param string $newWorkspaceName if defined, supplies the name for the
+     * @param string $srcWorkspace name of the source workspace
-     * workspace to restore to
+     * @param string $dstWorkspace name of the destination workspace
+     * @param string $overwrite if you need overwrite the database
+     * @param string $lang for define the language
+     * @param string $port of database if is empty take 3306
      */
     static public function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en', $port = '')
     {
@@ -1622,10 +1659,6 @@ class workspaceTools
         $version = System::getVersion();
         $pmVersion = (preg_match("/^([\d\.]+).*$/", $version, $arrayMatch)) ? $arrayMatch[1] : ""; //Otherwise: Branch master
 
-        /*if($pmVersion == '' && strpos(strtoupper($version), 'BRANCH')){
-            $pmVersion = 'dev-version-backup';
-        }*/
-
         CLI::logging(CLI::warning("
             Warning: A workspace from a newer version of ProcessMaker can NOT be restored in an older version of
             ProcessMaker. For example, restoring from v.3.0 to v.2.5 will not work. However, it may be possible
@@ -1758,8 +1791,6 @@ class workspaceTools
                 }
             }
 
-            //CLI::logging(CLI::info("$pmVersionWorkspaceToRestore < $pmVersion") . "\n");
-
             if (($pmVersionWorkspaceToRestore != '') && (version_compare($pmVersionWorkspaceToRestore . "",
                         $pmVersion . "", "<") || $pmVersion == "")
             ) {
@@ -1804,18 +1835,35 @@ class workspaceTools
                 $pmVersion = 'dev-version-backup';
             }
 
+            //Move the labels of content to the corresponding table
+            $start = microtime(true);
+            CLI::logging("> Optimizing content data...\n");
+            $workspace->migrateContent($workspace->name, $lang);
+            $stop = microtime(true);
+            CLI::logging("<*>   Optimizing content data took " . ($stop - $start) . " seconds.\n");
+
+            //Move the data of cases to the corresponding List
             /*----------------------------------********---------------------------------*/
-            if (($pmVersionWorkspaceToRestore != '') && (version_compare($pmVersionWorkspaceToRestore . "", "2.9",
-                        "<") || $pmVersion == "")
-            ) {
             $start = microtime(true);
             CLI::logging("> Updating List tables...\n");
             $workspace->migrateList($workspace->name, false, $lang);
             $stop = microtime(true);
             CLI::logging("<*>   Updating List Process took " . ($stop - $start) . " seconds.\n");
-            }
             /*----------------------------------********---------------------------------*/
 
+            $start = microtime(true);
+            CLI::logging("> Updating Files Manager...\n");
+            $workspace->processFilesUpgrade();
+            $stop = microtime(true);
+            CLI::logging("<*>   Updating Files Manager took " . ($stop - $start) . " seconds.\n");
+
+            //Populate the new fields for replace string UID to Interger ID
+            $start = microtime(true);
+            CLI::logging("> Migrating and populating indexing for APP_CACHE_VIEW...\n");
+            $workspace->migratePopulateIndexingACV($workspace->name);
+            $stop = microtime(true);
+            CLI::logging("<*>   Migrating an populating indexing for APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
+
             mysql_close($link);
         }
 
@@ -3538,4 +3586,97 @@ class workspaceTools
         CLI::logging("   Migrating Self-Service by Value Cases Done \n");
     }
 
+    public function migratePopulateIndexingACV($workspace) {
+        // Migrating and populating new indexes
+        CLI::logging("-> Migrating an populating indexing for avoiding the use of table APP_CACHE_VIEW Start \n");
+
+        // Initializing
+        $this->initPropel(true);
+        $con = Propel::getConnection(AppDelegationPeer::DATABASE_NAME);
+
+        // Populating APP_DELEGATION.APP_NUMBER
+        CLI::logging("->   Populating APP_DELEGATION.APP_NUMBER \n");
+        $con->begin();
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery("UPDATE APP_DELEGATION AS AD
+                                   INNER JOIN (
+                                       SELECT APPLICATION.APP_UID, APPLICATION.APP_NUMBER
+                                       FROM APPLICATION
+                                   ) AS APP
+                                   ON (AD.APP_UID = APP.APP_UID)
+                                   SET AD.APP_NUMBER = APP.APP_NUMBER
+                                   WHERE AD.APP_NUMBER = 0");
+        $con->commit();
+
+        // Populating APP_DELEGATION.USR_ID
+        CLI::logging("->   Populating APP_DELEGATION.USR_ID \n");
+        $con->begin();
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery("UPDATE APP_DELEGATION AS AD
+                                   INNER JOIN (
+                                       SELECT USERS.USR_UID, USERS.USR_ID
+                                       FROM USERS
+                                   ) AS USR
+                                   ON (AD.USR_UID = USR.USR_UID)
+                                   SET AD.USR_ID = USR.USR_ID
+                                   WHERE AD.USR_ID = 0");
+        $con->commit();
+
+        // Populating APP_DELEGATION.PRO_ID
+        CLI::logging("->   Populating APP_DELEGATION.PRO_ID \n");
+        $con->begin();
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery("UPDATE APP_DELEGATION AS AD
+                                   INNER JOIN (
+                                       SELECT PROCESS.PRO_UID, PROCESS.PRO_ID
+                                       FROM PROCESS
+                                   ) AS PRO
+                                   ON (AD.PRO_UID = PRO.PRO_UID)
+                                   SET AD.PRO_ID = PRO.PRO_ID
+                                   WHERE AD.PRO_ID = 0");
+        $con->commit();
+
+        // Populating APP_DELEGATION.TAS_ID
+        CLI::logging("->   Populating APP_DELEGATION.TAS_ID \n");
+        $con->begin();
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery("UPDATE APP_DELEGATION AS AD
+                                   INNER JOIN (
+                                       SELECT TASK.TAS_UID, TASK.TAS_ID
+                                       FROM TASK
+                                   ) AS TAS
+                                   ON (AD.TAS_UID = TAS.TAS_UID)
+                                   SET AD.TAS_ID = TAS.TAS_ID
+                                   WHERE AD.TAS_ID = 0");
+        $con->commit();
+
+        // Populating APPLICATION.APP_STATUS_ID
+        CLI::logging("->   Populating APPLICATION.APP_STATUS_ID \n");
+        $con->begin();
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery("UPDATE APPLICATION
+                                    SET APP_STATUS_ID = (case
+                                        when APP_STATUS = 'DRAFT' then 1
+                                        when APP_STATUS = 'TO_DO' then 2
+                                        when APP_STATUS = 'COMPLETED' then 3
+                                        when APP_STATUS = 'CANCELLED' then 4
+                                    end)
+                                    WHERE APP_STATUS in ('DRAFT', 'TO_DO', 'COMPLETED', 'CANCELLED') AND
+                                    APP_STATUS_ID = 0");
+        $con->commit();
+
+        CLI::logging("-> Migrating And Populating Indexing for avoiding the use of table APP_CACHE_VIEW Done \n");
+
+        // Populating PRO_ID, USR_ID
+        CLI::logging("->   Populating PRO_ID, USR_ID at LIST_* \n");
+        $con->begin();
+        $stmt = $con->createStatement();
+        foreach(workspaceTools::$populateIdsQueries as $query) {
+            $stmt->executeQuery($query);
+        }
+        $con->commit();
+
+        CLI::logging("-> Populating PRO_ID, USR_ID at LIST_*  Done \n");
+    }
+
 }

workflow/engine/classes/model/AppDelegation.php

@@ -104,7 +104,7 @@ class AppDelegation extends BaseAppDelegation
      * @param $isSubprocess is a subprocess inside a process?
      * @return delegation index of the application delegation.
      */
-    public function createAppDelegation ($sProUid, $sAppUid, $sTasUid, $sUsrUid, $sAppThread, $iPriority = 3, $isSubprocess = false, $sPrevious = -1, $sNextTasParam = null, $flagControl = false, $flagControlMulInstance = false, $delPrevious = 0)
+    public function createAppDelegation ($sProUid, $sAppUid, $sTasUid, $sUsrUid, $sAppThread, $iPriority = 3, $isSubprocess = false, $sPrevious = -1, $sNextTasParam = null, $flagControl = false, $flagControlMulInstance = false, $delPrevious = 0, $appNumber = 0, $taskId = 0, $userId = 0, $proId = 0)
     {
         if (! isset( $sProUid ) || strlen( $sProUid ) == 0) {
             throw (new Exception( 'Column "PRO_UID" cannot be null.' ));
@@ -126,6 +126,7 @@ class AppDelegation extends BaseAppDelegation
             throw (new Exception( 'Column "APP_THREAD" cannot be null.' ));
         }
 
+        $this->delegation_id = null;
         //Get max DEL_INDEX
         $criteria = new Criteria("workflow");
         $criteria->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -196,6 +197,10 @@ class AppDelegation extends BaseAppDelegation
         $this->setDelThread( $sAppThread );
         $this->setDelThreadStatus( 'OPEN' );
         $this->setDelDelegateDate( 'now' );
+        $this->setAppNumber($appNumber);
+        $this->setTasId($taskId);
+        $this->setUsrId($userId);
+        $this->setProId($proId);
 
         //The function return an array now.  By JHL
         $delTaskDueDate = $this->calculateDueDate($sNextTasParam);

workflow/engine/classes/model/Application.php

@@ -48,7 +48,7 @@ class Application extends BaseApplication
      */
     protected $app_title_content = '';
     protected $app_description_content = '';
-    //protected $app_proc_code = '';
+    public static $app_status_values = ['DRAFT' => 1, 'TO_DO' => 2, 'COMPLETED' => 3, 'CANCELLED' => 4];
 
     /**
      * Get the [app_title_content] column value.
@@ -225,7 +225,8 @@ class Application extends BaseApplication
             $this->setAppUid(G::generateUniqueID());
             $this->setAppParent('');
             $this->setAppStatus('DRAFT');
-            $this->setProUid( $sProUid);
+            $this->setAppStatusId(1);
+            $this->setProUid($sProUid);
             $this->setAppProcStatus('');
             $this->setAppProcCode('');
             $this->setAppParallel('N');
@@ -294,6 +295,9 @@ class Application extends BaseApplication
                 $oApp->fromArray($aData, BasePeer::TYPE_FIELDNAME);
 
                 if ($oApp->validate()) {
+                    if (isset($aData['APP_STATUS'])) {
+                        $oApp->setAppStatusId(self::$app_status_values[$aData['APP_STATUS']]);
+                    }
                     if (isset($aData['APP_TITLE'])) {
                         $oApp->setAppTitleContent($aData['APP_TITLE']);
                     }
@@ -301,9 +305,6 @@ class Application extends BaseApplication
                         $oApp->setAppDescriptionContent($aData['APP_DESCRIPTION']);
                     }
 
-                    //if ( isset ( $aData['APP_PROC_CODE'] ) )
-                      //$oApp->setAppProcCode( $aData['APP_PROC_CODE'] );
-
                     $res = $oApp->save();
                     $con->commit();
 

workflow/engine/classes/model/ListCanceled.php

@@ -14,7 +14,10 @@ require_once 'classes/model/om/BaseListCanceled.php';
  *
  * @package    classes.model
  */
-class ListCanceled extends BaseListCanceled {
+// @codingStandardsIgnoreStart
+class ListCanceled extends BaseListCanceled
+{
+    // @codingStandardsIgnoreEnd
     /**
      * Create List Canceled Table
      *
@@ -26,7 +29,7 @@ class ListCanceled extends BaseListCanceled {
     {
         $criteria = new Criteria();
         $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
-        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
         $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -48,8 +51,8 @@ class ListCanceled extends BaseListCanceled {
         $criteria->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
         $criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
         $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
-        $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
-        $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL);
         $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -62,8 +65,8 @@ class ListCanceled extends BaseListCanceled {
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
-        $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
-        $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL);
         $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -83,7 +86,7 @@ class ListCanceled extends BaseListCanceled {
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
         $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+        $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
         $dataset = UsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -105,19 +108,31 @@ class ListCanceled extends BaseListCanceled {
         $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED');
         BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
 
-        $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListCanceledPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -132,18 +147,26 @@ class ListCanceled extends BaseListCanceled {
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListCanceledPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -159,9 +182,9 @@ class ListCanceled extends BaseListCanceled {
      * @throws type
      *
      */
-    public function remove ($app_uid)
+    public function remove($app_uid)
     {
-        $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListCanceledPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $con->begin();
@@ -173,7 +196,7 @@ class ListCanceled extends BaseListCanceled {
         }
     }
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
         $filter = isset($filters['filter']) ? $filters['filter'] : "";
         $search = isset($filters['search']) ? $filters['search'] : "";
@@ -185,25 +208,31 @@ class ListCanceled extends BaseListCanceled {
         if ($filter != '') {
             switch ($filter) {
                 case 'read':
-                    $criteria->add( ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                    $criteria->add(ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                     break;
                 case 'unread':
-                    $criteria->add( ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                    $criteria->add(ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                     break;
             }
         }
 
         if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListCanceledPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)
+                    ->addOr(
+                        $criteria->getNewCriterion(ListCanceledPeer::APP_UID, $search, Criteria::EQUAL)
+                        ->addOr(
                             $criteria->getNewCriterion(ListCanceledPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            ))));
+                        )
+                    )
+                )
+            );
         }
 
         if ($process != '') {
-            $criteria->add( ListCanceledPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListCanceledPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
@@ -226,29 +255,31 @@ class ListCanceled extends BaseListCanceled {
                     $dateTo = $dateTo . " 23:59:59";
                 }
 
-                $criteria->add( $criteria->getNewCriterion( ListCanceledPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
+                $criteria->add(
-                    addAnd( $criteria->getNewCriterion( ListCanceledPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
+                    $criteria->getNewCriterion(
+                        ListCanceledPeer::DEL_DELEGATE_DATE,
+                        $dateFrom,
+                        Criteria::GREATER_EQUAL
+                    )->addAnd(
+                        $criteria->getNewCriterion(
+                            ListCanceledPeer::DEL_DELEGATE_DATE,
+                            $dateTo,
+                            Criteria::LESS_EQUAL
+                        )
+                    )
+                );
             } else {
                 $dateFrom = $dateFrom . " 00:00:00";
 
-                $criteria->add( ListCanceledPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
+                $criteria->add(ListCanceledPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
             }
         } elseif ($dateTo != "") {
             $dateTo = $dateTo . " 23:59:59";
 
-            $criteria->add( ListCanceledPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
+            $criteria->add(ListCanceledPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
         }
     }
 
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListCanceledPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        self::loadFilters($criteria, $filters);
-        $total = ListCanceledPeer::doCount( $criteria );
-        return (int)$total;
-    }
-
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
     {
         $resp = array();
@@ -272,7 +303,7 @@ class ListCanceled extends BaseListCanceled {
         $criteria->addSelectColumn(ListCanceledPeer::DEL_INIT_DATE);
         $criteria->addSelectColumn(ListCanceledPeer::DEL_DUE_DATE);
         $criteria->addSelectColumn(ListCanceledPeer::DEL_PRIORITY);
-        $criteria->add( ListCanceledPeer::USR_UID, $usr_uid, Criteria::EQUAL );
+        $criteria->add(ListCanceledPeer::USR_UID, $usr_uid, Criteria::EQUAL);
         self::loadFilters($criteria, $filters);
 
         $sort  = (!empty($filters['sort'])) ? $filters['sort'] : "APP_FINISH_DATE";
@@ -288,11 +319,11 @@ class ListCanceled extends BaseListCanceled {
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $dataset = ListCanceledPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListCanceledPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
         while ($dataset->next()) {
@@ -307,14 +338,21 @@ class ListCanceled extends BaseListCanceled {
     /**
      * Returns the number of cases of a user
      * @param $usrUid
+     * @param array $filters
      * @return int
      */
-    public function getCountList($usrUid)
+    public function getCountList($usrUid, $filters = array())
     {
         $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
         $criteria->add(ListCanceledPeer::USR_UID, $usrUid, Criteria::EQUAL);
-        $total = ListCanceledPeer::doCount($criteria);
+        if (count($filters)) {
-        return (int)$total;
+            self::loadFilters($criteria, $filters);
+        }
+        $dataset = ListCanceledPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+        return (int)$aRow['TOTAL'];
     }
 } // ListCanceled
-

workflow/engine/classes/model/ListCompleted.php

@@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListCompleted.php';
  *
  * @package    classes.model
  */
+// @codingStandardsIgnoreStart
 class ListCompleted extends BaseListCompleted
 {
+    // @codingStandardsIgnoreEnd
     /**
      * Create List Completed Table
      *
@@ -27,7 +29,7 @@ class ListCompleted extends BaseListCompleted
     {
         $criteria = new Criteria();
         $criteria->addSelectColumn(ListCompletedPeer::APP_UID);
-        $criteria->add( ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
         $dataset = ListCompletedPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         if ($dataset->next()) {
@@ -36,7 +38,7 @@ class ListCompleted extends BaseListCompleted
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
-        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
         $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -68,7 +70,7 @@ class ListCompleted extends BaseListCompleted
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
         $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+        $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
         $dataset = UsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -81,7 +83,7 @@ class ListCompleted extends BaseListCompleted
         if ($data['DEL_PREVIOUS'] != 0) {
             $criteria = new Criteria();
             $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
-            $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_PREVIOUS'], Criteria::EQUAL );
+            $criteria->add(AppDelegationPeer::DEL_INDEX, $data['DEL_PREVIOUS'], Criteria::EQUAL);
             $dataset = UsersPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
@@ -97,19 +99,31 @@ class ListCompleted extends BaseListCompleted
         $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
         BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
 
-        $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListCompletedPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -124,18 +138,26 @@ class ListCompleted extends BaseListCompleted
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListCompletedPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -151,9 +173,9 @@ class ListCompleted extends BaseListCompleted
      * @throws type
      *
      */
-    public function remove ($app_uid)
+    public function remove($app_uid)
     {
-        $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListCompletedPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $con->begin();
@@ -165,7 +187,7 @@ class ListCompleted extends BaseListCompleted
         }
     }
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
         $filter = isset($filters['filter']) ? $filters['filter'] : "";
         $search = isset($filters['search']) ? $filters['search'] : "";
@@ -177,25 +199,31 @@ class ListCompleted extends BaseListCompleted
         if ($filter != '') {
             switch ($filter) {
                 case 'read':
-                    $criteria->add( ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                    $criteria->add(ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                     break;
                 case 'unread':
-                    $criteria->add( ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                    $criteria->add(ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                     break;
             }
         }
 
         if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListCompletedPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)
+                    ->addOr(
+                        $criteria->getNewCriterion(ListCompletedPeer::APP_UID, $search, Criteria::EQUAL)
+                        ->addOr(
                             $criteria->getNewCriterion(ListCompletedPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            ))));
+                        )
+                    )
+                )
+            );
         }
 
         if ($process != '') {
-            $criteria->add( ListCompletedPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListCompletedPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
@@ -218,29 +246,31 @@ class ListCompleted extends BaseListCompleted
                     $dateTo = $dateTo . " 23:59:59";
                 }
 
-                $criteria->add( $criteria->getNewCriterion( ListCompletedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
+                $criteria->add(
-                    addAnd( $criteria->getNewCriterion( ListCompletedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
+                    $criteria->getNewCriterion(
+                        ListCompletedPeer::DEL_DELEGATE_DATE,
+                        $dateFrom,
+                        Criteria::GREATER_EQUAL
+                    )->addAnd(
+                        $criteria->getNewCriterion(
+                            ListCompletedPeer::DEL_DELEGATE_DATE,
+                            $dateTo,
+                            Criteria::LESS_EQUAL
+                        )
+                    )
+                );
             } else {
                 $dateFrom = $dateFrom . " 00:00:00";
 
-                $criteria->add( ListCompletedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
+                $criteria->add(ListCompletedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
             }
         } elseif ($dateTo != "") {
             $dateTo = $dateTo . " 23:59:59";
 
-            $criteria->add( ListCompletedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
+            $criteria->add(ListCompletedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
         }
     }
 
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListCompletedPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        self::loadFilters($criteria, $filters);
-        $total = ListCompletedPeer::doCount( $criteria );
-        return (int)$total;
-    }
-
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
     {
         $resp = array();
@@ -261,7 +291,7 @@ class ListCompleted extends BaseListCompleted
         $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME);
         $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME);
         $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_USERNAME);
-        $criteria->add( ListCompletedPeer::USR_UID, $usr_uid, Criteria::EQUAL );
+        $criteria->add(ListCompletedPeer::USR_UID, $usr_uid, Criteria::EQUAL);
         self::loadFilters($criteria, $filters);
 
         $sort  = (!empty($filters['sort'])) ? $filters['sort'] : "APP_FINISH_DATE";
@@ -277,11 +307,11 @@ class ListCompleted extends BaseListCompleted
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $dataset = ListCompletedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListCompletedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
         while ($dataset->next()) {
@@ -296,14 +326,21 @@ class ListCompleted extends BaseListCompleted
     /**
      * Returns the number of cases of a user
      * @param $usrUid
+     * @param array $filters
      * @return int
      */
-    public function getCountList($usrUid)
+    public function getCountList($usrUid, $filters = array())
     {
         $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
         $criteria->add(ListCompletedPeer::USR_UID, $usrUid, Criteria::EQUAL);
-        $total = ListCompletedPeer::doCount($criteria);
+        if (count($filters)) {
-        return (int)$total;
+            self::loadFilters($criteria, $filters);
+        }
+        $dataset = ListCompletedPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+        return (int)$aRow['TOTAL'];
     }
 } // ListCompleted
-

workflow/engine/classes/model/ListInbox.php

@@ -13,9 +13,10 @@ require_once 'classes/model/om/BaseListInbox.php';
  *
  * @package    classes.model
  */
-
+// @codingStandardsIgnoreStart
 class ListInbox extends BaseListInbox
 {
+    // @codingStandardsIgnoreEnd
     /**
      * Create List Inbox Table
      *
@@ -25,18 +26,33 @@ class ListInbox extends BaseListInbox
      */
     public function create($data, $isSelfService = false)
     {
-        $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME);
         try {
-            if(isset($data['APP_TITLE'])) {
+            if (isset($data['APP_TITLE'])) {
                 $oCase = new Cases();
-                $aData = $oCase->loadCase( $data["APP_UID"] );
+                $aData = $oCase->loadCase($data["APP_UID"]);
                 $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']);
             }
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+                $p = new Process();
+                $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+            }
+            if (!empty($data['USR_UID'])) {
+                $u = new Users();
+                $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+            }
+            if (!empty($data['TAS_UID'])) {
+                $t = new Task();
+                $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+            }
+            if (!empty($data['APP_STATUS'])) {
+                $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+            }
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
@@ -44,7 +60,7 @@ class ListInbox extends BaseListInbox
 
             // create participated history
             $listParticipatedHistory = new ListParticipatedHistory();
-            $listParticipatedHistory->remove($data['APP_UID'],$data['DEL_INDEX']);
+            $listParticipatedHistory->remove($data['APP_UID'], $data['DEL_INDEX']);
             $listParticipatedHistory = new ListParticipatedHistory();
             $listParticipatedHistory->create($data);
 
@@ -87,7 +103,7 @@ class ListInbox extends BaseListInbox
             }
 
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -102,9 +118,9 @@ class ListInbox extends BaseListInbox
      */
     public function update($data, $isSelfService = false)
     {
-        if(isset($data['APP_TITLE'])) {
+        if (isset($data['APP_TITLE'])) {
             $oCase = new Cases();
-            $aData = $oCase->loadCase( $data["APP_UID"] );
+            $aData = $oCase->loadCase($data["APP_UID"]);
             $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']);
         }
         if ($isSelfService) {
@@ -126,7 +142,11 @@ class ListInbox extends BaseListInbox
             $listParticipatedLast = new ListParticipatedLast();
             $listParticipatedLast->refresh($data);
         } else {
-            if (isset($data["APP_UID"]) && isset($data["USER_UID"]) && isset($data["DEL_INDEX"]) && isset($data["APP_TITLE"])) {
+            if (isset($data["APP_UID"]) &&
+                isset($data["USER_UID"]) &&
+                isset($data["DEL_INDEX"]) &&
+                isset($data["APP_TITLE"])
+            ) {
                 //Update
                 //Update - SET
                 $criteriaSet = new Criteria("workflow");
@@ -142,15 +162,29 @@ class ListInbox extends BaseListInbox
             }
         }
 
-        if((array_key_exists('TAS_UID', $data) && isset($data['TAS_UID'])) && (array_key_exists('TAS_UID', $data) && isset($data['PRO_UID'])) && isset($data['APP_UID'])) {
+        if ((array_key_exists('TAS_UID', $data) && isset($data['TAS_UID'])) &&
+            (array_key_exists('TAS_UID', $data) && isset($data['PRO_UID'])) &&
+            isset($data['APP_UID'])
+        ) {
             $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
         }
 
-        $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
+        $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
@@ -161,7 +195,7 @@ class ListInbox extends BaseListInbox
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -177,9 +211,9 @@ class ListInbox extends BaseListInbox
      * @throws type
      *
      */
-    public function remove ($app_uid, $del_index)
+    public function remove($app_uid, $del_index)
     {
-        $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $this->setDelIndex($del_index);
@@ -201,9 +235,9 @@ class ListInbox extends BaseListInbox
      * @throws type
      *
      */
-    public function removeAll ($app_uid)
+    public function removeAll($app_uid)
     {
-        $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
 
@@ -229,8 +263,11 @@ class ListInbox extends BaseListInbox
      * @return void
      *
      */
-    public function newRow ($data, $delPreviusUsrUid, $isSelfService = false)
+    public function newRow(
-    {
+        $data,
+        $delPreviusUsrUid,
+        $isSelfService = false
+    ) {
         $removeList = true;
         if (isset($data['REMOVED_LIST'])) {
             $removeList = $data['REMOVED_LIST'];
@@ -241,19 +278,19 @@ class ListInbox extends BaseListInbox
             $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
         }
 
-        if(!isset($data['DEL_DUE_DATE'])) {
+        if (!isset($data['DEL_DUE_DATE'])) {
             $filters = array("APP_UID" => $data["APP_UID"], "DEL_INDEX" => $data['DEL_INDEX']);
-            $data['DEL_DUE_DATE'] = $this->getAppDelegationInfo($filters,'DEL_TASK_DUE_DATE');
+            $data['DEL_DUE_DATE'] = $this->getAppDelegationInfo($filters, 'DEL_TASK_DUE_DATE');
         }
 
-        if(isset($data['APP_INIT_DATE'])){
+        if (isset($data['APP_INIT_DATE'])) {
             $data['DEL_INIT_DATE'] = $data['APP_INIT_DATE'];
         }
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
+        $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
-        $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
+        $criteria->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
-        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
         $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -264,7 +301,7 @@ class ListInbox extends BaseListInbox
         $criteria = new Criteria();
         $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
         $criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
-        $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
+        $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
         $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -272,7 +309,7 @@ class ListInbox extends BaseListInbox
         if ($aRow['TAS_DEF_TITLE'] == '') {
             $criteria = new Criteria();
             $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
-            $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+            $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
             $dataset = ApplicationPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
@@ -285,7 +322,7 @@ class ListInbox extends BaseListInbox
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
-        $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
+        $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
         $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -295,9 +332,9 @@ class ListInbox extends BaseListInbox
         $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
 
         $data['APP_PREVIOUS_USER'] = '';
-        if($data['DEL_PREVIOUS_USR_UID'] === ''){
+        if ($data['DEL_PREVIOUS_USR_UID'] === '') {
             global $RBAC;
-            if(isset($RBAC->aUserInfo['USER_INFO'])){
+            if (isset($RBAC->aUserInfo['USER_INFO'])) {
                 $aUser = $RBAC->aUserInfo['USER_INFO'];
                 $data['DEL_PREVIOUS_USR_UID'] = $aUser['USR_UID'];
             }
@@ -307,7 +344,7 @@ class ListInbox extends BaseListInbox
             $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
             $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
             $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-            $criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL );
+            $criteria->add(UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL);
             $dataset = UsersPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
@@ -319,7 +356,7 @@ class ListInbox extends BaseListInbox
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT);
-        $criteria->add( SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL);
         $dataset = SubApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         if ($dataset->next()) {
@@ -335,7 +372,7 @@ class ListInbox extends BaseListInbox
             $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
             $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
             $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-            $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+            $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
             $dataset = UsersPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
@@ -347,8 +384,10 @@ class ListInbox extends BaseListInbox
         self::create($data, $isSelfService);
     }
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
+        $action         = isset($filters['action']) ? $filters['action'] : "";
+        $usrUid         = isset($filters['usr_uid']) ? $filters['usr_uid'] : "";
         $filter         = isset($filters['filter']) ? $filters['filter'] : "";
         $search         = isset($filters['search']) ? $filters['search'] : "";
         $process        = isset($filters['process']) ? $filters['process'] : "";
@@ -356,103 +395,104 @@ class ListInbox extends BaseListInbox
         $dateFrom       = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
         $dateTo         = isset($filters['dateTo']) ? $filters['dateTo'] : "";
         $filterStatus   = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
-        $newestthan     = isset($filters['newestthan'] ) ? $filters['newestthan'] : '';
+        $newestthan     = isset($filters['newestthan']) ? $filters['newestthan'] : '';
-        $oldestthan     = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
+        $oldestthan     = isset($filters['oldestthan']) ? $filters['oldestthan'] : '';
 
-        if ($filter != '') {
+        //Check the inbox to call
+        switch ($action) {
+            case 'draft':
+                $criteria->add(ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL);
+                $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL);
+                break;
+            case 'to_revise':
+                $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL);
+                $oAppCache = new AppCacheView();
+                $aProcesses = $oAppCache->getProUidSupervisor($usrUid);
+                $criteria->add(ListInboxPeer::PRO_UID, $aProcesses, Criteria::IN);
+                break;
+            case 'to_reassign':
+                $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL);
+                if ($usrUid !== '') {
+                    $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL);
+                }
+                break;
+            default://todo
+                $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL);
+                $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL);
+        }
+
+        //Filter Read Unread All
         switch ($filter) {
             case 'read':
-                    $criteria->add( ListInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                $criteria->add(ListInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                 break;
             case 'unread':
-                    $criteria->add( ListInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                $criteria->add(ListInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                 break;
         }
+
+        //Filter Task Status
+        switch ($filterStatus) {
+            case 'ON_TIME':
+                $criteria->add(
+                    ListInboxPeer::DEL_RISK_DATE,
+                    "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0",
+                    Criteria::CUSTOM
+                );
+                break;
+            case 'AT_RISK':
+                $criteria->add(
+                    ListInboxPeer::DEL_RISK_DATE,
+                    "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0",
+                    Criteria::CUSTOM
+                );
+                $criteria->add(
+                    ListInboxPeer::DEL_DUE_DATE,
+                    "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) >  0",
+                    Criteria::CUSTOM
+                );
+                break;
+            case 'OVERDUE':
+                $criteria->add(
+                    ListInboxPeer::DEL_DUE_DATE,
+                    "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0",
+                    Criteria::CUSTOM
+                );
+                break;
         }
 
+        //Filter Search
         if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                    $criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion(ListInboxPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    ->addOr(
+                        $criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)
+                        ->addOr(
+                            $criteria->getNewCriterion(ListInboxPeer::APP_UID, $search, Criteria::EQUAL)
+                            ->addOr(
                                 $criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            )))));
+                            )
+                        )
+                    )
+                )
+            );
         }
 
+        //Filter Process Id
         if ($process != '') {
-            $criteria->add( ListInboxPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListInboxPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
+        //Filter Category
         if ($category != '') {
-            // INNER JOIN FOR TAS_TITLE
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListInboxPeer::PRO_UID, ProcessPeer::PRO_UID);
             $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
-
-        if ($dateFrom != "") {
-            if ($dateTo != "") {
-                if ($dateFrom == $dateTo) {
-                    $dateSame = $dateFrom;
-                    $dateFrom = $dateSame . " 00:00:00";
-                    $dateTo = $dateSame . " 23:59:59";
-                } else {
-                    $dateFrom = $dateFrom . " 00:00:00";
-                    $dateTo = $dateTo . " 23:59:59";
-                }
-
-                $criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
-                addAnd( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
-            } else {
-                $dateFrom = $dateFrom . " 00:00:00";
-
-                $criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
-            }
-        } elseif ($dateTo != "") {
-            $dateTo = $dateTo . " 23:59:59";
-
-            $criteria->add( ListInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
-        }
-
-        if ($newestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
-        }
-
-        if ($oldestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
-        }
-
-        if ($filterStatus != '') {
-            switch ($filterStatus) {
-                case 'ON_TIME':
-                    $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM);
-                    break;
-                case 'AT_RISK':
-                    $criteria->add( ListInboxPeer::DEL_RISK_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM);
-                    $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) >  0", Criteria::CUSTOM);
-                    break;
-                case 'OVERDUE':
-                    $criteria->add( ListInboxPeer::DEL_DUE_DATE  , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM);
-                    break;
-            }
-        }
-    }
-
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        if ($filters['action'] == 'draft') {
-            $criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
-        } else {
-            $criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
-        }
-        self::loadFilters($criteria, $filters);
-        $total = ListInboxPeer::doCount( $criteria );
-        return (int)$total;
     }
 
     /**
@@ -467,6 +507,8 @@ class ListInbox extends BaseListInbox
         $pmTable = new PmTable();
         $criteria = $pmTable->addPMFieldsToList('todo');
 
+        $filters['usr_uid'] = $usr_uid;
+
         $criteria->addSelectColumn(ListInboxPeer::APP_UID);
         $criteria->addSelectColumn(ListInboxPeer::DEL_INDEX);
         $criteria->addSelectColumn(ListInboxPeer::USR_UID);
@@ -491,22 +533,17 @@ class ListInbox extends BaseListInbox
         $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
-        $criteria->addJoin( ListInboxPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
+        $criteria->addJoin(ListInboxPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
-        $criteria->add( ListInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
         self::loadFilters($criteria, $filters);
 
-        $sort  = (!empty($filters['sort'])) ? ListInboxPeer::TABLE_NAME.'.'.$filters['sort'] : "LIST_INBOX.APP_UPDATE_DATE";
+        $sort  = (!empty($filters['sort'])) ?
+            ListInboxPeer::TABLE_NAME.'.'.$filters['sort'] :
+            "LIST_INBOX.APP_UPDATE_DATE";
         $dir   = isset($filters['dir']) ? $filters['dir'] : "ASC";
         $start = isset($filters['start']) ? $filters['start'] : "0";
         $limit = isset($filters['limit']) ? $filters['limit'] : "25";
         $paged = isset($filters['paged']) ? $filters['paged'] : 1;
 
-        if ($filters['action'] == 'draft') {
-            $criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
-        } else {
-            $criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
-        }
-
         if ($dir == "DESC") {
             $criteria->addDescendingOrderByColumn($sort);
         } else {
@@ -514,18 +551,21 @@ class ListInbox extends BaseListInbox
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $dataset = ListInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH');
         while ($dataset->next()) {
             $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow());
-            $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && is_numeric($aRow['DEL_PRIORITY']) && $aRow['DEL_PRIORITY'] <= 5 && $aRow['DEL_PRIORITY'] > 0 ) ? $aRow['DEL_PRIORITY'] : 3;
+            $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) &&
-            $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+                is_numeric($aRow['DEL_PRIORITY']) &&
+                $aRow['DEL_PRIORITY'] <= 5 &&
+                $aRow['DEL_PRIORITY'] > 0) ? $aRow['DEL_PRIORITY'] : 3;
+            $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             $data[] = $aRow;
         }
         return $data;
@@ -535,18 +575,18 @@ class ListInbox extends BaseListInbox
     {
         $criteria = new Criteria();
         $criteria->addSelectColumn(TaskPeer::TAS_PRIORITY_VARIABLE);
-        $criteria->add( TaskPeer::TAS_UID, $taskUid, Criteria::EQUAL );
+        $criteria->add(TaskPeer::TAS_UID, $taskUid, Criteria::EQUAL);
-        $criteria->add( TaskPeer::PRO_UID, $proUid, Criteria::EQUAL );
+        $criteria->add(TaskPeer::PRO_UID, $proUid, Criteria::EQUAL);
         $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
         $priority = $aRow['TAS_PRIORITY_VARIABLE'];
-        if(strlen($priority)>2){
+        if (strlen($priority)>2) {
             $oCase = new Cases();
-            $aData = $oCase->loadCase( $appUid );
+            $aData = $oCase->loadCase($appUid);
-            $priorityLabel = substr($priority, 2,strlen($priority));
+            $priorityLabel = substr($priority, 2, strlen($priority));
-            if (isset( $aData['APP_DATA'][$priorityLabel] )) {
+            if (isset($aData['APP_DATA'][$priorityLabel])) {
                 $priority = $aData['APP_DATA'][$priorityLabel];
             }
         }
@@ -557,34 +597,36 @@ class ListInbox extends BaseListInbox
     {
         $criteria = new Criteria();
         eval('$criteria->addSelectColumn( AppDelegationPeer::'.$fieldName.');');
-        foreach($filters as $k => $v) {
+        foreach ($filters as $k => $v) {
             eval('$criteria->add( AppDelegationPeer::'.$k.',$v, Criteria::EQUAL);');
         }
         $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        return isset($aRow[$fieldName]) ? $aRow[$fieldName] : NULL;
+        return isset($aRow[$fieldName]) ? $aRow[$fieldName] : null;
     }
 
    /**
      * Returns the number of cases of a user
-     * @param $usrUid
+     * @param string $usrUid
-     * @param string $appStatus
+     * @param array  $filters
+     * @param string $status
      * @return int
      */
-    public function getCountList($usrUid, $appStatus = 'DRAFT')
+    public function getCountList($usrUid, $filters = array())
     {
+        $filters['usr_uid'] = $usrUid;
         $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
         $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL);
-        if ($appStatus == 'TO_DO') {
+        if (count($filters)) {
-            $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL);
+            self::loadFilters($criteria, $filters);
-        } else {
-            $criteria->add(ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL);
         }
-        $total = ListInboxPeer::doCount($criteria);
+        $dataset = ListInboxPeer::doSelectRS($criteria);
-        return (int)$total;
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+        return (int)$aRow['TOTAL'];
     }
-
 }
-

workflow/engine/classes/model/ListMyInbox.php

@@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListMyInbox.php';
  *
  * @package    classes.model
  */
+// @codingStandardsIgnoreStart
 class ListMyInbox extends BaseListMyInbox
 {
+    // @codingStandardsIgnoreEnd
     /**
      * Create List My Inbox Table
      *
@@ -25,19 +27,34 @@ class ListMyInbox extends BaseListMyInbox
      */
     public function create($data)
     {
-        $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
+        $con = Propel::getConnection(ListMyInboxPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -52,18 +69,29 @@ class ListMyInbox extends BaseListMyInbox
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
+        $con = Propel::getConnection(ListMyInboxPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -79,9 +107,9 @@ class ListMyInbox extends BaseListMyInbox
      * @throws type
      *
      */
-    public function remove ($app_uid, $usr_uid)
+    public function remove($app_uid, $usr_uid)
     {
-        $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListMyInboxPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $this->setUsrUid($usr_uid);
@@ -103,7 +131,7 @@ class ListMyInbox extends BaseListMyInbox
      * @throws type
      *
      */
-    public function refresh ($data)
+    public function refresh($data)
     {
         $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS'];
 
@@ -111,7 +139,7 @@ class ListMyInbox extends BaseListMyInbox
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
         $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+        $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
         $dataset = UsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -136,7 +164,7 @@ class ListMyInbox extends BaseListMyInbox
 
 
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
         $filter = isset($filters['filter']) ? $filters['filter'] : "";
         $search = isset($filters['search']) ? $filters['search'] : "";
@@ -148,25 +176,31 @@ class ListMyInbox extends BaseListMyInbox
         if ($filter != '') {
             switch ($filter) {
                 case 'read':
-                    $criteria->add( ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                    $criteria->add(ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                     break;
                 case 'unread':
-                    $criteria->add( ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                    $criteria->add(ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                     break;
             }
         }
 
         if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListMyInboxPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)
+                    ->addOr(
+                        $criteria->getNewCriterion(ListMyInboxPeer::APP_UID, $search, Criteria::EQUAL)
+                        ->addOr(
                             $criteria->getNewCriterion(ListMyInboxPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            ))));
+                        )
+                    )
+                )
+            );
         }
 
         if ($process != '') {
-            $criteria->add( ListMyInboxPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListMyInboxPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
@@ -189,29 +223,31 @@ class ListMyInbox extends BaseListMyInbox
                     $dateTo = $dateTo . " 23:59:59";
                 }
 
-                $criteria->add( $criteria->getNewCriterion( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
+                $criteria->add(
-                    addAnd( $criteria->getNewCriterion( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
+                    $criteria->getNewCriterion(
+                        ListMyInboxPeer::DEL_DELEGATE_DATE,
+                        $dateFrom,
+                        Criteria::GREATER_EQUAL
+                    )->addAnd(
+                        $criteria->getNewCriterion(
+                            ListMyInboxPeer::DEL_DELEGATE_DATE,
+                            $dateTo,
+                            Criteria::LESS_EQUAL
+                        )
+                    )
+                );
             } else {
                 $dateFrom = $dateFrom . " 00:00:00";
 
-                $criteria->add( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
+                $criteria->add(ListMyInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
             }
         } elseif ($dateTo != "") {
             $dateTo = $dateTo . " 23:59:59";
 
-            $criteria->add( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
+            $criteria->add(ListMyInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
         }
     }
 
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListMyInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        self::loadFilters($criteria, $filters);
-        $total = ListMyInboxPeer::doCount( $criteria );
-        return (int)$total;
-    }
-
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
     {
         $criteria = new Criteria();
@@ -241,7 +277,7 @@ class ListMyInbox extends BaseListMyInbox
         $criteria->addSelectColumn(ListMyInboxPeer::DEL_INIT_DATE);
         $criteria->addSelectColumn(ListMyInboxPeer::DEL_DUE_DATE);
         $criteria->addSelectColumn(ListMyInboxPeer::DEL_PRIORITY);
-        $criteria->add( ListMyInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
+        $criteria->add(ListMyInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL);
         self::loadFilters($criteria, $filters);
 
         $sort  = (!empty($filters['sort'])) ? $filters['sort'] : "APP_UPDATE_DATE";
@@ -257,22 +293,42 @@ class ListMyInbox extends BaseListMyInbox
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $dataset = ListMyInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListMyInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH');
         while ($dataset->next()) {
             $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow());
 
-            $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+            $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             $data[] = $aRow;
         }
 
         return $data;
     }
-} // ListMyInbox
 
+    /**
+     * Returns the number of cases of a user
+     * @param $usrUid
+     * @param array $filters
+     * @return int
+     */
+    public function getCountList($usrUid, $filters = array())
+    {
+        $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
+        $criteria->add(ListMyInboxPeer::USR_UID, $usrUid, Criteria::EQUAL);
+        if (count($filters)) {
+            self::loadFilters($criteria, $filters);
+        }
+        $dataset = ListMyInboxPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+        return (int)$aRow['TOTAL'];
+    }
+} // ListMyInbox

workflow/engine/classes/model/ListParticipatedHistory.php

@@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListParticipatedHistory.php';
  *
  * @package    classes.model
  */
+// @codingStandardsIgnoreStart
 class ListParticipatedHistory extends BaseListParticipatedHistory
 {
+    // @codingStandardsIgnoreEnd
     /**
      * Create List Participated History Table
      *
@@ -25,19 +27,31 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
      */
     public function create($data)
     {
-        $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListParticipatedHistoryPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -52,18 +66,26 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListParticipatedHistoryPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -79,9 +101,9 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
      * @throws type
      *
      */
-    public function remove ($app_uid, $del_index)
+    public function remove($app_uid, $del_index)
     {
-        $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListParticipatedHistoryPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $this->setDelIndex($del_index);
@@ -95,7 +117,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
         }
     }
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
         $filter = isset($filters['filter']) ? $filters['filter'] : "";
         $search = isset($filters['search']) ? $filters['search'] : "";
@@ -107,10 +129,10 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
         if ($filter != '') {
             switch ($filter) {
                 case 'read':
-                    $criteria->add( ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                    $criteria->add(ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                     break;
                 case 'unread':
-                    $criteria->add( ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                    $criteria->add(ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                     break;
             }
         }
@@ -119,13 +141,21 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
             $criteria->add(
                 $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
                     $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr(
-                $criteria->getNewCriterion(ListParticipatedHistoryPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                        $criteria->getNewCriterion(ListParticipatedHistoryPeer::APP_UID, $search, Criteria::EQUAL)
-                $criteria->getNewCriterion(ListParticipatedHistoryPeer::APP_NUMBER, $search, Criteria::EQUAL)
+                        ->addOr(
-            ))));
+                            $criteria->getNewCriterion(
+                                ListParticipatedHistoryPeer::APP_NUMBER,
+                                $search,
+                                Criteria::EQUAL
+                            )
+                        )
+                    )
+                )
+            );
         }
 
         if ($process != '') {
-            $criteria->add( ListParticipatedHistoryPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListParticipatedHistoryPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
@@ -148,29 +178,31 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
                     $dateTo = $dateTo . " 23:59:59";
                 }
 
-                $criteria->add( $criteria->getNewCriterion( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
+                $criteria->add(
-                    addAnd( $criteria->getNewCriterion( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
+                    $criteria->getNewCriterion(
+                        ListParticipatedHistoryPeer::DEL_DELEGATE_DATE,
+                        $dateFrom,
+                        Criteria::GREATER_EQUAL
+                    )->addAnd(
+                        $criteria->getNewCriterion(
+                            ListParticipatedHistoryPeer::DEL_DELEGATE_DATE,
+                            $dateTo,
+                            Criteria::LESS_EQUAL
+                        )
+                    )
+                );
             } else {
                 $dateFrom = $dateFrom . " 00:00:00";
 
-                $criteria->add( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
+                $criteria->add(ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
             }
         } elseif ($dateTo != "") {
             $dateTo = $dateTo . " 23:59:59";
 
-            $criteria->add( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
+            $criteria->add(ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
         }
     }
 
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListParticipatedHistoryPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        self::loadFilters($criteria, $filters);
-        $total = ListParticipatedHistoryPeer::doCount( $criteria );
-        return (int)$total;
-    }
-
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
     {
         $criteria = new Criteria();
@@ -196,7 +228,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
         $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_INIT_DATE);
         $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_DUE_DATE);
         $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_PRIORITY);
-        $criteria->add( ListParticipatedHistoryPeer::USR_UID, $usr_uid, Criteria::EQUAL );
+        $criteria->add(ListParticipatedHistoryPeer::USR_UID, $usr_uid, Criteria::EQUAL);
         self::loadFilters($criteria, $filters);
 
         $sort  = (!empty($filters['sort'])) ? $filters['sort'] : "DEL_DELEGATE_DATE";
@@ -212,22 +244,42 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $dataset = ListParticipatedHistoryPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListParticipatedHistoryPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH');
         while ($dataset->next()) {
             $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow());
 
-            $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+            $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             $data[] = $aRow;
         }
 
         return $data;
     }
-}
 
+    /**
+     * Returns the number of cases of a user
+     * @param $usrUid
+     * @param array $filters
+     * @return int
+     */
+    public function getCountList($usrUid, $filters = array())
+    {
+        $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
+        $criteria->add(ListParticipatedHistoryPeer::USR_UID, $usrUid, Criteria::EQUAL);
+        if (count($filters)) {
+            self::loadFilters($criteria, $filters);
+        }
+        $dataset = ListParticipatedHistoryPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+        return (int)$aRow['TOTAL'];
+    }
+}

workflow/engine/classes/model/ListParticipatedLast.php

@@ -1,8 +1,8 @@
 <?php
 
+// @codingStandardsIgnoreStart
 require_once 'classes/model/om/BaseListParticipatedLast.php';
 
-
 /**
  * Skeleton subclass for representing a row from the 'LIST_PARTICIPATED_LAST' table.
  *
@@ -11,24 +11,22 @@ require_once 'classes/model/om/BaseListParticipatedLast.php';
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
- *
+ */
- * @package    classes.model
-*/
-
 class ListParticipatedLast extends BaseListParticipatedLast
 {
+    // @codingStandardsIgnoreEnd
     /**
-     * Create List Participated History Table
+     * Create List Participated History Table.
      *
      * @param type $data
-     * @return type
      *
+     * @return type
      */
     public function create($data)
     {
         $criteria = new Criteria();
         $criteria->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
         $dataset = UsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -36,12 +34,12 @@ class ListParticipatedLast extends BaseListParticipatedLast
         $data['APP_STATUS'] = $aRow['APP_STATUS'];
 
         if ($data['USR_UID'] != 'SELF_SERVICES') {
-            if($data['USR_UID'] != '') {
+            if ($data['USR_UID'] != '') {
                 $criteria = new Criteria();
                 $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
                 $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
                 $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-                $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+                $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
                 $dataset = UsersPeer::doSelectRS($criteria);
                 $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                 $dataset->next();
@@ -57,59 +55,89 @@ class ListParticipatedLast extends BaseListParticipatedLast
             $row = $this->getRowFromList($getData);
             if (is_array($row) && sizeof($row)) {
                 $set = array(
-                    "DEL_CURRENT_USR_USERNAME" => "",
+                    'DEL_CURRENT_USR_USERNAME' => '',
-                    "DEL_CURRENT_USR_FIRSTNAME" => "",
+                    'DEL_CURRENT_USR_FIRSTNAME' => '',
-                    "DEL_CURRENT_USR_LASTNAME" => "",
+                    'DEL_CURRENT_USR_LASTNAME' => '',
-                    "APP_TAS_TITLE" => $data['APP_TAS_TITLE'],
+                    'APP_TAS_TITLE' => $data['APP_TAS_TITLE'],
-                    "DEL_CURRENT_TAS_TITLE" => $data['APP_TAS_TITLE']);
+                    'DEL_CURRENT_TAS_TITLE' => $data['APP_TAS_TITLE'], );
                 $this->updateCurrentUser($row, $set);
             }
         }
 
-        if($this->primaryKeysExists($data)) {
+        if ($this->primaryKeysExists($data)) {
             return;
         }
 
-        $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] =  $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
+        $con = Propel::getConnection(ListParticipatedLastPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception('Failed Validation in class '.get_class($this).'.');
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
+
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
     }
 
     /**
-     *  Update List Participated History Table
+     *  Update List Participated History Table.
      *
      * @param type $data
+     *
      * @return type
+     *
      * @throws type
      */
     public function update($data)
     {
         $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN';
-        $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $data['USR_UID'] === 'SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
+        $con = Propel::getConnection(ListParticipatedLastPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
+
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception('Failed Validation in class '.get_class($this).'.'));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -117,18 +145,30 @@ class ListParticipatedLast extends BaseListParticipatedLast
         }
     }
     /**
-     * Refresh List Participated Last
+     * Refresh List Participated Last.
      *
      * @param type $seqName
-     * @return type
-     * @throws type
      *
+     * @return type
+     *
+     * @throws type
      */
-    public function refresh ($data, $isSelfService = false)
+    public function refresh($data, $isSelfService = false)
     {
         $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS'];
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $data['USR_UID'] === 'SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        if (!empty($data['APP_STATUS'])) {
+            $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
+        }
         if (!$isSelfService) {
-            if ($data["USR_UID"] == "") {
+            if ($data['USR_UID'] == '') {
                 return;
             }
 
@@ -136,17 +176,17 @@ class ListParticipatedLast extends BaseListParticipatedLast
             $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
             $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
             $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-            $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+            $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
             $dataset = UsersPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
             $aRow = $dataset->getRow();
 
             //Update - WHERE
-            $criteriaWhere = new Criteria("workflow");
+            $criteriaWhere = new Criteria('workflow');
-            $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL);
+            $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
             //Update - SET
-            $criteriaSet = new Criteria("workflow");
+            $criteriaSet = new Criteria('workflow');
             $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, $aRow['USR_USERNAME']);
             $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, $aRow['USR_FIRSTNAME']);
             $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, $aRow['USR_LASTNAME']);
@@ -155,32 +195,31 @@ class ListParticipatedLast extends BaseListParticipatedLast
                 $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE, $data['APP_TAS_TITLE']);
             }
 
-            BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
+            BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection('workflow'));
-
         }
         $this->update($data);
-
     }
     /**
-     * Remove List Participated History
+     * Remove List Participated History.
      *
      * @param type $seqName
-     * @return type
-     * @throws type
      *
+     * @return type
+     *
+     * @throws type
      */
-    public function remove ($app_uid, $usr_uid, $del_index)
+    public function remove($app_uid, $usr_uid, $del_index)
     {
         try {
             if (!is_null(ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid, $del_index))) {
-                $criteria = new Criteria("workflow");
+                $criteria = new Criteria('workflow');
 
                 $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
                 $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
                 $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index);
                 $result = ListParticipatedLastPeer::doDelete($criteria);
             } else {
-                $criteria = new Criteria("workflow");
+                $criteria = new Criteria('workflow');
                 $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
                 $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
                 $rsCriteria = ListParticipatedLastPeer::doSelectRS($criteria);
@@ -195,96 +234,69 @@ class ListParticipatedLast extends BaseListParticipatedLast
         }
     }
 
-
+    public function loadFilters(&$criteria, $filters)
-    public function loadFilters (&$criteria, $filters)
     {
-        $filter = isset($filters['filter']) ? $filters['filter'] : "";
+        $filter = isset($filters['filter']) ? $filters['filter'] : '';
-        $search = isset($filters['search']) ? $filters['search'] : "";
+        $search = isset($filters['search']) ? $filters['search'] : '';
-        $process = isset($filters['process']) ? $filters['process'] : "";
+        $process = isset($filters['process']) ? $filters['process'] : '';
-        $category = isset($filters['category']) ? $filters['category'] : "";
+        $category = isset($filters['category']) ? $filters['category'] : '';
-        $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
+        $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : '';
-        $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
+        $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : '';
-        $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
+        $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : '';
-        $newestthan     = isset($filters['newestthan'] ) ? $filters['newestthan'] : '';
+        $newestthan = isset($filters['newestthan']) ? $filters['newestthan'] : '';
-        $oldestthan     = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
+        $oldestthan = isset($filters['oldestthan']) ? $filters['oldestthan'] : '';
 
-        if ($filter != '') {
+        //Filter Started by me and Completed by me
         switch ($filter) {
-                case 'read':
+            case 'started':
-                    $criteria->add( ListParticipatedLastPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                $criteria->add(ListParticipatedLastPeer::DEL_INDEX, 1, Criteria::EQUAL);
                 break;
-                case 'unread':
+            case 'completed':
-                    $criteria->add( ListParticipatedLastPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
                 break;
         }
+        //Check the inbox to call
+        switch ($filterStatus) {
+            case 'DRAFT':
+                $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL);
+                break;
+            case 'TO_DO':
+                $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL);
+                break;
+            case 'COMPLETED':
+                $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
+                break;
+            case 'CANCELLED':
+                $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED', Criteria::EQUAL);
+                break;
         }
 
-        if ($search != '' ) {
+        if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%'.$search.'%', Criteria::LIKE)
-                $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%'.$search.'%', Criteria::LIKE)
+                    ->addOr(
+                        $criteria->getNewCriterion(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL)
+                        ->addOr(
                             $criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            ))));
+                        )
-        }
+                    )
-
+                )
-        if($filterStatus != ''){
+            );
-            $criteria->add(ListParticipatedLastPeer::APP_STATUS, '%' . $filterStatus . '%', Criteria::LIKE );
         }
 
         if ($process != '') {
-            $criteria->add( ListParticipatedLastPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListParticipatedLastPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
-            // INNER JOIN FOR TAS_TITLE
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions = array();
             $aConditions[] = array(ListParticipatedLastPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'".$category."'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
-
-        if ($dateFrom != "") {
-            if ($dateTo != "") {
-                if ($dateFrom == $dateTo) {
-                    $dateSame = $dateFrom;
-                    $dateFrom = $dateSame . " 00:00:00";
-                    $dateTo = $dateSame . " 23:59:59";
-                } else {
-                    $dateFrom = $dateFrom . " 00:00:00";
-                    $dateTo = $dateTo . " 23:59:59";
-                }
-
-                $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
-                    addAnd( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
-            } else {
-                $dateFrom = $dateFrom . " 00:00:00";
-
-                $criteria->add( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
-            }
-        } elseif ($dateTo != "") {
-            $dateTo = $dateTo . " 23:59:59";
-
-            $criteria->add( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
-        }
-
-        if ($newestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
-        }
-
-        if ($oldestthan != '') {
-            $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
-        }
-    }
-
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        self::loadFilters($criteria, $filters);
-        $total = ListParticipatedLastPeer::doCount( $criteria );
-        return (int)$total;
     }
 
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '')
@@ -315,50 +327,57 @@ class ListParticipatedLast extends BaseListParticipatedLast
         $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE);
         $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY);
         $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
-        $criteria->add( ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL );
+        $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL);
 
         //Check if the user was participated in a specific case
-        if($appUid != ''){
+        if ($appUid != '') {
-            $criteria->add( ListParticipatedLastPeer::APP_UID, $appUid, Criteria::EQUAL );
+            $criteria->add(ListParticipatedLastPeer::APP_UID, $appUid, Criteria::EQUAL);
         }
 
         self::loadFilters($criteria, $filters);
 
-        $sort  = (!empty($filters['sort'])) ? ListParticipatedLastPeer::TABLE_NAME.'.'.$filters['sort'] : "DEL_DELEGATE_DATE";
+        $sort = (!empty($filters['sort'])) ?
-        $dir   = isset($filters['dir']) ? $filters['dir'] : "ASC";
+            ListParticipatedLastPeer::TABLE_NAME.'.'.$filters['sort'] :
-        $start = isset($filters['start']) ? $filters['start'] : "0";
+            'DEL_DELEGATE_DATE';
-        $limit = isset($filters['limit']) ? $filters['limit'] : "25";
+        $dir = isset($filters['dir']) ? $filters['dir'] : 'ASC';
+        $start = isset($filters['start']) ? $filters['start'] : '0';
+        $limit = isset($filters['limit']) ? $filters['limit'] : '25';
         $paged = isset($filters['paged']) ? $filters['paged'] : 1;
 
-        if ($dir == "DESC") {
+        if ($dir == 'DESC') {
             $criteria->addDescendingOrderByColumn($sort);
         } else {
             $criteria->addAscendingOrderByColumn($sort);
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $criteria->addJoin(ListParticipatedLastPeer::APP_UID,ApplicationPeer::APP_UID,Criteria::LEFT_JOIN);
+        $criteria->addJoin(ListParticipatedLastPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
 
-        $dataset = ListParticipatedLastPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListParticipatedLastPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH');
         while ($dataset->next()) {
-            $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow());
+            $aRow = (is_null($callbackRecord)) ? $dataset->getRow() : $callbackRecord($dataset->getRow());
-            $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && is_numeric($aRow['DEL_PRIORITY']) && $aRow['DEL_PRIORITY'] <= 5 && $aRow['DEL_PRIORITY'] > 0 ) ? $aRow['DEL_PRIORITY'] : 3;
+            $aRow['DEL_PRIORITY'] = (
-            $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+                isset($aRow['DEL_PRIORITY']) &&
+                is_numeric($aRow['DEL_PRIORITY']) &&
+                $aRow['DEL_PRIORITY'] <= 5 &&
+                $aRow['DEL_PRIORITY'] > 0) ? $aRow['DEL_PRIORITY'] : 3;
+            $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             $data[] = $aRow;
         }
 
         return $data;
     }
 
-    public function primaryKeysExists($data) {
+    public function primaryKeysExists($data)
-        $criteria = new Criteria("workflow");
+    {
+        $criteria = new Criteria('workflow');
         $criteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']);
         $criteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']);
         $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $data['DEL_INDEX']);
@@ -366,27 +385,30 @@ class ListParticipatedLast extends BaseListParticipatedLast
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        if(is_array($aRow)) {
+        if (is_array($aRow)) {
-            if(sizeof($aRow)) {
+            if (sizeof($aRow)) {
                 return true;
             }
         }
+
         return false;
     }
 
-    public function getRowFromList($data) {
+    public function getRowFromList($data)
-        $criteria = new Criteria("workflow");
+    {
+        $criteria = new Criteria('workflow');
         $criteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']);
         $criteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']);
         $dataset = ListParticipatedLastPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        if(is_array($aRow)) {
+        if (is_array($aRow)) {
-            if(sizeof($aRow)) {
+            if (sizeof($aRow)) {
                 return $aRow;
             }
         }
+
         return false;
     }
 
@@ -394,29 +416,39 @@ class ListParticipatedLast extends BaseListParticipatedLast
     {
         $con = Propel::getConnection('workflow');
         //Update - WHERE
-        $criteriaWhere = new Criteria("workflow");
+        $criteriaWhere = new Criteria('workflow');
-        $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $where["APP_UID"], Criteria::EQUAL);
+        $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $where['APP_UID'], Criteria::EQUAL);
-        $criteriaWhere->add(ListParticipatedLastPeer::USR_UID, $where["USR_UID"], Criteria::EQUAL);
+        $criteriaWhere->add(ListParticipatedLastPeer::USR_UID, $where['USR_UID'], Criteria::EQUAL);
-        $criteriaWhere->add(ListParticipatedLastPeer::DEL_INDEX, $where["DEL_INDEX"], Criteria::EQUAL);
+        $criteriaWhere->add(ListParticipatedLastPeer::DEL_INDEX, $where['DEL_INDEX'], Criteria::EQUAL);
         //Update - SET
-        $criteriaSet = new Criteria("workflow");
+        $criteriaSet = new Criteria('workflow');
-        foreach($set as $k => $v) {
+        foreach ($set as $k => $v) {
             eval('$criteriaSet->add( ListParticipatedLastPeer::'.$k.',$v, Criteria::EQUAL);');
         }
         BasePeer::doUpdate($criteriaWhere, $criteriaSet, $con);
     }
 
     /**
-     * Returns the number of cases of a user
+     * Returns the number of cases of a user.
-     * @param $usrUid
+     *
+     * @param string $usrUid
+     * @param array  $filters
+     *
      * @return int
      */
-    public function getCountList($usrUid)
+    public function getCountList($usrUid, $filters = array())
     {
         $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
         $criteria->add(ListParticipatedLastPeer::USR_UID, $usrUid, Criteria::EQUAL);
-        $total = ListParticipatedLastPeer::doCount($criteria);
+        if (count($filters)) {
-        return (int)$total;
+            self::loadFilters($criteria, $filters);
+        }
+        $dataset = ListParticipatedLastPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+
+        return (int) $aRow['TOTAL'];
     }
 }
-

workflow/engine/classes/model/ListPaused.php

@@ -14,7 +14,10 @@ require_once 'classes/model/om/BaseListPaused.php';
  *
  * @package    classes.model
  */
-class ListPaused extends BaseListPaused {
+// @codingStandardsIgnoreStart
+class ListPaused extends BaseListPaused
+{
+    // @codingStandardsIgnoreEnd
     /**
      * Create List Paused Table
      *
@@ -37,7 +40,7 @@ class ListPaused extends BaseListPaused {
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
-        $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
+        $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
         $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -51,8 +54,8 @@ class ListPaused extends BaseListPaused {
         $criteria->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
         $criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
         $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
-        $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
-        $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL);
         $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -66,8 +69,8 @@ class ListPaused extends BaseListPaused {
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
-        $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
-        $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL );
+        $criteria->add(AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL);
         $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -78,7 +81,7 @@ class ListPaused extends BaseListPaused {
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
         $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL );
+        $criteria->add(UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL);
         $dataset = UsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -89,7 +92,7 @@ class ListPaused extends BaseListPaused {
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
-        $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
+        $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
         $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -100,7 +103,7 @@ class ListPaused extends BaseListPaused {
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
         $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+        $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL);
         $dataset = UsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -114,19 +117,31 @@ class ListPaused extends BaseListPaused {
         $oListInbox = new ListInbox();
         $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']);
 
-        $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListPausedPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -141,18 +156,26 @@ class ListPaused extends BaseListPaused {
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListPausedPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -168,15 +191,15 @@ class ListPaused extends BaseListPaused {
      * @throws type
      *
      */
-    public function remove ($app_uid, $del_index, $data_inbox)
+    public function remove($app_uid, $del_index, $data_inbox)
     {
         $oRow = ApplicationPeer::retrieveByPK($app_uid);
-        $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
+        $aFields = $oRow->toArray(BasePeer::TYPE_FIELDNAME);
         $data_inbox['APP_STATUS'] = $aFields['APP_STATUS'];
         $listInbox = new ListInbox();
         $listInbox->newRow($data_inbox, $data_inbox['USR_UID']);
 
-        $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListPausedPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $this->setDelIndex($del_index);
@@ -189,80 +212,50 @@ class ListPaused extends BaseListPaused {
         }
     }
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
         $filter = isset($filters['filter']) ? $filters['filter'] : "";
         $search = isset($filters['search']) ? $filters['search'] : "";
         $process = isset($filters['process']) ? $filters['process'] : "";
         $category = isset($filters['category']) ? $filters['category'] : "";
-        $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
+        $filterStatus   = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
-        $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
 
-        if ($filter != '') {
+        //Filter Read Unread All
         switch ($filter) {
             case 'read':
-                    $criteria->add( ListPausedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                $criteria->add(ListPausedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                 break;
             case 'unread':
-                    $criteria->add( ListPausedPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                $criteria->add(ListPausedPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                 break;
         }
-        }
 
         if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListPausedPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    $criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)
+                    ->addOr(
+                        $criteria->getNewCriterion(ListPausedPeer::APP_UID, $search, Criteria::EQUAL)
+                        ->addOr(
                             $criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            ))));
+                        )
+                    )
+                )
+            );
         }
 
         if ($process != '') {
-            $criteria->add( ListPausedPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListPausedPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
-            // INNER JOIN FOR TAS_TITLE
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListPausedPeer::PRO_UID, ProcessPeer::PRO_UID);
             $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
-
-        if ($dateFrom != "") {
-            if ($dateTo != "") {
-                if ($dateFrom == $dateTo) {
-                    $dateSame = $dateFrom;
-                    $dateFrom = $dateSame . " 00:00:00";
-                    $dateTo = $dateSame . " 23:59:59";
-                } else {
-                    $dateFrom = $dateFrom . " 00:00:00";
-                    $dateTo = $dateTo . " 23:59:59";
-                }
-
-                $criteria->add( $criteria->getNewCriterion( ListPausedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
-                    addAnd( $criteria->getNewCriterion( ListPausedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
-            } else {
-                $dateFrom = $dateFrom . " 00:00:00";
-
-                $criteria->add( ListPausedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
-            }
-        } elseif ($dateTo != "") {
-            $dateTo = $dateTo . " 23:59:59";
-
-            $criteria->add( ListPausedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
-        }
-    }
-
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $criteria = new Criteria();
-        $criteria->add( ListPausedPeer::USR_UID, $usr_uid, Criteria::EQUAL );
-        self::loadFilters($criteria, $filters);
-        $total = ListPausedPeer::doCount( $criteria );
-        return (int)$total;
     }
 
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
@@ -293,7 +286,7 @@ class ListPaused extends BaseListPaused {
         $criteria->addSelectColumn(ListPausedPeer::DEL_INIT_DATE);
         $criteria->addSelectColumn(ListPausedPeer::DEL_DUE_DATE);
         $criteria->addSelectColumn(ListPausedPeer::DEL_PRIORITY);
-        $criteria->add( ListPausedPeer::USR_UID, $usr_uid, Criteria::EQUAL );
+        $criteria->add(ListPausedPeer::USR_UID, $usr_uid, Criteria::EQUAL);
         self::loadFilters($criteria, $filters);
 
         $sort  = (!empty($filters['sort'])) ? ListPausedPeer::TABLE_NAME.'.'.$filters['sort'] : "APP_PAUSED_DATE";
@@ -309,11 +302,11 @@ class ListPaused extends BaseListPaused {
         }
 
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
 
-        $dataset = ListPausedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') );
+        $dataset = ListPausedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = array();
         while ($dataset->next()) {
@@ -327,15 +320,22 @@ class ListPaused extends BaseListPaused {
 
     /**
      * Returns the number of cases of a user
-     * @param $usrUid
+     * @param string $usrUid
+     * @param array  $filters
      * @return int
      */
-    public function getCountList($usrUid)
+    public function getCountList($usrUid, $filters = array())
     {
         $criteria = new Criteria();
+        $criteria->addSelectColumn('COUNT(*) AS TOTAL');
         $criteria->add(ListPausedPeer::USR_UID, $usrUid, Criteria::EQUAL);
-        $total = ListPausedPeer::doCount($criteria);
+        if (count($filters)) {
-        return (int)$total;
+            self::loadFilters($criteria, $filters);
+        }
+        $dataset = ListPausedPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+        return (int)$aRow['TOTAL'];
     }
 } // ListPaused
-

workflow/engine/classes/model/ListUnassigned.php

@@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListUnassigned.php';
  *
  * @package    classes.model
  */
+// @codingStandardsIgnoreStart
 class ListUnassigned extends BaseListUnassigned
 {
+    // @codingStandardsIgnoreEnd
     private $total = 0;
     /**
      * Create List Unassigned Table
@@ -26,19 +28,27 @@ class ListUnassigned extends BaseListUnassigned
      */
     public function create($data)
     {
-        $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
+        if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) {
+            $p = new Process();
+            $data['PRO_ID'] =  $p->load($data['PRO_UID'])['PRO_ID'];
+        }
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListUnassignedPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -53,18 +63,22 @@ class ListUnassigned extends BaseListUnassigned
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
+        if (!empty($data['TAS_UID'])) {
+            $t = new Task();
+            $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID'];
+        }
+        $con = Propel::getConnection(ListUnassignedPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -80,9 +94,9 @@ class ListUnassigned extends BaseListUnassigned
      * @throws type
      *
      */
-    public function remove ($appUid, $delIndex)
+    public function remove($appUid, $delIndex)
     {
-        $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListUnassignedPeer::DATABASE_NAME);
         try {
             $this->setAppUid($appUid);
             $this->setDelIndex($delIndex);
@@ -96,15 +110,15 @@ class ListUnassigned extends BaseListUnassigned
         }
     }
 
-    public function newRow ($data, $delPreviusUsrUid)
+    public function newRow($data, $delPreviusUsrUid)
     {
         $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
         $data['DEL_DUE_DATE'] = isset($data['DEL_TASK_DUE_DATE']) ? $data['DEL_TASK_DUE_DATE'] : '';
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
+        $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
-        $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
+        $criteria->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
-        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
         $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -113,7 +127,7 @@ class ListUnassigned extends BaseListUnassigned
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
-        $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
+        $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
         $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -123,7 +137,7 @@ class ListUnassigned extends BaseListUnassigned
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
-        $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
+        $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
         $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
@@ -137,7 +151,7 @@ class ListUnassigned extends BaseListUnassigned
             $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
             $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
             $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-            $criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL );
+            $criteria->add(UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL);
             $dataset = UsersPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
@@ -151,7 +165,7 @@ class ListUnassigned extends BaseListUnassigned
         return true;
     }
 
-    public function loadFilters (&$criteria, $filters)
+    public function loadFilters(&$criteria, $filters)
     {
         $filter = isset($filters['filter']) ? $filters['filter'] : "";
         $search = isset($filters['search']) ? $filters['search'] : "";
@@ -160,75 +174,39 @@ class ListUnassigned extends BaseListUnassigned
         $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
         $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
 
-        if ($filter != '') {
-            switch ($filter) {
-                case 'read':
-                    $criteria->add( ListUnassignedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
-                    break;
-                case 'unread':
-                    $criteria->add( ListUnassignedPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
-                    break;
-            }
-        }
-
         if ($search != '') {
             $criteria->add(
-                $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)
-                $criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
+                ->addOr(
-                $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
+                    $criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)
+                    ->addOr(
+                        $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL)
+                        ->addOr(
                             $criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL)
-            ))));
+                        )
+                    )
+                )
+            );
         }
 
         if ($process != '') {
-            $criteria->add( ListUnassignedPeer::PRO_UID, $process, Criteria::EQUAL);
+            $criteria->add(ListUnassignedPeer::PRO_UID, $process, Criteria::EQUAL);
         }
 
         if ($category != '') {
-            // INNER JOIN FOR TAS_TITLE
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListUnassignedPeer::PRO_UID, ProcessPeer::PRO_UID);
             $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
-
-        if ($dateFrom != "") {
-            if ($dateTo != "") {
-                if ($dateFrom == $dateTo) {
-                    $dateSame = $dateFrom;
-                    $dateFrom = $dateSame . " 00:00:00";
-                    $dateTo = $dateSame . " 23:59:59";
-                } else {
-                    $dateFrom = $dateFrom . " 00:00:00";
-                    $dateTo = $dateTo . " 23:59:59";
-                }
-
-                $criteria->add( $criteria->getNewCriterion( ListUnassignedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->
-                    addAnd( $criteria->getNewCriterion( ListUnassignedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
-            } else {
-                $dateFrom = $dateFrom . " 00:00:00";
-
-                $criteria->add( ListUnassignedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
-            }
-        } elseif ($dateTo != "") {
-            $dateTo = $dateTo . " 23:59:59";
-
-            $criteria->add( ListUnassignedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
-        }
-    }
-
-    public function countTotal ($usr_uid, $filters = array())
-    {
-        $total = $this->total;
-        return (int)$total;
     }
 
     public function loadList($usr_uid, $filters = array(), $callbackRecord = null)
     {
         $resp = array();
         $pmTable = new PmTable();
-        $tasks = $this->getSelfServiceTasks( $usr_uid );
+        $tasks = $this->getSelfServiceTasks($usr_uid);
         $criteria = $pmTable->addPMFieldsToList('unassigned');
 
         $criteria->addSelectColumn(ListUnassignedPeer::APP_UID);
@@ -279,11 +257,15 @@ class ListUnassigned extends BaseListUnassigned
                         Criteria::EQUAL
                     )->addAnd(
                         $criteria->getNewCriterion(
-                            ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL
+                            ListUnassignedPeer::DEL_INDEX,
+                            $value["DEL_INDEX"],
+                            Criteria::EQUAL
                         )
                     )->addAnd(
                         $criteria->getNewCriterion(
-                            ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL
+                            ListUnassignedPeer::TAS_UID,
+                            $value["TAS_UID"],
+                            Criteria::EQUAL
                         )
                     )->addOr(
                         $criterionAux
@@ -294,14 +276,16 @@ class ListUnassigned extends BaseListUnassigned
             $criteria->add(
                 $criterionAux->addOr($criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $tasks, Criteria::IN))
             );
-        }else{
+        } else {
             //Load Selfservice
             $criteria->add(ListUnassignedPeer::TAS_UID, $tasks, Criteria::IN);
         }
 
         //Apply some filters
         self::loadFilters($criteria, $filters);
-        $sort  = (!empty($filters['sort'])) ? ListUnassignedPeer::TABLE_NAME.'.'.$filters['sort'] : "LIST_UNASSIGNED.DEL_DELEGATE_DATE";
+        $sort  = (!empty($filters['sort'])) ?
+            ListUnassignedPeer::TABLE_NAME.'.'.$filters['sort'] :
+            "LIST_UNASSIGNED.DEL_DELEGATE_DATE";
         $dir   = isset($filters['dir']) ? $filters['dir'] : "ASC";
         $start = isset($filters['start']) ? $filters['start'] : "0";
         $limit = isset($filters['limit']) ? $filters['limit'] : "25";
@@ -314,18 +298,21 @@ class ListUnassigned extends BaseListUnassigned
         }
         $this->total = ListUnassignedPeer::doCount($criteria);
         if ($paged == 1) {
-            $criteria->setLimit( $limit );
+            $criteria->setLimit($limit);
-            $criteria->setOffset( $start );
+            $criteria->setOffset($start);
         }
         $dataset = ListUnassignedPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH');
 
         $data = array();
         while ($dataset->next()) {
             $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow());
-            $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && is_numeric($aRow['DEL_PRIORITY']) && $aRow['DEL_PRIORITY'] <= 5 && $aRow['DEL_PRIORITY'] > 0 ) ? $aRow['DEL_PRIORITY'] : 3;
+            $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) &&
-            $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+                is_numeric($aRow['DEL_PRIORITY']) &&
+                $aRow['DEL_PRIORITY'] <= 5 &&
+                $aRow['DEL_PRIORITY'] > 0) ? $aRow['DEL_PRIORITY'] : 3;
+            $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             $data[] = $aRow;
         }
         return $data;
@@ -356,9 +343,15 @@ class ListUnassigned extends BaseListUnassigned
             $criteria->addSelectColumn(AppAssignSelfServiceValuePeer::DEL_INDEX);
             $criteria->addSelectColumn(AppAssignSelfServiceValuePeer::TAS_UID);
 
-            $criteria->add(AppAssignSelfServiceValuePeer::ID, AppAssignSelfServiceValuePeer::ID . 
+            $criteria->add(
-            " IN (SELECT " . AppAssignSelfServiceValueGroupPeer::ID . " FROM " . AppAssignSelfServiceValueGroupPeer::TABLE_NAME . 
+                AppAssignSelfServiceValuePeer::ID,
-            " WHERE " . AppAssignSelfServiceValueGroupPeer::GRP_UID . " IN ('" . implode("','", $arrayUid) . "'))", Criteria::CUSTOM);
+                AppAssignSelfServiceValuePeer::ID.
+                " IN (SELECT ".AppAssignSelfServiceValueGroupPeer::ID.
+                " FROM ".AppAssignSelfServiceValueGroupPeer::TABLE_NAME.
+                " WHERE ".AppAssignSelfServiceValueGroupPeer::GRP_UID." IN ('".
+                implode("','", $arrayUid)."'))",
+                Criteria::CUSTOM
+            );
 
             $rsCriteria = AppAssignSelfServiceValuePeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -446,9 +439,10 @@ class ListUnassigned extends BaseListUnassigned
     /**
      * Returns the number of cases of a user
      * @param $userUid
+     * @param array $filters
      * @return int
      */
-    public function getCountList($userUid)
+    public function getCountList($userUid, $filters = array())
     {
         $criteria = new Criteria('workflow');
         $tasks = $this->getSelfServiceTasks($userUid);
@@ -460,13 +454,33 @@ class ListUnassigned extends BaseListUnassigned
 
             foreach ($arrayAppAssignSelfServiceValueData as $value) {
                 if (is_null($criterionAux)) {
-                    $criterionAux = $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $value["APP_UID"], Criteria::EQUAL)->addAnd(
+                    $criterionAux = $criteria->getNewCriterion(
-                        $criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL))->addAnd(
+                        ListUnassignedPeer::APP_UID,
-                        $criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL));
+                        $value["APP_UID"],
+                        Criteria::EQUAL
+                    )->addAnd(
+                        $criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL)
+                    )->addAnd(
+                        $criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL)
+                    );
                 } else {
-                    $criterionAux = $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $value["APP_UID"], Criteria::EQUAL)->addAnd(
+                    $criterionAux = $criteria->getNewCriterion(
-                        $criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL))->addAnd(
+                        ListUnassignedPeer::APP_UID,
-                        $criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL))->addOr(
+                        $value["APP_UID"],
+                        Criteria::EQUAL
+                    )->addAnd(
+                        $criteria->getNewCriterion(
+                            ListUnassignedPeer::DEL_INDEX,
+                            $value["DEL_INDEX"],
+                            Criteria::EQUAL
+                        )
+                    )->addAnd(
+                        $criteria->getNewCriterion(
+                            ListUnassignedPeer::TAS_UID,
+                            $value["TAS_UID"],
+                            Criteria::EQUAL
+                        )
+                    )->addOr(
                         $criterionAux
                     );
                 }
@@ -483,4 +497,3 @@ class ListUnassigned extends BaseListUnassigned
         return (int)$total;
     }
 }
-

workflow/engine/classes/model/ListUnassignedGroup.php

@@ -14,7 +14,10 @@ require_once 'classes/model/om/BaseListUnassignedGroup.php';
  *
  * @package    classes.model
  */
-class ListUnassignedGroup extends BaseListUnassignedGroup {
+// @codingStandardsIgnoreStart
+class ListUnassignedGroup extends BaseListUnassignedGroup
+{
+    // @codingStandardsIgnoreEnd
     /**
      * Create List Unassigned Group Table
      *
@@ -24,19 +27,23 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
      */
     public function create($data)
     {
-        $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        $con = Propel::getConnection(ListUnassignedGroupPeer::DATABASE_NAME);
         try {
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
             } else {
-                $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
+                $e = new Exception("Failed Validation in class " . get_class($this) . ".");
                 $e->aValidationFailures = $this->getValidationFailures();
                 throw ($e);
             }
             $con->commit();
             return $result;
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $con->rollback();
             throw ($e);
         }
@@ -50,18 +57,22 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
      */
     public function update($data)
     {
-        $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
+        if (!empty($data['USR_UID'])) {
+            $u = new Users();
+            $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID'];
+        }
+        $con = Propel::getConnection(ListUnassignedGroupPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
+            $this->setNew(false);
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -77,9 +88,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
      * @throws type
      *
      */
-    public function remove ($app_uid,$una_uid)
+    public function remove($app_uid, $una_uid)
     {
-        $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ListUnassignedGroupPeer::DATABASE_NAME);
         try {
             $this->setAppUid($app_uid);
             $this->setUnaUid($una_uid);
@@ -99,7 +110,8 @@ class ListUnassignedGroup extends BaseListUnassignedGroup {
      * @throws type
      *
      */
-    public function newRow($unaUid, $usrUid, $type, $typeUid=''){
+    public function newRow($unaUid, $usrUid, $type, $typeUid = '')
+    {
         $data['UNA_UID'] = $unaUid;
         $data['USR_UID'] = $usrUid;
         $data['TYPE']    = $type;

workflow/engine/classes/model/Process.php

@@ -165,6 +165,9 @@ class Process extends BaseProcess
                 } while ($this->processExists( $sNewProUid ));
             } else {
                 $sNewProUid = $aData['PRO_UID'];
+                if (!empty($aData['PRO_ID'])) {
+                    $this->setProId($aData['PRO_ID']);
+                }
             }
 
             $this->setProUid( $sNewProUid );

workflow/engine/classes/model/Task.php

@@ -410,6 +410,9 @@ class Task extends BaseTask
             $this->setTasPosy("");
             $this->setTasColor("");
             $this->setTasGroupVariable("");
+            if (!$generateUid && !empty($aData['TAS_ID'])) {
+                $this->setTasId($aData['TAS_ID']);
+            }
             $this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
 
             if ($this->validate()) {

workflow/engine/classes/model/map/AppDelegationMapBuilder.php

@@ -63,12 +63,16 @@ class AppDelegationMapBuilder
         $tMap = $this->dbMap->addTable('APP_DELEGATION');
         $tMap->setPhpName('AppDelegation');
 
-        $tMap->setUseIdGenerator(false);
+        $tMap->setUseIdGenerator(true);
 
         $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
         $tMap->addPrimaryKey('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
 
+        $tMap->addColumn('DELEGATION_ID', 'DelegationId', 'int', CreoleTypes::INTEGER, true, null);
+
+        $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, false, null);
+
         $tMap->addColumn('DEL_PREVIOUS', 'DelPrevious', 'int', CreoleTypes::INTEGER, true, null);
 
         $tMap->addColumn('DEL_LAST_INDEX', 'DelLastIndex', 'int', CreoleTypes::INTEGER, true, null);
@@ -113,6 +117,12 @@ class AppDelegationMapBuilder
 
         $tMap->addColumn('APP_OVERDUE_PERCENTAGE', 'AppOverduePercentage', 'double', CreoleTypes::DOUBLE, true, null);
 
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
         $tMap->addValidator('DEL_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|PARALLEL', 'Please select a valid status.');
 
         $tMap->addValidator('DEL_PRIORITY', 'validValues', 'propel.validator.ValidValuesValidator', '1|2|3|4|5', 'Please select a valid Priority.');

workflow/engine/classes/model/map/ApplicationMapBuilder.php

@@ -77,6 +77,8 @@ class ApplicationMapBuilder
 
         $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 100);
 
+        $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, true, null);
+
         $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
         $tMap->addColumn('APP_PROC_STATUS', 'AppProcStatus', 'string', CreoleTypes::VARCHAR, true, 100);

workflow/engine/classes/model/map/ListCanceledMapBuilder.php

@@ -101,6 +101,12 @@ class ListCanceledMapBuilder
 
         $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
     } // doBuild()
 
 } // ListCanceledMapBuilder

workflow/engine/classes/model/map/ListCompletedMapBuilder.php

@@ -95,6 +95,12 @@ class ListCompletedMapBuilder
 
         $tMap->addColumn('DEL_CURRENT_USR_LASTNAME', 'DelCurrentUsrLastname', 'string', CreoleTypes::VARCHAR, false, 50);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
     } // doBuild()
 
 } // ListCompletedMapBuilder

workflow/engine/classes/model/map/ListInboxMapBuilder.php

@@ -105,6 +105,14 @@ class ListInboxMapBuilder
 
         $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null);
+
     } // doBuild()
 
 } // ListInboxMapBuilder

workflow/engine/classes/model/map/ListMyInboxMapBuilder.php

@@ -115,6 +115,14 @@ class ListMyInboxMapBuilder
 
         $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null);
+
     } // doBuild()
 
 } // ListMyInboxMapBuilder

workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php

@@ -105,6 +105,12 @@ class ListParticipatedHistoryMapBuilder
 
         $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
     } // doBuild()
 
 } // ListParticipatedHistoryMapBuilder

workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php

@@ -111,6 +111,14 @@ class ListParticipatedLastMapBuilder
 
         $tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null);
+
     } // doBuild()
 
 } // ListParticipatedLastMapBuilder

workflow/engine/classes/model/map/ListPausedMapBuilder.php

@@ -109,6 +109,12 @@ class ListPausedMapBuilder
 
         $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
     } // doBuild()
 
 } // ListPausedMapBuilder

workflow/engine/classes/model/map/ListUnassignedGroupMapBuilder.php

@@ -73,6 +73,8 @@ class ListUnassignedGroupMapBuilder
 
         $tMap->addColumn('TYP_UID', 'TypUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null);
+
     } // doBuild()
 
 } // ListUnassignedGroupMapBuilder

workflow/engine/classes/model/map/ListUnassignedMapBuilder.php

@@ -97,6 +97,10 @@ class ListUnassignedMapBuilder
 
         $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
+
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null);
+
     } // doBuild()
 
 } // ListUnassignedMapBuilder

workflow/engine/classes/model/map/ProcessMapBuilder.php

@@ -63,10 +63,12 @@ class ProcessMapBuilder
         $tMap = $this->dbMap->addTable('PROCESS');
         $tMap->setPhpName('Process');
 
-        $tMap->setUseIdGenerator(false);
+        $tMap->setUseIdGenerator(true);
 
         $tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, true, null);
+
         $tMap->addColumn('PRO_TITLE', 'ProTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
 
         $tMap->addColumn('PRO_DESCRIPTION', 'ProDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);

workflow/engine/classes/model/map/TaskMapBuilder.php

@@ -63,12 +63,14 @@ class TaskMapBuilder
         $tMap = $this->dbMap->addTable('TASK');
         $tMap->setPhpName('Task');
 
-        $tMap->setUseIdGenerator(false);
+        $tMap->setUseIdGenerator(true);
 
         $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
         $tMap->addPrimaryKey('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, true, null);
+
         $tMap->addColumn('TAS_TITLE', 'TasTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
 
         $tMap->addColumn('TAS_DESCRIPTION', 'TasDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);

workflow/engine/classes/model/map/UsersMapBuilder.php

@@ -63,10 +63,12 @@ class UsersMapBuilder
         $tMap = $this->dbMap->addTable('USERS');
         $tMap->setPhpName('Users');
 
-        $tMap->setUseIdGenerator(false);
+        $tMap->setUseIdGenerator(true);
 
         $tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, true, null);
+
         $tMap->addColumn('USR_USERNAME', 'UsrUsername', 'string', CreoleTypes::VARCHAR, true, 100);
 
         $tMap->addColumn('USR_PASSWORD', 'UsrPassword', 'string', CreoleTypes::VARCHAR, true, 128);

workflow/engine/classes/model/om/BaseAppDelegation.php

@@ -39,6 +39,18 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
      */
     protected $del_index = 0;
 
+    /**
+     * The value for the delegation_id field.
+     * @var        int
+     */
+    protected $delegation_id;
+
+    /**
+     * The value for the app_number field.
+     * @var        int
+     */
+    protected $app_number = 0;
+
     /**
      * The value for the del_previous field.
      * @var        int
@@ -171,6 +183,24 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
      */
     protected $app_overdue_percentage = 0;
 
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -207,6 +237,28 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
         return $this->del_index;
     }
 
+    /**
+     * Get the [delegation_id] column value.
+     * 
+     * @return     int
+     */
+    public function getDelegationId()
+    {
+
+        return $this->delegation_id;
+    }
+
+    /**
+     * Get the [app_number] column value.
+     * 
+     * @return     int
+     */
+    public function getAppNumber()
+    {
+
+        return $this->app_number;
+    }
+
     /**
      * Get the [del_previous] column value.
      * 
@@ -554,6 +606,39 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
         return $this->app_overdue_percentage;
     }
 
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -598,6 +683,50 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
 
     } // setDelIndex()
 
+    /**
+     * Set the value of [delegation_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setDelegationId($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->delegation_id !== $v) {
+            $this->delegation_id = $v;
+            $this->modifiedColumns[] = AppDelegationPeer::DELEGATION_ID;
+        }
+
+    } // setDelegationId()
+
+    /**
+     * Set the value of [app_number] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setAppNumber($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->app_number !== $v || $v === 0) {
+            $this->app_number = $v;
+            $this->modifiedColumns[] = AppDelegationPeer::APP_NUMBER;
+        }
+
+    } // setAppNumber()
+
     /**
      * Set the value of [del_previous] column.
      * 
@@ -1093,6 +1222,72 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
 
     } // setAppOverduePercentage()
 
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = AppDelegationPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = AppDelegationPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = AppDelegationPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -1114,56 +1309,66 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
 
             $this->del_index = $rs->getInt($startcol + 1);
 
-            $this->del_previous = $rs->getInt($startcol + 2);
+            $this->delegation_id = $rs->getInt($startcol + 2);
 
-            $this->del_last_index = $rs->getInt($startcol + 3);
+            $this->app_number = $rs->getInt($startcol + 3);
 
-            $this->pro_uid = $rs->getString($startcol + 4);
+            $this->del_previous = $rs->getInt($startcol + 4);
 
-            $this->tas_uid = $rs->getString($startcol + 5);
+            $this->del_last_index = $rs->getInt($startcol + 5);
 
-            $this->usr_uid = $rs->getString($startcol + 6);
+            $this->pro_uid = $rs->getString($startcol + 6);
 
-            $this->del_type = $rs->getString($startcol + 7);
+            $this->tas_uid = $rs->getString($startcol + 7);
 
-            $this->del_thread = $rs->getInt($startcol + 8);
+            $this->usr_uid = $rs->getString($startcol + 8);
 
-            $this->del_thread_status = $rs->getString($startcol + 9);
+            $this->del_type = $rs->getString($startcol + 9);
 
-            $this->del_priority = $rs->getString($startcol + 10);
+            $this->del_thread = $rs->getInt($startcol + 10);
 
-            $this->del_delegate_date = $rs->getTimestamp($startcol + 11, null);
+            $this->del_thread_status = $rs->getString($startcol + 11);
 
-            $this->del_init_date = $rs->getTimestamp($startcol + 12, null);
+            $this->del_priority = $rs->getString($startcol + 12);
 
-            $this->del_finish_date = $rs->getTimestamp($startcol + 13, null);
+            $this->del_delegate_date = $rs->getTimestamp($startcol + 13, null);
 
-            $this->del_task_due_date = $rs->getTimestamp($startcol + 14, null);
+            $this->del_init_date = $rs->getTimestamp($startcol + 14, null);
 
-            $this->del_risk_date = $rs->getTimestamp($startcol + 15, null);
+            $this->del_finish_date = $rs->getTimestamp($startcol + 15, null);
 
-            $this->del_duration = $rs->getFloat($startcol + 16);
+            $this->del_task_due_date = $rs->getTimestamp($startcol + 16, null);
 
-            $this->del_queue_duration = $rs->getFloat($startcol + 17);
+            $this->del_risk_date = $rs->getTimestamp($startcol + 17, null);
 
-            $this->del_delay_duration = $rs->getFloat($startcol + 18);
+            $this->del_duration = $rs->getFloat($startcol + 18);
 
-            $this->del_started = $rs->getInt($startcol + 19);
+            $this->del_queue_duration = $rs->getFloat($startcol + 19);
 
-            $this->del_finished = $rs->getInt($startcol + 20);
+            $this->del_delay_duration = $rs->getFloat($startcol + 20);
 
-            $this->del_delayed = $rs->getInt($startcol + 21);
+            $this->del_started = $rs->getInt($startcol + 21);
 
-            $this->del_data = $rs->getString($startcol + 22);
+            $this->del_finished = $rs->getInt($startcol + 22);
 
-            $this->app_overdue_percentage = $rs->getFloat($startcol + 23);
+            $this->del_delayed = $rs->getInt($startcol + 23);
+
+            $this->del_data = $rs->getString($startcol + 24);
+
+            $this->app_overdue_percentage = $rs->getFloat($startcol + 25);
+
+            $this->usr_id = $rs->getInt($startcol + 26);
+
+            $this->pro_id = $rs->getInt($startcol + 27);
+
+            $this->tas_id = $rs->getInt($startcol + 28);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 24; // 24 = AppDelegationPeer::NUM_COLUMNS - AppDelegationPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 29; // 29 = AppDelegationPeer::NUM_COLUMNS - AppDelegationPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AppDelegation object", $e);
@@ -1374,71 +1579,86 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
                 return $this->getDelIndex();
                 break;
             case 2:
-                return $this->getDelPrevious();
+                return $this->getDelegationId();
                 break;
             case 3:
-                return $this->getDelLastIndex();
+                return $this->getAppNumber();
                 break;
             case 4:
-                return $this->getProUid();
+                return $this->getDelPrevious();
                 break;
             case 5:
-                return $this->getTasUid();
+                return $this->getDelLastIndex();
                 break;
             case 6:
-                return $this->getUsrUid();
+                return $this->getProUid();
                 break;
             case 7:
-                return $this->getDelType();
+                return $this->getTasUid();
                 break;
             case 8:
-                return $this->getDelThread();
+                return $this->getUsrUid();
                 break;
             case 9:
-                return $this->getDelThreadStatus();
+                return $this->getDelType();
                 break;
             case 10:
-                return $this->getDelPriority();
+                return $this->getDelThread();
                 break;
             case 11:
-                return $this->getDelDelegateDate();
+                return $this->getDelThreadStatus();
                 break;
             case 12:
-                return $this->getDelInitDate();
+                return $this->getDelPriority();
                 break;
             case 13:
-                return $this->getDelFinishDate();
+                return $this->getDelDelegateDate();
                 break;
             case 14:
-                return $this->getDelTaskDueDate();
+                return $this->getDelInitDate();
                 break;
             case 15:
-                return $this->getDelRiskDate();
+                return $this->getDelFinishDate();
                 break;
             case 16:
-                return $this->getDelDuration();
+                return $this->getDelTaskDueDate();
                 break;
             case 17:
-                return $this->getDelQueueDuration();
+                return $this->getDelRiskDate();
                 break;
             case 18:
-                return $this->getDelDelayDuration();
+                return $this->getDelDuration();
                 break;
             case 19:
-                return $this->getDelStarted();
+                return $this->getDelQueueDuration();
                 break;
             case 20:
-                return $this->getDelFinished();
+                return $this->getDelDelayDuration();
                 break;
             case 21:
-                return $this->getDelDelayed();
+                return $this->getDelStarted();
                 break;
             case 22:
-                return $this->getDelData();
+                return $this->getDelFinished();
                 break;
             case 23:
+                return $this->getDelDelayed();
+                break;
+            case 24:
+                return $this->getDelData();
+                break;
+            case 25:
                 return $this->getAppOverduePercentage();
                 break;
+            case 26:
+                return $this->getUsrId();
+                break;
+            case 27:
+                return $this->getProId();
+                break;
+            case 28:
+                return $this->getTasId();
+                break;
             default:
                 return null;
                 break;
@@ -1461,28 +1681,33 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
         $result = array(
             $keys[0] => $this->getAppUid(),
             $keys[1] => $this->getDelIndex(),
-            $keys[2] => $this->getDelPrevious(),
+            $keys[2] => $this->getDelegationId(),
-            $keys[3] => $this->getDelLastIndex(),
+            $keys[3] => $this->getAppNumber(),
-            $keys[4] => $this->getProUid(),
+            $keys[4] => $this->getDelPrevious(),
-            $keys[5] => $this->getTasUid(),
+            $keys[5] => $this->getDelLastIndex(),
-            $keys[6] => $this->getUsrUid(),
+            $keys[6] => $this->getProUid(),
-            $keys[7] => $this->getDelType(),
+            $keys[7] => $this->getTasUid(),
-            $keys[8] => $this->getDelThread(),
+            $keys[8] => $this->getUsrUid(),
-            $keys[9] => $this->getDelThreadStatus(),
+            $keys[9] => $this->getDelType(),
-            $keys[10] => $this->getDelPriority(),
+            $keys[10] => $this->getDelThread(),
-            $keys[11] => $this->getDelDelegateDate(),
+            $keys[11] => $this->getDelThreadStatus(),
-            $keys[12] => $this->getDelInitDate(),
+            $keys[12] => $this->getDelPriority(),
-            $keys[13] => $this->getDelFinishDate(),
+            $keys[13] => $this->getDelDelegateDate(),
-            $keys[14] => $this->getDelTaskDueDate(),
+            $keys[14] => $this->getDelInitDate(),
-            $keys[15] => $this->getDelRiskDate(),
+            $keys[15] => $this->getDelFinishDate(),
-            $keys[16] => $this->getDelDuration(),
+            $keys[16] => $this->getDelTaskDueDate(),
-            $keys[17] => $this->getDelQueueDuration(),
+            $keys[17] => $this->getDelRiskDate(),
-            $keys[18] => $this->getDelDelayDuration(),
+            $keys[18] => $this->getDelDuration(),
-            $keys[19] => $this->getDelStarted(),
+            $keys[19] => $this->getDelQueueDuration(),
-            $keys[20] => $this->getDelFinished(),
+            $keys[20] => $this->getDelDelayDuration(),
-            $keys[21] => $this->getDelDelayed(),
+            $keys[21] => $this->getDelStarted(),
-            $keys[22] => $this->getDelData(),
+            $keys[22] => $this->getDelFinished(),
-            $keys[23] => $this->getAppOverduePercentage(),
+            $keys[23] => $this->getDelDelayed(),
+            $keys[24] => $this->getDelData(),
+            $keys[25] => $this->getAppOverduePercentage(),
+            $keys[26] => $this->getUsrId(),
+            $keys[27] => $this->getProId(),
+            $keys[28] => $this->getTasId(),
         );
         return $result;
     }
@@ -1521,71 +1746,86 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
                 $this->setDelIndex($value);
                 break;
             case 2:
-                $this->setDelPrevious($value);
+                $this->setDelegationId($value);
                 break;
             case 3:
-                $this->setDelLastIndex($value);
+                $this->setAppNumber($value);
                 break;
             case 4:
-                $this->setProUid($value);
+                $this->setDelPrevious($value);
                 break;
             case 5:
-                $this->setTasUid($value);
+                $this->setDelLastIndex($value);
                 break;
             case 6:
-                $this->setUsrUid($value);
+                $this->setProUid($value);
                 break;
             case 7:
-                $this->setDelType($value);
+                $this->setTasUid($value);
                 break;
             case 8:
-                $this->setDelThread($value);
+                $this->setUsrUid($value);
                 break;
             case 9:
-                $this->setDelThreadStatus($value);
+                $this->setDelType($value);
                 break;
             case 10:
-                $this->setDelPriority($value);
+                $this->setDelThread($value);
                 break;
             case 11:
-                $this->setDelDelegateDate($value);
+                $this->setDelThreadStatus($value);
                 break;
             case 12:
-                $this->setDelInitDate($value);
+                $this->setDelPriority($value);
                 break;
             case 13:
-                $this->setDelFinishDate($value);
+                $this->setDelDelegateDate($value);
                 break;
             case 14:
-                $this->setDelTaskDueDate($value);
+                $this->setDelInitDate($value);
                 break;
             case 15:
-                $this->setDelRiskDate($value);
+                $this->setDelFinishDate($value);
                 break;
             case 16:
-                $this->setDelDuration($value);
+                $this->setDelTaskDueDate($value);
                 break;
             case 17:
-                $this->setDelQueueDuration($value);
+                $this->setDelRiskDate($value);
                 break;
             case 18:
-                $this->setDelDelayDuration($value);
+                $this->setDelDuration($value);
                 break;
             case 19:
-                $this->setDelStarted($value);
+                $this->setDelQueueDuration($value);
                 break;
             case 20:
-                $this->setDelFinished($value);
+                $this->setDelDelayDuration($value);
                 break;
             case 21:
-                $this->setDelDelayed($value);
+                $this->setDelStarted($value);
                 break;
             case 22:
-                $this->setDelData($value);
+                $this->setDelFinished($value);
                 break;
             case 23:
+                $this->setDelDelayed($value);
+                break;
+            case 24:
+                $this->setDelData($value);
+                break;
+            case 25:
                 $this->setAppOverduePercentage($value);
                 break;
+            case 26:
+                $this->setUsrId($value);
+                break;
+            case 27:
+                $this->setProId($value);
+                break;
+            case 28:
+                $this->setTasId($value);
+                break;
         } // switch()
     }
 
@@ -1618,91 +1858,111 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setDelPrevious($arr[$keys[2]]);
+            $this->setDelegationId($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setDelLastIndex($arr[$keys[3]]);
+            $this->setAppNumber($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setProUid($arr[$keys[4]]);
+            $this->setDelPrevious($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setTasUid($arr[$keys[5]]);
+            $this->setDelLastIndex($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setUsrUid($arr[$keys[6]]);
+            $this->setProUid($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setDelType($arr[$keys[7]]);
+            $this->setTasUid($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setDelThread($arr[$keys[8]]);
+            $this->setUsrUid($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setDelThreadStatus($arr[$keys[9]]);
+            $this->setDelType($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setDelPriority($arr[$keys[10]]);
+            $this->setDelThread($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setDelDelegateDate($arr[$keys[11]]);
+            $this->setDelThreadStatus($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setDelInitDate($arr[$keys[12]]);
+            $this->setDelPriority($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setDelFinishDate($arr[$keys[13]]);
+            $this->setDelDelegateDate($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setDelTaskDueDate($arr[$keys[14]]);
+            $this->setDelInitDate($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setDelRiskDate($arr[$keys[15]]);
+            $this->setDelFinishDate($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setDelDuration($arr[$keys[16]]);
+            $this->setDelTaskDueDate($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setDelQueueDuration($arr[$keys[17]]);
+            $this->setDelRiskDate($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setDelDelayDuration($arr[$keys[18]]);
+            $this->setDelDuration($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setDelStarted($arr[$keys[19]]);
+            $this->setDelQueueDuration($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setDelFinished($arr[$keys[20]]);
+            $this->setDelDelayDuration($arr[$keys[20]]);
         }
 
         if (array_key_exists($keys[21], $arr)) {
-            $this->setDelDelayed($arr[$keys[21]]);
+            $this->setDelStarted($arr[$keys[21]]);
         }
 
         if (array_key_exists($keys[22], $arr)) {
-            $this->setDelData($arr[$keys[22]]);
+            $this->setDelFinished($arr[$keys[22]]);
         }
 
         if (array_key_exists($keys[23], $arr)) {
-            $this->setAppOverduePercentage($arr[$keys[23]]);
+            $this->setDelDelayed($arr[$keys[23]]);
+        }
+
+        if (array_key_exists($keys[24], $arr)) {
+            $this->setDelData($arr[$keys[24]]);
+        }
+
+        if (array_key_exists($keys[25], $arr)) {
+            $this->setAppOverduePercentage($arr[$keys[25]]);
+        }
+
+        if (array_key_exists($keys[26], $arr)) {
+            $this->setUsrId($arr[$keys[26]]);
+        }
+
+        if (array_key_exists($keys[27], $arr)) {
+            $this->setProId($arr[$keys[27]]);
+        }
+
+        if (array_key_exists($keys[28], $arr)) {
+            $this->setTasId($arr[$keys[28]]);
         }
 
     }
@@ -1724,6 +1984,14 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
             $criteria->add(AppDelegationPeer::DEL_INDEX, $this->del_index);
         }
 
+        if ($this->isColumnModified(AppDelegationPeer::DELEGATION_ID)) {
+            $criteria->add(AppDelegationPeer::DELEGATION_ID, $this->delegation_id);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::APP_NUMBER)) {
+            $criteria->add(AppDelegationPeer::APP_NUMBER, $this->app_number);
+        }
+
         if ($this->isColumnModified(AppDelegationPeer::DEL_PREVIOUS)) {
             $criteria->add(AppDelegationPeer::DEL_PREVIOUS, $this->del_previous);
         }
@@ -1812,6 +2080,18 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
             $criteria->add(AppDelegationPeer::APP_OVERDUE_PERCENTAGE, $this->app_overdue_percentage);
         }
 
+        if ($this->isColumnModified(AppDelegationPeer::USR_ID)) {
+            $criteria->add(AppDelegationPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::PRO_ID)) {
+            $criteria->add(AppDelegationPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::TAS_ID)) {
+            $criteria->add(AppDelegationPeer::TAS_ID, $this->tas_id);
+        }
+
 
         return $criteria;
     }
@@ -1878,6 +2158,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setDelegationId($this->delegation_id);
+
+        $copyObj->setAppNumber($this->app_number);
+
         $copyObj->setDelPrevious($this->del_previous);
 
         $copyObj->setDelLastIndex($this->del_last_index);
@@ -1922,6 +2206,12 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
 
         $copyObj->setAppOverduePercentage($this->app_overdue_percentage);
 
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setTasId($this->tas_id);
+
 
         $copyObj->setNew(true);
 

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 = 24;
+    const NUM_COLUMNS = 29;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,12 @@ abstract class BaseAppDelegationPeer
     /** the column name for the DEL_INDEX field */
     const DEL_INDEX = 'APP_DELEGATION.DEL_INDEX';
 
+    /** the column name for the DELEGATION_ID field */
+    const DELEGATION_ID = 'APP_DELEGATION.DELEGATION_ID';
+
+    /** the column name for the APP_NUMBER field */
+    const APP_NUMBER = 'APP_DELEGATION.APP_NUMBER';
+
     /** the column name for the DEL_PREVIOUS field */
     const DEL_PREVIOUS = 'APP_DELEGATION.DEL_PREVIOUS';
 
@@ -103,6 +109,15 @@ abstract class BaseAppDelegationPeer
     /** the column name for the APP_OVERDUE_PERCENTAGE field */
     const APP_OVERDUE_PERCENTAGE = 'APP_DELEGATION.APP_OVERDUE_PERCENTAGE';
 
+    /** the column name for the USR_ID field */
+    const USR_ID = 'APP_DELEGATION.USR_ID';
+
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'APP_DELEGATION.PRO_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'APP_DELEGATION.TAS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -114,10 +129,10 @@ abstract class BaseAppDelegationPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelPrevious', 'DelLastIndex', 'ProUid', 'TasUid', 'UsrUid', 'DelType', 'DelThread', 'DelThreadStatus', 'DelPriority', 'DelDelegateDate', 'DelInitDate', 'DelFinishDate', 'DelTaskDueDate', 'DelRiskDate', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'DelData', 'AppOverduePercentage', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelegationId', 'AppNumber', 'DelPrevious', 'DelLastIndex', 'ProUid', 'TasUid', 'UsrUid', 'DelType', 'DelThread', 'DelThreadStatus', 'DelPriority', 'DelDelegateDate', 'DelInitDate', 'DelFinishDate', 'DelTaskDueDate', 'DelRiskDate', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'DelData', 'AppOverduePercentage', 'UsrId', 'ProId', 'TasId', ),
-        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_FINISH_DATE, AppDelegationPeer::DEL_TASK_DUE_DATE, AppDelegationPeer::DEL_RISK_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_COLNAME => array (AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX, AppDelegationPeer::DELEGATION_ID, AppDelegationPeer::APP_NUMBER, 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_FINISH_DATE, AppDelegationPeer::DEL_TASK_DUE_DATE, AppDelegationPeer::DEL_RISK_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, AppDelegationPeer::USR_ID, AppDelegationPeer::PRO_ID, AppDelegationPeer::TAS_ID, ),
-        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_FINISH_DATE', 'DEL_TASK_DUE_DATE', 'DEL_RISK_DATE', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'DEL_DATA', 'APP_OVERDUE_PERCENTAGE', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DELEGATION_ID', 'APP_NUMBER', '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_FINISH_DATE', 'DEL_TASK_DUE_DATE', 'DEL_RISK_DATE', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'DEL_DATA', 'APP_OVERDUE_PERCENTAGE', 'USR_ID', 'PRO_ID', 'TAS_ID', ),
-        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, )
+        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, )
     );
 
     /**
@@ -127,10 +142,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, 'DelLastIndex' => 3, 'ProUid' => 4, 'TasUid' => 5, 'UsrUid' => 6, 'DelType' => 7, 'DelThread' => 8, 'DelThreadStatus' => 9, 'DelPriority' => 10, 'DelDelegateDate' => 11, 'DelInitDate' => 12, 'DelFinishDate' => 13, 'DelTaskDueDate' => 14, 'DelRiskDate' => 15, 'DelDuration' => 16, 'DelQueueDuration' => 17, 'DelDelayDuration' => 18, 'DelStarted' => 19, 'DelFinished' => 20, 'DelDelayed' => 21, 'DelData' => 22, 'AppOverduePercentage' => 23, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelegationId' => 2, 'AppNumber' => 3, 'DelPrevious' => 4, 'DelLastIndex' => 5, 'ProUid' => 6, 'TasUid' => 7, 'UsrUid' => 8, 'DelType' => 9, 'DelThread' => 10, 'DelThreadStatus' => 11, 'DelPriority' => 12, 'DelDelegateDate' => 13, 'DelInitDate' => 14, 'DelFinishDate' => 15, 'DelTaskDueDate' => 16, 'DelRiskDate' => 17, 'DelDuration' => 18, 'DelQueueDuration' => 19, 'DelDelayDuration' => 20, 'DelStarted' => 21, 'DelFinished' => 22, 'DelDelayed' => 23, 'DelData' => 24, 'AppOverduePercentage' => 25, 'UsrId' => 26, 'ProId' => 27, 'TasId' => 28, ),
-        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_FINISH_DATE => 13, AppDelegationPeer::DEL_TASK_DUE_DATE => 14, AppDelegationPeer::DEL_RISK_DATE => 15, AppDelegationPeer::DEL_DURATION => 16, AppDelegationPeer::DEL_QUEUE_DURATION => 17, AppDelegationPeer::DEL_DELAY_DURATION => 18, AppDelegationPeer::DEL_STARTED => 19, AppDelegationPeer::DEL_FINISHED => 20, AppDelegationPeer::DEL_DELAYED => 21, AppDelegationPeer::DEL_DATA => 22, AppDelegationPeer::APP_OVERDUE_PERCENTAGE => 23, ),
+        BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID => 0, AppDelegationPeer::DEL_INDEX => 1, AppDelegationPeer::DELEGATION_ID => 2, AppDelegationPeer::APP_NUMBER => 3, AppDelegationPeer::DEL_PREVIOUS => 4, AppDelegationPeer::DEL_LAST_INDEX => 5, AppDelegationPeer::PRO_UID => 6, AppDelegationPeer::TAS_UID => 7, AppDelegationPeer::USR_UID => 8, AppDelegationPeer::DEL_TYPE => 9, AppDelegationPeer::DEL_THREAD => 10, AppDelegationPeer::DEL_THREAD_STATUS => 11, AppDelegationPeer::DEL_PRIORITY => 12, AppDelegationPeer::DEL_DELEGATE_DATE => 13, AppDelegationPeer::DEL_INIT_DATE => 14, AppDelegationPeer::DEL_FINISH_DATE => 15, AppDelegationPeer::DEL_TASK_DUE_DATE => 16, AppDelegationPeer::DEL_RISK_DATE => 17, AppDelegationPeer::DEL_DURATION => 18, AppDelegationPeer::DEL_QUEUE_DURATION => 19, AppDelegationPeer::DEL_DELAY_DURATION => 20, AppDelegationPeer::DEL_STARTED => 21, AppDelegationPeer::DEL_FINISHED => 22, AppDelegationPeer::DEL_DELAYED => 23, AppDelegationPeer::DEL_DATA => 24, AppDelegationPeer::APP_OVERDUE_PERCENTAGE => 25, AppDelegationPeer::USR_ID => 26, AppDelegationPeer::PRO_ID => 27, AppDelegationPeer::TAS_ID => 28, ),
-        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_FINISH_DATE' => 13, 'DEL_TASK_DUE_DATE' => 14, 'DEL_RISK_DATE' => 15, 'DEL_DURATION' => 16, 'DEL_QUEUE_DURATION' => 17, 'DEL_DELAY_DURATION' => 18, 'DEL_STARTED' => 19, 'DEL_FINISHED' => 20, 'DEL_DELAYED' => 21, 'DEL_DATA' => 22, 'APP_OVERDUE_PERCENTAGE' => 23, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DELEGATION_ID' => 2, 'APP_NUMBER' => 3, 'DEL_PREVIOUS' => 4, 'DEL_LAST_INDEX' => 5, 'PRO_UID' => 6, 'TAS_UID' => 7, 'USR_UID' => 8, 'DEL_TYPE' => 9, 'DEL_THREAD' => 10, 'DEL_THREAD_STATUS' => 11, 'DEL_PRIORITY' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_INIT_DATE' => 14, 'DEL_FINISH_DATE' => 15, 'DEL_TASK_DUE_DATE' => 16, 'DEL_RISK_DATE' => 17, 'DEL_DURATION' => 18, 'DEL_QUEUE_DURATION' => 19, 'DEL_DELAY_DURATION' => 20, 'DEL_STARTED' => 21, 'DEL_FINISHED' => 22, 'DEL_DELAYED' => 23, 'DEL_DATA' => 24, 'APP_OVERDUE_PERCENTAGE' => 25, 'USR_ID' => 26, 'PRO_ID' => 27, 'TAS_ID' => 28, ),
-        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, )
+        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, )
     );
 
     /**
@@ -235,6 +250,10 @@ abstract class BaseAppDelegationPeer
 
         $criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
 
+        $criteria->addSelectColumn(AppDelegationPeer::DELEGATION_ID);
+
+        $criteria->addSelectColumn(AppDelegationPeer::APP_NUMBER);
+
         $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
 
         $criteria->addSelectColumn(AppDelegationPeer::DEL_LAST_INDEX);
@@ -279,6 +298,12 @@ abstract class BaseAppDelegationPeer
 
         $criteria->addSelectColumn(AppDelegationPeer::APP_OVERDUE_PERCENTAGE);
 
+        $criteria->addSelectColumn(AppDelegationPeer::USR_ID);
+
+        $criteria->addSelectColumn(AppDelegationPeer::PRO_ID);
+
+        $criteria->addSelectColumn(AppDelegationPeer::TAS_ID);
+
     }
 
     const COUNT = 'COUNT(APP_DELEGATION.APP_UID)';

workflow/engine/classes/model/om/BaseApplication.php

@@ -63,6 +63,12 @@ abstract class BaseApplication extends BaseObject implements Persistent
      */
     protected $app_status = '';
 
+    /**
+     * The value for the app_status_id field.
+     * @var        int
+     */
+    protected $app_status_id = 0;
+
     /**
      * The value for the pro_uid field.
      * @var        string
@@ -239,6 +245,17 @@ abstract class BaseApplication extends BaseObject implements Persistent
         return $this->app_status;
     }
 
+    /**
+     * Get the [app_status_id] column value.
+     * 
+     * @return     int
+     */
+    public function getAppStatusId()
+    {
+
+        return $this->app_status_id;
+    }
+
     /**
      * Get the [pro_uid] column value.
      * 
@@ -631,6 +648,28 @@ abstract class BaseApplication extends BaseObject implements Persistent
 
     } // setAppStatus()
 
+    /**
+     * Set the value of [app_status_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setAppStatusId($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->app_status_id !== $v || $v === 0) {
+            $this->app_status_id = $v;
+            $this->modifiedColumns[] = ApplicationPeer::APP_STATUS_ID;
+        }
+
+    } // setAppStatusId()
+
     /**
      * Set the value of [pro_uid] column.
      * 
@@ -1028,44 +1067,46 @@ abstract class BaseApplication extends BaseObject implements Persistent
 
             $this->app_status = $rs->getString($startcol + 5);
 
-            $this->pro_uid = $rs->getString($startcol + 6);
+            $this->app_status_id = $rs->getInt($startcol + 6);
 
-            $this->app_proc_status = $rs->getString($startcol + 7);
+            $this->pro_uid = $rs->getString($startcol + 7);
 
-            $this->app_proc_code = $rs->getString($startcol + 8);
+            $this->app_proc_status = $rs->getString($startcol + 8);
 
-            $this->app_parallel = $rs->getString($startcol + 9);
+            $this->app_proc_code = $rs->getString($startcol + 9);
 
-            $this->app_init_user = $rs->getString($startcol + 10);
+            $this->app_parallel = $rs->getString($startcol + 10);
 
-            $this->app_cur_user = $rs->getString($startcol + 11);
+            $this->app_init_user = $rs->getString($startcol + 11);
 
-            $this->app_create_date = $rs->getTimestamp($startcol + 12, null);
+            $this->app_cur_user = $rs->getString($startcol + 12);
 
-            $this->app_init_date = $rs->getTimestamp($startcol + 13, null);
+            $this->app_create_date = $rs->getTimestamp($startcol + 13, null);
 
-            $this->app_finish_date = $rs->getTimestamp($startcol + 14, null);
+            $this->app_init_date = $rs->getTimestamp($startcol + 14, null);
 
-            $this->app_update_date = $rs->getTimestamp($startcol + 15, null);
+            $this->app_finish_date = $rs->getTimestamp($startcol + 15, null);
 
-            $this->app_data = $rs->getString($startcol + 16);
+            $this->app_update_date = $rs->getTimestamp($startcol + 16, null);
 
-            $this->app_pin = $rs->getString($startcol + 17);
+            $this->app_data = $rs->getString($startcol + 17);
 
-            $this->app_duration = $rs->getFloat($startcol + 18);
+            $this->app_pin = $rs->getString($startcol + 18);
 
-            $this->app_delay_duration = $rs->getFloat($startcol + 19);
+            $this->app_duration = $rs->getFloat($startcol + 19);
 
-            $this->app_drive_folder_uid = $rs->getString($startcol + 20);
+            $this->app_delay_duration = $rs->getFloat($startcol + 20);
 
-            $this->app_routing_data = $rs->getString($startcol + 21);
+            $this->app_drive_folder_uid = $rs->getString($startcol + 21);
+
+            $this->app_routing_data = $rs->getString($startcol + 22);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 22; // 22 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 23; // 23 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Application object", $e);
@@ -1288,51 +1329,54 @@ abstract class BaseApplication extends BaseObject implements Persistent
                 return $this->getAppStatus();
                 break;
             case 6:
-                return $this->getProUid();
+                return $this->getAppStatusId();
                 break;
             case 7:
-                return $this->getAppProcStatus();
+                return $this->getProUid();
                 break;
             case 8:
-                return $this->getAppProcCode();
+                return $this->getAppProcStatus();
                 break;
             case 9:
-                return $this->getAppParallel();
+                return $this->getAppProcCode();
                 break;
             case 10:
-                return $this->getAppInitUser();
+                return $this->getAppParallel();
                 break;
             case 11:
-                return $this->getAppCurUser();
+                return $this->getAppInitUser();
                 break;
             case 12:
-                return $this->getAppCreateDate();
+                return $this->getAppCurUser();
                 break;
             case 13:
-                return $this->getAppInitDate();
+                return $this->getAppCreateDate();
                 break;
             case 14:
-                return $this->getAppFinishDate();
+                return $this->getAppInitDate();
                 break;
             case 15:
-                return $this->getAppUpdateDate();
+                return $this->getAppFinishDate();
                 break;
             case 16:
-                return $this->getAppData();
+                return $this->getAppUpdateDate();
                 break;
             case 17:
-                return $this->getAppPin();
+                return $this->getAppData();
                 break;
             case 18:
-                return $this->getAppDuration();
+                return $this->getAppPin();
                 break;
             case 19:
-                return $this->getAppDelayDuration();
+                return $this->getAppDuration();
                 break;
             case 20:
-                return $this->getAppDriveFolderUid();
+                return $this->getAppDelayDuration();
                 break;
             case 21:
+                return $this->getAppDriveFolderUid();
+                break;
+            case 22:
                 return $this->getAppRoutingData();
                 break;
             default:
@@ -1361,22 +1405,23 @@ abstract class BaseApplication extends BaseObject implements Persistent
             $keys[3] => $this->getAppNumber(),
             $keys[4] => $this->getAppParent(),
             $keys[5] => $this->getAppStatus(),
-            $keys[6] => $this->getProUid(),
+            $keys[6] => $this->getAppStatusId(),
-            $keys[7] => $this->getAppProcStatus(),
+            $keys[7] => $this->getProUid(),
-            $keys[8] => $this->getAppProcCode(),
+            $keys[8] => $this->getAppProcStatus(),
-            $keys[9] => $this->getAppParallel(),
+            $keys[9] => $this->getAppProcCode(),
-            $keys[10] => $this->getAppInitUser(),
+            $keys[10] => $this->getAppParallel(),
-            $keys[11] => $this->getAppCurUser(),
+            $keys[11] => $this->getAppInitUser(),
-            $keys[12] => $this->getAppCreateDate(),
+            $keys[12] => $this->getAppCurUser(),
-            $keys[13] => $this->getAppInitDate(),
+            $keys[13] => $this->getAppCreateDate(),
-            $keys[14] => $this->getAppFinishDate(),
+            $keys[14] => $this->getAppInitDate(),
-            $keys[15] => $this->getAppUpdateDate(),
+            $keys[15] => $this->getAppFinishDate(),
-            $keys[16] => $this->getAppData(),
+            $keys[16] => $this->getAppUpdateDate(),
-            $keys[17] => $this->getAppPin(),
+            $keys[17] => $this->getAppData(),
-            $keys[18] => $this->getAppDuration(),
+            $keys[18] => $this->getAppPin(),
-            $keys[19] => $this->getAppDelayDuration(),
+            $keys[19] => $this->getAppDuration(),
-            $keys[20] => $this->getAppDriveFolderUid(),
+            $keys[20] => $this->getAppDelayDuration(),
-            $keys[21] => $this->getAppRoutingData(),
+            $keys[21] => $this->getAppDriveFolderUid(),
+            $keys[22] => $this->getAppRoutingData(),
         );
         return $result;
     }
@@ -1427,51 +1472,54 @@ abstract class BaseApplication extends BaseObject implements Persistent
                 $this->setAppStatus($value);
                 break;
             case 6:
-                $this->setProUid($value);
+                $this->setAppStatusId($value);
                 break;
             case 7:
-                $this->setAppProcStatus($value);
+                $this->setProUid($value);
                 break;
             case 8:
-                $this->setAppProcCode($value);
+                $this->setAppProcStatus($value);
                 break;
             case 9:
-                $this->setAppParallel($value);
+                $this->setAppProcCode($value);
                 break;
             case 10:
-                $this->setAppInitUser($value);
+                $this->setAppParallel($value);
                 break;
             case 11:
-                $this->setAppCurUser($value);
+                $this->setAppInitUser($value);
                 break;
             case 12:
-                $this->setAppCreateDate($value);
+                $this->setAppCurUser($value);
                 break;
             case 13:
-                $this->setAppInitDate($value);
+                $this->setAppCreateDate($value);
                 break;
             case 14:
-                $this->setAppFinishDate($value);
+                $this->setAppInitDate($value);
                 break;
             case 15:
-                $this->setAppUpdateDate($value);
+                $this->setAppFinishDate($value);
                 break;
             case 16:
-                $this->setAppData($value);
+                $this->setAppUpdateDate($value);
                 break;
             case 17:
-                $this->setAppPin($value);
+                $this->setAppData($value);
                 break;
             case 18:
-                $this->setAppDuration($value);
+                $this->setAppPin($value);
                 break;
             case 19:
-                $this->setAppDelayDuration($value);
+                $this->setAppDuration($value);
                 break;
             case 20:
-                $this->setAppDriveFolderUid($value);
+                $this->setAppDelayDuration($value);
                 break;
             case 21:
+                $this->setAppDriveFolderUid($value);
+                break;
+            case 22:
                 $this->setAppRoutingData($value);
                 break;
         } // switch()
@@ -1522,67 +1570,71 @@ abstract class BaseApplication extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setProUid($arr[$keys[6]]);
+            $this->setAppStatusId($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setAppProcStatus($arr[$keys[7]]);
+            $this->setProUid($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setAppProcCode($arr[$keys[8]]);
+            $this->setAppProcStatus($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setAppParallel($arr[$keys[9]]);
+            $this->setAppProcCode($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setAppInitUser($arr[$keys[10]]);
+            $this->setAppParallel($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setAppCurUser($arr[$keys[11]]);
+            $this->setAppInitUser($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setAppCreateDate($arr[$keys[12]]);
+            $this->setAppCurUser($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setAppInitDate($arr[$keys[13]]);
+            $this->setAppCreateDate($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setAppFinishDate($arr[$keys[14]]);
+            $this->setAppInitDate($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setAppUpdateDate($arr[$keys[15]]);
+            $this->setAppFinishDate($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setAppData($arr[$keys[16]]);
+            $this->setAppUpdateDate($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setAppPin($arr[$keys[17]]);
+            $this->setAppData($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setAppDuration($arr[$keys[18]]);
+            $this->setAppPin($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setAppDelayDuration($arr[$keys[19]]);
+            $this->setAppDuration($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setAppDriveFolderUid($arr[$keys[20]]);
+            $this->setAppDelayDuration($arr[$keys[20]]);
         }
 
         if (array_key_exists($keys[21], $arr)) {
-            $this->setAppRoutingData($arr[$keys[21]]);
+            $this->setAppDriveFolderUid($arr[$keys[21]]);
+        }
+
+        if (array_key_exists($keys[22], $arr)) {
+            $this->setAppRoutingData($arr[$keys[22]]);
         }
 
     }
@@ -1620,6 +1672,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
             $criteria->add(ApplicationPeer::APP_STATUS, $this->app_status);
         }
 
+        if ($this->isColumnModified(ApplicationPeer::APP_STATUS_ID)) {
+            $criteria->add(ApplicationPeer::APP_STATUS_ID, $this->app_status_id);
+        }
+
         if ($this->isColumnModified(ApplicationPeer::PRO_UID)) {
             $criteria->add(ApplicationPeer::PRO_UID, $this->pro_uid);
         }
@@ -1748,6 +1804,8 @@ abstract class BaseApplication extends BaseObject implements Persistent
 
         $copyObj->setAppStatus($this->app_status);
 
+        $copyObj->setAppStatusId($this->app_status_id);
+
         $copyObj->setProUid($this->pro_uid);
 
         $copyObj->setAppProcStatus($this->app_proc_status);

workflow/engine/classes/model/om/BaseApplicationPeer.php

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

workflow/engine/classes/model/om/BaseListCanceled.php

@@ -135,6 +135,24 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
      */
     protected $del_priority = '3';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -431,6 +449,39 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
         return $this->del_priority;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -855,6 +906,72 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
 
     } // setDelPriority()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListCanceledPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListCanceledPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListCanceledPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -908,12 +1025,18 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
 
             $this->del_priority = $rs->getString($startcol + 17);
 
+            $this->pro_id = $rs->getInt($startcol + 18);
+
+            $this->usr_id = $rs->getInt($startcol + 19);
+
+            $this->tas_id = $rs->getInt($startcol + 20);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 18; // 18 = ListCanceledPeer::NUM_COLUMNS - ListCanceledPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 21; // 21 = ListCanceledPeer::NUM_COLUMNS - ListCanceledPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListCanceled object", $e);
@@ -1171,6 +1294,15 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
             case 17:
                 return $this->getDelPriority();
                 break;
+            case 18:
+                return $this->getProId();
+                break;
+            case 19:
+                return $this->getUsrId();
+                break;
+            case 20:
+                return $this->getTasId();
+                break;
             default:
                 return null;
                 break;
@@ -1209,6 +1341,9 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
             $keys[15] => $this->getDelInitDate(),
             $keys[16] => $this->getDelDueDate(),
             $keys[17] => $this->getDelPriority(),
+            $keys[18] => $this->getProId(),
+            $keys[19] => $this->getUsrId(),
+            $keys[20] => $this->getTasId(),
         );
         return $result;
     }
@@ -1294,6 +1429,15 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
             case 17:
                 $this->setDelPriority($value);
                 break;
+            case 18:
+                $this->setProId($value);
+                break;
+            case 19:
+                $this->setUsrId($value);
+                break;
+            case 20:
+                $this->setTasId($value);
+                break;
         } // switch()
     }
 
@@ -1389,6 +1533,18 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
             $this->setDelPriority($arr[$keys[17]]);
         }
 
+        if (array_key_exists($keys[18], $arr)) {
+            $this->setProId($arr[$keys[18]]);
+        }
+
+        if (array_key_exists($keys[19], $arr)) {
+            $this->setUsrId($arr[$keys[19]]);
+        }
+
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setTasId($arr[$keys[20]]);
+        }
+
     }
 
     /**
@@ -1472,6 +1628,18 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
             $criteria->add(ListCanceledPeer::DEL_PRIORITY, $this->del_priority);
         }
 
+        if ($this->isColumnModified(ListCanceledPeer::PRO_ID)) {
+            $criteria->add(ListCanceledPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListCanceledPeer::USR_ID)) {
+            $criteria->add(ListCanceledPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListCanceledPeer::TAS_ID)) {
+            $criteria->add(ListCanceledPeer::TAS_ID, $this->tas_id);
+        }
+
 
         return $criteria;
     }
@@ -1560,6 +1728,12 @@ abstract class BaseListCanceled extends BaseObject implements Persistent
 
         $copyObj->setDelPriority($this->del_priority);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListCanceledPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListCanceledPeer
     const CLASS_DEFAULT = 'classes.model.ListCanceled';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 18;
+    const NUM_COLUMNS = 21;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -85,6 +85,15 @@ abstract class BaseListCanceledPeer
     /** the column name for the DEL_PRIORITY field */
     const DEL_PRIORITY = 'LIST_CANCELED.DEL_PRIORITY';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_CANCELED.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_CANCELED.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_CANCELED.TAS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -96,10 +105,10 @@ abstract class BaseListCanceledPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCanceledDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCanceledDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', ),
-        BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID, ListCanceledPeer::USR_UID, ListCanceledPeer::TAS_UID, ListCanceledPeer::PRO_UID, ListCanceledPeer::APP_NUMBER, ListCanceledPeer::APP_TITLE, ListCanceledPeer::APP_PRO_TITLE, ListCanceledPeer::APP_TAS_TITLE, ListCanceledPeer::APP_CANCELED_DATE, ListCanceledPeer::DEL_INDEX, ListCanceledPeer::DEL_PREVIOUS_USR_UID, ListCanceledPeer::DEL_CURRENT_USR_USERNAME, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME, ListCanceledPeer::DEL_DELEGATE_DATE, ListCanceledPeer::DEL_INIT_DATE, ListCanceledPeer::DEL_DUE_DATE, ListCanceledPeer::DEL_PRIORITY, ),
+        BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID, ListCanceledPeer::USR_UID, ListCanceledPeer::TAS_UID, ListCanceledPeer::PRO_UID, ListCanceledPeer::APP_NUMBER, ListCanceledPeer::APP_TITLE, ListCanceledPeer::APP_PRO_TITLE, ListCanceledPeer::APP_TAS_TITLE, ListCanceledPeer::APP_CANCELED_DATE, ListCanceledPeer::DEL_INDEX, ListCanceledPeer::DEL_PREVIOUS_USR_UID, ListCanceledPeer::DEL_CURRENT_USR_USERNAME, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME, ListCanceledPeer::DEL_DELEGATE_DATE, ListCanceledPeer::DEL_INIT_DATE, ListCanceledPeer::DEL_DUE_DATE, ListCanceledPeer::DEL_PRIORITY, ListCanceledPeer::PRO_ID, ListCanceledPeer::USR_ID, ListCanceledPeer::TAS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CANCELED_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CANCELED_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+        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, )
     );
 
     /**
@@ -109,10 +118,10 @@ abstract class BaseListCanceledPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCanceledDate' => 8, 'DelIndex' => 9, 'DelPreviousUsrUid' => 10, 'DelCurrentUsrUsername' => 11, 'DelCurrentUsrFirstname' => 12, 'DelCurrentUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCanceledDate' => 8, 'DelIndex' => 9, 'DelPreviousUsrUid' => 10, 'DelCurrentUsrUsername' => 11, 'DelCurrentUsrFirstname' => 12, 'DelCurrentUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, 'ProId' => 18, 'UsrId' => 19, 'TasId' => 20, ),
-        BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID => 0, ListCanceledPeer::USR_UID => 1, ListCanceledPeer::TAS_UID => 2, ListCanceledPeer::PRO_UID => 3, ListCanceledPeer::APP_NUMBER => 4, ListCanceledPeer::APP_TITLE => 5, ListCanceledPeer::APP_PRO_TITLE => 6, ListCanceledPeer::APP_TAS_TITLE => 7, ListCanceledPeer::APP_CANCELED_DATE => 8, ListCanceledPeer::DEL_INDEX => 9, ListCanceledPeer::DEL_PREVIOUS_USR_UID => 10, ListCanceledPeer::DEL_CURRENT_USR_USERNAME => 11, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME => 12, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME => 13, ListCanceledPeer::DEL_DELEGATE_DATE => 14, ListCanceledPeer::DEL_INIT_DATE => 15, ListCanceledPeer::DEL_DUE_DATE => 16, ListCanceledPeer::DEL_PRIORITY => 17, ),
+        BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID => 0, ListCanceledPeer::USR_UID => 1, ListCanceledPeer::TAS_UID => 2, ListCanceledPeer::PRO_UID => 3, ListCanceledPeer::APP_NUMBER => 4, ListCanceledPeer::APP_TITLE => 5, ListCanceledPeer::APP_PRO_TITLE => 6, ListCanceledPeer::APP_TAS_TITLE => 7, ListCanceledPeer::APP_CANCELED_DATE => 8, ListCanceledPeer::DEL_INDEX => 9, ListCanceledPeer::DEL_PREVIOUS_USR_UID => 10, ListCanceledPeer::DEL_CURRENT_USR_USERNAME => 11, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME => 12, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME => 13, ListCanceledPeer::DEL_DELEGATE_DATE => 14, ListCanceledPeer::DEL_INIT_DATE => 15, ListCanceledPeer::DEL_DUE_DATE => 16, ListCanceledPeer::DEL_PRIORITY => 17, ListCanceledPeer::PRO_ID => 18, ListCanceledPeer::USR_ID => 19, ListCanceledPeer::TAS_ID => 20, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CANCELED_DATE' => 8, 'DEL_INDEX' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_CURRENT_USR_USERNAME' => 11, 'DEL_CURRENT_USR_FIRSTNAME' => 12, 'DEL_CURRENT_USR_LASTNAME' => 13, 'DEL_DELEGATE_DATE' => 14, 'DEL_INIT_DATE' => 15, 'DEL_DUE_DATE' => 16, 'DEL_PRIORITY' => 17, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CANCELED_DATE' => 8, 'DEL_INDEX' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_CURRENT_USR_USERNAME' => 11, 'DEL_CURRENT_USR_FIRSTNAME' => 12, 'DEL_CURRENT_USR_LASTNAME' => 13, 'DEL_DELEGATE_DATE' => 14, 'DEL_INIT_DATE' => 15, 'DEL_DUE_DATE' => 16, 'DEL_PRIORITY' => 17, 'PRO_ID' => 18, 'USR_ID' => 19, 'TAS_ID' => 20, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+        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, )
     );
 
     /**
@@ -249,6 +258,12 @@ abstract class BaseListCanceledPeer
 
         $criteria->addSelectColumn(ListCanceledPeer::DEL_PRIORITY);
 
+        $criteria->addSelectColumn(ListCanceledPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListCanceledPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListCanceledPeer::TAS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_CANCELED.APP_UID)';

workflow/engine/classes/model/om/BaseListCompleted.php

@@ -117,6 +117,24 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
      */
     protected $del_current_usr_lastname = '';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -338,6 +356,39 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
         return $this->del_current_usr_lastname;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -682,6 +733,72 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
 
     } // setDelCurrentUsrLastname()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListCompletedPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListCompletedPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListCompletedPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -729,12 +846,18 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
 
             $this->del_current_usr_lastname = $rs->getString($startcol + 14);
 
+            $this->pro_id = $rs->getInt($startcol + 15);
+
+            $this->usr_id = $rs->getInt($startcol + 16);
+
+            $this->tas_id = $rs->getInt($startcol + 17);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 15; // 15 = ListCompletedPeer::NUM_COLUMNS - ListCompletedPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 18; // 18 = ListCompletedPeer::NUM_COLUMNS - ListCompletedPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListCompleted object", $e);
@@ -983,6 +1106,15 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
             case 14:
                 return $this->getDelCurrentUsrLastname();
                 break;
+            case 15:
+                return $this->getProId();
+                break;
+            case 16:
+                return $this->getUsrId();
+                break;
+            case 17:
+                return $this->getTasId();
+                break;
             default:
                 return null;
                 break;
@@ -1018,6 +1150,9 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
             $keys[12] => $this->getDelCurrentUsrUsername(),
             $keys[13] => $this->getDelCurrentUsrFirstname(),
             $keys[14] => $this->getDelCurrentUsrLastname(),
+            $keys[15] => $this->getProId(),
+            $keys[16] => $this->getUsrId(),
+            $keys[17] => $this->getTasId(),
         );
         return $result;
     }
@@ -1094,6 +1229,15 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
             case 14:
                 $this->setDelCurrentUsrLastname($value);
                 break;
+            case 15:
+                $this->setProId($value);
+                break;
+            case 16:
+                $this->setUsrId($value);
+                break;
+            case 17:
+                $this->setTasId($value);
+                break;
         } // switch()
     }
 
@@ -1177,6 +1321,18 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
             $this->setDelCurrentUsrLastname($arr[$keys[14]]);
         }
 
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setProId($arr[$keys[15]]);
+        }
+
+        if (array_key_exists($keys[16], $arr)) {
+            $this->setUsrId($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setTasId($arr[$keys[17]]);
+        }
+
     }
 
     /**
@@ -1248,6 +1404,18 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
             $criteria->add(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME, $this->del_current_usr_lastname);
         }
 
+        if ($this->isColumnModified(ListCompletedPeer::PRO_ID)) {
+            $criteria->add(ListCompletedPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListCompletedPeer::USR_ID)) {
+            $criteria->add(ListCompletedPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListCompletedPeer::TAS_ID)) {
+            $criteria->add(ListCompletedPeer::TAS_ID, $this->tas_id);
+        }
+
 
         return $criteria;
     }
@@ -1330,6 +1498,12 @@ abstract class BaseListCompleted extends BaseObject implements Persistent
 
         $copyObj->setDelCurrentUsrLastname($this->del_current_usr_lastname);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListCompletedPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListCompletedPeer
     const CLASS_DEFAULT = 'classes.model.ListCompleted';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 15;
+    const NUM_COLUMNS = 18;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -76,6 +76,15 @@ abstract class BaseListCompletedPeer
     /** the column name for the DEL_CURRENT_USR_LASTNAME field */
     const DEL_CURRENT_USR_LASTNAME = 'LIST_COMPLETED.DEL_CURRENT_USR_LASTNAME';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_COMPLETED.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_COMPLETED.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_COMPLETED.TAS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -87,10 +96,10 @@ abstract class BaseListCompletedPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppFinishDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppFinishDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'ProId', 'UsrId', 'TasId', ),
-        BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID, ListCompletedPeer::USR_UID, ListCompletedPeer::TAS_UID, ListCompletedPeer::PRO_UID, ListCompletedPeer::APP_NUMBER, ListCompletedPeer::APP_TITLE, ListCompletedPeer::APP_PRO_TITLE, ListCompletedPeer::APP_TAS_TITLE, ListCompletedPeer::APP_CREATE_DATE, ListCompletedPeer::APP_FINISH_DATE, ListCompletedPeer::DEL_INDEX, ListCompletedPeer::DEL_PREVIOUS_USR_UID, ListCompletedPeer::DEL_CURRENT_USR_USERNAME, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME, ),
+        BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID, ListCompletedPeer::USR_UID, ListCompletedPeer::TAS_UID, ListCompletedPeer::PRO_UID, ListCompletedPeer::APP_NUMBER, ListCompletedPeer::APP_TITLE, ListCompletedPeer::APP_PRO_TITLE, ListCompletedPeer::APP_TAS_TITLE, ListCompletedPeer::APP_CREATE_DATE, ListCompletedPeer::APP_FINISH_DATE, ListCompletedPeer::DEL_INDEX, ListCompletedPeer::DEL_PREVIOUS_USR_UID, ListCompletedPeer::DEL_CURRENT_USR_USERNAME, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME, ListCompletedPeer::PRO_ID, ListCompletedPeer::USR_ID, ListCompletedPeer::TAS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'PRO_ID', 'USR_ID', 'TAS_ID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
     );
 
     /**
@@ -100,10 +109,10 @@ abstract class BaseListCompletedPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppFinishDate' => 9, 'DelIndex' => 10, 'DelPreviousUsrUid' => 11, 'DelCurrentUsrUsername' => 12, 'DelCurrentUsrFirstname' => 13, 'DelCurrentUsrLastname' => 14, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppFinishDate' => 9, 'DelIndex' => 10, 'DelPreviousUsrUid' => 11, 'DelCurrentUsrUsername' => 12, 'DelCurrentUsrFirstname' => 13, 'DelCurrentUsrLastname' => 14, 'ProId' => 15, 'UsrId' => 16, 'TasId' => 17, ),
-        BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID => 0, ListCompletedPeer::USR_UID => 1, ListCompletedPeer::TAS_UID => 2, ListCompletedPeer::PRO_UID => 3, ListCompletedPeer::APP_NUMBER => 4, ListCompletedPeer::APP_TITLE => 5, ListCompletedPeer::APP_PRO_TITLE => 6, ListCompletedPeer::APP_TAS_TITLE => 7, ListCompletedPeer::APP_CREATE_DATE => 8, ListCompletedPeer::APP_FINISH_DATE => 9, ListCompletedPeer::DEL_INDEX => 10, ListCompletedPeer::DEL_PREVIOUS_USR_UID => 11, ListCompletedPeer::DEL_CURRENT_USR_USERNAME => 12, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME => 13, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME => 14, ),
+        BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID => 0, ListCompletedPeer::USR_UID => 1, ListCompletedPeer::TAS_UID => 2, ListCompletedPeer::PRO_UID => 3, ListCompletedPeer::APP_NUMBER => 4, ListCompletedPeer::APP_TITLE => 5, ListCompletedPeer::APP_PRO_TITLE => 6, ListCompletedPeer::APP_TAS_TITLE => 7, ListCompletedPeer::APP_CREATE_DATE => 8, ListCompletedPeer::APP_FINISH_DATE => 9, ListCompletedPeer::DEL_INDEX => 10, ListCompletedPeer::DEL_PREVIOUS_USR_UID => 11, ListCompletedPeer::DEL_CURRENT_USR_USERNAME => 12, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME => 13, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME => 14, ListCompletedPeer::PRO_ID => 15, ListCompletedPeer::USR_ID => 16, ListCompletedPeer::TAS_ID => 17, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_FINISH_DATE' => 9, 'DEL_INDEX' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_CURRENT_USR_USERNAME' => 12, 'DEL_CURRENT_USR_FIRSTNAME' => 13, 'DEL_CURRENT_USR_LASTNAME' => 14, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_FINISH_DATE' => 9, 'DEL_INDEX' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_CURRENT_USR_USERNAME' => 12, 'DEL_CURRENT_USR_FIRSTNAME' => 13, 'DEL_CURRENT_USR_LASTNAME' => 14, 'PRO_ID' => 15, 'USR_ID' => 16, 'TAS_ID' => 17, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
     );
 
     /**
@@ -234,6 +243,12 @@ abstract class BaseListCompletedPeer
 
         $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME);
 
+        $criteria->addSelectColumn(ListCompletedPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListCompletedPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListCompletedPeer::TAS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_COMPLETED.APP_UID)';

workflow/engine/classes/model/om/BaseListInbox.php

@@ -147,6 +147,30 @@ abstract class BaseListInbox extends BaseObject implements Persistent
      */
     protected $del_priority = '3';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
+    /**
+     * The value for the app_status_id field.
+     * @var        int
+     */
+    protected $app_status_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -486,6 +510,50 @@ abstract class BaseListInbox extends BaseObject implements Persistent
         return $this->del_priority;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
+    /**
+     * Get the [app_status_id] column value.
+     * 
+     * @return     int
+     */
+    public function getAppStatusId()
+    {
+
+        return $this->app_status_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -961,6 +1029,94 @@ abstract class BaseListInbox extends BaseObject implements Persistent
 
     } // setDelPriority()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListInboxPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListInboxPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListInboxPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
+    /**
+     * Set the value of [app_status_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setAppStatusId($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->app_status_id !== $v || $v === 0) {
+            $this->app_status_id = $v;
+            $this->modifiedColumns[] = ListInboxPeer::APP_STATUS_ID;
+        }
+
+    } // setAppStatusId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -1018,12 +1174,20 @@ abstract class BaseListInbox extends BaseObject implements Persistent
 
             $this->del_priority = $rs->getString($startcol + 19);
 
+            $this->pro_id = $rs->getInt($startcol + 20);
+
+            $this->usr_id = $rs->getInt($startcol + 21);
+
+            $this->tas_id = $rs->getInt($startcol + 22);
+
+            $this->app_status_id = $rs->getInt($startcol + 23);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 20; // 20 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 24; // 24 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListInbox object", $e);
@@ -1287,6 +1451,18 @@ abstract class BaseListInbox extends BaseObject implements Persistent
             case 19:
                 return $this->getDelPriority();
                 break;
+            case 20:
+                return $this->getProId();
+                break;
+            case 21:
+                return $this->getUsrId();
+                break;
+            case 22:
+                return $this->getTasId();
+                break;
+            case 23:
+                return $this->getAppStatusId();
+                break;
             default:
                 return null;
                 break;
@@ -1327,6 +1503,10 @@ abstract class BaseListInbox extends BaseObject implements Persistent
             $keys[17] => $this->getDelDueDate(),
             $keys[18] => $this->getDelRiskDate(),
             $keys[19] => $this->getDelPriority(),
+            $keys[20] => $this->getProId(),
+            $keys[21] => $this->getUsrId(),
+            $keys[22] => $this->getTasId(),
+            $keys[23] => $this->getAppStatusId(),
         );
         return $result;
     }
@@ -1418,6 +1598,18 @@ abstract class BaseListInbox extends BaseObject implements Persistent
             case 19:
                 $this->setDelPriority($value);
                 break;
+            case 20:
+                $this->setProId($value);
+                break;
+            case 21:
+                $this->setUsrId($value);
+                break;
+            case 22:
+                $this->setTasId($value);
+                break;
+            case 23:
+                $this->setAppStatusId($value);
+                break;
         } // switch()
     }
 
@@ -1521,6 +1713,22 @@ abstract class BaseListInbox extends BaseObject implements Persistent
             $this->setDelPriority($arr[$keys[19]]);
         }
 
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setProId($arr[$keys[20]]);
+        }
+
+        if (array_key_exists($keys[21], $arr)) {
+            $this->setUsrId($arr[$keys[21]]);
+        }
+
+        if (array_key_exists($keys[22], $arr)) {
+            $this->setTasId($arr[$keys[22]]);
+        }
+
+        if (array_key_exists($keys[23], $arr)) {
+            $this->setAppStatusId($arr[$keys[23]]);
+        }
+
     }
 
     /**
@@ -1612,6 +1820,22 @@ abstract class BaseListInbox extends BaseObject implements Persistent
             $criteria->add(ListInboxPeer::DEL_PRIORITY, $this->del_priority);
         }
 
+        if ($this->isColumnModified(ListInboxPeer::PRO_ID)) {
+            $criteria->add(ListInboxPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListInboxPeer::USR_ID)) {
+            $criteria->add(ListInboxPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListInboxPeer::TAS_ID)) {
+            $criteria->add(ListInboxPeer::TAS_ID, $this->tas_id);
+        }
+
+        if ($this->isColumnModified(ListInboxPeer::APP_STATUS_ID)) {
+            $criteria->add(ListInboxPeer::APP_STATUS_ID, $this->app_status_id);
+        }
+
 
         return $criteria;
     }
@@ -1714,6 +1938,14 @@ abstract class BaseListInbox extends BaseObject implements Persistent
 
         $copyObj->setDelPriority($this->del_priority);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
+        $copyObj->setAppStatusId($this->app_status_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListInboxPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListInboxPeer
     const CLASS_DEFAULT = 'classes.model.ListInbox';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 20;
+    const NUM_COLUMNS = 24;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -91,6 +91,18 @@ abstract class BaseListInboxPeer
     /** the column name for the DEL_PRIORITY field */
     const DEL_PRIORITY = 'LIST_INBOX.DEL_PRIORITY';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_INBOX.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_INBOX.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_INBOX.TAS_ID';
+
+    /** the column name for the APP_STATUS_ID field */
+    const APP_STATUS_ID = 'LIST_INBOX.APP_STATUS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -102,10 +114,10 @@ abstract class BaseListInboxPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelRiskDate', 'DelPriority', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelRiskDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', 'AppStatusId', ),
-        BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_RISK_DATE, ListInboxPeer::DEL_PRIORITY, ),
+        BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_RISK_DATE, ListInboxPeer::DEL_PRIORITY, ListInboxPeer::PRO_ID, ListInboxPeer::USR_ID, ListInboxPeer::TAS_ID, ListInboxPeer::APP_STATUS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_RISK_DATE', 'DEL_PRIORITY', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_RISK_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', 'APP_STATUS_ID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
+        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, )
     );
 
     /**
@@ -115,10 +127,10 @@ abstract class BaseListInboxPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelRiskDate' => 18, 'DelPriority' => 19, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelRiskDate' => 18, 'DelPriority' => 19, 'ProId' => 20, 'UsrId' => 21, 'TasId' => 22, 'AppStatusId' => 23, ),
-        BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_RISK_DATE => 18, ListInboxPeer::DEL_PRIORITY => 19, ),
+        BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_RISK_DATE => 18, ListInboxPeer::DEL_PRIORITY => 19, ListInboxPeer::PRO_ID => 20, ListInboxPeer::USR_ID => 21, ListInboxPeer::TAS_ID => 22, ListInboxPeer::APP_STATUS_ID => 23, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_RISK_DATE' => 18, 'DEL_PRIORITY' => 19, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_RISK_DATE' => 18, 'DEL_PRIORITY' => 19, 'PRO_ID' => 20, 'USR_ID' => 21, 'TAS_ID' => 22, 'APP_STATUS_ID' => 23, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
+        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, )
     );
 
     /**
@@ -259,6 +271,14 @@ abstract class BaseListInboxPeer
 
         $criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY);
 
+        $criteria->addSelectColumn(ListInboxPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListInboxPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListInboxPeer::TAS_ID);
+
+        $criteria->addSelectColumn(ListInboxPeer::APP_STATUS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_INBOX.APP_UID)';

workflow/engine/classes/model/om/BaseListMyInbox.php

@@ -177,6 +177,30 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
      */
     protected $del_priority = '3';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
+    /**
+     * The value for the app_status_id field.
+     * @var        int
+     */
+    protected $app_status_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -592,6 +616,50 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
         return $this->del_priority;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
+    /**
+     * Get the [app_status_id] column value.
+     * 
+     * @return     int
+     */
+    public function getAppStatusId()
+    {
+
+        return $this->app_status_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -1184,6 +1252,94 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
 
     } // setDelPriority()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListMyInboxPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListMyInboxPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListMyInboxPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
+    /**
+     * Set the value of [app_status_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setAppStatusId($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->app_status_id !== $v || $v === 0) {
+            $this->app_status_id = $v;
+            $this->modifiedColumns[] = ListMyInboxPeer::APP_STATUS_ID;
+        }
+
+    } // setAppStatusId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -1251,12 +1407,20 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
 
             $this->del_priority = $rs->getString($startcol + 24);
 
+            $this->pro_id = $rs->getInt($startcol + 25);
+
+            $this->usr_id = $rs->getInt($startcol + 26);
+
+            $this->tas_id = $rs->getInt($startcol + 27);
+
+            $this->app_status_id = $rs->getInt($startcol + 28);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 25; // 25 = ListMyInboxPeer::NUM_COLUMNS - ListMyInboxPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 29; // 29 = ListMyInboxPeer::NUM_COLUMNS - ListMyInboxPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListMyInbox object", $e);
@@ -1535,6 +1699,18 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
             case 24:
                 return $this->getDelPriority();
                 break;
+            case 25:
+                return $this->getProId();
+                break;
+            case 26:
+                return $this->getUsrId();
+                break;
+            case 27:
+                return $this->getTasId();
+                break;
+            case 28:
+                return $this->getAppStatusId();
+                break;
             default:
                 return null;
                 break;
@@ -1580,6 +1756,10 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
             $keys[22] => $this->getDelInitDate(),
             $keys[23] => $this->getDelDueDate(),
             $keys[24] => $this->getDelPriority(),
+            $keys[25] => $this->getProId(),
+            $keys[26] => $this->getUsrId(),
+            $keys[27] => $this->getTasId(),
+            $keys[28] => $this->getAppStatusId(),
         );
         return $result;
     }
@@ -1686,6 +1866,18 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
             case 24:
                 $this->setDelPriority($value);
                 break;
+            case 25:
+                $this->setProId($value);
+                break;
+            case 26:
+                $this->setUsrId($value);
+                break;
+            case 27:
+                $this->setTasId($value);
+                break;
+            case 28:
+                $this->setAppStatusId($value);
+                break;
         } // switch()
     }
 
@@ -1809,6 +2001,22 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
             $this->setDelPriority($arr[$keys[24]]);
         }
 
+        if (array_key_exists($keys[25], $arr)) {
+            $this->setProId($arr[$keys[25]]);
+        }
+
+        if (array_key_exists($keys[26], $arr)) {
+            $this->setUsrId($arr[$keys[26]]);
+        }
+
+        if (array_key_exists($keys[27], $arr)) {
+            $this->setTasId($arr[$keys[27]]);
+        }
+
+        if (array_key_exists($keys[28], $arr)) {
+            $this->setAppStatusId($arr[$keys[28]]);
+        }
+
     }
 
     /**
@@ -1920,6 +2128,22 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
             $criteria->add(ListMyInboxPeer::DEL_PRIORITY, $this->del_priority);
         }
 
+        if ($this->isColumnModified(ListMyInboxPeer::PRO_ID)) {
+            $criteria->add(ListMyInboxPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListMyInboxPeer::USR_ID)) {
+            $criteria->add(ListMyInboxPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListMyInboxPeer::TAS_ID)) {
+            $criteria->add(ListMyInboxPeer::TAS_ID, $this->tas_id);
+        }
+
+        if ($this->isColumnModified(ListMyInboxPeer::APP_STATUS_ID)) {
+            $criteria->add(ListMyInboxPeer::APP_STATUS_ID, $this->app_status_id);
+        }
+
 
         return $criteria;
     }
@@ -2022,6 +2246,14 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent
 
         $copyObj->setDelPriority($this->del_priority);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
+        $copyObj->setAppStatusId($this->app_status_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListMyInboxPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListMyInboxPeer
     const CLASS_DEFAULT = 'classes.model.ListMyInbox';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 25;
+    const NUM_COLUMNS = 29;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -106,6 +106,18 @@ abstract class BaseListMyInboxPeer
     /** the column name for the DEL_PRIORITY field */
     const DEL_PRIORITY = 'LIST_MY_INBOX.DEL_PRIORITY';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_MY_INBOX.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_MY_INBOX.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_MY_INBOX.TAS_ID';
+
+    /** the column name for the APP_STATUS_ID field */
+    const APP_STATUS_ID = 'LIST_MY_INBOX.APP_STATUS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -117,10 +129,10 @@ abstract class BaseListMyInboxPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppUpdateDate', 'AppFinishDate', 'AppStatus', 'DelIndex', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppUpdateDate', 'AppFinishDate', 'AppStatus', 'DelIndex', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', 'AppStatusId', ),
-        BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID, ListMyInboxPeer::USR_UID, ListMyInboxPeer::TAS_UID, ListMyInboxPeer::PRO_UID, ListMyInboxPeer::APP_NUMBER, ListMyInboxPeer::APP_TITLE, ListMyInboxPeer::APP_PRO_TITLE, ListMyInboxPeer::APP_TAS_TITLE, ListMyInboxPeer::APP_CREATE_DATE, ListMyInboxPeer::APP_UPDATE_DATE, ListMyInboxPeer::APP_FINISH_DATE, ListMyInboxPeer::APP_STATUS, ListMyInboxPeer::DEL_INDEX, ListMyInboxPeer::DEL_PREVIOUS_USR_UID, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListMyInboxPeer::DEL_CURRENT_USR_UID, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME, ListMyInboxPeer::DEL_DELEGATE_DATE, ListMyInboxPeer::DEL_INIT_DATE, ListMyInboxPeer::DEL_DUE_DATE, ListMyInboxPeer::DEL_PRIORITY, ),
+        BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID, ListMyInboxPeer::USR_UID, ListMyInboxPeer::TAS_UID, ListMyInboxPeer::PRO_UID, ListMyInboxPeer::APP_NUMBER, ListMyInboxPeer::APP_TITLE, ListMyInboxPeer::APP_PRO_TITLE, ListMyInboxPeer::APP_TAS_TITLE, ListMyInboxPeer::APP_CREATE_DATE, ListMyInboxPeer::APP_UPDATE_DATE, ListMyInboxPeer::APP_FINISH_DATE, ListMyInboxPeer::APP_STATUS, ListMyInboxPeer::DEL_INDEX, ListMyInboxPeer::DEL_PREVIOUS_USR_UID, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListMyInboxPeer::DEL_CURRENT_USR_UID, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME, ListMyInboxPeer::DEL_DELEGATE_DATE, ListMyInboxPeer::DEL_INIT_DATE, ListMyInboxPeer::DEL_DUE_DATE, ListMyInboxPeer::DEL_PRIORITY, ListMyInboxPeer::PRO_ID, ListMyInboxPeer::USR_ID, ListMyInboxPeer::TAS_ID, ListMyInboxPeer::APP_STATUS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_UPDATE_DATE', 'APP_FINISH_DATE', 'APP_STATUS', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_UPDATE_DATE', 'APP_FINISH_DATE', 'APP_STATUS', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', 'APP_STATUS_ID', ),
-        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, )
+        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, )
     );
 
     /**
@@ -130,10 +142,10 @@ abstract class BaseListMyInboxPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppUpdateDate' => 9, 'AppFinishDate' => 10, 'AppStatus' => 11, 'DelIndex' => 12, 'DelPreviousUsrUid' => 13, 'DelPreviousUsrUsername' => 14, 'DelPreviousUsrFirstname' => 15, 'DelPreviousUsrLastname' => 16, 'DelCurrentUsrUid' => 17, 'DelCurrentUsrUsername' => 18, 'DelCurrentUsrFirstname' => 19, 'DelCurrentUsrLastname' => 20, 'DelDelegateDate' => 21, 'DelInitDate' => 22, 'DelDueDate' => 23, 'DelPriority' => 24, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppUpdateDate' => 9, 'AppFinishDate' => 10, 'AppStatus' => 11, 'DelIndex' => 12, 'DelPreviousUsrUid' => 13, 'DelPreviousUsrUsername' => 14, 'DelPreviousUsrFirstname' => 15, 'DelPreviousUsrLastname' => 16, 'DelCurrentUsrUid' => 17, 'DelCurrentUsrUsername' => 18, 'DelCurrentUsrFirstname' => 19, 'DelCurrentUsrLastname' => 20, 'DelDelegateDate' => 21, 'DelInitDate' => 22, 'DelDueDate' => 23, 'DelPriority' => 24, 'ProId' => 25, 'UsrId' => 26, 'TasId' => 27, 'AppStatusId' => 28, ),
-        BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID => 0, ListMyInboxPeer::USR_UID => 1, ListMyInboxPeer::TAS_UID => 2, ListMyInboxPeer::PRO_UID => 3, ListMyInboxPeer::APP_NUMBER => 4, ListMyInboxPeer::APP_TITLE => 5, ListMyInboxPeer::APP_PRO_TITLE => 6, ListMyInboxPeer::APP_TAS_TITLE => 7, ListMyInboxPeer::APP_CREATE_DATE => 8, ListMyInboxPeer::APP_UPDATE_DATE => 9, ListMyInboxPeer::APP_FINISH_DATE => 10, ListMyInboxPeer::APP_STATUS => 11, ListMyInboxPeer::DEL_INDEX => 12, ListMyInboxPeer::DEL_PREVIOUS_USR_UID => 13, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME => 14, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 15, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 16, ListMyInboxPeer::DEL_CURRENT_USR_UID => 17, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME => 18, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME => 19, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME => 20, ListMyInboxPeer::DEL_DELEGATE_DATE => 21, ListMyInboxPeer::DEL_INIT_DATE => 22, ListMyInboxPeer::DEL_DUE_DATE => 23, ListMyInboxPeer::DEL_PRIORITY => 24, ),
+        BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID => 0, ListMyInboxPeer::USR_UID => 1, ListMyInboxPeer::TAS_UID => 2, ListMyInboxPeer::PRO_UID => 3, ListMyInboxPeer::APP_NUMBER => 4, ListMyInboxPeer::APP_TITLE => 5, ListMyInboxPeer::APP_PRO_TITLE => 6, ListMyInboxPeer::APP_TAS_TITLE => 7, ListMyInboxPeer::APP_CREATE_DATE => 8, ListMyInboxPeer::APP_UPDATE_DATE => 9, ListMyInboxPeer::APP_FINISH_DATE => 10, ListMyInboxPeer::APP_STATUS => 11, ListMyInboxPeer::DEL_INDEX => 12, ListMyInboxPeer::DEL_PREVIOUS_USR_UID => 13, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME => 14, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 15, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 16, ListMyInboxPeer::DEL_CURRENT_USR_UID => 17, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME => 18, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME => 19, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME => 20, ListMyInboxPeer::DEL_DELEGATE_DATE => 21, ListMyInboxPeer::DEL_INIT_DATE => 22, ListMyInboxPeer::DEL_DUE_DATE => 23, ListMyInboxPeer::DEL_PRIORITY => 24, ListMyInboxPeer::PRO_ID => 25, ListMyInboxPeer::USR_ID => 26, ListMyInboxPeer::TAS_ID => 27, ListMyInboxPeer::APP_STATUS_ID => 28, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_UPDATE_DATE' => 9, 'APP_FINISH_DATE' => 10, 'APP_STATUS' => 11, 'DEL_INDEX' => 12, 'DEL_PREVIOUS_USR_UID' => 13, 'DEL_PREVIOUS_USR_USERNAME' => 14, 'DEL_PREVIOUS_USR_FIRSTNAME' => 15, 'DEL_PREVIOUS_USR_LASTNAME' => 16, 'DEL_CURRENT_USR_UID' => 17, 'DEL_CURRENT_USR_USERNAME' => 18, 'DEL_CURRENT_USR_FIRSTNAME' => 19, 'DEL_CURRENT_USR_LASTNAME' => 20, 'DEL_DELEGATE_DATE' => 21, 'DEL_INIT_DATE' => 22, 'DEL_DUE_DATE' => 23, 'DEL_PRIORITY' => 24, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_UPDATE_DATE' => 9, 'APP_FINISH_DATE' => 10, 'APP_STATUS' => 11, 'DEL_INDEX' => 12, 'DEL_PREVIOUS_USR_UID' => 13, 'DEL_PREVIOUS_USR_USERNAME' => 14, 'DEL_PREVIOUS_USR_FIRSTNAME' => 15, 'DEL_PREVIOUS_USR_LASTNAME' => 16, 'DEL_CURRENT_USR_UID' => 17, 'DEL_CURRENT_USR_USERNAME' => 18, 'DEL_CURRENT_USR_FIRSTNAME' => 19, 'DEL_CURRENT_USR_LASTNAME' => 20, 'DEL_DELEGATE_DATE' => 21, 'DEL_INIT_DATE' => 22, 'DEL_DUE_DATE' => 23, 'DEL_PRIORITY' => 24, 'PRO_ID' => 25, 'USR_ID' => 26, 'TAS_ID' => 27, 'APP_STATUS_ID' => 28, ),
-        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, )
+        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, )
     );
 
     /**
@@ -284,6 +296,14 @@ abstract class BaseListMyInboxPeer
 
         $criteria->addSelectColumn(ListMyInboxPeer::DEL_PRIORITY);
 
+        $criteria->addSelectColumn(ListMyInboxPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListMyInboxPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListMyInboxPeer::TAS_ID);
+
+        $criteria->addSelectColumn(ListMyInboxPeer::APP_STATUS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_MY_INBOX.APP_UID)';

workflow/engine/classes/model/om/BaseListParticipatedHistory.php

@@ -147,6 +147,24 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
      */
     protected $del_priority = '3';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -444,6 +462,39 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
         return $this->del_priority;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -905,6 +956,72 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
 
     } // setDelPriority()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListParticipatedHistoryPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListParticipatedHistoryPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListParticipatedHistoryPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -962,12 +1079,18 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
 
             $this->del_priority = $rs->getString($startcol + 19);
 
+            $this->pro_id = $rs->getInt($startcol + 20);
+
+            $this->usr_id = $rs->getInt($startcol + 21);
+
+            $this->tas_id = $rs->getInt($startcol + 22);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 20; // 20 = ListParticipatedHistoryPeer::NUM_COLUMNS - ListParticipatedHistoryPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 23; // 23 = ListParticipatedHistoryPeer::NUM_COLUMNS - ListParticipatedHistoryPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListParticipatedHistory object", $e);
@@ -1231,6 +1354,15 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
             case 19:
                 return $this->getDelPriority();
                 break;
+            case 20:
+                return $this->getProId();
+                break;
+            case 21:
+                return $this->getUsrId();
+                break;
+            case 22:
+                return $this->getTasId();
+                break;
             default:
                 return null;
                 break;
@@ -1271,6 +1403,9 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
             $keys[17] => $this->getDelInitDate(),
             $keys[18] => $this->getDelDueDate(),
             $keys[19] => $this->getDelPriority(),
+            $keys[20] => $this->getProId(),
+            $keys[21] => $this->getUsrId(),
+            $keys[22] => $this->getTasId(),
         );
         return $result;
     }
@@ -1362,6 +1497,15 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
             case 19:
                 $this->setDelPriority($value);
                 break;
+            case 20:
+                $this->setProId($value);
+                break;
+            case 21:
+                $this->setUsrId($value);
+                break;
+            case 22:
+                $this->setTasId($value);
+                break;
         } // switch()
     }
 
@@ -1465,6 +1609,18 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
             $this->setDelPriority($arr[$keys[19]]);
         }
 
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setProId($arr[$keys[20]]);
+        }
+
+        if (array_key_exists($keys[21], $arr)) {
+            $this->setUsrId($arr[$keys[21]]);
+        }
+
+        if (array_key_exists($keys[22], $arr)) {
+            $this->setTasId($arr[$keys[22]]);
+        }
+
     }
 
     /**
@@ -1556,6 +1712,18 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
             $criteria->add(ListParticipatedHistoryPeer::DEL_PRIORITY, $this->del_priority);
         }
 
+        if ($this->isColumnModified(ListParticipatedHistoryPeer::PRO_ID)) {
+            $criteria->add(ListParticipatedHistoryPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListParticipatedHistoryPeer::USR_ID)) {
+            $criteria->add(ListParticipatedHistoryPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListParticipatedHistoryPeer::TAS_ID)) {
+            $criteria->add(ListParticipatedHistoryPeer::TAS_ID, $this->tas_id);
+        }
+
 
         return $criteria;
     }
@@ -1658,6 +1826,12 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist
 
         $copyObj->setDelPriority($this->del_priority);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListParticipatedHistoryPeer
     const CLASS_DEFAULT = 'classes.model.ListParticipatedHistory';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 20;
+    const NUM_COLUMNS = 23;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -91,6 +91,15 @@ abstract class BaseListParticipatedHistoryPeer
     /** the column name for the DEL_PRIORITY field */
     const DEL_PRIORITY = 'LIST_PARTICIPATED_HISTORY.DEL_PRIORITY';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_PARTICIPATED_HISTORY.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_PARTICIPATED_HISTORY.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_PARTICIPATED_HISTORY.TAS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -102,10 +111,10 @@ abstract class BaseListParticipatedHistoryPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', ),
-        BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID, ListParticipatedHistoryPeer::DEL_INDEX, ListParticipatedHistoryPeer::USR_UID, ListParticipatedHistoryPeer::TAS_UID, ListParticipatedHistoryPeer::PRO_UID, ListParticipatedHistoryPeer::APP_NUMBER, ListParticipatedHistoryPeer::APP_TITLE, ListParticipatedHistoryPeer::APP_PRO_TITLE, ListParticipatedHistoryPeer::APP_TAS_TITLE, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, ListParticipatedHistoryPeer::DEL_INIT_DATE, ListParticipatedHistoryPeer::DEL_DUE_DATE, ListParticipatedHistoryPeer::DEL_PRIORITY, ),
+        BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID, ListParticipatedHistoryPeer::DEL_INDEX, ListParticipatedHistoryPeer::USR_UID, ListParticipatedHistoryPeer::TAS_UID, ListParticipatedHistoryPeer::PRO_UID, ListParticipatedHistoryPeer::APP_NUMBER, ListParticipatedHistoryPeer::APP_TITLE, ListParticipatedHistoryPeer::APP_PRO_TITLE, ListParticipatedHistoryPeer::APP_TAS_TITLE, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, ListParticipatedHistoryPeer::DEL_INIT_DATE, ListParticipatedHistoryPeer::DEL_DUE_DATE, ListParticipatedHistoryPeer::DEL_PRIORITY, ListParticipatedHistoryPeer::PRO_ID, ListParticipatedHistoryPeer::USR_ID, ListParticipatedHistoryPeer::TAS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
+        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, )
     );
 
     /**
@@ -115,10 +124,10 @@ abstract class BaseListParticipatedHistoryPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'DelPreviousUsrUid' => 9, 'DelPreviousUsrUsername' => 10, 'DelPreviousUsrFirstname' => 11, 'DelPreviousUsrLastname' => 12, 'DelCurrentUsrUsername' => 13, 'DelCurrentUsrFirstname' => 14, 'DelCurrentUsrLastname' => 15, 'DelDelegateDate' => 16, 'DelInitDate' => 17, 'DelDueDate' => 18, 'DelPriority' => 19, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'DelPreviousUsrUid' => 9, 'DelPreviousUsrUsername' => 10, 'DelPreviousUsrFirstname' => 11, 'DelPreviousUsrLastname' => 12, 'DelCurrentUsrUsername' => 13, 'DelCurrentUsrFirstname' => 14, 'DelCurrentUsrLastname' => 15, 'DelDelegateDate' => 16, 'DelInitDate' => 17, 'DelDueDate' => 18, 'DelPriority' => 19, 'ProId' => 20, 'UsrId' => 21, 'TasId' => 22, ),
-        BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID => 0, ListParticipatedHistoryPeer::DEL_INDEX => 1, ListParticipatedHistoryPeer::USR_UID => 2, ListParticipatedHistoryPeer::TAS_UID => 3, ListParticipatedHistoryPeer::PRO_UID => 4, ListParticipatedHistoryPeer::APP_NUMBER => 5, ListParticipatedHistoryPeer::APP_TITLE => 6, ListParticipatedHistoryPeer::APP_PRO_TITLE => 7, ListParticipatedHistoryPeer::APP_TAS_TITLE => 8, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID => 9, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME => 10, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME => 11, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME => 12, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME => 13, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME => 14, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME => 15, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE => 16, ListParticipatedHistoryPeer::DEL_INIT_DATE => 17, ListParticipatedHistoryPeer::DEL_DUE_DATE => 18, ListParticipatedHistoryPeer::DEL_PRIORITY => 19, ),
+        BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID => 0, ListParticipatedHistoryPeer::DEL_INDEX => 1, ListParticipatedHistoryPeer::USR_UID => 2, ListParticipatedHistoryPeer::TAS_UID => 3, ListParticipatedHistoryPeer::PRO_UID => 4, ListParticipatedHistoryPeer::APP_NUMBER => 5, ListParticipatedHistoryPeer::APP_TITLE => 6, ListParticipatedHistoryPeer::APP_PRO_TITLE => 7, ListParticipatedHistoryPeer::APP_TAS_TITLE => 8, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID => 9, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME => 10, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME => 11, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME => 12, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME => 13, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME => 14, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME => 15, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE => 16, ListParticipatedHistoryPeer::DEL_INIT_DATE => 17, ListParticipatedHistoryPeer::DEL_DUE_DATE => 18, ListParticipatedHistoryPeer::DEL_PRIORITY => 19, ListParticipatedHistoryPeer::PRO_ID => 20, ListParticipatedHistoryPeer::USR_ID => 21, ListParticipatedHistoryPeer::TAS_ID => 22, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'DEL_PREVIOUS_USR_UID' => 9, 'DEL_PREVIOUS_USR_USERNAME' => 10, 'DEL_PREVIOUS_USR_FIRSTNAME' => 11, 'DEL_PREVIOUS_USR_LASTNAME' => 12, 'DEL_CURRENT_USR_USERNAME' => 13, 'DEL_CURRENT_USR_FIRSTNAME' => 14, 'DEL_CURRENT_USR_LASTNAME' => 15, 'DEL_DELEGATE_DATE' => 16, 'DEL_INIT_DATE' => 17, 'DEL_DUE_DATE' => 18, 'DEL_PRIORITY' => 19, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'DEL_PREVIOUS_USR_UID' => 9, 'DEL_PREVIOUS_USR_USERNAME' => 10, 'DEL_PREVIOUS_USR_FIRSTNAME' => 11, 'DEL_PREVIOUS_USR_LASTNAME' => 12, 'DEL_CURRENT_USR_USERNAME' => 13, 'DEL_CURRENT_USR_FIRSTNAME' => 14, 'DEL_CURRENT_USR_LASTNAME' => 15, 'DEL_DELEGATE_DATE' => 16, 'DEL_INIT_DATE' => 17, 'DEL_DUE_DATE' => 18, 'DEL_PRIORITY' => 19, 'PRO_ID' => 20, 'USR_ID' => 21, 'TAS_ID' => 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, )
+        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, )
     );
 
     /**
@@ -259,6 +268,12 @@ abstract class BaseListParticipatedHistoryPeer
 
         $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_PRIORITY);
 
+        $criteria->addSelectColumn(ListParticipatedHistoryPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListParticipatedHistoryPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListParticipatedHistoryPeer::TAS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_PARTICIPATED_HISTORY.APP_UID)';

workflow/engine/classes/model/om/BaseListParticipatedLast.php

@@ -165,6 +165,30 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
      */
     protected $del_thread_status = 'OPEN';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
+    /**
+     * The value for the app_status_id field.
+     * @var        int
+     */
+    protected $app_status_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -495,6 +519,50 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
         return $this->del_thread_status;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
+    /**
+     * Get the [app_status_id] column value.
+     * 
+     * @return     int
+     */
+    public function getAppStatusId()
+    {
+
+        return $this->app_status_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -1022,6 +1090,94 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
 
     } // setDelThreadStatus()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListParticipatedLastPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListParticipatedLastPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListParticipatedLastPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
+    /**
+     * Set the value of [app_status_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setAppStatusId($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->app_status_id !== $v || $v === 0) {
+            $this->app_status_id = $v;
+            $this->modifiedColumns[] = ListParticipatedLastPeer::APP_STATUS_ID;
+        }
+
+    } // setAppStatusId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -1085,12 +1241,20 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
 
             $this->del_thread_status = $rs->getString($startcol + 22);
 
+            $this->pro_id = $rs->getInt($startcol + 23);
+
+            $this->usr_id = $rs->getInt($startcol + 24);
+
+            $this->tas_id = $rs->getInt($startcol + 25);
+
+            $this->app_status_id = $rs->getInt($startcol + 26);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 23; // 23 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 27; // 27 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListParticipatedLast object", $e);
@@ -1363,6 +1527,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
             case 22:
                 return $this->getDelThreadStatus();
                 break;
+            case 23:
+                return $this->getProId();
+                break;
+            case 24:
+                return $this->getUsrId();
+                break;
+            case 25:
+                return $this->getTasId();
+                break;
+            case 26:
+                return $this->getAppStatusId();
+                break;
             default:
                 return null;
                 break;
@@ -1406,6 +1582,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
             $keys[20] => $this->getDelDueDate(),
             $keys[21] => $this->getDelPriority(),
             $keys[22] => $this->getDelThreadStatus(),
+            $keys[23] => $this->getProId(),
+            $keys[24] => $this->getUsrId(),
+            $keys[25] => $this->getTasId(),
+            $keys[26] => $this->getAppStatusId(),
         );
         return $result;
     }
@@ -1506,6 +1686,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
             case 22:
                 $this->setDelThreadStatus($value);
                 break;
+            case 23:
+                $this->setProId($value);
+                break;
+            case 24:
+                $this->setUsrId($value);
+                break;
+            case 25:
+                $this->setTasId($value);
+                break;
+            case 26:
+                $this->setAppStatusId($value);
+                break;
         } // switch()
     }
 
@@ -1621,6 +1813,22 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
             $this->setDelThreadStatus($arr[$keys[22]]);
         }
 
+        if (array_key_exists($keys[23], $arr)) {
+            $this->setProId($arr[$keys[23]]);
+        }
+
+        if (array_key_exists($keys[24], $arr)) {
+            $this->setUsrId($arr[$keys[24]]);
+        }
+
+        if (array_key_exists($keys[25], $arr)) {
+            $this->setTasId($arr[$keys[25]]);
+        }
+
+        if (array_key_exists($keys[26], $arr)) {
+            $this->setAppStatusId($arr[$keys[26]]);
+        }
+
     }
 
     /**
@@ -1724,6 +1932,22 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
             $criteria->add(ListParticipatedLastPeer::DEL_THREAD_STATUS, $this->del_thread_status);
         }
 
+        if ($this->isColumnModified(ListParticipatedLastPeer::PRO_ID)) {
+            $criteria->add(ListParticipatedLastPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListParticipatedLastPeer::USR_ID)) {
+            $criteria->add(ListParticipatedLastPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListParticipatedLastPeer::TAS_ID)) {
+            $criteria->add(ListParticipatedLastPeer::TAS_ID, $this->tas_id);
+        }
+
+        if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS_ID)) {
+            $criteria->add(ListParticipatedLastPeer::APP_STATUS_ID, $this->app_status_id);
+        }
+
 
         return $criteria;
     }
@@ -1835,6 +2059,14 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
 
         $copyObj->setDelThreadStatus($this->del_thread_status);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
+        $copyObj->setAppStatusId($this->app_status_id);
+
 
         $copyObj->setNew(true);
 
@@ -1842,7 +2074,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
 
         $copyObj->setUsrUid(''); // this is a pkey column, so set to default value
 
-        $copyObj->setDelIndex(''); // this is a pkey column, so set to default value
+        $copyObj->setDelIndex('0'); // this is a pkey column, so set to default value
 
     }
 

workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListParticipatedLastPeer
     const CLASS_DEFAULT = 'classes.model.ListParticipatedLast';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 23;
+    const NUM_COLUMNS = 27;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -100,6 +100,18 @@ abstract class BaseListParticipatedLastPeer
     /** the column name for the DEL_THREAD_STATUS field */
     const DEL_THREAD_STATUS = 'LIST_PARTICIPATED_LAST.DEL_THREAD_STATUS';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_PARTICIPATED_LAST.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_PARTICIPATED_LAST.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_PARTICIPATED_LAST.TAS_ID';
+
+    /** the column name for the APP_STATUS_ID field */
+    const APP_STATUS_ID = 'LIST_PARTICIPATED_LAST.APP_STATUS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -111,10 +123,10 @@ abstract class BaseListParticipatedLastPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelCurrentTasTitle', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelThreadStatus', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelCurrentTasTitle', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelThreadStatus', 'ProId', 'UsrId', 'TasId', 'AppStatusId', ),
-        BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ListParticipatedLastPeer::DEL_THREAD_STATUS, ),
+        BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ListParticipatedLastPeer::DEL_THREAD_STATUS, ListParticipatedLastPeer::PRO_ID, ListParticipatedLastPeer::USR_ID, ListParticipatedLastPeer::TAS_ID, ListParticipatedLastPeer::APP_STATUS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_CURRENT_TAS_TITLE', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'DEL_THREAD_STATUS', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_CURRENT_TAS_TITLE', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'DEL_THREAD_STATUS', 'PRO_ID', 'USR_ID', 'TAS_ID', 'APP_STATUS_ID', ),
-        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, )
+        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, )
     );
 
     /**
@@ -124,10 +136,10 @@ abstract class BaseListParticipatedLastPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'DelIndex' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelCurrentTasTitle' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'DelThreadStatus' => 22, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'DelIndex' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelCurrentTasTitle' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'DelThreadStatus' => 22, 'ProId' => 23, 'UsrId' => 24, 'TasId' => 25, 'AppStatusId' => 26, ),
-        BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::DEL_INDEX => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE => 17, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 18, ListParticipatedLastPeer::DEL_INIT_DATE => 19, ListParticipatedLastPeer::DEL_DUE_DATE => 20, ListParticipatedLastPeer::DEL_PRIORITY => 21, ListParticipatedLastPeer::DEL_THREAD_STATUS => 22, ),
+        BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::DEL_INDEX => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE => 17, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 18, ListParticipatedLastPeer::DEL_INIT_DATE => 19, ListParticipatedLastPeer::DEL_DUE_DATE => 20, ListParticipatedLastPeer::DEL_PRIORITY => 21, ListParticipatedLastPeer::DEL_THREAD_STATUS => 22, ListParticipatedLastPeer::PRO_ID => 23, ListParticipatedLastPeer::USR_ID => 24, ListParticipatedLastPeer::TAS_ID => 25, ListParticipatedLastPeer::APP_STATUS_ID => 26, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'DEL_INDEX' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_STATUS' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_CURRENT_TAS_TITLE' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'DEL_THREAD_STATUS' => 22, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'DEL_INDEX' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_STATUS' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_CURRENT_TAS_TITLE' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'DEL_THREAD_STATUS' => 22, 'PRO_ID' => 23, 'USR_ID' => 24, 'TAS_ID' => 25, 'APP_STATUS_ID' => 26, ),
-        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, )
+        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, )
     );
 
     /**
@@ -274,6 +286,14 @@ abstract class BaseListParticipatedLastPeer
 
         $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
 
+        $criteria->addSelectColumn(ListParticipatedLastPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListParticipatedLastPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListParticipatedLastPeer::TAS_ID);
+
+        $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_PARTICIPATED_LAST.APP_UID)';

workflow/engine/classes/model/om/BaseListPaused.php

@@ -159,6 +159,24 @@ abstract class BaseListPaused extends BaseObject implements Persistent
      */
     protected $del_priority = '3';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -520,6 +538,39 @@ abstract class BaseListPaused extends BaseObject implements Persistent
         return $this->del_priority;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -1039,6 +1090,72 @@ abstract class BaseListPaused extends BaseObject implements Persistent
 
     } // setDelPriority()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListPausedPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListPausedPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListPausedPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -1100,12 +1217,18 @@ abstract class BaseListPaused extends BaseObject implements Persistent
 
             $this->del_priority = $rs->getString($startcol + 21);
 
+            $this->pro_id = $rs->getInt($startcol + 22);
+
+            $this->usr_id = $rs->getInt($startcol + 23);
+
+            $this->tas_id = $rs->getInt($startcol + 24);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 22; // 22 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 25; // 25 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListPaused object", $e);
@@ -1375,6 +1498,15 @@ abstract class BaseListPaused extends BaseObject implements Persistent
             case 21:
                 return $this->getDelPriority();
                 break;
+            case 22:
+                return $this->getProId();
+                break;
+            case 23:
+                return $this->getUsrId();
+                break;
+            case 24:
+                return $this->getTasId();
+                break;
             default:
                 return null;
                 break;
@@ -1417,6 +1549,9 @@ abstract class BaseListPaused extends BaseObject implements Persistent
             $keys[19] => $this->getDelInitDate(),
             $keys[20] => $this->getDelDueDate(),
             $keys[21] => $this->getDelPriority(),
+            $keys[22] => $this->getProId(),
+            $keys[23] => $this->getUsrId(),
+            $keys[24] => $this->getTasId(),
         );
         return $result;
     }
@@ -1514,6 +1649,15 @@ abstract class BaseListPaused extends BaseObject implements Persistent
             case 21:
                 $this->setDelPriority($value);
                 break;
+            case 22:
+                $this->setProId($value);
+                break;
+            case 23:
+                $this->setUsrId($value);
+                break;
+            case 24:
+                $this->setTasId($value);
+                break;
         } // switch()
     }
 
@@ -1625,6 +1769,18 @@ abstract class BaseListPaused extends BaseObject implements Persistent
             $this->setDelPriority($arr[$keys[21]]);
         }
 
+        if (array_key_exists($keys[22], $arr)) {
+            $this->setProId($arr[$keys[22]]);
+        }
+
+        if (array_key_exists($keys[23], $arr)) {
+            $this->setUsrId($arr[$keys[23]]);
+        }
+
+        if (array_key_exists($keys[24], $arr)) {
+            $this->setTasId($arr[$keys[24]]);
+        }
+
     }
 
     /**
@@ -1724,6 +1880,18 @@ abstract class BaseListPaused extends BaseObject implements Persistent
             $criteria->add(ListPausedPeer::DEL_PRIORITY, $this->del_priority);
         }
 
+        if ($this->isColumnModified(ListPausedPeer::PRO_ID)) {
+            $criteria->add(ListPausedPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListPausedPeer::USR_ID)) {
+            $criteria->add(ListPausedPeer::USR_ID, $this->usr_id);
+        }
+
+        if ($this->isColumnModified(ListPausedPeer::TAS_ID)) {
+            $criteria->add(ListPausedPeer::TAS_ID, $this->tas_id);
+        }
+
 
         return $criteria;
     }
@@ -1830,6 +1998,12 @@ abstract class BaseListPaused extends BaseObject implements Persistent
 
         $copyObj->setDelPriority($this->del_priority);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setUsrId($this->usr_id);
+
+        $copyObj->setTasId($this->tas_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListPausedPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListPausedPeer
     const CLASS_DEFAULT = 'classes.model.ListPaused';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 22;
+    const NUM_COLUMNS = 25;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -97,6 +97,15 @@ abstract class BaseListPausedPeer
     /** the column name for the DEL_PRIORITY field */
     const DEL_PRIORITY = 'LIST_PAUSED.DEL_PRIORITY';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_PAUSED.PRO_ID';
+
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_PAUSED.USR_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_PAUSED.TAS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -108,10 +117,10 @@ abstract class BaseListPausedPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppPausedDate', 'AppRestartDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppPausedDate', 'AppRestartDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', ),
-        BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID, ListPausedPeer::DEL_INDEX, ListPausedPeer::USR_UID, ListPausedPeer::TAS_UID, ListPausedPeer::PRO_UID, ListPausedPeer::APP_NUMBER, ListPausedPeer::APP_TITLE, ListPausedPeer::APP_PRO_TITLE, ListPausedPeer::APP_TAS_TITLE, ListPausedPeer::APP_PAUSED_DATE, ListPausedPeer::APP_RESTART_DATE, ListPausedPeer::DEL_PREVIOUS_USR_UID, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME, ListPausedPeer::DEL_CURRENT_USR_USERNAME, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME, ListPausedPeer::DEL_CURRENT_USR_LASTNAME, ListPausedPeer::DEL_DELEGATE_DATE, ListPausedPeer::DEL_INIT_DATE, ListPausedPeer::DEL_DUE_DATE, ListPausedPeer::DEL_PRIORITY, ),
+        BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID, ListPausedPeer::DEL_INDEX, ListPausedPeer::USR_UID, ListPausedPeer::TAS_UID, ListPausedPeer::PRO_UID, ListPausedPeer::APP_NUMBER, ListPausedPeer::APP_TITLE, ListPausedPeer::APP_PRO_TITLE, ListPausedPeer::APP_TAS_TITLE, ListPausedPeer::APP_PAUSED_DATE, ListPausedPeer::APP_RESTART_DATE, ListPausedPeer::DEL_PREVIOUS_USR_UID, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME, ListPausedPeer::DEL_CURRENT_USR_USERNAME, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME, ListPausedPeer::DEL_CURRENT_USR_LASTNAME, ListPausedPeer::DEL_DELEGATE_DATE, ListPausedPeer::DEL_INIT_DATE, ListPausedPeer::DEL_DUE_DATE, ListPausedPeer::DEL_PRIORITY, ListPausedPeer::PRO_ID, ListPausedPeer::USR_ID, ListPausedPeer::TAS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_PAUSED_DATE', 'APP_RESTART_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_PAUSED_DATE', 'APP_RESTART_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', ),
-        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_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, )
     );
 
     /**
@@ -121,10 +130,10 @@ abstract class BaseListPausedPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppPausedDate' => 9, 'AppRestartDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelCurrentUsrUsername' => 15, 'DelCurrentUsrFirstname' => 16, 'DelCurrentUsrLastname' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppPausedDate' => 9, 'AppRestartDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelCurrentUsrUsername' => 15, 'DelCurrentUsrFirstname' => 16, 'DelCurrentUsrLastname' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'ProId' => 22, 'UsrId' => 23, 'TasId' => 24, ),
-        BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID => 0, ListPausedPeer::DEL_INDEX => 1, ListPausedPeer::USR_UID => 2, ListPausedPeer::TAS_UID => 3, ListPausedPeer::PRO_UID => 4, ListPausedPeer::APP_NUMBER => 5, ListPausedPeer::APP_TITLE => 6, ListPausedPeer::APP_PRO_TITLE => 7, ListPausedPeer::APP_TAS_TITLE => 8, ListPausedPeer::APP_PAUSED_DATE => 9, ListPausedPeer::APP_RESTART_DATE => 10, ListPausedPeer::DEL_PREVIOUS_USR_UID => 11, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListPausedPeer::DEL_CURRENT_USR_USERNAME => 15, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME => 16, ListPausedPeer::DEL_CURRENT_USR_LASTNAME => 17, ListPausedPeer::DEL_DELEGATE_DATE => 18, ListPausedPeer::DEL_INIT_DATE => 19, ListPausedPeer::DEL_DUE_DATE => 20, ListPausedPeer::DEL_PRIORITY => 21, ),
+        BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID => 0, ListPausedPeer::DEL_INDEX => 1, ListPausedPeer::USR_UID => 2, ListPausedPeer::TAS_UID => 3, ListPausedPeer::PRO_UID => 4, ListPausedPeer::APP_NUMBER => 5, ListPausedPeer::APP_TITLE => 6, ListPausedPeer::APP_PRO_TITLE => 7, ListPausedPeer::APP_TAS_TITLE => 8, ListPausedPeer::APP_PAUSED_DATE => 9, ListPausedPeer::APP_RESTART_DATE => 10, ListPausedPeer::DEL_PREVIOUS_USR_UID => 11, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListPausedPeer::DEL_CURRENT_USR_USERNAME => 15, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME => 16, ListPausedPeer::DEL_CURRENT_USR_LASTNAME => 17, ListPausedPeer::DEL_DELEGATE_DATE => 18, ListPausedPeer::DEL_INIT_DATE => 19, ListPausedPeer::DEL_DUE_DATE => 20, ListPausedPeer::DEL_PRIORITY => 21, ListPausedPeer::PRO_ID => 22, ListPausedPeer::USR_ID => 23, ListPausedPeer::TAS_ID => 24, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_PAUSED_DATE' => 9, 'APP_RESTART_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_CURRENT_USR_USERNAME' => 15, 'DEL_CURRENT_USR_FIRSTNAME' => 16, 'DEL_CURRENT_USR_LASTNAME' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_PAUSED_DATE' => 9, 'APP_RESTART_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_CURRENT_USR_USERNAME' => 15, 'DEL_CURRENT_USR_FIRSTNAME' => 16, 'DEL_CURRENT_USR_LASTNAME' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'PRO_ID' => 22, 'USR_ID' => 23, 'TAS_ID' => 24, ),
-        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_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, )
     );
 
     /**
@@ -269,6 +278,12 @@ abstract class BaseListPausedPeer
 
         $criteria->addSelectColumn(ListPausedPeer::DEL_PRIORITY);
 
+        $criteria->addSelectColumn(ListPausedPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListPausedPeer::USR_ID);
+
+        $criteria->addSelectColumn(ListPausedPeer::TAS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_PAUSED.APP_UID)';

workflow/engine/classes/model/om/BaseListUnassigned.php

@@ -123,6 +123,18 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
      */
     protected $del_priority = '3';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id = 0;
+
+    /**
+     * The value for the tas_id field.
+     * @var        int
+     */
+    protected $tas_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -376,6 +388,28 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
         return $this->del_priority;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
+    /**
+     * Get the [tas_id] column value.
+     * 
+     * @return     int
+     */
+    public function getTasId()
+    {
+
+        return $this->tas_id;
+    }
+
     /**
      * Set the value of [app_uid] column.
      * 
@@ -749,6 +783,50 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
 
     } // setDelPriority()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v || $v === 0) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ListUnassignedPeer::PRO_ID;
+        }
+
+    } // setProId()
+
+    /**
+     * Set the value of [tas_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setTasId($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->tas_id !== $v || $v === 0) {
+            $this->tas_id = $v;
+            $this->modifiedColumns[] = ListUnassignedPeer::TAS_ID;
+        }
+
+    } // setTasId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -798,12 +876,16 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
 
             $this->del_priority = $rs->getString($startcol + 15);
 
+            $this->pro_id = $rs->getInt($startcol + 16);
+
+            $this->tas_id = $rs->getInt($startcol + 17);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 16; // 16 = ListUnassignedPeer::NUM_COLUMNS - ListUnassignedPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 18; // 18 = ListUnassignedPeer::NUM_COLUMNS - ListUnassignedPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListUnassigned object", $e);
@@ -1055,6 +1137,12 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
             case 15:
                 return $this->getDelPriority();
                 break;
+            case 16:
+                return $this->getProId();
+                break;
+            case 17:
+                return $this->getTasId();
+                break;
             default:
                 return null;
                 break;
@@ -1091,6 +1179,8 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
             $keys[13] => $this->getDelDelegateDate(),
             $keys[14] => $this->getDelDueDate(),
             $keys[15] => $this->getDelPriority(),
+            $keys[16] => $this->getProId(),
+            $keys[17] => $this->getTasId(),
         );
         return $result;
     }
@@ -1170,6 +1260,12 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
             case 15:
                 $this->setDelPriority($value);
                 break;
+            case 16:
+                $this->setProId($value);
+                break;
+            case 17:
+                $this->setTasId($value);
+                break;
         } // switch()
     }
 
@@ -1257,6 +1353,14 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
             $this->setDelPriority($arr[$keys[15]]);
         }
 
+        if (array_key_exists($keys[16], $arr)) {
+            $this->setProId($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setTasId($arr[$keys[17]]);
+        }
+
     }
 
     /**
@@ -1332,6 +1436,14 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
             $criteria->add(ListUnassignedPeer::DEL_PRIORITY, $this->del_priority);
         }
 
+        if ($this->isColumnModified(ListUnassignedPeer::PRO_ID)) {
+            $criteria->add(ListUnassignedPeer::PRO_ID, $this->pro_id);
+        }
+
+        if ($this->isColumnModified(ListUnassignedPeer::TAS_ID)) {
+            $criteria->add(ListUnassignedPeer::TAS_ID, $this->tas_id);
+        }
+
 
         return $criteria;
     }
@@ -1426,6 +1538,10 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
 
         $copyObj->setDelPriority($this->del_priority);
 
+        $copyObj->setProId($this->pro_id);
+
+        $copyObj->setTasId($this->tas_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListUnassignedGroup.php

@@ -51,6 +51,12 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
      */
     protected $typ_uid = '';
 
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -109,6 +115,17 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
         return $this->typ_uid;
     }
 
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
     /**
      * Set the value of [una_uid] column.
      * 
@@ -197,6 +214,28 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
 
     } // setTypUid()
 
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v || $v === 0) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = ListUnassignedGroupPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -222,12 +261,14 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
 
             $this->typ_uid = $rs->getString($startcol + 3);
 
+            $this->usr_id = $rs->getInt($startcol + 4);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 4; // 4 = ListUnassignedGroupPeer::NUM_COLUMNS - ListUnassignedGroupPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 5; // 5 = ListUnassignedGroupPeer::NUM_COLUMNS - ListUnassignedGroupPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating ListUnassignedGroup object", $e);
@@ -443,6 +484,9 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
             case 3:
                 return $this->getTypUid();
                 break;
+            case 4:
+                return $this->getUsrId();
+                break;
             default:
                 return null;
                 break;
@@ -467,6 +511,7 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
             $keys[1] => $this->getUsrUid(),
             $keys[2] => $this->getType(),
             $keys[3] => $this->getTypUid(),
+            $keys[4] => $this->getUsrId(),
         );
         return $result;
     }
@@ -510,6 +555,9 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
             case 3:
                 $this->setTypUid($value);
                 break;
+            case 4:
+                $this->setUsrId($value);
+                break;
         } // switch()
     }
 
@@ -549,6 +597,10 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
             $this->setTypUid($arr[$keys[3]]);
         }
 
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setUsrId($arr[$keys[4]]);
+        }
+
     }
 
     /**
@@ -576,6 +628,10 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
             $criteria->add(ListUnassignedGroupPeer::TYP_UID, $this->typ_uid);
         }
 
+        if ($this->isColumnModified(ListUnassignedGroupPeer::USR_ID)) {
+            $criteria->add(ListUnassignedGroupPeer::USR_ID, $this->usr_id);
+        }
+
 
         return $criteria;
     }
@@ -649,6 +705,8 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent
 
         $copyObj->setTypUid($this->typ_uid);
 
+        $copyObj->setUsrId($this->usr_id);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseListUnassignedGroupPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListUnassignedGroupPeer
     const CLASS_DEFAULT = 'classes.model.ListUnassignedGroup';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 4;
+    const NUM_COLUMNS = 5;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -43,6 +43,9 @@ abstract class BaseListUnassignedGroupPeer
     /** the column name for the TYP_UID field */
     const TYP_UID = 'LIST_UNASSIGNED_GROUP.TYP_UID';
 
+    /** the column name for the USR_ID field */
+    const USR_ID = 'LIST_UNASSIGNED_GROUP.USR_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -54,10 +57,10 @@ abstract class BaseListUnassignedGroupPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('UnaUid', 'UsrUid', 'Type', 'TypUid', ),
+        BasePeer::TYPE_PHPNAME => array ('UnaUid', 'UsrUid', 'Type', 'TypUid', 'UsrId', ),
-        BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID, ListUnassignedGroupPeer::USR_UID, ListUnassignedGroupPeer::TYPE, ListUnassignedGroupPeer::TYP_UID, ),
+        BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID, ListUnassignedGroupPeer::USR_UID, ListUnassignedGroupPeer::TYPE, ListUnassignedGroupPeer::TYP_UID, ListUnassignedGroupPeer::USR_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('UNA_UID', 'USR_UID', 'TYPE', 'TYP_UID', ),
+        BasePeer::TYPE_FIELDNAME => array ('UNA_UID', 'USR_UID', 'TYPE', 'TYP_UID', 'USR_ID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
     );
 
     /**
@@ -67,10 +70,10 @@ abstract class BaseListUnassignedGroupPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('UnaUid' => 0, 'UsrUid' => 1, 'Type' => 2, 'TypUid' => 3, ),
+        BasePeer::TYPE_PHPNAME => array ('UnaUid' => 0, 'UsrUid' => 1, 'Type' => 2, 'TypUid' => 3, 'UsrId' => 4, ),
-        BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID => 0, ListUnassignedGroupPeer::USR_UID => 1, ListUnassignedGroupPeer::TYPE => 2, ListUnassignedGroupPeer::TYP_UID => 3, ),
+        BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID => 0, ListUnassignedGroupPeer::USR_UID => 1, ListUnassignedGroupPeer::TYPE => 2, ListUnassignedGroupPeer::TYP_UID => 3, ListUnassignedGroupPeer::USR_ID => 4, ),
-        BasePeer::TYPE_FIELDNAME => array ('UNA_UID' => 0, 'USR_UID' => 1, 'TYPE' => 2, 'TYP_UID' => 3, ),
+        BasePeer::TYPE_FIELDNAME => array ('UNA_UID' => 0, 'USR_UID' => 1, 'TYPE' => 2, 'TYP_UID' => 3, 'USR_ID' => 4, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
     );
 
     /**
@@ -179,6 +182,8 @@ abstract class BaseListUnassignedGroupPeer
 
         $criteria->addSelectColumn(ListUnassignedGroupPeer::TYP_UID);
 
+        $criteria->addSelectColumn(ListUnassignedGroupPeer::USR_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_UNASSIGNED_GROUP.UNA_UID)';

workflow/engine/classes/model/om/BaseListUnassignedPeer.php

@@ -25,7 +25,7 @@ abstract class BaseListUnassignedPeer
     const CLASS_DEFAULT = 'classes.model.ListUnassigned';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 16;
+    const NUM_COLUMNS = 18;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -79,6 +79,12 @@ abstract class BaseListUnassignedPeer
     /** the column name for the DEL_PRIORITY field */
     const DEL_PRIORITY = 'LIST_UNASSIGNED.DEL_PRIORITY';
 
+    /** the column name for the PRO_ID field */
+    const PRO_ID = 'LIST_UNASSIGNED.PRO_ID';
+
+    /** the column name for the TAS_ID field */
+    const TAS_ID = 'LIST_UNASSIGNED.TAS_ID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -90,10 +96,10 @@ abstract class BaseListUnassignedPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelDelegateDate', 'DelDueDate', 'DelPriority', ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelDelegateDate', 'DelDueDate', 'DelPriority', 'ProId', 'TasId', ),
-        BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID, ListUnassignedPeer::DEL_INDEX, ListUnassignedPeer::TAS_UID, ListUnassignedPeer::PRO_UID, ListUnassignedPeer::APP_NUMBER, ListUnassignedPeer::APP_TITLE, ListUnassignedPeer::APP_PRO_TITLE, ListUnassignedPeer::APP_TAS_TITLE, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME, ListUnassignedPeer::APP_UPDATE_DATE, ListUnassignedPeer::DEL_PREVIOUS_USR_UID, ListUnassignedPeer::DEL_DELEGATE_DATE, ListUnassignedPeer::DEL_DUE_DATE, ListUnassignedPeer::DEL_PRIORITY, ),
+        BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID, ListUnassignedPeer::DEL_INDEX, ListUnassignedPeer::TAS_UID, ListUnassignedPeer::PRO_UID, ListUnassignedPeer::APP_NUMBER, ListUnassignedPeer::APP_TITLE, ListUnassignedPeer::APP_PRO_TITLE, ListUnassignedPeer::APP_TAS_TITLE, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME, ListUnassignedPeer::APP_UPDATE_DATE, ListUnassignedPeer::DEL_PREVIOUS_USR_UID, ListUnassignedPeer::DEL_DELEGATE_DATE, ListUnassignedPeer::DEL_DUE_DATE, ListUnassignedPeer::DEL_PRIORITY, ListUnassignedPeer::PRO_ID, ListUnassignedPeer::TAS_ID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_DELEGATE_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_DELEGATE_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'TAS_ID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
     );
 
     /**
@@ -103,10 +109,10 @@ abstract class BaseListUnassignedPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, 'ProId' => 16, 'TasId' => 17, ),
-        BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ),
+        BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ListUnassignedPeer::PRO_ID => 16, ListUnassignedPeer::TAS_ID => 17, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, 'PRO_ID' => 16, 'TAS_ID' => 17, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
     );
 
     /**
@@ -239,6 +245,10 @@ abstract class BaseListUnassignedPeer
 
         $criteria->addSelectColumn(ListUnassignedPeer::DEL_PRIORITY);
 
+        $criteria->addSelectColumn(ListUnassignedPeer::PRO_ID);
+
+        $criteria->addSelectColumn(ListUnassignedPeer::TAS_ID);
+
     }
 
     const COUNT = 'COUNT(LIST_UNASSIGNED.APP_UID)';

workflow/engine/classes/model/om/BaseProcess.php

@@ -33,6 +33,12 @@ abstract class BaseProcess extends BaseObject implements Persistent
      */
     protected $pro_uid = '';
 
+    /**
+     * The value for the pro_id field.
+     * @var        int
+     */
+    protected $pro_id;
+
     /**
      * The value for the pro_title field.
      * @var        string
@@ -292,6 +298,17 @@ abstract class BaseProcess extends BaseObject implements Persistent
         return $this->pro_uid;
     }
 
+    /**
+     * Get the [pro_id] column value.
+     * 
+     * @return     int
+     */
+    public function getProId()
+    {
+
+        return $this->pro_id;
+    }
+
     /**
      * Get the [pro_title] column value.
      * 
@@ -785,6 +802,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
 
     } // setProUid()
 
+    /**
+     * Set the value of [pro_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setProId($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->pro_id !== $v) {
+            $this->pro_id = $v;
+            $this->modifiedColumns[] = ProcessPeer::PRO_ID;
+        }
+
+    } // setProId()
+
     /**
      * Set the value of [pro_title] column.
      * 
@@ -1664,90 +1703,92 @@ abstract class BaseProcess extends BaseObject implements Persistent
 
             $this->pro_uid = $rs->getString($startcol + 0);
 
-            $this->pro_title = $rs->getString($startcol + 1);
+            $this->pro_id = $rs->getInt($startcol + 1);
 
-            $this->pro_description = $rs->getString($startcol + 2);
+            $this->pro_title = $rs->getString($startcol + 2);
 
-            $this->pro_parent = $rs->getString($startcol + 3);
+            $this->pro_description = $rs->getString($startcol + 3);
 
-            $this->pro_time = $rs->getFloat($startcol + 4);
+            $this->pro_parent = $rs->getString($startcol + 4);
 
-            $this->pro_timeunit = $rs->getString($startcol + 5);
+            $this->pro_time = $rs->getFloat($startcol + 5);
 
-            $this->pro_status = $rs->getString($startcol + 6);
+            $this->pro_timeunit = $rs->getString($startcol + 6);
 
-            $this->pro_type_day = $rs->getString($startcol + 7);
+            $this->pro_status = $rs->getString($startcol + 7);
 
-            $this->pro_type = $rs->getString($startcol + 8);
+            $this->pro_type_day = $rs->getString($startcol + 8);
 
-            $this->pro_assignment = $rs->getString($startcol + 9);
+            $this->pro_type = $rs->getString($startcol + 9);
 
-            $this->pro_show_map = $rs->getInt($startcol + 10);
+            $this->pro_assignment = $rs->getString($startcol + 10);
 
-            $this->pro_show_message = $rs->getInt($startcol + 11);
+            $this->pro_show_map = $rs->getInt($startcol + 11);
 
-            $this->pro_subprocess = $rs->getInt($startcol + 12);
+            $this->pro_show_message = $rs->getInt($startcol + 12);
 
-            $this->pro_tri_create = $rs->getString($startcol + 13);
+            $this->pro_subprocess = $rs->getInt($startcol + 13);
 
-            $this->pro_tri_open = $rs->getString($startcol + 14);
+            $this->pro_tri_create = $rs->getString($startcol + 14);
 
-            $this->pro_tri_deleted = $rs->getString($startcol + 15);
+            $this->pro_tri_open = $rs->getString($startcol + 15);
 
-            $this->pro_tri_canceled = $rs->getString($startcol + 16);
+            $this->pro_tri_deleted = $rs->getString($startcol + 16);
 
-            $this->pro_tri_paused = $rs->getString($startcol + 17);
+            $this->pro_tri_canceled = $rs->getString($startcol + 17);
 
-            $this->pro_tri_reassigned = $rs->getString($startcol + 18);
+            $this->pro_tri_paused = $rs->getString($startcol + 18);
 
-            $this->pro_tri_unpaused = $rs->getString($startcol + 19);
+            $this->pro_tri_reassigned = $rs->getString($startcol + 19);
 
-            $this->pro_type_process = $rs->getString($startcol + 20);
+            $this->pro_tri_unpaused = $rs->getString($startcol + 20);
 
-            $this->pro_show_delegate = $rs->getInt($startcol + 21);
+            $this->pro_type_process = $rs->getString($startcol + 21);
 
-            $this->pro_show_dynaform = $rs->getInt($startcol + 22);
+            $this->pro_show_delegate = $rs->getInt($startcol + 22);
 
-            $this->pro_category = $rs->getString($startcol + 23);
+            $this->pro_show_dynaform = $rs->getInt($startcol + 23);
 
-            $this->pro_sub_category = $rs->getString($startcol + 24);
+            $this->pro_category = $rs->getString($startcol + 24);
 
-            $this->pro_industry = $rs->getInt($startcol + 25);
+            $this->pro_sub_category = $rs->getString($startcol + 25);
 
-            $this->pro_update_date = $rs->getTimestamp($startcol + 26, null);
+            $this->pro_industry = $rs->getInt($startcol + 26);
 
-            $this->pro_create_date = $rs->getTimestamp($startcol + 27, null);
+            $this->pro_update_date = $rs->getTimestamp($startcol + 27, null);
 
-            $this->pro_create_user = $rs->getString($startcol + 28);
+            $this->pro_create_date = $rs->getTimestamp($startcol + 28, null);
 
-            $this->pro_height = $rs->getInt($startcol + 29);
+            $this->pro_create_user = $rs->getString($startcol + 29);
 
-            $this->pro_width = $rs->getInt($startcol + 30);
+            $this->pro_height = $rs->getInt($startcol + 30);
 
-            $this->pro_title_x = $rs->getInt($startcol + 31);
+            $this->pro_width = $rs->getInt($startcol + 31);
 
-            $this->pro_title_y = $rs->getInt($startcol + 32);
+            $this->pro_title_x = $rs->getInt($startcol + 32);
 
-            $this->pro_debug = $rs->getInt($startcol + 33);
+            $this->pro_title_y = $rs->getInt($startcol + 33);
 
-            $this->pro_dynaforms = $rs->getString($startcol + 34);
+            $this->pro_debug = $rs->getInt($startcol + 34);
 
-            $this->pro_derivation_screen_tpl = $rs->getString($startcol + 35);
+            $this->pro_dynaforms = $rs->getString($startcol + 35);
 
-            $this->pro_cost = $rs->getFloat($startcol + 36);
+            $this->pro_derivation_screen_tpl = $rs->getString($startcol + 36);
 
-            $this->pro_unit_cost = $rs->getString($startcol + 37);
+            $this->pro_cost = $rs->getFloat($startcol + 37);
 
-            $this->pro_itee = $rs->getInt($startcol + 38);
+            $this->pro_unit_cost = $rs->getString($startcol + 38);
 
-            $this->pro_action_done = $rs->getString($startcol + 39);
+            $this->pro_itee = $rs->getInt($startcol + 39);
+
+            $this->pro_action_done = $rs->getString($startcol + 40);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 40; // 40 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 41; // 41 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Process object", $e);
@@ -1955,120 +1996,123 @@ abstract class BaseProcess extends BaseObject implements Persistent
                 return $this->getProUid();
                 break;
             case 1:
-                return $this->getProTitle();
+                return $this->getProId();
                 break;
             case 2:
-                return $this->getProDescription();
+                return $this->getProTitle();
                 break;
             case 3:
-                return $this->getProParent();
+                return $this->getProDescription();
                 break;
             case 4:
-                return $this->getProTime();
+                return $this->getProParent();
                 break;
             case 5:
-                return $this->getProTimeunit();
+                return $this->getProTime();
                 break;
             case 6:
-                return $this->getProStatus();
+                return $this->getProTimeunit();
                 break;
             case 7:
-                return $this->getProTypeDay();
+                return $this->getProStatus();
                 break;
             case 8:
-                return $this->getProType();
+                return $this->getProTypeDay();
                 break;
             case 9:
-                return $this->getProAssignment();
+                return $this->getProType();
                 break;
             case 10:
-                return $this->getProShowMap();
+                return $this->getProAssignment();
                 break;
             case 11:
-                return $this->getProShowMessage();
+                return $this->getProShowMap();
                 break;
             case 12:
-                return $this->getProSubprocess();
+                return $this->getProShowMessage();
                 break;
             case 13:
-                return $this->getProTriCreate();
+                return $this->getProSubprocess();
                 break;
             case 14:
-                return $this->getProTriOpen();
+                return $this->getProTriCreate();
                 break;
             case 15:
-                return $this->getProTriDeleted();
+                return $this->getProTriOpen();
                 break;
             case 16:
-                return $this->getProTriCanceled();
+                return $this->getProTriDeleted();
                 break;
             case 17:
-                return $this->getProTriPaused();
+                return $this->getProTriCanceled();
                 break;
             case 18:
-                return $this->getProTriReassigned();
+                return $this->getProTriPaused();
                 break;
             case 19:
-                return $this->getProTriUnpaused();
+                return $this->getProTriReassigned();
                 break;
             case 20:
-                return $this->getProTypeProcess();
+                return $this->getProTriUnpaused();
                 break;
             case 21:
-                return $this->getProShowDelegate();
+                return $this->getProTypeProcess();
                 break;
             case 22:
-                return $this->getProShowDynaform();
+                return $this->getProShowDelegate();
                 break;
             case 23:
-                return $this->getProCategory();
+                return $this->getProShowDynaform();
                 break;
             case 24:
-                return $this->getProSubCategory();
+                return $this->getProCategory();
                 break;
             case 25:
-                return $this->getProIndustry();
+                return $this->getProSubCategory();
                 break;
             case 26:
-                return $this->getProUpdateDate();
+                return $this->getProIndustry();
                 break;
             case 27:
-                return $this->getProCreateDate();
+                return $this->getProUpdateDate();
                 break;
             case 28:
-                return $this->getProCreateUser();
+                return $this->getProCreateDate();
                 break;
             case 29:
-                return $this->getProHeight();
+                return $this->getProCreateUser();
                 break;
             case 30:
-                return $this->getProWidth();
+                return $this->getProHeight();
                 break;
             case 31:
-                return $this->getProTitleX();
+                return $this->getProWidth();
                 break;
             case 32:
-                return $this->getProTitleY();
+                return $this->getProTitleX();
                 break;
             case 33:
-                return $this->getProDebug();
+                return $this->getProTitleY();
                 break;
             case 34:
-                return $this->getProDynaforms();
+                return $this->getProDebug();
                 break;
             case 35:
-                return $this->getProDerivationScreenTpl();
+                return $this->getProDynaforms();
                 break;
             case 36:
-                return $this->getProCost();
+                return $this->getProDerivationScreenTpl();
                 break;
             case 37:
-                return $this->getProUnitCost();
+                return $this->getProCost();
                 break;
             case 38:
-                return $this->getProItee();
+                return $this->getProUnitCost();
                 break;
             case 39:
+                return $this->getProItee();
+                break;
+            case 40:
                 return $this->getProActionDone();
                 break;
             default:
@@ -2092,45 +2136,46 @@ abstract class BaseProcess extends BaseObject implements Persistent
         $keys = ProcessPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getProUid(),
-            $keys[1] => $this->getProTitle(),
+            $keys[1] => $this->getProId(),
-            $keys[2] => $this->getProDescription(),
+            $keys[2] => $this->getProTitle(),
-            $keys[3] => $this->getProParent(),
+            $keys[3] => $this->getProDescription(),
-            $keys[4] => $this->getProTime(),
+            $keys[4] => $this->getProParent(),
-            $keys[5] => $this->getProTimeunit(),
+            $keys[5] => $this->getProTime(),
-            $keys[6] => $this->getProStatus(),
+            $keys[6] => $this->getProTimeunit(),
-            $keys[7] => $this->getProTypeDay(),
+            $keys[7] => $this->getProStatus(),
-            $keys[8] => $this->getProType(),
+            $keys[8] => $this->getProTypeDay(),
-            $keys[9] => $this->getProAssignment(),
+            $keys[9] => $this->getProType(),
-            $keys[10] => $this->getProShowMap(),
+            $keys[10] => $this->getProAssignment(),
-            $keys[11] => $this->getProShowMessage(),
+            $keys[11] => $this->getProShowMap(),
-            $keys[12] => $this->getProSubprocess(),
+            $keys[12] => $this->getProShowMessage(),
-            $keys[13] => $this->getProTriCreate(),
+            $keys[13] => $this->getProSubprocess(),
-            $keys[14] => $this->getProTriOpen(),
+            $keys[14] => $this->getProTriCreate(),
-            $keys[15] => $this->getProTriDeleted(),
+            $keys[15] => $this->getProTriOpen(),
-            $keys[16] => $this->getProTriCanceled(),
+            $keys[16] => $this->getProTriDeleted(),
-            $keys[17] => $this->getProTriPaused(),
+            $keys[17] => $this->getProTriCanceled(),
-            $keys[18] => $this->getProTriReassigned(),
+            $keys[18] => $this->getProTriPaused(),
-            $keys[19] => $this->getProTriUnpaused(),
+            $keys[19] => $this->getProTriReassigned(),
-            $keys[20] => $this->getProTypeProcess(),
+            $keys[20] => $this->getProTriUnpaused(),
-            $keys[21] => $this->getProShowDelegate(),
+            $keys[21] => $this->getProTypeProcess(),
-            $keys[22] => $this->getProShowDynaform(),
+            $keys[22] => $this->getProShowDelegate(),
-            $keys[23] => $this->getProCategory(),
+            $keys[23] => $this->getProShowDynaform(),
-            $keys[24] => $this->getProSubCategory(),
+            $keys[24] => $this->getProCategory(),
-            $keys[25] => $this->getProIndustry(),
+            $keys[25] => $this->getProSubCategory(),
-            $keys[26] => $this->getProUpdateDate(),
+            $keys[26] => $this->getProIndustry(),
-            $keys[27] => $this->getProCreateDate(),
+            $keys[27] => $this->getProUpdateDate(),
-            $keys[28] => $this->getProCreateUser(),
+            $keys[28] => $this->getProCreateDate(),
-            $keys[29] => $this->getProHeight(),
+            $keys[29] => $this->getProCreateUser(),
-            $keys[30] => $this->getProWidth(),
+            $keys[30] => $this->getProHeight(),
-            $keys[31] => $this->getProTitleX(),
+            $keys[31] => $this->getProWidth(),
-            $keys[32] => $this->getProTitleY(),
+            $keys[32] => $this->getProTitleX(),
-            $keys[33] => $this->getProDebug(),
+            $keys[33] => $this->getProTitleY(),
-            $keys[34] => $this->getProDynaforms(),
+            $keys[34] => $this->getProDebug(),
-            $keys[35] => $this->getProDerivationScreenTpl(),
+            $keys[35] => $this->getProDynaforms(),
-            $keys[36] => $this->getProCost(),
+            $keys[36] => $this->getProDerivationScreenTpl(),
-            $keys[37] => $this->getProUnitCost(),
+            $keys[37] => $this->getProCost(),
-            $keys[38] => $this->getProItee(),
+            $keys[38] => $this->getProUnitCost(),
-            $keys[39] => $this->getProActionDone(),
+            $keys[39] => $this->getProItee(),
+            $keys[40] => $this->getProActionDone(),
         );
         return $result;
     }
@@ -2166,120 +2211,123 @@ abstract class BaseProcess extends BaseObject implements Persistent
                 $this->setProUid($value);
                 break;
             case 1:
-                $this->setProTitle($value);
+                $this->setProId($value);
                 break;
             case 2:
-                $this->setProDescription($value);
+                $this->setProTitle($value);
                 break;
             case 3:
-                $this->setProParent($value);
+                $this->setProDescription($value);
                 break;
             case 4:
-                $this->setProTime($value);
+                $this->setProParent($value);
                 break;
             case 5:
-                $this->setProTimeunit($value);
+                $this->setProTime($value);
                 break;
             case 6:
-                $this->setProStatus($value);
+                $this->setProTimeunit($value);
                 break;
             case 7:
-                $this->setProTypeDay($value);
+                $this->setProStatus($value);
                 break;
             case 8:
-                $this->setProType($value);
+                $this->setProTypeDay($value);
                 break;
             case 9:
-                $this->setProAssignment($value);
+                $this->setProType($value);
                 break;
             case 10:
-                $this->setProShowMap($value);
+                $this->setProAssignment($value);
                 break;
             case 11:
-                $this->setProShowMessage($value);
+                $this->setProShowMap($value);
                 break;
             case 12:
-                $this->setProSubprocess($value);
+                $this->setProShowMessage($value);
                 break;
             case 13:
-                $this->setProTriCreate($value);
+                $this->setProSubprocess($value);
                 break;
             case 14:
-                $this->setProTriOpen($value);
+                $this->setProTriCreate($value);
                 break;
             case 15:
-                $this->setProTriDeleted($value);
+                $this->setProTriOpen($value);
                 break;
             case 16:
-                $this->setProTriCanceled($value);
+                $this->setProTriDeleted($value);
                 break;
             case 17:
-                $this->setProTriPaused($value);
+                $this->setProTriCanceled($value);
                 break;
             case 18:
-                $this->setProTriReassigned($value);
+                $this->setProTriPaused($value);
                 break;
             case 19:
-                $this->setProTriUnpaused($value);
+                $this->setProTriReassigned($value);
                 break;
             case 20:
-                $this->setProTypeProcess($value);
+                $this->setProTriUnpaused($value);
                 break;
             case 21:
-                $this->setProShowDelegate($value);
+                $this->setProTypeProcess($value);
                 break;
             case 22:
-                $this->setProShowDynaform($value);
+                $this->setProShowDelegate($value);
                 break;
             case 23:
-                $this->setProCategory($value);
+                $this->setProShowDynaform($value);
                 break;
             case 24:
-                $this->setProSubCategory($value);
+                $this->setProCategory($value);
                 break;
             case 25:
-                $this->setProIndustry($value);
+                $this->setProSubCategory($value);
                 break;
             case 26:
-                $this->setProUpdateDate($value);
+                $this->setProIndustry($value);
                 break;
             case 27:
-                $this->setProCreateDate($value);
+                $this->setProUpdateDate($value);
                 break;
             case 28:
-                $this->setProCreateUser($value);
+                $this->setProCreateDate($value);
                 break;
             case 29:
-                $this->setProHeight($value);
+                $this->setProCreateUser($value);
                 break;
             case 30:
-                $this->setProWidth($value);
+                $this->setProHeight($value);
                 break;
             case 31:
-                $this->setProTitleX($value);
+                $this->setProWidth($value);
                 break;
             case 32:
-                $this->setProTitleY($value);
+                $this->setProTitleX($value);
                 break;
             case 33:
-                $this->setProDebug($value);
+                $this->setProTitleY($value);
                 break;
             case 34:
-                $this->setProDynaforms($value);
+                $this->setProDebug($value);
                 break;
             case 35:
-                $this->setProDerivationScreenTpl($value);
+                $this->setProDynaforms($value);
                 break;
             case 36:
-                $this->setProCost($value);
+                $this->setProDerivationScreenTpl($value);
                 break;
             case 37:
-                $this->setProUnitCost($value);
+                $this->setProCost($value);
                 break;
             case 38:
-                $this->setProItee($value);
+                $this->setProUnitCost($value);
                 break;
             case 39:
+                $this->setProItee($value);
+                break;
+            case 40:
                 $this->setProActionDone($value);
                 break;
         } // switch()
@@ -2310,159 +2358,163 @@ abstract class BaseProcess extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setProTitle($arr[$keys[1]]);
+            $this->setProId($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setProDescription($arr[$keys[2]]);
+            $this->setProTitle($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setProParent($arr[$keys[3]]);
+            $this->setProDescription($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setProTime($arr[$keys[4]]);
+            $this->setProParent($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setProTimeunit($arr[$keys[5]]);
+            $this->setProTime($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setProStatus($arr[$keys[6]]);
+            $this->setProTimeunit($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setProTypeDay($arr[$keys[7]]);
+            $this->setProStatus($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setProType($arr[$keys[8]]);
+            $this->setProTypeDay($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setProAssignment($arr[$keys[9]]);
+            $this->setProType($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setProShowMap($arr[$keys[10]]);
+            $this->setProAssignment($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setProShowMessage($arr[$keys[11]]);
+            $this->setProShowMap($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setProSubprocess($arr[$keys[12]]);
+            $this->setProShowMessage($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setProTriCreate($arr[$keys[13]]);
+            $this->setProSubprocess($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setProTriOpen($arr[$keys[14]]);
+            $this->setProTriCreate($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setProTriDeleted($arr[$keys[15]]);
+            $this->setProTriOpen($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setProTriCanceled($arr[$keys[16]]);
+            $this->setProTriDeleted($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setProTriPaused($arr[$keys[17]]);
+            $this->setProTriCanceled($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setProTriReassigned($arr[$keys[18]]);
+            $this->setProTriPaused($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setProTriUnpaused($arr[$keys[19]]);
+            $this->setProTriReassigned($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setProTypeProcess($arr[$keys[20]]);
+            $this->setProTriUnpaused($arr[$keys[20]]);
         }
 
         if (array_key_exists($keys[21], $arr)) {
-            $this->setProShowDelegate($arr[$keys[21]]);
+            $this->setProTypeProcess($arr[$keys[21]]);
         }
 
         if (array_key_exists($keys[22], $arr)) {
-            $this->setProShowDynaform($arr[$keys[22]]);
+            $this->setProShowDelegate($arr[$keys[22]]);
         }
 
         if (array_key_exists($keys[23], $arr)) {
-            $this->setProCategory($arr[$keys[23]]);
+            $this->setProShowDynaform($arr[$keys[23]]);
         }
 
         if (array_key_exists($keys[24], $arr)) {
-            $this->setProSubCategory($arr[$keys[24]]);
+            $this->setProCategory($arr[$keys[24]]);
         }
 
         if (array_key_exists($keys[25], $arr)) {
-            $this->setProIndustry($arr[$keys[25]]);
+            $this->setProSubCategory($arr[$keys[25]]);
         }
 
         if (array_key_exists($keys[26], $arr)) {
-            $this->setProUpdateDate($arr[$keys[26]]);
+            $this->setProIndustry($arr[$keys[26]]);
         }
 
         if (array_key_exists($keys[27], $arr)) {
-            $this->setProCreateDate($arr[$keys[27]]);
+            $this->setProUpdateDate($arr[$keys[27]]);
         }
 
         if (array_key_exists($keys[28], $arr)) {
-            $this->setProCreateUser($arr[$keys[28]]);
+            $this->setProCreateDate($arr[$keys[28]]);
         }
 
         if (array_key_exists($keys[29], $arr)) {
-            $this->setProHeight($arr[$keys[29]]);
+            $this->setProCreateUser($arr[$keys[29]]);
         }
 
         if (array_key_exists($keys[30], $arr)) {
-            $this->setProWidth($arr[$keys[30]]);
+            $this->setProHeight($arr[$keys[30]]);
         }
 
         if (array_key_exists($keys[31], $arr)) {
-            $this->setProTitleX($arr[$keys[31]]);
+            $this->setProWidth($arr[$keys[31]]);
         }
 
         if (array_key_exists($keys[32], $arr)) {
-            $this->setProTitleY($arr[$keys[32]]);
+            $this->setProTitleX($arr[$keys[32]]);
         }
 
         if (array_key_exists($keys[33], $arr)) {
-            $this->setProDebug($arr[$keys[33]]);
+            $this->setProTitleY($arr[$keys[33]]);
         }
 
         if (array_key_exists($keys[34], $arr)) {
-            $this->setProDynaforms($arr[$keys[34]]);
+            $this->setProDebug($arr[$keys[34]]);
         }
 
         if (array_key_exists($keys[35], $arr)) {
-            $this->setProDerivationScreenTpl($arr[$keys[35]]);
+            $this->setProDynaforms($arr[$keys[35]]);
         }
 
         if (array_key_exists($keys[36], $arr)) {
-            $this->setProCost($arr[$keys[36]]);
+            $this->setProDerivationScreenTpl($arr[$keys[36]]);
         }
 
         if (array_key_exists($keys[37], $arr)) {
-            $this->setProUnitCost($arr[$keys[37]]);
+            $this->setProCost($arr[$keys[37]]);
         }
 
         if (array_key_exists($keys[38], $arr)) {
-            $this->setProItee($arr[$keys[38]]);
+            $this->setProUnitCost($arr[$keys[38]]);
         }
 
         if (array_key_exists($keys[39], $arr)) {
-            $this->setProActionDone($arr[$keys[39]]);
+            $this->setProItee($arr[$keys[39]]);
+        }
+
+        if (array_key_exists($keys[40], $arr)) {
+            $this->setProActionDone($arr[$keys[40]]);
         }
 
     }
@@ -2480,6 +2532,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
             $criteria->add(ProcessPeer::PRO_UID, $this->pro_uid);
         }
 
+        if ($this->isColumnModified(ProcessPeer::PRO_ID)) {
+            $criteria->add(ProcessPeer::PRO_ID, $this->pro_id);
+        }
+
         if ($this->isColumnModified(ProcessPeer::PRO_TITLE)) {
             $criteria->add(ProcessPeer::PRO_TITLE, $this->pro_title);
         }
@@ -2690,6 +2746,8 @@ abstract class BaseProcess extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setProId($this->pro_id);
+
         $copyObj->setProTitle($this->pro_title);
 
         $copyObj->setProDescription($this->pro_description);

workflow/engine/classes/model/om/BaseProcessPeer.php

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

workflow/engine/classes/model/om/BaseTaskPeer.php

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

workflow/engine/classes/model/om/BaseUsers.php

@@ -33,6 +33,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
      */
     protected $usr_uid = '';
 
+    /**
+     * The value for the usr_id field.
+     * @var        int
+     */
+    protected $usr_id;
+
     /**
      * The value for the usr_username field.
      * @var        string
@@ -250,6 +256,17 @@ abstract class BaseUsers extends BaseObject implements Persistent
         return $this->usr_uid;
     }
 
+    /**
+     * Get the [usr_id] column value.
+     * 
+     * @return     int
+     */
+    public function getUsrId()
+    {
+
+        return $this->usr_id;
+    }
+
     /**
      * Get the [usr_username] column value.
      * 
@@ -729,6 +746,28 @@ abstract class BaseUsers extends BaseObject implements Persistent
 
     } // setUsrUid()
 
+    /**
+     * Set the value of [usr_id] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUsrId($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->usr_id !== $v) {
+            $this->usr_id = $v;
+            $this->modifiedColumns[] = UsersPeer::USR_ID;
+        }
+
+    } // setUsrId()
+
     /**
      * Set the value of [usr_username] column.
      * 
@@ -1481,76 +1520,78 @@ abstract class BaseUsers extends BaseObject implements Persistent
 
             $this->usr_uid = $rs->getString($startcol + 0);
 
-            $this->usr_username = $rs->getString($startcol + 1);
+            $this->usr_id = $rs->getInt($startcol + 1);
 
-            $this->usr_password = $rs->getString($startcol + 2);
+            $this->usr_username = $rs->getString($startcol + 2);
 
-            $this->usr_firstname = $rs->getString($startcol + 3);
+            $this->usr_password = $rs->getString($startcol + 3);
 
-            $this->usr_lastname = $rs->getString($startcol + 4);
+            $this->usr_firstname = $rs->getString($startcol + 4);
 
-            $this->usr_email = $rs->getString($startcol + 5);
+            $this->usr_lastname = $rs->getString($startcol + 5);
 
-            $this->usr_due_date = $rs->getDate($startcol + 6, null);
+            $this->usr_email = $rs->getString($startcol + 6);
 
-            $this->usr_create_date = $rs->getTimestamp($startcol + 7, null);
+            $this->usr_due_date = $rs->getDate($startcol + 7, null);
 
-            $this->usr_update_date = $rs->getTimestamp($startcol + 8, null);
+            $this->usr_create_date = $rs->getTimestamp($startcol + 8, null);
 
-            $this->usr_status = $rs->getString($startcol + 9);
+            $this->usr_update_date = $rs->getTimestamp($startcol + 9, null);
 
-            $this->usr_country = $rs->getString($startcol + 10);
+            $this->usr_status = $rs->getString($startcol + 10);
 
-            $this->usr_city = $rs->getString($startcol + 11);
+            $this->usr_country = $rs->getString($startcol + 11);
 
-            $this->usr_location = $rs->getString($startcol + 12);
+            $this->usr_city = $rs->getString($startcol + 12);
 
-            $this->usr_address = $rs->getString($startcol + 13);
+            $this->usr_location = $rs->getString($startcol + 13);
 
-            $this->usr_phone = $rs->getString($startcol + 14);
+            $this->usr_address = $rs->getString($startcol + 14);
 
-            $this->usr_fax = $rs->getString($startcol + 15);
+            $this->usr_phone = $rs->getString($startcol + 15);
 
-            $this->usr_cellular = $rs->getString($startcol + 16);
+            $this->usr_fax = $rs->getString($startcol + 16);
 
-            $this->usr_zip_code = $rs->getString($startcol + 17);
+            $this->usr_cellular = $rs->getString($startcol + 17);
 
-            $this->dep_uid = $rs->getString($startcol + 18);
+            $this->usr_zip_code = $rs->getString($startcol + 18);
 
-            $this->usr_position = $rs->getString($startcol + 19);
+            $this->dep_uid = $rs->getString($startcol + 19);
 
-            $this->usr_resume = $rs->getString($startcol + 20);
+            $this->usr_position = $rs->getString($startcol + 20);
 
-            $this->usr_birthday = $rs->getDate($startcol + 21, null);
+            $this->usr_resume = $rs->getString($startcol + 21);
 
-            $this->usr_role = $rs->getString($startcol + 22);
+            $this->usr_birthday = $rs->getDate($startcol + 22, null);
 
-            $this->usr_reports_to = $rs->getString($startcol + 23);
+            $this->usr_role = $rs->getString($startcol + 23);
 
-            $this->usr_replaced_by = $rs->getString($startcol + 24);
+            $this->usr_reports_to = $rs->getString($startcol + 24);
 
-            $this->usr_ux = $rs->getString($startcol + 25);
+            $this->usr_replaced_by = $rs->getString($startcol + 25);
 
-            $this->usr_cost_by_hour = $rs->getFloat($startcol + 26);
+            $this->usr_ux = $rs->getString($startcol + 26);
 
-            $this->usr_unit_cost = $rs->getString($startcol + 27);
+            $this->usr_cost_by_hour = $rs->getFloat($startcol + 27);
 
-            $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 28);
+            $this->usr_unit_cost = $rs->getString($startcol + 28);
 
-            $this->usr_bookmark_start_cases = $rs->getString($startcol + 29);
+            $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 29);
 
-            $this->usr_time_zone = $rs->getString($startcol + 30);
+            $this->usr_bookmark_start_cases = $rs->getString($startcol + 30);
 
-            $this->usr_default_lang = $rs->getString($startcol + 31);
+            $this->usr_time_zone = $rs->getString($startcol + 31);
 
-            $this->usr_last_login = $rs->getTimestamp($startcol + 32, null);
+            $this->usr_default_lang = $rs->getString($startcol + 32);
+
+            $this->usr_last_login = $rs->getTimestamp($startcol + 33, null);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 33; // 33 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 34; // 34 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Users object", $e);
@@ -1758,99 +1799,102 @@ abstract class BaseUsers extends BaseObject implements Persistent
                 return $this->getUsrUid();
                 break;
             case 1:
-                return $this->getUsrUsername();
+                return $this->getUsrId();
                 break;
             case 2:
-                return $this->getUsrPassword();
+                return $this->getUsrUsername();
                 break;
             case 3:
-                return $this->getUsrFirstname();
+                return $this->getUsrPassword();
                 break;
             case 4:
-                return $this->getUsrLastname();
+                return $this->getUsrFirstname();
                 break;
             case 5:
-                return $this->getUsrEmail();
+                return $this->getUsrLastname();
                 break;
             case 6:
-                return $this->getUsrDueDate();
+                return $this->getUsrEmail();
                 break;
             case 7:
-                return $this->getUsrCreateDate();
+                return $this->getUsrDueDate();
                 break;
             case 8:
-                return $this->getUsrUpdateDate();
+                return $this->getUsrCreateDate();
                 break;
             case 9:
-                return $this->getUsrStatus();
+                return $this->getUsrUpdateDate();
                 break;
             case 10:
-                return $this->getUsrCountry();
+                return $this->getUsrStatus();
                 break;
             case 11:
-                return $this->getUsrCity();
+                return $this->getUsrCountry();
                 break;
             case 12:
-                return $this->getUsrLocation();
+                return $this->getUsrCity();
                 break;
             case 13:
-                return $this->getUsrAddress();
+                return $this->getUsrLocation();
                 break;
             case 14:
-                return $this->getUsrPhone();
+                return $this->getUsrAddress();
                 break;
             case 15:
-                return $this->getUsrFax();
+                return $this->getUsrPhone();
                 break;
             case 16:
-                return $this->getUsrCellular();
+                return $this->getUsrFax();
                 break;
             case 17:
-                return $this->getUsrZipCode();
+                return $this->getUsrCellular();
                 break;
             case 18:
-                return $this->getDepUid();
+                return $this->getUsrZipCode();
                 break;
             case 19:
-                return $this->getUsrPosition();
+                return $this->getDepUid();
                 break;
             case 20:
-                return $this->getUsrResume();
+                return $this->getUsrPosition();
                 break;
             case 21:
-                return $this->getUsrBirthday();
+                return $this->getUsrResume();
                 break;
             case 22:
-                return $this->getUsrRole();
+                return $this->getUsrBirthday();
                 break;
             case 23:
-                return $this->getUsrReportsTo();
+                return $this->getUsrRole();
                 break;
             case 24:
-                return $this->getUsrReplacedBy();
+                return $this->getUsrReportsTo();
                 break;
             case 25:
-                return $this->getUsrUx();
+                return $this->getUsrReplacedBy();
                 break;
             case 26:
-                return $this->getUsrCostByHour();
+                return $this->getUsrUx();
                 break;
             case 27:
-                return $this->getUsrUnitCost();
+                return $this->getUsrCostByHour();
                 break;
             case 28:
-                return $this->getUsrPmdriveFolderUid();
+                return $this->getUsrUnitCost();
                 break;
             case 29:
-                return $this->getUsrBookmarkStartCases();
+                return $this->getUsrPmdriveFolderUid();
                 break;
             case 30:
-                return $this->getUsrTimeZone();
+                return $this->getUsrBookmarkStartCases();
                 break;
             case 31:
-                return $this->getUsrDefaultLang();
+                return $this->getUsrTimeZone();
                 break;
             case 32:
+                return $this->getUsrDefaultLang();
+                break;
+            case 33:
                 return $this->getUsrLastLogin();
                 break;
             default:
@@ -1874,38 +1918,39 @@ abstract class BaseUsers extends BaseObject implements Persistent
         $keys = UsersPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getUsrUid(),
-            $keys[1] => $this->getUsrUsername(),
+            $keys[1] => $this->getUsrId(),
-            $keys[2] => $this->getUsrPassword(),
+            $keys[2] => $this->getUsrUsername(),
-            $keys[3] => $this->getUsrFirstname(),
+            $keys[3] => $this->getUsrPassword(),
-            $keys[4] => $this->getUsrLastname(),
+            $keys[4] => $this->getUsrFirstname(),
-            $keys[5] => $this->getUsrEmail(),
+            $keys[5] => $this->getUsrLastname(),
-            $keys[6] => $this->getUsrDueDate(),
+            $keys[6] => $this->getUsrEmail(),
-            $keys[7] => $this->getUsrCreateDate(),
+            $keys[7] => $this->getUsrDueDate(),
-            $keys[8] => $this->getUsrUpdateDate(),
+            $keys[8] => $this->getUsrCreateDate(),
-            $keys[9] => $this->getUsrStatus(),
+            $keys[9] => $this->getUsrUpdateDate(),
-            $keys[10] => $this->getUsrCountry(),
+            $keys[10] => $this->getUsrStatus(),
-            $keys[11] => $this->getUsrCity(),
+            $keys[11] => $this->getUsrCountry(),
-            $keys[12] => $this->getUsrLocation(),
+            $keys[12] => $this->getUsrCity(),
-            $keys[13] => $this->getUsrAddress(),
+            $keys[13] => $this->getUsrLocation(),
-            $keys[14] => $this->getUsrPhone(),
+            $keys[14] => $this->getUsrAddress(),
-            $keys[15] => $this->getUsrFax(),
+            $keys[15] => $this->getUsrPhone(),
-            $keys[16] => $this->getUsrCellular(),
+            $keys[16] => $this->getUsrFax(),
-            $keys[17] => $this->getUsrZipCode(),
+            $keys[17] => $this->getUsrCellular(),
-            $keys[18] => $this->getDepUid(),
+            $keys[18] => $this->getUsrZipCode(),
-            $keys[19] => $this->getUsrPosition(),
+            $keys[19] => $this->getDepUid(),
-            $keys[20] => $this->getUsrResume(),
+            $keys[20] => $this->getUsrPosition(),
-            $keys[21] => $this->getUsrBirthday(),
+            $keys[21] => $this->getUsrResume(),
-            $keys[22] => $this->getUsrRole(),
+            $keys[22] => $this->getUsrBirthday(),
-            $keys[23] => $this->getUsrReportsTo(),
+            $keys[23] => $this->getUsrRole(),
-            $keys[24] => $this->getUsrReplacedBy(),
+            $keys[24] => $this->getUsrReportsTo(),
-            $keys[25] => $this->getUsrUx(),
+            $keys[25] => $this->getUsrReplacedBy(),
-            $keys[26] => $this->getUsrCostByHour(),
+            $keys[26] => $this->getUsrUx(),
-            $keys[27] => $this->getUsrUnitCost(),
+            $keys[27] => $this->getUsrCostByHour(),
-            $keys[28] => $this->getUsrPmdriveFolderUid(),
+            $keys[28] => $this->getUsrUnitCost(),
-            $keys[29] => $this->getUsrBookmarkStartCases(),
+            $keys[29] => $this->getUsrPmdriveFolderUid(),
-            $keys[30] => $this->getUsrTimeZone(),
+            $keys[30] => $this->getUsrBookmarkStartCases(),
-            $keys[31] => $this->getUsrDefaultLang(),
+            $keys[31] => $this->getUsrTimeZone(),
-            $keys[32] => $this->getUsrLastLogin(),
+            $keys[32] => $this->getUsrDefaultLang(),
+            $keys[33] => $this->getUsrLastLogin(),
         );
         return $result;
     }
@@ -1941,99 +1986,102 @@ abstract class BaseUsers extends BaseObject implements Persistent
                 $this->setUsrUid($value);
                 break;
             case 1:
-                $this->setUsrUsername($value);
+                $this->setUsrId($value);
                 break;
             case 2:
-                $this->setUsrPassword($value);
+                $this->setUsrUsername($value);
                 break;
             case 3:
-                $this->setUsrFirstname($value);
+                $this->setUsrPassword($value);
                 break;
             case 4:
-                $this->setUsrLastname($value);
+                $this->setUsrFirstname($value);
                 break;
             case 5:
-                $this->setUsrEmail($value);
+                $this->setUsrLastname($value);
                 break;
             case 6:
-                $this->setUsrDueDate($value);
+                $this->setUsrEmail($value);
                 break;
             case 7:
-                $this->setUsrCreateDate($value);
+                $this->setUsrDueDate($value);
                 break;
             case 8:
-                $this->setUsrUpdateDate($value);
+                $this->setUsrCreateDate($value);
                 break;
             case 9:
-                $this->setUsrStatus($value);
+                $this->setUsrUpdateDate($value);
                 break;
             case 10:
-                $this->setUsrCountry($value);
+                $this->setUsrStatus($value);
                 break;
             case 11:
-                $this->setUsrCity($value);
+                $this->setUsrCountry($value);
                 break;
             case 12:
-                $this->setUsrLocation($value);
+                $this->setUsrCity($value);
                 break;
             case 13:
-                $this->setUsrAddress($value);
+                $this->setUsrLocation($value);
                 break;
             case 14:
-                $this->setUsrPhone($value);
+                $this->setUsrAddress($value);
                 break;
             case 15:
-                $this->setUsrFax($value);
+                $this->setUsrPhone($value);
                 break;
             case 16:
-                $this->setUsrCellular($value);
+                $this->setUsrFax($value);
                 break;
             case 17:
-                $this->setUsrZipCode($value);
+                $this->setUsrCellular($value);
                 break;
             case 18:
-                $this->setDepUid($value);
+                $this->setUsrZipCode($value);
                 break;
             case 19:
-                $this->setUsrPosition($value);
+                $this->setDepUid($value);
                 break;
             case 20:
-                $this->setUsrResume($value);
+                $this->setUsrPosition($value);
                 break;
             case 21:
-                $this->setUsrBirthday($value);
+                $this->setUsrResume($value);
                 break;
             case 22:
-                $this->setUsrRole($value);
+                $this->setUsrBirthday($value);
                 break;
             case 23:
-                $this->setUsrReportsTo($value);
+                $this->setUsrRole($value);
                 break;
             case 24:
-                $this->setUsrReplacedBy($value);
+                $this->setUsrReportsTo($value);
                 break;
             case 25:
-                $this->setUsrUx($value);
+                $this->setUsrReplacedBy($value);
                 break;
             case 26:
-                $this->setUsrCostByHour($value);
+                $this->setUsrUx($value);
                 break;
             case 27:
-                $this->setUsrUnitCost($value);
+                $this->setUsrCostByHour($value);
                 break;
             case 28:
-                $this->setUsrPmdriveFolderUid($value);
+                $this->setUsrUnitCost($value);
                 break;
             case 29:
-                $this->setUsrBookmarkStartCases($value);
+                $this->setUsrPmdriveFolderUid($value);
                 break;
             case 30:
-                $this->setUsrTimeZone($value);
+                $this->setUsrBookmarkStartCases($value);
                 break;
             case 31:
-                $this->setUsrDefaultLang($value);
+                $this->setUsrTimeZone($value);
                 break;
             case 32:
+                $this->setUsrDefaultLang($value);
+                break;
+            case 33:
                 $this->setUsrLastLogin($value);
                 break;
         } // switch()
@@ -2064,131 +2112,135 @@ abstract class BaseUsers extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setUsrUsername($arr[$keys[1]]);
+            $this->setUsrId($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setUsrPassword($arr[$keys[2]]);
+            $this->setUsrUsername($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setUsrFirstname($arr[$keys[3]]);
+            $this->setUsrPassword($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setUsrLastname($arr[$keys[4]]);
+            $this->setUsrFirstname($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setUsrEmail($arr[$keys[5]]);
+            $this->setUsrLastname($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setUsrDueDate($arr[$keys[6]]);
+            $this->setUsrEmail($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setUsrCreateDate($arr[$keys[7]]);
+            $this->setUsrDueDate($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setUsrUpdateDate($arr[$keys[8]]);
+            $this->setUsrCreateDate($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setUsrStatus($arr[$keys[9]]);
+            $this->setUsrUpdateDate($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setUsrCountry($arr[$keys[10]]);
+            $this->setUsrStatus($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setUsrCity($arr[$keys[11]]);
+            $this->setUsrCountry($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setUsrLocation($arr[$keys[12]]);
+            $this->setUsrCity($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setUsrAddress($arr[$keys[13]]);
+            $this->setUsrLocation($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setUsrPhone($arr[$keys[14]]);
+            $this->setUsrAddress($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setUsrFax($arr[$keys[15]]);
+            $this->setUsrPhone($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setUsrCellular($arr[$keys[16]]);
+            $this->setUsrFax($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setUsrZipCode($arr[$keys[17]]);
+            $this->setUsrCellular($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setDepUid($arr[$keys[18]]);
+            $this->setUsrZipCode($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setUsrPosition($arr[$keys[19]]);
+            $this->setDepUid($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setUsrResume($arr[$keys[20]]);
+            $this->setUsrPosition($arr[$keys[20]]);
         }
 
         if (array_key_exists($keys[21], $arr)) {
-            $this->setUsrBirthday($arr[$keys[21]]);
+            $this->setUsrResume($arr[$keys[21]]);
         }
 
         if (array_key_exists($keys[22], $arr)) {
-            $this->setUsrRole($arr[$keys[22]]);
+            $this->setUsrBirthday($arr[$keys[22]]);
         }
 
         if (array_key_exists($keys[23], $arr)) {
-            $this->setUsrReportsTo($arr[$keys[23]]);
+            $this->setUsrRole($arr[$keys[23]]);
         }
 
         if (array_key_exists($keys[24], $arr)) {
-            $this->setUsrReplacedBy($arr[$keys[24]]);
+            $this->setUsrReportsTo($arr[$keys[24]]);
         }
 
         if (array_key_exists($keys[25], $arr)) {
-            $this->setUsrUx($arr[$keys[25]]);
+            $this->setUsrReplacedBy($arr[$keys[25]]);
         }
 
         if (array_key_exists($keys[26], $arr)) {
-            $this->setUsrCostByHour($arr[$keys[26]]);
+            $this->setUsrUx($arr[$keys[26]]);
         }
 
         if (array_key_exists($keys[27], $arr)) {
-            $this->setUsrUnitCost($arr[$keys[27]]);
+            $this->setUsrCostByHour($arr[$keys[27]]);
         }
 
         if (array_key_exists($keys[28], $arr)) {
-            $this->setUsrPmdriveFolderUid($arr[$keys[28]]);
+            $this->setUsrUnitCost($arr[$keys[28]]);
         }
 
         if (array_key_exists($keys[29], $arr)) {
-            $this->setUsrBookmarkStartCases($arr[$keys[29]]);
+            $this->setUsrPmdriveFolderUid($arr[$keys[29]]);
         }
 
         if (array_key_exists($keys[30], $arr)) {
-            $this->setUsrTimeZone($arr[$keys[30]]);
+            $this->setUsrBookmarkStartCases($arr[$keys[30]]);
         }
 
         if (array_key_exists($keys[31], $arr)) {
-            $this->setUsrDefaultLang($arr[$keys[31]]);
+            $this->setUsrTimeZone($arr[$keys[31]]);
         }
 
         if (array_key_exists($keys[32], $arr)) {
-            $this->setUsrLastLogin($arr[$keys[32]]);
+            $this->setUsrDefaultLang($arr[$keys[32]]);
+        }
+
+        if (array_key_exists($keys[33], $arr)) {
+            $this->setUsrLastLogin($arr[$keys[33]]);
         }
 
     }
@@ -2206,6 +2258,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
             $criteria->add(UsersPeer::USR_UID, $this->usr_uid);
         }
 
+        if ($this->isColumnModified(UsersPeer::USR_ID)) {
+            $criteria->add(UsersPeer::USR_ID, $this->usr_id);
+        }
+
         if ($this->isColumnModified(UsersPeer::USR_USERNAME)) {
             $criteria->add(UsersPeer::USR_USERNAME, $this->usr_username);
         }
@@ -2388,6 +2444,8 @@ abstract class BaseUsers extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setUsrId($this->usr_id);
+
         $copyObj->setUsrUsername($this->usr_username);
 
         $copyObj->setUsrPassword($this->usr_password);

workflow/engine/classes/model/om/BaseUsersPeer.php

@@ -25,7 +25,7 @@ abstract class BaseUsersPeer
     const CLASS_DEFAULT = 'classes.model.Users';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 33;
+    const NUM_COLUMNS = 34;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseUsersPeer
     /** the column name for the USR_UID field */
     const USR_UID = 'USERS.USR_UID';
 
+    /** the column name for the USR_ID field */
+    const USR_ID = 'USERS.USR_ID';
+
     /** the column name for the USR_USERNAME field */
     const USR_USERNAME = 'USERS.USR_USERNAME';
 
@@ -141,10 +144,10 @@ abstract class BaseUsersPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', 'UsrLastLogin', ),
+        BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrId', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', 'UsrLastLogin', ),
-        BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_USERNAME, UsersPeer::USR_PASSWORD, UsersPeer::USR_FIRSTNAME, UsersPeer::USR_LASTNAME, UsersPeer::USR_EMAIL, UsersPeer::USR_DUE_DATE, UsersPeer::USR_CREATE_DATE, UsersPeer::USR_UPDATE_DATE, UsersPeer::USR_STATUS, UsersPeer::USR_COUNTRY, UsersPeer::USR_CITY, UsersPeer::USR_LOCATION, UsersPeer::USR_ADDRESS, UsersPeer::USR_PHONE, UsersPeer::USR_FAX, UsersPeer::USR_CELLULAR, UsersPeer::USR_ZIP_CODE, UsersPeer::DEP_UID, UsersPeer::USR_POSITION, UsersPeer::USR_RESUME, UsersPeer::USR_BIRTHDAY, UsersPeer::USR_ROLE, UsersPeer::USR_REPORTS_TO, UsersPeer::USR_REPLACED_BY, UsersPeer::USR_UX, UsersPeer::USR_COST_BY_HOUR, UsersPeer::USR_UNIT_COST, UsersPeer::USR_PMDRIVE_FOLDER_UID, UsersPeer::USR_BOOKMARK_START_CASES, UsersPeer::USR_TIME_ZONE, UsersPeer::USR_DEFAULT_LANG, UsersPeer::USR_LAST_LOGIN, ),
+        BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_ID, UsersPeer::USR_USERNAME, UsersPeer::USR_PASSWORD, UsersPeer::USR_FIRSTNAME, UsersPeer::USR_LASTNAME, UsersPeer::USR_EMAIL, UsersPeer::USR_DUE_DATE, UsersPeer::USR_CREATE_DATE, UsersPeer::USR_UPDATE_DATE, UsersPeer::USR_STATUS, UsersPeer::USR_COUNTRY, UsersPeer::USR_CITY, UsersPeer::USR_LOCATION, UsersPeer::USR_ADDRESS, UsersPeer::USR_PHONE, UsersPeer::USR_FAX, UsersPeer::USR_CELLULAR, UsersPeer::USR_ZIP_CODE, UsersPeer::DEP_UID, UsersPeer::USR_POSITION, UsersPeer::USR_RESUME, UsersPeer::USR_BIRTHDAY, UsersPeer::USR_ROLE, UsersPeer::USR_REPORTS_TO, UsersPeer::USR_REPLACED_BY, UsersPeer::USR_UX, UsersPeer::USR_COST_BY_HOUR, UsersPeer::USR_UNIT_COST, UsersPeer::USR_PMDRIVE_FOLDER_UID, UsersPeer::USR_BOOKMARK_START_CASES, UsersPeer::USR_TIME_ZONE, UsersPeer::USR_DEFAULT_LANG, UsersPeer::USR_LAST_LOGIN, ),
-        BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'USR_ADDRESS', 'USR_PHONE', 'USR_FAX', 'USR_CELLULAR', 'USR_ZIP_CODE', 'DEP_UID', 'USR_POSITION', 'USR_RESUME', 'USR_BIRTHDAY', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX', 'USR_COST_BY_HOUR', 'USR_UNIT_COST', 'USR_PMDRIVE_FOLDER_UID', 'USR_BOOKMARK_START_CASES', 'USR_TIME_ZONE', 'USR_DEFAULT_LANG', 'USR_LAST_LOGIN', ),
+        BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_ID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'USR_ADDRESS', 'USR_PHONE', 'USR_FAX', 'USR_CELLULAR', 'USR_ZIP_CODE', 'DEP_UID', 'USR_POSITION', 'USR_RESUME', 'USR_BIRTHDAY', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX', 'USR_COST_BY_HOUR', 'USR_UNIT_COST', 'USR_PMDRIVE_FOLDER_UID', 'USR_BOOKMARK_START_CASES', 'USR_TIME_ZONE', 'USR_DEFAULT_LANG', 'USR_LAST_LOGIN', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, )
     );
 
     /**
@@ -154,10 +157,10 @@ abstract class BaseUsersPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrUsername' => 1, 'UsrPassword' => 2, 'UsrFirstname' => 3, 'UsrLastname' => 4, 'UsrEmail' => 5, 'UsrDueDate' => 6, 'UsrCreateDate' => 7, 'UsrUpdateDate' => 8, 'UsrStatus' => 9, 'UsrCountry' => 10, 'UsrCity' => 11, 'UsrLocation' => 12, 'UsrAddress' => 13, 'UsrPhone' => 14, 'UsrFax' => 15, 'UsrCellular' => 16, 'UsrZipCode' => 17, 'DepUid' => 18, 'UsrPosition' => 19, 'UsrResume' => 20, 'UsrBirthday' => 21, 'UsrRole' => 22, 'UsrReportsTo' => 23, 'UsrReplacedBy' => 24, 'UsrUx' => 25, 'UsrCostByHour' => 26, 'UsrUnitCost' => 27, 'UsrPmdriveFolderUid' => 28, 'UsrBookmarkStartCases' => 29, 'UsrTimeZone' => 30, 'UsrDefaultLang' => 31, 'UsrLastLogin' => 32, ),
+        BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrId' => 1, 'UsrUsername' => 2, 'UsrPassword' => 3, 'UsrFirstname' => 4, 'UsrLastname' => 5, 'UsrEmail' => 6, 'UsrDueDate' => 7, 'UsrCreateDate' => 8, 'UsrUpdateDate' => 9, 'UsrStatus' => 10, 'UsrCountry' => 11, 'UsrCity' => 12, 'UsrLocation' => 13, 'UsrAddress' => 14, 'UsrPhone' => 15, 'UsrFax' => 16, 'UsrCellular' => 17, 'UsrZipCode' => 18, 'DepUid' => 19, 'UsrPosition' => 20, 'UsrResume' => 21, 'UsrBirthday' => 22, 'UsrRole' => 23, 'UsrReportsTo' => 24, 'UsrReplacedBy' => 25, 'UsrUx' => 26, 'UsrCostByHour' => 27, 'UsrUnitCost' => 28, 'UsrPmdriveFolderUid' => 29, 'UsrBookmarkStartCases' => 30, 'UsrTimeZone' => 31, 'UsrDefaultLang' => 32, 'UsrLastLogin' => 33, ),
-        BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_USERNAME => 1, UsersPeer::USR_PASSWORD => 2, UsersPeer::USR_FIRSTNAME => 3, UsersPeer::USR_LASTNAME => 4, UsersPeer::USR_EMAIL => 5, UsersPeer::USR_DUE_DATE => 6, UsersPeer::USR_CREATE_DATE => 7, UsersPeer::USR_UPDATE_DATE => 8, UsersPeer::USR_STATUS => 9, UsersPeer::USR_COUNTRY => 10, UsersPeer::USR_CITY => 11, UsersPeer::USR_LOCATION => 12, UsersPeer::USR_ADDRESS => 13, UsersPeer::USR_PHONE => 14, UsersPeer::USR_FAX => 15, UsersPeer::USR_CELLULAR => 16, UsersPeer::USR_ZIP_CODE => 17, UsersPeer::DEP_UID => 18, UsersPeer::USR_POSITION => 19, UsersPeer::USR_RESUME => 20, UsersPeer::USR_BIRTHDAY => 21, UsersPeer::USR_ROLE => 22, UsersPeer::USR_REPORTS_TO => 23, UsersPeer::USR_REPLACED_BY => 24, UsersPeer::USR_UX => 25, UsersPeer::USR_COST_BY_HOUR => 26, UsersPeer::USR_UNIT_COST => 27, UsersPeer::USR_PMDRIVE_FOLDER_UID => 28, UsersPeer::USR_BOOKMARK_START_CASES => 29, UsersPeer::USR_TIME_ZONE => 30, UsersPeer::USR_DEFAULT_LANG => 31, UsersPeer::USR_LAST_LOGIN => 32, ),
+        BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_ID => 1, UsersPeer::USR_USERNAME => 2, UsersPeer::USR_PASSWORD => 3, UsersPeer::USR_FIRSTNAME => 4, UsersPeer::USR_LASTNAME => 5, UsersPeer::USR_EMAIL => 6, UsersPeer::USR_DUE_DATE => 7, UsersPeer::USR_CREATE_DATE => 8, UsersPeer::USR_UPDATE_DATE => 9, UsersPeer::USR_STATUS => 10, UsersPeer::USR_COUNTRY => 11, UsersPeer::USR_CITY => 12, UsersPeer::USR_LOCATION => 13, UsersPeer::USR_ADDRESS => 14, UsersPeer::USR_PHONE => 15, UsersPeer::USR_FAX => 16, UsersPeer::USR_CELLULAR => 17, UsersPeer::USR_ZIP_CODE => 18, UsersPeer::DEP_UID => 19, UsersPeer::USR_POSITION => 20, UsersPeer::USR_RESUME => 21, UsersPeer::USR_BIRTHDAY => 22, UsersPeer::USR_ROLE => 23, UsersPeer::USR_REPORTS_TO => 24, UsersPeer::USR_REPLACED_BY => 25, UsersPeer::USR_UX => 26, UsersPeer::USR_COST_BY_HOUR => 27, UsersPeer::USR_UNIT_COST => 28, UsersPeer::USR_PMDRIVE_FOLDER_UID => 29, UsersPeer::USR_BOOKMARK_START_CASES => 30, UsersPeer::USR_TIME_ZONE => 31, UsersPeer::USR_DEFAULT_LANG => 32, UsersPeer::USR_LAST_LOGIN => 33, ),
-        BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_USERNAME' => 1, 'USR_PASSWORD' => 2, 'USR_FIRSTNAME' => 3, 'USR_LASTNAME' => 4, 'USR_EMAIL' => 5, 'USR_DUE_DATE' => 6, 'USR_CREATE_DATE' => 7, 'USR_UPDATE_DATE' => 8, 'USR_STATUS' => 9, 'USR_COUNTRY' => 10, 'USR_CITY' => 11, 'USR_LOCATION' => 12, 'USR_ADDRESS' => 13, 'USR_PHONE' => 14, 'USR_FAX' => 15, 'USR_CELLULAR' => 16, 'USR_ZIP_CODE' => 17, 'DEP_UID' => 18, 'USR_POSITION' => 19, 'USR_RESUME' => 20, 'USR_BIRTHDAY' => 21, 'USR_ROLE' => 22, 'USR_REPORTS_TO' => 23, 'USR_REPLACED_BY' => 24, 'USR_UX' => 25, 'USR_COST_BY_HOUR' => 26, 'USR_UNIT_COST' => 27, 'USR_PMDRIVE_FOLDER_UID' => 28, 'USR_BOOKMARK_START_CASES' => 29, 'USR_TIME_ZONE' => 30, 'USR_DEFAULT_LANG' => 31, 'USR_LAST_LOGIN' => 32, ),
+        BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_ID' => 1, 'USR_USERNAME' => 2, 'USR_PASSWORD' => 3, 'USR_FIRSTNAME' => 4, 'USR_LASTNAME' => 5, 'USR_EMAIL' => 6, 'USR_DUE_DATE' => 7, 'USR_CREATE_DATE' => 8, 'USR_UPDATE_DATE' => 9, 'USR_STATUS' => 10, 'USR_COUNTRY' => 11, 'USR_CITY' => 12, 'USR_LOCATION' => 13, 'USR_ADDRESS' => 14, 'USR_PHONE' => 15, 'USR_FAX' => 16, 'USR_CELLULAR' => 17, 'USR_ZIP_CODE' => 18, 'DEP_UID' => 19, 'USR_POSITION' => 20, 'USR_RESUME' => 21, 'USR_BIRTHDAY' => 22, 'USR_ROLE' => 23, 'USR_REPORTS_TO' => 24, 'USR_REPLACED_BY' => 25, 'USR_UX' => 26, 'USR_COST_BY_HOUR' => 27, 'USR_UNIT_COST' => 28, 'USR_PMDRIVE_FOLDER_UID' => 29, 'USR_BOOKMARK_START_CASES' => 30, 'USR_TIME_ZONE' => 31, 'USR_DEFAULT_LANG' => 32, 'USR_LAST_LOGIN' => 33, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, )
     );
 
     /**
@@ -260,6 +263,8 @@ abstract class BaseUsersPeer
 
         $criteria->addSelectColumn(UsersPeer::USR_UID);
 
+        $criteria->addSelectColumn(UsersPeer::USR_ID);
+
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
 
         $criteria->addSelectColumn(UsersPeer::USR_PASSWORD);

workflow/engine/config/schema.xml

@@ -27,6 +27,7 @@
     <column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
     <column name="APP_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
     <column name="APP_STATUS" type="VARCHAR" size="100" required="true" default=""/>
+    <column name="APP_STATUS_ID" type="TINYINT" required="true" default="0"/>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
     <column name="APP_PROC_STATUS" type="VARCHAR" size="100" required="true" default=""/>
     <column name="APP_PROC_CODE" type="VARCHAR" size="100" required="true" default=""/>
@@ -92,11 +93,14 @@
         <parameter name="Seq_in_index" value="1"/>
       </vendor>
     </index>
+    <unique name="INDEX_APP_NUMBER">
+      <unique-column name="APP_NUMBER" />
+    </unique>
   </table>
   <table name="APP_SEQUENCE" idMethod="native">
     <column name="ID" type="INTEGER" required="true" primaryKey="true" autoIncrement="true" />
   </table>
-  <table name="APP_DELEGATION">
+  <table name="APP_DELEGATION" idMethod="native">
     <vendor type="mysql">
       <parameter name="Name" value="APP_DELEGATION"/>
       <parameter name="Engine" value="InnoDB"/>
@@ -119,6 +123,8 @@
     </vendor>
     <column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
     <column name="DEL_INDEX" type="INTEGER" required="true" primaryKey="true" default="0"/>
+    <column name="DELEGATION_ID" type="INTEGER" required="true" autoIncrement="true" unique="true"/>
+    <column name="APP_NUMBER" type="INTEGER" required="false" default="0"/>
     <column name="DEL_PREVIOUS" type="INTEGER" required="true" default="0"/>
     <column name="DEL_LAST_INDEX" type="INTEGER" required="true" default="0"/>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
@@ -141,6 +147,12 @@
     <column name="DEL_DELAYED" type="TINYINT" required="false" default="0"/>
     <column name="DEL_DATA" type="LONGVARCHAR" required="true"/>
     <column name="APP_OVERDUE_PERCENTAGE" type="DOUBLE" required="true" default="0"/>
+    <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+    <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+    <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+    <unique name="DELEGATION_ID">
+      <unique-column name="DELEGATION_ID" />
+    </unique>
     <validator column="DEL_TYPE">
       <rule name="validValues" value="NORMAL|PARALLEL" message="Please select a valid status." />
     </validator>
@@ -150,6 +162,25 @@
     <validator column="DEL_THREAD_STATUS">
       <rule name="validValues" value="CLOSED|OPEN|PAUSED" message="Please select a valid status." />
     </validator>
+    <index name="INDEX_APP_NUMBER">
+      <index-column name="APP_NUMBER"/>
+    </index>
+    <index name="INDEX_USR_ID">
+      <index-column name="USR_ID"/>
+    </index>
+    <index name="INDEX_PRO_ID">
+      <index-column name="PRO_ID"/>
+    </index>
+    <index name="INDEX_TAS_ID">
+      <index-column name="TAS_ID"/>
+    </index>
+    <index name="INDEX_USR_UID">
+      <index-column name="USR_UID"/>
+    </index>
+    <index name="INDEX_THREAD_STATUS_APP_NUMBER">
+      <index-column name="DEL_THREAD_STATUS"/>
+      <index-column name="APP_NUMBER"/>
+    </index>
   </table>
   <table name="APP_DOCUMENT">
     <vendor type="mysql">
@@ -864,7 +895,7 @@
       <rule name="validValues" value="HTML|ITEXT|JRXML|ACROFORM" message="Please select a valid Output Document Type."/>
     </validator>
   </table>
-  <table name="PROCESS">
+  <table name="PROCESS" idMethod="native">
     <vendor type="mysql">
       <parameter name="Name" value="PROCESS"/>
       <parameter name="Engine" value="InnoDB"/>
@@ -886,6 +917,7 @@
       <parameter name="Comment" value="Store process Information"/>
     </vendor>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+    <column name="PRO_ID" type="INTEGER" required="true" autoIncrement="true" unique="true"/>
     <column name="PRO_TITLE" type="LONGVARCHAR" required="true"/>
     <column name="PRO_DESCRIPTION" type="LONGVARCHAR"/>
     <column name="PRO_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
@@ -925,6 +957,9 @@
     <column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
     <column name="PRO_ITEE" type="INTEGER" required="true" default="0"/>
     <column name="PRO_ACTION_DONE" type="LONGVARCHAR" />
+    <unique name="INDEX_PRO_ID">
+      <unique-column name="PRO_ID" />
+    </unique>
     <validator column="PRO_TIMEUNIT">
       <rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/>
     </validator>
@@ -1250,7 +1285,7 @@
       <rule name="required" message="Swimlane Element type is required."/>
     </validator>
   </table>
-  <table name="TASK">
+  <table name="TASK" idMethod="native">
     <vendor type="mysql">
       <parameter name="Name" value="TASK"/>
       <parameter name="Engine" value="InnoDB"/>
@@ -1273,7 +1308,7 @@
     </vendor>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
     <column name="TAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
-
+    <column name="TAS_ID" type="INTEGER" required="true" autoIncrement="true" unique="true"/>
     <column name="TAS_TITLE" type="LONGVARCHAR" required="true"/>
     <column name="TAS_DESCRIPTION" type="LONGVARCHAR"/>
     <column name="TAS_DEF_TITLE" type="LONGVARCHAR"/>
@@ -1281,7 +1316,6 @@
     <column name="TAS_DEF_PROC_CODE" type="LONGVARCHAR"/>
     <column name="TAS_DEF_MESSAGE" type="LONGVARCHAR"/>
     <column name="TAS_DEF_DESCRIPTION" type="LONGVARCHAR"/>
-
     <column name="TAS_TYPE" type="VARCHAR" size="50" required="true" default="NORMAL"/>
     <column name="TAS_DURATION" type="DOUBLE" required="true" default="0"/>
     <column name="TAS_DELAY_TYPE" type="VARCHAR" size="30" required="true" default=""/>
@@ -1338,10 +1372,12 @@
     <column name="TAS_RECEIVE_MESSAGE_TEMPLATE" type="VARCHAR" size="100" required="true" default="alert_message.html"/>
     <column name="TAS_RECEIVE_SUBJECT_MESSAGE" type="LONGVARCHAR"/>
     <column name="TAS_RECEIVE_MESSAGE" type="LONGVARCHAR"/>
+    <unique name="INDEX_TAS_ID">
+      <unique-column name="TAS_ID" />
+    </unique>
     <index name="indexTasUid">
       <index-column name="TAS_UID"/>
     </index>
-
     <validator column="TAS_TYPE">
         <rule name="validValues" value="NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|START-TIMER-EVENT|INTERMEDIATE-CATCH-TIMER-EVENT|END-EMAIL-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT|SERVICE-TASK" message="Please set a valid value for TAS_TYPE" />
     </validator>
@@ -1518,7 +1554,7 @@
       <rule name="required" message="Type is required."/>
     </validator>
   </table>
-  <table name="USERS">
+  <table name="USERS" idMethod="native">
     <vendor type="mysql">
       <parameter name="Name" value="USERS"/>
       <parameter name="Engine" value="InnoDB"/>
@@ -1540,6 +1576,7 @@
       <parameter name="Comment" value="Users"/>
     </vendor>
     <column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+    <column name="USR_ID" type="INTEGER" required="true" autoIncrement="true" unique="true"/>
     <column name="USR_USERNAME" type="VARCHAR" size="100" required="true" default=""/>
     <column name="USR_PASSWORD" type="VARCHAR" size="128" required="true" default=""/>
     <column name="USR_FIRSTNAME" type="VARCHAR" size="50" required="true" default=""/>
@@ -1581,6 +1618,9 @@
     <column name="USR_TIME_ZONE" type="VARCHAR" size="100" default="" />
     <column name="USR_DEFAULT_LANG" type="VARCHAR" size="10" default=""/>
     <column name="USR_LAST_LOGIN" type="TIMESTAMP" required="false"/>
+    <unique name="INDEX_USR_ID">
+      <unique-column name="USR_ID" />
+    </unique>
     <index name="indexUsrUid">
       <index-column name="USR_UID"/>
     </index>
@@ -4144,6 +4184,10 @@
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_RISK_DATE" type="TIMESTAMP" required="false" />
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <column name="APP_STATUS_ID" type="TINYINT" required="false" default="0"/>
         <index name="indexUser">
           <index-column name="USR_UID"/>
           <vendor type="mysql">
@@ -4174,6 +4218,18 @@
                 <parameter name="Seq_in_index" value="1"/>
             </vendor>
         </index>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
+        <index name="INDEX_APP_STATUS_ID">
+            <index-column name="APP_STATUS_ID"/>
+        </index>
     </table>
     <table name="LIST_PARTICIPATED_HISTORY">
         <vendor type="mysql">
@@ -4216,6 +4272,9 @@
         <column name="DEL_INIT_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
         <index name="indexInboxUser">
             <index-column name="USR_UID"/>
             <index-column name="DEL_DELEGATE_DATE"/>
@@ -4226,6 +4285,15 @@
                 <parameter name="Seq_in_index" value="1"/>
             </vendor>
         </index>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
     </table>
     <table name="LIST_PARTICIPATED_LAST">
         <vendor type="mysql">
@@ -4271,6 +4339,10 @@
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
         <column name="DEL_THREAD_STATUS" type="VARCHAR" size="32" required="true" default="OPEN"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <column name="APP_STATUS_ID" type="TINYINT" required="false" default="0"/>
         <index name="usrIndex">
             <index-column name="USR_UID"/>
             <vendor type="mysql">
@@ -4280,6 +4352,24 @@
                 <parameter name="Seq_in_index" value="1"/>
             </vendor>
         </index>
+        <index name="delDelegateDate">
+            <index-column name="DEL_DELEGATE_DATE"/>
+            <vendor type="mysql">
+                <parameter name="Table" value="LIST_PARTICIPATED_LAST"/>
+                <parameter name="Non_unique" value="1"/>
+                <parameter name="Key_name" value="delDelegateDate"/>
+                <parameter name="Seq_in_index" value="1"/>
+            </vendor>
+        </index>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
     </table>
     <table name="LIST_COMPLETED">
         <vendor type="mysql">
@@ -4317,6 +4407,18 @@
         <column name="DEL_CURRENT_USR_USERNAME" type="VARCHAR" size="100" default=""/>
         <column name="DEL_CURRENT_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
         <column name="DEL_CURRENT_USR_LASTNAME" type="VARCHAR" size="50" default=""/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
         <index name="usrListCompleted">
           <index-column name="USR_UID"/>
           <vendor type="mysql">
@@ -4370,6 +4472,18 @@
         <column name="DEL_INIT_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
         <index name="indexPausedUser">
             <index-column name="USR_UID"/>
             <vendor type="mysql">
@@ -4419,6 +4533,18 @@
         <column name="DEL_INIT_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
         <index name="indexCanceledUser">
             <index-column name="USR_UID"/>
             <vendor type="mysql">
@@ -4475,6 +4601,19 @@
         <column name="DEL_INIT_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <column name="APP_STATUS_ID" type="TINYINT" required="false" default="0"/>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
     </table>
     <table name="LIST_UNASSIGNED">
         <vendor type="mysql">
@@ -4513,6 +4652,14 @@
         <column name="DEL_DELEGATE_DATE" type="TIMESTAMP" required="true"/>
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
+        <column name="PRO_ID" type="INTEGER" required="false" default="0"/>
+        <column name="TAS_ID" type="INTEGER" required="false" default="0"/>
+        <index name="INDEX_PRO_ID">
+            <index-column name="PRO_ID"/>
+        </index>
+        <index name="INDEX_TAS_ID">
+            <index-column name="TAS_ID"/>
+        </index>
     </table>
     <table name="LIST_UNASSIGNED_GROUP">
         <vendor type="mysql">
@@ -4539,6 +4686,10 @@
         <column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
         <column name="TYPE"    type="VARCHAR" size="255" required="true" primaryKey="true" default=""/>
         <column name="TYP_UID" type="VARCHAR" size="32" required="true" default=""/>
+        <column name="USR_ID" type="INTEGER" required="false" default="0"/>
+        <index name="INDEX_USR_ID">
+            <index-column name="USR_ID"/>
+        </index>
     </table>
     <table name="MESSAGE_TYPE">
         <vendor type="mysql">

workflow/engine/data/mysql/schema.sql

@@ -18,6 +18,7 @@ CREATE TABLE `APPLICATION`
 	`APP_NUMBER` INTEGER default 0 NOT NULL,
 	`APP_PARENT` VARCHAR(32) default '0' NOT NULL,
 	`APP_STATUS` VARCHAR(100) default '' NOT NULL,
+	`APP_STATUS_ID` TINYINT default 0 NOT NULL,
 	`PRO_UID` VARCHAR(32) default '' NOT NULL,
 	`APP_PROC_STATUS` VARCHAR(100) default '' NOT NULL,
 	`APP_PROC_CODE` VARCHAR(100) default '' NOT NULL,
@@ -35,6 +36,7 @@ CREATE TABLE `APPLICATION`
 	`APP_DRIVE_FOLDER_UID` VARCHAR(32) default '',
 	`APP_ROUTING_DATA` MEDIUMTEXT,
 	PRIMARY KEY (`APP_UID`),
+	UNIQUE KEY `INDEX_APP_NUMBER` (`APP_NUMBER`),
 	KEY `indexApp`(`PRO_UID`, `APP_STATUS`, `APP_UID`),
 	KEY `indexAppNumber`(`APP_NUMBER`),
 	KEY `indexAppStatus`(`APP_STATUS`),
@@ -63,6 +65,8 @@ CREATE TABLE `APP_DELEGATION`
 (
 	`APP_UID` VARCHAR(32) default '' NOT NULL,
 	`DEL_INDEX` INTEGER default 0 NOT NULL,
+	`DELEGATION_ID` INTEGER  NOT NULL AUTO_INCREMENT,
+	`APP_NUMBER` INTEGER default 0,
 	`DEL_PREVIOUS` INTEGER default 0 NOT NULL,
 	`DEL_LAST_INDEX` INTEGER default 0 NOT NULL,
 	`PRO_UID` VARCHAR(32) default '' NOT NULL,
@@ -85,7 +89,17 @@ CREATE TABLE `APP_DELEGATION`
 	`DEL_DELAYED` TINYINT default 0,
 	`DEL_DATA` MEDIUMTEXT  NOT NULL,
 	`APP_OVERDUE_PERCENTAGE` DOUBLE default 0 NOT NULL,
-	PRIMARY KEY (`APP_UID`,`DEL_INDEX`)
+	`USR_ID` INTEGER default 0,
+	`PRO_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
+	PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
+	UNIQUE KEY `DELEGATION_ID` (`DELEGATION_ID`),
+	KEY `INDEX_APP_NUMBER`(`APP_NUMBER`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`),
+	KEY `INDEX_USR_UID`(`USR_UID`),
+	KEY `INDEX_THREAD_STATUS_APP_NUMBER`(`DEL_THREAD_STATUS`, `APP_NUMBER`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Delegation a task to user';
 #-----------------------------------------------------------------------------
 #-- APP_DOCUMENT
@@ -432,6 +446,7 @@ DROP TABLE IF EXISTS `PROCESS`;
 CREATE TABLE `PROCESS`
 (
 	`PRO_UID` VARCHAR(32) default '' NOT NULL,
+	`PRO_ID` INTEGER  NOT NULL AUTO_INCREMENT,
 	`PRO_TITLE` MEDIUMTEXT  NOT NULL,
 	`PRO_DESCRIPTION` MEDIUMTEXT,
 	`PRO_PARENT` VARCHAR(32) default '0' NOT NULL,
@@ -471,7 +486,8 @@ CREATE TABLE `PROCESS`
 	`PRO_UNIT_COST` VARCHAR(50) default '',
 	`PRO_ITEE` INTEGER default 0 NOT NULL,
 	`PRO_ACTION_DONE` MEDIUMTEXT,
-	PRIMARY KEY (`PRO_UID`)
+	PRIMARY KEY (`PRO_UID`),
+	UNIQUE KEY `INDEX_PRO_ID` (`PRO_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Store process Information';
 #-----------------------------------------------------------------------------
 #-- PROCESS_OWNER
@@ -618,6 +634,7 @@ CREATE TABLE `TASK`
 (
 	`PRO_UID` VARCHAR(32) default '' NOT NULL,
 	`TAS_UID` VARCHAR(32) default '' NOT NULL,
+	`TAS_ID` INTEGER  NOT NULL AUTO_INCREMENT,
 	`TAS_TITLE` MEDIUMTEXT  NOT NULL,
 	`TAS_DESCRIPTION` MEDIUMTEXT,
 	`TAS_DEF_TITLE` MEDIUMTEXT,
@@ -682,6 +699,7 @@ CREATE TABLE `TASK`
 	`TAS_RECEIVE_SUBJECT_MESSAGE` MEDIUMTEXT,
 	`TAS_RECEIVE_MESSAGE` MEDIUMTEXT,
 	PRIMARY KEY (`TAS_UID`),
+	UNIQUE KEY `INDEX_TAS_ID` (`TAS_ID`),
 	KEY `indexTasUid`(`TAS_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Task of workflow';
 #-----------------------------------------------------------------------------
@@ -743,6 +761,7 @@ DROP TABLE IF EXISTS `USERS`;
 CREATE TABLE `USERS`
 (
 	`USR_UID` VARCHAR(32) default '' NOT NULL,
+	`USR_ID` INTEGER  NOT NULL AUTO_INCREMENT,
 	`USR_USERNAME` VARCHAR(100) default '' NOT NULL,
 	`USR_PASSWORD` VARCHAR(128) default '' NOT NULL,
 	`USR_FIRSTNAME` VARCHAR(50) default '' NOT NULL,
@@ -776,6 +795,7 @@ CREATE TABLE `USERS`
 	`USR_DEFAULT_LANG` VARCHAR(10) default '',
 	`USR_LAST_LOGIN` DATETIME,
 	PRIMARY KEY (`USR_UID`),
+	UNIQUE KEY `INDEX_USR_ID` (`USR_ID`),
 	KEY `indexUsrUid`(`USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Users';
 #-----------------------------------------------------------------------------
@@ -2339,10 +2359,18 @@ CREATE TABLE `LIST_INBOX`
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_RISK_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
+	`APP_STATUS_ID` TINYINT default 0,
 	PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
 	KEY `indexUser`(`USR_UID`),
 	KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`),
-	KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`)
+	KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`),
+	KEY `INDEX_APP_STATUS_ID`(`APP_STATUS_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Inbox list';
 #-----------------------------------------------------------------------------
 #-- LIST_PARTICIPATED_HISTORY
@@ -2373,8 +2401,14 @@ CREATE TABLE `LIST_PARTICIPATED_HISTORY`
 	`DEL_INIT_DATE` DATETIME,
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
 	PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
-	KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`)
+	KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Participated history list';
 #-----------------------------------------------------------------------------
 #-- LIST_PARTICIPATED_LAST
@@ -2408,8 +2442,16 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
 	`DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN' NOT NULL,
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
+	`APP_STATUS_ID` TINYINT default 0,
 	PRIMARY KEY (`APP_UID`,`USR_UID`,`DEL_INDEX`),
-	KEY `usrIndex`(`USR_UID`)
+	KEY `usrIndex`(`USR_UID`),
+	KEY `delDelegateDate`(`DEL_DELEGATE_DATE`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Participated last list';
 #-----------------------------------------------------------------------------
 #-- LIST_COMPLETED
@@ -2435,7 +2477,13 @@ CREATE TABLE `LIST_COMPLETED`
 	`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
 	`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
 	`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
 	PRIMARY KEY (`APP_UID`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`),
 	KEY `usrListCompleted`(`USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Completed list';
 #-----------------------------------------------------------------------------
@@ -2469,7 +2517,13 @@ CREATE TABLE `LIST_PAUSED`
 	`DEL_INIT_DATE` DATETIME,
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
 	PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`),
 	KEY `indexPausedUser`(`USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Paused list';
 #-----------------------------------------------------------------------------
@@ -2499,7 +2553,13 @@ CREATE TABLE `LIST_CANCELED`
 	`DEL_INIT_DATE` DATETIME,
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
 	PRIMARY KEY (`APP_UID`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`),
 	KEY `indexCanceledUser`(`USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Canceled list';
 #-----------------------------------------------------------------------------
@@ -2536,7 +2596,14 @@ CREATE TABLE `LIST_MY_INBOX`
 	`DEL_INIT_DATE` DATETIME,
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
-	PRIMARY KEY (`APP_UID`)
+	`PRO_ID` INTEGER default 0,
+	`USR_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
+	`APP_STATUS_ID` TINYINT default 0,
+	PRIMARY KEY (`APP_UID`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_USR_ID`(`USR_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='My Inbox list';
 #-----------------------------------------------------------------------------
 #-- LIST_UNASSIGNED
@@ -2563,7 +2630,11 @@ CREATE TABLE `LIST_UNASSIGNED`
 	`DEL_DELEGATE_DATE` DATETIME  NOT NULL,
 	`DEL_DUE_DATE` DATETIME,
 	`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
-	PRIMARY KEY (`APP_UID`,`DEL_INDEX`)
+	`PRO_ID` INTEGER default 0,
+	`TAS_ID` INTEGER default 0,
+	PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
+	KEY `INDEX_PRO_ID`(`PRO_ID`),
+	KEY `INDEX_TAS_ID`(`TAS_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Unassigned list';
 #-----------------------------------------------------------------------------
 #-- LIST_UNASSIGNED_GROUP
@@ -2578,7 +2649,9 @@ CREATE TABLE `LIST_UNASSIGNED_GROUP`
 	`USR_UID` VARCHAR(32) default '' NOT NULL,
 	`TYPE` VARCHAR(255) default '' NOT NULL,
 	`TYP_UID` VARCHAR(32) default '' NOT NULL,
-	PRIMARY KEY (`UNA_UID`,`USR_UID`,`TYPE`)
+	`USR_ID` INTEGER default 0,
+	PRIMARY KEY (`UNA_UID`,`USR_UID`,`TYPE`),
+	KEY `INDEX_USR_ID`(`USR_ID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Unassiged list';
 #-----------------------------------------------------------------------------
 #-- MESSAGE_TYPE

workflow/engine/methods/cases/casesListExtJs.php

@@ -47,10 +47,10 @@ switch ($action) {
         $urlProxy .= '?list=unassigned';
         break;
     case 'to_revise':
-        $urlProxy = 'proxyCasesList';
+        $urlProxy .= '?list=inbox';
         break;
     case 'to_reassign':
-        $urlProxy = 'proxyCasesList';
+        $urlProxy .= '?list=inbox';
         break;
 }
 /*----------------------------------********---------------------------------*/
@@ -139,8 +139,6 @@ if ($action == "todo" || $action == "draft" || $action == "sent" || $action == "
 $processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' ));
 $status = getStatusArray( $action, $userUid );
 $category = getCategoryArray();
-$users = getUserArray( $action, $userUid );
-$allUsers = getAllUsersArray( $action );
 
 $oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy
 $oHeadPublisher->addExtJsScript( 'cases/reassignList', false );
@@ -160,8 +158,6 @@ $oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to
 $oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status
 $oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes
 $oHeadPublisher->assign( 'categoryValues', $category ); //Sending the listing of categories
-$oHeadPublisher->assign( 'userValues', $users ); //Sending the listing of users
-$oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of all users
 $oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar
 $oHeadPublisher->assign( 'enableEnterprise', $enableEnterprise ); //sending the page size
 
@@ -221,38 +217,6 @@ $oHeadPublisher->assign( 'openReassignCallback', $jsFunction );
 
 G::RenderPage( 'publish', 'extJs' );
 
-function getUserArray ($action, $userUid)
-{
-    global $oAppCache;
-    $status = array ();
-
-    $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" ));
-    $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" ));
-
-    //now get users, just for the Search action
-    switch ($action) {
-        case 'search_simple':
-        case 'search':
-            $cUsers = new Criteria( 'workflow' );
-            $cUsers->clearSelectColumns();
-            $cUsers->addSelectColumn( UsersPeer::USR_UID );
-            $cUsers->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-            $cUsers->addSelectColumn( UsersPeer::USR_LASTNAME );
-            $oDataset = UsersPeer::doSelectRS( $cUsers );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-            while ($aRow = $oDataset->getRow()) {
-                $users[] = array ($aRow['USR_UID'],$aRow['USR_LASTNAME'] . ' ' . $aRow['USR_FIRSTNAME']);
-                $oDataset->next();
-            }
-            break;
-        default:
-            return $users;
-            break;
-    }
-    return $users;
-}
-
 function getCategoryArray ()
 {
     global $oAppCache;
@@ -276,45 +240,18 @@ function getCategoryArray ()
     return $category;
 }
 
-function getAllUsersArray ($action)
-{
-    global $oAppCache;
-    $status = array ();
-    $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" )
-    );
-    $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" )
-    );
-
-    if ($action == 'to_reassign') {
-        //now get users, just for the Search action
-        $cUsers = $oAppCache->getToReassignListCriteria(null);
-        $cUsers->addSelectColumn( AppCacheViewPeer::USR_UID );
-
-        if (g::MySQLSintaxis()) {
-            $cUsers->addGroupByColumn( AppCacheViewPeer::USR_UID );
-        }
-
-        $cUsers->addAscendingOrderByColumn( AppCacheViewPeer::APP_CURRENT_USER );
-        $oDataset = AppCacheViewPeer::doSelectRS( $cUsers , Propel::getDbConnection('workflow_ro') );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $oDataset->next();
-        while ($aRow = $oDataset->getRow()) {
-            $users[] = array ($aRow['USR_UID'],$aRow['APP_CURRENT_USER']);
-            $oDataset->next();
-        }
-    }
-    return $users;
-}
-
 function getStatusArray($action, $userUid)
 {
     $status = array();
+    $aStatus = Application::$app_status_values;
     $status[] = array('', G::LoadTranslation('ID_ALL_STATUS'));
-    $status[] = array('COMPLETED', G::LoadTranslation('ID_CASES_STATUS_COMPLETED'));
+    foreach ($aStatus as $key => $value) {
-    $status[] = array('DRAFT', G::LoadTranslation('ID_CASES_STATUS_DRAFT'));
+        if ($action == 'search') {
-    $status[] = array('TO_DO', G::LoadTranslation('ID_CASES_STATUS_TO_DO'));
+            $status[] =  array ($value, G::LoadTranslation( 'ID_CASES_STATUS_' . $key ));
-    $status[] = array('CANCELLED', G::LoadTranslation('ID_CASES_STATUS_CANCELLED'));
+        } else {
-
+            $status[] =  array ($key, G::LoadTranslation( 'ID_CASES_STATUS_' . $key ));
+        }
+    }
     return $status;
 }
 

workflow/engine/methods/cases/casesList_Ajax.php

@@ -28,16 +28,6 @@ if (!isset($_SESSION['USER_LOGGED'])) {
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-/*require_once 'classes/model/Application.php';
-require_once 'classes/model/Users.php';
-require_once 'classes/model/AppThread.php';
-require_once 'classes/model/AppDelay.php';
-require_once 'classes/model/Process.php';
-require_once 'classes/model/Task.php';
-require_once ("classes/model/AppCacheView.php");
-require_once ("classes/model/AppDelegation.php");
-require_once ("classes/model/AdditionalTables.php");
-require_once ("classes/model/AppDelay.php");*/
 G::LoadClass( 'case' );
 
 $actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null;
@@ -53,27 +43,29 @@ function filterUserListArray($users = array(), $filter = '')
     return $filteredUsers;
 }
 
+//Load the suggest list of users
 if ($actionAjax == "userValues") {
-    //global $oAppCache;
-    $oAppCache = new AppCacheView();
     $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : null;
     $query = isset( $_REQUEST['query'] ) ? $_REQUEST['query'] : null;
-    $users = array();
+
-    $users[] = array ("USR_UID" => "", "USR_FULLNAME" => G::LoadTranslation( "ID_ALL_USERS" ));
-    $users[] = array ("USR_UID" => "CURRENT_USER", "USR_FULLNAME" => G::LoadTranslation( "ID_CURRENT_USER" ));
-    $users = filterUserListArray($users, $query);
-    //now get users, just for the Search action
-    switch ($action) {
-        case 'to_reassign':
     G::LoadClass("configuration");
     $conf = new Configurations();
     $confEnvSetting = $conf->getFormats();
+    $users = array();
     $cUsers = new Criteria('workflow');
     $cUsers->clearSelectColumns();
-            $cUsers->addSelectColumn(UsersPeer::USR_UID);
     $cUsers->addSelectColumn(UsersPeer::USR_USERNAME);
     $cUsers->addSelectColumn(UsersPeer::USR_FIRSTNAME);
     $cUsers->addSelectColumn(UsersPeer::USR_LASTNAME);
+    switch ($action) {
+        case 'to_reassign':
+            $cUsers->addSelectColumn(UsersPeer::USR_UID);
+            break;
+        case 'search_simple':
+        case 'search':
+            $cUsers->addSelectColumn(UsersPeer::USR_ID);
+            break;
+    }
     $cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
     if (!is_null($query)) {
         $filters = $cUsers->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $query . '%', Criteria::LIKE)->addOr(
@@ -89,49 +81,13 @@ if ($actionAjax == "userValues") {
     while ($oDataset->next()) {
         $row = $oDataset->getRow();
         $usrFullName = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]);
+        if ($action === 'search') {
+            //Only for the advanced search we used the USR_ID column
+            $users[] = array("USR_UID" => $row["USR_ID"], "USR_FULLNAME" => $usrFullName);
+        } else {
             $users[] = array("USR_UID" => $row["USR_UID"], "USR_FULLNAME" => $usrFullName);
         }
-            break;
-        case 'search_simple':
-        case 'search':
-            G::LoadClass("configuration");
-
-            $conf = new Configurations();
-
-            $confEnvSetting = $conf->getFormats();
-
-            $cUsers = new Criteria('workflow');
-            $cUsers->clearSelectColumns();
-            $cUsers->addSelectColumn(UsersPeer::USR_UID);
-            $cUsers->addSelectColumn(UsersPeer::USR_USERNAME);
-            $cUsers->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-            $cUsers->addSelectColumn(UsersPeer::USR_LASTNAME);
-            $cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
-
-            if (!is_null($query)) {
-                $filters = $cUsers->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%'.$query.'%', Criteria::LIKE )->addOr(
-                    $cUsers->getNewCriterion( UsersPeer::USR_LASTNAME, '%'.$query.'%', Criteria::LIKE )->addOr(
-                        $cUsers->getNewCriterion( UsersPeer::USR_USERNAME, '%'.$query.'%', Criteria::LIKE )));
-                $cUsers->addOr( $filters );
     }
-            $cUsers->setLimit(20);
-            $cUsers->addAscendingOrderByColumn(UsersPeer::TABLE_NAME . "." . $conf->userNameFormatGetFirstFieldByUsersTable());
-            $oDataset = UsersPeer::doSelectRS($cUsers);
-            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
-            while ($oDataset->next()) {
-                $row = $oDataset->getRow();
-
-                $usrFullName = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]);
-
-                $users[] = array("USR_UID" => $row["USR_UID"], "USR_FULLNAME" => $usrFullName);
-            }
-            break;
-        default:
-            return $users;
-            break;
-    }
-    //return $users;
     return print G::json_encode($users);
 }
 
@@ -152,7 +108,12 @@ if ($actionAjax == "processListExtJs") {
     $cProcess = new Criteria('workflow');
     //get the processes for this user in this action
     $cProcess->clearSelectColumns();
+    if ($action == 'search') {
+        $cProcess->addSelectColumn(ProcessPeer::PRO_ID);
+    } else {
         $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
+    }
+
     $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
     if ($categoryUid) {
         $cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid);
@@ -166,15 +127,15 @@ if ($actionAjax == "processListExtJs") {
         $cProcess->addAnd($filters);
     }
 
-    if($action==='to_revise') {
+    if ($action==='to_revise') {
         $oAppCache = new AppCacheView();
         $aProcesses = $oAppCache->getProUidSupervisor($_SESSION['USER_LOGGED']);
         $cProcess->add(ProcessPeer::PRO_UID, $aProcesses, Criteria::IN);
     }
 
-    if($action==='to_reassign') {
+    if ($action==='to_reassign') {
-        if($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
+        if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
-        } elseif($RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) {
+        } elseif ($RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) {
             $oAppCache = new AppCacheView();
             $aProcesses = $oAppCache->getProUidSupervisor($_SESSION['USER_LOGGED']);
             $cProcess->add(ProcessPeer::PRO_UID, $aProcesses, Criteria::IN);
@@ -188,6 +149,9 @@ if ($actionAjax == "processListExtJs") {
 
     while ($oDataset->next()) {
         $aRow = $oDataset->getRow();
+        if (!isset($aRow['PRO_UID'])) {
+            $aRow['PRO_UID'] = $aRow['PRO_ID'];
+        }
         $processes[] = $aRow;
     }
     return print G::json_encode($processes);
@@ -204,7 +168,7 @@ if ($actionAjax == "verifySession") {
         $response = new stdclass();
         GLOBAL $RBAC;
         //Check if the user is a supervisor to this Process
-        if($RBAC->userCanAccess('PM_REASSIGNCASE') == 1){
+        if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
             $response->reassigncase = true;
             $response->message = '';
             $response->processeslist = '';
@@ -249,6 +213,7 @@ if ($actionAjax == "getUsersToReassign") {
 
     echo G::json_encode($response);
 }
+
 if ($actionAjax == 'reassignCase') {
 
     $APP_UID = $_REQUEST["APP_UID"];
@@ -286,7 +251,6 @@ if ($actionAjax == 'reassignCase') {
 
         $caseData = $app->load($_SESSION['APPLICATION']);
         $userData = $user->load($TO_USR_UID);
-        //print_r($caseData);
         $data['APP_NUMBER'] = $caseData['APP_NUMBER'];
         $data['USER'] = $userData['USR_LASTNAME'] . ' ' . $userData['USR_FIRSTNAME']; //TODO change with the farmated username from environment conf
         $result = new stdClass();

workflow/engine/methods/cases/proxyCasesList.php

@@ -16,8 +16,10 @@ $_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
 
 //Getting the extJs parameters
 $callback = isset( $_REQUEST["callback"] ) ? $_REQUEST["callback"] : "stcCallback1001";
+//This default value was defined in casesList.js
 $dir = isset( $_REQUEST["dir"] ) ? $_REQUEST["dir"] : "DESC";
-$sort = isset( $_REQUEST["sort"] ) ? $_REQUEST["sort"] : "";
+//This default value was defined in casesList.js
+$sort = isset( $_REQUEST["sort"] ) ? $_REQUEST["sort"] : "APP_NUMBER";
 $start = isset( $_REQUEST["start"] ) ? $_REQUEST["start"] : "0";
 $limit = isset( $_REQUEST["limit"] ) ? $_REQUEST["limit"] : "25";
 $filter = isset( $_REQUEST["filter"] ) ? $_REQUEST["filter"] : "";
@@ -31,7 +33,7 @@ $action = isset( $_GET["action"] ) ? $_GET["action"] : (isset( $_REQUEST["action
 $type = isset( $_GET["type"] ) ? $_GET["type"] : (isset( $_REQUEST["type"] ) ? $_REQUEST["type"] : "extjs");
 $dateFrom = isset( $_REQUEST["dateFrom"] ) ? substr( $_REQUEST["dateFrom"], 0, 10 ) : "";
 $dateTo = isset( $_REQUEST["dateTo"] ) ? substr( $_REQUEST["dateTo"], 0, 10 ) : "";
-$first = isset( $_REQUEST["first"] ) ? true :false;
+$first = isset( $_REQUEST["first"] ) ? true : false;
 $openApplicationUid = (isset($_REQUEST['openApplicationUid']) && $_REQUEST['openApplicationUid'] != '')?
     $_REQUEST['openApplicationUid'] : null;
 
@@ -107,37 +109,26 @@ try {
             $sort,
             $category
         );
-
-        $data['data'] = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($data['data']);
-
-        $result = G::json_encode($data);
     } else {
         G::LoadClass("applications");
 
         $apps = new Applications();
-        $data = $apps->getAll(
+        $data = $apps->searchAll(
             $userUid,
             $start,
             $limit,
-            $action,
-            $filter,
             $search,
             $process,
             $filterStatus,
-            $type,
-            $dateFrom,
-            $dateTo,
-            $callback,
             $dir,
-            (strpos($sort, ".") !== false)? $sort : "APP_CACHE_VIEW." . $sort,
+            $sort,
-            $category
+            $category,
+            $dateFrom,
+            $dateTo
         );
-
-        $data['data'] = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($data['data']);
-
-        $result = G::json_encode($data);
     }
-
+    $data['data'] = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($data['data']);
+    $result = G::json_encode($data);
     echo $result;
 } catch (Exception $e) {
     $msg = array("error" => $e->getMessage());

workflow/engine/methods/cases/proxyNewCasesList.php

@@ -13,25 +13,33 @@ $filter = new InputFilter();
 
 try {
     $userUid = $_SESSION['USER_LOGGED'];
-    $filters['paged']    = isset( $_REQUEST["paged"] ) ? $filter->sanitizeInputValue($_REQUEST["paged"], 'nosql') : true;
+    $filters['paged'] = isset($_REQUEST["paged"]) ? $filter->sanitizeInputValue($_REQUEST["paged"], 'nosql') : true;
-    $filters['count']    = isset( $_REQUEST['count'] ) ? $filter->sanitizeInputValue($_REQUEST["count"], 'nosql') : true;
+    $filters['count'] = isset($_REQUEST['count']) ? $filter->sanitizeInputValue($_REQUEST["count"], 'nosql') : true;
-    $filters['category'] = isset( $_REQUEST["category"] ) ? $filter->sanitizeInputValue($_REQUEST["category"], 'nosql') : "";
+    $filters['category'] = isset($_REQUEST["category"]) ? $filter->sanitizeInputValue($_REQUEST["category"], 'nosql') : "";
-    $filters['process']  = isset( $_REQUEST["process"] ) ? $filter->sanitizeInputValue($_REQUEST["process"], 'nosql') : "";
+    $filters['process'] = isset($_REQUEST["process"]) ? $filter->sanitizeInputValue($_REQUEST["process"], 'nosql') : "";
-    $filters['search']   = isset( $_REQUEST["search"] ) ? $filter->sanitizeInputValue($_REQUEST["search"], 'nosql') : "";
+    $filters['search'] = isset($_REQUEST["search"]) ? $filter->sanitizeInputValue($_REQUEST["search"], 'nosql') : "";
-    $filters['filter']   = isset( $_REQUEST["filter"] ) ? $filter->sanitizeInputValue($_REQUEST["filter"], 'nosql') : "";
+    $filters['filter'] = isset($_REQUEST["filter"]) ? $filter->sanitizeInputValue($_REQUEST["filter"], 'nosql') : "";
-    $filters['dateFrom'] = (!empty( $_REQUEST["dateFrom"] )) ? substr( $_REQUEST["dateFrom"], 0, 10 ) : "";
+    $filters['dateFrom'] = (!empty($_REQUEST["dateFrom"])) ? substr( $_REQUEST["dateFrom"], 0, 10 ) : "";
-    $filters['dateTo']   = (!empty( $_REQUEST["dateTo"] )) ? substr( $_REQUEST["dateTo"], 0, 10 ) : "";
+    $filters['dateTo'] = (!empty($_REQUEST["dateTo"])) ? substr( $_REQUEST["dateTo"], 0, 10 ) : "";
-
+    $filters['start'] = isset($_REQUEST["start"]) ? $filter->sanitizeInputValue($_REQUEST["start"], 'nosql') : "0";
-    $filters['start']    = isset( $_REQUEST["start"] ) ? $filter->sanitizeInputValue($_REQUEST["start"], 'nosql') : "0";
+    $filters['limit'] = isset($_REQUEST["limit"]) ? $filter->sanitizeInputValue($_REQUEST["limit"], 'nosql') : "25";
-    $filters['limit']    = isset( $_REQUEST["limit"] ) ? $filter->sanitizeInputValue($_REQUEST["limit"], 'nosql') : "25";
     $filters['sort'] = (isset($_REQUEST['sort']))? (($_REQUEST['sort'] == 'APP_STATUS_LABEL')? 'APP_STATUS' : $filter->sanitizeInputValue($_REQUEST["sort"], 'nosql')) : '';
-    $filters['dir']      = isset( $_REQUEST["dir"] ) ? $filter->sanitizeInputValue($_REQUEST["dir"], 'nosql') : "DESC";
+    $filters['dir'] = isset($_REQUEST["dir"]) ? $filter->sanitizeInputValue($_REQUEST["dir"], 'nosql') : "DESC";
+    $filters['action'] = isset($_REQUEST["action"]) ? $filter->sanitizeInputValue($_REQUEST["action"], 'nosql') : "";
+    $filters['user'] = isset($_REQUEST["user"]) ? $filter->sanitizeInputValue($_REQUEST["user"], 'nosql') : "";
+    $listName = isset($_REQUEST["list"]) ? $filter->sanitizeInputValue($_REQUEST["list"], 'nosql') : "inbox";
+    $filters['filterStatus'] = isset($_REQUEST["filterStatus"]) ? $filter->sanitizeInputValue($_REQUEST["filterStatus"], 'nosql') : "";
+    $openApplicationUid = (isset($_REQUEST['openApplicationUid']) && $_REQUEST['openApplicationUid'] != '') ? $_REQUEST['openApplicationUid'] : null;
 
-    $filters['action']   = isset( $_REQUEST["action"] ) ? $filter->sanitizeInputValue($_REQUEST["action"], 'nosql') : "";
+    //Define user when is reassign
-    $listName            = isset( $_REQUEST["list"] ) ? $filter->sanitizeInputValue($_REQUEST["list"], 'nosql') : "inbox";
+    if ($filters['action'] == 'to_reassign') {
-    $filters['filterStatus']   = isset( $_REQUEST["filterStatus"] ) ? $filter->sanitizeInputValue($_REQUEST["filterStatus"], 'nosql') : "";
+        if ($filters['user'] == '' ) {
-    $openApplicationUid = (isset($_REQUEST['openApplicationUid']) && $_REQUEST['openApplicationUid'] != '')?
+            $userUid = '';
-        $_REQUEST['openApplicationUid'] : null;
+        }
+        if ($filters['user'] !== '' && $filters['user'] !== 'CURRENT_USER') {
+            $userUid = $filters['user'];
+        }
+    }
 
     // Select list
     switch ($listName) {
@@ -175,25 +183,12 @@ try {
         }
     );
 
-    $filtersData = array();
-    $filtersData['start']           = $filters['start'];
-    $filtersData['limit']           = $filters['limit'];
-    $filtersData['sort']            = G::toLower($filters['sort']);
-    $filtersData['dir']             = G::toLower($filters['dir']);
-    $filtersData['cat_uid']         = $filters['category'];
-    $filtersData['pro_uid']         = $filters['process'];
-    $filtersData['search']          = $filters['search'];
-    $filtersData['date_from']       = $filters['dateFrom'];
-    $filtersData['date_to']         = $filters['dateTo'];
-    $filtersData["action"]          = $filters["action"];
-    $filtersData["filterStatus"]    = $filters['filterStatus'];
-
     $response = array();
-    $response['filters']        = $filtersData;
-    $response['totalCount']     = $list->countTotal($userUid, $filtersData);
 
+    $response['filters']        = $filters;
+    $response['totalCount']     = $list->getCountList($userUid, $filters);
+    $response = $filter->xssFilterHard($response);
     $response['data'] = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($result);
-
     echo G::json_encode($response);
 } catch (Exception $e) {
     $msg = array("error" => $e->getMessage());

workflow/engine/src/ProcessMaker/BusinessModel/Lists.php

@@ -201,7 +201,7 @@ class Lists {
         }
 
         if ($total) {
-            $total = $list->countTotal($userUid, $filters);
+            $total = $list->getCountList($userUid, $filters);
             return $total;
         }
 
@@ -249,7 +249,7 @@ class Lists {
             $response['filters']        = $filtersData;
             $response['data']           = $result;
             $filtersData['action']      = $filters["action"];
-            $response['totalCount']     = $list->countTotal($userUid, $filtersData);
+            $response['totalCount']     = $list->getCountList($userUid, $filtersData);
         } else {
             $response = $result;
         }
@@ -267,8 +267,8 @@ class Lists {
         $response = array();
         foreach ($list as $listObject => $item) {
             switch ($listObject) {
-                case 'ListInbox':
+                case 'ListDraft':
-                    $total = $this->$listObject->getCountList($userId, 'TO_DO');
+                    $total = $this->$listObject->getCountList($userId, array('action'=>'draft'));
                     array_push($response, (array('count' => $total, 'item' => $item)));
                     break;
                 /*----------------------------------********---------------------------------*/

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php

@@ -36,7 +36,7 @@ class ProcessDefinitionMigrator implements Importable, Exportable
     {
         try {
             //Bpmn elements
-            $pjrUid = $this->bpmn->createFromStruct($data['bpmn'], false);
+            $pjrUid = $this->bpmn->createFromStruct($data['bpmn'], false, $data);
             //Import workflow elements
         } catch (\Exception $e) {
             $exception = new ImportException($e->getMessage());

workflow/engine/src/ProcessMaker/Importer/Importer.php

@@ -235,6 +235,9 @@ abstract class Importer
         $this->importData["tables"]["bpmn"]["project"][0]["prj_name"] = $name;
         $this->importData["tables"]["bpmn"]["diagram"][0]["dia_name"] = $name;
         $this->importData["tables"]["bpmn"]["process"][0]["pro_name"] = $name;
+        if (!empty($this->importData["tables"]["workflow"]["process"][0]['PRO_ID'])) {
+            $this->importData["tables"]["bpmn"]["process"][0]["pro_id"] = $this->importData["tables"]["workflow"]["process"][0]['PRO_ID'];
+        }
         $this->importData["tables"]["workflow"]["process"][0]["PRO_TITLE"] = $name;
 
         if ($this->importData["tables"]["workflow"]["process"][0]["PRO_UPDATE_DATE"] . "" == "") {
@@ -363,6 +366,10 @@ abstract class Importer
     public function removeProject($onlyDiagram = false)
     {
         /* @var $process \Process */
+        $processes = new \Processes();
+        $this->importData["tables"]["workflow"] = $processes
+            ->loadIdsFromData($this->importData["tables"]["workflow"]);
+
         $process = new \Process();
         $process->load($this->metadata["uid"]);
         $this->currentProcessTitle = $process->getProTitle();

workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php

@@ -86,6 +86,10 @@ class BpmnWorkflow extends Project\Bpmn
                 $wpData["PRO_CATEGORY"] = $data["PRJ_CATEGORY"];
             }
 
+            if (array_key_exists("PRO_ID", $data)) {
+                $wpData["PRO_ID"] = $data["PRO_ID"];
+            }
+
             $this->wp = new Project\Workflow();
             $this->wp->create($wpData);
 
@@ -131,7 +135,6 @@ class BpmnWorkflow extends Project\Bpmn
         }
 
         $arrayData["PRO_UPDATE_DATE"] = date("Y-m-d H:i:s");
-
         $this->wp->update($arrayData);
     }
 
@@ -185,6 +188,9 @@ class BpmnWorkflow extends Project\Bpmn
 
         $actUid = parent::addActivity($data);
         $taskData["TAS_UID"] = $actUid;
+        if (!empty($data["TAS_ID"])) {
+            $taskData["TAS_ID"] = $data["TAS_ID"];
+        }
 
         if (array_key_exists("ACT_NAME", $data)) {
             $taskData["TAS_TITLE"] = $data["ACT_NAME"];
@@ -1254,7 +1260,7 @@ class BpmnWorkflow extends Project\Bpmn
         $this->wp->remove($flagRemoveCases, $onlyDiagram);
     }
 
-    public static function createFromStruct(array $projectData, $generateUid = true)
+    public static function createFromStruct(array $projectData, $generateUid = true, $allData = null)
     {
         $projectData["prj_name"] = trim($projectData["prj_name"]);
         if ($projectData["prj_name"] == '') {
@@ -1300,6 +1306,10 @@ class BpmnWorkflow extends Project\Bpmn
             $data["PRJ_CATEGORY"] = $projectData["prj_category"];
         }
 
+        if (isset($projectData["process"]["pro_id"])) {
+            $data["PRO_ID"] = $projectData["process"]["pro_id"];
+        }
+
         $bwp->create($data);
 
         $diagramData = $processData = array();
@@ -1329,7 +1339,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         $bwp->addProcess($processData);
 
-        $mappedUid = array_merge($result, self::updateFromStruct($bwp->prjUid, $projectData, $generateUid, true));
+        $mappedUid = array_merge($result, self::updateFromStruct($bwp->prjUid, $projectData, $generateUid, true, $allData));
 
         return $generateUid ? $mappedUid : $bwp->getUid();
     }
@@ -1456,10 +1466,15 @@ class BpmnWorkflow extends Project\Bpmn
      *
      * @param $prjUid
      * @param $projectData
+     * @param $allData All data from import file
      * @return array
      */
-    public static function updateFromStruct($prjUid, $projectData, $generateUid = true, $forceInsert = false)
+    public static function updateFromStruct(
-    {
+        $prjUid, $projectData,
+        $generateUid = true,
+        $forceInsert = false,
+        $allData = null
+    ) {
         $diagram = isset($projectData["diagrams"]) && isset($projectData["diagrams"][0]) ? $projectData["diagrams"][0] : array();
         $diagram["activities"] = isset($diagram["activities"])? $diagram["activities"]: array();
         $diagram["artifacts"]  = isset($diagram["artifacts"])? $diagram["artifacts"]: array();
@@ -1614,6 +1629,13 @@ class BpmnWorkflow extends Project\Bpmn
                         "old_uid" => $uidOld,
                         "new_uid" => $activityData["ACT_UID"]
                     );
+                } elseif (!empty($allData['workflow']['tasks']) && is_array($allData['workflow']['tasks'])) {
+                    foreach ($allData['workflow']['tasks'] as $task) {
+                        if (!empty($task['TAS_ID']) && $activityData["ACT_UID"] === $task['TAS_UID']) {
+                            $activityData["TAS_ID"] = $task['TAS_ID'];
+                            break;
+                        }
+                    }
                 }
 
                 $bwp->addActivity($activityData);

workflow/engine/templates/cases/casesList.js

@@ -843,7 +843,7 @@ Ext.onReady ( function() {
         reader: readerCasesList,
         writer: writerCasesList,  // <-- plug a DataWriter into the store just as you would a Reader
         autoSave: true, // <-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton.
-        sortInfo:{field: 'APP_CACHE_VIEW.APP_NUMBER', direction: "DESC"},
+        sortInfo:{field: 'APP_NUMBER', direction: "DESC"},
         listeners: {
             beforeload: function (store, options)
             {
@@ -1032,47 +1032,6 @@ Ext.onReady ( function() {
         }
     };
 
-    var comboAllUsers = new Ext.form.ComboBox({
-        width         : 180,
-        boxMaxWidth   : 180,
-        editable      : false,
-        displayField  : 'USR_FULLNAME',
-        valueField    : 'USR_UID',
-        //typeAhead     : true,
-        mode          : 'local',
-        forceSelection: true,
-        triggerAction: 'all',
-
-        emptyText: _('ID_EMPTY_USERS'),
-        selectOnFocus: true,
-        //getListParent: function() {
-        //  return this.el.up('.x-menu');
-        //},
-        store         : new Ext.data.ArrayStore({
-            fields: ['USR_UID','USR_FULLNAME'],
-            data  : allUsersValues
-        }),
-        listeners:{
-            scope: this,
-            'select': function() {
-                filterProcess = comboAllUsers.value;
-
-                /*if (filterProcess==''){
-                 btnSelectAll.hide();
-                 btnUnSelectAll.hide();
-                 btnReassign.hide();
-                 }
-                 else  {
-                 btnSelectAll.show();
-                 btnUnSelectAll.show();
-                 btnReassign.show();
-                 }*/
-                storeCases.setBaseParam( 'user', filterProcess);
-                //storeCases.load({params:{user: filterProcess, start : 0 , limit : pageSize}});
-            }},
-        iconCls: 'no-icon'  //use iconCls if placing within menu to shift to right side of menu
-    });
-
     var comboCategory = new Ext.form.ComboBox({
         width           : 180,
         boxMaxWidth     : 200,
@@ -2174,6 +2133,34 @@ Ext.onReady ( function() {
         items: itemToolbar
     });
 
+    var pagingToolBar;
+    if (action === 'search') {
+        pagingToolBar = new Ext.PagingToolbar({
+            pageSize: pageSize,
+            afterPageText: '',
+            store: storeCases,
+            displayInfo: true,
+            displayMsg: '',
+            emptyMsg: '',
+            listeners: {
+                afterlayout: function (toolbar, opts) {
+                    var buttons = Ext.query('em', toolbar.el.dom);
+                    //Hide the "First Page" and "Last Page" buttons
+                    buttons[0].style.display = 'none';
+                    buttons[3].style.display = 'none';
+                }
+            }
+        });
+    } else {
+        pagingToolBar = new Ext.PagingToolbar({
+            pageSize: pageSize,
+            store: storeCases,
+            displayInfo: true,
+            //displayMsg: 'Displaying items {0} - {1} of {2} ' + ' &nbsp; ' ,
+            displayMsg: _('ID_DISPLAY_ITEMS') + ' &nbsp; ',
+            emptyMsg: _('ID_DISPLAY_EMPTY')
+        })
+    }
     var mask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_LOADING')});
     // create the editor grid
     grid = new Ext.grid.GridPanel({
@@ -2212,14 +2199,7 @@ Ext.onReady ( function() {
 
         tbar: tb,
         // paging bar on the bottom
-        bbar: new Ext.PagingToolbar({
+        bbar: pagingToolBar
-            pageSize: pageSize,
-            store: storeCases,
-            displayInfo: true,
-            //displayMsg: 'Displaying items {0} - {1} of {2} ' + ' &nbsp; ' ,
-            displayMsg: _('ID_DISPLAY_ITEMS') + ' &nbsp; ',
-            emptyMsg: _('ID_DISPLAY_EMPTY')
-        })
     });
 
 
@@ -2533,7 +2513,6 @@ Ext.onReady ( function() {
     if(typeof(comboUser) != 'undefined'){
         comboUser.setValue("");
     }
-    comboAllUsers.setValue("CURRENT_USER");
 
     function reassign(){
         storeReassignCases.removeAll();