diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 58dbe0536..4014e8717 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -1051,6 +1051,21 @@ class wsBase $result->createDate = $aRows['CREATE_DATE']; $result->updateDate = $aRows['UPDATE_DATE']; + //now fill the array of AppDelay + $oCriteria = new Criteria( 'workflow' ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX ); + $oCriteria->add( AppDelayPeer::APP_UID, $caseId ); + $oCriteria->add( AppDelayPeer::APP_TYPE, 'PAUSE' ); + $oCriteria->add( AppDelayPeer::APP_DISABLE_ACTION_USER, '0' ); + + $oDataset = AppDelayPeer::doSelectRS( $oCriteria ); + $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aIndexsPaused = array(); + while ($oDataset->next()) { + $data = $oDataset->getRow(); + $aIndexsPaused[] = $data['APP_DEL_INDEX']; + } + //now fill the array of AppDelegationPeer $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX ); @@ -1063,8 +1078,11 @@ class wsBase $oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE); $oCriteria->add( AppDelegationPeer::APP_UID, $caseId ); - if ($flagUseDelIndex) { - $oCriteria->add(AppDelegationPeer::DEL_INDEX, $iDelIndex, Criteria::EQUAL); + if (count($aIndexsPaused)) { + $cton1 = $oCriteria->getNewCriterion( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL); + $cton2 = $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INDEX, $aIndexsPaused, Criteria::IN ); + $cton1->addOR( $cton2 ); + $oCriteria->add( $cton1 ); } else { $oCriteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL); } @@ -1105,6 +1123,7 @@ class wsBase $currentUser->delIndex = $aAppDel['DEL_INDEX']; $currentUser->delThread = $aAppDel['DEL_THREAD']; $currentUser->delThreadStatus = $aAppDel['DEL_THREAD_STATUS']; + $currentUser->delStatus = ($aAppDel["DEL_THREAD_STATUS"] == 'CLOSED') ? 'PAUSED' : $aRows['APP_STATUS']; $currentUser->delInitDate = $aAppDel["DEL_INIT_DATE"]; $currentUser->delTaskDueDate = $aAppDel["DEL_TASK_DUE_DATE"]; $aCurrentUsers[] = $currentUser; diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 58159c550..caf32c9cc 100755 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -132,10 +132,12 @@ class AppDelegation extends BaseAppDelegation $this->setDelDelegateDate( 'now' ); //The function return an array now. By JHL - $delTaskDueDate = $this->calculateDueDate( $sNextTasParam ); + $delTaskDueDate = $this->calculateDueDate($sNextTasParam); + $delRiskDate = $this->calculateRiskDate($delTaskDueDate, $this->getRisk()); //$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted - $this->setDelTaskDueDate( $delTaskDueDate ); + $this->setDelTaskDueDate($delTaskDueDate); + $this->setDelRiskDate($delRiskDate); if ((defined( "DEBUG_CALENDAR_LOG" )) && (DEBUG_CALENDAR_LOG)) { //$this->setDelData( $delTaskDueDate['DUE_DATE_LOG'] ); // Log of actions made by Calendar Engine @@ -164,7 +166,7 @@ class AppDelegation extends BaseAppDelegation $msg .= $objValidationFailure->getMessage() . "
"; } throw (new Exception( 'Failed Data validation. ' . $msg )); - } + } $delIndex = $this->getDelIndex(); @@ -179,8 +181,8 @@ class AppDelegation extends BaseAppDelegation $oPluginRegistry->executeTriggers(PM_CREATE_NEW_DELEGATION, $data); /*----------------------------------********---------------------------------*/ - // this section evaluates the actions by email trigger execution please - // modify this section carefully, the if evaluation checks if the license has been + // this section evaluates the actions by email trigger execution please + // modify this section carefully, the if evaluation checks if the license has been // activated in order to send the mail according to the configuration table if (PMLicensedFeatures ::getSingleton() @@ -357,16 +359,35 @@ class AppDelegation extends BaseAppDelegation //use the dates class to calculate dates $calendar = new calendar(); - if ($calendar->pmCalendarUid == '') { - $calendar->getCalendar(null, $task->getProUid(), $aData['TAS_UID']); - $calData = $calendar->getCalendarData(); + $arrayCalendarData = array(); + + if ($calendar->pmCalendarUid == "") { + $calendar->getCalendar(null, $task->getProUid(), $this->getTasUid()); + + $arrayCalendarData = $calendar->getCalendarData(); } /*$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'] //hours or days, ( we only accept this two types or maybe weeks );*/ - $iDueDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT'], $calData); + $dueDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $aData["TAS_DURATION"], $aData["TAS_TIMEUNIT"], $arrayCalendarData); - return $iDueDate; + //Return + return $dueDate; + } + + public function calculateRiskDate($dueDate, $risk) + { + try { + $numDueDate = strtotime($dueDate); //Seconds + $numDueDate = $numDueDate - ($numDueDate * $risk); + + $riskDate = date("Y-m-d H:i:s", round($numDueDate)); + + //Return + return $riskDate; + } catch (Exception $e) { + throw $e; + } } public function getDiffDate ($date1, $date2) @@ -455,7 +476,7 @@ class AppDelegation extends BaseAppDelegation $i = 0; //print ""; //print ""; - + $calendar = new calendar(); $now = strtotime( 'now' ); @@ -576,8 +597,8 @@ class AppDelegation extends BaseAppDelegation error_log( $oError->getMessage() ); } } - - + + public function getLastDeleration ($APP_UID) { $c = new Criteria( 'workflow' ); @@ -628,7 +649,7 @@ class AppDelegation extends BaseAppDelegation $data = $oRuleSet->getRow(); return $data['TAS_UID']; } - + /** * Verify if the current case is already routed. * @@ -653,5 +674,16 @@ class AppDelegation extends BaseAppDelegation } } + public function getRisk() + { + try { + $risk = 0.2; + + //Return + return $risk; + } catch (Exception $e) { + throw $e; + } + } } diff --git a/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php b/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php index dc603ce8c..4848f3a6b 100755 --- a/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php +++ b/workflow/engine/classes/model/map/AppCacheViewMapBuilder.php @@ -87,9 +87,11 @@ class AppCacheViewMapBuilder $tMap->addColumn('DEL_INIT_DATE', 'DelInitDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_FINISH_DATE', 'DelFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_TASK_DUE_DATE', 'DelTaskDueDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('DEL_FINISH_DATE', 'DelFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_RISK_DATE', 'DelRiskDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, false, 32); diff --git a/workflow/engine/classes/model/map/AppDelegationMapBuilder.php b/workflow/engine/classes/model/map/AppDelegationMapBuilder.php index 38bbf4a68..7a78006e8 100755 --- a/workflow/engine/classes/model/map/AppDelegationMapBuilder.php +++ b/workflow/engine/classes/model/map/AppDelegationMapBuilder.php @@ -91,9 +91,11 @@ class AppDelegationMapBuilder $tMap->addColumn('DEL_INIT_DATE', 'DelInitDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_FINISH_DATE', 'DelFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_TASK_DUE_DATE', 'DelTaskDueDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('DEL_FINISH_DATE', 'DelFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_RISK_DATE', 'DelRiskDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('DEL_DURATION', 'DelDuration', 'double', CreoleTypes::DOUBLE, false, null); diff --git a/workflow/engine/classes/model/map/ListInboxMapBuilder.php b/workflow/engine/classes/model/map/ListInboxMapBuilder.php index 5f6f73868..0e471f121 100644 --- a/workflow/engine/classes/model/map/ListInboxMapBuilder.php +++ b/workflow/engine/classes/model/map/ListInboxMapBuilder.php @@ -101,6 +101,8 @@ class ListInboxMapBuilder $tMap->addColumn('DEL_DUE_DATE', 'DelDueDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_RISK_DATE', 'DelRiskDate', 'int', CreoleTypes::TIMESTAMP, false, null); + $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); } // doBuild() diff --git a/workflow/engine/classes/model/om/BaseAppCacheView.php b/workflow/engine/classes/model/om/BaseAppCacheView.php index bcdfe65ff..b78f21560 100755 --- a/workflow/engine/classes/model/om/BaseAppCacheView.php +++ b/workflow/engine/classes/model/om/BaseAppCacheView.php @@ -93,6 +93,12 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent */ protected $del_init_date; + /** + * The value for the del_finish_date field. + * @var int + */ + protected $del_finish_date; + /** * The value for the del_task_due_date field. * @var int @@ -100,10 +106,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent protected $del_task_due_date; /** - * The value for the del_finish_date field. + * The value for the del_risk_date field. * @var int */ - protected $del_finish_date; + protected $del_risk_date; /** * The value for the del_thread_status field. @@ -390,6 +396,38 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent } } + /** + * Get the [optionally formatted] [del_finish_date] column value. + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the integer unix timestamp will be returned. + * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL). + * @throws PropelException - if unable to convert the date/time to timestamp. + */ + public function getDelFinishDate($format = 'Y-m-d H:i:s') + { + + if ($this->del_finish_date === null || $this->del_finish_date === '') { + return null; + } 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) { + 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; + } + if ($format === null) { + return $ts; + } elseif (strpos($format, '%') !== false) { + return strftime($format, $ts); + } else { + return date($format, $ts); + } + } + /** * Get the [optionally formatted] [del_task_due_date] column value. * @@ -423,27 +461,27 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent } /** - * Get the [optionally formatted] [del_finish_date] column value. + * Get the [optionally formatted] [del_risk_date] column value. * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the integer unix timestamp will be returned. * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL). * @throws PropelException - if unable to convert the date/time to timestamp. */ - public function getDelFinishDate($format = 'Y-m-d H:i:s') + public function getDelRiskDate($format = 'Y-m-d H:i:s') { - if ($this->del_finish_date === null || $this->del_finish_date === '') { + if ($this->del_risk_date === null || $this->del_risk_date === '') { return null; - } elseif (!is_int($this->del_finish_date)) { + } elseif (!is_int($this->del_risk_date)) { // a non-timestamp value was set externally, so we convert it - $ts = strtotime($this->del_finish_date); + $ts = strtotime($this->del_risk_date); 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)); + throw new PropelException("Unable to parse value of [del_risk_date] as date/time value: " . + var_export($this->del_risk_date, true)); } } else { - $ts = $this->del_finish_date; + $ts = $this->del_risk_date; } if ($format === null) { return $ts; @@ -971,6 +1009,35 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent } // setDelInitDate() + /** + * Set the value of [del_finish_date] column. + * + * @param int $v new value + * @return void + */ + public function setDelFinishDate($v) + { + + if ($v !== null && !is_int($v)) { + $ts = strtotime($v); + //Date/time accepts null values + if ($v == '') { + $ts = null; + } + 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; + } + if ($this->del_finish_date !== $ts) { + $this->del_finish_date = $ts; + $this->modifiedColumns[] = AppCacheViewPeer::DEL_FINISH_DATE; + } + + } // setDelFinishDate() + /** * Set the value of [del_task_due_date] column. * @@ -1001,12 +1068,12 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent } // setDelTaskDueDate() /** - * Set the value of [del_finish_date] column. + * Set the value of [del_risk_date] column. * * @param int $v new value * @return void */ - public function setDelFinishDate($v) + public function setDelRiskDate($v) { if ($v !== null && !is_int($v)) { @@ -1016,18 +1083,18 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent $ts = null; } if ($ts === -1 || $ts === false) { - throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " . + throw new PropelException("Unable to parse date/time value for [del_risk_date] from input: " . var_export($v, true)); } } else { $ts = $v; } - if ($this->del_finish_date !== $ts) { - $this->del_finish_date = $ts; - $this->modifiedColumns[] = AppCacheViewPeer::DEL_FINISH_DATE; + if ($this->del_risk_date !== $ts) { + $this->del_risk_date = $ts; + $this->modifiedColumns[] = AppCacheViewPeer::DEL_RISK_DATE; } - } // setDelFinishDate() + } // setDelRiskDate() /** * Set the value of [del_thread_status] column. @@ -1461,52 +1528,54 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent $this->del_init_date = $rs->getTimestamp($startcol + 10, null); - $this->del_task_due_date = $rs->getTimestamp($startcol + 11, null); + $this->del_finish_date = $rs->getTimestamp($startcol + 11, null); - $this->del_finish_date = $rs->getTimestamp($startcol + 12, null); + $this->del_task_due_date = $rs->getTimestamp($startcol + 12, null); - $this->del_thread_status = $rs->getString($startcol + 13); + $this->del_risk_date = $rs->getTimestamp($startcol + 13, null); - $this->app_thread_status = $rs->getString($startcol + 14); + $this->del_thread_status = $rs->getString($startcol + 14); - $this->app_title = $rs->getString($startcol + 15); + $this->app_thread_status = $rs->getString($startcol + 15); - $this->app_pro_title = $rs->getString($startcol + 16); + $this->app_title = $rs->getString($startcol + 16); - $this->app_tas_title = $rs->getString($startcol + 17); + $this->app_pro_title = $rs->getString($startcol + 17); - $this->app_current_user = $rs->getString($startcol + 18); + $this->app_tas_title = $rs->getString($startcol + 18); - $this->app_del_previous_user = $rs->getString($startcol + 19); + $this->app_current_user = $rs->getString($startcol + 19); - $this->del_priority = $rs->getString($startcol + 20); + $this->app_del_previous_user = $rs->getString($startcol + 20); - $this->del_duration = $rs->getFloat($startcol + 21); + $this->del_priority = $rs->getString($startcol + 21); - $this->del_queue_duration = $rs->getFloat($startcol + 22); + $this->del_duration = $rs->getFloat($startcol + 22); - $this->del_delay_duration = $rs->getFloat($startcol + 23); + $this->del_queue_duration = $rs->getFloat($startcol + 23); - $this->del_started = $rs->getInt($startcol + 24); + $this->del_delay_duration = $rs->getFloat($startcol + 24); - $this->del_finished = $rs->getInt($startcol + 25); + $this->del_started = $rs->getInt($startcol + 25); - $this->del_delayed = $rs->getInt($startcol + 26); + $this->del_finished = $rs->getInt($startcol + 26); - $this->app_create_date = $rs->getTimestamp($startcol + 27, null); + $this->del_delayed = $rs->getInt($startcol + 27); - $this->app_finish_date = $rs->getTimestamp($startcol + 28, null); + $this->app_create_date = $rs->getTimestamp($startcol + 28, null); - $this->app_update_date = $rs->getTimestamp($startcol + 29, null); + $this->app_finish_date = $rs->getTimestamp($startcol + 29, null); - $this->app_overdue_percentage = $rs->getFloat($startcol + 30); + $this->app_update_date = $rs->getTimestamp($startcol + 30, null); + + $this->app_overdue_percentage = $rs->getFloat($startcol + 31); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 31; // 31 = AppCacheViewPeer::NUM_COLUMNS - AppCacheViewPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 32; // 32 = AppCacheViewPeer::NUM_COLUMNS - AppCacheViewPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating AppCacheView object", $e); @@ -1744,63 +1813,66 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent return $this->getDelInitDate(); break; case 11: - return $this->getDelTaskDueDate(); - break; - case 12: return $this->getDelFinishDate(); break; + case 12: + return $this->getDelTaskDueDate(); + break; case 13: - return $this->getDelThreadStatus(); + return $this->getDelRiskDate(); break; case 14: - return $this->getAppThreadStatus(); + return $this->getDelThreadStatus(); break; case 15: - return $this->getAppTitle(); + return $this->getAppThreadStatus(); break; case 16: - return $this->getAppProTitle(); + return $this->getAppTitle(); break; case 17: - return $this->getAppTasTitle(); + return $this->getAppProTitle(); break; case 18: - return $this->getAppCurrentUser(); + return $this->getAppTasTitle(); break; case 19: - return $this->getAppDelPreviousUser(); + return $this->getAppCurrentUser(); break; case 20: - return $this->getDelPriority(); + return $this->getAppDelPreviousUser(); break; case 21: - return $this->getDelDuration(); + return $this->getDelPriority(); break; case 22: - return $this->getDelQueueDuration(); + return $this->getDelDuration(); break; case 23: - return $this->getDelDelayDuration(); + return $this->getDelQueueDuration(); break; case 24: - return $this->getDelStarted(); + return $this->getDelDelayDuration(); break; case 25: - return $this->getDelFinished(); + return $this->getDelStarted(); break; case 26: - return $this->getDelDelayed(); + return $this->getDelFinished(); break; case 27: - return $this->getAppCreateDate(); + return $this->getDelDelayed(); break; case 28: - return $this->getAppFinishDate(); + return $this->getAppCreateDate(); break; case 29: - return $this->getAppUpdateDate(); + return $this->getAppFinishDate(); break; case 30: + return $this->getAppUpdateDate(); + break; + case 31: return $this->getAppOverduePercentage(); break; default: @@ -1834,26 +1906,27 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent $keys[8] => $this->getProUid(), $keys[9] => $this->getDelDelegateDate(), $keys[10] => $this->getDelInitDate(), - $keys[11] => $this->getDelTaskDueDate(), - $keys[12] => $this->getDelFinishDate(), - $keys[13] => $this->getDelThreadStatus(), - $keys[14] => $this->getAppThreadStatus(), - $keys[15] => $this->getAppTitle(), - $keys[16] => $this->getAppProTitle(), - $keys[17] => $this->getAppTasTitle(), - $keys[18] => $this->getAppCurrentUser(), - $keys[19] => $this->getAppDelPreviousUser(), - $keys[20] => $this->getDelPriority(), - $keys[21] => $this->getDelDuration(), - $keys[22] => $this->getDelQueueDuration(), - $keys[23] => $this->getDelDelayDuration(), - $keys[24] => $this->getDelStarted(), - $keys[25] => $this->getDelFinished(), - $keys[26] => $this->getDelDelayed(), - $keys[27] => $this->getAppCreateDate(), - $keys[28] => $this->getAppFinishDate(), - $keys[29] => $this->getAppUpdateDate(), - $keys[30] => $this->getAppOverduePercentage(), + $keys[11] => $this->getDelFinishDate(), + $keys[12] => $this->getDelTaskDueDate(), + $keys[13] => $this->getDelRiskDate(), + $keys[14] => $this->getDelThreadStatus(), + $keys[15] => $this->getAppThreadStatus(), + $keys[16] => $this->getAppTitle(), + $keys[17] => $this->getAppProTitle(), + $keys[18] => $this->getAppTasTitle(), + $keys[19] => $this->getAppCurrentUser(), + $keys[20] => $this->getAppDelPreviousUser(), + $keys[21] => $this->getDelPriority(), + $keys[22] => $this->getDelDuration(), + $keys[23] => $this->getDelQueueDuration(), + $keys[24] => $this->getDelDelayDuration(), + $keys[25] => $this->getDelStarted(), + $keys[26] => $this->getDelFinished(), + $keys[27] => $this->getDelDelayed(), + $keys[28] => $this->getAppCreateDate(), + $keys[29] => $this->getAppFinishDate(), + $keys[30] => $this->getAppUpdateDate(), + $keys[31] => $this->getAppOverduePercentage(), ); return $result; } @@ -1919,63 +1992,66 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent $this->setDelInitDate($value); break; case 11: - $this->setDelTaskDueDate($value); - break; - case 12: $this->setDelFinishDate($value); break; + case 12: + $this->setDelTaskDueDate($value); + break; case 13: - $this->setDelThreadStatus($value); + $this->setDelRiskDate($value); break; case 14: - $this->setAppThreadStatus($value); + $this->setDelThreadStatus($value); break; case 15: - $this->setAppTitle($value); + $this->setAppThreadStatus($value); break; case 16: - $this->setAppProTitle($value); + $this->setAppTitle($value); break; case 17: - $this->setAppTasTitle($value); + $this->setAppProTitle($value); break; case 18: - $this->setAppCurrentUser($value); + $this->setAppTasTitle($value); break; case 19: - $this->setAppDelPreviousUser($value); + $this->setAppCurrentUser($value); break; case 20: - $this->setDelPriority($value); + $this->setAppDelPreviousUser($value); break; case 21: - $this->setDelDuration($value); + $this->setDelPriority($value); break; case 22: - $this->setDelQueueDuration($value); + $this->setDelDuration($value); break; case 23: - $this->setDelDelayDuration($value); + $this->setDelQueueDuration($value); break; case 24: - $this->setDelStarted($value); + $this->setDelDelayDuration($value); break; case 25: - $this->setDelFinished($value); + $this->setDelStarted($value); break; case 26: - $this->setDelDelayed($value); + $this->setDelFinished($value); break; case 27: - $this->setAppCreateDate($value); + $this->setDelDelayed($value); break; case 28: - $this->setAppFinishDate($value); + $this->setAppCreateDate($value); break; case 29: - $this->setAppUpdateDate($value); + $this->setAppFinishDate($value); break; case 30: + $this->setAppUpdateDate($value); + break; + case 31: $this->setAppOverduePercentage($value); break; } // switch() @@ -2046,83 +2122,87 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent } if (array_key_exists($keys[11], $arr)) { - $this->setDelTaskDueDate($arr[$keys[11]]); + $this->setDelFinishDate($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setDelFinishDate($arr[$keys[12]]); + $this->setDelTaskDueDate($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setDelThreadStatus($arr[$keys[13]]); + $this->setDelRiskDate($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setAppThreadStatus($arr[$keys[14]]); + $this->setDelThreadStatus($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setAppTitle($arr[$keys[15]]); + $this->setAppThreadStatus($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setAppProTitle($arr[$keys[16]]); + $this->setAppTitle($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setAppTasTitle($arr[$keys[17]]); + $this->setAppProTitle($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setAppCurrentUser($arr[$keys[18]]); + $this->setAppTasTitle($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setAppDelPreviousUser($arr[$keys[19]]); + $this->setAppCurrentUser($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setDelPriority($arr[$keys[20]]); + $this->setAppDelPreviousUser($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setDelDuration($arr[$keys[21]]); + $this->setDelPriority($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setDelQueueDuration($arr[$keys[22]]); + $this->setDelDuration($arr[$keys[22]]); } if (array_key_exists($keys[23], $arr)) { - $this->setDelDelayDuration($arr[$keys[23]]); + $this->setDelQueueDuration($arr[$keys[23]]); } if (array_key_exists($keys[24], $arr)) { - $this->setDelStarted($arr[$keys[24]]); + $this->setDelDelayDuration($arr[$keys[24]]); } if (array_key_exists($keys[25], $arr)) { - $this->setDelFinished($arr[$keys[25]]); + $this->setDelStarted($arr[$keys[25]]); } if (array_key_exists($keys[26], $arr)) { - $this->setDelDelayed($arr[$keys[26]]); + $this->setDelFinished($arr[$keys[26]]); } if (array_key_exists($keys[27], $arr)) { - $this->setAppCreateDate($arr[$keys[27]]); + $this->setDelDelayed($arr[$keys[27]]); } if (array_key_exists($keys[28], $arr)) { - $this->setAppFinishDate($arr[$keys[28]]); + $this->setAppCreateDate($arr[$keys[28]]); } if (array_key_exists($keys[29], $arr)) { - $this->setAppUpdateDate($arr[$keys[29]]); + $this->setAppFinishDate($arr[$keys[29]]); } if (array_key_exists($keys[30], $arr)) { - $this->setAppOverduePercentage($arr[$keys[30]]); + $this->setAppUpdateDate($arr[$keys[30]]); + } + + if (array_key_exists($keys[31], $arr)) { + $this->setAppOverduePercentage($arr[$keys[31]]); } } @@ -2180,12 +2260,16 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent $criteria->add(AppCacheViewPeer::DEL_INIT_DATE, $this->del_init_date); } + if ($this->isColumnModified(AppCacheViewPeer::DEL_FINISH_DATE)) { + $criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, $this->del_finish_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_RISK_DATE)) { + $criteria->add(AppCacheViewPeer::DEL_RISK_DATE, $this->del_risk_date); } if ($this->isColumnModified(AppCacheViewPeer::DEL_THREAD_STATUS)) { @@ -2344,9 +2428,11 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent $copyObj->setDelInitDate($this->del_init_date); + $copyObj->setDelFinishDate($this->del_finish_date); + $copyObj->setDelTaskDueDate($this->del_task_due_date); - $copyObj->setDelFinishDate($this->del_finish_date); + $copyObj->setDelRiskDate($this->del_risk_date); $copyObj->setDelThreadStatus($this->del_thread_status); diff --git a/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php b/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php index 4e2bc1d6d..938838849 100755 --- a/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php +++ b/workflow/engine/classes/model/om/BaseAppCacheViewPeer.php @@ -25,7 +25,7 @@ abstract class BaseAppCacheViewPeer const CLASS_DEFAULT = 'classes.model.AppCacheView'; /** The total number of columns. */ - const NUM_COLUMNS = 31; + const NUM_COLUMNS = 32; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -64,11 +64,14 @@ abstract class BaseAppCacheViewPeer /** the column name for the DEL_INIT_DATE field */ const DEL_INIT_DATE = 'APP_CACHE_VIEW.DEL_INIT_DATE'; + /** the column name for the DEL_FINISH_DATE field */ + const DEL_FINISH_DATE = 'APP_CACHE_VIEW.DEL_FINISH_DATE'; + /** the column name for the DEL_TASK_DUE_DATE field */ const DEL_TASK_DUE_DATE = 'APP_CACHE_VIEW.DEL_TASK_DUE_DATE'; - /** the column name for the DEL_FINISH_DATE field */ - const DEL_FINISH_DATE = 'APP_CACHE_VIEW.DEL_FINISH_DATE'; + /** the column name for the DEL_RISK_DATE field */ + const DEL_RISK_DATE = 'APP_CACHE_VIEW.DEL_RISK_DATE'; /** the column name for the DEL_THREAD_STATUS field */ const DEL_THREAD_STATUS = 'APP_CACHE_VIEW.DEL_THREAD_STATUS'; @@ -135,10 +138,10 @@ abstract class BaseAppCacheViewPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelLastIndex', 'AppNumber', 'AppStatus', 'UsrUid', 'PreviousUsrUid', 'TasUid', 'ProUid', 'DelDelegateDate', 'DelInitDate', 'DelTaskDueDate', 'DelFinishDate', 'DelThreadStatus', 'AppThreadStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCurrentUser', 'AppDelPreviousUser', 'DelPriority', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'AppCreateDate', 'AppFinishDate', 'AppUpdateDate', 'AppOverduePercentage', ), - BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX, AppCacheViewPeer::DEL_LAST_INDEX, AppCacheViewPeer::APP_NUMBER, AppCacheViewPeer::APP_STATUS, AppCacheViewPeer::USR_UID, AppCacheViewPeer::PREVIOUS_USR_UID, AppCacheViewPeer::TAS_UID, AppCacheViewPeer::PRO_UID, AppCacheViewPeer::DEL_DELEGATE_DATE, AppCacheViewPeer::DEL_INIT_DATE, AppCacheViewPeer::DEL_TASK_DUE_DATE, AppCacheViewPeer::DEL_FINISH_DATE, AppCacheViewPeer::DEL_THREAD_STATUS, AppCacheViewPeer::APP_THREAD_STATUS, AppCacheViewPeer::APP_TITLE, AppCacheViewPeer::APP_PRO_TITLE, AppCacheViewPeer::APP_TAS_TITLE, AppCacheViewPeer::APP_CURRENT_USER, AppCacheViewPeer::APP_DEL_PREVIOUS_USER, AppCacheViewPeer::DEL_PRIORITY, AppCacheViewPeer::DEL_DURATION, AppCacheViewPeer::DEL_QUEUE_DURATION, AppCacheViewPeer::DEL_DELAY_DURATION, AppCacheViewPeer::DEL_STARTED, AppCacheViewPeer::DEL_FINISHED, AppCacheViewPeer::DEL_DELAYED, AppCacheViewPeer::APP_CREATE_DATE, AppCacheViewPeer::APP_FINISH_DATE, AppCacheViewPeer::APP_UPDATE_DATE, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_LAST_INDEX', 'APP_NUMBER', 'APP_STATUS', 'USR_UID', 'PREVIOUS_USR_UID', 'TAS_UID', 'PRO_UID', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_TASK_DUE_DATE', 'DEL_FINISH_DATE', 'DEL_THREAD_STATUS', 'APP_THREAD_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CURRENT_USER', 'APP_DEL_PREVIOUS_USER', 'DEL_PRIORITY', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_OVERDUE_PERCENTAGE', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelLastIndex', 'AppNumber', 'AppStatus', 'UsrUid', 'PreviousUsrUid', 'TasUid', 'ProUid', 'DelDelegateDate', 'DelInitDate', 'DelFinishDate', 'DelTaskDueDate', 'DelRiskDate', 'DelThreadStatus', 'AppThreadStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCurrentUser', 'AppDelPreviousUser', 'DelPriority', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'AppCreateDate', 'AppFinishDate', 'AppUpdateDate', 'AppOverduePercentage', ), + BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX, AppCacheViewPeer::DEL_LAST_INDEX, AppCacheViewPeer::APP_NUMBER, AppCacheViewPeer::APP_STATUS, AppCacheViewPeer::USR_UID, AppCacheViewPeer::PREVIOUS_USR_UID, AppCacheViewPeer::TAS_UID, AppCacheViewPeer::PRO_UID, AppCacheViewPeer::DEL_DELEGATE_DATE, AppCacheViewPeer::DEL_INIT_DATE, AppCacheViewPeer::DEL_FINISH_DATE, AppCacheViewPeer::DEL_TASK_DUE_DATE, AppCacheViewPeer::DEL_RISK_DATE, AppCacheViewPeer::DEL_THREAD_STATUS, AppCacheViewPeer::APP_THREAD_STATUS, AppCacheViewPeer::APP_TITLE, AppCacheViewPeer::APP_PRO_TITLE, AppCacheViewPeer::APP_TAS_TITLE, AppCacheViewPeer::APP_CURRENT_USER, AppCacheViewPeer::APP_DEL_PREVIOUS_USER, AppCacheViewPeer::DEL_PRIORITY, AppCacheViewPeer::DEL_DURATION, AppCacheViewPeer::DEL_QUEUE_DURATION, AppCacheViewPeer::DEL_DELAY_DURATION, AppCacheViewPeer::DEL_STARTED, AppCacheViewPeer::DEL_FINISHED, AppCacheViewPeer::DEL_DELAYED, AppCacheViewPeer::APP_CREATE_DATE, AppCacheViewPeer::APP_FINISH_DATE, AppCacheViewPeer::APP_UPDATE_DATE, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_LAST_INDEX', 'APP_NUMBER', 'APP_STATUS', 'USR_UID', 'PREVIOUS_USR_UID', 'TAS_UID', 'PRO_UID', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_FINISH_DATE', 'DEL_TASK_DUE_DATE', 'DEL_RISK_DATE', 'DEL_THREAD_STATUS', 'APP_THREAD_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CURRENT_USER', 'APP_DEL_PREVIOUS_USER', 'DEL_PRIORITY', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_OVERDUE_PERCENTAGE', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ) ); /** @@ -148,10 +151,10 @@ abstract class BaseAppCacheViewPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelLastIndex' => 2, 'AppNumber' => 3, 'AppStatus' => 4, 'UsrUid' => 5, 'PreviousUsrUid' => 6, 'TasUid' => 7, 'ProUid' => 8, 'DelDelegateDate' => 9, 'DelInitDate' => 10, 'DelTaskDueDate' => 11, 'DelFinishDate' => 12, 'DelThreadStatus' => 13, 'AppThreadStatus' => 14, 'AppTitle' => 15, 'AppProTitle' => 16, 'AppTasTitle' => 17, 'AppCurrentUser' => 18, 'AppDelPreviousUser' => 19, 'DelPriority' => 20, 'DelDuration' => 21, 'DelQueueDuration' => 22, 'DelDelayDuration' => 23, 'DelStarted' => 24, 'DelFinished' => 25, 'DelDelayed' => 26, 'AppCreateDate' => 27, 'AppFinishDate' => 28, 'AppUpdateDate' => 29, 'AppOverduePercentage' => 30, ), - BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID => 0, AppCacheViewPeer::DEL_INDEX => 1, AppCacheViewPeer::DEL_LAST_INDEX => 2, AppCacheViewPeer::APP_NUMBER => 3, AppCacheViewPeer::APP_STATUS => 4, AppCacheViewPeer::USR_UID => 5, AppCacheViewPeer::PREVIOUS_USR_UID => 6, AppCacheViewPeer::TAS_UID => 7, AppCacheViewPeer::PRO_UID => 8, AppCacheViewPeer::DEL_DELEGATE_DATE => 9, AppCacheViewPeer::DEL_INIT_DATE => 10, AppCacheViewPeer::DEL_TASK_DUE_DATE => 11, AppCacheViewPeer::DEL_FINISH_DATE => 12, AppCacheViewPeer::DEL_THREAD_STATUS => 13, AppCacheViewPeer::APP_THREAD_STATUS => 14, AppCacheViewPeer::APP_TITLE => 15, AppCacheViewPeer::APP_PRO_TITLE => 16, AppCacheViewPeer::APP_TAS_TITLE => 17, AppCacheViewPeer::APP_CURRENT_USER => 18, AppCacheViewPeer::APP_DEL_PREVIOUS_USER => 19, AppCacheViewPeer::DEL_PRIORITY => 20, AppCacheViewPeer::DEL_DURATION => 21, AppCacheViewPeer::DEL_QUEUE_DURATION => 22, AppCacheViewPeer::DEL_DELAY_DURATION => 23, AppCacheViewPeer::DEL_STARTED => 24, AppCacheViewPeer::DEL_FINISHED => 25, AppCacheViewPeer::DEL_DELAYED => 26, AppCacheViewPeer::APP_CREATE_DATE => 27, AppCacheViewPeer::APP_FINISH_DATE => 28, AppCacheViewPeer::APP_UPDATE_DATE => 29, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE => 30, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_LAST_INDEX' => 2, 'APP_NUMBER' => 3, 'APP_STATUS' => 4, 'USR_UID' => 5, 'PREVIOUS_USR_UID' => 6, 'TAS_UID' => 7, 'PRO_UID' => 8, 'DEL_DELEGATE_DATE' => 9, 'DEL_INIT_DATE' => 10, 'DEL_TASK_DUE_DATE' => 11, 'DEL_FINISH_DATE' => 12, 'DEL_THREAD_STATUS' => 13, 'APP_THREAD_STATUS' => 14, 'APP_TITLE' => 15, 'APP_PRO_TITLE' => 16, 'APP_TAS_TITLE' => 17, 'APP_CURRENT_USER' => 18, 'APP_DEL_PREVIOUS_USER' => 19, 'DEL_PRIORITY' => 20, 'DEL_DURATION' => 21, 'DEL_QUEUE_DURATION' => 22, 'DEL_DELAY_DURATION' => 23, 'DEL_STARTED' => 24, 'DEL_FINISHED' => 25, 'DEL_DELAYED' => 26, 'APP_CREATE_DATE' => 27, 'APP_FINISH_DATE' => 28, 'APP_UPDATE_DATE' => 29, 'APP_OVERDUE_PERCENTAGE' => 30, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelLastIndex' => 2, 'AppNumber' => 3, 'AppStatus' => 4, 'UsrUid' => 5, 'PreviousUsrUid' => 6, 'TasUid' => 7, 'ProUid' => 8, 'DelDelegateDate' => 9, 'DelInitDate' => 10, 'DelFinishDate' => 11, 'DelTaskDueDate' => 12, 'DelRiskDate' => 13, 'DelThreadStatus' => 14, 'AppThreadStatus' => 15, 'AppTitle' => 16, 'AppProTitle' => 17, 'AppTasTitle' => 18, 'AppCurrentUser' => 19, 'AppDelPreviousUser' => 20, 'DelPriority' => 21, 'DelDuration' => 22, 'DelQueueDuration' => 23, 'DelDelayDuration' => 24, 'DelStarted' => 25, 'DelFinished' => 26, 'DelDelayed' => 27, 'AppCreateDate' => 28, 'AppFinishDate' => 29, 'AppUpdateDate' => 30, 'AppOverduePercentage' => 31, ), + BasePeer::TYPE_COLNAME => array (AppCacheViewPeer::APP_UID => 0, AppCacheViewPeer::DEL_INDEX => 1, AppCacheViewPeer::DEL_LAST_INDEX => 2, AppCacheViewPeer::APP_NUMBER => 3, AppCacheViewPeer::APP_STATUS => 4, AppCacheViewPeer::USR_UID => 5, AppCacheViewPeer::PREVIOUS_USR_UID => 6, AppCacheViewPeer::TAS_UID => 7, AppCacheViewPeer::PRO_UID => 8, AppCacheViewPeer::DEL_DELEGATE_DATE => 9, AppCacheViewPeer::DEL_INIT_DATE => 10, AppCacheViewPeer::DEL_FINISH_DATE => 11, AppCacheViewPeer::DEL_TASK_DUE_DATE => 12, AppCacheViewPeer::DEL_RISK_DATE => 13, AppCacheViewPeer::DEL_THREAD_STATUS => 14, AppCacheViewPeer::APP_THREAD_STATUS => 15, AppCacheViewPeer::APP_TITLE => 16, AppCacheViewPeer::APP_PRO_TITLE => 17, AppCacheViewPeer::APP_TAS_TITLE => 18, AppCacheViewPeer::APP_CURRENT_USER => 19, AppCacheViewPeer::APP_DEL_PREVIOUS_USER => 20, AppCacheViewPeer::DEL_PRIORITY => 21, AppCacheViewPeer::DEL_DURATION => 22, AppCacheViewPeer::DEL_QUEUE_DURATION => 23, AppCacheViewPeer::DEL_DELAY_DURATION => 24, AppCacheViewPeer::DEL_STARTED => 25, AppCacheViewPeer::DEL_FINISHED => 26, AppCacheViewPeer::DEL_DELAYED => 27, AppCacheViewPeer::APP_CREATE_DATE => 28, AppCacheViewPeer::APP_FINISH_DATE => 29, AppCacheViewPeer::APP_UPDATE_DATE => 30, AppCacheViewPeer::APP_OVERDUE_PERCENTAGE => 31, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_LAST_INDEX' => 2, 'APP_NUMBER' => 3, 'APP_STATUS' => 4, 'USR_UID' => 5, 'PREVIOUS_USR_UID' => 6, 'TAS_UID' => 7, 'PRO_UID' => 8, 'DEL_DELEGATE_DATE' => 9, 'DEL_INIT_DATE' => 10, 'DEL_FINISH_DATE' => 11, 'DEL_TASK_DUE_DATE' => 12, 'DEL_RISK_DATE' => 13, 'DEL_THREAD_STATUS' => 14, 'APP_THREAD_STATUS' => 15, 'APP_TITLE' => 16, 'APP_PRO_TITLE' => 17, 'APP_TAS_TITLE' => 18, 'APP_CURRENT_USER' => 19, 'APP_DEL_PREVIOUS_USER' => 20, 'DEL_PRIORITY' => 21, 'DEL_DURATION' => 22, 'DEL_QUEUE_DURATION' => 23, 'DEL_DELAY_DURATION' => 24, 'DEL_STARTED' => 25, 'DEL_FINISHED' => 26, 'DEL_DELAYED' => 27, 'APP_CREATE_DATE' => 28, 'APP_FINISH_DATE' => 29, 'APP_UPDATE_DATE' => 30, 'APP_OVERDUE_PERCENTAGE' => 31, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, ) ); /** @@ -274,9 +277,11 @@ abstract class BaseAppCacheViewPeer $criteria->addSelectColumn(AppCacheViewPeer::DEL_INIT_DATE); + $criteria->addSelectColumn(AppCacheViewPeer::DEL_FINISH_DATE); + $criteria->addSelectColumn(AppCacheViewPeer::DEL_TASK_DUE_DATE); - $criteria->addSelectColumn(AppCacheViewPeer::DEL_FINISH_DATE); + $criteria->addSelectColumn(AppCacheViewPeer::DEL_RISK_DATE); $criteria->addSelectColumn(AppCacheViewPeer::DEL_THREAD_STATUS); diff --git a/workflow/engine/classes/model/om/BaseAppDelegation.php b/workflow/engine/classes/model/om/BaseAppDelegation.php index fba20498b..a561d6026 100755 --- a/workflow/engine/classes/model/om/BaseAppDelegation.php +++ b/workflow/engine/classes/model/om/BaseAppDelegation.php @@ -105,6 +105,12 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent */ protected $del_init_date; + /** + * The value for the del_finish_date field. + * @var int + */ + protected $del_finish_date; + /** * The value for the del_task_due_date field. * @var int @@ -112,10 +118,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent protected $del_task_due_date; /** - * The value for the del_finish_date field. + * The value for the del_risk_date field. * @var int */ - protected $del_finish_date; + protected $del_risk_date; /** * The value for the del_duration field. @@ -364,6 +370,38 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent } } + /** + * Get the [optionally formatted] [del_finish_date] column value. + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the integer unix timestamp will be returned. + * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL). + * @throws PropelException - if unable to convert the date/time to timestamp. + */ + public function getDelFinishDate($format = 'Y-m-d H:i:s') + { + + if ($this->del_finish_date === null || $this->del_finish_date === '') { + return null; + } 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) { + 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; + } + if ($format === null) { + return $ts; + } elseif (strpos($format, '%') !== false) { + return strftime($format, $ts); + } else { + return date($format, $ts); + } + } + /** * Get the [optionally formatted] [del_task_due_date] column value. * @@ -397,27 +435,27 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent } /** - * Get the [optionally formatted] [del_finish_date] column value. + * Get the [optionally formatted] [del_risk_date] column value. * * @param string $format The date/time format string (either date()-style or strftime()-style). * If format is NULL, then the integer unix timestamp will be returned. * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL). * @throws PropelException - if unable to convert the date/time to timestamp. */ - public function getDelFinishDate($format = 'Y-m-d H:i:s') + public function getDelRiskDate($format = 'Y-m-d H:i:s') { - if ($this->del_finish_date === null || $this->del_finish_date === '') { + if ($this->del_risk_date === null || $this->del_risk_date === '') { return null; - } elseif (!is_int($this->del_finish_date)) { + } elseif (!is_int($this->del_risk_date)) { // a non-timestamp value was set externally, so we convert it - $ts = strtotime($this->del_finish_date); + $ts = strtotime($this->del_risk_date); 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)); + throw new PropelException("Unable to parse value of [del_risk_date] as date/time value: " . + var_export($this->del_risk_date, true)); } } else { - $ts = $this->del_finish_date; + $ts = $this->del_risk_date; } if ($format === null) { return $ts; @@ -816,6 +854,35 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent } // setDelInitDate() + /** + * Set the value of [del_finish_date] column. + * + * @param int $v new value + * @return void + */ + public function setDelFinishDate($v) + { + + if ($v !== null && !is_int($v)) { + $ts = strtotime($v); + //Date/time accepts null values + if ($v == '') { + $ts = null; + } + 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; + } + if ($this->del_finish_date !== $ts) { + $this->del_finish_date = $ts; + $this->modifiedColumns[] = AppDelegationPeer::DEL_FINISH_DATE; + } + + } // setDelFinishDate() + /** * Set the value of [del_task_due_date] column. * @@ -846,12 +913,12 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent } // setDelTaskDueDate() /** - * Set the value of [del_finish_date] column. + * Set the value of [del_risk_date] column. * * @param int $v new value * @return void */ - public function setDelFinishDate($v) + public function setDelRiskDate($v) { if ($v !== null && !is_int($v)) { @@ -861,18 +928,18 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent $ts = null; } if ($ts === -1 || $ts === false) { - throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " . + throw new PropelException("Unable to parse date/time value for [del_risk_date] from input: " . var_export($v, true)); } } else { $ts = $v; } - if ($this->del_finish_date !== $ts) { - $this->del_finish_date = $ts; - $this->modifiedColumns[] = AppDelegationPeer::DEL_FINISH_DATE; + if ($this->del_risk_date !== $ts) { + $this->del_risk_date = $ts; + $this->modifiedColumns[] = AppDelegationPeer::DEL_RISK_DATE; } - } // setDelFinishDate() + } // setDelRiskDate() /** * Set the value of [del_duration] column. @@ -1069,32 +1136,34 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent $this->del_init_date = $rs->getTimestamp($startcol + 12, null); - $this->del_task_due_date = $rs->getTimestamp($startcol + 13, null); + $this->del_finish_date = $rs->getTimestamp($startcol + 13, null); - $this->del_finish_date = $rs->getTimestamp($startcol + 14, null); + $this->del_task_due_date = $rs->getTimestamp($startcol + 14, null); - $this->del_duration = $rs->getFloat($startcol + 15); + $this->del_risk_date = $rs->getTimestamp($startcol + 15, null); - $this->del_queue_duration = $rs->getFloat($startcol + 16); + $this->del_duration = $rs->getFloat($startcol + 16); - $this->del_delay_duration = $rs->getFloat($startcol + 17); + $this->del_queue_duration = $rs->getFloat($startcol + 17); - $this->del_started = $rs->getInt($startcol + 18); + $this->del_delay_duration = $rs->getFloat($startcol + 18); - $this->del_finished = $rs->getInt($startcol + 19); + $this->del_started = $rs->getInt($startcol + 19); - $this->del_delayed = $rs->getInt($startcol + 20); + $this->del_finished = $rs->getInt($startcol + 20); - $this->del_data = $rs->getString($startcol + 21); + $this->del_delayed = $rs->getInt($startcol + 21); - $this->app_overdue_percentage = $rs->getFloat($startcol + 22); + $this->del_data = $rs->getString($startcol + 22); + + $this->app_overdue_percentage = $rs->getFloat($startcol + 23); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 23; // 23 = AppDelegationPeer::NUM_COLUMNS - AppDelegationPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 24; // 24 = AppDelegationPeer::NUM_COLUMNS - AppDelegationPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating AppDelegation object", $e); @@ -1338,33 +1407,36 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent return $this->getDelInitDate(); break; case 13: - return $this->getDelTaskDueDate(); - break; - case 14: return $this->getDelFinishDate(); break; + case 14: + return $this->getDelTaskDueDate(); + break; case 15: - return $this->getDelDuration(); + return $this->getDelRiskDate(); break; case 16: - return $this->getDelQueueDuration(); + return $this->getDelDuration(); break; case 17: - return $this->getDelDelayDuration(); + return $this->getDelQueueDuration(); break; case 18: - return $this->getDelStarted(); + return $this->getDelDelayDuration(); break; case 19: - return $this->getDelFinished(); + return $this->getDelStarted(); break; case 20: - return $this->getDelDelayed(); + return $this->getDelFinished(); break; case 21: - return $this->getDelData(); + return $this->getDelDelayed(); break; case 22: + return $this->getDelData(); + break; + case 23: return $this->getAppOverduePercentage(); break; default: @@ -1400,16 +1472,17 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent $keys[10] => $this->getDelPriority(), $keys[11] => $this->getDelDelegateDate(), $keys[12] => $this->getDelInitDate(), - $keys[13] => $this->getDelTaskDueDate(), - $keys[14] => $this->getDelFinishDate(), - $keys[15] => $this->getDelDuration(), - $keys[16] => $this->getDelQueueDuration(), - $keys[17] => $this->getDelDelayDuration(), - $keys[18] => $this->getDelStarted(), - $keys[19] => $this->getDelFinished(), - $keys[20] => $this->getDelDelayed(), - $keys[21] => $this->getDelData(), - $keys[22] => $this->getAppOverduePercentage(), + $keys[13] => $this->getDelFinishDate(), + $keys[14] => $this->getDelTaskDueDate(), + $keys[15] => $this->getDelRiskDate(), + $keys[16] => $this->getDelDuration(), + $keys[17] => $this->getDelQueueDuration(), + $keys[18] => $this->getDelDelayDuration(), + $keys[19] => $this->getDelStarted(), + $keys[20] => $this->getDelFinished(), + $keys[21] => $this->getDelDelayed(), + $keys[22] => $this->getDelData(), + $keys[23] => $this->getAppOverduePercentage(), ); return $result; } @@ -1481,33 +1554,36 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent $this->setDelInitDate($value); break; case 13: - $this->setDelTaskDueDate($value); - break; - case 14: $this->setDelFinishDate($value); break; + case 14: + $this->setDelTaskDueDate($value); + break; case 15: - $this->setDelDuration($value); + $this->setDelRiskDate($value); break; case 16: - $this->setDelQueueDuration($value); + $this->setDelDuration($value); break; case 17: - $this->setDelDelayDuration($value); + $this->setDelQueueDuration($value); break; case 18: - $this->setDelStarted($value); + $this->setDelDelayDuration($value); break; case 19: - $this->setDelFinished($value); + $this->setDelStarted($value); break; case 20: - $this->setDelDelayed($value); + $this->setDelFinished($value); break; case 21: - $this->setDelData($value); + $this->setDelDelayed($value); break; case 22: + $this->setDelData($value); + break; + case 23: $this->setAppOverduePercentage($value); break; } // switch() @@ -1586,43 +1662,47 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent } if (array_key_exists($keys[13], $arr)) { - $this->setDelTaskDueDate($arr[$keys[13]]); + $this->setDelFinishDate($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setDelFinishDate($arr[$keys[14]]); + $this->setDelTaskDueDate($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setDelDuration($arr[$keys[15]]); + $this->setDelRiskDate($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setDelQueueDuration($arr[$keys[16]]); + $this->setDelDuration($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setDelDelayDuration($arr[$keys[17]]); + $this->setDelQueueDuration($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setDelStarted($arr[$keys[18]]); + $this->setDelDelayDuration($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setDelFinished($arr[$keys[19]]); + $this->setDelStarted($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setDelDelayed($arr[$keys[20]]); + $this->setDelFinished($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setDelData($arr[$keys[21]]); + $this->setDelDelayed($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setAppOverduePercentage($arr[$keys[22]]); + $this->setDelData($arr[$keys[22]]); + } + + if (array_key_exists($keys[23], $arr)) { + $this->setAppOverduePercentage($arr[$keys[23]]); } } @@ -1688,12 +1768,16 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent $criteria->add(AppDelegationPeer::DEL_INIT_DATE, $this->del_init_date); } + if ($this->isColumnModified(AppDelegationPeer::DEL_FINISH_DATE)) { + $criteria->add(AppDelegationPeer::DEL_FINISH_DATE, $this->del_finish_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_RISK_DATE)) { + $criteria->add(AppDelegationPeer::DEL_RISK_DATE, $this->del_risk_date); } if ($this->isColumnModified(AppDelegationPeer::DEL_DURATION)) { @@ -1816,9 +1900,11 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent $copyObj->setDelInitDate($this->del_init_date); + $copyObj->setDelFinishDate($this->del_finish_date); + $copyObj->setDelTaskDueDate($this->del_task_due_date); - $copyObj->setDelFinishDate($this->del_finish_date); + $copyObj->setDelRiskDate($this->del_risk_date); $copyObj->setDelDuration($this->del_duration); diff --git a/workflow/engine/classes/model/om/BaseAppDelegationPeer.php b/workflow/engine/classes/model/om/BaseAppDelegationPeer.php index c05b45440..00a13c68c 100755 --- a/workflow/engine/classes/model/om/BaseAppDelegationPeer.php +++ b/workflow/engine/classes/model/om/BaseAppDelegationPeer.php @@ -25,7 +25,7 @@ abstract class BaseAppDelegationPeer const CLASS_DEFAULT = 'classes.model.AppDelegation'; /** The total number of columns. */ - const NUM_COLUMNS = 23; + const NUM_COLUMNS = 24; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -70,11 +70,14 @@ abstract class BaseAppDelegationPeer /** the column name for the DEL_INIT_DATE field */ const DEL_INIT_DATE = 'APP_DELEGATION.DEL_INIT_DATE'; + /** the column name for the DEL_FINISH_DATE field */ + const DEL_FINISH_DATE = 'APP_DELEGATION.DEL_FINISH_DATE'; + /** the column name for the DEL_TASK_DUE_DATE field */ const DEL_TASK_DUE_DATE = 'APP_DELEGATION.DEL_TASK_DUE_DATE'; - /** the column name for the DEL_FINISH_DATE field */ - const DEL_FINISH_DATE = 'APP_DELEGATION.DEL_FINISH_DATE'; + /** the column name for the DEL_RISK_DATE field */ + const DEL_RISK_DATE = 'APP_DELEGATION.DEL_RISK_DATE'; /** the column name for the DEL_DURATION field */ const DEL_DURATION = 'APP_DELEGATION.DEL_DURATION'; @@ -111,10 +114,10 @@ abstract class BaseAppDelegationPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelPrevious', 'DelLastIndex', 'ProUid', 'TasUid', 'UsrUid', 'DelType', 'DelThread', 'DelThreadStatus', 'DelPriority', 'DelDelegateDate', 'DelInitDate', 'DelTaskDueDate', 'DelFinishDate', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'DelData', 'AppOverduePercentage', ), - BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX, AppDelegationPeer::DEL_PREVIOUS, AppDelegationPeer::DEL_LAST_INDEX, AppDelegationPeer::PRO_UID, AppDelegationPeer::TAS_UID, AppDelegationPeer::USR_UID, AppDelegationPeer::DEL_TYPE, AppDelegationPeer::DEL_THREAD, AppDelegationPeer::DEL_THREAD_STATUS, AppDelegationPeer::DEL_PRIORITY, AppDelegationPeer::DEL_DELEGATE_DATE, AppDelegationPeer::DEL_INIT_DATE, AppDelegationPeer::DEL_TASK_DUE_DATE, AppDelegationPeer::DEL_FINISH_DATE, AppDelegationPeer::DEL_DURATION, AppDelegationPeer::DEL_QUEUE_DURATION, AppDelegationPeer::DEL_DELAY_DURATION, AppDelegationPeer::DEL_STARTED, AppDelegationPeer::DEL_FINISHED, AppDelegationPeer::DEL_DELAYED, AppDelegationPeer::DEL_DATA, AppDelegationPeer::APP_OVERDUE_PERCENTAGE, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_PREVIOUS', 'DEL_LAST_INDEX', 'PRO_UID', 'TAS_UID', 'USR_UID', 'DEL_TYPE', 'DEL_THREAD', 'DEL_THREAD_STATUS', 'DEL_PRIORITY', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_TASK_DUE_DATE', 'DEL_FINISH_DATE', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'DEL_DATA', 'APP_OVERDUE_PERCENTAGE', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'DelPrevious', 'DelLastIndex', 'ProUid', 'TasUid', 'UsrUid', 'DelType', 'DelThread', 'DelThreadStatus', 'DelPriority', 'DelDelegateDate', 'DelInitDate', 'DelFinishDate', 'DelTaskDueDate', 'DelRiskDate', 'DelDuration', 'DelQueueDuration', 'DelDelayDuration', 'DelStarted', 'DelFinished', 'DelDelayed', 'DelData', 'AppOverduePercentage', ), + BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX, AppDelegationPeer::DEL_PREVIOUS, AppDelegationPeer::DEL_LAST_INDEX, AppDelegationPeer::PRO_UID, AppDelegationPeer::TAS_UID, AppDelegationPeer::USR_UID, AppDelegationPeer::DEL_TYPE, AppDelegationPeer::DEL_THREAD, AppDelegationPeer::DEL_THREAD_STATUS, AppDelegationPeer::DEL_PRIORITY, AppDelegationPeer::DEL_DELEGATE_DATE, AppDelegationPeer::DEL_INIT_DATE, AppDelegationPeer::DEL_FINISH_DATE, AppDelegationPeer::DEL_TASK_DUE_DATE, AppDelegationPeer::DEL_RISK_DATE, AppDelegationPeer::DEL_DURATION, AppDelegationPeer::DEL_QUEUE_DURATION, AppDelegationPeer::DEL_DELAY_DURATION, AppDelegationPeer::DEL_STARTED, AppDelegationPeer::DEL_FINISHED, AppDelegationPeer::DEL_DELAYED, AppDelegationPeer::DEL_DATA, AppDelegationPeer::APP_OVERDUE_PERCENTAGE, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'DEL_PREVIOUS', 'DEL_LAST_INDEX', 'PRO_UID', 'TAS_UID', 'USR_UID', 'DEL_TYPE', 'DEL_THREAD', 'DEL_THREAD_STATUS', 'DEL_PRIORITY', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_FINISH_DATE', 'DEL_TASK_DUE_DATE', 'DEL_RISK_DATE', 'DEL_DURATION', 'DEL_QUEUE_DURATION', 'DEL_DELAY_DURATION', 'DEL_STARTED', 'DEL_FINISHED', 'DEL_DELAYED', 'DEL_DATA', 'APP_OVERDUE_PERCENTAGE', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ) ); /** @@ -124,10 +127,10 @@ abstract class BaseAppDelegationPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelPrevious' => 2, 'DelLastIndex' => 3, 'ProUid' => 4, 'TasUid' => 5, 'UsrUid' => 6, 'DelType' => 7, 'DelThread' => 8, 'DelThreadStatus' => 9, 'DelPriority' => 10, 'DelDelegateDate' => 11, 'DelInitDate' => 12, 'DelTaskDueDate' => 13, 'DelFinishDate' => 14, 'DelDuration' => 15, 'DelQueueDuration' => 16, 'DelDelayDuration' => 17, 'DelStarted' => 18, 'DelFinished' => 19, 'DelDelayed' => 20, 'DelData' => 21, 'AppOverduePercentage' => 22, ), - BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID => 0, AppDelegationPeer::DEL_INDEX => 1, AppDelegationPeer::DEL_PREVIOUS => 2, AppDelegationPeer::DEL_LAST_INDEX => 3, AppDelegationPeer::PRO_UID => 4, AppDelegationPeer::TAS_UID => 5, AppDelegationPeer::USR_UID => 6, AppDelegationPeer::DEL_TYPE => 7, AppDelegationPeer::DEL_THREAD => 8, AppDelegationPeer::DEL_THREAD_STATUS => 9, AppDelegationPeer::DEL_PRIORITY => 10, AppDelegationPeer::DEL_DELEGATE_DATE => 11, AppDelegationPeer::DEL_INIT_DATE => 12, AppDelegationPeer::DEL_TASK_DUE_DATE => 13, AppDelegationPeer::DEL_FINISH_DATE => 14, AppDelegationPeer::DEL_DURATION => 15, AppDelegationPeer::DEL_QUEUE_DURATION => 16, AppDelegationPeer::DEL_DELAY_DURATION => 17, AppDelegationPeer::DEL_STARTED => 18, AppDelegationPeer::DEL_FINISHED => 19, AppDelegationPeer::DEL_DELAYED => 20, AppDelegationPeer::DEL_DATA => 21, AppDelegationPeer::APP_OVERDUE_PERCENTAGE => 22, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_PREVIOUS' => 2, 'DEL_LAST_INDEX' => 3, 'PRO_UID' => 4, 'TAS_UID' => 5, 'USR_UID' => 6, 'DEL_TYPE' => 7, 'DEL_THREAD' => 8, 'DEL_THREAD_STATUS' => 9, 'DEL_PRIORITY' => 10, 'DEL_DELEGATE_DATE' => 11, 'DEL_INIT_DATE' => 12, 'DEL_TASK_DUE_DATE' => 13, 'DEL_FINISH_DATE' => 14, 'DEL_DURATION' => 15, 'DEL_QUEUE_DURATION' => 16, 'DEL_DELAY_DURATION' => 17, 'DEL_STARTED' => 18, 'DEL_FINISHED' => 19, 'DEL_DELAYED' => 20, 'DEL_DATA' => 21, 'APP_OVERDUE_PERCENTAGE' => 22, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'DelPrevious' => 2, 'DelLastIndex' => 3, 'ProUid' => 4, 'TasUid' => 5, 'UsrUid' => 6, 'DelType' => 7, 'DelThread' => 8, 'DelThreadStatus' => 9, 'DelPriority' => 10, 'DelDelegateDate' => 11, 'DelInitDate' => 12, 'DelFinishDate' => 13, 'DelTaskDueDate' => 14, 'DelRiskDate' => 15, 'DelDuration' => 16, 'DelQueueDuration' => 17, 'DelDelayDuration' => 18, 'DelStarted' => 19, 'DelFinished' => 20, 'DelDelayed' => 21, 'DelData' => 22, 'AppOverduePercentage' => 23, ), + BasePeer::TYPE_COLNAME => array (AppDelegationPeer::APP_UID => 0, AppDelegationPeer::DEL_INDEX => 1, AppDelegationPeer::DEL_PREVIOUS => 2, AppDelegationPeer::DEL_LAST_INDEX => 3, AppDelegationPeer::PRO_UID => 4, AppDelegationPeer::TAS_UID => 5, AppDelegationPeer::USR_UID => 6, AppDelegationPeer::DEL_TYPE => 7, AppDelegationPeer::DEL_THREAD => 8, AppDelegationPeer::DEL_THREAD_STATUS => 9, AppDelegationPeer::DEL_PRIORITY => 10, AppDelegationPeer::DEL_DELEGATE_DATE => 11, AppDelegationPeer::DEL_INIT_DATE => 12, AppDelegationPeer::DEL_FINISH_DATE => 13, AppDelegationPeer::DEL_TASK_DUE_DATE => 14, AppDelegationPeer::DEL_RISK_DATE => 15, AppDelegationPeer::DEL_DURATION => 16, AppDelegationPeer::DEL_QUEUE_DURATION => 17, AppDelegationPeer::DEL_DELAY_DURATION => 18, AppDelegationPeer::DEL_STARTED => 19, AppDelegationPeer::DEL_FINISHED => 20, AppDelegationPeer::DEL_DELAYED => 21, AppDelegationPeer::DEL_DATA => 22, AppDelegationPeer::APP_OVERDUE_PERCENTAGE => 23, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'DEL_PREVIOUS' => 2, 'DEL_LAST_INDEX' => 3, 'PRO_UID' => 4, 'TAS_UID' => 5, 'USR_UID' => 6, 'DEL_TYPE' => 7, 'DEL_THREAD' => 8, 'DEL_THREAD_STATUS' => 9, 'DEL_PRIORITY' => 10, 'DEL_DELEGATE_DATE' => 11, 'DEL_INIT_DATE' => 12, 'DEL_FINISH_DATE' => 13, 'DEL_TASK_DUE_DATE' => 14, 'DEL_RISK_DATE' => 15, 'DEL_DURATION' => 16, 'DEL_QUEUE_DURATION' => 17, 'DEL_DELAY_DURATION' => 18, 'DEL_STARTED' => 19, 'DEL_FINISHED' => 20, 'DEL_DELAYED' => 21, 'DEL_DATA' => 22, 'APP_OVERDUE_PERCENTAGE' => 23, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ) ); /** @@ -254,9 +257,11 @@ abstract class BaseAppDelegationPeer $criteria->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE); + $criteria->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE); + $criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE); - $criteria->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE); + $criteria->addSelectColumn(AppDelegationPeer::DEL_RISK_DATE); $criteria->addSelectColumn(AppDelegationPeer::DEL_DURATION); diff --git a/workflow/engine/classes/model/om/BaseListInbox.php b/workflow/engine/classes/model/om/BaseListInbox.php index 7eac24aa5..853fb2c59 100644 --- a/workflow/engine/classes/model/om/BaseListInbox.php +++ b/workflow/engine/classes/model/om/BaseListInbox.php @@ -135,6 +135,12 @@ abstract class BaseListInbox extends BaseObject implements Persistent */ protected $del_due_date; + /** + * The value for the del_risk_date field. + * @var int + */ + protected $del_risk_date; + /** * The value for the del_priority field. * @var string @@ -437,6 +443,38 @@ abstract class BaseListInbox extends BaseObject implements Persistent } } + /** + * Get the [optionally formatted] [del_risk_date] column value. + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the integer unix timestamp will be returned. + * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL). + * @throws PropelException - if unable to convert the date/time to timestamp. + */ + public function getDelRiskDate($format = 'Y-m-d H:i:s') + { + + if ($this->del_risk_date === null || $this->del_risk_date === '') { + return null; + } elseif (!is_int($this->del_risk_date)) { + // a non-timestamp value was set externally, so we convert it + $ts = strtotime($this->del_risk_date); + if ($ts === -1 || $ts === false) { + throw new PropelException("Unable to parse value of [del_risk_date] as date/time value: " . + var_export($this->del_risk_date, true)); + } + } else { + $ts = $this->del_risk_date; + } + if ($format === null) { + return $ts; + } elseif (strpos($format, '%') !== false) { + return strftime($format, $ts); + } else { + return date($format, $ts); + } + } + /** * Get the [del_priority] column value. * @@ -872,6 +910,35 @@ abstract class BaseListInbox extends BaseObject implements Persistent } // setDelDueDate() + /** + * Set the value of [del_risk_date] column. + * + * @param int $v new value + * @return void + */ + public function setDelRiskDate($v) + { + + if ($v !== null && !is_int($v)) { + $ts = strtotime($v); + //Date/time accepts null values + if ($v == '') { + $ts = null; + } + if ($ts === -1 || $ts === false) { + throw new PropelException("Unable to parse date/time value for [del_risk_date] from input: " . + var_export($v, true)); + } + } else { + $ts = $v; + } + if ($this->del_risk_date !== $ts) { + $this->del_risk_date = $ts; + $this->modifiedColumns[] = ListInboxPeer::DEL_RISK_DATE; + } + + } // setDelRiskDate() + /** * Set the value of [del_priority] column. * @@ -947,14 +1014,16 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->del_due_date = $rs->getTimestamp($startcol + 17, null); - $this->del_priority = $rs->getString($startcol + 18); + $this->del_risk_date = $rs->getTimestamp($startcol + 18, null); + + $this->del_priority = $rs->getString($startcol + 19); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 19; // 19 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 20; // 20 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListInbox object", $e); @@ -1213,6 +1282,9 @@ abstract class BaseListInbox extends BaseObject implements Persistent return $this->getDelDueDate(); break; case 18: + return $this->getDelRiskDate(); + break; + case 19: return $this->getDelPriority(); break; default: @@ -1253,7 +1325,8 @@ abstract class BaseListInbox extends BaseObject implements Persistent $keys[15] => $this->getDelDelegateDate(), $keys[16] => $this->getDelInitDate(), $keys[17] => $this->getDelDueDate(), - $keys[18] => $this->getDelPriority(), + $keys[18] => $this->getDelRiskDate(), + $keys[19] => $this->getDelPriority(), ); return $result; } @@ -1340,6 +1413,9 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->setDelDueDate($value); break; case 18: + $this->setDelRiskDate($value); + break; + case 19: $this->setDelPriority($value); break; } // switch() @@ -1438,7 +1514,11 @@ abstract class BaseListInbox extends BaseObject implements Persistent } if (array_key_exists($keys[18], $arr)) { - $this->setDelPriority($arr[$keys[18]]); + $this->setDelRiskDate($arr[$keys[18]]); + } + + if (array_key_exists($keys[19], $arr)) { + $this->setDelPriority($arr[$keys[19]]); } } @@ -1524,6 +1604,10 @@ abstract class BaseListInbox extends BaseObject implements Persistent $criteria->add(ListInboxPeer::DEL_DUE_DATE, $this->del_due_date); } + if ($this->isColumnModified(ListInboxPeer::DEL_RISK_DATE)) { + $criteria->add(ListInboxPeer::DEL_RISK_DATE, $this->del_risk_date); + } + if ($this->isColumnModified(ListInboxPeer::DEL_PRIORITY)) { $criteria->add(ListInboxPeer::DEL_PRIORITY, $this->del_priority); } @@ -1626,6 +1710,8 @@ abstract class BaseListInbox extends BaseObject implements Persistent $copyObj->setDelDueDate($this->del_due_date); + $copyObj->setDelRiskDate($this->del_risk_date); + $copyObj->setDelPriority($this->del_priority); diff --git a/workflow/engine/classes/model/om/BaseListInboxPeer.php b/workflow/engine/classes/model/om/BaseListInboxPeer.php index 01e529d68..4b667d641 100644 --- a/workflow/engine/classes/model/om/BaseListInboxPeer.php +++ b/workflow/engine/classes/model/om/BaseListInboxPeer.php @@ -25,7 +25,7 @@ abstract class BaseListInboxPeer const CLASS_DEFAULT = 'classes.model.ListInbox'; /** The total number of columns. */ - const NUM_COLUMNS = 19; + const NUM_COLUMNS = 20; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -85,6 +85,9 @@ abstract class BaseListInboxPeer /** the column name for the DEL_DUE_DATE field */ const DEL_DUE_DATE = 'LIST_INBOX.DEL_DUE_DATE'; + /** the column name for the DEL_RISK_DATE field */ + const DEL_RISK_DATE = 'LIST_INBOX.DEL_RISK_DATE'; + /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_INBOX.DEL_PRIORITY'; @@ -99,10 +102,10 @@ abstract class BaseListInboxPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ), - BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_PRIORITY, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelRiskDate', 'DelPriority', ), + BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_RISK_DATE, ListInboxPeer::DEL_PRIORITY, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_RISK_DATE', 'DEL_PRIORITY', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ) ); /** @@ -112,10 +115,10 @@ abstract class BaseListInboxPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelPriority' => 18, ), - BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_PRIORITY => 18, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_PRIORITY' => 18, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelRiskDate' => 18, 'DelPriority' => 19, ), + BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_RISK_DATE => 18, ListInboxPeer::DEL_PRIORITY => 19, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_RISK_DATE' => 18, 'DEL_PRIORITY' => 19, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ) ); /** @@ -252,6 +255,8 @@ abstract class BaseListInboxPeer $criteria->addSelectColumn(ListInboxPeer::DEL_DUE_DATE); + $criteria->addSelectColumn(ListInboxPeer::DEL_RISK_DATE); + $criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY); } diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 38a332e67..f40ed1d99 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -123,8 +123,9 @@ - + + @@ -2438,8 +2439,9 @@ - + + @@ -3961,6 +3963,7 @@ + @@ -4820,7 +4823,7 @@
iDelegateDate iInitDate iDueDate iFinishDate isStarted isFinished isDelayed queueDuration delDuration delayDuration
- + diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php index da96eab69..b866c292c 100755 --- a/workflow/engine/controllers/pmTables.php +++ b/workflow/engine/controllers/pmTables.php @@ -112,11 +112,12 @@ class pmTables extends Controller $this->setJSVar( 'dataNumRows', $dataNumRows ); $this->setJSVar( '_plugin_permissions', $repTabPluginPermissions ); $this->setJSVar( 'sizeTableName', $this->getSizeTableName()); - - require_once 'classes/model/AdditionalTables.php'; - $process = new Process(); - $isBpmn = $process->isBpmnProcess($_GET['PRO_UID']); - + + $isBpmn = 0; + if (isset( $_GET['PRO_UID'] )) { + $process = new Process(); + $isBpmn = $process->isBpmnProcess($_GET['PRO_UID']); + } $this->setJSVar( 'isBpmn', $isBpmn ); G::RenderPage( 'publish', 'extJs' ); diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 2af1322f7..ea632a452 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -58,8 +58,9 @@ CREATE TABLE `APP_DELEGATION` `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `DEL_DELEGATE_DATE` DATETIME NOT NULL, `DEL_INIT_DATE` DATETIME, - `DEL_TASK_DUE_DATE` DATETIME, - `DEL_FINISH_DATE` DATETIME, + `DEL_FINISH_DATE` DATETIME, + `DEL_TASK_DUE_DATE` DATETIME, + `DEL_RISK_DATE` DATETIME, `DEL_DURATION` DOUBLE default 0, `DEL_QUEUE_DURATION` DOUBLE default 0, `DEL_DELAY_DURATION` DOUBLE default 0, @@ -1155,8 +1156,9 @@ CREATE TABLE `APP_CACHE_VIEW` `PRO_UID` VARCHAR(32) default '' NOT NULL, `DEL_DELEGATE_DATE` DATETIME NOT NULL, `DEL_INIT_DATE` DATETIME, - `DEL_TASK_DUE_DATE` DATETIME, - `DEL_FINISH_DATE` DATETIME, + `DEL_FINISH_DATE` DATETIME, + `DEL_TASK_DUE_DATE` DATETIME, + `DEL_RISK_DATE` DATETIME, `DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN', `APP_THREAD_STATUS` VARCHAR(32) default 'OPEN', `APP_TITLE` VARCHAR(255) default '' NOT NULL, @@ -2238,6 +2240,7 @@ CREATE TABLE `LIST_INBOX` `DEL_DELEGATE_DATE` DATETIME NOT NULL, `DEL_INIT_DATE` DATETIME, `DEL_DUE_DATE` DATETIME, + `DEL_RISK_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`) diff --git a/workflow/engine/methods/login/forgotPassword.php b/workflow/engine/methods/login/forgotPassword.php index 755fab2db..52340ab35 100755 --- a/workflow/engine/methods/login/forgotPassword.php +++ b/workflow/engine/methods/login/forgotPassword.php @@ -23,6 +23,10 @@ * */ $G_PUBLISH = new Publisher (); -$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); +if(SYS_SKIN == 'neoclassic'){ + $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php'); +}else{ + $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); +} G::RenderPage ( "publish" ); diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index 2241a195e..a358cf1f8 100755 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -148,7 +148,11 @@ if (!class_exists('pmLicenseManager')) { $licenseManager =& pmLicenseManager::getSingleton(); if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) { $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate'); + if(SYS_SKIN == 'neoclassic'){ + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate'); + }else{ + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate'); + } G::RenderPage('publish'); die(); } @@ -192,7 +196,12 @@ if (isset($myUrl) && $myUrl != "") { } $G_PUBLISH = new Publisher(); -$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php'); +if(SYS_SKIN == 'neoclassic'){ + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php'); +}else{ + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php'); +} + G::LoadClass('serverConfiguration'); //Bootstrap::LoadClass('serverConfiguration'); //get the serverconf singleton, and check if we can send the heartbeat diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php index 207c2e755..b4b744ddf 100755 --- a/workflow/engine/methods/login/sysLogin.php +++ b/workflow/engine/methods/login/sysLogin.php @@ -23,12 +23,12 @@ * */ /*----------------------------------********---------------------------------*/ -//Browser Compatibility -$browserSupported = G::checkBrowserCompatibility(); -if ($browserSupported==false){ - if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){ - G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning'); - } +//Browser Compatibility +$browserSupported = G::checkBrowserCompatibility(); +if ($browserSupported==false){ + if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){ + G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning'); + } } /*----------------------------------********---------------------------------*/ if (isset ($_POST['form']['USER_ENV'])) { @@ -160,13 +160,21 @@ switch (WS_IN_LOGIN) { //Get Server Configuration $oServerConf = & serverConf::getSingleton (); if ($oServerConf->getProperty ('LOGIN_NO_WS')) { - $fileLogin = 'login/sysLoginNoWS'; + if(SYS_SKIN == 'neoclassic'){ + $fileLogin = 'login/sysLoginNoWSpm3'; + }else{ + $fileLogin = 'login/sysLoginNoWS'; + } } else { $fileLogin = 'login/sysLogin'; } break; case 'no': - $fileLogin = 'login/sysLoginNoWS'; + if(SYS_SKIN == 'neoclassic'){ + $fileLogin = 'login/sysLoginNoWSpm3'; + }else{ + $fileLogin = 'login/sysLoginNoWS'; + } break; case 'yes': $fileLogin = 'login/sysLogin'; diff --git a/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql b/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql index 74cf64bbb..a27792a7d 100755 --- a/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql +++ b/workflow/engine/methods/setup/setupSchemas/app_cache_view.sql @@ -11,8 +11,9 @@ CREATE TABLE `APP_CACHE_VIEW` `PRO_UID` VARCHAR(32) default '' NOT NULL, `DEL_DELEGATE_DATE` DATETIME NOT NULL, `DEL_INIT_DATE` DATETIME, - `DEL_TASK_DUE_DATE` DATETIME, `DEL_FINISH_DATE` DATETIME, + `DEL_TASK_DUE_DATE` DATETIME, + `DEL_RISK_DATE` DATETIME, `DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN', `APP_THREAD_STATUS` VARCHAR(32) default 'OPEN', `APP_TITLE` VARCHAR(255) default '' NOT NULL, diff --git a/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql b/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql index e3e4ccdf9..97a36384d 100755 --- a/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql +++ b/workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql @@ -13,8 +13,9 @@ INSERT INTO APP_CACHE_VIEW ( PRO_UID, DEL_DELEGATE_DATE, DEL_INIT_DATE, - DEL_TASK_DUE_DATE, DEL_FINISH_DATE, + DEL_TASK_DUE_DATE, + DEL_RISK_DATE, DEL_THREAD_STATUS, APP_THREAD_STATUS, APP_TITLE, @@ -57,8 +58,9 @@ SELECT APP_DELEGATION.PRO_UID, substring(APP_DELEGATION.DEL_DELEGATE_DATE,1,19), substring(APP_DELEGATION.DEL_INIT_DATE,1,19), - substring(APP_DELEGATION.DEL_TASK_DUE_DATE,1,19), substring(APP_DELEGATION.DEL_FINISH_DATE,1,19), + substring(APP_DELEGATION.DEL_TASK_DUE_DATE,1,19), + substring(APP_DELEGATION.DEL_RISK_DATE,1,19), APP_DELEGATION.DEL_THREAD_STATUS, APP_THREAD.APP_THREAD_STATUS, APP_TITLE.CON_VALUE AS APP_TITLE, diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql index 2e142025e..d0fd9b856 100755 --- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql +++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql @@ -55,8 +55,9 @@ BEGIN PRO_UID, DEL_DELEGATE_DATE, DEL_INIT_DATE, - DEL_TASK_DUE_DATE, DEL_FINISH_DATE, + DEL_TASK_DUE_DATE, + DEL_RISK_DATE, DEL_THREAD_STATUS, APP_THREAD_STATUS, APP_TITLE, @@ -88,8 +89,9 @@ BEGIN NEW.PRO_UID, NEW.DEL_DELEGATE_DATE, NEW.DEL_INIT_DATE, - NEW.DEL_TASK_DUE_DATE, NEW.DEL_FINISH_DATE, + NEW.DEL_TASK_DUE_DATE, + NEW.DEL_RISK_DATE, NEW.DEL_THREAD_STATUS, @APP_THREAD_STATUS, @APP_TITLE, diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql index f5592c526..1a492caab 100755 --- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql +++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql @@ -53,8 +53,9 @@ BEGIN PRO_UID = NEW.PRO_UID, DEL_DELEGATE_DATE = NEW.DEL_DELEGATE_DATE, DEL_INIT_DATE = NEW.DEL_INIT_DATE, - DEL_TASK_DUE_DATE = NEW.DEL_TASK_DUE_DATE, DEL_FINISH_DATE = NEW.DEL_FINISH_DATE, + DEL_TASK_DUE_DATE = NEW.DEL_TASK_DUE_DATE, + DEL_RISK_DATE = NEW.DEL_RISK_DATE, DEL_THREAD_STATUS = NEW.DEL_THREAD_STATUS, APP_THREAD_STATUS = @APP_THREAD_STATUS, APP_TITLE = @APP_TITLE, diff --git a/workflow/engine/skinEngine/neoclassic/config.xml b/workflow/engine/skinEngine/neoclassic/config.xml index 1620a8711..5303272e1 100644 --- a/workflow/engine/skinEngine/neoclassic/config.xml +++ b/workflow/engine/skinEngine/neoclassic/config.xml @@ -16,6 +16,7 @@ + diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css new file mode 100644 index 000000000..bcf5c1cb2 --- /dev/null +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -0,0 +1,244 @@ +/* +* LOGIN PM3 STYLES +*/ +body.login { + background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); + //background-position-y: -30px; +} + +.vertical-offset-100 { + padding-top: 90px; +} + +img.img-responsive { + margin-bottom: 20px; +} +.img-responsive { + display: block; + height: auto; + margin: auto; + max-width: 100%; +} + +.login .panel { + border-radius: 0; + padding: 20px; +} +.panel { + background-color: rgba(255, 255, 255, 0.8); + border: 1px solid transparent; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + margin-bottom: 20px; + margin-left: 50px; + margin-right: 50px; +} + +.login .panel-default > .panel-heading { + background: none repeat scroll 0 0 transparent; +} + + +.login .panel-heading { + border-bottom: 1px solid transparent; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + padding: 5px 1px; +} + + +.module_app_input___gray { + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; + color: #555; + display: block; + font-size: 14px; + height: 34px; + line-height: 1.42857; + padding: 6px 12px; + transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; + width: 100%; +} +.login .module_app_input___gray_file{ + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; + color: #555; + display: block; + font-size: 14px; + height: 45px; + line-height: 1.42857; + padding: 9px 12px; + transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; + width: 100%; +} +.form-signin .module_app_input___gray { + border-radius: 0; + box-sizing: border-box; + color: #444; + font-family: "Open Sans",Arial,Helvetica,sans-serif; + font-size: 16px; + height: 45px; + padding: 10px; + position: relative; + margin-bottom: 6px; +} + +.module_app_input___gray::-moz-placeholder { + color: #999; + opacity: 1; +} + +.login .panel h3 { + margin-bottom: 8px; +} +h1, h2, h3, h4, h5, h6 { + color: #444; + font-family: "Montserrat",sans-serif; + font-weight: 400; + margin: 0 0 30px; +} +p { + font-size: 16px; + line-height: 1.5em; + margin: 0 0 10px; +} + +.panel-body table{ + width: 100%; +} + +.button-login-cancel{ + background-image: none; + width: 100%; + color: #fff; + border-radius: 6px; + font-size: 18px; + line-height: 1.33; + padding: 10px 16px; + display: block; + padding-left: 0; + padding-right: 0; + width: 100%; + background: none repeat scroll 0 0 #e4655f; + border: 1px solid #e14333; + color: #fff; + font-weight: 700; + //transition: all 0.3s ease-in-out 0s; + max-width: 400px; + filter:none; +} + +.button-login-cancel:hover{ + background-color: #e14333; + background-image:none; + color: #fff; + filter:none; +} + +.button-login-success{ + background-image: none; + width: 100%; + color: #fff; + border-radius: 6px; + font-size: 18px; + line-height: 1.33; + padding: 10px 16px; + display: block; + padding-left: 0; + padding-right: 0; + width: 100%; + background: none repeat scroll 0 0 #1fbc99; + border: 1px solid #1fbc99; + color: #fff; + font-weight: 700; + //transition: all 0.3s ease-in-out 0s; + max-width: 400px; + filter:none; +} + +.button-login-success:hover{ + background-color: #1ba385; + background-image:none; + color: #fff; + filter:none; +} + + +.login-message{ + border: 1px solid transparent; + border-radius: 4px; + margin-bottom: 20px; + padding: 15px; + text-align: center; + font-size: 13px; + line-height: 1.42857; +} + +.login #temporalMessageWARNING{ + padding: 15px; + background-color: #ffc85c; + border-color: #db9d22; + color: #4d380d; +} + +.login #temporalMessageERROR{ + padding: 15px; + background-color: #e87a75; + border-color: #e14333; + color: #5a1212; +} + +.login #temporalMessageINFO{ + padding: 15px; + background-color: #44afff; + border-color: #2481c5; + color: #0a263c; +} + + +.login #temporalMessageTD { + border-width: 0px; + font-size: normal 6pt !important; + height: 25px !important; + padding: 0 0px !important; + background-size: 100% 100% !important; + font-size: 11px; +} + +.footer-login .content{ + color: white; + font-weight: 900; +} + +.footer-login{ + text-align: center; +} + +.login_result span{ + margin-bottom: 6px; + display: block; +} + + +.login .module_app_inputFailed___gray{ + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; + color: #555; + display: block; + font-size: 14px; + height: 45px; + line-height: 1.42857; + padding: 9px 12px; + transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; + width: 100%; + border:1px solid #e14333; +} \ No newline at end of file diff --git a/workflow/engine/skinEngine/neoclassic/css/style.css b/workflow/engine/skinEngine/neoclassic/css/style.css index 532b5b70e..b7aa6638d 100644 --- a/workflow/engine/skinEngine/neoclassic/css/style.css +++ b/workflow/engine/skinEngine/neoclassic/css/style.css @@ -3273,7 +3273,7 @@ ul#pm_menu li { } ul#pm_menu a { color: #7b7c80; - font-size: 15px; + font-size: 14px; text-decoration: none; display: block; text-transform: capitalize; diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index f429b65e1..af628788d 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -1,76 +1,110 @@ + {$meta} {$header} - -
- - - -
- - - {if $user_logged neq '' or $tracker neq ''} - - - + + + + + + + +
- {include file="$tpl_menu"} - {if (count($subMenus)>0) } - {include file= "$tpl_submenu"} - {/if} - -
- - {if $user_logged neq ''} - {$msgVer} - {if $switch_interface} - + {if $user_logged neq '' or $tracker neq ''} + + + + - - - - - - +
+ + + {if $user_logged neq '' or $tracker neq ''} + + + + {else} + + {/if} + + + - {else} - - {/if} - - - - -
+ {include file="$tpl_menu"} + {if (count($subMenus)>0) } + {include file= "$tpl_submenu"} {/if} - {$logout}  
-     - {else} - {if $tracker eq 1} - {$logout}   + 		+
+ + {if $user_logged neq ''} + {$msgVer} + {if $switch_interface} + {/if} - {/if} - -
+ {$logout}  
+     + {else} + {if $tracker eq 1} + {$logout}   + {/if} + {/if} + + + 		+ +
+
-
-
-
- - - - -
- {php} - global $G_TEMPLATE; - if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE); - {/php} -
-
-
+
+
+ + + + +
+ {php} + global $G_TEMPLATE; + if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE); + {/php} +
+
+
+
{$footer}
+
+
+ + {else} + + +
+
+
+
+ Conxole Admin +
+
+
+

Please enter your credentials below

+
+
+ {php} + global $G_TEMPLATE; + if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE); + {/php} +
+
+
+
+
+ -
- + + + {/if} \ No newline at end of file diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index e910c0137..fd3d6a9da 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -698,7 +698,7 @@ class SkinEngine if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { $freeOfChargeText = ""; if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) - $freeOfChargeText = "Supplied free of charge with no support, certification, warranty,
maintenance nor indemnity by Colosa and its Certified Partners."; + $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners."; if(class_exists('pmLicenseManager')) $freeOfChargeText=""; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; @@ -713,7 +713,7 @@ class SkinEngine if (file_exists($fileFooter)) { $footer .= file_get_contents($fileFooter); } else { - $footer .= "
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
$freeOfChargeText " . "

"; + $footer .= " $freeOfChargeText
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
" . "

"; } } } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 6f00f414f..60f790ddf 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -449,24 +449,9 @@ class Cases } //Get data - $arrayStatusInfo = $this->getStatusInfo($applicationUid); - - $applicationStatus = ""; - $delIndex = 0; - $flagUseDelIndex = false; - - if (count($arrayStatusInfo) > 0) { - $applicationStatus = $arrayStatusInfo["APP_STATUS"]; - $delIndex = $arrayStatusInfo["DEL_INDEX"]; - - if (in_array($applicationStatus, array("DRAFT", "PAUSED", "CANCELLED"))) { - $flagUseDelIndex = true; - } - } - $ws = new \wsBase(); - $fields = $ws->getCaseInfo($applicationUid, $delIndex, $flagUseDelIndex); + $fields = $ws->getCaseInfo($applicationUid, 0); $array = json_decode(json_encode($fields), true); if ($array ["status_code"] != 0) { @@ -475,7 +460,7 @@ class Cases $array['app_uid'] = $array['caseId']; $array['app_number'] = $array['caseNumber']; $array['app_name'] = $array['caseName']; - $array["app_status"] = ($applicationStatus != "")? $applicationStatus : $array["caseStatus"]; + $array["app_status"] = $array["caseStatus"]; $array['app_init_usr_uid'] = $array['caseCreatorUser']; $array['app_init_usr_username'] = trim($array['caseCreatorUserName']); $array['pro_uid'] = $array['processId']; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index a1278a5f5..d6b6c31f2 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -384,7 +384,7 @@ class Task $result = $task->update($arrayProperty); if (!empty($arrayProperty['CONSOLIDATE_DATA'])) { - if (isset($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) { + if (!empty($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) { G::LoadClass("consolidatedCases"); $consolidated = new \ConsolidatedCases(); $dataConso = array( diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php index 0d3f8369d..a2a01412f 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php @@ -118,12 +118,12 @@ class Activity extends Api } $task = new \ProcessMaker\BusinessModel\Task(); $properties = $task->updateProperties($prj_uid, $act_uid, $request_data); - + /*----------------------------------********---------------------------------*/ if (\PMLicensedFeatures ::getSingleton() ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { - if (isset($request_data['properties']['_features'])) { + if (isset($request_data['properties']['_features']) && !empty($request_data['properties']['_features']['ActionsByEmail']['fields']['ABE_UID'])) { $actionsByEmailService = new \ProcessMaker\BusinessModel\ActionsByEmail(); $actionsByEmailService->saveConfiguration($request_data['properties']['_features']); } diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index 94e05ad23..f08867831 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -97,19 +97,12 @@ -
-
-
- - - -
@@ -157,5 +150,5 @@
- - + + \ No newline at end of file diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.html b/workflow/engine/xmlform/login/forgotPasswordpm3.html new file mode 100755 index 000000000..47bcf197e --- /dev/null +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.html @@ -0,0 +1,30 @@ +
+ + + +
+ + {$form.USR_USERNAME} + {$form.USR_EMAIL} + {$form.URL} + +
+
+ + {$form.BSUBMIT} +
+ {$form.BCANCEL} +
+ +
+ + + diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml new file mode 100755 index 000000000..1c148713a --- /dev/null +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -0,0 +1,52 @@ + + + + <en><![CDATA[I forgot my password]]></en> + + + + + + + + + + + + + + + + + diff --git a/workflow/engine/xmlform/login/licenseExpiredpm3.html b/workflow/engine/xmlform/login/licenseExpiredpm3.html new file mode 100644 index 000000000..2f57e2d0f --- /dev/null +++ b/workflow/engine/xmlform/login/licenseExpiredpm3.html @@ -0,0 +1,29 @@ +
+ + + +
+ + {$form.licenseFile} +
+
+ +
+ {$form.updateButton} +
+ +
* Required Field
+
 
 
 
+ + + + + + + diff --git a/workflow/engine/xmlform/login/licenseExpiredpm3.xml b/workflow/engine/xmlform/login/licenseExpiredpm3.xml new file mode 100755 index 000000000..5af1614d4 --- /dev/null +++ b/workflow/engine/xmlform/login/licenseExpiredpm3.xml @@ -0,0 +1,18 @@ + + + + + + + License File + + + Update License + + + \ No newline at end of file diff --git a/workflow/engine/xmlform/login/loginpm3.html b/workflow/engine/xmlform/login/loginpm3.html new file mode 100755 index 000000000..9294154c5 --- /dev/null +++ b/workflow/engine/xmlform/login/loginpm3.html @@ -0,0 +1,31 @@ +
+ + +
{$form.USR_PASSWORD}
+
+ + {$form.USR_USERNAME} + {$form.USR_PASSWORD_MASK} + {$form.USER_LANG} + {$form.URL} + +
+
+ +
+ {$form.BSUBMIT} + {$form.FORGOT_PASWORD_LINK} + +
+ +
+ diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml new file mode 100755 index 000000000..99ff2d1d8 --- /dev/null +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -0,0 +1,114 @@ + + + + <en><![CDATA[Login]]></en> + + + + + + + + + + + +SELECT LANG_ID, LANG_NAME FROM langOptions + + + + + + + + + + + + diff --git a/workflow/engine/xmlform/login/sysLoginNoWS.html b/workflow/engine/xmlform/login/sysLoginNoWS.html new file mode 100644 index 000000000..fc386508c --- /dev/null +++ b/workflow/engine/xmlform/login/sysLoginNoWS.html @@ -0,0 +1,69 @@ + + +
+ + + +
+ + {$form.USR_USERNAME} + {$form.USR_PASSWORD} + +
+
+ + {$form.USER_LANG} + {$form.USER_ENV} +
+ {$form.BSUBMIT} +
+ +
diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html new file mode 100644 index 000000000..1beeb6f06 --- /dev/null +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html @@ -0,0 +1,27 @@ +
+ + + +
{$form.USR_PASSWORD}
+
+ + {$form.USR_USERNAME} + {$form.USR_PASSWORD_MASK} + +
+
+ + {$form.USER_ENV} + {$form.USER_LANG} + +
+ {$form.BSUBMIT} +
+ +
\ No newline at end of file diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml new file mode 100755 index 000000000..30d75bcff --- /dev/null +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -0,0 +1,60 @@ + + + + <en><![CDATA[Login]]></en> + + + + + + + + + + + + + + +SELECT LANG_ID, LANG_NAME FROM langOptions + + + + + + + diff --git a/workflow/public_html/images/backgroundpm3.jpg b/workflow/public_html/images/backgroundpm3.jpg new file mode 100644 index 000000000..85fd281c8 Binary files /dev/null and b/workflow/public_html/images/backgroundpm3.jpg differ diff --git a/workflow/public_html/images/logopm3.png b/workflow/public_html/images/logopm3.png new file mode 100644 index 000000000..df5f03fe0 Binary files /dev/null and b/workflow/public_html/images/logopm3.png differ