BUG 8333 "File field for each grid line" SOLVED

- New feature
- File field for each grid line
- Added "file" element in grids
- The QA team should test with:
    * Grids in mode edit/view
    * INPUT property (http://wiki.processmaker.com/index.php/2.0/Files)
    * KnowledgeTree plugin
    * And other cases
* Available from version 2.0.45

gulliver/js/grid/core/grid.js

@@ -464,6 +464,9 @@ var G_Grid = function(oForm, sGridName){
                         eval('aObjects[n].onclick = ' + onclickevn.replace(/\[1\]/g, '\[' + currentRow + '\]') + ';');
                     }
                     break;
+                  case "file":
+                      aObjects[n].value = "";
+                      break;
                 }
               }
             }
@@ -718,6 +721,10 @@ var G_Grid = function(oForm, sGridName){
     var iRow = Number(sRow);
     var iRowAux = iRow + 1;
     var lastItem = oObj.oGrid.rows.length - 2;
+    var elem2ParentNode;
+    var elem2Id   = "";
+    var elem2Name = "";
+    var elemAux;
 
     deleteRowOnDynaform(oObj, iRow);
 
@@ -725,16 +732,40 @@ var G_Grid = function(oForm, sGridName){
       for (i = 1; i < oObj.oGrid.rows[iRowAux - 1].cells.length; i++) {
         var oCell1 = oObj.oGrid.rows[iRowAux - 1].cells[i];
         var oCell2 = oObj.oGrid.rows[iRowAux].cells[i];
+
         switch (oCell1.innerHTML.replace(/^\s+|\s+$/g, '').substr(0, 6).toLowerCase()){
           case '<input':
             aObjects1 = oCell1.getElementsByTagName('input');
             aObjects2 = oCell2.getElementsByTagName('input');
+
             if (aObjects1 && aObjects2) {
-              if(aObjects1[0].type=='checkbox'){
+                switch (aObjects2[0].type) {
+                    case "file":
+                        elem2ParentNode = aObjects2[0].parentNode;
+                        elem2Id   = aObjects2[0].id;
+                        elem2Name = aObjects2[0].name;
+
+                        aObjects2[0].id = aObjects1[0].id;
+                        aObjects2[0].name = aObjects1[0].name;
+
+                        aObjects1[0].parentNode.replaceChild(aObjects2[0], aObjects1[0]);
+
+                        elemAux = document.createElement("input");
+                        elemAux.type = "file";
+                        elemAux.setAttribute("id", elem2Id);
+                        elemAux.setAttribute("name", elem2Name);
+
+                        elem2ParentNode.insertBefore(elemAux, elem2ParentNode.firstChild);
+                        break;
+                    default:
+                        if (aObjects2[0].type == "checkbox") {
                             aObjects1[0].checked = aObjects2[0].checked;
                         }
+
                         aObjects1[0].value = aObjects2[0].value;
                         aObjects1[0].className = aObjects2[0].className;
+                        break;
+                }
             }
 
             aObjects = oCell1.getElementsByTagName('div');
@@ -791,10 +822,11 @@ var G_Grid = function(oForm, sGridName){
             }
             break;
           default:
-            if (( oCell2.innerHTML.indexOf('changeValues')==111 || oCell2.innerHTML.indexOf('changeValues')==115 ) ) {
+              if ((oCell2.innerHTML.indexOf("changeValues") == 111 || oCell2.innerHTML.indexOf("changeValues") == 115)) {
                   break;
               }
-          if (oCell2.innerHTML.toLowerCase().indexOf('deletegridrow') == -1) {
+
+              if (oCell2.innerHTML.toLowerCase().indexOf("deletegridrow") == -1) {
                   oCell1.innerHTML = oCell2.innerHTML;
               }
               break;

gulliver/system/class.form.php

@@ -308,29 +308,29 @@ class Form extends XmlForm
             switch($v->type){
               case 'radiogroup':
                 $values[$k] = $newValues[$k];
-                $values["{$k}_label"] = $newValues["{$k}_label"] = $v->options[$newValues[$k]];
+                $values[$k . "_label"] = $newValues[$k . "_label"] = $v->options[$newValues[$k]];
                 break;
 
               case 'suggest':
                 $values[$k] = $newValues[$k];
-                $values["{$k}_label"] = $newValues["{$k}_label"];
+                $values[$k . "_label"] = $newValues[$k . "_label"];
                 break;
 
               case 'checkgroup':
 
               case 'listbox':
                 if ( is_array($newValues[$k]) ) {
-                  $values[$k] = $values["{$k}_label"] = '';
+                  $values[$k] = $values[$k . "_label"] = null;
                   foreach ($newValues[$k] as $i => $value) {
                     //if $value is empty continue with the next loop, because this is a not selected/checked item
                     if (trim($value) == '') {
                       continue;
                     }
 
-                    $values[$k] .= ($i != 0 ? '|': '') . $value;
+                    $values[$k] .= (($i != 0)? "|" : null) . $value;
 
                     if (isset($v->options[$value])){
-                      $values["{$k}_label"] .= ($i != 0 ? '|': '') . $v->options[$value];
+                        $values[$k . "_label"] .= (($i != 0)? "|" : null) . $v->options[$value];
                     }
                     else { // if hasn't options try execute a sql sentence
                       $query = G::replaceDataField($this->fields[$k]->sql,$newValues);
@@ -346,7 +346,7 @@ class Form extends XmlForm
                           list($rowId, $rowContent) = array_values($rs->getRow());//This to be sure that the array is numeric. Some cases when is DBArray result it returns an associative. By JHL
 
                           if ($value == $rowId){
-                            $values["{$k}_label"] .= ($i != 0 ? '|': '') . $rowContent;
+                              $values[$k . "_label"] .= (($i != 0)? "|" : null) . $rowContent;
                               break;
                           }
                         }
@@ -354,10 +354,11 @@ class Form extends XmlForm
 
                     }
                   }
-                  $newValues["{$k}_label"] = isset($values["{$k}_label"]) ? $values["{$k}_label"] : '';
+
+                  $newValues[$k . "_label"] = (isset($values[$k . "_label"]))? $values[$k . "_label"] : null;
                 } else {
                     $values[$k] = $newValues[$k];
-                  $values["{$k}_label"] = isset($newValues["{$k}_label"]) ? $newValues["{$k}_label"] : '';
+                    $values[$k . "_label"] = (isset($newValues[$k . "_label"]))? $newValues[$k . "_label"] : null;
                 }
                 break;
 
@@ -365,7 +366,7 @@ class Form extends XmlForm
                 $values[$k] = $newValues[$k];
 
                 if (isset($v->options[$newValues[$k]])){
-                  $values["{$k}_label"] = $newValues["{$k}_label"] = $v->options[$newValues[$k]];
+                    $values[$k . "_label"] = $newValues[$k . "_label"] = $v->options[$newValues[$k]];
                 }
                 else {
                   $query = G::replaceDataField($this->fields[$k]->sql,$newValues);
@@ -382,7 +383,7 @@ class Form extends XmlForm
                   while ($rs->next()) {
                     list($rowId, $rowContent) = $rs->getRow();
                     if ($newValues[$k]==$rowId){
-                      $values["{$k}_label"] = $rowContent;
+                        $values[$k . "_label"] = $rowContent;
                         break;
                     }
                   }
@@ -392,47 +393,62 @@ class Form extends XmlForm
               case 'grid':
                 foreach( $newValues[$k] as $j => $item ) {
                   if(is_array($item)){
-                    $i=0;
                     $values[$k][$j] = $this->fields[$k]->maskValue( $newValues[$k][$j], $this );
-                    foreach($item as $kk => $vv){
-
-                      //we need to know which fields are dropdowns
-                      if($this->fields[$k]->fields[$kk]->type == 'dropdown') {
+                    foreach ($item as $kk => $vv) {
+                        if ($this->fields[$k]->fields[$kk]->type != "file") {
+                            switch ($this->fields[$k]->fields[$kk]->type) {
+                                case "dropdown":
+                                    //We need to know which fields are dropdowns
                                     $values[$k][$j] = $newValues[$k][$j];
 
-                        if ($this->fields[$k]->validateValue($newValues[$k][$j], $this )){
-                          // if the dropdown has otions
-
-                          if (isset($this->fields[$k]->fields[$kk]->options[$vv])){
-                            $values[$k][$j]["{$kk}_label"] = $newValues[$k][$j][$kk . '_label'] = $this->fields[$k]->fields[$kk]->options[$vv];
-                          } else { // if hasn't options try execute a sql sentence
+                                    if ($this->fields[$k]->validateValue($newValues[$k][$j], $this)) {
+                                        //If the dropdown has otions
+                                        if (isset($this->fields[$k]->fields[$kk]->options[$vv])) {
+                                            $values[$k][$j][$kk . "_label"] = $newValues[$k][$j][$kk . "_label"] = $this->fields[$k]->fields[$kk]->options[$vv];
+                                        } else {
+                                            //If hasn't options try execute a sql sentence
                                             $query = G::replaceDataField($this->fields[$k]->fields[$kk]->sql,$values[$k][$j]);
-                            $con = Propel::getConnection($this->fields[$k]->fields[$kk]->sqlConnection!=""?$this->fields[$k]->fields[$kk]->sqlConnection:"workflow");
+                                            $con = Propel::getConnection((!empty($this->fields[$k]->fields[$kk]->sqlConnection))? $this->fields[$k]->fields[$kk]->sqlConnection : "workflow");
                                             $stmt = $con->prepareStatement($query);
 
-                            // execute just if a query was set, it should be not empty
-                            if(trim($query) == '') {
-                              continue; //if it is  empty string skip it
+                                            //Execute just if a query was set, it should be not empty
+                                            if (trim($query) == "") {
+                                                //if it is  empty string skip it
+                                                continue;
                                             }
+
                                             $rs = $stmt->executeQuery(ResultSet::FETCHMODE_NUM);
-                            while ($rs->next()){
-                              // from the query executed we only need certain elements
-                              // note added by krlos pacha carlos[at]colosa[dot]com
-                              // the following line has the correct values because the query return an associative array. Related 7945 bug
-                              list($rowId, $rowContent) = explode(',',implode(',',$rs->getRow()));
-                              if ($vv==$rowId){
-                                $values[$k][$j]["{$kk}_label"] = $newValues[$k][$j][$kk. '_label'] = $rowContent;
+
+                                            while ($rs->next()) {
+                                                //From the query executed we only need certain elements
+                                                //note added by krlos pacha carlos[at]colosa[dot]com
+                                                //the following line has the correct values because the query return an associative array. Related 7945 bug
+                                                list($rowId, $rowContent) = explode(",", implode(",", $rs->getRow()));
+
+                                                if ($vv == $rowId) {
+                                                    $values[$k][$j][$kk . "_label"] = $newValues[$k][$j][$kk. "_label"] = $rowContent;
                                                     break;
                                                 }
-                            }//end $rw->next() while
                                             }
                                         }
+                                    }
+                                    break;
+                                default:
+                                    //If there are no dropdowns previously setted and the evaluated field is not a dropdown
+                                    //only then rewritte the $values
+                                    $values[$k][$j] = $this->fields[$k]->maskValue($newValues[$k][$j], $this);
+                                    break;
+                            }
                         } else {
-                        // if there are no dropdowns previously setted and the evaluated field is not a dropdown
-                        // only then rewritte the $values
-                        $values[$k][$j] = $this->fields[$k]->maskValue( $newValues[$k][$j], $this );
+                            if (isset($_FILES["form"]["name"][$k][$j][$kk])) {
+                                $values[$k][$j][$kk] = $_FILES["form"]["name"][$k][$j][$kk];
+                            }
+
+                            if (isset($this->fields[$k]->fields[$kk]->input) && !empty($this->fields[$k]->fields[$kk]->input)) {
+                                //$_POST["INPUTS"][$k][$j][$kk] = $this->fields[$k]->fields[$kk]->input;
+                                $_POST["INPUTS"][$k][$kk] = $this->fields[$k]->fields[$kk]->input;
+                            }
                         }
-                      $i++;
                     }
                   } else {
                     $values[$k][$j] = $this->fields[$k]->maskValue( $newValues[$k][$j], $this );
@@ -447,20 +463,14 @@ class Form extends XmlForm
             }
 
           }
+        } else {
+            if (isset($_FILES["form"]["name"][$k])) {
+                $values[$k] = $_FILES["form"]["name"][$k];
             }
-        else {
-          if (isset($_FILES['form']['name'][$k])) {
-            $values[$k] = $_FILES['form']['name'][$k];
+
+            if (isset($v->input) && !empty($v->input)) {
+                $_POST["INPUTS"][$k] = $v->input;
             }
-          /**
-           * FIXED for multiple inputs documents related to file type field
-           * By Erik Amaru Ortiz <erik@colosa.com>
-           * Nov 24th, 2009
-           */
-          if ( isset($v->input) && $v->input != ''){
-            $_POST['INPUTS'][$k] = $v->input;
-          }
-          /**/
         }
       }
     }
@@ -470,6 +480,7 @@ class Form extends XmlForm
         $values[$k] = $v;
       }
     }
+
     return $values;
   }
 
@@ -570,32 +581,40 @@ class Form extends XmlForm
     return count($notPassedFields) > 0 ? $notPassedFields : false;
   }
 
-  function validateFields($data) {
-    $values = array();
-    $excludeTypes = array('submit', 'file');
-    foreach($this->fields as $k => $v) {
+    public function validateFields($data)
+    {
+        $excludeTypes = array("submit", "file");
+
+        foreach ($this->fields as $k => $v) {
             if (!in_array($v->type, $excludeTypes)) {
-        switch($v->type) {
-          case 'checkbox':
-            $data[$v->name] = isset($data[$v->name])? $data[$v->name] : $v->falseValue;
+                switch ($v->type) {
+                    case "checkbox":
+                        $data[$v->name] = (isset($data[$v->name]))? $data[$v->name] : ((isset($v->falseValue))? $v->falseValue : null);
                         break;
-          case 'grid':
-             $i = 0 ;
+                    case "grid":
+                        $i = 0;
+
                         foreach ($data[$v->name] as $dataGrid) {
-             $i++;
-               foreach ($v->fields as $dataGridInt) {
-                 switch($dataGridInt->type) {
-                   case 'checkbox':
-                     $data[$v->name][$i][$dataGridInt->name] = isset($data[$v->name][$i][$dataGridInt->name])? $data[$v->name][$i][$dataGridInt->name] : $dataGridInt->falseValue;
+                            $i = $i + 1;
+
+                            foreach ($v->fields as $gridField) {
+                                switch ($gridField->type) {
+                                    case "file":
+                                        $data[$v->name][$i][$gridField->name] = (isset($_FILES["form"]["name"][$v->name][$i][$gridField->name]))? $_FILES["form"]["name"][$v->name][$i][$gridField->name] : ((isset($gridField->falseValue))? $gridField->falseValue : null);
+                                        break;
+                                    case "checkbox":
+                                        $data[$v->name][$i][$gridField->name] = (isset($data[$v->name][$i][$gridField->name]))? $data[$v->name][$i][$gridField->name] : ((isset($gridField->falseValue))? $gridField->falseValue : null);
                                         break;
                                 }
                             }
                         }
                         break;
                     default:
+                        break;
                 }
             }
         }
+
         return $data;
     }
 }

gulliver/system/class.xmlform.php

@@ -2324,9 +2324,11 @@ class XmlForm_Field_Link extends XmlForm_Field {
  * @package gulliver.system
  * @access public
  */
-class XmlForm_Field_File extends XmlForm_Field {
-  var $required = false;
-  var $input    = '';
+class XmlForm_Field_File extends XmlForm_Field
+{
+    public $required = false;
+    public $input = null;
+
     /**
      * Function render
      * @author David S. Callizaya S. <davidsantos@colosa.com>
@@ -2334,66 +2336,99 @@ class XmlForm_Field_File extends XmlForm_Field {
      * @param string value
      * @return string
      */
-  function render($value = NULL) {
+    public function render($value=null, $owner=null, $rowId=null, $row=-1, $therow=-1)
+    {
         $permission = false;
-    $url = '';
-    if (isset($_SESSION['APPLICATION']) && isset($_SESSION['USER_LOGGED']) && isset($_SESSION['TASK']) && $this->mode == 'view') {
+        $url = null;
+
+        if (isset($_SESSION["APPLICATION"]) &&
+            isset($_SESSION["USER_LOGGED"]) &&
+            isset($_SESSION["TASK"]) &&
+            isset($this->input) && $this->input != null &&
+            $this->mode == "view"
+        ) {
             require_once ("classes/model/AppDocument.php");
-        G::LoadClass('case');
+            G::LoadClass("case");
+
             $case = new Cases();
-        $fields = $case->loadCase($_SESSION['APPLICATION']);
-        $sProcessUID = $fields['PRO_UID'];
-        $permissions = $case->getAllObjects($sProcessUID, $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
+            $arrayField = $case->loadCase($_SESSION["APPLICATION"]);
+            $arrayPermission = $case->getAllObjects($arrayField["PRO_UID"], $_SESSION["APPLICATION"], $_SESSION["TASK"], $_SESSION["USER_LOGGED"]);
 
             $criteria = new Criteria();
-        $criteria->add(AppDocumentPeer::APP_DOC_UID, $permissions['INPUT_DOCUMENTS'], Criteria::IN);
+            $criteria->add(AppDocumentPeer::APP_DOC_UID, $arrayPermission["INPUT_DOCUMENTS"], Criteria::IN);
+
+            switch ($owner->type) {
+                case "xmlform":
+                    break;
+                case "grid":
+                    $criteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $owner->name . "_" . $row . "_" . $this->name);
+                    break;
+            }
+
             $criteria->addDescendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE);
-        $dataset = AppDocumentPeer::doSelectRS($criteria);
-        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $dataset->next();
+            $rsCriteria = AppDocumentPeer::doSelectRS($criteria);
+            $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $sw = 0;
-        while (($aRow = $dataset->getRow()) && $sw == 0) {
-            if ($aRow['DOC_UID'] == $this->input) {
-                $sw = 1;
+
+            while (($rsCriteria->next()) && $sw == 0) {
+                $row = $rsCriteria->getRow();
+
+                if ($row["DOC_UID"] == $this->input) {
                     $permission = true;
-                $url = (G::is_https() ? 'https://' : 'http://') .
-                $_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/cases_ShowDocument?a='.
-                $aRow['APP_DOC_UID'].'&v='.$aRow['DOC_VERSION'];
+                    $url = ((G::is_https())? "https://" : "http://") . $_SERVER["HTTP_HOST"] . dirname($_SERVER["REQUEST_URI"]) . "/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
+                    $sw = 1;
                 }
-            $dataset->next();
             }
         }
 
-    $mode = ($this->mode == 'view') ? ' disabled="disabled"' : '';
-    if($this->mode == 'view'){
-      $displayStyle = 'display:none;';
+        $html1 = null;
+        $html2 = null;
+        $mode  = ($this->mode == "view")? " disabled=\"disabled\"" : null;
+        $styleDisplay = null;
+
+        if ($this->mode == "view") {
             if ($permission) {
-        $html = '<a href='.$url.'>'.$value.'<input class="module_app_input___gray_file" ' . $mode .'style='.$displayStyle .' id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'file\' value=\'' . $value . '\' /></a>';
-      } else {
-        $html = $value.'<input class="module_app_input___gray_file" ' . $mode .'style='.$displayStyle .' id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'file\' value=\'' . $value . '\' />';
-      }
-    }
-    else{
-      $html = '<input class="module_app_input___gray_file" ' . $mode . 'id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'file\' value=\'' . $value . '\'/>';
+                $html1 = "<a href=\"" . $url . "\"" . (($owner->type == "grid")? " class=\"tableOption\" style=\"color: #006699; text-decoration: none; font-weight: normal;\"" : null) . ">";
+                $html2 = "</a>";
             }
 
-    if( isset($this->input) && $this->input != '') {
-      require_once 'classes/model/InputDocument.php';
-      $oiDoc = new InputDocument;
+            $html1 = $html1 . $value;
+            $styleDisplay = "display: none;";
+        }
+
+        $html = $html1 . "<input type=\"file\" id=\"form" . $rowId . "[" . $this->name . "]\" name=\"form" . $rowId . "[" . $this->name . "]\" value=\"" . $value . "\" class=\"module_app_input___gray_file\" style=\"" . $styleDisplay . "\"" . $mode . " />" . $html2;
+
+        if (isset($this->input) && $this->input != null) {
+            require_once ("classes/model/InputDocument.php");
 
             try {
-        $aDoc  = $oiDoc->load($this->input);
-        $aDoc['INP_DOC_TITLE'] = isset($aDoc['INP_DOC_TITLE'])? $aDoc['INP_DOC_TITLE']: '';
-        $html .= '<label><img src="/images/inputdocument.gif" width="22px" width="22px"/><font size="1">('.trim($aDoc['INP_DOC_TITLE']).')</font></label>';
-      }
-      catch (Exception $e) {
-        // then the input document doesn't exits, id referencial broken
-        $html .= '&nbsp;<font color="red"><img src="/images/alert_icon.gif" width="16px" width="16px"/><font size="1">('.G::loadTranslation('ID_INPUT_DOC_DOESNT_EXIST').')</font></font>';
+                $indoc = new InputDocument();
+                $aDoc = $indoc->load($this->input);
+                $aDoc["INP_DOC_TITLE"] = (isset($aDoc["INP_DOC_TITLE"]))? $aDoc["INP_DOC_TITLE"] : null;
+                $html = $html . "<label><img src=\"/images/inputdocument.gif\" width=\"22px\" width=\"22px\" alt=\"\" /><font size=\"1\">(" . trim($aDoc["INP_DOC_TITLE"]) . ")</font></label>";
+            } catch (Exception $e) {
+                //Then the input document doesn"t exits, id referencial broken
+                $html = $html . "&nbsp;<font color=\"red\"><img src=\"/images/alert_icon.gif\" width=\"16px\" width=\"16px\" alt=\"\" /><font size=\"1\">(" . G::loadTranslation("ID_INPUT_DOC_DOESNT_EXIST") . ")</font></font>";
             }
         }
-    $html .= $this->renderHint();
+
+        $html = $html . $this->renderHint();
+
         return $html;
     }
+
+    public function renderGrid($value=array(), $owner=null, $therow=-1)
+    {
+        $arrayResult = array();
+        $r = 1;
+
+        foreach ($value as $v) {
+            $arrayResult[] = $this->render($v, $owner, "[" . $owner->name . "][" . $r . "]", $r, $therow);
+            $r = $r + 1;
+        }
+
+        return $arrayResult;
+    }
 }
 
 /**
@@ -4781,13 +4816,19 @@ class xmlformTemplate extends Smarty
           }
         }*/
 
-        if ($v->type == 'grid') {
-          $result ['form'] [$k] = $form->fields [$k]->renderGrid ( $value, $form, $therow );
+        if ($v->type == "grid") {
+            $result["form"][$k] = $form->fields[$k]->renderGrid($value, $form, $therow);
         } else {
-          if ($v->type == 'dropdown') {
-            $result ['form'] [$k] = $form->fields [$k]->renderGrid ( $value, $form, false, $therow );
-          } else {
-            $result ['form'] [$k] = $form->fields [$k]->renderGrid ( $value, $form );
+            switch ($v->type) {
+                case "dropdown":
+                    $result["form"][$k] = $form->fields[$k]->renderGrid($value, $form, false, $therow);
+                    break;
+                case "file":
+                    $result["form"][$k] = $form->fields[$k]->renderGrid($value, $form, $therow);
+                    break;
+                default:
+                    $result["form"][$k] = $form->fields[$k]->renderGrid($value, $form);
+                    break;
             }
         }
       }

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AdditionalTablesMapBuilder {
+class AdditionalTablesMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppCacheViewMapBuilder {
+class AppCacheViewMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppDelayMapBuilder {
+class AppDelayMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppDelegationMapBuilder {
+class AppDelegationMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppDocumentMapBuilder {
+class AppDocumentMapBuilder
+{
 
     /**
      * The (dot-path) name of this class
@@ -92,6 +93,8 @@ class AppDocumentMapBuilder {
 
         $tMap->addColumn('APP_DOC_STATUS_DATE', 'AppDocStatusDate', 'int', CreoleTypes::TIMESTAMP, false, null);
 
+        $tMap->addColumn('APP_DOC_FIELDNAME', 'AppDocFieldname', 'string', CreoleTypes::VARCHAR, false, 150);
+
         $tMap->addValidator('APP_DOC_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Application Document UID can be no larger than 32 in size');
 
         $tMap->addValidator('APP_DOC_UID', 'required', 'propel.validator.RequiredValidator', '', 'Application Document UID is required.');

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppEventMapBuilder {
+class AppEventMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppFolderMapBuilder {
+class AppFolderMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppHistoryMapBuilder {
+class AppHistoryMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppMessageMapBuilder {
+class AppMessageMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppNotesMapBuilder {
+class AppNotesMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppOwnerMapBuilder {
+class AppOwnerMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppSolrQueueMapBuilder {
+class AppSolrQueueMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class AppThreadMapBuilder {
+class AppThreadMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ApplicationMapBuilder {
+class ApplicationMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CalendarAssignmentsMapBuilder {
+class CalendarAssignmentsMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CalendarBusinessHoursMapBuilder {
+class CalendarBusinessHoursMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CalendarDefinitionMapBuilder {
+class CalendarDefinitionMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CalendarHolidaysMapBuilder {
+class CalendarHolidaysMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CaseSchedulerMapBuilder {
+class CaseSchedulerMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CaseTrackerMapBuilder {
+class CaseTrackerMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class CaseTrackerObjectMapBuilder {
+class CaseTrackerObjectMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ConfigurationMapBuilder {
+class ConfigurationMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ContentMapBuilder {
+class ContentMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DashletInstanceMapBuilder {
+class DashletInstanceMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DashletMapBuilder {
+class DashletMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DbSourceMapBuilder {
+class DbSourceMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DepartmentMapBuilder {
+class DepartmentMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DimTimeCompleteMapBuilder {
+class DimTimeCompleteMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DimTimeDelegateMapBuilder {
+class DimTimeDelegateMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class DynaformMapBuilder {
+class DynaformMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class EventMapBuilder {
+class EventMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class FieldConditionMapBuilder {
+class FieldConditionMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class FieldsMapBuilder {
+class FieldsMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class GatewayMapBuilder {
+class GatewayMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class GroupUserMapBuilder {
+class GroupUserMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class GroupwfMapBuilder {
+class GroupwfMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class HolidayMapBuilder {
+class HolidayMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class InputDocumentMapBuilder {
+class InputDocumentMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class IsoCountryMapBuilder {
+class IsoCountryMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class IsoLocationMapBuilder {
+class IsoLocationMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class IsoSubdivisionMapBuilder {
+class IsoSubdivisionMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class LanguageMapBuilder {
+class LanguageMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class LexicoMapBuilder {
+class LexicoMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class LogCasesSchedulerMapBuilder {
+class LogCasesSchedulerMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class LoginLogMapBuilder {
+class LoginLogMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ObjectPermissionMapBuilder {
+class ObjectPermissionMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class OutputDocumentMapBuilder {
+class OutputDocumentMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ProcessCategoryMapBuilder {
+class ProcessCategoryMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ProcessMapBuilder {
+class ProcessMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ProcessOwnerMapBuilder {
+class ProcessOwnerMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ProcessUserMapBuilder {
+class ProcessUserMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ReportTableMapBuilder {
+class ReportTableMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ReportVarMapBuilder {
+class ReportVarMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class RouteMapBuilder {
+class RouteMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class SessionMapBuilder {
+class SessionMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class ShadowTableMapBuilder {
+class ShadowTableMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class StageMapBuilder {
+class StageMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class StepMapBuilder {
+class StepMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class StepSupervisorMapBuilder {
+class StepSupervisorMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class StepTriggerMapBuilder {
+class StepTriggerMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class SubApplicationMapBuilder {
+class SubApplicationMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class SubProcessMapBuilder {
+class SubProcessMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class SwimlanesElementsMapBuilder {
+class SwimlanesElementsMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class TaskMapBuilder {
+class TaskMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class TaskUserMapBuilder {
+class TaskUserMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class TranslationMapBuilder {
+class TranslationMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class TriggersMapBuilder {
+class TriggersMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class UsersMapBuilder {
+class UsersMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
  *
  * @package    workflow.classes.model.map
  */
-class UsersPropertiesMapBuilder {
+class UsersPropertiesMapBuilder
+{
 
     /**
      * The (dot-path) name of this class

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AdditionalTablesPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
-
+abstract class BaseAdditionalTables extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,112 +27,96 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the add_tab_uid field.
      * @var        string
      */
     protected $add_tab_uid = '';
 
-
     /**
      * The value for the add_tab_name field.
      * @var        string
      */
     protected $add_tab_name = '';
 
-
     /**
      * The value for the add_tab_class_name field.
      * @var        string
      */
     protected $add_tab_class_name = '';
 
-
     /**
      * The value for the add_tab_description field.
      * @var        string
      */
     protected $add_tab_description;
 
-
     /**
      * The value for the add_tab_sdw_log_insert field.
      * @var        int
      */
     protected $add_tab_sdw_log_insert = 0;
 
-
     /**
      * The value for the add_tab_sdw_log_update field.
      * @var        int
      */
     protected $add_tab_sdw_log_update = 0;
 
-
     /**
      * The value for the add_tab_sdw_log_delete field.
      * @var        int
      */
     protected $add_tab_sdw_log_delete = 0;
 
-
     /**
      * The value for the add_tab_sdw_log_select field.
      * @var        int
      */
     protected $add_tab_sdw_log_select = 0;
 
-
     /**
      * The value for the add_tab_sdw_max_length field.
      * @var        int
      */
     protected $add_tab_sdw_max_length = 0;
 
-
     /**
      * The value for the add_tab_sdw_auto_delete field.
      * @var        int
      */
     protected $add_tab_sdw_auto_delete = 0;
 
-
     /**
      * The value for the add_tab_plg_uid field.
      * @var        string
      */
     protected $add_tab_plg_uid = '';
 
-
     /**
      * The value for the dbs_uid field.
      * @var        string
      */
     protected $dbs_uid = '';
 
-
     /**
      * The value for the pro_uid field.
      * @var        string
      */
     protected $pro_uid = '';
 
-
     /**
      * The value for the add_tab_type field.
      * @var        string
      */
     protected $add_tab_type = '';
 
-
     /**
      * The value for the add_tab_grid field.
      * @var        string
      */
     protected $add_tab_grid = '';
 
-
     /**
      * The value for the add_tab_tag field.
      * @var        string
@@ -778,7 +762,7 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -810,7 +794,7 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -890,7 +874,8 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -1124,22 +1109,70 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
     {
         $keys = AdditionalTablesPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAddTabUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setAddTabName($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAddTabClassName($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setAddTabDescription($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setAddTabSdwLogInsert($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setAddTabSdwLogUpdate($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAddTabSdwLogDelete($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setAddTabSdwLogSelect($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setAddTabSdwMaxLength($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setAddTabSdwAutoDelete($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setAddTabPlgUid($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setDbsUid($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setProUid($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setAddTabType($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setAddTabGrid($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setAddTabTag($arr[$keys[15]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAddTabUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setAddTabName($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAddTabClassName($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setAddTabDescription($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setAddTabSdwLogInsert($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setAddTabSdwLogUpdate($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAddTabSdwLogDelete($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setAddTabSdwLogSelect($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setAddTabSdwMaxLength($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setAddTabSdwAutoDelete($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setAddTabPlgUid($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setDbsUid($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setProUid($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setAddTabType($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setAddTabGrid($arr[$keys[14]]);
+        }
+
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setAddTabTag($arr[$keys[15]]);
+        }
+
     }
 
     /**
@@ -1151,22 +1184,70 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AdditionalTablesPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_UID)) $criteria->add(AdditionalTablesPeer::ADD_TAB_UID, $this->add_tab_uid);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_NAME)) $criteria->add(AdditionalTablesPeer::ADD_TAB_NAME, $this->add_tab_name);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_CLASS_NAME)) $criteria->add(AdditionalTablesPeer::ADD_TAB_CLASS_NAME, $this->add_tab_class_name);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_DESCRIPTION)) $criteria->add(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, $this->add_tab_description);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT, $this->add_tab_sdw_log_insert);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE, $this->add_tab_sdw_log_update);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE, $this->add_tab_sdw_log_delete);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT, $this->add_tab_sdw_log_select);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH, $this->add_tab_sdw_max_length);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE, $this->add_tab_sdw_auto_delete);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_PLG_UID)) $criteria->add(AdditionalTablesPeer::ADD_TAB_PLG_UID, $this->add_tab_plg_uid);
-		if ($this->isColumnModified(AdditionalTablesPeer::DBS_UID)) $criteria->add(AdditionalTablesPeer::DBS_UID, $this->dbs_uid);
-		if ($this->isColumnModified(AdditionalTablesPeer::PRO_UID)) $criteria->add(AdditionalTablesPeer::PRO_UID, $this->pro_uid);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TYPE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_TYPE, $this->add_tab_type);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_GRID)) $criteria->add(AdditionalTablesPeer::ADD_TAB_GRID, $this->add_tab_grid);
-		if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TAG)) $criteria->add(AdditionalTablesPeer::ADD_TAB_TAG, $this->add_tab_tag);
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_UID)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_UID, $this->add_tab_uid);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_NAME)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_NAME, $this->add_tab_name);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_CLASS_NAME)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_CLASS_NAME, $this->add_tab_class_name);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_DESCRIPTION)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, $this->add_tab_description);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT, $this->add_tab_sdw_log_insert);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE, $this->add_tab_sdw_log_update);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE, $this->add_tab_sdw_log_delete);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT, $this->add_tab_sdw_log_select);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH, $this->add_tab_sdw_max_length);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE, $this->add_tab_sdw_auto_delete);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_PLG_UID)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_PLG_UID, $this->add_tab_plg_uid);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::DBS_UID)) {
+            $criteria->add(AdditionalTablesPeer::DBS_UID, $this->dbs_uid);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::PRO_UID)) {
+            $criteria->add(AdditionalTablesPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TYPE)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_TYPE, $this->add_tab_type);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_GRID)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_GRID, $this->add_tab_grid);
+        }
+
+        if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TAG)) {
+            $criteria->add(AdditionalTablesPeer::ADD_TAB_TAG, $this->add_tab_tag);
+        }
+
 
         return $criteria;
     }
@@ -1295,5 +1376,5 @@ abstract class BaseAdditionalTables extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAdditionalTables

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AdditionalTables.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAdditionalTablesPeer {
+abstract class BaseAdditionalTablesPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -265,8 +266,7 @@ abstract class BaseAdditionalTablesPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -357,7 +357,7 @@ abstract class BaseAdditionalTablesPeer {
         $cls = AdditionalTablesPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -423,7 +423,7 @@ abstract class BaseAdditionalTablesPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -434,8 +434,8 @@ abstract class BaseAdditionalTablesPeer {
     /**
      * Method perform an UPDATE on the database, given a AdditionalTables or Criteria object.
      *
-	 * @param      mixed $values Criteria or AdditionalTables object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AdditionalTables object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -454,7 +454,7 @@ abstract class BaseAdditionalTablesPeer {
             $comparison = $criteria->getComparison(AdditionalTablesPeer::ADD_TAB_UID);
             $selectCriteria->add(AdditionalTablesPeer::ADD_TAB_UID, $criteria->remove(AdditionalTablesPeer::ADD_TAB_UID), $comparison);
 
-		} else { // $values is AdditionalTables object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -495,7 +495,8 @@ abstract class BaseAdditionalTablesPeer {
      * @param      mixed $values Criteria or AdditionalTables object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -560,7 +561,7 @@ abstract class BaseAdditionalTablesPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -620,8 +621,8 @@ abstract class BaseAdditionalTablesPeer {
         }
         return $objs;
     }
+}
 
-} // BaseAdditionalTablesPeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -638,3 +639,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AdditionalTablesMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AdditionalTablesMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppCacheViewPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppCacheView extends BaseObject  implements Persistent {
-
+abstract class BaseAppCacheView extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,210 +27,180 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the del_index field.
      * @var        int
      */
     protected $del_index = 0;
 
-
     /**
      * The value for the app_number field.
      * @var        int
      */
     protected $app_number = 0;
 
-
     /**
      * The value for the app_status field.
      * @var        string
      */
     protected $app_status = '';
 
-
     /**
      * The value for the usr_uid field.
      * @var        string
      */
     protected $usr_uid = '';
 
-
     /**
      * The value for the previous_usr_uid field.
      * @var        string
      */
     protected $previous_usr_uid = '';
 
-
     /**
      * The value for the tas_uid field.
      * @var        string
      */
     protected $tas_uid = '';
 
-
     /**
      * The value for the pro_uid field.
      * @var        string
      */
     protected $pro_uid = '';
 
-
     /**
      * The value for the del_delegate_date field.
      * @var        int
      */
     protected $del_delegate_date;
 
-
     /**
      * The value for the del_init_date field.
      * @var        int
      */
     protected $del_init_date;
 
-
     /**
      * The value for the del_task_due_date field.
      * @var        int
      */
     protected $del_task_due_date;
 
-
     /**
      * The value for the del_finish_date field.
      * @var        int
      */
     protected $del_finish_date;
 
-
     /**
      * The value for the del_thread_status field.
      * @var        string
      */
     protected $del_thread_status = 'OPEN';
 
-
     /**
      * The value for the app_thread_status field.
      * @var        string
      */
     protected $app_thread_status = 'OPEN';
 
-
     /**
      * The value for the app_title field.
      * @var        string
      */
     protected $app_title = '';
 
-
     /**
      * The value for the app_pro_title field.
      * @var        string
      */
     protected $app_pro_title = '';
 
-
     /**
      * The value for the app_tas_title field.
      * @var        string
      */
     protected $app_tas_title = '';
 
-
     /**
      * The value for the app_current_user field.
      * @var        string
      */
     protected $app_current_user = '';
 
-
     /**
      * The value for the app_del_previous_user field.
      * @var        string
      */
     protected $app_del_previous_user = '';
 
-
     /**
      * The value for the del_priority field.
      * @var        string
      */
     protected $del_priority = '3';
 
-
     /**
      * The value for the del_duration field.
      * @var        double
      */
     protected $del_duration = 0;
 
-
     /**
      * The value for the del_queue_duration field.
      * @var        double
      */
     protected $del_queue_duration = 0;
 
-
     /**
      * The value for the del_delay_duration field.
      * @var        double
      */
     protected $del_delay_duration = 0;
 
-
     /**
      * The value for the del_started field.
      * @var        int
      */
     protected $del_started = 0;
 
-
     /**
      * The value for the del_finished field.
      * @var        int
      */
     protected $del_finished = 0;
 
-
     /**
      * The value for the del_delayed field.
      * @var        int
      */
     protected $del_delayed = 0;
 
-
     /**
      * The value for the app_create_date field.
      * @var        int
      */
     protected $app_create_date;
 
-
     /**
      * The value for the app_finish_date field.
      * @var        int
      */
     protected $app_finish_date;
 
-
     /**
      * The value for the app_update_date field.
      * @var        int
      */
     protected $app_update_date;
 
-
     /**
      * The value for the app_overdue_percentage field.
      * @var        double
@@ -355,8 +325,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_delegate_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_delegate_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_delegate_date] as date/time value: " . var_export($this->del_delegate_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_delegate_date] as date/time value: " .
+                    var_export($this->del_delegate_date, true));
             }
         } else {
             $ts = $this->del_delegate_date;
@@ -386,8 +357,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_init_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_init_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_init_date] as date/time value: " . var_export($this->del_init_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_init_date] as date/time value: " .
+                    var_export($this->del_init_date, true));
             }
         } else {
             $ts = $this->del_init_date;
@@ -417,8 +389,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_task_due_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_task_due_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_task_due_date] as date/time value: " . var_export($this->del_task_due_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_task_due_date] as date/time value: " .
+                    var_export($this->del_task_due_date, true));
             }
         } else {
             $ts = $this->del_task_due_date;
@@ -448,8 +421,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_finish_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_finish_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_finish_date] as date/time value: " . var_export($this->del_finish_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_finish_date] as date/time value: " .
+                    var_export($this->del_finish_date, true));
             }
         } else {
             $ts = $this->del_finish_date;
@@ -633,8 +607,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_create_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_create_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_create_date] as date/time value: " . var_export($this->app_create_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_create_date] as date/time value: " .
+                    var_export($this->app_create_date, true));
             }
         } else {
             $ts = $this->app_create_date;
@@ -664,8 +639,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_finish_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_finish_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_finish_date] as date/time value: " . var_export($this->app_finish_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_finish_date] as date/time value: " .
+                    var_export($this->app_finish_date, true));
             }
         } else {
             $ts = $this->app_finish_date;
@@ -695,8 +671,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_update_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_update_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_update_date] as date/time value: " . var_export($this->app_update_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_update_date] as date/time value: " .
+                    var_export($this->app_update_date, true));
             }
         } else {
             $ts = $this->app_update_date;
@@ -908,8 +885,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_delegate_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_delegate_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -932,8 +910,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_init_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_init_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -956,8 +935,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_task_due_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_task_due_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -980,8 +960,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -1294,8 +1275,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_create_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_create_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -1318,8 +1300,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_finish_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_finish_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -1342,8 +1325,9 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_update_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_update_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -1496,7 +1480,7 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -1528,7 +1512,7 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -1608,7 +1592,8 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -1940,36 +1925,126 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
     {
         $keys = AppCacheViewPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setDelIndex($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAppNumber($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setAppStatus($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setUsrUid($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setPreviousUsrUid($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setTasUid($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setProUid($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setDelDelegateDate($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setDelInitDate($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setDelTaskDueDate($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setDelFinishDate($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setDelThreadStatus($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setAppThreadStatus($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setAppTitle($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setAppProTitle($arr[$keys[15]]);
-		if (array_key_exists($keys[16], $arr)) $this->setAppTasTitle($arr[$keys[16]]);
-		if (array_key_exists($keys[17], $arr)) $this->setAppCurrentUser($arr[$keys[17]]);
-		if (array_key_exists($keys[18], $arr)) $this->setAppDelPreviousUser($arr[$keys[18]]);
-		if (array_key_exists($keys[19], $arr)) $this->setDelPriority($arr[$keys[19]]);
-		if (array_key_exists($keys[20], $arr)) $this->setDelDuration($arr[$keys[20]]);
-		if (array_key_exists($keys[21], $arr)) $this->setDelQueueDuration($arr[$keys[21]]);
-		if (array_key_exists($keys[22], $arr)) $this->setDelDelayDuration($arr[$keys[22]]);
-		if (array_key_exists($keys[23], $arr)) $this->setDelStarted($arr[$keys[23]]);
-		if (array_key_exists($keys[24], $arr)) $this->setDelFinished($arr[$keys[24]]);
-		if (array_key_exists($keys[25], $arr)) $this->setDelDelayed($arr[$keys[25]]);
-		if (array_key_exists($keys[26], $arr)) $this->setAppCreateDate($arr[$keys[26]]);
-		if (array_key_exists($keys[27], $arr)) $this->setAppFinishDate($arr[$keys[27]]);
-		if (array_key_exists($keys[28], $arr)) $this->setAppUpdateDate($arr[$keys[28]]);
-		if (array_key_exists($keys[29], $arr)) $this->setAppOverduePercentage($arr[$keys[29]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setDelIndex($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppNumber($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setAppStatus($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setUsrUid($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setPreviousUsrUid($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setTasUid($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setProUid($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setDelDelegateDate($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setDelInitDate($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setDelTaskDueDate($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setDelFinishDate($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setDelThreadStatus($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setAppThreadStatus($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setAppTitle($arr[$keys[14]]);
+        }
+
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setAppProTitle($arr[$keys[15]]);
+        }
+
+        if (array_key_exists($keys[16], $arr)) {
+            $this->setAppTasTitle($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setAppCurrentUser($arr[$keys[17]]);
+        }
+
+        if (array_key_exists($keys[18], $arr)) {
+            $this->setAppDelPreviousUser($arr[$keys[18]]);
+        }
+
+        if (array_key_exists($keys[19], $arr)) {
+            $this->setDelPriority($arr[$keys[19]]);
+        }
+
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setDelDuration($arr[$keys[20]]);
+        }
+
+        if (array_key_exists($keys[21], $arr)) {
+            $this->setDelQueueDuration($arr[$keys[21]]);
+        }
+
+        if (array_key_exists($keys[22], $arr)) {
+            $this->setDelDelayDuration($arr[$keys[22]]);
+        }
+
+        if (array_key_exists($keys[23], $arr)) {
+            $this->setDelStarted($arr[$keys[23]]);
+        }
+
+        if (array_key_exists($keys[24], $arr)) {
+            $this->setDelFinished($arr[$keys[24]]);
+        }
+
+        if (array_key_exists($keys[25], $arr)) {
+            $this->setDelDelayed($arr[$keys[25]]);
+        }
+
+        if (array_key_exists($keys[26], $arr)) {
+            $this->setAppCreateDate($arr[$keys[26]]);
+        }
+
+        if (array_key_exists($keys[27], $arr)) {
+            $this->setAppFinishDate($arr[$keys[27]]);
+        }
+
+        if (array_key_exists($keys[28], $arr)) {
+            $this->setAppUpdateDate($arr[$keys[28]]);
+        }
+
+        if (array_key_exists($keys[29], $arr)) {
+            $this->setAppOverduePercentage($arr[$keys[29]]);
+        }
+
     }
 
     /**
@@ -1981,36 +2056,126 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppCacheViewPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppCacheViewPeer::APP_UID)) $criteria->add(AppCacheViewPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_INDEX)) $criteria->add(AppCacheViewPeer::DEL_INDEX, $this->del_index);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_NUMBER)) $criteria->add(AppCacheViewPeer::APP_NUMBER, $this->app_number);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_STATUS)) $criteria->add(AppCacheViewPeer::APP_STATUS, $this->app_status);
-		if ($this->isColumnModified(AppCacheViewPeer::USR_UID)) $criteria->add(AppCacheViewPeer::USR_UID, $this->usr_uid);
-		if ($this->isColumnModified(AppCacheViewPeer::PREVIOUS_USR_UID)) $criteria->add(AppCacheViewPeer::PREVIOUS_USR_UID, $this->previous_usr_uid);
-		if ($this->isColumnModified(AppCacheViewPeer::TAS_UID)) $criteria->add(AppCacheViewPeer::TAS_UID, $this->tas_uid);
-		if ($this->isColumnModified(AppCacheViewPeer::PRO_UID)) $criteria->add(AppCacheViewPeer::PRO_UID, $this->pro_uid);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_DELEGATE_DATE)) $criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $this->del_delegate_date);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_INIT_DATE)) $criteria->add(AppCacheViewPeer::DEL_INIT_DATE, $this->del_init_date);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_TASK_DUE_DATE)) $criteria->add(AppCacheViewPeer::DEL_TASK_DUE_DATE, $this->del_task_due_date);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_FINISH_DATE)) $criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, $this->del_finish_date);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_THREAD_STATUS)) $criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, $this->del_thread_status);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_THREAD_STATUS)) $criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, $this->app_thread_status);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_TITLE)) $criteria->add(AppCacheViewPeer::APP_TITLE, $this->app_title);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_PRO_TITLE)) $criteria->add(AppCacheViewPeer::APP_PRO_TITLE, $this->app_pro_title);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_TAS_TITLE)) $criteria->add(AppCacheViewPeer::APP_TAS_TITLE, $this->app_tas_title);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_CURRENT_USER)) $criteria->add(AppCacheViewPeer::APP_CURRENT_USER, $this->app_current_user);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_DEL_PREVIOUS_USER)) $criteria->add(AppCacheViewPeer::APP_DEL_PREVIOUS_USER, $this->app_del_previous_user);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_PRIORITY)) $criteria->add(AppCacheViewPeer::DEL_PRIORITY, $this->del_priority);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_DURATION)) $criteria->add(AppCacheViewPeer::DEL_DURATION, $this->del_duration);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_QUEUE_DURATION)) $criteria->add(AppCacheViewPeer::DEL_QUEUE_DURATION, $this->del_queue_duration);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_DELAY_DURATION)) $criteria->add(AppCacheViewPeer::DEL_DELAY_DURATION, $this->del_delay_duration);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_STARTED)) $criteria->add(AppCacheViewPeer::DEL_STARTED, $this->del_started);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_FINISHED)) $criteria->add(AppCacheViewPeer::DEL_FINISHED, $this->del_finished);
-		if ($this->isColumnModified(AppCacheViewPeer::DEL_DELAYED)) $criteria->add(AppCacheViewPeer::DEL_DELAYED, $this->del_delayed);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_CREATE_DATE)) $criteria->add(AppCacheViewPeer::APP_CREATE_DATE, $this->app_create_date);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_FINISH_DATE)) $criteria->add(AppCacheViewPeer::APP_FINISH_DATE, $this->app_finish_date);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_UPDATE_DATE)) $criteria->add(AppCacheViewPeer::APP_UPDATE_DATE, $this->app_update_date);
-		if ($this->isColumnModified(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE)) $criteria->add(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE, $this->app_overdue_percentage);
+        if ($this->isColumnModified(AppCacheViewPeer::APP_UID)) {
+            $criteria->add(AppCacheViewPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_INDEX)) {
+            $criteria->add(AppCacheViewPeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_NUMBER)) {
+            $criteria->add(AppCacheViewPeer::APP_NUMBER, $this->app_number);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_STATUS)) {
+            $criteria->add(AppCacheViewPeer::APP_STATUS, $this->app_status);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::USR_UID)) {
+            $criteria->add(AppCacheViewPeer::USR_UID, $this->usr_uid);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::PREVIOUS_USR_UID)) {
+            $criteria->add(AppCacheViewPeer::PREVIOUS_USR_UID, $this->previous_usr_uid);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::TAS_UID)) {
+            $criteria->add(AppCacheViewPeer::TAS_UID, $this->tas_uid);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::PRO_UID)) {
+            $criteria->add(AppCacheViewPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_DELEGATE_DATE)) {
+            $criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $this->del_delegate_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_INIT_DATE)) {
+            $criteria->add(AppCacheViewPeer::DEL_INIT_DATE, $this->del_init_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_TASK_DUE_DATE)) {
+            $criteria->add(AppCacheViewPeer::DEL_TASK_DUE_DATE, $this->del_task_due_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_FINISH_DATE)) {
+            $criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, $this->del_finish_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_THREAD_STATUS)) {
+            $criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, $this->del_thread_status);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_THREAD_STATUS)) {
+            $criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, $this->app_thread_status);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_TITLE)) {
+            $criteria->add(AppCacheViewPeer::APP_TITLE, $this->app_title);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_PRO_TITLE)) {
+            $criteria->add(AppCacheViewPeer::APP_PRO_TITLE, $this->app_pro_title);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_TAS_TITLE)) {
+            $criteria->add(AppCacheViewPeer::APP_TAS_TITLE, $this->app_tas_title);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_CURRENT_USER)) {
+            $criteria->add(AppCacheViewPeer::APP_CURRENT_USER, $this->app_current_user);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_DEL_PREVIOUS_USER)) {
+            $criteria->add(AppCacheViewPeer::APP_DEL_PREVIOUS_USER, $this->app_del_previous_user);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_PRIORITY)) {
+            $criteria->add(AppCacheViewPeer::DEL_PRIORITY, $this->del_priority);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_DURATION)) {
+            $criteria->add(AppCacheViewPeer::DEL_DURATION, $this->del_duration);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_QUEUE_DURATION)) {
+            $criteria->add(AppCacheViewPeer::DEL_QUEUE_DURATION, $this->del_queue_duration);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_DELAY_DURATION)) {
+            $criteria->add(AppCacheViewPeer::DEL_DELAY_DURATION, $this->del_delay_duration);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_STARTED)) {
+            $criteria->add(AppCacheViewPeer::DEL_STARTED, $this->del_started);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_FINISHED)) {
+            $criteria->add(AppCacheViewPeer::DEL_FINISHED, $this->del_finished);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::DEL_DELAYED)) {
+            $criteria->add(AppCacheViewPeer::DEL_DELAYED, $this->del_delayed);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_CREATE_DATE)) {
+            $criteria->add(AppCacheViewPeer::APP_CREATE_DATE, $this->app_create_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_FINISH_DATE)) {
+            $criteria->add(AppCacheViewPeer::APP_FINISH_DATE, $this->app_finish_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_UPDATE_DATE)) {
+            $criteria->add(AppCacheViewPeer::APP_UPDATE_DATE, $this->app_update_date);
+        }
+
+        if ($this->isColumnModified(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE)) {
+            $criteria->add(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE, $this->app_overdue_percentage);
+        }
+
 
         return $criteria;
     }
@@ -2179,5 +2344,5 @@ abstract class BaseAppCacheView extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppCacheView

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppCacheView.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppCacheViewPeer {
+abstract class BaseAppCacheViewPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -335,8 +336,7 @@ abstract class BaseAppCacheViewPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -427,7 +427,7 @@ abstract class BaseAppCacheViewPeer {
         $cls = AppCacheViewPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -493,7 +493,7 @@ abstract class BaseAppCacheViewPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -504,8 +504,8 @@ abstract class BaseAppCacheViewPeer {
     /**
      * Method perform an UPDATE on the database, given a AppCacheView or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppCacheView object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppCacheView object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -527,7 +527,7 @@ abstract class BaseAppCacheViewPeer {
             $comparison = $criteria->getComparison(AppCacheViewPeer::DEL_INDEX);
             $selectCriteria->add(AppCacheViewPeer::DEL_INDEX, $criteria->remove(AppCacheViewPeer::DEL_INDEX), $comparison);
 
-		} else { // $values is AppCacheView object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -568,7 +568,8 @@ abstract class BaseAppCacheViewPeer {
      * @param      mixed $values Criteria or AppCacheView object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -590,14 +591,12 @@ abstract class BaseAppCacheViewPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
                 $vals[0][] = $value[0];
                 $vals[1][] = $value[1];
@@ -650,7 +649,7 @@ abstract class BaseAppCacheViewPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -666,12 +665,12 @@ abstract class BaseAppCacheViewPeer {
     /**
      * Retrieve object using using composite pkey values.
      * @param string $app_uid
-	   @param int $del_index
-	   
+       * @param int $del_index
         * @param      Connection $con
      * @return     AppCacheView
      */
-	public static function retrieveByPK( $app_uid, $del_index, $con = null) {
+    public static function retrieveByPK($app_uid, $del_index, $con = null)
+    {
         if ($con === null) {
             $con = Propel::getConnection(self::DATABASE_NAME);
         }
@@ -682,7 +681,8 @@ abstract class BaseAppCacheViewPeer {
 
         return !empty($v) ? $v[0] : null;
     }
-} // BaseAppCacheViewPeer
+}
+
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -699,3 +699,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppCacheViewMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppCacheViewMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppDelayPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppDelay extends BaseObject  implements Persistent {
-
+abstract class BaseAppDelay extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,98 +27,84 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_delay_uid field.
      * @var        string
      */
     protected $app_delay_uid = '';
 
-
     /**
      * The value for the pro_uid field.
      * @var        string
      */
     protected $pro_uid = '0';
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '0';
 
-
     /**
      * The value for the app_thread_index field.
      * @var        int
      */
     protected $app_thread_index = 0;
 
-
     /**
      * The value for the app_del_index field.
      * @var        int
      */
     protected $app_del_index = 0;
 
-
     /**
      * The value for the app_type field.
      * @var        string
      */
     protected $app_type = '0';
 
-
     /**
      * The value for the app_status field.
      * @var        string
      */
     protected $app_status = '0';
 
-
     /**
      * The value for the app_next_task field.
      * @var        string
      */
     protected $app_next_task = '0';
 
-
     /**
      * The value for the app_delegation_user field.
      * @var        string
      */
     protected $app_delegation_user = '0';
 
-
     /**
      * The value for the app_enable_action_user field.
      * @var        string
      */
     protected $app_enable_action_user = '0';
 
-
     /**
      * The value for the app_enable_action_date field.
      * @var        int
      */
     protected $app_enable_action_date;
 
-
     /**
      * The value for the app_disable_action_user field.
      * @var        string
      */
     protected $app_disable_action_user = '0';
 
-
     /**
      * The value for the app_disable_action_date field.
      * @var        int
      */
     protected $app_disable_action_date;
 
-
     /**
      * The value for the app_automatic_disabled_date field.
      * @var        int
@@ -265,8 +251,9 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_enable_action_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_enable_action_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_enable_action_date] as date/time value: " . var_export($this->app_enable_action_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_enable_action_date] as date/time value: " .
+                    var_export($this->app_enable_action_date, true));
             }
         } else {
             $ts = $this->app_enable_action_date;
@@ -307,8 +294,9 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_disable_action_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_disable_action_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_disable_action_date] as date/time value: " . var_export($this->app_disable_action_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_disable_action_date] as date/time value: " .
+                    var_export($this->app_disable_action_date, true));
             }
         } else {
             $ts = $this->app_disable_action_date;
@@ -338,8 +326,9 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_automatic_disabled_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_automatic_disabled_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_automatic_disabled_date] as date/time value: " . var_export($this->app_automatic_disabled_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_automatic_disabled_date] as date/time value: " .
+                    var_export($this->app_automatic_disabled_date, true));
             }
         } else {
             $ts = $this->app_automatic_disabled_date;
@@ -584,8 +573,9 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_enable_action_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_enable_action_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -630,8 +620,9 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_disable_action_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_disable_action_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -654,8 +645,9 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_automatic_disabled_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_automatic_disabled_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -760,7 +752,7 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -792,7 +784,7 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -872,7 +864,8 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -1092,20 +1085,62 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
     {
         $keys = AppDelayPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppDelayUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setProUid($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAppUid($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setAppThreadIndex($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setAppDelIndex($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setAppType($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAppStatus($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setAppNextTask($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setAppDelegationUser($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setAppEnableActionUser($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setAppEnableActionDate($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setAppDisableActionUser($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setAppDisableActionDate($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setAppAutomaticDisabledDate($arr[$keys[13]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppDelayUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setProUid($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setAppThreadIndex($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setAppDelIndex($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setAppType($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAppStatus($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setAppNextTask($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setAppDelegationUser($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setAppEnableActionUser($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setAppEnableActionDate($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setAppDisableActionUser($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setAppDisableActionDate($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setAppAutomaticDisabledDate($arr[$keys[13]]);
+        }
+
     }
 
     /**
@@ -1117,20 +1152,62 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppDelayPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppDelayPeer::APP_DELAY_UID)) $criteria->add(AppDelayPeer::APP_DELAY_UID, $this->app_delay_uid);
-		if ($this->isColumnModified(AppDelayPeer::PRO_UID)) $criteria->add(AppDelayPeer::PRO_UID, $this->pro_uid);
-		if ($this->isColumnModified(AppDelayPeer::APP_UID)) $criteria->add(AppDelayPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppDelayPeer::APP_THREAD_INDEX)) $criteria->add(AppDelayPeer::APP_THREAD_INDEX, $this->app_thread_index);
-		if ($this->isColumnModified(AppDelayPeer::APP_DEL_INDEX)) $criteria->add(AppDelayPeer::APP_DEL_INDEX, $this->app_del_index);
-		if ($this->isColumnModified(AppDelayPeer::APP_TYPE)) $criteria->add(AppDelayPeer::APP_TYPE, $this->app_type);
-		if ($this->isColumnModified(AppDelayPeer::APP_STATUS)) $criteria->add(AppDelayPeer::APP_STATUS, $this->app_status);
-		if ($this->isColumnModified(AppDelayPeer::APP_NEXT_TASK)) $criteria->add(AppDelayPeer::APP_NEXT_TASK, $this->app_next_task);
-		if ($this->isColumnModified(AppDelayPeer::APP_DELEGATION_USER)) $criteria->add(AppDelayPeer::APP_DELEGATION_USER, $this->app_delegation_user);
-		if ($this->isColumnModified(AppDelayPeer::APP_ENABLE_ACTION_USER)) $criteria->add(AppDelayPeer::APP_ENABLE_ACTION_USER, $this->app_enable_action_user);
-		if ($this->isColumnModified(AppDelayPeer::APP_ENABLE_ACTION_DATE)) $criteria->add(AppDelayPeer::APP_ENABLE_ACTION_DATE, $this->app_enable_action_date);
-		if ($this->isColumnModified(AppDelayPeer::APP_DISABLE_ACTION_USER)) $criteria->add(AppDelayPeer::APP_DISABLE_ACTION_USER, $this->app_disable_action_user);
-		if ($this->isColumnModified(AppDelayPeer::APP_DISABLE_ACTION_DATE)) $criteria->add(AppDelayPeer::APP_DISABLE_ACTION_DATE, $this->app_disable_action_date);
-		if ($this->isColumnModified(AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE)) $criteria->add(AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE, $this->app_automatic_disabled_date);
+        if ($this->isColumnModified(AppDelayPeer::APP_DELAY_UID)) {
+            $criteria->add(AppDelayPeer::APP_DELAY_UID, $this->app_delay_uid);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::PRO_UID)) {
+            $criteria->add(AppDelayPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_UID)) {
+            $criteria->add(AppDelayPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_THREAD_INDEX)) {
+            $criteria->add(AppDelayPeer::APP_THREAD_INDEX, $this->app_thread_index);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_DEL_INDEX)) {
+            $criteria->add(AppDelayPeer::APP_DEL_INDEX, $this->app_del_index);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_TYPE)) {
+            $criteria->add(AppDelayPeer::APP_TYPE, $this->app_type);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_STATUS)) {
+            $criteria->add(AppDelayPeer::APP_STATUS, $this->app_status);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_NEXT_TASK)) {
+            $criteria->add(AppDelayPeer::APP_NEXT_TASK, $this->app_next_task);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_DELEGATION_USER)) {
+            $criteria->add(AppDelayPeer::APP_DELEGATION_USER, $this->app_delegation_user);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_ENABLE_ACTION_USER)) {
+            $criteria->add(AppDelayPeer::APP_ENABLE_ACTION_USER, $this->app_enable_action_user);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_ENABLE_ACTION_DATE)) {
+            $criteria->add(AppDelayPeer::APP_ENABLE_ACTION_DATE, $this->app_enable_action_date);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_DISABLE_ACTION_USER)) {
+            $criteria->add(AppDelayPeer::APP_DISABLE_ACTION_USER, $this->app_disable_action_user);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_DISABLE_ACTION_DATE)) {
+            $criteria->add(AppDelayPeer::APP_DISABLE_ACTION_DATE, $this->app_disable_action_date);
+        }
+
+        if ($this->isColumnModified(AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE)) {
+            $criteria->add(AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE, $this->app_automatic_disabled_date);
+        }
+
 
         return $criteria;
     }
@@ -1255,5 +1332,5 @@ abstract class BaseAppDelay extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppDelay

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppDelay.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppDelayPeer {
+abstract class BaseAppDelayPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -255,8 +256,7 @@ abstract class BaseAppDelayPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -347,7 +347,7 @@ abstract class BaseAppDelayPeer {
         $cls = AppDelayPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -413,7 +413,7 @@ abstract class BaseAppDelayPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -424,8 +424,8 @@ abstract class BaseAppDelayPeer {
     /**
      * Method perform an UPDATE on the database, given a AppDelay or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppDelay object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppDelay object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -444,7 +444,7 @@ abstract class BaseAppDelayPeer {
             $comparison = $criteria->getComparison(AppDelayPeer::APP_DELAY_UID);
             $selectCriteria->add(AppDelayPeer::APP_DELAY_UID, $criteria->remove(AppDelayPeer::APP_DELAY_UID), $comparison);
 
-		} else { // $values is AppDelay object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -485,7 +485,8 @@ abstract class BaseAppDelayPeer {
      * @param      mixed $values Criteria or AppDelay object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -550,7 +551,7 @@ abstract class BaseAppDelayPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -610,8 +611,8 @@ abstract class BaseAppDelayPeer {
         }
         return $objs;
     }
+}
 
-} // BaseAppDelayPeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -628,3 +629,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppDelayMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppDelayMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppDelegationPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppDelegation extends BaseObject  implements Persistent {
-
+abstract class BaseAppDelegation extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,154 +27,132 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the del_index field.
      * @var        int
      */
     protected $del_index = 0;
 
-
     /**
      * The value for the del_previous field.
      * @var        int
      */
     protected $del_previous = 0;
 
-
     /**
      * The value for the pro_uid field.
      * @var        string
      */
     protected $pro_uid = '';
 
-
     /**
      * The value for the tas_uid field.
      * @var        string
      */
     protected $tas_uid = '';
 
-
     /**
      * The value for the usr_uid field.
      * @var        string
      */
     protected $usr_uid = '';
 
-
     /**
      * The value for the del_type field.
      * @var        string
      */
     protected $del_type = 'NORMAL';
 
-
     /**
      * The value for the del_thread field.
      * @var        int
      */
     protected $del_thread = 0;
 
-
     /**
      * The value for the del_thread_status field.
      * @var        string
      */
     protected $del_thread_status = 'OPEN';
 
-
     /**
      * The value for the del_priority field.
      * @var        string
      */
     protected $del_priority = '3';
 
-
     /**
      * The value for the del_delegate_date field.
      * @var        int
      */
     protected $del_delegate_date;
 
-
     /**
      * The value for the del_init_date field.
      * @var        int
      */
     protected $del_init_date;
 
-
     /**
      * The value for the del_task_due_date field.
      * @var        int
      */
     protected $del_task_due_date;
 
-
     /**
      * The value for the del_finish_date field.
      * @var        int
      */
     protected $del_finish_date;
 
-
     /**
      * The value for the del_duration field.
      * @var        double
      */
     protected $del_duration = 0;
 
-
     /**
      * The value for the del_queue_duration field.
      * @var        double
      */
     protected $del_queue_duration = 0;
 
-
     /**
      * The value for the del_delay_duration field.
      * @var        double
      */
     protected $del_delay_duration = 0;
 
-
     /**
      * The value for the del_started field.
      * @var        int
      */
     protected $del_started = 0;
 
-
     /**
      * The value for the del_finished field.
      * @var        int
      */
     protected $del_finished = 0;
 
-
     /**
      * The value for the del_delayed field.
      * @var        int
      */
     protected $del_delayed = 0;
 
-
     /**
      * The value for the del_data field.
      * @var        string
      */
     protected $del_data;
 
-
     /**
      * The value for the app_overdue_percentage field.
      * @var        double
@@ -321,8 +299,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_delegate_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_delegate_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_delegate_date] as date/time value: " . var_export($this->del_delegate_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_delegate_date] as date/time value: " .
+                    var_export($this->del_delegate_date, true));
             }
         } else {
             $ts = $this->del_delegate_date;
@@ -352,8 +331,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_init_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_init_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_init_date] as date/time value: " . var_export($this->del_init_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_init_date] as date/time value: " .
+                    var_export($this->del_init_date, true));
             }
         } else {
             $ts = $this->del_init_date;
@@ -383,8 +363,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_task_due_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_task_due_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_task_due_date] as date/time value: " . var_export($this->del_task_due_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_task_due_date] as date/time value: " .
+                    var_export($this->del_task_due_date, true));
             }
         } else {
             $ts = $this->del_task_due_date;
@@ -414,8 +395,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
         } elseif (!is_int($this->del_finish_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->del_finish_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [del_finish_date] as date/time value: " . var_export($this->del_finish_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [del_finish_date] as date/time value: " .
+                    var_export($this->del_finish_date, true));
             }
         } else {
             $ts = $this->del_finish_date;
@@ -748,8 +730,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_delegate_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_delegate_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -772,8 +755,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_init_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_init_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -796,8 +780,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_task_due_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_task_due_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -820,8 +805,9 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -1094,7 +1080,7 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -1126,7 +1112,7 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -1206,7 +1192,8 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -1482,28 +1469,94 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
     {
         $keys = AppDelegationPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setDelIndex($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setDelPrevious($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setProUid($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setTasUid($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setUsrUid($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setDelType($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setDelThread($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setDelThreadStatus($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setDelPriority($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setDelDelegateDate($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setDelInitDate($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setDelTaskDueDate($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setDelFinishDate($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setDelDuration($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setDelQueueDuration($arr[$keys[15]]);
-		if (array_key_exists($keys[16], $arr)) $this->setDelDelayDuration($arr[$keys[16]]);
-		if (array_key_exists($keys[17], $arr)) $this->setDelStarted($arr[$keys[17]]);
-		if (array_key_exists($keys[18], $arr)) $this->setDelFinished($arr[$keys[18]]);
-		if (array_key_exists($keys[19], $arr)) $this->setDelDelayed($arr[$keys[19]]);
-		if (array_key_exists($keys[20], $arr)) $this->setDelData($arr[$keys[20]]);
-		if (array_key_exists($keys[21], $arr)) $this->setAppOverduePercentage($arr[$keys[21]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setDelIndex($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setDelPrevious($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setProUid($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setTasUid($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setUsrUid($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setDelType($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setDelThread($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setDelThreadStatus($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setDelPriority($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setDelDelegateDate($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setDelInitDate($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setDelTaskDueDate($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setDelFinishDate($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setDelDuration($arr[$keys[14]]);
+        }
+
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setDelQueueDuration($arr[$keys[15]]);
+        }
+
+        if (array_key_exists($keys[16], $arr)) {
+            $this->setDelDelayDuration($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setDelStarted($arr[$keys[17]]);
+        }
+
+        if (array_key_exists($keys[18], $arr)) {
+            $this->setDelFinished($arr[$keys[18]]);
+        }
+
+        if (array_key_exists($keys[19], $arr)) {
+            $this->setDelDelayed($arr[$keys[19]]);
+        }
+
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setDelData($arr[$keys[20]]);
+        }
+
+        if (array_key_exists($keys[21], $arr)) {
+            $this->setAppOverduePercentage($arr[$keys[21]]);
+        }
+
     }
 
     /**
@@ -1515,28 +1568,94 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppDelegationPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppDelegationPeer::APP_UID)) $criteria->add(AppDelegationPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_INDEX)) $criteria->add(AppDelegationPeer::DEL_INDEX, $this->del_index);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_PREVIOUS)) $criteria->add(AppDelegationPeer::DEL_PREVIOUS, $this->del_previous);
-		if ($this->isColumnModified(AppDelegationPeer::PRO_UID)) $criteria->add(AppDelegationPeer::PRO_UID, $this->pro_uid);
-		if ($this->isColumnModified(AppDelegationPeer::TAS_UID)) $criteria->add(AppDelegationPeer::TAS_UID, $this->tas_uid);
-		if ($this->isColumnModified(AppDelegationPeer::USR_UID)) $criteria->add(AppDelegationPeer::USR_UID, $this->usr_uid);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_TYPE)) $criteria->add(AppDelegationPeer::DEL_TYPE, $this->del_type);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_THREAD)) $criteria->add(AppDelegationPeer::DEL_THREAD, $this->del_thread);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_THREAD_STATUS)) $criteria->add(AppDelegationPeer::DEL_THREAD_STATUS, $this->del_thread_status);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_PRIORITY)) $criteria->add(AppDelegationPeer::DEL_PRIORITY, $this->del_priority);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_DELEGATE_DATE)) $criteria->add(AppDelegationPeer::DEL_DELEGATE_DATE, $this->del_delegate_date);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_INIT_DATE)) $criteria->add(AppDelegationPeer::DEL_INIT_DATE, $this->del_init_date);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_TASK_DUE_DATE)) $criteria->add(AppDelegationPeer::DEL_TASK_DUE_DATE, $this->del_task_due_date);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_FINISH_DATE)) $criteria->add(AppDelegationPeer::DEL_FINISH_DATE, $this->del_finish_date);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_DURATION)) $criteria->add(AppDelegationPeer::DEL_DURATION, $this->del_duration);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_QUEUE_DURATION)) $criteria->add(AppDelegationPeer::DEL_QUEUE_DURATION, $this->del_queue_duration);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_DELAY_DURATION)) $criteria->add(AppDelegationPeer::DEL_DELAY_DURATION, $this->del_delay_duration);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_STARTED)) $criteria->add(AppDelegationPeer::DEL_STARTED, $this->del_started);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_FINISHED)) $criteria->add(AppDelegationPeer::DEL_FINISHED, $this->del_finished);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_DELAYED)) $criteria->add(AppDelegationPeer::DEL_DELAYED, $this->del_delayed);
-		if ($this->isColumnModified(AppDelegationPeer::DEL_DATA)) $criteria->add(AppDelegationPeer::DEL_DATA, $this->del_data);
-		if ($this->isColumnModified(AppDelegationPeer::APP_OVERDUE_PERCENTAGE)) $criteria->add(AppDelegationPeer::APP_OVERDUE_PERCENTAGE, $this->app_overdue_percentage);
+        if ($this->isColumnModified(AppDelegationPeer::APP_UID)) {
+            $criteria->add(AppDelegationPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_INDEX)) {
+            $criteria->add(AppDelegationPeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_PREVIOUS)) {
+            $criteria->add(AppDelegationPeer::DEL_PREVIOUS, $this->del_previous);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::PRO_UID)) {
+            $criteria->add(AppDelegationPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::TAS_UID)) {
+            $criteria->add(AppDelegationPeer::TAS_UID, $this->tas_uid);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::USR_UID)) {
+            $criteria->add(AppDelegationPeer::USR_UID, $this->usr_uid);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_TYPE)) {
+            $criteria->add(AppDelegationPeer::DEL_TYPE, $this->del_type);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_THREAD)) {
+            $criteria->add(AppDelegationPeer::DEL_THREAD, $this->del_thread);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_THREAD_STATUS)) {
+            $criteria->add(AppDelegationPeer::DEL_THREAD_STATUS, $this->del_thread_status);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_PRIORITY)) {
+            $criteria->add(AppDelegationPeer::DEL_PRIORITY, $this->del_priority);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_DELEGATE_DATE)) {
+            $criteria->add(AppDelegationPeer::DEL_DELEGATE_DATE, $this->del_delegate_date);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_INIT_DATE)) {
+            $criteria->add(AppDelegationPeer::DEL_INIT_DATE, $this->del_init_date);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_TASK_DUE_DATE)) {
+            $criteria->add(AppDelegationPeer::DEL_TASK_DUE_DATE, $this->del_task_due_date);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_FINISH_DATE)) {
+            $criteria->add(AppDelegationPeer::DEL_FINISH_DATE, $this->del_finish_date);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_DURATION)) {
+            $criteria->add(AppDelegationPeer::DEL_DURATION, $this->del_duration);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_QUEUE_DURATION)) {
+            $criteria->add(AppDelegationPeer::DEL_QUEUE_DURATION, $this->del_queue_duration);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_DELAY_DURATION)) {
+            $criteria->add(AppDelegationPeer::DEL_DELAY_DURATION, $this->del_delay_duration);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_STARTED)) {
+            $criteria->add(AppDelegationPeer::DEL_STARTED, $this->del_started);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_FINISHED)) {
+            $criteria->add(AppDelegationPeer::DEL_FINISHED, $this->del_finished);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_DELAYED)) {
+            $criteria->add(AppDelegationPeer::DEL_DELAYED, $this->del_delayed);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::DEL_DATA)) {
+            $criteria->add(AppDelegationPeer::DEL_DATA, $this->del_data);
+        }
+
+        if ($this->isColumnModified(AppDelegationPeer::APP_OVERDUE_PERCENTAGE)) {
+            $criteria->add(AppDelegationPeer::APP_OVERDUE_PERCENTAGE, $this->app_overdue_percentage);
+        }
+
 
         return $criteria;
     }
@@ -1689,5 +1808,5 @@ abstract class BaseAppDelegation extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppDelegation

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppDelegation.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppDelegationPeer {
+abstract class BaseAppDelegationPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -295,8 +296,7 @@ abstract class BaseAppDelegationPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -387,7 +387,7 @@ abstract class BaseAppDelegationPeer {
         $cls = AppDelegationPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -453,7 +453,7 @@ abstract class BaseAppDelegationPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -464,8 +464,8 @@ abstract class BaseAppDelegationPeer {
     /**
      * Method perform an UPDATE on the database, given a AppDelegation or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppDelegation object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppDelegation object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -487,7 +487,7 @@ abstract class BaseAppDelegationPeer {
             $comparison = $criteria->getComparison(AppDelegationPeer::DEL_INDEX);
             $selectCriteria->add(AppDelegationPeer::DEL_INDEX, $criteria->remove(AppDelegationPeer::DEL_INDEX), $comparison);
 
-		} else { // $values is AppDelegation object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -528,7 +528,8 @@ abstract class BaseAppDelegationPeer {
      * @param      mixed $values Criteria or AppDelegation object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -550,14 +551,12 @@ abstract class BaseAppDelegationPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
                 $vals[0][] = $value[0];
                 $vals[1][] = $value[1];
@@ -610,7 +609,7 @@ abstract class BaseAppDelegationPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -635,12 +634,12 @@ abstract class BaseAppDelegationPeer {
     /**
      * Retrieve object using using composite pkey values.
      * @param string $app_uid
-	   @param int $del_index
-	   
+       * @param int $del_index
         * @param      Connection $con
      * @return     AppDelegation
      */
-	public static function retrieveByPK( $app_uid, $del_index, $con = null) {
+    public static function retrieveByPK($app_uid, $del_index, $con = null)
+    {
         if ($con === null) {
             $con = Propel::getConnection(self::DATABASE_NAME);
         }
@@ -651,7 +650,8 @@ abstract class BaseAppDelegationPeer {
 
         return !empty($v) ? $v[0] : null;
     }
-} // BaseAppDelegationPeer
+}
+
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -668,3 +668,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppDelegationMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppDelegationMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppDocumentPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppDocument extends BaseObject  implements Persistent {
-
+abstract class BaseAppDocument extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,104 +27,96 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_doc_uid field.
      * @var        string
      */
     protected $app_doc_uid = '';
 
-
     /**
      * The value for the doc_version field.
      * @var        int
      */
     protected $doc_version = 1;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the del_index field.
      * @var        int
      */
     protected $del_index = 0;
 
-
     /**
      * The value for the doc_uid field.
      * @var        string
      */
     protected $doc_uid = '';
 
-
     /**
      * The value for the usr_uid field.
      * @var        string
      */
     protected $usr_uid = '';
 
-
     /**
      * The value for the app_doc_type field.
      * @var        string
      */
     protected $app_doc_type = '';
 
-
     /**
      * The value for the app_doc_create_date field.
      * @var        int
      */
     protected $app_doc_create_date;
 
-
     /**
      * The value for the app_doc_index field.
      * @var        int
      */
     protected $app_doc_index;
 
-
     /**
      * The value for the folder_uid field.
      * @var        string
      */
     protected $folder_uid = '';
 
-
     /**
      * The value for the app_doc_plugin field.
      * @var        string
      */
     protected $app_doc_plugin = '';
 
-
     /**
      * The value for the app_doc_tags field.
      * @var        string
      */
     protected $app_doc_tags;
 
-
     /**
      * The value for the app_doc_status field.
      * @var        string
      */
     protected $app_doc_status = 'ACTIVE';
 
-
     /**
      * The value for the app_doc_status_date field.
      * @var        int
      */
     protected $app_doc_status_date;
 
+    /**
+     * The value for the app_doc_fieldname field.
+     * @var        string
+     */
+    protected $app_doc_fieldname;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -232,8 +224,9 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_doc_create_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_doc_create_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_doc_create_date] as date/time value: " . var_export($this->app_doc_create_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_doc_create_date] as date/time value: " .
+                    var_export($this->app_doc_create_date, true));
             }
         } else {
             $ts = $this->app_doc_create_date;
@@ -318,8 +311,9 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_doc_status_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_doc_status_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_doc_status_date] as date/time value: " . var_export($this->app_doc_status_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_doc_status_date] as date/time value: " .
+                    var_export($this->app_doc_status_date, true));
             }
         } else {
             $ts = $this->app_doc_status_date;
@@ -333,6 +327,17 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
         }
     }
 
+    /**
+     * Get the [app_doc_fieldname] column value.
+     * 
+     * @return     string
+     */
+    public function getAppDocFieldname()
+    {
+
+        return $this->app_doc_fieldname;
+    }
+
     /**
      * Set the value of [app_doc_uid] column.
      * 
@@ -498,8 +503,9 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_doc_create_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_doc_create_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -632,8 +638,9 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_doc_status_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_doc_status_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -645,6 +652,28 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
 
     } // setAppDocStatusDate()
 
+    /**
+     * Set the value of [app_doc_fieldname] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAppDocFieldname($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->app_doc_fieldname !== $v) {
+            $this->app_doc_fieldname = $v;
+            $this->modifiedColumns[] = AppDocumentPeer::APP_DOC_FIELDNAME;
+        }
+
+    } // setAppDocFieldname()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -690,12 +719,14 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
 
             $this->app_doc_status_date = $rs->getTimestamp($startcol + 13, null);
 
+            $this->app_doc_fieldname = $rs->getString($startcol + 14);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 14; // 14 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 15; // 15 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AppDocument object", $e);
@@ -738,7 +769,7 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -770,7 +801,7 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -850,7 +881,8 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -940,6 +972,9 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
             case 13:
                 return $this->getAppDocStatusDate();
                 break;
+            case 14:
+                return $this->getAppDocFieldname();
+                break;
             default:
                 return null;
                 break;
@@ -974,6 +1009,7 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
             $keys[11] => $this->getAppDocTags(),
             $keys[12] => $this->getAppDocStatus(),
             $keys[13] => $this->getAppDocStatusDate(),
+            $keys[14] => $this->getAppDocFieldname(),
         );
         return $result;
     }
@@ -1047,6 +1083,9 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
             case 13:
                 $this->setAppDocStatusDate($value);
                 break;
+            case 14:
+                $this->setAppDocFieldname($value);
+                break;
         } // switch()
     }
 
@@ -1070,20 +1109,66 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
     {
         $keys = AppDocumentPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppDocUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setDocVersion($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAppUid($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setDelIndex($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setDocUid($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setUsrUid($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAppDocType($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setAppDocCreateDate($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setAppDocIndex($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setFolderUid($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setAppDocPlugin($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setAppDocTags($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setAppDocStatus($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setAppDocStatusDate($arr[$keys[13]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppDocUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setDocVersion($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setDelIndex($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setDocUid($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setUsrUid($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAppDocType($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setAppDocCreateDate($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setAppDocIndex($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setFolderUid($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setAppDocPlugin($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setAppDocTags($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setAppDocStatus($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setAppDocStatusDate($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setAppDocFieldname($arr[$keys[14]]);
+        }
+
     }
 
     /**
@@ -1095,20 +1180,66 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppDocumentPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_UID)) $criteria->add(AppDocumentPeer::APP_DOC_UID, $this->app_doc_uid);
-		if ($this->isColumnModified(AppDocumentPeer::DOC_VERSION)) $criteria->add(AppDocumentPeer::DOC_VERSION, $this->doc_version);
-		if ($this->isColumnModified(AppDocumentPeer::APP_UID)) $criteria->add(AppDocumentPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppDocumentPeer::DEL_INDEX)) $criteria->add(AppDocumentPeer::DEL_INDEX, $this->del_index);
-		if ($this->isColumnModified(AppDocumentPeer::DOC_UID)) $criteria->add(AppDocumentPeer::DOC_UID, $this->doc_uid);
-		if ($this->isColumnModified(AppDocumentPeer::USR_UID)) $criteria->add(AppDocumentPeer::USR_UID, $this->usr_uid);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_TYPE)) $criteria->add(AppDocumentPeer::APP_DOC_TYPE, $this->app_doc_type);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_CREATE_DATE)) $criteria->add(AppDocumentPeer::APP_DOC_CREATE_DATE, $this->app_doc_create_date);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_INDEX)) $criteria->add(AppDocumentPeer::APP_DOC_INDEX, $this->app_doc_index);
-		if ($this->isColumnModified(AppDocumentPeer::FOLDER_UID)) $criteria->add(AppDocumentPeer::FOLDER_UID, $this->folder_uid);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_PLUGIN)) $criteria->add(AppDocumentPeer::APP_DOC_PLUGIN, $this->app_doc_plugin);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_TAGS)) $criteria->add(AppDocumentPeer::APP_DOC_TAGS, $this->app_doc_tags);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_STATUS)) $criteria->add(AppDocumentPeer::APP_DOC_STATUS, $this->app_doc_status);
-		if ($this->isColumnModified(AppDocumentPeer::APP_DOC_STATUS_DATE)) $criteria->add(AppDocumentPeer::APP_DOC_STATUS_DATE, $this->app_doc_status_date);
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_UID)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_UID, $this->app_doc_uid);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::DOC_VERSION)) {
+            $criteria->add(AppDocumentPeer::DOC_VERSION, $this->doc_version);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_UID)) {
+            $criteria->add(AppDocumentPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::DEL_INDEX)) {
+            $criteria->add(AppDocumentPeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::DOC_UID)) {
+            $criteria->add(AppDocumentPeer::DOC_UID, $this->doc_uid);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::USR_UID)) {
+            $criteria->add(AppDocumentPeer::USR_UID, $this->usr_uid);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_TYPE)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_TYPE, $this->app_doc_type);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_CREATE_DATE)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_CREATE_DATE, $this->app_doc_create_date);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_INDEX)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_INDEX, $this->app_doc_index);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::FOLDER_UID)) {
+            $criteria->add(AppDocumentPeer::FOLDER_UID, $this->folder_uid);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_PLUGIN)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_PLUGIN, $this->app_doc_plugin);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_TAGS)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_TAGS, $this->app_doc_tags);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_STATUS)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_STATUS, $this->app_doc_status);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_STATUS_DATE)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_STATUS_DATE, $this->app_doc_status_date);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::APP_DOC_FIELDNAME)) {
+            $criteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $this->app_doc_fieldname);
+        }
+
 
         return $criteria;
     }
@@ -1199,6 +1330,8 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
 
         $copyObj->setAppDocStatusDate($this->app_doc_status_date);
 
+        $copyObj->setAppDocFieldname($this->app_doc_fieldname);
+
 
         $copyObj->setNew(true);
 
@@ -1245,5 +1378,5 @@ abstract class BaseAppDocument extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppDocument

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppDocument.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppDocumentPeer {
+abstract class BaseAppDocumentPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -24,7 +25,7 @@ abstract class BaseAppDocumentPeer {
     const CLASS_DEFAULT = 'classes.model.AppDocument';
 
     /** The total number of columns. */
-	const NUM_COLUMNS = 14;
+    const NUM_COLUMNS = 15;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -72,6 +73,9 @@ abstract class BaseAppDocumentPeer {
     /** the column name for the APP_DOC_STATUS_DATE field */
     const APP_DOC_STATUS_DATE = 'APP_DOCUMENT.APP_DOC_STATUS_DATE';
 
+    /** the column name for the APP_DOC_FIELDNAME field */
+    const APP_DOC_FIELDNAME = 'APP_DOCUMENT.APP_DOC_FIELDNAME';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -83,10 +87,10 @@ abstract class BaseAppDocumentPeer {
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', ),
-		BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, ),
-		BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, )
+        BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', ),
+        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
     );
 
     /**
@@ -96,10 +100,10 @@ abstract class BaseAppDocumentPeer {
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'DocVersion' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'DocUid' => 4, 'UsrUid' => 5, 'AppDocType' => 6, 'AppDocCreateDate' => 7, 'AppDocIndex' => 8, 'FolderUid' => 9, 'AppDocPlugin' => 10, 'AppDocTags' => 11, 'AppDocStatus' => 12, 'AppDocStatusDate' => 13, ),
-		BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::DOC_VERSION => 1, AppDocumentPeer::APP_UID => 2, AppDocumentPeer::DEL_INDEX => 3, AppDocumentPeer::DOC_UID => 4, AppDocumentPeer::USR_UID => 5, AppDocumentPeer::APP_DOC_TYPE => 6, AppDocumentPeer::APP_DOC_CREATE_DATE => 7, AppDocumentPeer::APP_DOC_INDEX => 8, AppDocumentPeer::FOLDER_UID => 9, AppDocumentPeer::APP_DOC_PLUGIN => 10, AppDocumentPeer::APP_DOC_TAGS => 11, AppDocumentPeer::APP_DOC_STATUS => 12, AppDocumentPeer::APP_DOC_STATUS_DATE => 13, ),
-		BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'DOC_VERSION' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'DOC_UID' => 4, 'USR_UID' => 5, 'APP_DOC_TYPE' => 6, 'APP_DOC_CREATE_DATE' => 7, 'APP_DOC_INDEX' => 8, 'FOLDER_UID' => 9, 'APP_DOC_PLUGIN' => 10, 'APP_DOC_TAGS' => 11, 'APP_DOC_STATUS' => 12, 'APP_DOC_STATUS_DATE' => 13, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, )
+        BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'DocVersion' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'DocUid' => 4, 'UsrUid' => 5, 'AppDocType' => 6, 'AppDocCreateDate' => 7, 'AppDocIndex' => 8, 'FolderUid' => 9, 'AppDocPlugin' => 10, 'AppDocTags' => 11, 'AppDocStatus' => 12, 'AppDocStatusDate' => 13, 'AppDocFieldname' => 14, ),
+        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::DOC_VERSION => 1, AppDocumentPeer::APP_UID => 2, AppDocumentPeer::DEL_INDEX => 3, AppDocumentPeer::DOC_UID => 4, AppDocumentPeer::USR_UID => 5, AppDocumentPeer::APP_DOC_TYPE => 6, AppDocumentPeer::APP_DOC_CREATE_DATE => 7, AppDocumentPeer::APP_DOC_INDEX => 8, AppDocumentPeer::FOLDER_UID => 9, AppDocumentPeer::APP_DOC_PLUGIN => 10, AppDocumentPeer::APP_DOC_TAGS => 11, AppDocumentPeer::APP_DOC_STATUS => 12, AppDocumentPeer::APP_DOC_STATUS_DATE => 13, AppDocumentPeer::APP_DOC_FIELDNAME => 14, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'DOC_VERSION' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'DOC_UID' => 4, 'USR_UID' => 5, 'APP_DOC_TYPE' => 6, 'APP_DOC_CREATE_DATE' => 7, 'APP_DOC_INDEX' => 8, 'FOLDER_UID' => 9, 'APP_DOC_PLUGIN' => 10, 'APP_DOC_TAGS' => 11, 'APP_DOC_STATUS' => 12, 'APP_DOC_STATUS_DATE' => 13, 'APP_DOC_FIELDNAME' => 14, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
     );
 
     /**
@@ -228,6 +232,8 @@ abstract class BaseAppDocumentPeer {
 
         $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_STATUS_DATE);
 
+        $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_FIELDNAME);
+
     }
 
     const COUNT = 'COUNT(APP_DOCUMENT.APP_DOC_UID)';
@@ -255,8 +261,7 @@ abstract class BaseAppDocumentPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -347,7 +352,7 @@ abstract class BaseAppDocumentPeer {
         $cls = AppDocumentPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -413,7 +418,7 @@ abstract class BaseAppDocumentPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -424,8 +429,8 @@ abstract class BaseAppDocumentPeer {
     /**
      * Method perform an UPDATE on the database, given a AppDocument or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppDocument object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppDocument object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -447,7 +452,7 @@ abstract class BaseAppDocumentPeer {
             $comparison = $criteria->getComparison(AppDocumentPeer::DOC_VERSION);
             $selectCriteria->add(AppDocumentPeer::DOC_VERSION, $criteria->remove(AppDocumentPeer::DOC_VERSION), $comparison);
 
-		} else { // $values is AppDocument object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -488,7 +493,8 @@ abstract class BaseAppDocumentPeer {
      * @param      mixed $values Criteria or AppDocument object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -510,14 +516,12 @@ abstract class BaseAppDocumentPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
                 $vals[0][] = $value[0];
                 $vals[1][] = $value[1];
@@ -570,7 +574,7 @@ abstract class BaseAppDocumentPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -610,12 +614,12 @@ abstract class BaseAppDocumentPeer {
     /**
      * Retrieve object using using composite pkey values.
      * @param string $app_doc_uid
-	   @param int $doc_version
-	   
+       * @param int $doc_version
         * @param      Connection $con
      * @return     AppDocument
      */
-	public static function retrieveByPK( $app_doc_uid, $doc_version, $con = null) {
+    public static function retrieveByPK($app_doc_uid, $doc_version, $con = null)
+    {
         if ($con === null) {
             $con = Propel::getConnection(self::DATABASE_NAME);
         }
@@ -626,7 +630,8 @@ abstract class BaseAppDocumentPeer {
 
         return !empty($v) ? $v[0] : null;
     }
-} // BaseAppDocumentPeer
+}
+
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -643,3 +648,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppDocumentMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppDocumentMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppEventPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppEvent extends BaseObject  implements Persistent {
-
+abstract class BaseAppEvent extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,49 +27,42 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the del_index field.
      * @var        int
      */
     protected $del_index = 0;
 
-
     /**
      * The value for the evn_uid field.
      * @var        string
      */
     protected $evn_uid = '';
 
-
     /**
      * The value for the app_evn_action_date field.
      * @var        int
      */
     protected $app_evn_action_date;
 
-
     /**
      * The value for the app_evn_attempts field.
      * @var        int
      */
     protected $app_evn_attempts = 0;
 
-
     /**
      * The value for the app_evn_last_execution_date field.
      * @var        int
      */
     protected $app_evn_last_execution_date;
 
-
     /**
      * The value for the app_evn_status field.
      * @var        string
@@ -139,8 +132,9 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_evn_action_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_evn_action_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_evn_action_date] as date/time value: " . var_export($this->app_evn_action_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_evn_action_date] as date/time value: " .
+                    var_export($this->app_evn_action_date, true));
             }
         } else {
             $ts = $this->app_evn_action_date;
@@ -181,8 +175,9 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_evn_last_execution_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_evn_last_execution_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_evn_last_execution_date] as date/time value: " . var_export($this->app_evn_last_execution_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_evn_last_execution_date] as date/time value: " .
+                    var_export($this->app_evn_last_execution_date, true));
             }
         } else {
             $ts = $this->app_evn_last_execution_date;
@@ -284,8 +279,9 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_evn_action_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_evn_action_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -330,8 +326,9 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_evn_last_execution_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_evn_last_execution_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -444,7 +441,7 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -476,7 +473,7 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -556,7 +553,8 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -727,13 +725,34 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
     {
         $keys = AppEventPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setDelIndex($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setEvnUid($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setAppEvnActionDate($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setAppEvnAttempts($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setAppEvnLastExecutionDate($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAppEvnStatus($arr[$keys[6]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setDelIndex($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setEvnUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setAppEvnActionDate($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setAppEvnAttempts($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setAppEvnLastExecutionDate($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAppEvnStatus($arr[$keys[6]]);
+        }
+
     }
 
     /**
@@ -745,13 +764,34 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppEventPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppEventPeer::APP_UID)) $criteria->add(AppEventPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppEventPeer::DEL_INDEX)) $criteria->add(AppEventPeer::DEL_INDEX, $this->del_index);
-		if ($this->isColumnModified(AppEventPeer::EVN_UID)) $criteria->add(AppEventPeer::EVN_UID, $this->evn_uid);
-		if ($this->isColumnModified(AppEventPeer::APP_EVN_ACTION_DATE)) $criteria->add(AppEventPeer::APP_EVN_ACTION_DATE, $this->app_evn_action_date);
-		if ($this->isColumnModified(AppEventPeer::APP_EVN_ATTEMPTS)) $criteria->add(AppEventPeer::APP_EVN_ATTEMPTS, $this->app_evn_attempts);
-		if ($this->isColumnModified(AppEventPeer::APP_EVN_LAST_EXECUTION_DATE)) $criteria->add(AppEventPeer::APP_EVN_LAST_EXECUTION_DATE, $this->app_evn_last_execution_date);
-		if ($this->isColumnModified(AppEventPeer::APP_EVN_STATUS)) $criteria->add(AppEventPeer::APP_EVN_STATUS, $this->app_evn_status);
+        if ($this->isColumnModified(AppEventPeer::APP_UID)) {
+            $criteria->add(AppEventPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppEventPeer::DEL_INDEX)) {
+            $criteria->add(AppEventPeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(AppEventPeer::EVN_UID)) {
+            $criteria->add(AppEventPeer::EVN_UID, $this->evn_uid);
+        }
+
+        if ($this->isColumnModified(AppEventPeer::APP_EVN_ACTION_DATE)) {
+            $criteria->add(AppEventPeer::APP_EVN_ACTION_DATE, $this->app_evn_action_date);
+        }
+
+        if ($this->isColumnModified(AppEventPeer::APP_EVN_ATTEMPTS)) {
+            $criteria->add(AppEventPeer::APP_EVN_ATTEMPTS, $this->app_evn_attempts);
+        }
+
+        if ($this->isColumnModified(AppEventPeer::APP_EVN_LAST_EXECUTION_DATE)) {
+            $criteria->add(AppEventPeer::APP_EVN_LAST_EXECUTION_DATE, $this->app_evn_last_execution_date);
+        }
+
+        if ($this->isColumnModified(AppEventPeer::APP_EVN_STATUS)) {
+            $criteria->add(AppEventPeer::APP_EVN_STATUS, $this->app_evn_status);
+        }
+
 
         return $criteria;
     }
@@ -879,5 +919,5 @@ abstract class BaseAppEvent extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppEvent

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppEvent.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppEventPeer {
+abstract class BaseAppEventPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -220,8 +221,7 @@ abstract class BaseAppEventPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -312,7 +312,7 @@ abstract class BaseAppEventPeer {
         $cls = AppEventPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -378,7 +378,7 @@ abstract class BaseAppEventPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -389,8 +389,8 @@ abstract class BaseAppEventPeer {
     /**
      * Method perform an UPDATE on the database, given a AppEvent or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppEvent object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppEvent object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -415,7 +415,7 @@ abstract class BaseAppEventPeer {
             $comparison = $criteria->getComparison(AppEventPeer::EVN_UID);
             $selectCriteria->add(AppEventPeer::EVN_UID, $criteria->remove(AppEventPeer::EVN_UID), $comparison);
 
-		} else { // $values is AppEvent object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -456,7 +456,8 @@ abstract class BaseAppEventPeer {
      * @param      mixed $values Criteria or AppEvent object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -478,14 +479,12 @@ abstract class BaseAppEventPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
                 $vals[0][] = $value[0];
                 $vals[1][] = $value[1];
@@ -540,7 +539,7 @@ abstract class BaseAppEventPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -556,13 +555,13 @@ abstract class BaseAppEventPeer {
     /**
      * Retrieve object using using composite pkey values.
      * @param string $app_uid
-	   @param int $del_index
-	   @param string $evn_uid
-	   
+       * @param int $del_index
+       * @param string $evn_uid
         * @param      Connection $con
      * @return     AppEvent
      */
-	public static function retrieveByPK( $app_uid, $del_index, $evn_uid, $con = null) {
+    public static function retrieveByPK($app_uid, $del_index, $evn_uid, $con = null)
+    {
         if ($con === null) {
             $con = Propel::getConnection(self::DATABASE_NAME);
         }
@@ -574,7 +573,8 @@ abstract class BaseAppEventPeer {
 
         return !empty($v) ? $v[0] : null;
     }
-} // BaseAppEventPeer
+}
+
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -591,3 +591,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppEventMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppEventMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppFolderPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppFolder extends BaseObject  implements Persistent {
-
+abstract class BaseAppFolder extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,35 +27,30 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the folder_uid field.
      * @var        string
      */
     protected $folder_uid = '';
 
-
     /**
      * The value for the folder_parent_uid field.
      * @var        string
      */
     protected $folder_parent_uid = '';
 
-
     /**
      * The value for the folder_name field.
      * @var        string
      */
     protected $folder_name;
 
-
     /**
      * The value for the folder_create_date field.
      * @var        int
      */
     protected $folder_create_date;
 
-
     /**
      * The value for the folder_update_date field.
      * @var        int
@@ -125,8 +120,9 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
         } elseif (!is_int($this->folder_create_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->folder_create_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [folder_create_date] as date/time value: " . var_export($this->folder_create_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [folder_create_date] as date/time value: " .
+                    var_export($this->folder_create_date, true));
             }
         } else {
             $ts = $this->folder_create_date;
@@ -156,8 +152,9 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
         } elseif (!is_int($this->folder_update_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->folder_update_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [folder_update_date] as date/time value: " . var_export($this->folder_update_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [folder_update_date] as date/time value: " .
+                    var_export($this->folder_update_date, true));
             }
         } else {
             $ts = $this->folder_update_date;
@@ -248,8 +245,9 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [folder_create_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [folder_create_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -272,8 +270,9 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [folder_update_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [folder_update_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -360,7 +359,7 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -392,7 +391,7 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -472,7 +471,8 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -629,11 +629,26 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
     {
         $keys = AppFolderPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setFolderUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setFolderParentUid($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setFolderName($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setFolderCreateDate($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setFolderUpdateDate($arr[$keys[4]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setFolderUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setFolderParentUid($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setFolderName($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setFolderCreateDate($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setFolderUpdateDate($arr[$keys[4]]);
+        }
+
     }
 
     /**
@@ -645,11 +660,26 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppFolderPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppFolderPeer::FOLDER_UID)) $criteria->add(AppFolderPeer::FOLDER_UID, $this->folder_uid);
-		if ($this->isColumnModified(AppFolderPeer::FOLDER_PARENT_UID)) $criteria->add(AppFolderPeer::FOLDER_PARENT_UID, $this->folder_parent_uid);
-		if ($this->isColumnModified(AppFolderPeer::FOLDER_NAME)) $criteria->add(AppFolderPeer::FOLDER_NAME, $this->folder_name);
-		if ($this->isColumnModified(AppFolderPeer::FOLDER_CREATE_DATE)) $criteria->add(AppFolderPeer::FOLDER_CREATE_DATE, $this->folder_create_date);
-		if ($this->isColumnModified(AppFolderPeer::FOLDER_UPDATE_DATE)) $criteria->add(AppFolderPeer::FOLDER_UPDATE_DATE, $this->folder_update_date);
+        if ($this->isColumnModified(AppFolderPeer::FOLDER_UID)) {
+            $criteria->add(AppFolderPeer::FOLDER_UID, $this->folder_uid);
+        }
+
+        if ($this->isColumnModified(AppFolderPeer::FOLDER_PARENT_UID)) {
+            $criteria->add(AppFolderPeer::FOLDER_PARENT_UID, $this->folder_parent_uid);
+        }
+
+        if ($this->isColumnModified(AppFolderPeer::FOLDER_NAME)) {
+            $criteria->add(AppFolderPeer::FOLDER_NAME, $this->folder_name);
+        }
+
+        if ($this->isColumnModified(AppFolderPeer::FOLDER_CREATE_DATE)) {
+            $criteria->add(AppFolderPeer::FOLDER_CREATE_DATE, $this->folder_create_date);
+        }
+
+        if ($this->isColumnModified(AppFolderPeer::FOLDER_UPDATE_DATE)) {
+            $criteria->add(AppFolderPeer::FOLDER_UPDATE_DATE, $this->folder_update_date);
+        }
+
 
         return $criteria;
     }
@@ -756,5 +786,5 @@ abstract class BaseAppFolder extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppFolder

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppFolder.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppFolderPeer {
+abstract class BaseAppFolderPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -210,8 +211,7 @@ abstract class BaseAppFolderPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -302,7 +302,7 @@ abstract class BaseAppFolderPeer {
         $cls = AppFolderPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -368,7 +368,7 @@ abstract class BaseAppFolderPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -379,8 +379,8 @@ abstract class BaseAppFolderPeer {
     /**
      * Method perform an UPDATE on the database, given a AppFolder or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppFolder object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppFolder object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -399,7 +399,7 @@ abstract class BaseAppFolderPeer {
             $comparison = $criteria->getComparison(AppFolderPeer::FOLDER_UID);
             $selectCriteria->add(AppFolderPeer::FOLDER_UID, $criteria->remove(AppFolderPeer::FOLDER_UID), $comparison);
 
-		} else { // $values is AppFolder object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -440,7 +440,8 @@ abstract class BaseAppFolderPeer {
      * @param      mixed $values Criteria or AppFolder object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -505,7 +506,7 @@ abstract class BaseAppFolderPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -565,8 +566,8 @@ abstract class BaseAppFolderPeer {
         }
         return $objs;
     }
+}
 
-} // BaseAppFolderPeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -583,3 +584,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppFolderMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppFolderMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppHistoryPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppHistory extends BaseObject  implements Persistent {
-
+abstract class BaseAppHistory extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,63 +27,54 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the del_index field.
      * @var        int
      */
     protected $del_index = 0;
 
-
     /**
      * The value for the pro_uid field.
      * @var        string
      */
     protected $pro_uid = '';
 
-
     /**
      * The value for the tas_uid field.
      * @var        string
      */
     protected $tas_uid = '';
 
-
     /**
      * The value for the dyn_uid field.
      * @var        string
      */
     protected $dyn_uid = '';
 
-
     /**
      * The value for the usr_uid field.
      * @var        string
      */
     protected $usr_uid = '';
 
-
     /**
      * The value for the app_status field.
      * @var        string
      */
     protected $app_status = '';
 
-
     /**
      * The value for the history_date field.
      * @var        int
      */
     protected $history_date;
 
-
     /**
      * The value for the history_data field.
      * @var        string
@@ -197,8 +188,9 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
         } elseif (!is_int($this->history_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->history_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [history_date] as date/time value: " . var_export($this->history_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [history_date] as date/time value: " .
+                    var_export($this->history_date, true));
             }
         } else {
             $ts = $this->history_date;
@@ -388,8 +380,9 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [history_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [history_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -506,7 +499,7 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -538,7 +531,7 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -618,7 +611,8 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -803,15 +797,42 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
     {
         $keys = AppHistoryPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setDelIndex($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setProUid($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setTasUid($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setDynUid($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setUsrUid($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAppStatus($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setHistoryDate($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setHistoryData($arr[$keys[8]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setDelIndex($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setProUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setTasUid($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setDynUid($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setUsrUid($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAppStatus($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setHistoryDate($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setHistoryData($arr[$keys[8]]);
+        }
+
     }
 
     /**
@@ -823,15 +844,42 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppHistoryPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppHistoryPeer::APP_UID)) $criteria->add(AppHistoryPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppHistoryPeer::DEL_INDEX)) $criteria->add(AppHistoryPeer::DEL_INDEX, $this->del_index);
-		if ($this->isColumnModified(AppHistoryPeer::PRO_UID)) $criteria->add(AppHistoryPeer::PRO_UID, $this->pro_uid);
-		if ($this->isColumnModified(AppHistoryPeer::TAS_UID)) $criteria->add(AppHistoryPeer::TAS_UID, $this->tas_uid);
-		if ($this->isColumnModified(AppHistoryPeer::DYN_UID)) $criteria->add(AppHistoryPeer::DYN_UID, $this->dyn_uid);
-		if ($this->isColumnModified(AppHistoryPeer::USR_UID)) $criteria->add(AppHistoryPeer::USR_UID, $this->usr_uid);
-		if ($this->isColumnModified(AppHistoryPeer::APP_STATUS)) $criteria->add(AppHistoryPeer::APP_STATUS, $this->app_status);
-		if ($this->isColumnModified(AppHistoryPeer::HISTORY_DATE)) $criteria->add(AppHistoryPeer::HISTORY_DATE, $this->history_date);
-		if ($this->isColumnModified(AppHistoryPeer::HISTORY_DATA)) $criteria->add(AppHistoryPeer::HISTORY_DATA, $this->history_data);
+        if ($this->isColumnModified(AppHistoryPeer::APP_UID)) {
+            $criteria->add(AppHistoryPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::DEL_INDEX)) {
+            $criteria->add(AppHistoryPeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::PRO_UID)) {
+            $criteria->add(AppHistoryPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::TAS_UID)) {
+            $criteria->add(AppHistoryPeer::TAS_UID, $this->tas_uid);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::DYN_UID)) {
+            $criteria->add(AppHistoryPeer::DYN_UID, $this->dyn_uid);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::USR_UID)) {
+            $criteria->add(AppHistoryPeer::USR_UID, $this->usr_uid);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::APP_STATUS)) {
+            $criteria->add(AppHistoryPeer::APP_STATUS, $this->app_status);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::HISTORY_DATE)) {
+            $criteria->add(AppHistoryPeer::HISTORY_DATE, $this->history_date);
+        }
+
+        if ($this->isColumnModified(AppHistoryPeer::HISTORY_DATA)) {
+            $criteria->add(AppHistoryPeer::HISTORY_DATA, $this->history_data);
+        }
+
 
         return $criteria;
     }
@@ -949,5 +997,5 @@ abstract class BaseAppHistory extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppHistory

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppHistory.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppHistoryPeer {
+abstract class BaseAppHistoryPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -230,8 +231,7 @@ abstract class BaseAppHistoryPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -322,7 +322,7 @@ abstract class BaseAppHistoryPeer {
         $cls = AppHistoryPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -388,7 +388,7 @@ abstract class BaseAppHistoryPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -399,8 +399,8 @@ abstract class BaseAppHistoryPeer {
     /**
      * Method perform an UPDATE on the database, given a AppHistory or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppHistory object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppHistory object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -416,7 +416,7 @@ abstract class BaseAppHistoryPeer {
         if ($values instanceof Criteria) {
             $criteria = clone $values; // rename for clarity
 
-		} else { // $values is AppHistory object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -457,7 +457,8 @@ abstract class BaseAppHistoryPeer {
      * @param      mixed $values Criteria or AppHistory object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -479,14 +480,12 @@ abstract class BaseAppHistoryPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
             }
 
@@ -535,7 +534,7 @@ abstract class BaseAppHistoryPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -547,8 +546,8 @@ abstract class BaseAppHistoryPeer {
 
         return BasePeer::doValidate(AppHistoryPeer::DATABASE_NAME, AppHistoryPeer::TABLE_NAME, $columns);
     }
+}
 
-} // BaseAppHistoryPeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -565,3 +564,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppHistoryMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppHistoryMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppMessagePeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppMessage extends BaseObject  implements Persistent {
-
+abstract class BaseAppMessage extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,112 +27,96 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_msg_uid field.
      * @var        string
      */
     protected $app_msg_uid;
 
-
     /**
      * The value for the msg_uid field.
      * @var        string
      */
     protected $msg_uid;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the del_index field.
      * @var        int
      */
     protected $del_index = 0;
 
-
     /**
      * The value for the app_msg_type field.
      * @var        string
      */
     protected $app_msg_type = '';
 
-
     /**
      * The value for the app_msg_subject field.
      * @var        string
      */
     protected $app_msg_subject = '';
 
-
     /**
      * The value for the app_msg_from field.
      * @var        string
      */
     protected $app_msg_from = '';
 
-
     /**
      * The value for the app_msg_to field.
      * @var        string
      */
     protected $app_msg_to;
 
-
     /**
      * The value for the app_msg_body field.
      * @var        string
      */
     protected $app_msg_body;
 
-
     /**
      * The value for the app_msg_date field.
      * @var        int
      */
     protected $app_msg_date;
 
-
     /**
      * The value for the app_msg_cc field.
      * @var        string
      */
     protected $app_msg_cc;
 
-
     /**
      * The value for the app_msg_bcc field.
      * @var        string
      */
     protected $app_msg_bcc;
 
-
     /**
      * The value for the app_msg_template field.
      * @var        string
      */
     protected $app_msg_template;
 
-
     /**
      * The value for the app_msg_status field.
      * @var        string
      */
     protected $app_msg_status;
 
-
     /**
      * The value for the app_msg_attach field.
      * @var        string
      */
     protected $app_msg_attach;
 
-
     /**
      * The value for the app_msg_send_date field.
      * @var        int
@@ -268,8 +252,9 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_msg_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_msg_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_msg_date] as date/time value: " . var_export($this->app_msg_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_msg_date] as date/time value: " .
+                    var_export($this->app_msg_date, true));
             }
         } else {
             $ts = $this->app_msg_date;
@@ -354,8 +339,9 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_msg_send_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_msg_send_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_msg_send_date] as date/time value: " . var_export($this->app_msg_send_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_msg_send_date] as date/time value: " .
+                    var_export($this->app_msg_send_date, true));
             }
         } else {
             $ts = $this->app_msg_send_date;
@@ -578,8 +564,9 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_msg_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_msg_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -712,8 +699,9 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_msg_send_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_msg_send_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -822,7 +810,7 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -854,7 +842,7 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -934,7 +922,8 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -1168,22 +1157,70 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
     {
         $keys = AppMessagePeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppMsgUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setMsgUid($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAppUid($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setDelIndex($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setAppMsgType($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setAppMsgSubject($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAppMsgFrom($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setAppMsgTo($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setAppMsgBody($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setAppMsgDate($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setAppMsgCc($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setAppMsgBcc($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setAppMsgTemplate($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setAppMsgStatus($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setAppMsgAttach($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setAppMsgSendDate($arr[$keys[15]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppMsgUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setMsgUid($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setDelIndex($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setAppMsgType($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setAppMsgSubject($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAppMsgFrom($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setAppMsgTo($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setAppMsgBody($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setAppMsgDate($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setAppMsgCc($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setAppMsgBcc($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setAppMsgTemplate($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setAppMsgStatus($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setAppMsgAttach($arr[$keys[14]]);
+        }
+
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setAppMsgSendDate($arr[$keys[15]]);
+        }
+
     }
 
     /**
@@ -1195,22 +1232,70 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppMessagePeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_UID)) $criteria->add(AppMessagePeer::APP_MSG_UID, $this->app_msg_uid);
-		if ($this->isColumnModified(AppMessagePeer::MSG_UID)) $criteria->add(AppMessagePeer::MSG_UID, $this->msg_uid);
-		if ($this->isColumnModified(AppMessagePeer::APP_UID)) $criteria->add(AppMessagePeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppMessagePeer::DEL_INDEX)) $criteria->add(AppMessagePeer::DEL_INDEX, $this->del_index);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_TYPE)) $criteria->add(AppMessagePeer::APP_MSG_TYPE, $this->app_msg_type);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_SUBJECT)) $criteria->add(AppMessagePeer::APP_MSG_SUBJECT, $this->app_msg_subject);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_FROM)) $criteria->add(AppMessagePeer::APP_MSG_FROM, $this->app_msg_from);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_TO)) $criteria->add(AppMessagePeer::APP_MSG_TO, $this->app_msg_to);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_BODY)) $criteria->add(AppMessagePeer::APP_MSG_BODY, $this->app_msg_body);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_DATE)) $criteria->add(AppMessagePeer::APP_MSG_DATE, $this->app_msg_date);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_CC)) $criteria->add(AppMessagePeer::APP_MSG_CC, $this->app_msg_cc);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_BCC)) $criteria->add(AppMessagePeer::APP_MSG_BCC, $this->app_msg_bcc);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_TEMPLATE)) $criteria->add(AppMessagePeer::APP_MSG_TEMPLATE, $this->app_msg_template);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_STATUS)) $criteria->add(AppMessagePeer::APP_MSG_STATUS, $this->app_msg_status);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_ATTACH)) $criteria->add(AppMessagePeer::APP_MSG_ATTACH, $this->app_msg_attach);
-		if ($this->isColumnModified(AppMessagePeer::APP_MSG_SEND_DATE)) $criteria->add(AppMessagePeer::APP_MSG_SEND_DATE, $this->app_msg_send_date);
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_UID)) {
+            $criteria->add(AppMessagePeer::APP_MSG_UID, $this->app_msg_uid);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::MSG_UID)) {
+            $criteria->add(AppMessagePeer::MSG_UID, $this->msg_uid);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_UID)) {
+            $criteria->add(AppMessagePeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::DEL_INDEX)) {
+            $criteria->add(AppMessagePeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_TYPE)) {
+            $criteria->add(AppMessagePeer::APP_MSG_TYPE, $this->app_msg_type);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_SUBJECT)) {
+            $criteria->add(AppMessagePeer::APP_MSG_SUBJECT, $this->app_msg_subject);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_FROM)) {
+            $criteria->add(AppMessagePeer::APP_MSG_FROM, $this->app_msg_from);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_TO)) {
+            $criteria->add(AppMessagePeer::APP_MSG_TO, $this->app_msg_to);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_BODY)) {
+            $criteria->add(AppMessagePeer::APP_MSG_BODY, $this->app_msg_body);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_DATE)) {
+            $criteria->add(AppMessagePeer::APP_MSG_DATE, $this->app_msg_date);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_CC)) {
+            $criteria->add(AppMessagePeer::APP_MSG_CC, $this->app_msg_cc);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_BCC)) {
+            $criteria->add(AppMessagePeer::APP_MSG_BCC, $this->app_msg_bcc);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_TEMPLATE)) {
+            $criteria->add(AppMessagePeer::APP_MSG_TEMPLATE, $this->app_msg_template);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_STATUS)) {
+            $criteria->add(AppMessagePeer::APP_MSG_STATUS, $this->app_msg_status);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_ATTACH)) {
+            $criteria->add(AppMessagePeer::APP_MSG_ATTACH, $this->app_msg_attach);
+        }
+
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_SEND_DATE)) {
+            $criteria->add(AppMessagePeer::APP_MSG_SEND_DATE, $this->app_msg_send_date);
+        }
+
 
         return $criteria;
     }
@@ -1339,5 +1424,5 @@ abstract class BaseAppMessage extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppMessage

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppMessage.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppMessagePeer {
+abstract class BaseAppMessagePeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -265,8 +266,7 @@ abstract class BaseAppMessagePeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -357,7 +357,7 @@ abstract class BaseAppMessagePeer {
         $cls = AppMessagePeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -423,7 +423,7 @@ abstract class BaseAppMessagePeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -434,8 +434,8 @@ abstract class BaseAppMessagePeer {
     /**
      * Method perform an UPDATE on the database, given a AppMessage or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppMessage object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppMessage object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -454,7 +454,7 @@ abstract class BaseAppMessagePeer {
             $comparison = $criteria->getComparison(AppMessagePeer::APP_MSG_UID);
             $selectCriteria->add(AppMessagePeer::APP_MSG_UID, $criteria->remove(AppMessagePeer::APP_MSG_UID), $comparison);
 
-		} else { // $values is AppMessage object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -495,7 +495,8 @@ abstract class BaseAppMessagePeer {
      * @param      mixed $values Criteria or AppMessage object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -560,7 +561,7 @@ abstract class BaseAppMessagePeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -620,8 +621,8 @@ abstract class BaseAppMessagePeer {
         }
         return $objs;
     }
+}
 
-} // BaseAppMessagePeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -638,3 +639,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppMessageMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppMessageMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppNotesPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppNotes extends BaseObject  implements Persistent {
-
+abstract class BaseAppNotes extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,70 +27,60 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the usr_uid field.
      * @var        string
      */
     protected $usr_uid = '';
 
-
     /**
      * The value for the note_date field.
      * @var        int
      */
     protected $note_date;
 
-
     /**
      * The value for the note_content field.
      * @var        string
      */
     protected $note_content;
 
-
     /**
      * The value for the note_type field.
      * @var        string
      */
     protected $note_type = 'USER';
 
-
     /**
      * The value for the note_availability field.
      * @var        string
      */
     protected $note_availability = 'PUBLIC';
 
-
     /**
      * The value for the note_origin_obj field.
      * @var        string
      */
     protected $note_origin_obj = '';
 
-
     /**
      * The value for the note_affected_obj1 field.
      * @var        string
      */
     protected $note_affected_obj1 = '';
 
-
     /**
      * The value for the note_affected_obj2 field.
      * @var        string
      */
     protected $note_affected_obj2 = '';
 
-
     /**
      * The value for the note_recipients field.
      * @var        string
@@ -149,8 +139,9 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
         } elseif (!is_int($this->note_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->note_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [note_date] as date/time value: " . var_export($this->note_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [note_date] as date/time value: " .
+                    var_export($this->note_date, true));
             }
         } else {
             $ts = $this->note_date;
@@ -296,8 +287,9 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [note_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [note_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -548,7 +540,7 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -580,7 +572,7 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -660,7 +652,8 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -852,16 +845,46 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
     {
         $keys = AppNotesPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setUsrUid($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setNoteDate($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setNoteContent($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setNoteType($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setNoteAvailability($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setNoteOriginObj($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setNoteAffectedObj1($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setNoteAffectedObj2($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setNoteRecipients($arr[$keys[9]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setUsrUid($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setNoteDate($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setNoteContent($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setNoteType($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setNoteAvailability($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setNoteOriginObj($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setNoteAffectedObj1($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setNoteAffectedObj2($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setNoteRecipients($arr[$keys[9]]);
+        }
+
     }
 
     /**
@@ -873,16 +896,46 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppNotesPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppNotesPeer::APP_UID)) $criteria->add(AppNotesPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppNotesPeer::USR_UID)) $criteria->add(AppNotesPeer::USR_UID, $this->usr_uid);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_DATE)) $criteria->add(AppNotesPeer::NOTE_DATE, $this->note_date);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_CONTENT)) $criteria->add(AppNotesPeer::NOTE_CONTENT, $this->note_content);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_TYPE)) $criteria->add(AppNotesPeer::NOTE_TYPE, $this->note_type);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_AVAILABILITY)) $criteria->add(AppNotesPeer::NOTE_AVAILABILITY, $this->note_availability);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_ORIGIN_OBJ)) $criteria->add(AppNotesPeer::NOTE_ORIGIN_OBJ, $this->note_origin_obj);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_AFFECTED_OBJ1)) $criteria->add(AppNotesPeer::NOTE_AFFECTED_OBJ1, $this->note_affected_obj1);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_AFFECTED_OBJ2)) $criteria->add(AppNotesPeer::NOTE_AFFECTED_OBJ2, $this->note_affected_obj2);
-		if ($this->isColumnModified(AppNotesPeer::NOTE_RECIPIENTS)) $criteria->add(AppNotesPeer::NOTE_RECIPIENTS, $this->note_recipients);
+        if ($this->isColumnModified(AppNotesPeer::APP_UID)) {
+            $criteria->add(AppNotesPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::USR_UID)) {
+            $criteria->add(AppNotesPeer::USR_UID, $this->usr_uid);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_DATE)) {
+            $criteria->add(AppNotesPeer::NOTE_DATE, $this->note_date);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_CONTENT)) {
+            $criteria->add(AppNotesPeer::NOTE_CONTENT, $this->note_content);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_TYPE)) {
+            $criteria->add(AppNotesPeer::NOTE_TYPE, $this->note_type);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_AVAILABILITY)) {
+            $criteria->add(AppNotesPeer::NOTE_AVAILABILITY, $this->note_availability);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_ORIGIN_OBJ)) {
+            $criteria->add(AppNotesPeer::NOTE_ORIGIN_OBJ, $this->note_origin_obj);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_AFFECTED_OBJ1)) {
+            $criteria->add(AppNotesPeer::NOTE_AFFECTED_OBJ1, $this->note_affected_obj1);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_AFFECTED_OBJ2)) {
+            $criteria->add(AppNotesPeer::NOTE_AFFECTED_OBJ2, $this->note_affected_obj2);
+        }
+
+        if ($this->isColumnModified(AppNotesPeer::NOTE_RECIPIENTS)) {
+            $criteria->add(AppNotesPeer::NOTE_RECIPIENTS, $this->note_recipients);
+        }
+
 
         return $criteria;
     }
@@ -1002,5 +1055,5 @@ abstract class BaseAppNotes extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppNotes

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppNotes.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppNotesPeer {
+abstract class BaseAppNotesPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -235,8 +236,7 @@ abstract class BaseAppNotesPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -327,7 +327,7 @@ abstract class BaseAppNotesPeer {
         $cls = AppNotesPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -393,7 +393,7 @@ abstract class BaseAppNotesPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -404,8 +404,8 @@ abstract class BaseAppNotesPeer {
     /**
      * Method perform an UPDATE on the database, given a AppNotes or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppNotes object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppNotes object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -421,7 +421,7 @@ abstract class BaseAppNotesPeer {
         if ($values instanceof Criteria) {
             $criteria = clone $values; // rename for clarity
 
-		} else { // $values is AppNotes object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -462,7 +462,8 @@ abstract class BaseAppNotesPeer {
      * @param      mixed $values Criteria or AppNotes object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -484,14 +485,12 @@ abstract class BaseAppNotesPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
             }
 
@@ -540,7 +539,7 @@ abstract class BaseAppNotesPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -552,8 +551,8 @@ abstract class BaseAppNotesPeer {
 
         return BasePeer::doValidate(AppNotesPeer::DATABASE_NAME, AppNotesPeer::TABLE_NAME, $columns);
     }
+}
 
-} // BaseAppNotesPeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -570,3 +569,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppNotesMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppNotesMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppOwnerPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppOwner extends BaseObject  implements Persistent {
-
+abstract class BaseAppOwner extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,21 +27,18 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the own_uid field.
      * @var        string
      */
     protected $own_uid = '';
 
-
     /**
      * The value for the usr_uid field.
      * @var        string
@@ -232,7 +229,7 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -264,7 +261,7 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -344,7 +341,8 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -487,9 +485,18 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
     {
         $keys = AppOwnerPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setOwnUid($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setUsrUid($arr[$keys[2]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setOwnUid($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setUsrUid($arr[$keys[2]]);
+        }
+
     }
 
     /**
@@ -501,9 +508,18 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppOwnerPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppOwnerPeer::APP_UID)) $criteria->add(AppOwnerPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppOwnerPeer::OWN_UID)) $criteria->add(AppOwnerPeer::OWN_UID, $this->own_uid);
-		if ($this->isColumnModified(AppOwnerPeer::USR_UID)) $criteria->add(AppOwnerPeer::USR_UID, $this->usr_uid);
+        if ($this->isColumnModified(AppOwnerPeer::APP_UID)) {
+            $criteria->add(AppOwnerPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppOwnerPeer::OWN_UID)) {
+            $criteria->add(AppOwnerPeer::OWN_UID, $this->own_uid);
+        }
+
+        if ($this->isColumnModified(AppOwnerPeer::USR_UID)) {
+            $criteria->add(AppOwnerPeer::USR_UID, $this->usr_uid);
+        }
+
 
         return $criteria;
     }
@@ -623,5 +639,5 @@ abstract class BaseAppOwner extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppOwner

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppOwner.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppOwnerPeer {
+abstract class BaseAppOwnerPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -200,8 +201,7 @@ abstract class BaseAppOwnerPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -292,7 +292,7 @@ abstract class BaseAppOwnerPeer {
         $cls = AppOwnerPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -358,7 +358,7 @@ abstract class BaseAppOwnerPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -369,8 +369,8 @@ abstract class BaseAppOwnerPeer {
     /**
      * Method perform an UPDATE on the database, given a AppOwner or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppOwner object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppOwner object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -395,7 +395,7 @@ abstract class BaseAppOwnerPeer {
             $comparison = $criteria->getComparison(AppOwnerPeer::USR_UID);
             $selectCriteria->add(AppOwnerPeer::USR_UID, $criteria->remove(AppOwnerPeer::USR_UID), $comparison);
 
-		} else { // $values is AppOwner object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -436,7 +436,8 @@ abstract class BaseAppOwnerPeer {
      * @param      mixed $values Criteria or AppOwner object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -458,14 +459,12 @@ abstract class BaseAppOwnerPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
                 $vals[0][] = $value[0];
                 $vals[1][] = $value[1];
@@ -520,7 +519,7 @@ abstract class BaseAppOwnerPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -536,13 +535,13 @@ abstract class BaseAppOwnerPeer {
     /**
      * Retrieve object using using composite pkey values.
      * @param string $app_uid
-	   @param string $own_uid
-	   @param string $usr_uid
-	   
+       * @param string $own_uid
+       * @param string $usr_uid
         * @param      Connection $con
      * @return     AppOwner
      */
-	public static function retrieveByPK( $app_uid, $own_uid, $usr_uid, $con = null) {
+    public static function retrieveByPK($app_uid, $own_uid, $usr_uid, $con = null)
+    {
         if ($con === null) {
             $con = Propel::getConnection(self::DATABASE_NAME);
         }
@@ -554,7 +553,8 @@ abstract class BaseAppOwnerPeer {
 
         return !empty($v) ? $v[0] : null;
     }
-} // BaseAppOwnerPeer
+}
+
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -571,3 +571,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppOwnerMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppOwnerMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppSolrQueuePeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
-
+abstract class BaseAppSolrQueue extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,14 +27,12 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the app_updated field.
      * @var        int
@@ -190,7 +188,7 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -222,7 +220,7 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -302,7 +300,8 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -438,8 +437,14 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
     {
         $keys = AppSolrQueuePeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setAppUpdated($arr[$keys[1]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setAppUpdated($arr[$keys[1]]);
+        }
+
     }
 
     /**
@@ -451,8 +456,14 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppSolrQueuePeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppSolrQueuePeer::APP_UID)) $criteria->add(AppSolrQueuePeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppSolrQueuePeer::APP_UPDATED)) $criteria->add(AppSolrQueuePeer::APP_UPDATED, $this->app_updated);
+        if ($this->isColumnModified(AppSolrQueuePeer::APP_UID)) {
+            $criteria->add(AppSolrQueuePeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppSolrQueuePeer::APP_UPDATED)) {
+            $criteria->add(AppSolrQueuePeer::APP_UPDATED, $this->app_updated);
+        }
+
 
         return $criteria;
     }
@@ -553,5 +564,5 @@ abstract class BaseAppSolrQueue extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppSolrQueue

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppSolrQueue.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppSolrQueuePeer {
+abstract class BaseAppSolrQueuePeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -195,8 +196,7 @@ abstract class BaseAppSolrQueuePeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -287,7 +287,7 @@ abstract class BaseAppSolrQueuePeer {
         $cls = AppSolrQueuePeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -353,7 +353,7 @@ abstract class BaseAppSolrQueuePeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -364,8 +364,8 @@ abstract class BaseAppSolrQueuePeer {
     /**
      * Method perform an UPDATE on the database, given a AppSolrQueue or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppSolrQueue object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppSolrQueue object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -384,7 +384,7 @@ abstract class BaseAppSolrQueuePeer {
             $comparison = $criteria->getComparison(AppSolrQueuePeer::APP_UID);
             $selectCriteria->add(AppSolrQueuePeer::APP_UID, $criteria->remove(AppSolrQueuePeer::APP_UID), $comparison);
 
-		} else { // $values is AppSolrQueue object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -425,7 +425,8 @@ abstract class BaseAppSolrQueuePeer {
      * @param      mixed $values Criteria or AppSolrQueue object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -490,7 +491,7 @@ abstract class BaseAppSolrQueuePeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -550,8 +551,8 @@ abstract class BaseAppSolrQueuePeer {
         }
         return $objs;
     }
+}
 
-} // BaseAppSolrQueuePeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -568,3 +569,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppSolrQueueMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppSolrQueueMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/AppThreadPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppThread extends BaseObject  implements Persistent {
-
+abstract class BaseAppThread extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,35 +27,30 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the app_thread_index field.
      * @var        int
      */
     protected $app_thread_index = 0;
 
-
     /**
      * The value for the app_thread_parent field.
      * @var        int
      */
     protected $app_thread_parent = 0;
 
-
     /**
      * The value for the app_thread_status field.
      * @var        string
      */
     protected $app_thread_status = 'OPEN';
 
-
     /**
      * The value for the del_index field.
      * @var        int
@@ -316,7 +311,7 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -348,7 +343,7 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -428,7 +423,8 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -585,11 +581,26 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
     {
         $keys = AppThreadPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setAppThreadIndex($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAppThreadParent($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setAppThreadStatus($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setDelIndex($arr[$keys[4]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setAppThreadIndex($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppThreadParent($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setAppThreadStatus($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setDelIndex($arr[$keys[4]]);
+        }
+
     }
 
     /**
@@ -601,11 +612,26 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(AppThreadPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(AppThreadPeer::APP_UID)) $criteria->add(AppThreadPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(AppThreadPeer::APP_THREAD_INDEX)) $criteria->add(AppThreadPeer::APP_THREAD_INDEX, $this->app_thread_index);
-		if ($this->isColumnModified(AppThreadPeer::APP_THREAD_PARENT)) $criteria->add(AppThreadPeer::APP_THREAD_PARENT, $this->app_thread_parent);
-		if ($this->isColumnModified(AppThreadPeer::APP_THREAD_STATUS)) $criteria->add(AppThreadPeer::APP_THREAD_STATUS, $this->app_thread_status);
-		if ($this->isColumnModified(AppThreadPeer::DEL_INDEX)) $criteria->add(AppThreadPeer::DEL_INDEX, $this->del_index);
+        if ($this->isColumnModified(AppThreadPeer::APP_UID)) {
+            $criteria->add(AppThreadPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(AppThreadPeer::APP_THREAD_INDEX)) {
+            $criteria->add(AppThreadPeer::APP_THREAD_INDEX, $this->app_thread_index);
+        }
+
+        if ($this->isColumnModified(AppThreadPeer::APP_THREAD_PARENT)) {
+            $criteria->add(AppThreadPeer::APP_THREAD_PARENT, $this->app_thread_parent);
+        }
+
+        if ($this->isColumnModified(AppThreadPeer::APP_THREAD_STATUS)) {
+            $criteria->add(AppThreadPeer::APP_THREAD_STATUS, $this->app_thread_status);
+        }
+
+        if ($this->isColumnModified(AppThreadPeer::DEL_INDEX)) {
+            $criteria->add(AppThreadPeer::DEL_INDEX, $this->del_index);
+        }
+
 
         return $criteria;
     }
@@ -724,5 +750,5 @@ abstract class BaseAppThread extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseAppThread

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

@@ -12,7 +12,8 @@ include_once 'classes/model/AppThread.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseAppThreadPeer {
+abstract class BaseAppThreadPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -210,8 +211,7 @@ abstract class BaseAppThreadPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -302,7 +302,7 @@ abstract class BaseAppThreadPeer {
         $cls = AppThreadPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -368,7 +368,7 @@ abstract class BaseAppThreadPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -379,8 +379,8 @@ abstract class BaseAppThreadPeer {
     /**
      * Method perform an UPDATE on the database, given a AppThread or Criteria object.
      *
-	 * @param      mixed $values Criteria or AppThread object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or AppThread object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -402,7 +402,7 @@ abstract class BaseAppThreadPeer {
             $comparison = $criteria->getComparison(AppThreadPeer::APP_THREAD_INDEX);
             $selectCriteria->add(AppThreadPeer::APP_THREAD_INDEX, $criteria->remove(AppThreadPeer::APP_THREAD_INDEX), $comparison);
 
-		} else { // $values is AppThread object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -443,7 +443,8 @@ abstract class BaseAppThreadPeer {
      * @param      mixed $values Criteria or AppThread object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -465,14 +466,12 @@ abstract class BaseAppThreadPeer {
             // primary key is composite; we therefore, expect
             // the primary key passed to be an array of pkey
             // values
-			if(count($values) == count($values, COUNT_RECURSIVE))
-			{
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
                 // array is not multi-dimensional
                 $values = array($values);
             }
             $vals = array();
-			foreach($values as $value)
-			{
+            foreach ($values as $value) {
 
                 $vals[0][] = $value[0];
                 $vals[1][] = $value[1];
@@ -525,7 +524,7 @@ abstract class BaseAppThreadPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -544,12 +543,12 @@ abstract class BaseAppThreadPeer {
     /**
      * Retrieve object using using composite pkey values.
      * @param string $app_uid
-	   @param int $app_thread_index
-	   
+       * @param int $app_thread_index
         * @param      Connection $con
      * @return     AppThread
      */
-	public static function retrieveByPK( $app_uid, $app_thread_index, $con = null) {
+    public static function retrieveByPK($app_uid, $app_thread_index, $con = null)
+    {
         if ($con === null) {
             $con = Propel::getConnection(self::DATABASE_NAME);
         }
@@ -560,7 +559,8 @@ abstract class BaseAppThreadPeer {
 
         return !empty($v) ? $v[0] : null;
     }
-} // BaseAppThreadPeer
+}
+
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -577,3 +577,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/AppThreadMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.AppThreadMapBuilder');
 }
+

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

@@ -16,8 +16,8 @@ include_once 'classes/model/ApplicationPeer.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseApplication extends BaseObject  implements Persistent {
-
+abstract class BaseApplication extends BaseObject implements Persistent
+{
 
     /**
      * The Peer class.
@@ -27,112 +27,96 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
     */
     protected static $peer;
 
-
     /**
      * The value for the app_uid field.
      * @var        string
      */
     protected $app_uid = '';
 
-
     /**
      * The value for the app_number field.
      * @var        int
      */
     protected $app_number = 0;
 
-
     /**
      * The value for the app_parent field.
      * @var        string
      */
     protected $app_parent = '0';
 
-
     /**
      * The value for the app_status field.
      * @var        string
      */
     protected $app_status = '';
 
-
     /**
      * The value for the pro_uid field.
      * @var        string
      */
     protected $pro_uid = '';
 
-
     /**
      * The value for the app_proc_status field.
      * @var        string
      */
     protected $app_proc_status = '';
 
-
     /**
      * The value for the app_proc_code field.
      * @var        string
      */
     protected $app_proc_code = '';
 
-
     /**
      * The value for the app_parallel field.
      * @var        string
      */
     protected $app_parallel = 'NO';
 
-
     /**
      * The value for the app_init_user field.
      * @var        string
      */
     protected $app_init_user = '';
 
-
     /**
      * The value for the app_cur_user field.
      * @var        string
      */
     protected $app_cur_user = '';
 
-
     /**
      * The value for the app_create_date field.
      * @var        int
      */
     protected $app_create_date;
 
-
     /**
      * The value for the app_init_date field.
      * @var        int
      */
     protected $app_init_date;
 
-
     /**
      * The value for the app_finish_date field.
      * @var        int
      */
     protected $app_finish_date;
 
-
     /**
      * The value for the app_update_date field.
      * @var        int
      */
     protected $app_update_date;
 
-
     /**
      * The value for the app_data field.
      * @var        string
      */
     protected $app_data;
 
-
     /**
      * The value for the app_pin field.
      * @var        string
@@ -279,8 +263,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_create_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_create_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_create_date] as date/time value: " . var_export($this->app_create_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_create_date] as date/time value: " .
+                    var_export($this->app_create_date, true));
             }
         } else {
             $ts = $this->app_create_date;
@@ -310,8 +295,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_init_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_init_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_init_date] as date/time value: " . var_export($this->app_init_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_init_date] as date/time value: " .
+                    var_export($this->app_init_date, true));
             }
         } else {
             $ts = $this->app_init_date;
@@ -341,8 +327,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_finish_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_finish_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_finish_date] as date/time value: " . var_export($this->app_finish_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_finish_date] as date/time value: " .
+                    var_export($this->app_finish_date, true));
             }
         } else {
             $ts = $this->app_finish_date;
@@ -372,8 +359,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
         } elseif (!is_int($this->app_update_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->app_update_date);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse value of [app_update_date] as date/time value: " . var_export($this->app_update_date, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [app_update_date] as date/time value: " .
+                    var_export($this->app_update_date, true));
             }
         } else {
             $ts = $this->app_update_date;
@@ -640,8 +628,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_create_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_create_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -664,8 +653,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_init_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_init_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -688,8 +678,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_finish_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_finish_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -712,8 +703,9 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
 
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
-			if ($ts === -1 || $ts === false) { // in PHP 5.1 return value changes to FALSE
-				throw new PropelException("Unable to parse date/time value for [app_update_date] from input: " . var_export($v, true));
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [app_update_date] from input: " .
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -866,7 +858,7 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -898,7 +890,7 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -978,7 +970,8 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -1212,22 +1205,70 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
     {
         $keys = ApplicationPeer::getFieldNames($keyType);
 
-		if (array_key_exists($keys[0], $arr)) $this->setAppUid($arr[$keys[0]]);
-		if (array_key_exists($keys[1], $arr)) $this->setAppNumber($arr[$keys[1]]);
-		if (array_key_exists($keys[2], $arr)) $this->setAppParent($arr[$keys[2]]);
-		if (array_key_exists($keys[3], $arr)) $this->setAppStatus($arr[$keys[3]]);
-		if (array_key_exists($keys[4], $arr)) $this->setProUid($arr[$keys[4]]);
-		if (array_key_exists($keys[5], $arr)) $this->setAppProcStatus($arr[$keys[5]]);
-		if (array_key_exists($keys[6], $arr)) $this->setAppProcCode($arr[$keys[6]]);
-		if (array_key_exists($keys[7], $arr)) $this->setAppParallel($arr[$keys[7]]);
-		if (array_key_exists($keys[8], $arr)) $this->setAppInitUser($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setAppCurUser($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setAppCreateDate($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setAppInitDate($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setAppFinishDate($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setAppUpdateDate($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setAppData($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setAppPin($arr[$keys[15]]);
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setAppUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setAppNumber($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppParent($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setAppStatus($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setProUid($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setAppProcStatus($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setAppProcCode($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setAppParallel($arr[$keys[7]]);
+        }
+
+        if (array_key_exists($keys[8], $arr)) {
+            $this->setAppInitUser($arr[$keys[8]]);
+        }
+
+        if (array_key_exists($keys[9], $arr)) {
+            $this->setAppCurUser($arr[$keys[9]]);
+        }
+
+        if (array_key_exists($keys[10], $arr)) {
+            $this->setAppCreateDate($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setAppInitDate($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setAppFinishDate($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setAppUpdateDate($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setAppData($arr[$keys[14]]);
+        }
+
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setAppPin($arr[$keys[15]]);
+        }
+
     }
 
     /**
@@ -1239,22 +1280,70 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
     {
         $criteria = new Criteria(ApplicationPeer::DATABASE_NAME);
 
-		if ($this->isColumnModified(ApplicationPeer::APP_UID)) $criteria->add(ApplicationPeer::APP_UID, $this->app_uid);
-		if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) $criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number);
-		if ($this->isColumnModified(ApplicationPeer::APP_PARENT)) $criteria->add(ApplicationPeer::APP_PARENT, $this->app_parent);
-		if ($this->isColumnModified(ApplicationPeer::APP_STATUS)) $criteria->add(ApplicationPeer::APP_STATUS, $this->app_status);
-		if ($this->isColumnModified(ApplicationPeer::PRO_UID)) $criteria->add(ApplicationPeer::PRO_UID, $this->pro_uid);
-		if ($this->isColumnModified(ApplicationPeer::APP_PROC_STATUS)) $criteria->add(ApplicationPeer::APP_PROC_STATUS, $this->app_proc_status);
-		if ($this->isColumnModified(ApplicationPeer::APP_PROC_CODE)) $criteria->add(ApplicationPeer::APP_PROC_CODE, $this->app_proc_code);
-		if ($this->isColumnModified(ApplicationPeer::APP_PARALLEL)) $criteria->add(ApplicationPeer::APP_PARALLEL, $this->app_parallel);
-		if ($this->isColumnModified(ApplicationPeer::APP_INIT_USER)) $criteria->add(ApplicationPeer::APP_INIT_USER, $this->app_init_user);
-		if ($this->isColumnModified(ApplicationPeer::APP_CUR_USER)) $criteria->add(ApplicationPeer::APP_CUR_USER, $this->app_cur_user);
-		if ($this->isColumnModified(ApplicationPeer::APP_CREATE_DATE)) $criteria->add(ApplicationPeer::APP_CREATE_DATE, $this->app_create_date);
-		if ($this->isColumnModified(ApplicationPeer::APP_INIT_DATE)) $criteria->add(ApplicationPeer::APP_INIT_DATE, $this->app_init_date);
-		if ($this->isColumnModified(ApplicationPeer::APP_FINISH_DATE)) $criteria->add(ApplicationPeer::APP_FINISH_DATE, $this->app_finish_date);
-		if ($this->isColumnModified(ApplicationPeer::APP_UPDATE_DATE)) $criteria->add(ApplicationPeer::APP_UPDATE_DATE, $this->app_update_date);
-		if ($this->isColumnModified(ApplicationPeer::APP_DATA)) $criteria->add(ApplicationPeer::APP_DATA, $this->app_data);
-		if ($this->isColumnModified(ApplicationPeer::APP_PIN)) $criteria->add(ApplicationPeer::APP_PIN, $this->app_pin);
+        if ($this->isColumnModified(ApplicationPeer::APP_UID)) {
+            $criteria->add(ApplicationPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) {
+            $criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_PARENT)) {
+            $criteria->add(ApplicationPeer::APP_PARENT, $this->app_parent);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_STATUS)) {
+            $criteria->add(ApplicationPeer::APP_STATUS, $this->app_status);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::PRO_UID)) {
+            $criteria->add(ApplicationPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_PROC_STATUS)) {
+            $criteria->add(ApplicationPeer::APP_PROC_STATUS, $this->app_proc_status);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_PROC_CODE)) {
+            $criteria->add(ApplicationPeer::APP_PROC_CODE, $this->app_proc_code);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_PARALLEL)) {
+            $criteria->add(ApplicationPeer::APP_PARALLEL, $this->app_parallel);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_INIT_USER)) {
+            $criteria->add(ApplicationPeer::APP_INIT_USER, $this->app_init_user);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_CUR_USER)) {
+            $criteria->add(ApplicationPeer::APP_CUR_USER, $this->app_cur_user);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_CREATE_DATE)) {
+            $criteria->add(ApplicationPeer::APP_CREATE_DATE, $this->app_create_date);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_INIT_DATE)) {
+            $criteria->add(ApplicationPeer::APP_INIT_DATE, $this->app_init_date);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_FINISH_DATE)) {
+            $criteria->add(ApplicationPeer::APP_FINISH_DATE, $this->app_finish_date);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_UPDATE_DATE)) {
+            $criteria->add(ApplicationPeer::APP_UPDATE_DATE, $this->app_update_date);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_DATA)) {
+            $criteria->add(ApplicationPeer::APP_DATA, $this->app_data);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_PIN)) {
+            $criteria->add(ApplicationPeer::APP_PIN, $this->app_pin);
+        }
+
 
         return $criteria;
     }
@@ -1383,5 +1472,5 @@ abstract class BaseApplication extends BaseObject  implements Persistent {
         }
         return self::$peer;
     }
+}
 
-} // BaseApplication

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

@@ -12,7 +12,8 @@ include_once 'classes/model/Application.php';
  *
  * @package    workflow.classes.model.om
  */
-abstract class BaseApplicationPeer {
+abstract class BaseApplicationPeer
+{
 
     /** the default database name for this class */
     const DATABASE_NAME = 'workflow';
@@ -265,8 +266,7 @@ abstract class BaseApplicationPeer {
         }
 
         // just in case we're grouping: add those columns to the select statement
-		foreach($criteria->getGroupByColumns() as $column)
-		{
+        foreach ($criteria->getGroupByColumns() as $column) {
             $criteria->addSelectColumn($column);
         }
 
@@ -357,7 +357,7 @@ abstract class BaseApplicationPeer {
         $cls = ApplicationPeer::getOMClass();
         $cls = Propel::import($cls);
         // populate the object(s)
-		while($rs->next()) {
+        while ($rs->next()) {
 
             $obj = new $cls();
             $obj->hydrate($rs);
@@ -423,7 +423,7 @@ abstract class BaseApplicationPeer {
             $con->begin();
             $pk = BasePeer::doInsert($criteria, $con);
             $con->commit();
-		} catch(PropelException $e) {
+        } catch (PropelException $e) {
             $con->rollback();
             throw $e;
         }
@@ -434,8 +434,8 @@ abstract class BaseApplicationPeer {
     /**
      * Method perform an UPDATE on the database, given a Application or Criteria object.
      *
-	 * @param      mixed $values Criteria or Application object containing data that is used to create the UPDATE statement.
-	 * @param      Connection $con The connection to use (specify Connection object to exert more control over transactions).
+     * @param      mixed $values Criteria or Application object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
      * @return     int The number of affected rows (if supported by underlying database driver).
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -454,7 +454,7 @@ abstract class BaseApplicationPeer {
             $comparison = $criteria->getComparison(ApplicationPeer::APP_UID);
             $selectCriteria->add(ApplicationPeer::APP_UID, $criteria->remove(ApplicationPeer::APP_UID), $comparison);
 
-		} else { // $values is Application object
+        } else {
             $criteria = $values->buildCriteria(); // gets full criteria
             $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
         }
@@ -495,7 +495,8 @@ abstract class BaseApplicationPeer {
      * @param      mixed $values Criteria or Application object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param      Connection $con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
      *              if supported by native driver or if emulated using Propel.
      * @throws     PropelException Any exceptions caught during processing will be
      *       rethrown wrapped into a PropelException.
@@ -560,7 +561,7 @@ abstract class BaseApplicationPeer {
                 $cols = array($cols);
             }
 
-			foreach($cols as $colName) {
+            foreach ($cols as $colName) {
                 if ($tableMap->containsColumn($colName)) {
                     $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
                     $columns[$colName] = $obj->$get();
@@ -623,8 +624,8 @@ abstract class BaseApplicationPeer {
         }
         return $objs;
     }
+}
 
-} // BaseApplicationPeer
 
 // static code to register the map builder for this Peer with the main Propel class
 if (Propel::isInit()) {
@@ -641,3 +642,4 @@ if (Propel::isInit()) {
     require_once 'classes/model/map/ApplicationMapBuilder.php';
     Propel::registerMapBuilder('classes.model.map.ApplicationMapBuilder');
 }
+