diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php index 0b9d8ddc7..9f30f063c 100755 --- a/workflow/engine/classes/model/Dynaform.php +++ b/workflow/engine/classes/model/Dynaform.php @@ -169,7 +169,7 @@ class Dynaform extends BaseDynaform $this->setProUid( $aData['PRO_UID'] ); $this->setDynType( isset( $aData['DYN_TYPE'] ) ? $aData['DYN_TYPE'] : 'xmlform' ); $this->setDynFilename( $aData['PRO_UID'] . PATH_SEP . $dynUid ); - $this->setDynUpdate( date("Y-m-d H:i:s")); + $this->setDynUpdateDate( date("Y-m-d H:i:s")); if (isset($aData["DYN_CONTENT"])) { $this->setDynContent($aData["DYN_CONTENT"]); @@ -570,7 +570,7 @@ class Dynaform extends BaseDynaform $oPro = DynaformPeer::retrieveByPK( $aData['DYN_UID'] ); if (is_object( $oPro ) && get_class( $oPro ) == 'Dynaform') { $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); - $this->setDynUpdate(date("Y-m-d H:i:s")); + $oPro->setDynUpdateDate(date("Y-m-d H:i:s")); if ($oPro->validate()) { if (isset( $aData['DYN_TITLE'] )) { $oPro->setDynTitle( $aData['DYN_TITLE'] ); diff --git a/workflow/engine/classes/model/om/BaseDynaform.php b/workflow/engine/classes/model/om/BaseDynaform.php index cc1de1b98..210c90197 100755 --- a/workflow/engine/classes/model/om/BaseDynaform.php +++ b/workflow/engine/classes/model/om/BaseDynaform.php @@ -70,10 +70,10 @@ abstract class BaseDynaform extends BaseObject implements Persistent protected $dyn_version; /** - * The value for the dyn_update field. + * The value for the dyn_update_date field. * @var int */ - protected $dyn_update; + protected $dyn_update_date; /** * Flag to prevent endless save loop, if this object is referenced @@ -167,27 +167,27 @@ abstract class BaseDynaform extends BaseObject implements Persistent } /** - * Get the [optionally formatted] [dyn_update] column value. + * Get the [optionally formatted] [dyn_update_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 getDynUpdate($format = 'Y-m-d') + public function getDynUpdateDate($format = 'Y-m-d') { - if ($this->dyn_update === null || $this->dyn_update === '') { + if ($this->dyn_update_date === null || $this->dyn_update_date === '') { return null; - } elseif (!is_int($this->dyn_update)) { + } elseif (!is_int($this->dyn_update_date)) { // a non-timestamp value was set externally, so we convert it - $ts = strtotime($this->dyn_update); + $ts = strtotime($this->dyn_update_date); if ($ts === -1 || $ts === false) { - throw new PropelException("Unable to parse value of [dyn_update] as date/time value: " . - var_export($this->dyn_update, true)); + throw new PropelException("Unable to parse value of [dyn_update_date] as date/time value: " . + var_export($this->dyn_update_date, true)); } } else { - $ts = $this->dyn_update; + $ts = $this->dyn_update_date; } if ($format === null) { return $ts; @@ -353,12 +353,12 @@ abstract class BaseDynaform extends BaseObject implements Persistent } // setDynVersion() /** - * Set the value of [dyn_update] column. + * Set the value of [dyn_update_date] column. * * @param int $v new value * @return void */ - public function setDynUpdate($v) + public function setDynUpdateDate($v) { if ($v !== null && !is_int($v)) { @@ -368,18 +368,18 @@ abstract class BaseDynaform extends BaseObject implements Persistent $ts = null; } if ($ts === -1 || $ts === false) { - throw new PropelException("Unable to parse date/time value for [dyn_update] from input: " . + throw new PropelException("Unable to parse date/time value for [dyn_update_date] from input: " . var_export($v, true)); } } else { $ts = $v; } - if ($this->dyn_update !== $ts) { - $this->dyn_update = $ts; - $this->modifiedColumns[] = DynaformPeer::DYN_UPDATE; + if ($this->dyn_update_date !== $ts) { + $this->dyn_update_date = $ts; + $this->modifiedColumns[] = DynaformPeer::DYN_UPDATE_DATE; } - } // setDynUpdate() + } // setDynUpdateDate() /** * Hydrates (populates) the object variables with values from the database resultset. @@ -412,7 +412,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent $this->dyn_version = $rs->getInt($startcol + 6); - $this->dyn_update = $rs->getDate($startcol + 7, null); + $this->dyn_update_date = $rs->getDate($startcol + 7, null); $this->resetModified(); @@ -645,7 +645,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent return $this->getDynVersion(); break; case 7: - return $this->getDynUpdate(); + return $this->getDynUpdateDate(); break; default: return null; @@ -674,7 +674,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent $keys[4] => $this->getDynContent(), $keys[5] => $this->getDynLabel(), $keys[6] => $this->getDynVersion(), - $keys[7] => $this->getDynUpdate(), + $keys[7] => $this->getDynUpdateDate(), ); return $result; } @@ -728,7 +728,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent $this->setDynVersion($value); break; case 7: - $this->setDynUpdate($value); + $this->setDynUpdateDate($value); break; } // switch() } @@ -782,7 +782,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent } if (array_key_exists($keys[7], $arr)) { - $this->setDynUpdate($arr[$keys[7]]); + $this->setDynUpdateDate($arr[$keys[7]]); } } @@ -824,8 +824,8 @@ abstract class BaseDynaform extends BaseObject implements Persistent $criteria->add(DynaformPeer::DYN_VERSION, $this->dyn_version); } - if ($this->isColumnModified(DynaformPeer::DYN_UPDATE)) { - $criteria->add(DynaformPeer::DYN_UPDATE, $this->dyn_update); + if ($this->isColumnModified(DynaformPeer::DYN_UPDATE_DATE)) { + $criteria->add(DynaformPeer::DYN_UPDATE_DATE, $this->dyn_update_date); } @@ -894,7 +894,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent $copyObj->setDynVersion($this->dyn_version); - $copyObj->setDynUpdate($this->dyn_update); + $copyObj->setDynUpdateDate($this->dyn_update_date); $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseDynaformPeer.php b/workflow/engine/classes/model/om/BaseDynaformPeer.php index a810d5b52..0481bad40 100755 --- a/workflow/engine/classes/model/om/BaseDynaformPeer.php +++ b/workflow/engine/classes/model/om/BaseDynaformPeer.php @@ -52,8 +52,8 @@ abstract class BaseDynaformPeer /** the column name for the DYN_VERSION field */ const DYN_VERSION = 'DYNAFORM.DYN_VERSION'; - /** the column name for the DYN_UPDATE field */ - const DYN_UPDATE = 'DYNAFORM.DYN_UPDATE'; + /** the column name for the DYN_UPDATE_DATE field */ + const DYN_UPDATE_DATE = 'DYNAFORM.DYN_UPDATE_DATE'; /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -66,9 +66,9 @@ abstract class BaseDynaformPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('DynUid', 'ProUid', 'DynType', 'DynFilename', 'DynContent', 'DynLabel', 'DynVersion', 'DynUpdate', ), - BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID, DynaformPeer::PRO_UID, DynaformPeer::DYN_TYPE, DynaformPeer::DYN_FILENAME, DynaformPeer::DYN_CONTENT, DynaformPeer::DYN_LABEL, DynaformPeer::DYN_VERSION, DynaformPeer::DYN_UPDATE, ), - BasePeer::TYPE_FIELDNAME => array ('DYN_UID', 'PRO_UID', 'DYN_TYPE', 'DYN_FILENAME', 'DYN_CONTENT', 'DYN_LABEL', 'DYN_VERSION', 'DYN_UPDATE', ), + BasePeer::TYPE_PHPNAME => array ('DynUid', 'ProUid', 'DynType', 'DynFilename', 'DynContent', 'DynLabel', 'DynVersion', 'DynUpdateDate', ), + BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID, DynaformPeer::PRO_UID, DynaformPeer::DYN_TYPE, DynaformPeer::DYN_FILENAME, DynaformPeer::DYN_CONTENT, DynaformPeer::DYN_LABEL, DynaformPeer::DYN_VERSION, DynaformPeer::DYN_UPDATE_DATE, ), + BasePeer::TYPE_FIELDNAME => array ('DYN_UID', 'PRO_UID', 'DYN_TYPE', 'DYN_FILENAME', 'DYN_CONTENT', 'DYN_LABEL', 'DYN_VERSION', 'DYN_UPDATE_DATE', ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) ); @@ -79,9 +79,9 @@ abstract class BaseDynaformPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('DynUid' => 0, 'ProUid' => 1, 'DynType' => 2, 'DynFilename' => 3, 'DynContent' => 4, 'DynLabel' => 5, 'DynVersion' => 6, 'DynUpdate' => 7, ), - BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID => 0, DynaformPeer::PRO_UID => 1, DynaformPeer::DYN_TYPE => 2, DynaformPeer::DYN_FILENAME => 3, DynaformPeer::DYN_CONTENT => 4, DynaformPeer::DYN_LABEL => 5, DynaformPeer::DYN_VERSION => 6, DynaformPeer::DYN_UPDATE => 7, ), - BasePeer::TYPE_FIELDNAME => array ('DYN_UID' => 0, 'PRO_UID' => 1, 'DYN_TYPE' => 2, 'DYN_FILENAME' => 3, 'DYN_CONTENT' => 4, 'DYN_LABEL' => 5, 'DYN_VERSION' => 6, 'DYN_UPDATE' => 7, ), + BasePeer::TYPE_PHPNAME => array ('DynUid' => 0, 'ProUid' => 1, 'DynType' => 2, 'DynFilename' => 3, 'DynContent' => 4, 'DynLabel' => 5, 'DynVersion' => 6, 'DynUpdateDate' => 7, ), + BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID => 0, DynaformPeer::PRO_UID => 1, DynaformPeer::DYN_TYPE => 2, DynaformPeer::DYN_FILENAME => 3, DynaformPeer::DYN_CONTENT => 4, DynaformPeer::DYN_LABEL => 5, DynaformPeer::DYN_VERSION => 6, DynaformPeer::DYN_UPDATE_DATE => 7, ), + BasePeer::TYPE_FIELDNAME => array ('DYN_UID' => 0, 'PRO_UID' => 1, 'DYN_TYPE' => 2, 'DYN_FILENAME' => 3, 'DYN_CONTENT' => 4, 'DYN_LABEL' => 5, 'DYN_VERSION' => 6, 'DYN_UPDATE_DATE' => 7, ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) ); @@ -197,7 +197,7 @@ abstract class BaseDynaformPeer $criteria->addSelectColumn(DynaformPeer::DYN_VERSION); - $criteria->addSelectColumn(DynaformPeer::DYN_UPDATE); + $criteria->addSelectColumn(DynaformPeer::DYN_UPDATE_DATE); } diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index d3268bc2e..50f12575e 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -465,7 +465,7 @@ - + diff --git a/workflow/engine/data/mssql/schema.sql b/workflow/engine/data/mssql/schema.sql index f66e244e5..93cec8bbc 100755 --- a/workflow/engine/data/mssql/schema.sql +++ b/workflow/engine/data/mssql/schema.sql @@ -432,7 +432,7 @@ CREATE TABLE [DYNAFORM] [PRO_UID] VARCHAR(32) default '0' NOT NULL, [DYN_TYPE] VARCHAR(20) default 'xmlform' NOT NULL, [DYN_FILENAME] VARCHAR(100) default '' NOT NULL, - [DYN_UPDATE] DATE default '' NOT NULL + [DYN_UPDATE_DATE] DATE default '' NOT NULL CONSTRAINT DYNAFORM_PK PRIMARY KEY ([DYN_UID]) ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php index e1427cb15..d5624b052 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php @@ -921,7 +921,7 @@ class DynaForm $criteria->addSelectColumn(\DynaformPeer::DYN_TYPE); $criteria->addSelectColumn(\DynaformPeer::DYN_CONTENT); $criteria->addSelectColumn(\DynaformPeer::DYN_VERSION); - $criteria->addSelectColumn(\DynaformPeer::DYN_UPDATE); + $criteria->addSelectColumn(\DynaformPeer::DYN_UPDATE_DATE); $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); @@ -975,7 +975,7 @@ class DynaForm $this->getFieldNameByFormatFieldName("DYN_TYPE") => $record["DYN_TYPE"] . "", $this->getFieldNameByFormatFieldName("DYN_CONTENT") => $record["DYN_CONTENT"] . "", $this->getFieldNameByFormatFieldName("DYN_VERSION") => (int)($record["DYN_VERSION"]), - $this->getFieldNameByFormatFieldName("DYN_UPDATE") => $record["DYN_UPDATE"] + $this->getFieldNameByFormatFieldName("DYN_UPDATE_DATE") => $record["DYN_UPDATE_DATE"] ); } catch (\Exception $e) { throw $e;