fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in qronald/processmaker/HOR-1385 (pull request #4505)

Browse Source 
HOR-1385
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-08 15:58:52 -04:00
parent b0e77b2776 c2dd985691
commit f50516ca7f
14 changed files with 267 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
workflow/engine/classes/class.processMap.php
View File

@@ -962,13 +962,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID' );
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter );
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
@@ -978,7 +972,9 @@ class processMap
if (($aRow['INP_DOC_TITLE'] == null) || ($aRow['INP_DOC_TITLE'] == "")) { if (($aRow['INP_DOC_TITLE'] == null) || ($aRow['INP_DOC_TITLE'] == "")) {
// There is no transaltion for this Document name, try to get/regenerate the label // There is no transaltion for this Document name, try to get/regenerate the label
$aRow['INP_DOC_TITLE'] = Content::Load("INP_DOC_TITLE", "", $aRow['INP_DOC_UID'], SYS_LANG); $oInputDocument = new InputDocument;
$row = $oInputDocument->load($aRow['INP_DOC_UID']);
$aRow['INP_DOC_TITLE'] = $row['INP_DOC_TITLE'];
} }
$aBB[] = array('STEP_UID' => $aRow['INP_DOC_UID'], 'STEP_TITLE' => $aRow['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow['INP_DOC_UID'] . '">' ); $aBB[] = array('STEP_UID' => $aRow['INP_DOC_UID'], 'STEP_TITLE' => $aRow['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow['INP_DOC_UID'] . '">' );
$oDataset->next(); $oDataset->next();
@@ -2123,24 +2119,11 @@ class processMap
public function getInputDocumentsCriteria($sProcessUID = '') public function getInputDocumentsCriteria($sProcessUID = '')
{ {
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('INP_DOC_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAlias('C1', 'CONTENT');
$oCriteria->addAlias('C2', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C1.CON_ID' );
$aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter );
$aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C2.CON_ID' );
$aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'INP_DOC_DESCRIPTION' . $sDelimiter );
$aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
@@ -3172,17 +3155,11 @@ class processMap
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION);
@@ -3278,17 +3255,10 @@ class processMap
$aUIDS[] = $aRow['STEP_UID_OBJ']; $aUIDS[] = $aRow['STEP_UID_OBJ'];
$oDataset->next(); $oDataset->next();
} }
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN);
return $oCriteria; return $oCriteria;
@@ -4288,13 +4258,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -5441,13 +5405,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -5927,26 +5885,13 @@ class processMap
public function getExtInputDocumentsCriteria($start, $limit, $sProcessUID = '') public function getExtInputDocumentsCriteria($start, $limit, $sProcessUID = '')
{ {
$aTasks = $this->getAllInputDocsByTask($sProcessUID); $aTasks = $this->getAllInputDocsByTask($sProcessUID);
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_VERSIONING); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_VERSIONING);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESTINATION_PATH); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESTINATION_PATH);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('INP_DOC_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAlias('C1', 'CONTENT');
$oCriteria->addAlias('C2', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C1.CON_ID');
$aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C2.CON_ID');
$aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'INP_DOC_DESCRIPTION' . $sDelimiter);
$aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$this->tmpCriteria = clone $oCriteria; $this->tmpCriteria = clone $oCriteria;
@@ -6425,17 +6370,11 @@ class processMap
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION);
@@ -6479,16 +6418,7 @@ class processMap
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID'
);
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter
);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter
);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -6830,13 +6760,7 @@ class processMap
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN); $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN);
$oDataset = InputDocumentPeer::doSelectRS($oCriteria); $oDataset = InputDocumentPeer::doSelectRS($oCriteria);

2
workflow/engine/classes/class.processes.php
View File

@@ -1935,7 +1935,7 @@ class Processes
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$oInput = new InputDocument(); $oInput = new InputDocument();
$aInput[] = $oInput->Load($aRow['INP_DOC_UID']); $aInput[] = $oInput->load($aRow['INP_DOC_UID']);
$oDataset->next(); $oDataset->next();
} }
return $aInput; return $aInput;

64
workflow/engine/classes/model/InputDocument.php
View File

@@ -47,14 +47,14 @@ class InputDocument extends BaseInputDocument
* *
* @var string * @var string
*/ */
protected $inp_doc_title = ''; protected $inp_doc_title_content = '';
/** /**
* This value goes in the content table * This value goes in the content table
* *
* @var string * @var string
*/ */
protected $inp_doc_description = ''; protected $inp_doc_description_content = '';
/* /*
* Load the application document registry * Load the application document registry
@@ -67,9 +67,7 @@ class InputDocument extends BaseInputDocument
$oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid ); $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
if (! is_null( $oInputDocument )) { if (! is_null( $oInputDocument )) {
$aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['INP_DOC_TITLE'] = $oInputDocument->getInpDocTitle(); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
$aFields['INP_DOC_DESCRIPTION'] = $oInputDocument->getInpDocDescription();
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
return $aFields; return $aFields;
} else { } else {
throw (new Exception( 'This row doesn\'t exist!' )); throw (new Exception( 'This row doesn\'t exist!' ));
@@ -88,8 +86,6 @@ class InputDocument extends BaseInputDocument
} }
$aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['INP_DOC_TITLE'] = $oInputDocument->getInpDocTitle();
$aFields['INP_DOC_DESCRIPTION'] = $oInputDocument->getInpDocDescription();
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
return $aFields; return $aFields;
} catch (Exception $oError) { } catch (Exception $oError) {
@@ -119,10 +115,10 @@ class InputDocument extends BaseInputDocument
if ($oInputDocument->validate()) { if ($oInputDocument->validate()) {
$oConnection->begin(); $oConnection->begin();
if (isset( $aData['INP_DOC_TITLE'] )) { if (isset( $aData['INP_DOC_TITLE'] )) {
$oInputDocument->setInpDocTitle( $aData['INP_DOC_TITLE'] ); $oInputDocument->setInpDocTitleContent( $aData['INP_DOC_TITLE'] );
} }
if (isset( $aData['INP_DOC_DESCRIPTION'] )) { if (isset( $aData['INP_DOC_DESCRIPTION'] )) {
$oInputDocument->setInpDocDescription( $aData['INP_DOC_DESCRIPTION'] ); $oInputDocument->setInpDocDescriptionContent( $aData['INP_DOC_DESCRIPTION'] );
} }
$iResult = $oInputDocument->save(); $iResult = $oInputDocument->save();
$oConnection->commit(); $oConnection->commit();
@@ -193,10 +189,10 @@ class InputDocument extends BaseInputDocument
if ($oInputDocument->validate()) { if ($oInputDocument->validate()) {
$oConnection->begin(); $oConnection->begin();
if (isset( $aData['INP_DOC_TITLE'] )) { if (isset( $aData['INP_DOC_TITLE'] )) {
$oInputDocument->setInpDocTitle( $aData['INP_DOC_TITLE'] ); $oInputDocument->setInpDocTitleContent( $aData['INP_DOC_TITLE'] );
} }
if (isset( $aData['INP_DOC_DESCRIPTION'] )) { if (isset( $aData['INP_DOC_DESCRIPTION'] )) {
$oInputDocument->setInpDocDescription( $aData['INP_DOC_DESCRIPTION'] ); $oInputDocument->setInpDocDescriptionContent( $aData['INP_DOC_DESCRIPTION'] );
} }
$iResult = $oInputDocument->save(); $iResult = $oInputDocument->save();
$oConnection->commit(); $oConnection->commit();
@@ -266,16 +262,14 @@ class InputDocument extends BaseInputDocument
try { try {
$oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid ); $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
if (! is_null( $oInputDocument )) { if (! is_null( $oInputDocument )) {
$nameInput = $this->getInpDocTitle(); $nameInput = $oInputDocument->getInpDocTitle();
$descInput = $this->getInpDocDescription(); $descInput = $oInputDocument->getInpDocDescription();
$oConnection->begin(); $oConnection->begin();
Content::removeContent( 'INP_DOC_TITLE', '', $oInputDocument->getInpDocUid() ); Content::removeContent( 'INP_DOC_TITLE', '', $oInputDocument->getInpDocUid() );
Content::removeContent( 'INP_DOC_DESCRIPTION', '', $oInputDocument->getInpDocUid() ); Content::removeContent( 'INP_DOC_DESCRIPTION', '', $oInputDocument->getInpDocUid() );
$iResult = $oInputDocument->delete(); $iResult = $oInputDocument->delete();
$oConnection->commit(); $oConnection->commit();
//Add Audit Log //Add Audit Log
$nameInput = $this->getInpDocTitle();
$descInput = $this->getInpDocDescription();
G::auditLog("DeleteInputDocument", "Input Document Name: ".$nameInput.", Input Document Uid: ".$sInpDocUid.", Description: ".$descInput); G::auditLog("DeleteInputDocument", "Input Document Name: ".$nameInput.", Input Document Uid: ".$sInpDocUid.", Description: ".$descInput);
return $iResult; return $iResult;
@@ -289,40 +283,40 @@ class InputDocument extends BaseInputDocument
} }
/** /**
* Get the [inp_doc_title] column value. * Get the [inp_doc_title_content] column value.
* *
* @return string * @return string
*/ */
public function getInpDocTitle () public function getInpDocTitleContent ()
{ {
if ($this->inp_doc_title == '') { if ($this->inp_doc_title_content == '') {
try { try {
$this->inp_doc_title = Content::load( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') ); $this->inp_doc_title_content = Content::load( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
} catch (Exception $oError) { } catch (Exception $oError) {
throw ($oError); throw ($oError);
} }
} }
return $this->inp_doc_title; return $this->inp_doc_title_content;
} }
/** /**
* Set the [inp_doc_title] column value. * Set the [inp_doc_title_content] column value.
* *
* @param string $sValue new value * @param string $sValue new value
* @return void * @return void
*/ */
public function setInpDocTitle ($sValue) public function setInpDocTitleContent ($sValue)
{ {
if ($sValue !== null && ! is_string( $sValue )) { if ($sValue !== null && ! is_string( $sValue )) {
$sValue = (string) $sValue; $sValue = (string) $sValue;
} }
if ($this->inp_doc_title !== $sValue || $sValue === '') { if ($this->inp_doc_title_content !== $sValue || $sValue === '') {
try { try {
$this->inp_doc_title = $sValue; $this->inp_doc_title_content = $sValue;
$iResult = Content::addContent( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_title ); $iResult = Content::addContent( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_title_content );
} catch (Exception $oError) { } catch (Exception $oError) {
$this->inp_doc_title = ''; $this->inp_doc_title_content = '';
throw ($oError); throw ($oError);
} }
} }
@@ -333,16 +327,16 @@ class InputDocument extends BaseInputDocument
* *
* @return string * @return string
*/ */
public function getInpDocDescription () public function getInpDocDescriptionContent ()
{ {
if ($this->inp_doc_description == '') { if ($this->inp_doc_description_content == '') {
try { try {
$this->inp_doc_description = Content::load( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') ); $this->inp_doc_description_content = Content::load( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
} catch (Exception $oError) { } catch (Exception $oError) {
throw ($oError); throw ($oError);
} }
} }
return $this->inp_doc_description; return $this->inp_doc_description_content;
} }
/** /**
@@ -351,18 +345,18 @@ class InputDocument extends BaseInputDocument
* @param string $sValue new value * @param string $sValue new value
* @return void * @return void
*/ */
public function setInpDocDescription ($sValue) public function setInpDocDescriptionContent ($sValue)
{ {
if ($sValue !== null && ! is_string( $sValue )) { if ($sValue !== null && ! is_string( $sValue )) {
$sValue = (string) $sValue; $sValue = (string) $sValue;
} }
if ($this->inp_doc_description !== $sValue || $sValue === '') { if ($this->inp_doc_description_content !== $sValue || $sValue === '') {
try { try {
$this->inp_doc_description = $sValue; $this->inp_doc_description_content = $sValue;
$iResult = Content::addContent( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_description ); $iResult = Content::addContent( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_description_content );
} catch (Exception $oError) { } catch (Exception $oError) {
$this->inp_doc_description = ''; $this->inp_doc_description_content = '';
throw ($oError); throw ($oError);
} }
} }

4
workflow/engine/classes/model/map/InputDocumentMapBuilder.php
View File

@@ -69,6 +69,10 @@ class InputDocumentMapBuilder
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('INP_DOC_TITLE', 'InpDocTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('INP_DOC_DESCRIPTION', 'InpDocDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('INP_DOC_FORM_NEEDED', 'InpDocFormNeeded', 'string', CreoleTypes::VARCHAR, true, 20); $tMap->addColumn('INP_DOC_FORM_NEEDED', 'InpDocFormNeeded', 'string', CreoleTypes::VARCHAR, true, 20);
$tMap->addColumn('INP_DOC_ORIGINAL', 'InpDocOriginal', 'string', CreoleTypes::VARCHAR, true, 20); $tMap->addColumn('INP_DOC_ORIGINAL', 'InpDocOriginal', 'string', CreoleTypes::VARCHAR, true, 20);

204
workflow/engine/classes/model/om/BaseInputDocument.php
View File

@@ -39,6 +39,18 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
*/ */
protected $pro_uid = '0'; protected $pro_uid = '0';
/**
* The value for the inp_doc_title field.
* @var string
*/
protected $inp_doc_title;
/**
* The value for the inp_doc_description field.
* @var string
*/
protected $inp_doc_description;
/** /**
* The value for the inp_doc_form_needed field. * The value for the inp_doc_form_needed field.
* @var string * @var string
@@ -129,6 +141,28 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
return $this->pro_uid; return $this->pro_uid;
} }
/**
* Get the [inp_doc_title] column value.
*
* @return string
*/
public function getInpDocTitle()
{
return $this->inp_doc_title;
}
/**
* Get the [inp_doc_description] column value.
*
* @return string
*/
public function getInpDocDescription()
{
return $this->inp_doc_description;
}
/** /**
* Get the [inp_doc_form_needed] column value. * Get the [inp_doc_form_needed] column value.
* *
@@ -272,6 +306,50 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
} // setProUid() } // setProUid()
/**
* Set the value of [inp_doc_title] column.
*
* @param string $v new value
* @return void
*/
public function setInpDocTitle($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->inp_doc_title !== $v) {
$this->inp_doc_title = $v;
$this->modifiedColumns[] = InputDocumentPeer::INP_DOC_TITLE;
}
} // setInpDocTitle()
/**
* Set the value of [inp_doc_description] column.
*
* @param string $v new value
* @return void
*/
public function setInpDocDescription($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->inp_doc_description !== $v) {
$this->inp_doc_description = $v;
$this->modifiedColumns[] = InputDocumentPeer::INP_DOC_DESCRIPTION;
}
} // setInpDocDescription()
/** /**
* Set the value of [inp_doc_form_needed] column. * Set the value of [inp_doc_form_needed] column.
* *
@@ -491,30 +569,34 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$this->pro_uid = $rs->getString($startcol + 1); $this->pro_uid = $rs->getString($startcol + 1);
$this->inp_doc_form_needed = $rs->getString($startcol + 2); $this->inp_doc_title = $rs->getString($startcol + 2);
$this->inp_doc_original = $rs->getString($startcol + 3); $this->inp_doc_description = $rs->getString($startcol + 3);
$this->inp_doc_published = $rs->getString($startcol + 4); $this->inp_doc_form_needed = $rs->getString($startcol + 4);
$this->inp_doc_versioning = $rs->getInt($startcol + 5); $this->inp_doc_original = $rs->getString($startcol + 5);
$this->inp_doc_destination_path = $rs->getString($startcol + 6); $this->inp_doc_published = $rs->getString($startcol + 6);
$this->inp_doc_tags = $rs->getString($startcol + 7); $this->inp_doc_versioning = $rs->getInt($startcol + 7);
$this->inp_doc_type_file = $rs->getString($startcol + 8); $this->inp_doc_destination_path = $rs->getString($startcol + 8);
$this->inp_doc_max_filesize = $rs->getInt($startcol + 9); $this->inp_doc_tags = $rs->getString($startcol + 9);
$this->inp_doc_max_filesize_unit = $rs->getString($startcol + 10); $this->inp_doc_type_file = $rs->getString($startcol + 10);
$this->inp_doc_max_filesize = $rs->getInt($startcol + 11);
$this->inp_doc_max_filesize_unit = $rs->getString($startcol + 12);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 11; // 11 = InputDocumentPeer::NUM_COLUMNS - InputDocumentPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 13; // 13 = InputDocumentPeer::NUM_COLUMNS - InputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating InputDocument object", $e); throw new PropelException("Error populating InputDocument object", $e);
@@ -725,30 +807,36 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
return $this->getProUid(); return $this->getProUid();
break; break;
case 2: case 2:
return $this->getInpDocFormNeeded(); return $this->getInpDocTitle();
break; break;
case 3: case 3:
return $this->getInpDocOriginal(); return $this->getInpDocDescription();
break; break;
case 4: case 4:
return $this->getInpDocPublished(); return $this->getInpDocFormNeeded();
break; break;
case 5: case 5:
return $this->getInpDocVersioning(); return $this->getInpDocOriginal();
break; break;
case 6: case 6:
return $this->getInpDocDestinationPath(); return $this->getInpDocPublished();
break; break;
case 7: case 7:
return $this->getInpDocTags(); return $this->getInpDocVersioning();
break; break;
case 8: case 8:
return $this->getInpDocTypeFile(); return $this->getInpDocDestinationPath();
break; break;
case 9: case 9:
return $this->getInpDocMaxFilesize(); return $this->getInpDocTags();
break; break;
case 10: case 10:
return $this->getInpDocTypeFile();
break;
case 11:
return $this->getInpDocMaxFilesize();
break;
case 12:
return $this->getInpDocMaxFilesizeUnit(); return $this->getInpDocMaxFilesizeUnit();
break; break;
default: default:
@@ -773,15 +861,17 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$result = array( $result = array(
$keys[0] => $this->getInpDocUid(), $keys[0] => $this->getInpDocUid(),
$keys[1] => $this->getProUid(), $keys[1] => $this->getProUid(),
$keys[2] => $this->getInpDocFormNeeded(), $keys[2] => $this->getInpDocTitle(),
$keys[3] => $this->getInpDocOriginal(), $keys[3] => $this->getInpDocDescription(),
$keys[4] => $this->getInpDocPublished(), $keys[4] => $this->getInpDocFormNeeded(),
$keys[5] => $this->getInpDocVersioning(), $keys[5] => $this->getInpDocOriginal(),
$keys[6] => $this->getInpDocDestinationPath(), $keys[6] => $this->getInpDocPublished(),
$keys[7] => $this->getInpDocTags(), $keys[7] => $this->getInpDocVersioning(),
$keys[8] => $this->getInpDocTypeFile(), $keys[8] => $this->getInpDocDestinationPath(),
$keys[9] => $this->getInpDocMaxFilesize(), $keys[9] => $this->getInpDocTags(),
$keys[10] => $this->getInpDocMaxFilesizeUnit(), $keys[10] => $this->getInpDocTypeFile(),
$keys[11] => $this->getInpDocMaxFilesize(),
$keys[12] => $this->getInpDocMaxFilesizeUnit(),
); );
return $result; return $result;
} }
@@ -820,30 +910,36 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$this->setProUid($value); $this->setProUid($value);
break; break;
case 2: case 2:
$this->setInpDocFormNeeded($value); $this->setInpDocTitle($value);
break; break;
case 3: case 3:
$this->setInpDocOriginal($value); $this->setInpDocDescription($value);
break; break;
case 4: case 4:
$this->setInpDocPublished($value); $this->setInpDocFormNeeded($value);
break; break;
case 5: case 5:
$this->setInpDocVersioning($value); $this->setInpDocOriginal($value);
break; break;
case 6: case 6:
$this->setInpDocDestinationPath($value); $this->setInpDocPublished($value);
break; break;
case 7: case 7:
$this->setInpDocTags($value); $this->setInpDocVersioning($value);
break; break;
case 8: case 8:
$this->setInpDocTypeFile($value); $this->setInpDocDestinationPath($value);
break; break;
case 9: case 9:
$this->setInpDocMaxFilesize($value); $this->setInpDocTags($value);
break; break;
case 10: case 10:
$this->setInpDocTypeFile($value);
break;
case 11:
$this->setInpDocMaxFilesize($value);
break;
case 12:
$this->setInpDocMaxFilesizeUnit($value); $this->setInpDocMaxFilesizeUnit($value);
break; break;
} // switch() } // switch()
@@ -878,39 +974,47 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setInpDocFormNeeded($arr[$keys[2]]); $this->setInpDocTitle($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setInpDocOriginal($arr[$keys[3]]); $this->setInpDocDescription($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setInpDocPublished($arr[$keys[4]]); $this->setInpDocFormNeeded($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setInpDocVersioning($arr[$keys[5]]); $this->setInpDocOriginal($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setInpDocDestinationPath($arr[$keys[6]]); $this->setInpDocPublished($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setInpDocTags($arr[$keys[7]]); $this->setInpDocVersioning($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setInpDocTypeFile($arr[$keys[8]]); $this->setInpDocDestinationPath($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setInpDocMaxFilesize($arr[$keys[9]]); $this->setInpDocTags($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setInpDocMaxFilesizeUnit($arr[$keys[10]]); $this->setInpDocTypeFile($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setInpDocMaxFilesize($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setInpDocMaxFilesizeUnit($arr[$keys[12]]);
} }
} }
@@ -932,6 +1036,14 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$criteria->add(InputDocumentPeer::PRO_UID, $this->pro_uid); $criteria->add(InputDocumentPeer::PRO_UID, $this->pro_uid);
} }
if ($this->isColumnModified(InputDocumentPeer::INP_DOC_TITLE)) {
$criteria->add(InputDocumentPeer::INP_DOC_TITLE, $this->inp_doc_title);
}
if ($this->isColumnModified(InputDocumentPeer::INP_DOC_DESCRIPTION)) {
$criteria->add(InputDocumentPeer::INP_DOC_DESCRIPTION, $this->inp_doc_description);
}
if ($this->isColumnModified(InputDocumentPeer::INP_DOC_FORM_NEEDED)) { if ($this->isColumnModified(InputDocumentPeer::INP_DOC_FORM_NEEDED)) {
$criteria->add(InputDocumentPeer::INP_DOC_FORM_NEEDED, $this->inp_doc_form_needed); $criteria->add(InputDocumentPeer::INP_DOC_FORM_NEEDED, $this->inp_doc_form_needed);
} }
@@ -1024,6 +1136,10 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
$copyObj->setProUid($this->pro_uid); $copyObj->setProUid($this->pro_uid);
$copyObj->setInpDocTitle($this->inp_doc_title);
$copyObj->setInpDocDescription($this->inp_doc_description);
$copyObj->setInpDocFormNeeded($this->inp_doc_form_needed); $copyObj->setInpDocFormNeeded($this->inp_doc_form_needed);
$copyObj->setInpDocOriginal($this->inp_doc_original); $copyObj->setInpDocOriginal($this->inp_doc_original);

28
workflow/engine/classes/model/om/BaseInputDocumentPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseInputDocumentPeer
const CLASS_DEFAULT = 'classes.model.InputDocument'; const CLASS_DEFAULT = 'classes.model.InputDocument';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 11; const NUM_COLUMNS = 13;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,12 @@ abstract class BaseInputDocumentPeer
/** the column name for the PRO_UID field */ /** the column name for the PRO_UID field */
const PRO_UID = 'INPUT_DOCUMENT.PRO_UID'; const PRO_UID = 'INPUT_DOCUMENT.PRO_UID';
/** the column name for the INP_DOC_TITLE field */
const INP_DOC_TITLE = 'INPUT_DOCUMENT.INP_DOC_TITLE';
/** the column name for the INP_DOC_DESCRIPTION field */
const INP_DOC_DESCRIPTION = 'INPUT_DOCUMENT.INP_DOC_DESCRIPTION';
/** the column name for the INP_DOC_FORM_NEEDED field */ /** the column name for the INP_DOC_FORM_NEEDED field */
const INP_DOC_FORM_NEEDED = 'INPUT_DOCUMENT.INP_DOC_FORM_NEEDED'; const INP_DOC_FORM_NEEDED = 'INPUT_DOCUMENT.INP_DOC_FORM_NEEDED';
@@ -75,10 +81,10 @@ abstract class BaseInputDocumentPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('InpDocUid', 'ProUid', 'InpDocFormNeeded', 'InpDocOriginal', 'InpDocPublished', 'InpDocVersioning', 'InpDocDestinationPath', 'InpDocTags', 'InpDocTypeFile', 'InpDocMaxFilesize', 'InpDocMaxFilesizeUnit', ), BasePeer::TYPE_PHPNAME => array ('InpDocUid', 'ProUid', 'InpDocTitle', 'InpDocDescription', 'InpDocFormNeeded', 'InpDocOriginal', 'InpDocPublished', 'InpDocVersioning', 'InpDocDestinationPath', 'InpDocTags', 'InpDocTypeFile', 'InpDocMaxFilesize', 'InpDocMaxFilesizeUnit', ),
BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID, InputDocumentPeer::PRO_UID, InputDocumentPeer::INP_DOC_FORM_NEEDED, InputDocumentPeer::INP_DOC_ORIGINAL, InputDocumentPeer::INP_DOC_PUBLISHED, InputDocumentPeer::INP_DOC_VERSIONING, InputDocumentPeer::INP_DOC_DESTINATION_PATH, InputDocumentPeer::INP_DOC_TAGS, InputDocumentPeer::INP_DOC_TYPE_FILE, InputDocumentPeer::INP_DOC_MAX_FILESIZE, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT, ), BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID, InputDocumentPeer::PRO_UID, InputDocumentPeer::INP_DOC_TITLE, InputDocumentPeer::INP_DOC_DESCRIPTION, InputDocumentPeer::INP_DOC_FORM_NEEDED, InputDocumentPeer::INP_DOC_ORIGINAL, InputDocumentPeer::INP_DOC_PUBLISHED, InputDocumentPeer::INP_DOC_VERSIONING, InputDocumentPeer::INP_DOC_DESTINATION_PATH, InputDocumentPeer::INP_DOC_TAGS, InputDocumentPeer::INP_DOC_TYPE_FILE, InputDocumentPeer::INP_DOC_MAX_FILESIZE, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT, ),
BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID', 'PRO_UID', 'INP_DOC_FORM_NEEDED', 'INP_DOC_ORIGINAL', 'INP_DOC_PUBLISHED', 'INP_DOC_VERSIONING', 'INP_DOC_DESTINATION_PATH', 'INP_DOC_TAGS', 'INP_DOC_TYPE_FILE', 'INP_DOC_MAX_FILESIZE', 'INP_DOC_MAX_FILESIZE_UNIT', ), BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID', 'PRO_UID', 'INP_DOC_TITLE', 'INP_DOC_DESCRIPTION', 'INP_DOC_FORM_NEEDED', 'INP_DOC_ORIGINAL', 'INP_DOC_PUBLISHED', 'INP_DOC_VERSIONING', 'INP_DOC_DESTINATION_PATH', 'INP_DOC_TAGS', 'INP_DOC_TYPE_FILE', 'INP_DOC_MAX_FILESIZE', 'INP_DOC_MAX_FILESIZE_UNIT', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
); );
/** /**
@@ -88,10 +94,10 @@ abstract class BaseInputDocumentPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('InpDocUid' => 0, 'ProUid' => 1, 'InpDocFormNeeded' => 2, 'InpDocOriginal' => 3, 'InpDocPublished' => 4, 'InpDocVersioning' => 5, 'InpDocDestinationPath' => 6, 'InpDocTags' => 7, 'InpDocTypeFile' => 8, 'InpDocMaxFilesize' => 9, 'InpDocMaxFilesizeUnit' => 10, ), BasePeer::TYPE_PHPNAME => array ('InpDocUid' => 0, 'ProUid' => 1, 'InpDocTitle' => 2, 'InpDocDescription' => 3, 'InpDocFormNeeded' => 4, 'InpDocOriginal' => 5, 'InpDocPublished' => 6, 'InpDocVersioning' => 7, 'InpDocDestinationPath' => 8, 'InpDocTags' => 9, 'InpDocTypeFile' => 10, 'InpDocMaxFilesize' => 11, 'InpDocMaxFilesizeUnit' => 12, ),
BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID => 0, InputDocumentPeer::PRO_UID => 1, InputDocumentPeer::INP_DOC_FORM_NEEDED => 2, InputDocumentPeer::INP_DOC_ORIGINAL => 3, InputDocumentPeer::INP_DOC_PUBLISHED => 4, InputDocumentPeer::INP_DOC_VERSIONING => 5, InputDocumentPeer::INP_DOC_DESTINATION_PATH => 6, InputDocumentPeer::INP_DOC_TAGS => 7, InputDocumentPeer::INP_DOC_TYPE_FILE => 8, InputDocumentPeer::INP_DOC_MAX_FILESIZE => 9, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT => 10, ), BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID => 0, InputDocumentPeer::PRO_UID => 1, InputDocumentPeer::INP_DOC_TITLE => 2, InputDocumentPeer::INP_DOC_DESCRIPTION => 3, InputDocumentPeer::INP_DOC_FORM_NEEDED => 4, InputDocumentPeer::INP_DOC_ORIGINAL => 5, InputDocumentPeer::INP_DOC_PUBLISHED => 6, InputDocumentPeer::INP_DOC_VERSIONING => 7, InputDocumentPeer::INP_DOC_DESTINATION_PATH => 8, InputDocumentPeer::INP_DOC_TAGS => 9, InputDocumentPeer::INP_DOC_TYPE_FILE => 10, InputDocumentPeer::INP_DOC_MAX_FILESIZE => 11, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT => 12, ),
BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID' => 0, 'PRO_UID' => 1, 'INP_DOC_FORM_NEEDED' => 2, 'INP_DOC_ORIGINAL' => 3, 'INP_DOC_PUBLISHED' => 4, 'INP_DOC_VERSIONING' => 5, 'INP_DOC_DESTINATION_PATH' => 6, 'INP_DOC_TAGS' => 7, 'INP_DOC_TYPE_FILE' => 8, 'INP_DOC_MAX_FILESIZE' => 9, 'INP_DOC_MAX_FILESIZE_UNIT' => 10, ), BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID' => 0, 'PRO_UID' => 1, 'INP_DOC_TITLE' => 2, 'INP_DOC_DESCRIPTION' => 3, 'INP_DOC_FORM_NEEDED' => 4, 'INP_DOC_ORIGINAL' => 5, 'INP_DOC_PUBLISHED' => 6, 'INP_DOC_VERSIONING' => 7, 'INP_DOC_DESTINATION_PATH' => 8, 'INP_DOC_TAGS' => 9, 'INP_DOC_TYPE_FILE' => 10, 'INP_DOC_MAX_FILESIZE' => 11, 'INP_DOC_MAX_FILESIZE_UNIT' => 12, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
); );
/** /**
@@ -196,6 +202,10 @@ abstract class BaseInputDocumentPeer
$criteria->addSelectColumn(InputDocumentPeer::PRO_UID); $criteria->addSelectColumn(InputDocumentPeer::PRO_UID);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_FORM_NEEDED); $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_FORM_NEEDED);
$criteria->addSelectColumn(InputDocumentPeer::INP_DOC_ORIGINAL); $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_ORIGINAL);

2
workflow/engine/config/schema.xml
View File

@@ -622,6 +622,8 @@
</vendor> </vendor>
<column name="INP_DOC_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="INP_DOC_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default="0"/> <column name="PRO_UID" type="VARCHAR" size="32" required="true" default="0"/>
<column name="INP_DOC_TITLE" type="LONGVARCHAR" required="true"/>
<column name="INP_DOC_DESCRIPTION" type="LONGVARCHAR"/>
<column name="INP_DOC_FORM_NEEDED" type="VARCHAR" size="20" required="true" default="REAL"/> <column name="INP_DOC_FORM_NEEDED" type="VARCHAR" size="20" required="true" default="REAL"/>
<column name="INP_DOC_ORIGINAL" type="VARCHAR" size="20" required="true" default="COPY"/> <column name="INP_DOC_ORIGINAL" type="VARCHAR" size="20" required="true" default="COPY"/>
<column name="INP_DOC_PUBLISHED" type="VARCHAR" size="20" required="true" default="PRIVATE"/> <column name="INP_DOC_PUBLISHED" type="VARCHAR" size="20" required="true" default="PRIVATE"/>

2
workflow/engine/data/mysql/schema.sql
View File

@@ -289,6 +289,8 @@ CREATE TABLE `INPUT_DOCUMENT`
( (
`INP_DOC_UID` VARCHAR(32) default '' NOT NULL, `INP_DOC_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '0' NOT NULL, `PRO_UID` VARCHAR(32) default '0' NOT NULL,
`INP_DOC_TITLE` MEDIUMTEXT NOT NULL,
`INP_DOC_DESCRIPTION` MEDIUMTEXT,
`INP_DOC_FORM_NEEDED` VARCHAR(20) default 'REAL' NOT NULL, `INP_DOC_FORM_NEEDED` VARCHAR(20) default 'REAL' NOT NULL,
`INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL, `INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL,
`INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL, `INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL,

22
workflow/engine/methods/inputdocs/inputdocs_Save.php
View File

@@ -54,26 +54,14 @@ try {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( InputDocumentPeer::INP_DOC_UID ); $oCriteria->addSelectColumn( InputDocumentPeer::INP_DOC_UID );
$oCriteria->add( InputDocumentPeer::PRO_UID, $sPRO_UID ); $oCriteria->add( InputDocumentPeer::PRO_UID, $sPRO_UID );
$oCriteria->add( InputDocumentPeer::INP_DOC_TITLE, $snameInput );
$oDataset = InputDocumentPeer::doSelectRS( $oCriteria ); $oDataset = InputDocumentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$flag = true; $flag = true;
while ($oDataset->next() && $flag) { $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
if ($aRow) {
$oCriteria1 = new Criteria( 'workflow' ); $flag = false;
$oCriteria1->addSelectColumn( 'COUNT(*) AS INPUTS' );
$oCriteria1->add( ContentPeer::CON_CATEGORY, 'INP_DOC_TITLE' );
$oCriteria1->add( ContentPeer::CON_ID, $aRow['INP_DOC_UID'] );
$oCriteria1->add( ContentPeer::CON_VALUE, $snameInput );
$oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
$oDataset1 = ContentPeer::doSelectRS( $oCriteria1 );
$oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset1->next();
$aRow1 = $oDataset1->getRow();
if ($aRow1['INPUTS']) {
$flag = false;
}
} }
print $flag; print $flag;
break; break;

24
workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php
View File

@@ -200,24 +200,8 @@ class CaseTracker
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayInputDocumentUid, \Criteria::NOT_IN); $criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayInputDocumentUid, \Criteria::NOT_IN);
@@ -229,7 +213,9 @@ class CaseTracker
if ($row["INP_DOC_TITLE"] . "" == "") { if ($row["INP_DOC_TITLE"] . "" == "") {
//There is no transaltion for this Document name, try to get/regenerate the label //There is no transaltion for this Document name, try to get/regenerate the label
$row["INP_DOC_TITLE"] = \Content::Load("INP_DOC_TITLE", "", $row["INP_DOC_UID"], SYS_LANG); $inputDocument = new \InputDocument();
$inputDocumentObj = $inputDocument->load($row['INP_DOC_UID']);
$row["INP_DOC_TITLE"] = $inputDocumentObj['INP_DOC_TITLE'];
} }
$arrayCaseTrackerObject[] = array( $arrayCaseTrackerObject[] = array(

34
workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
View File

@@ -110,22 +110,14 @@ class InputDocument
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
if ($inputDocumentUidExclude != "") { if ($inputDocumentUidExclude != "") {
$criteria->add(\InputDocumentPeer::INP_DOC_UID, $inputDocumentUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\InputDocumentPeer::INP_DOC_UID, $inputDocumentUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $inputDocumentTitle, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::INP_DOC_TITLE, $inputDocumentTitle, \Criteria::EQUAL);
$rsCriteria = \InputDocumentPeer::doSelectRS($criteria); $rsCriteria = \InputDocumentPeer::doSelectRS($criteria);
@@ -461,13 +453,11 @@ class InputDocument
public function getInputDocumentCriteria() public function getInputDocumentCriteria()
{ {
try { try {
$delimiter = \DBAdapter::getStringDelimiter();
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_FORM_NEEDED); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_FORM_NEEDED);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_ORIGINAL); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_ORIGINAL);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_PUBLISHED); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_PUBLISHED);
@@ -477,22 +467,6 @@ class InputDocument
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TYPE_FILE); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TYPE_FILE);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
return $criteria; return $criteria;
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;

2
workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -1456,7 +1456,7 @@ class Process
$criteria = $inputDocument->getInputDocumentCriteria(); $criteria = $inputDocument->getInputDocumentCriteria();
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->addAscendingOrderByColumn("INP_DOC_TITLE"); $criteria->addAscendingOrderByColumn(\InputDocumentPeer::INP_DOC_TITLE);
$rsCriteria = \InputDocumentPeer::doSelectRS($criteria); $rsCriteria = \InputDocumentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);

57
workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
View File

@@ -643,13 +643,7 @@ class ProcessSupervisor
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN); $oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN);
$oDataset = \StepSupervisorPeer::doSelectRS($oCriteria); $oDataset = \StepSupervisorPeer::doSelectRS($oCriteria);
@@ -722,17 +716,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION);
@@ -823,17 +811,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
$oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION);
@@ -878,17 +860,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_UID, $sPuiUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID, $sPuiUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
@@ -926,17 +902,10 @@ class ProcessSupervisor
foreach ($oCriteria as $oCriteria => $value) { foreach ($oCriteria as $oCriteria => $value) {
$aUIDS[] = $value["input_doc_uid"]; $aUIDS[] = $value["input_doc_uid"];
} }
$sDelimiter = \DBAdapter::getStringDelimiter();
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID); $oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN); $oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN);
$oDataset = \StepSupervisorPeer::doSelectRS($oCriteria); $oDataset = \StepSupervisorPeer::doSelectRS($oCriteria);
@@ -1138,17 +1107,11 @@ class ProcessSupervisor
$sDelimiter = \DBAdapter::getStringDelimiter(); $sDelimiter = \DBAdapter::getStringDelimiter();
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
@@ -1173,17 +1136,11 @@ class ProcessSupervisor
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
$oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
$oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE'); $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$oCriteria->addAlias('C', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID); $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
$aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter); $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$aConditions = array();
$aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
$aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
$aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
$oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
$oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID);
$oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT'); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');

24
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -574,24 +574,8 @@ class Task
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
$criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE"); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayUid, \Criteria::NOT_IN); $criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayUid, \Criteria::NOT_IN);
@@ -603,7 +587,9 @@ class Task
if ($row["INP_DOC_TITLE"] . "" == "") { if ($row["INP_DOC_TITLE"] . "" == "") {
//There is no transaltion for this Document name, try to get/regenerate the label //There is no transaltion for this Document name, try to get/regenerate the label
$row["INP_DOC_TITLE"] = \Content::Load("INP_DOC_TITLE", "", $row["INP_DOC_UID"], SYS_LANG); $oInputDocument = new \InputDocument;
$aRow = $oInputDocument->load($row['INP_DOC_UID']);
$row['INP_DOC_TITLE'] = $aRow['INP_DOC_TITLE'];
} }
$arraydbStep[] = array( $arraydbStep[] = array(