BUG 000 Add cases summary to branch 2.0

workflow/engine/classes/class.dynaformEditor.php

@@ -408,8 +408,9 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
       default:
         $template = 'xmlform_' . $G_PUBLISH->publisherId;
         $aFields  = array( '__DYNAFORM_OPTIONS'=> array(
-                                                      'PREVIOUS_STEP'     => '#',
+                                                      'PREVIOUS_STEP'    => '#',
-                                                      'NEXT_STEP'         => '#',
+                                                      'NEXT_STEP'        => '#',
+                                                      'NEXT_STEP_LABEL'  => G::loadTranslation('ID_NEXT_STEP'),
                                                       'PREVIOUS_ACTION'  => 'return false;',
                                                       'NEXT_ACTION'      => 'return false;'
                                                       )

workflow/engine/classes/class.processMap.php

@@ -427,6 +427,7 @@ class processMap {
 
         $_SESSION ['_DBArray'] = $_DBArray;
         $aFields = $oProcess->load($sProcessUID);
+        $aFields['PRO_SUMMARY_DYNAFORM'] = (isset($aFields['PRO_DYNAFORMS']['PROCESS']) ? $aFields['PRO_DYNAFORMS']['PROCESS'] : '');
         $aFields ['THETYPE'] = 'UPDATE';
         $calendarInfo = $calendar->getCalendarFor($sProcessUID, $sProcessUID, $sProcessUID);
         //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar

workflow/engine/classes/class.processes.php

@@ -750,14 +750,27 @@ class Processes {
       $newGuid = $this->getUnusedDynaformGUID();
       $map[ $val['DYN_UID'] ] = $newGuid;
       $oData->dynaforms[$key]['DYN_UID'] = $newGuid;
-
     }
+
+    if (!is_array($oData->process['PRO_DYNAFORMS'])) {
+      $oData->process['PRO_DYNAFORMS'] = @unserialize($oData->process['PRO_DYNAFORMS']);
+    }
+
+    if (!isset($oData->process['PRO_DYNAFORMS']['PROCESS'])) {
+      $oData->process['PRO_DYNAFORMS']['PROCESS'] = '';
+    }
+
+    if ($oData->process['PRO_DYNAFORMS']['PROCESS'] != '') {
+      $oData->process['PRO_DYNAFORMS']['PROCESS'] = $map[$oData->process['PRO_DYNAFORMS']['PROCESS']];
+    }
+
     foreach ( $oData->steps as $key => $val ) {
       if ( $val['STEP_TYPE_OBJ'] == 'DYNAFORM' ) {
         $newGuid = $map[ $val['STEP_UID_OBJ'] ];
         $oData->steps[$key]['STEP_UID_OBJ'] = $newGuid;
       }
     }
+
     if ( isset($oData->caseTrackerObject ) && is_array($oData->caseTrackerObject) ) {
       foreach ( $oData->caseTrackerObject as $key => $val ) {
         if ( $val['CTO_TYPE_OBJ'] == 'DYNAFORM' ) {

workflow/engine/classes/model/Process.php

@@ -180,6 +180,7 @@ class Process extends BaseProcess {
       $this->setProWidth        ( 10000 );
       $this->setProTitleX       ( 0 );
       $this->setProTitleY       ( 0 );
+      $this->setProDynaforms    ( isset($aData['PRO_DYNAFORMS']) ? (is_array($aData['PRO_DYNAFORMS']) ? serialize($aData['PRO_DYNAFORMS']) : $aData['PRO_DYNAFORMS']) : '' );
 
       if ( $this->validate() ) {
         $con->begin();
@@ -315,6 +316,8 @@ class Process extends BaseProcess {
         	}
         }
 
+        $aFields['PRO_DYNAFORMS'] = @unserialize($aFields['PRO_DYNAFORMS']);
+
         return $aFields;
       }
       else {
@@ -393,6 +396,9 @@ class Process extends BaseProcess {
 
   public function update($aData)
   {
+    if (is_array($aData['PRO_DYNAFORMS'])) {
+      $aData['PRO_DYNAFORMS'] = @serialize($aData['PRO_DYNAFORMS']);
+    }
     $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
     try {
       $con->begin();
@@ -458,6 +464,7 @@ class Process extends BaseProcess {
     $this->setProWidth        ( $aData['PRO_WIDTH'] );
     $this->setProTitleX       ( $aData['PRO_TITLE_X'] );
     $this->setProTitleY       ( $aData['PRO_TITLE_Y'] );
+    $this->setProDynaforms    ( isset($aData['PRO_DYNAFORMS']) ? (is_array($aData['PRO_DYNAFORMS']) ? serialize($aData['PRO_DYNAFORMS']) : $aData['PRO_DYNAFORMS']) : '' );
     if ( $this->validate() ) {
 			$con->begin();
       $res = $this->save();

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

@@ -110,6 +110,8 @@ class ProcessMapBuilder {
 
 		$tMap->addColumn('PRO_DEBUG', 'ProDebug', 'int', CreoleTypes::INTEGER, true, null);
 
+		$tMap->addColumn('PRO_DYNAFORMS', 'ProDynaforms', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
 		$tMap->addValidator('PRO_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'WEEKS|MONTHS|DAYS|HOURS|MINUTES', 'Please select a valid Time Unit.');
 
 		$tMap->addValidator('PRO_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|DISABLED', 'Please select a valid Process Status.');

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

@@ -188,6 +188,13 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 	 */
 	protected $pro_debug = 0;
 
+
+	/**
+	 * The value for the pro_dynaforms field.
+	 * @var        string
+	 */
+	protected $pro_dynaforms;
+
 	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
@@ -495,6 +502,17 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 		return $this->pro_debug;
 	}
 
+	/**
+	 * Get the [pro_dynaforms] column value.
+	 * 
+	 * @return     string
+	 */
+	public function getProDynaforms()
+	{
+
+		return $this->pro_dynaforms;
+	}
+
 	/**
 	 * Set the value of [pro_uid] column.
 	 * 
@@ -999,6 +1017,28 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 
 	} // setProDebug()
 
+	/**
+	 * Set the value of [pro_dynaforms] column.
+	 * 
+	 * @param      string $v new value
+	 * @return     void
+	 */
+	public function setProDynaforms($v)
+	{
+
+		// Since the native PHP type for this column is string,
+		// we will cast the input to a string (if it is not).
+		if ($v !== null && !is_string($v)) {
+			$v = (string) $v; 
+		}
+
+		if ($this->pro_dynaforms !== $v) {
+			$this->pro_dynaforms = $v;
+			$this->modifiedColumns[] = ProcessPeer::PRO_DYNAFORMS;
+		}
+
+	} // setProDynaforms()
+
 	/**
 	 * Hydrates (populates) the object variables with values from the database resultset.
 	 *
@@ -1062,12 +1102,14 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 
 			$this->pro_debug = $rs->getInt($startcol + 22);
 
+			$this->pro_dynaforms = $rs->getString($startcol + 23);
+
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 23; // 23 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 24; // 24 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating Process object", $e);
@@ -1339,6 +1381,9 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 			case 22:
 				return $this->getProDebug();
 				break;
+			case 23:
+				return $this->getProDynaforms();
+				break;
 			default:
 				return null;
 				break;
@@ -1382,6 +1427,7 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 			$keys[20] => $this->getProTitleX(),
 			$keys[21] => $this->getProTitleY(),
 			$keys[22] => $this->getProDebug(),
+			$keys[23] => $this->getProDynaforms(),
 		);
 		return $result;
 	}
@@ -1482,6 +1528,9 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 			case 22:
 				$this->setProDebug($value);
 				break;
+			case 23:
+				$this->setProDynaforms($value);
+				break;
 		} // switch()
 	}
 
@@ -1528,6 +1577,7 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 		if (array_key_exists($keys[20], $arr)) $this->setProTitleX($arr[$keys[20]]);
 		if (array_key_exists($keys[21], $arr)) $this->setProTitleY($arr[$keys[21]]);
 		if (array_key_exists($keys[22], $arr)) $this->setProDebug($arr[$keys[22]]);
+		if (array_key_exists($keys[23], $arr)) $this->setProDynaforms($arr[$keys[23]]);
 	}
 
 	/**
@@ -1562,6 +1612,7 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(ProcessPeer::PRO_TITLE_X)) $criteria->add(ProcessPeer::PRO_TITLE_X, $this->pro_title_x);
 		if ($this->isColumnModified(ProcessPeer::PRO_TITLE_Y)) $criteria->add(ProcessPeer::PRO_TITLE_Y, $this->pro_title_y);
 		if ($this->isColumnModified(ProcessPeer::PRO_DEBUG)) $criteria->add(ProcessPeer::PRO_DEBUG, $this->pro_debug);
+		if ($this->isColumnModified(ProcessPeer::PRO_DYNAFORMS)) $criteria->add(ProcessPeer::PRO_DYNAFORMS, $this->pro_dynaforms);
 
 		return $criteria;
 	}
@@ -1660,6 +1711,8 @@ abstract class BaseProcess extends BaseObject  implements Persistent {
 
 		$copyObj->setProDebug($this->pro_debug);
 
+		$copyObj->setProDynaforms($this->pro_dynaforms);
+
 
 		$copyObj->setNew(true);
 

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

@@ -24,7 +24,7 @@ abstract class BaseProcessPeer {
 	const CLASS_DEFAULT = 'classes.model.Process';
 
 	/** 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;
@@ -99,6 +99,9 @@ abstract class BaseProcessPeer {
 	/** the column name for the PRO_DEBUG field */
 	const PRO_DEBUG = 'PROCESS.PRO_DEBUG';
 
+	/** the column name for the PRO_DYNAFORMS field */
+	const PRO_DYNAFORMS = 'PROCESS.PRO_DYNAFORMS';
+
 	/** The PHP to DB Name Mapping */
 	private static $phpNameMap = null;
 
@@ -110,10 +113,10 @@ abstract class BaseProcessPeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', ),
+		BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', ),
-		BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ),
+		BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ),
-		BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', ),
+		BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, )
 	);
 
 	/**
@@ -123,10 +126,10 @@ abstract class BaseProcessPeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProParent' => 1, 'ProTime' => 2, 'ProTimeunit' => 3, 'ProStatus' => 4, 'ProTypeDay' => 5, 'ProType' => 6, 'ProAssignment' => 7, 'ProShowMap' => 8, 'ProShowMessage' => 9, 'ProShowDelegate' => 10, 'ProShowDynaform' => 11, 'ProCategory' => 12, 'ProSubCategory' => 13, 'ProIndustry' => 14, 'ProUpdateDate' => 15, 'ProCreateDate' => 16, 'ProCreateUser' => 17, 'ProHeight' => 18, 'ProWidth' => 19, 'ProTitleX' => 20, 'ProTitleY' => 21, 'ProDebug' => 22, ),
+		BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProParent' => 1, 'ProTime' => 2, 'ProTimeunit' => 3, 'ProStatus' => 4, 'ProTypeDay' => 5, 'ProType' => 6, 'ProAssignment' => 7, 'ProShowMap' => 8, 'ProShowMessage' => 9, 'ProShowDelegate' => 10, 'ProShowDynaform' => 11, 'ProCategory' => 12, 'ProSubCategory' => 13, 'ProIndustry' => 14, 'ProUpdateDate' => 15, 'ProCreateDate' => 16, 'ProCreateUser' => 17, 'ProHeight' => 18, 'ProWidth' => 19, 'ProTitleX' => 20, 'ProTitleY' => 21, 'ProDebug' => 22, 'ProDynaforms' => 23, ),
-		BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_PARENT => 1, ProcessPeer::PRO_TIME => 2, ProcessPeer::PRO_TIMEUNIT => 3, ProcessPeer::PRO_STATUS => 4, ProcessPeer::PRO_TYPE_DAY => 5, ProcessPeer::PRO_TYPE => 6, ProcessPeer::PRO_ASSIGNMENT => 7, ProcessPeer::PRO_SHOW_MAP => 8, ProcessPeer::PRO_SHOW_MESSAGE => 9, ProcessPeer::PRO_SHOW_DELEGATE => 10, ProcessPeer::PRO_SHOW_DYNAFORM => 11, ProcessPeer::PRO_CATEGORY => 12, ProcessPeer::PRO_SUB_CATEGORY => 13, ProcessPeer::PRO_INDUSTRY => 14, ProcessPeer::PRO_UPDATE_DATE => 15, ProcessPeer::PRO_CREATE_DATE => 16, ProcessPeer::PRO_CREATE_USER => 17, ProcessPeer::PRO_HEIGHT => 18, ProcessPeer::PRO_WIDTH => 19, ProcessPeer::PRO_TITLE_X => 20, ProcessPeer::PRO_TITLE_Y => 21, ProcessPeer::PRO_DEBUG => 22, ),
+		BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_PARENT => 1, ProcessPeer::PRO_TIME => 2, ProcessPeer::PRO_TIMEUNIT => 3, ProcessPeer::PRO_STATUS => 4, ProcessPeer::PRO_TYPE_DAY => 5, ProcessPeer::PRO_TYPE => 6, ProcessPeer::PRO_ASSIGNMENT => 7, ProcessPeer::PRO_SHOW_MAP => 8, ProcessPeer::PRO_SHOW_MESSAGE => 9, ProcessPeer::PRO_SHOW_DELEGATE => 10, ProcessPeer::PRO_SHOW_DYNAFORM => 11, ProcessPeer::PRO_CATEGORY => 12, ProcessPeer::PRO_SUB_CATEGORY => 13, ProcessPeer::PRO_INDUSTRY => 14, ProcessPeer::PRO_UPDATE_DATE => 15, ProcessPeer::PRO_CREATE_DATE => 16, ProcessPeer::PRO_CREATE_USER => 17, ProcessPeer::PRO_HEIGHT => 18, ProcessPeer::PRO_WIDTH => 19, ProcessPeer::PRO_TITLE_X => 20, ProcessPeer::PRO_TITLE_Y => 21, ProcessPeer::PRO_DEBUG => 22, ProcessPeer::PRO_DYNAFORMS => 23, ),
-		BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_PARENT' => 1, 'PRO_TIME' => 2, 'PRO_TIMEUNIT' => 3, 'PRO_STATUS' => 4, 'PRO_TYPE_DAY' => 5, 'PRO_TYPE' => 6, 'PRO_ASSIGNMENT' => 7, 'PRO_SHOW_MAP' => 8, 'PRO_SHOW_MESSAGE' => 9, 'PRO_SHOW_DELEGATE' => 10, 'PRO_SHOW_DYNAFORM' => 11, 'PRO_CATEGORY' => 12, 'PRO_SUB_CATEGORY' => 13, 'PRO_INDUSTRY' => 14, 'PRO_UPDATE_DATE' => 15, 'PRO_CREATE_DATE' => 16, 'PRO_CREATE_USER' => 17, 'PRO_HEIGHT' => 18, 'PRO_WIDTH' => 19, 'PRO_TITLE_X' => 20, 'PRO_TITLE_Y' => 21, 'PRO_DEBUG' => 22, ),
+		BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_PARENT' => 1, 'PRO_TIME' => 2, 'PRO_TIMEUNIT' => 3, 'PRO_STATUS' => 4, 'PRO_TYPE_DAY' => 5, 'PRO_TYPE' => 6, 'PRO_ASSIGNMENT' => 7, 'PRO_SHOW_MAP' => 8, 'PRO_SHOW_MESSAGE' => 9, 'PRO_SHOW_DELEGATE' => 10, 'PRO_SHOW_DYNAFORM' => 11, 'PRO_CATEGORY' => 12, 'PRO_SUB_CATEGORY' => 13, 'PRO_INDUSTRY' => 14, 'PRO_UPDATE_DATE' => 15, 'PRO_CREATE_DATE' => 16, 'PRO_CREATE_USER' => 17, 'PRO_HEIGHT' => 18, 'PRO_WIDTH' => 19, 'PRO_TITLE_X' => 20, 'PRO_TITLE_Y' => 21, 'PRO_DEBUG' => 22, 'PRO_DYNAFORMS' => 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, )
+		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, )
 	);
 
 	/**
@@ -273,6 +276,8 @@ abstract class BaseProcessPeer {
 
 		$criteria->addSelectColumn(ProcessPeer::PRO_DEBUG);
 
+		$criteria->addSelectColumn(ProcessPeer::PRO_DYNAFORMS);
+
 	}
 
 	const COUNT = 'COUNT(PROCESS.PRO_UID)';

workflow/engine/config/schema.xml

@@ -787,6 +787,7 @@
     <column name="PRO_TITLE_X" type="INTEGER" required="true" default="0"/>
     <column name="PRO_TITLE_Y" type="INTEGER" required="true" default="6"/>
     <column name="PRO_DEBUG" type="INTEGER" required="true" default="0"/>
+    <column name="PRO_DYNAFORMS" type="LONGVARCHAR" required="false"/>
     <validator column="PRO_TIMEUNIT">
       <rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/>
     </validator>

workflow/engine/data/mysql/schema.sql

@@ -397,6 +397,7 @@ CREATE TABLE `PROCESS`
 	`PRO_TITLE_X` INTEGER default 0 NOT NULL,
 	`PRO_TITLE_Y` INTEGER default 6 NOT NULL,
 	`PRO_DEBUG` INTEGER default 0 NOT NULL,
+	`PRO_DYNAFORMS` MEDIUMTEXT,
 	PRIMARY KEY (`PRO_UID`)
 )ENGINE=MyISAM  DEFAULT CHARSET='utf8' COMMENT='Store process Information';
 #-----------------------------------------------------------------------------

workflow/engine/js/processmap/core/processmap.js

@@ -340,7 +340,7 @@ var processmap=function(){
             this.tmp.editProcessPanel = panel =new leimnud.module.panel();
             panel.options={
               limit :true,
-              size  :{w:700,h:390},
+              size  :{w:700,h:420},
               position:{x:50,y:50,center:true},
               title :G_STRINGS.ID_PROCESSMAP_EDIT_PROCESS+": "+this.data.db.title.label,
               theme :this.options.theme,

workflow/engine/methods/cases/casesListExtJs.php

@@ -40,14 +40,16 @@
   // if the general settings has been set the pagesize values are extracted from that record
   if (isset($generalConfCasesList['casesListRowNumber'])&&!empty($generalConfCasesList['casesListRowNumber'])){
     $pageSize = intval($generalConfCasesList['casesListRowNumber']);
-  } else {
+  }
+  else {
     $pageSize = intval($config['rowsperpage']);
   }
 
   // if the general settings has been set the dateFormat values are extracted from that record
-  if (isset($generalConfCasesList['casesListDateFormat'])&&!empty($generalConfCasesList['casesListDateFormat'])){
+  if (isset($generalConfCasesList['casesListDateFormat']) && !empty($generalConfCasesList['casesListDateFormat'])){
     $dateFormat = $generalConfCasesList['casesListDateFormat'];
-  } else {
+  }
+  else {
     $dateFormat = $config['dateformat'];
   }
 
@@ -111,7 +113,7 @@
   $oHeadPublisher->assign( '___p34315105',   $menuPerms); // user menu permissions
 
   $oHeadPublisher->usingExtJs('ux/GridRowActions');
-  $oHeadPublisher->addExtJsScript('cases/caseNotes', true);
+  $oHeadPublisher->addExtJsScript('cases/caseUtils', true);
   $oHeadPublisher->addExtJsScript('cases/casesList', false );    //adding a javascript file .js
   $oHeadPublisher->addContent( 'cases/casesListExtJs'); //adding a html file  .html.
 
@@ -326,6 +328,7 @@
   function getToDo() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                 'dataIndex' => 'APP_NUMBER',       'width' => 45, 'align' => 'center');
+    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),       'dataIndex' => 'APP_TITLE',        'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                           'dataIndex' => 'USR_UID',          'width' => 50 , 'hidden'=> true, 'hideable'=> false);
@@ -355,6 +358,7 @@
     $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
 
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y' );
@@ -363,6 +367,7 @@
   function getDraft() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                 'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
+    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),       'dataIndex' => 'APP_TITLE',         'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                           'dataIndex' => 'USR_UID',           'width' => 50, 'hidden'=> true, 'hideable'=> false);
@@ -390,6 +395,7 @@
     $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
     $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
@@ -398,7 +404,8 @@
   function getParticipated() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',         'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',           'width' => 50, 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50, 'hidden'=> true, 'hideable'=> false);
@@ -426,6 +433,7 @@
     $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
     $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
 
@@ -435,6 +443,8 @@
    function getSearch() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                     'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
+    $caseColumns[] = array( 'header' => '',                                      'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                      'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),           'dataIndex' => 'APP_TITLE',         'width' => 100 );
     $caseColumns[] = array( 'header' => 'UserUid',                               'dataIndex' => 'USR_UID',           'width' => 50 , 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'PreUsrUid',                             'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50 , 'hidden'=> true, 'hideable'=> false);
@@ -464,6 +474,7 @@
     $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
     $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
@@ -472,7 +483,8 @@
   function getUnassigned() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',      'width' => 40, 'align' => 'left');
-    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',       'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',         'width' => 50, 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false);
@@ -502,6 +514,7 @@
     $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
     $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
@@ -510,7 +523,8 @@
   function getPaused() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',           'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',            'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',              'width' => 50, 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID',     'width' => 50, 'hidden'=> true, 'hideable'=> false);
@@ -542,6 +556,7 @@
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
     $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
     $caseReaderFields[] = array( 'name' => 'APP_THREAD_INDEX' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
@@ -550,7 +565,8 @@
   function getToRevise() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',      'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',       'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',         'width' => 50, 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false);
@@ -581,6 +597,7 @@
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
     $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
     $caseReaderFields[] = array( 'name' => 'ID_SENT_BY' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
@@ -588,7 +605,8 @@
 
   function getToReassign() {
     $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => 'TaskUid',                            'dataIndex' => 'TAS_UID' ,        'width' => 150 ,'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'DelIndex',                           'dataIndex' => 'DEL_INDEX' ,      'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',         'width' => 50, 'hidden'=> true, 'hideable'=> false);
@@ -616,6 +634,7 @@
 //    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
     $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
 
@@ -625,7 +644,8 @@
   function getGeneral() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
+    $caseColumns[] = array( 'header' => '',                                   'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',         'width' => 150 );
     $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',           'width' => 50 , 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50 , 'hidden'=> true, 'hideable'=> false);
@@ -648,6 +668,7 @@
     $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
     $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
     $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
 
@@ -661,13 +682,13 @@
   function getReassignList() {
     $caseColumns = array ();
     $caseColumns[] = array( 'header' => '#',                                 'dataIndex' => 'APP_NUMBER',          'width' => 40 );
+    $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_SUMMARY',     'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => '',                                  'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 15, 'align' => 'center',  'sorteable'=>false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),       'dataIndex' => 'APP_TITLE',           'width' => 100, 'hidden'=> true);
     $caseColumns[] = array( 'header' => 'CaseId',                            'dataIndex' => 'APP_UID'  ,           'width' => 200, 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => 'User',                              'dataIndex' => 'USR_UID'  ,           'width' => 200, 'hidden'=> true, 'hideable'=> false);
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),       'dataIndex' => 'APP_TAS_TITLE',       'width' => 120 );
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),    'dataIndex' => 'APP_PRO_TITLE',       'width' => 120 );
-//    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'),     'dataIndex' => 'APP_STATUS',    'width' => 50 );
     $caseColumns[] = array( 'header' => 'Reassigned Uid',                    'dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120, 'hidden'=> true, 'hideable'=> false );
     $caseColumns[] = array( 'header' => 'Reassigned Uid',                    'dataIndex' => 'TAS_UID',              'width' => 120, 'hidden'=> true, 'hideable'=> false );
     $caseColumns[] = array( 'header' => G::LoadTranslation('ID_REASSIGN_TO'),'dataIndex' => 'APP_REASSIGN_USER',    'width' => 170 );
@@ -682,11 +703,9 @@
     $caseReaderFields[] = array( 'name' => 'APP_REASSIGN_USER_UID' );
     $caseReaderFields[] = array( 'name' => 'TAS_UID' );
     $caseReaderFields[] = array( 'name' => 'APP_REASSIGN_USER' );
-//    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
+    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-//    $caseReaderFields[] = array( 'name' => 'USERS' );
     $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
 
-
     return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
   }
 
@@ -721,7 +740,6 @@ function getAdditionalFields($action, $confCasesList){
   if ( !empty($confCasesList) && !empty($confCasesList['second']['data']) ) {
     foreach($confCasesList['second']['data'] as $fieldData){
       if ( $fieldData['fieldType']!='key' ) {
-//        $label = ($fieldData['fieldType']=='case field' ) ? G::loadTranslation('ID_CASESLIST_'.$fieldData['name']) : $fieldData['label'];
         $label = $fieldData['label'];
         $caseColumns[]      = array( 'header' => $label, 'dataIndex' => $fieldData['name'], 'width' => $fieldData['width'], 'align' => $fieldData['align'] );
         $caseReaderFields[] = array( 'name'   => $fieldData['name'] );

workflow/engine/methods/cases/cases_Step.php

@@ -197,6 +197,7 @@
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
       }
       $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
+      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation('ID_NEXT_STEP');
 
       $oStep = new Step();
       $oStep = $oStep->loadByProcessTaskPosition($_SESSION['PROCESS'], $_SESSION['TASK'], $_GET['POSITION']);

workflow/engine/methods/cases/open.php

@@ -39,7 +39,7 @@
 
   $oHeadPublisher =& headPublisher::getSingleton();
   $oHeadPublisher->usingExtJs('ux/miframe');
-  $oHeadPublisher->addExtJsScript('cases/caseNotes', true);
+  $oHeadPublisher->addExtJsScript('cases/caseUtils', true);
   $oHeadPublisher->addExtJsScript('cases/open', true);
 
   $uri = '';

workflow/engine/methods/cases/summary.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * summary.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ *
+ */
+
+try {
+  global $RBAC;
+  switch ($RBAC->userCanAccess('PM_CASES')) {
+  	case -2:
+  	  throw new Exception(G::LoadTranslation('ID_USER_HAVENT_RIGHTS_SYSTEM'));
+  	break;
+  	case -1:
+  	  throw new Exception(G::LoadTranslation('ID_USER_HAVENT_RIGHTS_PAGE'));
+  	break;
+  }
+
+  if (!isset($_REQUEST['APP_UID']) || !isset($_REQUEST['DEL_INDEX']) || !isset($_REQUEST['DYN_UID'])) {
+    throw new Exception(G::LoadTranslation('ID_REQUIRED_FIELDS_ERROR') . ' (APP_UID, DEL_INDEX, DYN_UID)');
+  }
+
+  if ($_REQUEST['APP_UID'] == '' || $_REQUEST['DEL_INDEX'] == '' || $_REQUEST['DYN_UID'] == '') {
+    throw new Exception(G::LoadTranslation('ID_REQUIRED_FIELDS_ERROR') . ' (APP_UID, DEL_INDEX, DYN_UID)');
+  }
+
+  G::LoadClass('case');
+  $case = new Cases();
+  if ($RBAC->userCanAccess('PM_ALLCASES') < 0 && $case->userParticipatedInCase($_REQUEST['APP_UID'], $_SESSION['USER_LOGGED']) == 0) {
+    throw new Exception(G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'));
+  }
+
+  $applicationFields = $case->loadCase($_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX']);
+
+  if (file_exists(PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml')) {
+    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#';
+    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = '#';
+
+    G::LoadClass ('dbConnections');
+    $_SESSION['PROCESS'] = $applicationFields['PRO_UID'];
+    $dbConnections = new dbConnections($_SESSION['PROCESS']);
+    $dbConnections->loadAdditionalConnections();
+    $_SESSION['CURRENT_DYN_UID'] = $_REQUEST['DYN_UID'];
+
+    global $G_PUBLISH;
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent('dynaform', 'xmlform', $applicationFields['PRO_UID'] . '/' . $_REQUEST['DYN_UID'], '', $applicationFields['APP_DATA'], '', '', 'view');
+    G::RenderPage('publish', 'blank');
+  }
+  else {
+    throw new Exception(G::LoadTranslation('INVALID_FILE') . ': ' . $_REQUEST['DYN_UID']);
+  }
+}
+catch (Exception $error) {
+  global $G_PUBLISH;
+  $G_PUBLISH = new Publisher();
+  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => $error->getMessage()));
+  G::RenderPage('publish', 'blank');
+  die();
+}

workflow/engine/methods/cases/summaryAjax.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * summaryAjax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ *
+ */
+
+if (!isset($_REQUEST['action'])) {
+  $_REQUEST['action'] = 'getDataSummary';
+}
+if ($_REQUEST['action'] == '') {
+  $_REQUEST['action'] = 'getDataSummary';
+}
+
+try {
+  global $RBAC;
+  switch ($RBAC->userCanAccess('PM_CASES')) {
+  	case -2:
+  	  throw new Exception(G::LoadTranslation('ID_USER_HAVENT_RIGHTS_SYSTEM'));
+  	break;
+  	case -1:
+  	  throw new Exception(G::LoadTranslation('ID_USER_HAVENT_RIGHTS_PAGE'));
+  	break;
+  }
+
+  if (!isset($_REQUEST['APP_UID']) || !isset($_REQUEST['DEL_INDEX'])) {
+    throw new Exception(G::LoadTranslation('ID_REQUIRED_FIELDS_ERROR') . ' (APP_UID, DEL_INDEX)');
+  }
+
+  G::LoadClass('case');
+  $case = new Cases();
+  if ($RBAC->userCanAccess('PM_ALLCASES') < 0 && $case->userParticipatedInCase($_REQUEST['APP_UID'], $_SESSION['USER_LOGGED']) == 0) {
+    throw new Exception(G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'));
+  }
+
+  $json = new Services_JSON();
+  $response = new stdclass();
+  $response->type = 'OK';
+  switch ($_REQUEST['action']) {
+    case 'getDataSummary':
+      $response->labels = new stdclass();
+      $form = new Form('cases/cases_Resume', PATH_XMLFORM, SYS_LANG);
+      foreach($form->fields as $fieldName => $field) {
+        $response->labels->{$fieldName} = $field->label;
+      }
+      $applicationFields = $case->loadCase($_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX']);
+      $process = new Process();
+      $processData = $process->load($applicationFields['PRO_UID']);
+      if (!isset($processData['PRO_DYNAFORMS']['PROCESS'])) {
+        $processData['PRO_DYNAFORMS']['PROCESS'] = '';
+      }
+      $task = new Task();
+      $taskData = $task->load($applicationFields['TAS_UID']);
+      $response->values = new stdclass();
+      $response->values->PRO_TITLE = $processData['PRO_TITLE'];
+      $response->values->TITLE = $applicationFields['TITLE'];
+      $response->values->APP_NUMBER = $applicationFields['APP_NUMBER'];
+      $response->values->STATUS = $applicationFields['STATUS'];
+      $response->values->APP_UID = $applicationFields['APP_UID'];
+      $response->values->CREATOR = $applicationFields['CREATOR'];
+      $response->values->CREATE_DATE = $applicationFields['CREATE_DATE'];
+      $response->values->UPDATE_DATE = $applicationFields['UPDATE_DATE'];
+      $response->values->TAS_TITLE = $taskData['TAS_TITLE'];
+      $response->values->CURRENT_USER = $applicationFields['CURRENT_USER'];
+      $response->values->DEL_DELEGATE_DATE = $applicationFields['DEL_DELEGATE_DATE'];
+      $response->values->DEL_INIT_DATE = $applicationFields['DEL_INIT_DATE'];
+      $response->values->DEL_TASK_DUE_DATE = $applicationFields['DEL_TASK_DUE_DATE'];
+      $response->values->DEL_FINISH_DATE = $applicationFields['DEL_FINISH_DATE'];
+      $response->values->DYN_UID = $processData['PRO_DYNAFORMS']['PROCESS'];
+    break;
+  }
+  die($json->encode($response));
+}
+catch (Exception $error) {
+  $response = new stdclass();
+  $response->type = 'ERROR';
+  $response->message = $error->getMessage();
+  $json = new Services_JSON();
+  die($json->encode($response));
+}

workflow/engine/methods/processes/processes_Save.php

@@ -45,9 +45,8 @@ switch($function){
     $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
     $oDataset->next();
     $aRow = $oDataset->getRow();
-    print ($aRow['PROCESS']?true:false);
+    print($aRow['PROCESS'] ? true : false);
   break;
-  
   default:
     if ( isset($_GET['PRO_UID'])) {
       $_POST['form']['PRO_UID'] = $_GET['PRO_UID'];
@@ -55,7 +54,7 @@ switch($function){
 
     G::LoadClass('processMap');
     $oProcessMap = new ProcessMap();
-    if( !isset($_POST['form']['PRO_UID']) ) {
+    if (!isset($_POST['form']['PRO_UID'])) {
       $_POST['form']['USR_UID'] = $_SESSION['USER_LOGGED'];
       $oJSON  = new Services_JSON();
       require_once 'classes/model/Task.php';
@@ -64,15 +63,19 @@ switch($function){
 
       //call plugins
       $oData['PRO_UID']      = $sProUid;
-      $oData['PRO_TEMPLATE'] = (isset($_POST['form']['PRO_TEMPLATE']) && $_POST['form']['PRO_TEMPLATE']!='')?$_POST['form']['PRO_TEMPLATE']:'';
+      $oData['PRO_TEMPLATE'] = (isset($_POST['form']['PRO_TEMPLATE']) && $_POST['form']['PRO_TEMPLATE'] != '') ? $_POST['form']['PRO_TEMPLATE'] : '';
       $oData['PROCESSMAP']   = $oProcessMap;
 
       $oPluginRegistry =& PMPluginRegistry::getSingleton();
-      $oPluginRegistry->executeTriggers ( PM_NEW_PROCESS_SAVE , $oData );
+      $oPluginRegistry->executeTriggers(PM_NEW_PROCESS_SAVE, $oData);
 
-      G::header('location: processes_Map?PRO_UID='. $sProUid );
+      G::header('location: processes_Map?PRO_UID=' . $sProUid);
       die;
-    } else {
+    }
+    else {
+      $_POST['form']['PRO_DYNAFORMS'] = array();
+      $_POST['form']['PRO_DYNAFORMS']['PROCESS'] = isset($_POST['form']['PRO_SUMMARY_DYNAFORM']) ? $_POST['form']['PRO_SUMMARY_DYNAFORM'] : '';
+      unset($_POST['form']['PRO_SUMMARY_DYNAFORM']);
       $oProcessMap->updateProcess($_POST['form']);
       $sProUid = $_POST['form']['PRO_UID'];
     }
@@ -80,9 +83,9 @@ switch($function){
     //Save Calendar ID for this process
     G::LoadClass("calendar");
     $calendarObj=new Calendar();
-    $calendarObj->assignCalendarTo($sProUid,$_POST['form']['PRO_CALENDAR'],'PROCESS');
+    $calendarObj->assignCalendarTo($sProUid, $_POST['form']['PRO_CALENDAR'], 'PROCESS');
 
-    if ($_POST['form']['THETYPE'] == ''){
+    if ($_POST['form']['THETYPE'] == '') {
       G::header('location: main');
     }
   break;

workflow/engine/templates/cases/caseUtils.js

@@ -1,3 +1,5 @@
+/* Case Notes - Start */
+
 function closeCaseNotesWindow(){
   if(Ext.get("caseNotesWindowPanel")){
     Ext.get("caseNotesWindowPanel").destroy();
@@ -172,7 +174,7 @@ caseNotesWindow = new Ext.Window({
   {
     cls: 'x-toolbar1',
     text: _('ID_SUBMIT_NOTE'),
-    iconCls: 'x-pm-startcase-btn',
+    iconCls: 'x-pm-notes-btn',
     scale: 'large',
     stype:'button',
     iconAlign: 'top',
@@ -256,3 +258,166 @@ function statusBarMessage( msg, isLoading, success ) {
   }
 }
 
+
+/* Case Notes - End */
+/* Case Summary - Start */
+Ext.util.Format.capitalize = (function(){
+  var re = /(^|[^\w])([a-z])/g,
+  fn = function(m, a, b) {
+    return a + b.toUpperCase();
+  };
+  return function(v) {
+    return v.toLowerCase().replace(re, fn);
+  }
+})();
+
+var openSummaryWindow = function(applicationUID, delegation) {
+  var summaryForm = new Ext.FormPanel({
+    title: Ext.util.Format.capitalize(_('ID_GENERATE_INFO')),
+    frame : true,
+    height: 440,
+    labelWidth: 150,
+    items : [{
+      xtype: 'displayfield',
+      name: 'TITLE1',
+      labelStyle: 'font-weight:bold;'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'PRO_TITLE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'TITLE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'APP_NUMBER'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'STATUS'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'APP_UID'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'CREATOR'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'CREATE_DATE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'UPDATE_DATE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'TITLE2',
+      labelStyle: 'font-weight:bold;'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'TAS_TITLE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'CURRENT_USER'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'DEL_DELEGATE_DATE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'DEL_INIT_DATE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'DEL_TASK_DUE_DATE'
+    },
+    {
+      xtype: 'displayfield',
+      name: 'DEL_FINISH_DATE'
+    }],
+  });
+
+  var summaryWindow = new Ext.Window({
+    title: _('ID_SUMMARY'),
+    id: 'summaryWindow',
+    width: 750,
+    height: 500,
+    minWidth: 750,
+    minHeight: 500,
+    left: 0,
+    top: 0,
+    resizable: false,
+    closable: true,
+    modal: true,
+    autoScroll:true,
+    shadow: true,
+    bodyBorder: false,
+    keys: {
+      key: 27,
+      fn: function() {
+        summaryWindow.close();
+      }
+    },
+    listeners: {
+      show: function() {
+        this.loadMask = new Ext.LoadMask(this.body, {
+          msg: _('ID_LOADING')
+        });
+        this.loadMask.show();
+        Ext.Ajax.request({
+          url : '../cases/summaryAjax',
+          params : {
+            action : 'getDataSummary',
+            APP_UID: applicationUID,
+            DEL_INDEX: delegation
+          },
+          success: function (result, request) {
+            var response = Ext.util.JSON.decode(result.responseText);
+            var tabs = [];
+            if (response.values.DYN_UID != '') {
+              tabs.push({title: Ext.util.Format.capitalize(_('ID_MORE_INFORMATION')), bodyCfg: {
+                tag: 'iframe',
+                id: 'summaryIFrame',
+                src: '../cases/summary?APP_UID=' + applicationUID + '&DEL_INDEX=' + delegation + '&DYN_UID=' + response.values.DYN_UID,
+                style: {border: '0px none', height: '440px'},
+                onload: ''
+              }});
+            }
+            for (var fieldName in response.labels) {
+              var field = summaryForm.getForm().findField(fieldName);
+              if (field) {
+                field.fieldLabel = response.labels[fieldName];
+              }
+            }
+            summaryForm.getForm().setValues(response.values);
+            tabs.push(summaryForm);
+            var summaryTabs = new Ext.TabPanel({
+              activeTab: 0,
+              items: tabs
+            });
+            summaryWindow.add(summaryTabs);
+            summaryWindow.doLayout();
+            summaryWindow.loadMask.hide();
+          },
+          failure: function (result, request) {
+            Ext.MessageBox.alert('Failed', result.responseText);
+          }
+        });
+      },
+      close: function() {
+        var summaryIFrame = document.getElementById('summaryIFrame');
+        delete(summaryIFrame);
+      }
+    }
+  });
+  summaryWindow.show();
+};
+/* Case Summary - End*/

workflow/engine/templates/cases/casesList.js

@@ -22,8 +22,16 @@ var storeReassignCases;
 var grid;
 var textJump;
 
+var caseSummary = function() {
+  var rowModel = grid.getSelectionModel().getSelected();
+  if (rowModel) {
+    openSummaryWindow(rowModel.data.APP_UID, rowModel.data.DEL_INDEX);
+  }
+  else {
+    msgBox('Information', TRANSLATIONS.ID_SELECT_ONE_AT_LEAST);
+  }
+};
 
-/** */
 function caseNotes(){
   var rowModel = grid.getSelectionModel().getSelected();
   if(rowModel){
@@ -74,8 +82,17 @@ function openCase(){
           requestFile = 'open';
           break;
       }
-
+      try {
-      parent._CASE_TITLE  = caseTitle;
+        try {
+          parent._CASE_TITLE  = caseTitle;
+        }
+        catch (e) {
+          // Nothing to do
+        }
+      }
+      catch (e) {
+        // Nothing to do
+      }
       params += '&action=' + action;
       redirect(requestFile + '?' + params);
 
@@ -108,9 +125,19 @@ function deleteCase() {
           Ext.Ajax.request({
             url: 'cases_Delete',
             success: function(response) {
-              parent.updateCasesView();
+              try {
+                parent.updateCasesView();
+              }
+              catch (e) {
+                // Nothing to do
+              }
               Ext.MessageBox.hide();
-              parent.updateCasesTree();
+              try {
+                parent.updateCasesTree();
+              }
+              catch (e) {
+                // Nothing to do
+              }
             },
             params: {APP_UIDS:APP_UIDS}
           });
@@ -143,8 +170,19 @@ function pauseCase(date){
         Ext.Ajax.request({
           url: 'cases_Ajax',
           success: function(response) {
-            parent.updateCasesView();
+            try {
-            parent.updateCasesTree();
+              parent.updateCasesView();
+            }
+            catch (e) {
+              // Nothing to do
+            }
+            Ext.MessageBox.hide();
+            try {
+              parent.updateCasesTree();
+            }
+            catch (e) {
+              // Nothing to do
+            }
             Ext.MessageBox.hide();
           },
           params: {action:'pauseCase', unpausedate:unpauseDate, APP_UID:rowModel.data.APP_UID, DEL_INDEX: rowModel.data.DEL_INDEX}
@@ -178,9 +216,19 @@ function cancelCase(){
           Ext.Ajax.request({
             url: 'cases_Ajax',
             success: function(response) {
-              parent.updateCasesView();
+              try {
+                parent.updateCasesView();
+              }
+              catch (e) {
+                // Nothing to do
+              }
               Ext.MessageBox.hide();
-              parent.updateCasesTree();
+              try {
+                parent.updateCasesTree();
+              }
+              catch (e) {
+                // Nothing to do
+              }
             },
             params: {action:'cancelCase', APP_UID:APP_UIDS, DEL_INDEX:DEL_INDEXES}
           });
@@ -206,9 +254,19 @@ function callbackUnpauseCase (btn, text) {
     Ext.Ajax.request({
       url: 'cases_Ajax',
       success: function(response) {
-      	parent.updateCasesView();
+      	try {
+      	  parent.updateCasesView();
+      	}
+        catch (e) {
+          // Nothing to do
+        }
         Ext.MessageBox.hide();
-        parent.updateCasesTree();
+        try {
+          parent.updateCasesTree();
+        }
+        catch (e) {
+          // Nothing to do
+        }
       },
       params: {action:'unpauseCase', sApplicationUID: caseIdToUnpause, iIndex: caseIndexToUnpause}
     });
@@ -226,9 +284,19 @@ function unpauseCase() {
       Ext.Ajax.request({
         url: 'cases_Ajax',
         success: function(response) {
-          parent.updateCasesView();
+          try {
+            parent.updateCasesView();
+          }
+          catch (e) {
+            // Nothing to do
+          }
           Ext.MessageBox.hide();
-          parent.updateCasesTree();
+          try {
+            parent.updateCasesTree();
+          }
+          catch (e) {
+            // Nothing to do
+          }
         },
         params: {action:'unpauseCase', sApplicationUID: caseIdToUnpause, iIndex: caseIndexToUnpause}
       });
@@ -249,7 +317,12 @@ Ext.onReady ( function() {
   var caseIdToDelete = '';
   var caseIdToUnpause = '';
   var caseIndexToUnpause = '';
-  parent._action = action;
+  try {
+    parent._action = action;
+  }
+  catch (e) {
+    // Nothing to do
+  }
 
   function openLink(value, p, r){
     return String.format("<a class='button_pm' href='../cases/cases_Open?APP_UID={0}&DEL_INDEX={1}&content=inner'>" + TRANSLATIONS.ID_VIEW + "</a>", r.data['APP_UID'], r.data['DEL_INDEX'], r.data['APP_TITLE']);
@@ -295,6 +368,12 @@ Ext.onReady ( function() {
     return String.format("<span style='{1}'>{0}</span>", myDate.dateFormat(PMDateFormat), myColor );
   }
 
+  var renderSummary = function (val, p, r) {
+    var summaryIcon = '<img src="/images/ext/default/s.gif" class="x-tree-node-icon ss_folder_page" unselectable="off" id="extdd-17" ';
+    summaryIcon += 'onclick="openSummaryWindow(' + "'" + r.data['APP_UID'] + "'" + ', ' + r.data['DEL_INDEX'] + ')" title="' + _('ID_SUMMARY') + '" />';
+    return summaryIcon;
+  };
+
   function renderNote(val,p,r) {
     appUid="'"+r.data['APP_UID']+"'";
     return '<img src="/images/ext/default/s.gif" class="x-tree-node-icon ICON_CASES_NOTES" unselectable="off" id="extdd-17" onClick="openCaseNotesWindow('+appUid+',true)">';
@@ -315,6 +394,7 @@ Ext.onReady ( function() {
     if( c.id == 'deleteLink')               c.renderer = deleteLink;
     if( c.id == 'viewLink')                 c.renderer = viewLink;
     if( c.id == 'unpauseLink')              c.renderer = unpauseLink;
+    if( c.dataIndex == 'CASE_SUMMARY')      c.renderer = renderSummary;
     if( c.dataIndex == 'CASE_NOTES_COUNT')   c.renderer = renderNote;
   }
 
@@ -873,8 +953,6 @@ Ext.onReady ( function() {
   }
 
   function enableDisableMenuOption(){
-  
-  
     var rows = grid.getSelectionModel().getSelections();
     switch(action){
       case 'todo':
@@ -942,7 +1020,17 @@ Ext.onReady ( function() {
 
   });
 
+  var optionMenuSummary = new Ext.Action({
+    text: _('ID_SUMMARY'),
+    iconCls: 'x-tree-node-icon ss_application_form',
+    handler: caseSummary
+  });
 
+  optionMenuNotes = new Ext.Action({
+    text: _('ID_CASES_NOTES'),
+    iconCls: 'ICON_CASES_NOTES',
+    handler: caseNotes
+  });
 
   reassingCaseToUser = function()
   {
@@ -958,7 +1046,12 @@ Ext.onReady ( function() {
           success: function ( result, request ) {
             var data = Ext.util.JSON.decode(result.responseText);
             if( data.status == 0 ) {
-              parent.notify('', data.msg);
+              try {
+                parent.notify('', data.msg);
+              }
+              catch (e) {
+                // Nothing to do
+              }
               location.href = 'casesListExtJs';
             } else {
               alert(data.msg);
@@ -971,11 +1064,7 @@ Ext.onReady ( function() {
       });
     }
   }
-  optionMenuNotes = new Ext.Action({
+
-    text: _('ID_CASES_NOTES'),
-    iconCls: 'ICON_CASES_NOTES',
-    handler: caseNotes
-  });
   reassingCaseToUser = function()
   {
     var APP_UID = optionMenuReassignGlobal.APP_UID;
@@ -1122,16 +1211,15 @@ Ext.onReady ( function() {
 
   switch(action){
     case 'todo':
-      menuItems = [optionMenuOpen, optionMenuPause,optionMenuNotes];
+      menuItems = [optionMenuOpen, optionMenuPause, optionMenuSummary, optionMenuNotes];
 
       if( ___p34315105.search('R') != -1 )
         menuItems.push(optionMenuReassign);
 
-
       break;
 
       case 'draft':
-      menuItems = [optionMenuOpen, optionMenuPause,optionMenuNotes];
+      menuItems = [optionMenuOpen, optionMenuPause, optionMenuSummary, optionMenuNotes];
       if( ___p34315105.search('R') != -1 )
         menuItems.push(optionMenuReassign);
       menuItems.push(optionMenuDelete);
@@ -1139,11 +1227,11 @@ Ext.onReady ( function() {
       break;
 
     case 'paused':
-      menuItems = [optionMenuUnpause,optionMenuNotes];
+      menuItems = [optionMenuUnpause, optionMenuSummary, optionMenuNotes];
       break;
 
     default:
-      menuItems = [optionMenuNotes]
+      menuItems = [optionMenuSummary, optionMenuNotes]
   }
 
   var messageContextMenu = new Ext.menu.Menu({
@@ -1381,8 +1469,8 @@ Ext.onReady ( function() {
     layout: 'fit',
     viewConfig: {
      forceFit:true,
-        cls:"x-grid-empty",
+      cls:"x-grid-empty",
-        emptyText: (TRANSLATIONS.ID_NO_RECORDS_FOUND)
+      emptyText: (TRANSLATIONS.ID_NO_RECORDS_FOUND)
     },
     listeners: {
       rowdblclick: openCase,
@@ -1623,16 +1711,25 @@ var gridForm = new Ext.FormPanel({
       break;
   }
 
-  if( _nodeId != '' ){
+  try {
-    treePanel1 = parent.Ext.getCmp('tree-panel')
+    if ( _nodeId != '' ){
-    if(treePanel1)
+      treePanel1 = parent.Ext.getCmp('tree-panel')
-      node = treePanel1.getNodeById(_nodeId);
+      if(treePanel1)
-    if(node)
+        node = treePanel1.getNodeById(_nodeId);
-      node.select();
+      if(node)
+        node.select();
+    }
+  }
+  catch (e) {
+    // Nothing to do
   }
 
-  //parent.updateCasesView();
+  try {
-  parent.updateCasesTree();
+    parent.updateCasesTree();
+  }
+  catch (e) {
+    // Nothing to do
+  }
   comboStatus.setValue('');
   comboProcess.setValue('');
   // hidding the buttons for the reassign

workflow/engine/xmlform/cases/cases_Resume.xml

@@ -1,81 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm
+<dynaForm name="cases_Resume" type="xmlform" width="550px" labelWidth="150px">
-  name="cases_Resume"
-  type="xmlform"
-  width="550px"
-  labelWidth="150px"
->
-
 <TITLE1 type="title">
   <en>Case Properties</en>
 </TITLE1>
-
 <PRO_TITLE type="text" mode="view">
   <en>Process</en>
 </PRO_TITLE>
-
-<STATUS type="text" mode="view">
-  <en>Case Status</en>
-</STATUS>
-
 <TITLE type="text" mode="view">
   <en>Case Title</en>
 </TITLE>
-
 <APP_NUMBER type="text" mode="view">
   <en>Case Number</en>
 </APP_NUMBER>
-
+<STATUS type="text" mode="view">
+  <en>Case Status</en>
+</STATUS>
 <APP_UID type="text" mode="view">
   <en>Case Uid</en>
 </APP_UID>
-
 <CREATOR type="text" mode="view">
   <en>Creator</en>
 </CREATOR>
-
 <CREATE_DATE type="text" mode="view">
   <en>Create Date</en>
 </CREATE_DATE>
-
 <UPDATE_DATE type="text" mode="view">
   <en>Last Update</en>
 </UPDATE_DATE>
-
 <TITLE2 type="title">
   <en>Current Task Properties</en>
 </TITLE2>
-
 <TAS_TITLE type="text" mode="view">
   <en>Task</en>
 </TAS_TITLE>
-
 <CURRENT_USER type="text" mode="view">
   <en>Current User</en>
 </CURRENT_USER>
-
 <DEL_DELEGATE_DATE type="text" mode="view">
   <en>Task Delegate Date</en>
 </DEL_DELEGATE_DATE>
-
 <DEL_INIT_DATE type="text" mode="view">
   <en>Task Init Date</en>
 </DEL_INIT_DATE>
-
 <DEL_TASK_DUE_DATE type="text" mode="view">
   <en>Task Due Date</en>
 </DEL_TASK_DUE_DATE>
-
 <DEL_FINISH_DATE type="text" mode="view">
   <en>Finish Date</en>
 </DEL_FINISH_DATE>
-
-
-<!--<CURRENT_TASK_STATUS type="dropdown" mode="view">
-  <en>Current Task Status
-    <option name="">In Progress</option>
-    <option name="PAUSE">Paused</option>
-    <option name="CANCEL">Finished</option>
-  </en>
-</CURRENT_TASK_STATUS>-->
 </dynaForm>

workflow/engine/xmlform/gulliver/dynaforms_Options.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm name="users_NewOptions" type="xmlmenu">
-<NEXT_STEP type="private"/>
 <PREVIOUS_STEP type="private"/>
 <PREVIOUS_STEP_LABEL type="private"/>
 <PREVIOUS_ACTION type="private"/>
+<NEXT_STEP type="private"/>
+<NEXT_STEP_LABEL type="private"/>
 <NEXT_ACTION type="private"/>
 <!--MNUP type="print" colWidth="20" title="" value='' colAlign="left" link="../cases/cases_PrintView" width="800" height="600" left="0" top="0" resizable="1">
   <en>Print form</en>
@@ -14,7 +15,7 @@
 </DYN_BACKWARD>
 
 
-<DYN_FORWARD type="link" value='' link="@#NEXT_STEP" onclick="@#NEXT_ACTION" colAlign="right" colWidth="120">
+<DYN_FORWARD type="link" value='' link="@#NEXT_STEP" onclick="@#NEXT_ACTION" colAlign="right" colWidth="120" label="@#NEXT_STEP_LABEL">
   <en>Next Step</en>
 </DYN_FORWARD>
 </dynaForm>

workflow/engine/xmlform/processes/processes_Edit.html

@@ -1,58 +1,62 @@
 <form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
- <div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
+<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
-		<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+  <div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-		<div class="content" style="">
+    <div class="content" style="">
-	  <table width="99%">
+    <table width="99%">
-      <tbody><tr>
+    <tbody>
-        <td valign="top">
+    <tr>
+      <td valign="top">
         <input class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="" type="hidden">
         <input name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" type="hidden">
-           <table border="0" cellpadding="0" cellspacing="0" width="100%">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                   <tbody><tr>
+        <tbody>
-              <td class="FormTitle" colspan="2" align="">{$form.TITLE1}</td>
+        <tr>
-             </tr>
+          <td class="FormTitle" colspan="2" align="">{$form.TITLE1}</td>
-                                              <tr style="display: none;">
+        </tr>
-              <td colspan="2">{$form.PRO_UID}</td>
+        <tr style="display: none;">
-             </tr>
+          <td colspan="2">{$form.PRO_UID}</td>
-                                              <tr style="display: none;">
+        </tr>
-              <td colspan="2">{$form.THETYPE}</td>
+        <tr style="display: none;">
-             </tr>
+          <td colspan="2">{$form.THETYPE}</td>
-                                                <tr>
+        </tr>
-              <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font>{$PRO_TITLE}</td>
+        <tr>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PRO_TITLE} </td>  //-->
+          <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font>{$PRO_TITLE}</td>
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TITLE}</td> 
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TITLE}</td>
-              </tr>
+        </tr>
-                                                <tr>
+        <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PRO_DESCRIPTION}</td>
+          <td class="FormLabel" width="{$form_labelWidth}">{$PRO_DESCRIPTION}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PRO_DESCRIPTION} </td>  //-->
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_DESCRIPTION}</td>
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_DESCRIPTION}</td> 
+        </tr>
-              </tr>
+        <tr>
-                                                <tr>
+          <td class="FormLabel" width="{$form_labelWidth}">{$PRO_CALENDAR}</td>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PRO_CALENDAR}</td>
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_CALENDAR}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PRO_CALENDAR} </td>  //-->
+        </tr>
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_CALENDAR}</td> 
+        <tr>
-              </tr>
+          <td class="FormLabel" width="{$form_labelWidth}">{$PRO_CATEGORY}</td>
-              
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_CATEGORY}</td>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PRO_CATEGORY}</td>
+        </tr>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PRO_CALENDAR} </td>  //-->
+        <tr>
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_CATEGORY}</td> 
+          <td class="FormLabel" width="{$form_labelWidth}">{$PRO_SUMMARY_DYNAFORM}</td>
-              </tr>
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_SUMMARY_DYNAFORM}</td>
-                                                <tr>
+        </tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PRO_DEBUG}</td>
+        <tr>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PRO_DEBUG} </td>  //-->
+          <td class="FormLabel" width="{$form_labelWidth}">{$PRO_DEBUG}</td>
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_DEBUG}</td> 
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_DEBUG}</td>
-              </tr>
+        </tr>
-                                               <tr>
+        <tr>
-              <td class="FormButton" colspan="2" align="center"><br/> {$form.SUBMIT} &nbsp; {$form.BTN_CANCEL} </td>
+          <td class="FormButton" colspan="2" align="center"><br/> {$form.SUBMIT} &nbsp; {$form.BTN_CANCEL} </td>
-             </tr>
+        </tr>
-                                                                                                     </tbody></table>
+        </tbody>
-        </td>
+        </table>
-      </tr>
+      </td>
-    </tbody></table>
+    </tr>
-    <div class="FormRequiredTextMessage"><font color="red">*  </font>{php}echo (G::LoadTranslation('ID_REQUIRED_FIELD'));{/php}</div>		</div>
+    </tbody>
-		<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+    </table>
+    <div class="FormRequiredTextMessage"><font color="red">*  </font>{php}echo (G::LoadTranslation('ID_REQUIRED_FIELD'));{/php}</div>
   </div>
-                        <script type="text/javascript">
+  <div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div>
-    {$form.JS}
+</div>
-  </script>
+<script type="text/javascript">
+{$form.JS}
+</script>
 </form>

workflow/engine/xmlform/processes/processes_Edit.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm name="processes_Edit" width="500px" labelWidth="250px" mode="edit" enableTemplate="1" ajaxSubmit="1" >
+<dynaForm name="processes_Edit" width="500px" labelWidth="250px" mode="edit" enableTemplate="1" ajaxSubmit="1">
 
 <TITLE1 type="title" group="1">
-  <en>Process Information </en>
+  <en>Process Information</en>
 </TITLE1>
 
 <PRO_UID type="hidden"/>
@@ -13,20 +13,31 @@
   <en>Title</en>
 </PRO_TITLE>
 
-
 <PRO_DESCRIPTION type="textarea" rows="8" cols="60">
   <en>Description</en>
 </PRO_DESCRIPTION>
+
 <PRO_CALENDAR type="dropdown" sqlconnection="dbarray">
-SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
+<![CDATA[SELECT CALENDAR_UID,CALENDAR_NAME FROM availableCalendars]]>
-<en>Calendar<option name="">- None -</option></en>
+<en>Calendar
+  <option name="">- None -</option>
+</en>
 </PRO_CALENDAR>
 
 <PRO_CATEGORY type="dropdown" >
-SELECT CATEGORY_UID, CATEGORY_NAME FROM PROCESS_CATEGORY
+<![CDATA[SELECT CATEGORY_UID, CATEGORY_NAME FROM PROCESS_CATEGORY]]>
-<en>Process Category<option name="">- None -</option></en>
+<en>Process Category
+  <option name="">- None -</option>
+</en>
 </PRO_CATEGORY>
 
+<PRO_SUMMARY_DYNAFORM type="dropdown">
+<![CDATA[SELECT DYN_UID, CON_VALUE AS DYN_TITLE FROM DYNAFORM LEFT JOIN CONTENT ON (DYN_UID = CON_ID AND CON_CATEGORY = 'DYN_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' AND DYN_TYPE = 'xmlform' ORDER BY DYN_TITLE]]>
+<en>Dynaform to show a case summary
+  <option name="">- Default summary Dynaform -</option>
+</en>
+</PRO_SUMMARY_DYNAFORM>
+
 <PRO_DEBUG type="checkbox" value="1" falsevalue="0" defaultvalue="1" labelonright="0">
   <en>Debug</en>
 </PRO_DEBUG>
@@ -41,30 +52,28 @@ SELECT CATEGORY_UID, CATEGORY_NAME FROM PROCESS_CATEGORY
 
 <MESSAGE1 type="phpvariable"/>
 
-<JS type="javascript" replacetags="1"><![CDATA[
+<JS type="javascript" replacetags="1">
-var verifyProcessInformation = function(oForm)
+<![CDATA[
-{
+var verifyProcessInformation = function(oForm) {
 	var oAux;
 	var bContinue = true;
 	oAux = oForm.elements['form[PRO_TITLE]'];
-	if (oAux.value == '')
+	if (oAux.value == '') {
-	{
 		alert('@G::LoadTranslation(ID_PROCESS_TITLE_REQUIRED)');
 		oAux.focus();
 		bContinue = false;
 	}
-	if (bContinue)
+	if (bContinue) {
-	{
 		ajax_post(oForm.action, oForm, 'POST');
 		Pm.data.db.title.label = Pm.data.db.title.object.elements.label.innerHTML = getField('PRO_TITLE').value.escapeHTML();
     Pm.tmp.editProcessPanel.remove();
 	}
 };
 
-function cancel(){
+function cancel() {
-    Pm.tmp.editProcessPanel.remove();
+  Pm.tmp.editProcessPanel.remove();
 }
-
+]]>
-]]></JS>
+</JS>
 
 </dynaForm>