Merged in dheeyi/processmaker/PM-3025 (pull request #2410)

Pm 3025

workflow/engine/classes/model/Dynaform.php

@@ -169,6 +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->setDynUpdateDate( date("Y-m-d H:i:s"));
 
             if (isset($aData["DYN_CONTENT"])) {
                 $this->setDynContent($aData["DYN_CONTENT"]);
@@ -569,6 +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 );
+                $oPro->setDynUpdateDate(date("Y-m-d H:i:s"));
                 if ($oPro->validate()) {
                     if (isset( $aData['DYN_TITLE'] )) {
                         $oPro->setDynTitle( $aData['DYN_TITLE'] );

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

@@ -79,6 +79,8 @@ class DynaformMapBuilder
 
         $tMap->addColumn('DYN_VERSION', 'DynVersion', 'int', CreoleTypes::INTEGER, true, null);
 
+        $tMap->addColumn('DYN_UPDATE_DATE', 'DynUpdateDate', 'int', CreoleTypes::DATE, false, null);
+
         $tMap->addValidator('DYN_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'xmlform|grid', 'Please select a valid dynaform type.');
 
     } // doBuild()

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

@@ -25,7 +25,7 @@ abstract class BaseAbeConfigurationPeer
     const CLASS_DEFAULT = 'classes.model.AbeConfiguration';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 12;
+    const NUM_COLUMNS = 13;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;

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

@@ -69,6 +69,12 @@ abstract class BaseDynaform extends BaseObject implements Persistent
      */
     protected $dyn_version;
 
+    /**
+     * The value for the dyn_update_date field.
+     * @var        int
+     */
+    protected $dyn_update_date;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -160,6 +166,38 @@ abstract class BaseDynaform extends BaseObject implements Persistent
         return $this->dyn_version;
     }
 
+    /**
+     * 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 getDynUpdateDate($format = 'Y-m-d')
+    {
+
+        if ($this->dyn_update_date === null || $this->dyn_update_date === '') {
+            return null;
+        } elseif (!is_int($this->dyn_update_date)) {
+            // a non-timestamp value was set externally, so we convert it
+            $ts = strtotime($this->dyn_update_date);
+            if ($ts === -1 || $ts === false) {
+                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_date;
+        }
+        if ($format === null) {
+            return $ts;
+        } elseif (strpos($format, '%') !== false) {
+            return strftime($format, $ts);
+        } else {
+            return date($format, $ts);
+        }
+    }
+
     /**
      * Set the value of [dyn_uid] column.
      * 
@@ -314,6 +352,35 @@ abstract class BaseDynaform extends BaseObject implements Persistent
 
     } // setDynVersion()
 
+    /**
+     * Set the value of [dyn_update_date] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setDynUpdateDate($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 [dyn_update_date] from input: " .
+                    var_export($v, true));
+            }
+        } else {
+            $ts = $v;
+        }
+        if ($this->dyn_update_date !== $ts) {
+            $this->dyn_update_date = $ts;
+            $this->modifiedColumns[] = DynaformPeer::DYN_UPDATE_DATE;
+        }
+
+    } // setDynUpdateDate()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -345,12 +412,14 @@ abstract class BaseDynaform extends BaseObject implements Persistent
 
             $this->dyn_version = $rs->getInt($startcol + 6);
 
+            $this->dyn_update_date = $rs->getDate($startcol + 7, null);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 7; // 7 = DynaformPeer::NUM_COLUMNS - DynaformPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 8; // 8 = DynaformPeer::NUM_COLUMNS - DynaformPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Dynaform object", $e);
@@ -575,6 +644,9 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             case 6:
                 return $this->getDynVersion();
                 break;
+            case 7:
+                return $this->getDynUpdateDate();
+                break;
             default:
                 return null;
                 break;
@@ -602,6 +674,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             $keys[4] => $this->getDynContent(),
             $keys[5] => $this->getDynLabel(),
             $keys[6] => $this->getDynVersion(),
+            $keys[7] => $this->getDynUpdateDate(),
         );
         return $result;
     }
@@ -654,6 +727,9 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             case 6:
                 $this->setDynVersion($value);
                 break;
+            case 7:
+                $this->setDynUpdateDate($value);
+                break;
         } // switch()
     }
 
@@ -705,6 +781,10 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             $this->setDynVersion($arr[$keys[6]]);
         }
 
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setDynUpdateDate($arr[$keys[7]]);
+        }
+
     }
 
     /**
@@ -744,6 +824,10 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             $criteria->add(DynaformPeer::DYN_VERSION, $this->dyn_version);
         }
 
+        if ($this->isColumnModified(DynaformPeer::DYN_UPDATE_DATE)) {
+            $criteria->add(DynaformPeer::DYN_UPDATE_DATE, $this->dyn_update_date);
+        }
+
 
         return $criteria;
     }
@@ -810,6 +894,8 @@ abstract class BaseDynaform extends BaseObject implements Persistent
 
         $copyObj->setDynVersion($this->dyn_version);
 
+        $copyObj->setDynUpdateDate($this->dyn_update_date);
+
 
         $copyObj->setNew(true);
 

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

@@ -25,7 +25,7 @@ abstract class BaseDynaformPeer
     const CLASS_DEFAULT = 'classes.model.Dynaform';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 8;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -52,6 +52,9 @@ abstract class BaseDynaformPeer
     /** the column name for the DYN_VERSION field */
     const DYN_VERSION = 'DYNAFORM.DYN_VERSION';
 
+    /** 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;
 
@@ -63,10 +66,10 @@ 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', ),
+        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, ),
+        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', ),
+        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, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -76,10 +79,10 @@ 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, ),
+        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, ),
+        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, ),
+        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, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -194,6 +197,8 @@ abstract class BaseDynaformPeer
 
         $criteria->addSelectColumn(DynaformPeer::DYN_VERSION);
 
+        $criteria->addSelectColumn(DynaformPeer::DYN_UPDATE_DATE);
+
     }
 
     const COUNT = 'COUNT(DYNAFORM.DYN_UID)';

workflow/engine/config/schema.xml

@@ -465,6 +465,7 @@
     <column name="DYN_CONTENT" type="LONGVARCHAR"/>
     <column name="DYN_LABEL" type="LONGVARCHAR"/>
     <column name="DYN_VERSION" type="INTEGER" required="true"/>
+    <column name="DYN_UPDATE_DATE" type="DATE" required="false"/>
     <validator column="DYN_TYPE">
       <rule name="validValues" value="xmlform|grid" message="Please select a valid dynaform type."/>
     </validator>

workflow/engine/data/mssql/schema.sql

@@ -432,6 +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] DATE default '' NOT NULL,
 	CONSTRAINT DYNAFORM_PK PRIMARY KEY ([DYN_UID])
 );
 

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

@@ -921,6 +921,7 @@ class DynaForm
             $criteria->addSelectColumn(\DynaformPeer::DYN_TYPE);
             $criteria->addSelectColumn(\DynaformPeer::DYN_CONTENT);
             $criteria->addSelectColumn(\DynaformPeer::DYN_VERSION);
+            $criteria->addSelectColumn(\DynaformPeer::DYN_UPDATE_DATE);
 
             $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
             $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
@@ -973,7 +974,8 @@ class DynaForm
                 $this->getFieldNameByFormatFieldName("DYN_DESCRIPTION") => $record["DYN_DESCRIPTION"] . "",
                 $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_VERSION")     => (int)($record["DYN_VERSION"]),
+                $this->getFieldNameByFormatFieldName("DYN_UPDATE_DATE")     => $record["DYN_UPDATE_DATE"]
             );
         } catch (\Exception $e) {
             throw $e;