BUG 000 Add cases summary to branch 2.0
This commit is contained in:
@@ -22,10 +22,10 @@
|
||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* Created on 21/12/2007
|
||||
* Dynaform - Dynaform class
|
||||
* Dynaform - Dynaform class
|
||||
* @copyright 2007 COLOSA
|
||||
* @author David Callizaya <davidsantos@colosa.com>
|
||||
*/
|
||||
@@ -41,7 +41,7 @@ G::LoadClass('xmlDb');
|
||||
* @package workflow.engine.classes
|
||||
*/
|
||||
|
||||
class dynaformEditor extends WebResource
|
||||
class dynaformEditor extends WebResource
|
||||
{
|
||||
private $isOldCopy = false;
|
||||
var $file='';
|
||||
@@ -91,24 +91,24 @@ class dynaformEditor extends WebResource
|
||||
'resize' => false,
|
||||
'blinkToFront'=> false
|
||||
);
|
||||
|
||||
|
||||
/**
|
||||
* Constructor of the class dynaformEditor
|
||||
* @param string $get
|
||||
* @return void
|
||||
*/
|
||||
function dynaformEditor($get)
|
||||
function dynaformEditor($get)
|
||||
{
|
||||
$this->panelConf = array_merge( $this->panelConf , $this->defaultConfig['Editor'] );
|
||||
//'title' => G::LoadTranslation('ID_DYNAFORM_EDITOR').' - ['.$this->title.']',
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create the xml form default
|
||||
* @param string $filename
|
||||
* @return void
|
||||
*/
|
||||
function _createDefaultXmlForm($fileName)
|
||||
function _createDefaultXmlForm($fileName)
|
||||
{
|
||||
//Create the default Dynaform
|
||||
$sampleForm='<?xml version="1.0" encoding="UTF-8"?>'."\n";
|
||||
@@ -138,12 +138,12 @@ class dynaformEditor extends WebResource
|
||||
fwrite($fp, $sampleForm);
|
||||
fclose($fp);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prints the DynaformEditor
|
||||
* @return void
|
||||
*/
|
||||
function _render()
|
||||
function _render()
|
||||
{
|
||||
global $G_PUBLISH;
|
||||
$script='';
|
||||
@@ -165,9 +165,9 @@ class dynaformEditor extends WebResource
|
||||
$JSEditor = array(
|
||||
'URL'=> G::encrypt( $this->file , URL_KEY ),
|
||||
);
|
||||
|
||||
|
||||
$A = G::encrypt( $this->file , URL_KEY );
|
||||
|
||||
|
||||
try {
|
||||
$openDoc = new Xml_Document();
|
||||
$fileName= $this->home . $this->file . '.xml';
|
||||
@@ -240,7 +240,7 @@ class dynaformEditor extends WebResource
|
||||
/***@Erik-> this is deprecated,. (unuseful) $G_PUBLISH->AddContent('propeltable', 'paged-table', 'dynaforms/fields_List', $oCriteria, $Parameters, '', SYS_URI.'dynaforms/dynaforms_PagedTableAjax');***/
|
||||
$G_PUBLISH->AddContent('blank');
|
||||
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_JSEditor', 'display:none', $JSEditor , '', '');
|
||||
}
|
||||
}
|
||||
catch (Exception $e) {
|
||||
}
|
||||
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Properties', 'display:none', $Properties , '', '');
|
||||
@@ -259,7 +259,7 @@ class dynaformEditor extends WebResource
|
||||
//$oHeadPublisher->addScriptFile('/js/dveditor/core/dveditor.js');
|
||||
//$oHeadPublisher->addScriptFile('/codepress/codepress.js',1);
|
||||
$oHeadPublisher->addScriptFile('/js/codemirror/js/codemirror.js',1);
|
||||
|
||||
|
||||
$oHeadPublisher->addScriptFile('/js/grid/core/grid.js');
|
||||
$oHeadPublisher->addScriptCode('
|
||||
var DYNAFORM_URL="'.$Parameters['URL'].'";
|
||||
@@ -267,23 +267,23 @@ class dynaformEditor extends WebResource
|
||||
');
|
||||
G::RenderPage( "publish", 'blank' );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the filename
|
||||
* @param string $file
|
||||
* @return string
|
||||
*/
|
||||
function _getFilename($file)
|
||||
function _getFilename($file)
|
||||
{
|
||||
return (strcasecmp(substr($file,-5),'_tmp0')==0)? substr($file,0,strlen($file)-5) : $file;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the temporal copy
|
||||
* @param string $onOff
|
||||
* @return void
|
||||
*/
|
||||
function _setUseTemporalCopy($onOff)
|
||||
function _setUseTemporalCopy($onOff)
|
||||
{
|
||||
$file = self::_getFilename( $this->file );
|
||||
if ($onOff) {
|
||||
@@ -303,26 +303,26 @@ class dynaformEditor extends WebResource
|
||||
self::_setTmpData(array());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set temporal data
|
||||
* @param $data
|
||||
* @return void
|
||||
*/
|
||||
function _setTmpData($data)
|
||||
*/
|
||||
function _setTmpData($data)
|
||||
{
|
||||
G::verifyPath(PATH_C . 'dynEditor/',true);
|
||||
$fp=fopen(PATH_C . 'dynEditor/'.session_id().'.php','w');
|
||||
fwrite($fp,'$tmpData=unserialize(\''.addcslashes(serialize($data),'\\\'').'\');');
|
||||
fclose($fp);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get temporal data
|
||||
* @param string $filename
|
||||
* @return array
|
||||
* @return array
|
||||
*/
|
||||
function _getTmpData()
|
||||
function _getTmpData()
|
||||
{
|
||||
$tmpData = array();
|
||||
$file = PATH_C . 'dynEditor/'.session_id().'.php';
|
||||
@@ -335,7 +335,7 @@ class dynaformEditor extends WebResource
|
||||
* @param file $to
|
||||
* @return void
|
||||
*/
|
||||
function _copyFile($from,$to)
|
||||
function _copyFile($from,$to)
|
||||
{
|
||||
$copy = implode('',file($from));
|
||||
$fcopy = fopen($to,"w");
|
||||
@@ -344,46 +344,46 @@ class dynaformEditor extends WebResource
|
||||
}
|
||||
}
|
||||
|
||||
interface iDynaformEditorAjax
|
||||
interface iDynaformEditorAjax
|
||||
{
|
||||
//public function render_preview($A);
|
||||
}
|
||||
|
||||
/**
|
||||
* DynaformEditorAjax - DynaformEditorAjax class
|
||||
*
|
||||
*
|
||||
* @package workflow.engine.classes
|
||||
*/
|
||||
|
||||
class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* Constructor of the class dynaformEditorAjax
|
||||
* @param var $post
|
||||
* @return void
|
||||
*/
|
||||
function dynaformEditorAjax($post)
|
||||
function dynaformEditorAjax($post)
|
||||
{
|
||||
$this->_run($post);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Function Run
|
||||
* @param var $post
|
||||
* @return void
|
||||
*/
|
||||
function _run($post)
|
||||
function _run($post)
|
||||
{
|
||||
WebResource::WebResource($_SERVER['REQUEST_URI'],$post);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prints the DynaformEditorAjax
|
||||
* @param object $A
|
||||
* @return ob_get_clean
|
||||
*/
|
||||
function render_preview($A)
|
||||
function render_preview($A)
|
||||
{ ob_start();
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
global $G_PUBLISH;
|
||||
@@ -391,7 +391,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
$G_PUBLISH->publisherId='preview';
|
||||
$form = new Form( $file , PATH_DYNAFORM, SYS_LANG, true, $G_PUBLISH->publisherId);
|
||||
switch(basename($form->template,'.html')) {
|
||||
case 'grid':
|
||||
case 'grid':
|
||||
$template = 'grid';
|
||||
$aAux = array_keys($form->fields);
|
||||
if (count($aAux) > 0) {
|
||||
@@ -401,15 +401,16 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
$aFields = $aAux;
|
||||
}
|
||||
if (is_array($aFields)) {
|
||||
foreach($aFields as $key => $val)
|
||||
foreach($aFields as $key => $val)
|
||||
$aFields[$key]=array(1=>"",2=>"",3=>"",4=>"",5=>"");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
$template = 'xmlform_' . $G_PUBLISH->publisherId;
|
||||
$aFields = array( '__DYNAFORM_OPTIONS'=> array(
|
||||
'PREVIOUS_STEP' => '#',
|
||||
'NEXT_STEP' => '#',
|
||||
'PREVIOUS_STEP' => '#',
|
||||
'NEXT_STEP' => '#',
|
||||
'NEXT_STEP_LABEL' => G::loadTranslation('ID_NEXT_STEP'),
|
||||
'PREVIOUS_ACTION' => 'return false;',
|
||||
'NEXT_ACTION' => 'return false;'
|
||||
)
|
||||
@@ -419,13 +420,13 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
G::RenderPage('publish','raw');
|
||||
return ob_get_clean();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prints the Dynaform in format HTML
|
||||
* @param object $A
|
||||
* @return array
|
||||
*/
|
||||
function render_htmledit($A)
|
||||
function render_htmledit($A)
|
||||
{
|
||||
$script = '';
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
@@ -457,7 +458,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
* @param object $A
|
||||
* @return code html
|
||||
*/
|
||||
function get_htmlcode($A)
|
||||
function get_htmlcode($A)
|
||||
{
|
||||
try {
|
||||
$script = '';
|
||||
@@ -531,7 +532,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
* @param object $A
|
||||
* @return code html
|
||||
*/
|
||||
function restore_html($A)
|
||||
function restore_html($A)
|
||||
{
|
||||
$script = '';
|
||||
$fileTmp = G::decrypt( $A , URL_KEY );
|
||||
@@ -539,7 +540,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
$form = new Form( $fileTmp , PATH_DYNAFORM, SYS_LANG, true );
|
||||
/* Navigation Bar */
|
||||
$form->fields=G::array_merges(
|
||||
array('__DYNAFORM_OPTIONS' => new XmlForm_Field_XmlMenu(
|
||||
array('__DYNAFORM_OPTIONS' => new XmlForm_Field_XmlMenu(
|
||||
new Xml_Node(
|
||||
'__DYNAFORM_OPTIONS',
|
||||
'complete',
|
||||
@@ -559,13 +560,13 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
fclose($fp);
|
||||
return $html;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the html code
|
||||
* @param object $A
|
||||
* @return array
|
||||
*/
|
||||
function set_htmlcode($A,$htmlcode)
|
||||
function set_htmlcode($A,$htmlcode)
|
||||
{
|
||||
try {
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
@@ -587,7 +588,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
* @param object $A
|
||||
* @return array
|
||||
*/
|
||||
function get_xmlcode($A)
|
||||
function get_xmlcode($A)
|
||||
{
|
||||
try {
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
@@ -598,14 +599,14 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
return array("xmlcode"=>"","error"=>(array)$e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the xml code
|
||||
* @param object $A
|
||||
* @param array $xmlcode
|
||||
* @return string
|
||||
*/
|
||||
function set_xmlcode($A,$xmlcode)
|
||||
function set_xmlcode($A,$xmlcode)
|
||||
{
|
||||
$xmlcode = urldecode($xmlcode) ;
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
@@ -615,14 +616,14 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
fclose($fp);
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the javascript code
|
||||
* @param object $A
|
||||
* @param string $fieldName
|
||||
* @return array
|
||||
*/
|
||||
function get_javascripts($A,$fieldName)
|
||||
function get_javascripts($A,$fieldName)
|
||||
{
|
||||
try {
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
@@ -632,7 +633,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
foreach($form->fields as $name => $value ) {
|
||||
if (strcasecmp($value->type,"javascript")==0) {
|
||||
$aOptions[] = array('key'=>$name,'value'=>$name);
|
||||
if ( $name == $fieldName )
|
||||
if ( $name == $fieldName )
|
||||
$sCode = $value->code;
|
||||
}
|
||||
}
|
||||
@@ -642,7 +643,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
return (array) $e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the javascript code
|
||||
* @param object $A
|
||||
@@ -660,25 +661,25 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
$ses2 = new DBSession($dbc2);
|
||||
$ses2->execute(G::replaceDataField("UPDATE dynaForm SET XMLNODE_VALUE = @@CODE WHERE XMLNODE_NAME = @@FIELDNAME ", array('FIELDNAME'=>$fieldName,'CODE'=>$sCode), "myxml" ));
|
||||
*/
|
||||
|
||||
|
||||
G::LoadSystem('dynaformhandler');
|
||||
|
||||
|
||||
$dynaform = new dynaFormHandler(PATH_DYNAFORM."{$file}.xml");
|
||||
$dynaform->replace($fieldName, $fieldName, Array('type'=>'javascript', '#cdata'=>$sCode));
|
||||
|
||||
|
||||
return 0;
|
||||
} catch(Exception $e) {
|
||||
return (array) $e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get properties of the dynaForm
|
||||
* @param file $A
|
||||
* @param string $DYN_UID
|
||||
* @return array
|
||||
*/
|
||||
function get_properties( $A, $DYN_UID )
|
||||
function get_properties( $A, $DYN_UID )
|
||||
{
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
$tmp = self::_getTmpData();
|
||||
@@ -711,7 +712,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
}
|
||||
return $Properties;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set properties of the dynaForm
|
||||
* @param file $A
|
||||
@@ -763,26 +764,26 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
return (array) $e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get enable template
|
||||
* @param object $A
|
||||
* @return string
|
||||
*/
|
||||
function get_enabletemplate( $A )
|
||||
function get_enabletemplate( $A )
|
||||
{
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
$form = new Form( $file , PATH_DYNAFORM, SYS_LANG, true );
|
||||
return $form->enableTemplate;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set enable template
|
||||
* @param object $A
|
||||
* @param string $value
|
||||
* @return string
|
||||
*/
|
||||
function set_enabletemplate( $A, $value )
|
||||
function set_enabletemplate( $A, $value )
|
||||
{
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
$value = $value=="1"?"1":"0";
|
||||
@@ -791,14 +792,14 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
$ses2->execute("UPDATE . SET ENABLETEMPLATE = '$value'");
|
||||
return $value;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Save a dynaForm
|
||||
* @param object $A
|
||||
* @param string $DYN_UID
|
||||
* @return array
|
||||
*/
|
||||
function save($A,$DYN_UID)
|
||||
function save($A,$DYN_UID)
|
||||
{
|
||||
try {
|
||||
$answer = 0;
|
||||
@@ -814,7 +815,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
* in here we are validation if a xmlform has a submit action
|
||||
*/
|
||||
if(!preg_match("/type=\"submit\"/",$copy) && !preg_match("/type=\"grid\"/",$copy) && !isset($_SESSION['submitAction']) ){
|
||||
|
||||
|
||||
$_SESSION['submitAction']= 1;
|
||||
$answer = 'noSub';
|
||||
}
|
||||
@@ -841,13 +842,13 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
return (array) $e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Close a dynaform
|
||||
* @param object $A
|
||||
* @return array
|
||||
*/
|
||||
function close($A)
|
||||
function close($A)
|
||||
{
|
||||
try {
|
||||
/*
|
||||
@@ -877,14 +878,14 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
|
||||
return (array) $e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if a dynaform was changed
|
||||
* @param file $A
|
||||
* @param string $DYN_UID
|
||||
* @return array
|
||||
*/
|
||||
function is_modified($A,$DYN_UID)
|
||||
function is_modified($A,$DYN_UID)
|
||||
{
|
||||
$file = G::decrypt( $A , URL_KEY );
|
||||
try {
|
||||
|
||||
@@ -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
|
||||
@@ -1394,7 +1395,7 @@ class processMap {
|
||||
}else{
|
||||
$G_PUBLISH->AddContent('xmlform', 'xmlform', $sFilename, '', $aFields);
|
||||
}
|
||||
|
||||
|
||||
G::RenderPage('publish', 'raw');
|
||||
return true;
|
||||
} catch (Exception $oError) {
|
||||
@@ -2313,7 +2314,7 @@ class processMap {
|
||||
// var_dump($aRow);
|
||||
// die();
|
||||
|
||||
|
||||
|
||||
if (is_array($aRow)) {
|
||||
$aFields ['ROU_TYPE'] = $aRow ['ROU_TYPE'];
|
||||
$aFields ['ROU_TYPE_OLD'] = $aRow ['ROU_TYPE'];
|
||||
@@ -2399,7 +2400,7 @@ class processMap {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$aFields ['action'] = 'savePattern';
|
||||
$aFields ['LANG'] = SYS_LANG;
|
||||
$aFields ['PROCESS'] = $sProcessUID;
|
||||
@@ -2416,7 +2417,7 @@ class processMap {
|
||||
$aMessage['MESSAGE'] = $oError->getMessage();
|
||||
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
|
||||
G::RenderPage( 'publish','blank');
|
||||
die;
|
||||
die;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2878,7 +2879,7 @@ class processMap {
|
||||
throw ($oError);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* webEntryByTask
|
||||
*
|
||||
@@ -4645,12 +4646,12 @@ class processMap {
|
||||
$oContent = new Content();
|
||||
$dynTitle = $oContent->load('DYN_TITLE', '', $oData['EVN_ACTION'], 'en');
|
||||
$task_uid = $oEvent->getEvnTasUidTo();
|
||||
|
||||
|
||||
$dyn = new Dynaform();
|
||||
$dyn->load($oData['EVN_ACTION']);
|
||||
|
||||
|
||||
$dynUid = $dyn->getDynUid();
|
||||
|
||||
|
||||
$task = new Task();
|
||||
$task->load($task_uid);
|
||||
$task_name = $task->getTasTitle();
|
||||
@@ -4795,7 +4796,7 @@ class processMap {
|
||||
$oCriteria->setOffset($start);
|
||||
if($limit != '')
|
||||
$oCriteria->setLimit($limit);
|
||||
|
||||
|
||||
$oDataset = TaskUserPeer::doSelectRS ( $oCriteria );
|
||||
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next ();
|
||||
@@ -5206,7 +5207,7 @@ class processMap {
|
||||
$oCriteria->setOffset($start);
|
||||
if($limit != '')
|
||||
$oCriteria->setLimit($limit);
|
||||
|
||||
|
||||
$oDataset = InputDocumentPeer::doSelectRS ( $oCriteria );
|
||||
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next ();
|
||||
@@ -5330,7 +5331,7 @@ class processMap {
|
||||
$dynaformArray = array ();
|
||||
$gridLabel = G::LoadTranslation( 'ID_GRID' );
|
||||
$normalLabel = G::LoadTranslation( 'ID_NORMAL' );
|
||||
|
||||
|
||||
while ( $aRow = $oDataset->getRow () ) {
|
||||
//this is a trick to copy the description and title from other language when the current language does not exist for this content row.
|
||||
if (($aRow ['DYN_TITLE'] == NULL)||($aRow ['DYN_TITLE'] == "")) { // There is no transaltion for this Document name, try to get/regenerate the label
|
||||
@@ -5339,7 +5340,7 @@ class processMap {
|
||||
if (($aRow ['DYN_DESCRIPTION'] == NULL)||($aRow ['DYN_DESCRIPTION'] == "")) { // There is no transaltion for this Document name, try to get/regenerate the label
|
||||
$aRow ['DYN_DESCRIPTION'] = Content::Load("DYN_DESCRIPTION","",$aRow ['DYN_UID'],SYS_LANG);
|
||||
}
|
||||
|
||||
|
||||
if ( $aRow['DYN_TYPE'] == 'grid' ) $aRow['DYN_TYPE'] = $gridLabel;
|
||||
if ( $aRow['DYN_TYPE'] == 'xmlform' ) $aRow['DYN_TYPE'] = $normalLabel;
|
||||
$aRow['TAS_EDIT'] = 0;
|
||||
@@ -5348,7 +5349,7 @@ class processMap {
|
||||
$oDataset->next ();
|
||||
}
|
||||
$result = array();
|
||||
|
||||
|
||||
//Now count how many times the dynaform was used in different tasks in VIEW mode,
|
||||
$groupbyCriteria = new Criteria ( 'workflow' );
|
||||
$groupbyCriteria->clearSelectColumns();
|
||||
@@ -5402,7 +5403,7 @@ class processMap {
|
||||
else
|
||||
$result['totalCount'] = 0;
|
||||
$result['data'] = $dynaformArray;
|
||||
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
@@ -5824,7 +5825,7 @@ class processMap {
|
||||
$oCriteria->setOffset($start);
|
||||
if($limit != '')
|
||||
$oCriteria->setLimit($limit);
|
||||
|
||||
|
||||
$oDataset = StepSupervisorPeer::doSelectRS ( $oCriteria );
|
||||
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next ();
|
||||
@@ -6715,7 +6716,7 @@ function saveExtEvents($oData)
|
||||
$aDataEvent['EVN_UID'] = $oData->evn_uid;
|
||||
$aDataEvent['EVN_RELATED_TO'] = 'MULTIPLE';
|
||||
$aDataEvent['EVN_TYPE'] = $oData->evn_type;
|
||||
|
||||
|
||||
if(preg_match("/Start/", $sEvn_type)){
|
||||
if(isset($oData->tas_uid) && $oData->tas_uid != '') {
|
||||
$aDataTask['TAS_UID'] = $oData->tas_uid;
|
||||
@@ -6723,7 +6724,7 @@ function saveExtEvents($oData)
|
||||
$aDataTask['EVN_TYPE'] = $oData->evn_type;
|
||||
$aDataTask['TAS_EVN_UID'] = $oData->evn_uid;
|
||||
$oTask->update($aDataTask);
|
||||
|
||||
|
||||
$aDataEvent['EVN_TAS_UID_TO'] = $oData->tas_uid;
|
||||
$output = $oEvent->update($aDataEvent);
|
||||
}
|
||||
@@ -6787,7 +6788,7 @@ function saveExtEvents($oData)
|
||||
$oCriteria->setOffset($start);
|
||||
if($limit != '')
|
||||
$oCriteria->setLimit($limit);
|
||||
|
||||
|
||||
$oDataset = TriggersPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
@@ -6807,7 +6808,7 @@ function saveExtEvents($oData)
|
||||
return $triggersArray;
|
||||
|
||||
}
|
||||
|
||||
|
||||
function getAllInputDocsByTask($sPRO_UID){
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn(StepPeer::STEP_UID_OBJ);
|
||||
@@ -6817,7 +6818,7 @@ function saveExtEvents($oData)
|
||||
$oCriteria->add(StepPeer::PRO_UID, $sPRO_UID);
|
||||
$oDataset = StepPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
|
||||
$aIDocs = array();
|
||||
while ($oDataset->next()){
|
||||
$row = $oDataset->getRow();
|
||||
@@ -6825,5 +6826,5 @@ function saveExtEvents($oData)
|
||||
}
|
||||
return $aIDocs;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
*
|
||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*/
|
||||
*/
|
||||
|
||||
require_once 'classes/model/Content.php';
|
||||
require_once 'classes/model/Process.php';
|
||||
@@ -73,7 +73,7 @@ class Processes {
|
||||
|
||||
$oProcess->Update( $proFields );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* change debug mode of any Process
|
||||
* @param string $sProUid
|
||||
@@ -531,109 +531,109 @@ class Processes {
|
||||
$oData->tasks[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->routes ) && is_array($oData->routes) ) {
|
||||
foreach ($oData->routes as $key => $val ) {
|
||||
$oData->routes[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->lanes ) && is_array($oData->lanes) ) {
|
||||
foreach ($oData->lanes as $key => $val ) {
|
||||
$oData->lanes[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->inputs ) && is_array($oData->inputs) ) {
|
||||
foreach ($oData->inputs as $key => $val ) {
|
||||
$oData->inputs[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->outputs ) && is_array($oData->outputs) ) {
|
||||
foreach ($oData->outputs as $key => $val ) {
|
||||
$oData->outputs[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->steps ) && is_array($oData->steps) ) {
|
||||
foreach ($oData->steps as $key => $val ) {
|
||||
$oData->steps[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->dynaforms ) && is_array($oData->dynaforms) ) {
|
||||
foreach ($oData->dynaforms as $key => $val ) {
|
||||
$oData->dynaforms[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->triggers ) && is_array($oData->triggers) ) {
|
||||
foreach ($oData->triggers as $key => $val ) {
|
||||
$oData->triggers[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->reportTables ) && is_array($oData->reportTables) ) {
|
||||
foreach ($oData->reportTables as $key => $val ) {
|
||||
$oData->reportTables[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->reportTablesVars ) && is_array($oData->reportTablesVars) ) {
|
||||
foreach ($oData->reportTablesVars as $key => $val ) {
|
||||
$oData->reportTablesVars[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->dbconnections ) && is_array($oData->dbconnections) ) {
|
||||
foreach ($oData->dbconnections as $key => $val ) {
|
||||
$oData->dbconnections[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->stepSupervisor ) && is_array($oData->stepSupervisor) ) {
|
||||
foreach ($oData->stepSupervisor as $key => $val ) {
|
||||
$oData->stepSupervisor[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->objectPermissions ) && is_array($oData->objectPermissions) ) {
|
||||
foreach ($oData->objectPermissions as $key => $val ) {
|
||||
$oData->objectPermissions[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->caseTracker ) && is_array($oData->caseTracker) ) {
|
||||
foreach ($oData->caseTracker as $key => $val ) {
|
||||
$oData->caseTracker[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->caseTrackerObject ) && is_array($oData->caseTrackerObject) ) {
|
||||
foreach ($oData->caseTrackerObject as $key => $val ) {
|
||||
$oData->caseTrackerObject[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->stage ) && is_array($oData->stage) ) {
|
||||
foreach ($oData->stage as $key => $val ) {
|
||||
$oData->stage[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->subProcess ) && is_array($oData->subProcess) ) {
|
||||
foreach ($oData->subProcess as $key => $val ) {
|
||||
$oData->subProcess[$key]['PRO_PARENT'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->event ) && is_array($oData->event) ) {
|
||||
foreach ($oData->event as $key => $val ) {
|
||||
$oData->event[$key]['PRO_UID'] = $sNewProUid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->caseScheduler ) && is_array($oData->caseScheduler) ) {
|
||||
foreach ($oData->caseScheduler as $key => $val){
|
||||
$oData->caseScheduler[$key]['PRO_UID'] = $sNewProUid;
|
||||
@@ -683,7 +683,7 @@ class Processes {
|
||||
$oData->steps[$key]['TAS_UID'] = $newGuid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( isset($oData->steptriggers ) && is_array($oData->steptriggers) ) {
|
||||
foreach ( $oData->steptriggers as $key => $val ) {
|
||||
$newGuid = $map[ $val['TAS_UID'] ];
|
||||
@@ -736,7 +736,7 @@ class Processes {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -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' ) {
|
||||
@@ -954,7 +967,7 @@ class Processes {
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->add(DynaformPeer::PRO_UID, $sProUid);
|
||||
$oCriteria->addJoin (DynaformPeer::DYN_UID, FieldConditionPeer::FCD_DYN_UID );
|
||||
|
||||
|
||||
$oDataset = FieldConditionPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$oDataset->next();
|
||||
@@ -978,7 +991,7 @@ class Processes {
|
||||
try {
|
||||
$aEvent = array();
|
||||
$oCriteria = new Criteria('workflow');
|
||||
|
||||
|
||||
$oCriteria->add(EventPeer::PRO_UID, $sProUid);
|
||||
$oDataset = EventPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
@@ -1004,7 +1017,7 @@ class Processes {
|
||||
try {
|
||||
$aCaseScheduler = array();
|
||||
$oCriteria = new Criteria('workflow');
|
||||
|
||||
|
||||
$oCriteria->add(CaseSchedulerPeer::PRO_UID, $sProUid);
|
||||
$oDataset = CaseSchedulerPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
@@ -1020,7 +1033,7 @@ class Processes {
|
||||
throw($oError);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Get all Swimlanes Elements for any Process
|
||||
@@ -1264,7 +1277,7 @@ class Processes {
|
||||
$oEvent = new Event();
|
||||
if($oEvent->Exists ($row['EVN_UID']))
|
||||
$oEvent->remove($row['EVN_UID']);
|
||||
|
||||
|
||||
$res = $oEvent->create($row);
|
||||
}
|
||||
return;
|
||||
@@ -1281,7 +1294,7 @@ class Processes {
|
||||
$oCaseScheduler = new CaseScheduler();
|
||||
if($oCaseScheduler->Exists($row['SCH_UID']))
|
||||
$oCaseScheduler->remove($row['SCH_UID']);
|
||||
|
||||
|
||||
$res = $oCaseScheduler->create($row);
|
||||
}
|
||||
return;
|
||||
@@ -1577,7 +1590,7 @@ class Processes {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Renew all the GUID's for Swimlanes Elements Objects
|
||||
* @param $oData array.
|
||||
@@ -1934,7 +1947,7 @@ class Processes {
|
||||
throw($oError);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create Step Trigger Rows for a Process form an array
|
||||
* @param array $aTrigger
|
||||
@@ -2169,7 +2182,7 @@ class Processes {
|
||||
$oConnection->remove($aRow['DBS_UID'], $aRow['PRO_UID']);
|
||||
}
|
||||
$oConnection->create($aRow);
|
||||
|
||||
|
||||
// Update information in the table of contents
|
||||
$oContent = new Content();
|
||||
$ConCategory = 'DBS_DESCRIPTION';
|
||||
@@ -2273,7 +2286,7 @@ class Processes {
|
||||
*/
|
||||
function serializeProcess ( $sProUid = '') {
|
||||
$oProcess = new Process( );
|
||||
$oData->process = $this->getProcessRow( $sProUid, false);
|
||||
$oData->process = $this->getProcessRow( $sProUid, false);
|
||||
$oData->tasks = $this->getTaskRows( $sProUid );
|
||||
$oData->routes = $this->getRouteRows( $sProUid );
|
||||
$oData->lanes = $this->getLaneRows( $sProUid );
|
||||
@@ -2493,7 +2506,7 @@ class Processes {
|
||||
/* under here, I've not modified those lines */
|
||||
|
||||
fclose ($fp);
|
||||
|
||||
|
||||
//$bytesSaved = file_put_contents ( $filename , $oData );
|
||||
$filenameLink = 'processes_DownloadFile?p=' . $proTitle . '&r=' . rand(100,1000);
|
||||
$result['PRO_UID'] = $data->process['PRO_UID'];
|
||||
@@ -2534,7 +2547,7 @@ class Processes {
|
||||
{ $oData->gridFiles[$value['DYN_UID'] ] = $value['DYN_UID'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$oData->dynaformFiles = array();
|
||||
$sIdentifier = 0;
|
||||
while ( !feof ( $fp ) && is_numeric ( $sIdentifier ) ) {
|
||||
@@ -2559,7 +2572,7 @@ class Processes {
|
||||
fclose ( $fp);
|
||||
return $oData;
|
||||
}
|
||||
|
||||
|
||||
// import process related functions
|
||||
|
||||
/**
|
||||
@@ -2803,9 +2816,9 @@ class Processes {
|
||||
foreach($oData->sqlConnections as $key => $value ){
|
||||
$XmlContent = str_replace($key, $value, $XmlContent);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
#here we verify if is adynaform or a html
|
||||
$aAux = explode(' ', $XmlContent);
|
||||
$ext = (strpos($aAux[0], '<?xml') !== false ? '.xml' : '.html');
|
||||
@@ -3237,7 +3250,7 @@ class Processes {
|
||||
$this->createFieldCondition($oData->fieldCondition, $oData->dynaforms);
|
||||
$this->createEventRows( $oData->event);
|
||||
$this->createCaseSchedulerRows( $oData->caseScheduler );
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -133,7 +133,7 @@ class Process extends BaseProcess {
|
||||
|
||||
//verify the content for base language
|
||||
Content::copyContentOnBaseLanguageIfNotExists('PRO_DESCRIPTION', $this->getProUid(), $this->pro_description);
|
||||
|
||||
|
||||
$res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description );
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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.');
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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_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_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_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
|
||||
BasePeer::TYPE_PHPNAME => array ('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, 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', '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, 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_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_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_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
|
||||
BasePeer::TYPE_PHPNAME => array ('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, 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, '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, 23, )
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -273,6 +276,8 @@ abstract class BaseProcessPeer {
|
||||
|
||||
$criteria->addSelectColumn(ProcessPeer::PRO_DEBUG);
|
||||
|
||||
$criteria->addSelectColumn(ProcessPeer::PRO_DYNAFORMS);
|
||||
|
||||
}
|
||||
|
||||
const COUNT = 'COUNT(PROCESS.PRO_UID)';
|
||||
|
||||
Reference in New Issue
Block a user