diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 37d857186..8a938d803 100644 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -3293,22 +3293,14 @@ class Cases $sStepUid = $sStepUidObj; } - $delimiter = DBAdapter::getStringDelimiter(); - $c = new Criteria(); $c->clearSelectColumns(); $c->addSelectColumn(TriggersPeer::TRI_UID); - $c->addAsColumn("TRI_TITLE", ContentPeer::CON_VALUE); + $c->addSelectColumn(TriggersPeer::TRI_TITLE); $c->addSelectColumn(StepTriggerPeer::ST_CONDITION); $c->addSelectColumn(TriggersPeer::TRI_TYPE); $c->addSelectColumn(TriggersPeer::TRI_WEBBOT); - $arrayCondition = array(); - $arrayCondition[] = array(TriggersPeer::TRI_UID, ContentPeer::CON_ID, Criteria::EQUAL); - $arrayCondition[] = array(ContentPeer::CON_CATEGORY, $delimiter . "TRI_TITLE" . $delimiter, Criteria::EQUAL); - $arrayCondition[] = array(ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL); - $c->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); - $c->add(StepTriggerPeer::STEP_UID, $sStepUid); $c->add(StepTriggerPeer::TAS_UID, $sTasUid); $c->add(StepTriggerPeer::ST_TYPE, $sTriggerType); @@ -3412,34 +3404,21 @@ class Cases public function getTriggerNames($triggers) { - $triggers_info = Array(); + $triggers_info = array(); $aTriggers = array(); foreach ($triggers as $key => $val) { $aTriggers[] = $val['TRI_UID']; } - $lang = defined('SYS_LANG') ? SYS_LANG : 'en'; $c = new Criteria(); $c->clearSelectColumns(); - $c->addSelectColumn(ContentPeer::CON_ID); - $c->addSelectColumn(ContentPeer::CON_VALUE); - $c->add(ContentPeer::CON_ID, $aTriggers, Criteria::IN); - $c->add(ContentPeer::CON_CATEGORY, 'TRI_TITLE'); - $c->add(ContentPeer::CON_LANG, $lang); + $c->addSelectColumn(TriggersPeer::TRI_TITLE); + $c->add(TriggersPeer::TRI_UID, $aTriggers, Criteria::IN); $rs = TriggersPeer::doSelectRS($c); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->next(); - $row = $rs->getRow(); - while (is_array($row)) { - $info[$row['CON_ID']] = ($row['CON_VALUE'] != '' ? $row['CON_VALUE'] : '-'); + while ($row = $rs->getRow()) { + $triggers_info[] = $row['TRI_TITLE']; $rs->next(); - $row = $rs->getRow(); - } - foreach ($triggers as $key => $val) { - if (isset($info[$val['TRI_UID']])) { - $triggers_info[] = $info[$val['TRI_UID']]; - } else { - $triggers_info[] = Content::load('TRI_TITLE', '', $val['TRI_UID'], $lang); - } } return $triggers_info; } @@ -3467,7 +3446,6 @@ class Cases $folderData = new folderData(null, null, $sApplicationUID, null, $_SESSION['USER_LOGGED']); $folderData->PMType = "INPUT"; $folderData->returnList = true; - //$oPluginRegistry = & PMPluginRegistry::getSingleton(); $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData); } @@ -3475,7 +3453,6 @@ class Cases $oAppDocument = new AppDocument(); $oCriteria = new Criteria('workflow'); $oCriteria->add(AppDocumentPeer::APP_UID, $sApplicationUID); - //$oCriteria->add(AppDocumentPeer::DEL_INDEX, $iDelegation); $oCriteria->add(AppDocumentPeer::DOC_UID, $sDocumentUID); if ($sAppDocuUID != "") { $oCriteria->add(AppDocumentPeer::APP_DOC_UID, $sAppDocuUID); @@ -5108,6 +5085,7 @@ class Cases //These fields are missing now is completed $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->addSelectColumn(DynaformPeer::DYN_TYPE); $oCriteria->addSelectColumn(DynaformPeer::DYN_FILENAME); $oCriteria->addSelectColumn(ApplicationPeer::PRO_UID); @@ -5127,9 +5105,7 @@ class Cases ); while ($aRow = $oDataset->getRow()) { - $o = new Dynaform(); - $o->setDynUid($aRow['DYN_UID']); - $aFields['DYN_TITLE'] = $o->getDynTitle(); + $aFields['DYN_TITLE'] = $aRow['DYN_TITLE']; $aFields['DYN_UID'] = $aRow['DYN_UID']; $aFields['EDIT'] = G::LoadTranslation('ID_EDIT'); $aFields['PRO_UID'] = $sProcessUID; diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 000cc4443..53ca45d81 100644 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -879,24 +879,18 @@ class processMap { $imgEx = "
"; $imgNoEx = '
'; - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); - $oCriteria->addSelectColumn('C.CON_VALUE'); - $oCriteria->addSelectColumn('STEP_UID'); - $oCriteria->addSelectColumn('TRI_UID'); + $oCriteria->addAsColumn('CON_VALUE', TriggersPeer::TRI_TITLE); + $oCriteria->addSelectColumn(StepTriggerPeer::STEP_UID); + $oCriteria->addSelectColumn(StepTriggerPeer::TRI_UID); $oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', '(SELECT LOCATE(MD5(' . TriggersPeer::TRI_WEBBOT . '),' . TriggersPeer::TRI_PARAM . ') FROM ' . TriggersPeer::TABLE_NAME . ' WHERE ' . TriggersPeer::TRI_UID . '=' . StepTriggerPeer::TRI_UID . ' )'); - $oCriteria->addSelectColumn('ST_TYPE'); + $oCriteria->addSelectColumn(StepTriggerPeer::ST_TYPE); /*----------------------------------********---------------------------------*/ $oCriteria->addSelectColumn('IF ('.StepTriggerPeer::ST_CONDITION.' = "", "'.$imgNoEx.'", "'.$imgEx.'") AS CONDITION_SET'); /*----------------------------------********---------------------------------*/ $oCriteria->addSelectColumn(StepTriggerPeer::ST_POSITION); - $oCriteria->addAsColumn('TRI_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(StepTriggerPeer::TRI_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'TRI_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(TriggersPeer::TRI_TITLE); + $oCriteria->addJoin(StepTriggerPeer::TRI_UID, TriggersPeer::TRI_UID, Criteria::LEFT_JOIN); $oCriteria->add(StepTriggerPeer::STEP_UID, $sStepUID); $oCriteria->add(StepTriggerPeer::TAS_UID, $sTaskUID); $oCriteria->add(StepTriggerPeer::ST_TYPE, $sType); @@ -925,13 +919,7 @@ class processMap $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(DynaformPeer::DYN_UID, $sUIDs, Criteria::NOT_IN); $oCriteria->add(DynaformPeer::DYN_TYPE, 'xmlform'); @@ -941,10 +929,6 @@ class processMap $i = 0; while ($aRow = $oDataset->getRow()) { $i++; - if (($aRow['DYN_TITLE'] == null) || ($aRow['DYN_TITLE'] == "")) { - // There is no transaltion for this Document name, try to get/regenerate the label - $aRow['DYN_TITLE'] = Content::Load("DYN_TITLE", "", $aRow['DYN_UID'], SYS_LANG); - } $aBB[] = array('STEP_UID' => $aRow['DYN_UID'], 'STEP_TITLE' => $aRow['DYN_TITLE'], 'STEP_TYPE_OBJ' => 'DYNAFORM', 'STEP_MODE' => '' ); $oDataset->next(); } @@ -1535,18 +1508,11 @@ class processMap $oCriteria->setDistinct(); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - $oCriteria->addSelectColumn(ContentPeer::CON_VALUE); - - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, ContentPeer::CON_ID); - $aConditions[] = array(ContentPeer::CON_CATEGORY, $del . "DYN_TITLE" . $del); - $aConditions[] = array(ContentPeer::CON_LANG, $del . "en" . $del); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $_SESSION["PROCESS"]); $oCriteria->add(DynaformPeer::DYN_TYPE, "grid"); - - $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE); + + $oCriteria->addAscendingOrderByColumn(DynaformPeer::DYN_TITLE); $numRows = DynaformPeer::doCount($oCriteria); if ($numRows == 0) { @@ -1914,41 +1880,20 @@ class processMap public function getDynaformsCriteria($sProcessUID = '') { - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); $oCriteria->addSelectColumn(DynaformPeer::PRO_UID); $oCriteria->addSelectColumn(DynaformPeer::DYN_TYPE); - $oCriteria->addAsColumn('DYN_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('DYN_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C1.CON_ID' ); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'DYN_DESCRIPTION' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); + $oCriteria->addSelectColumn(DynaformPeer::DYN_DESCRIPTION); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); - $oCriteria->addAscendingOrderByColumn('DYN_TITLE'); + $oCriteria->addAscendingOrderByColumn(DynaformPeer::DYN_TITLE); $oDataset = DynaformPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); $dynaformArray = array(); $dynaformArray[] = array('d' => 'char'); while ($aRow = $oDataset->getRow()) { - if (($aRow['DYN_TITLE'] == null) || ($aRow['DYN_TITLE'] == "")) { - // There is no transaltion for this Document name, try to get/regenerate the label - $aRow['DYN_TITLE'] = Content::Load("DYN_TITLE", "", $aRow['DYN_UID'], SYS_LANG); - } - 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); - } $dynaformArray[] = $aRow; $oDataset->next(); } @@ -1969,20 +1914,8 @@ class processMap $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); $oCriteria->addSelectColumn(DynaformPeer::PRO_UID); $oCriteria->addSelectColumn(DynaformPeer::DYN_TYPE); - $oCriteria->addAsColumn('DYN_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('DYN_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C1.CON_ID'); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'DYN_DESCRIPTION' . $sDelimiter); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); + $oCriteria->addSelectColumn(DynaformPeer::DYN_DESCRIPTION); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oDataset = DynaformPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); @@ -1990,14 +1923,6 @@ class processMap $oDataset->next(); $dynaformArray = array(); while ($aRow = $oDataset->getRow()) { - if (($aRow['DYN_TITLE'] == null) || ($aRow['DYN_TITLE'] == "")) { - // There is no transaltion for this Document name, try to get/regenerate the label - $aRow['DYN_TITLE'] = Content::Load("DYN_TITLE", "", $aRow['DYN_UID'], SYS_LANG); - } - 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); - } $dynaformArray[] = $aRow; $oDataset->next(); } @@ -2037,22 +1962,10 @@ class processMap $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_UID); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TITLE); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_DESCRIPTION); $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TYPE); $oCriteria->addSelectColumn(OutputDocumentPeer::PRO_UID); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C1.CON_ID' ); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter ); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'OUT_DOC_DESCRIPTION' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); $oCriteria->add(OutputDocumentPeer::PRO_UID, $sProcessUID); $oDataset = OutputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); @@ -2177,27 +2090,14 @@ class processMap public function getTriggersCriteria($sProcessUID = '') { - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(TriggersPeer::TRI_UID); + $oCriteria->addSelectColumn(TriggersPeer::TRI_TITLE); + $oCriteria->addSelectColumn(TriggersPeer::TRI_DESCRIPTION); $oCriteria->addSelectColumn(TriggersPeer::PRO_UID); $oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', 'LOCATE(MD5(' . TriggersPeer::TRI_WEBBOT . '),' . TriggersPeer::TRI_PARAM . ')'); - $oCriteria->addAsColumn('TRI_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('TRI_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(TriggersPeer::TRI_UID, 'C1.CON_ID' ); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'TRI_TITLE' . $sDelimiter ); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(TriggersPeer::TRI_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'TRI_TITLE' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); $oCriteria->add(TriggersPeer::PRO_UID, $sProcessUID); - $oCriteria->addAscendingOrderByColumn('TRI_TITLE'); + $oCriteria->addAscendingOrderByColumn(TriggersPeer::TRI_TITLE); $oDataset = TriggersPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -2454,21 +2354,13 @@ class processMap public function getReportTablesCriteria($sProcessUID = '') { - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_UID); $oCriteria->addSelectColumn(ReportTablePeer::PRO_UID); $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_NAME); $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_TYPE); $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_CONNECTION); - // $oCriteria->addAsColumn ( 'REP_TAB_TITLE', 'C.CON_VALUE' ); - $oCriteria->addAsColumn('REP_TAB_TITLE', "CASE WHEN C.CON_VALUE IS NULL THEN (SELECT DISTINCT MAX(A.CON_VALUE) FROM CONTENT A WHERE A.CON_ID = REPORT_TABLE.REP_TAB_UID ) ELSE C.CON_VALUE END "); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(ReportTablePeer::REP_TAB_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'REP_TAB_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_TITLE); $oCriteria->add(ReportTablePeer::PRO_UID, $sProcessUID); return $oCriteria; } @@ -3108,24 +3000,14 @@ class processMap public function getSupervisorDynaformsCriteria($sProcessUID = '') { - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID); $oCriteria->addSelectColumn(StepSupervisorPeer::PRO_UID); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, DynaformPeer::DYN_UID ); - $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(StepSupervisorPeer::STEP_UID_OBJ, DynaformPeer::DYN_UID, Criteria::LEFT_JOIN); $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION); @@ -3213,17 +3095,10 @@ class processMap $aUIDS[] = $aRow['STEP_UID_OBJ']; $oDataset->next(); } - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); $oCriteria->addSelectColumn(DynaformPeer::PRO_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(DynaformPeer::DYN_TYPE, 'xmlform'); $oCriteria->add(DynaformPeer::DYN_UID, $aUIDS, Criteria::NOT_IN); @@ -4229,13 +4104,7 @@ class processMap $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(DynaformPeer::DYN_TYPE, 'xmlform'); $oCriteria->add(DynaformPeer::DYN_UID, $aDynaformsUIDS, Criteria::NOT_IN); @@ -4261,13 +4130,7 @@ class processMap } $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_UID); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TITLE); $oCriteria->add(OutputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(OutputDocumentPeer::OUT_DOC_UID, $aOutputsUIDS, Criteria::NOT_IN); @@ -5037,15 +4900,13 @@ class processMap $usr_uid_evn = $oEvent->getEvnConditions(); if ($oData['EVN_ACTION'] != '' && $oData['EVN_ACTION'] != 'WEB_ENTRY') { - require_once 'classes/model/Content.php'; require_once 'classes/model/Task.php'; require_once 'classes/model/Dynaform.php'; - $oContent = new Content(); - $dynTitle = $oContent->load('DYN_TITLE', '', $oData['EVN_ACTION'], 'en'); $task_uid = $oEvent->getEvnTasUidTo(); $dyn = new Dynaform(); $dyn->load($oData['EVN_ACTION']); + $dynTitle = $dyn->getDynTitle(); $dynUid = $dyn->getDynUid(); @@ -5366,13 +5227,7 @@ class processMap $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(DynaformPeer::DYN_UID, $sUIDs, Criteria::NOT_IN); $oCriteria->add(DynaformPeer::DYN_TYPE, 'xmlform'); @@ -5409,13 +5264,7 @@ class processMap } $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_UID); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TITLE); $oCriteria->add(OutputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(OutputDocumentPeer::OUT_DOC_UID, $sUIDs, Criteria::NOT_IN); $oDataset = OutputDocumentPeer::doSelectRS($oCriteria); @@ -5666,16 +5515,9 @@ class processMap } $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); - //$oCriteria->addSelectColumn ( ContentPeer::CON_ID ); - $oCriteria->addSelectColumn('TRI_UID'); - $oCriteria->addSelectColumn('C.CON_VALUE'); - $oCriteria->addAsColumn('TRI_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array('TRI_UID', 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'TRI_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(TriggersPeer::TRI_UID); + $oCriteria->addSelectColumn(TriggersPeer::TRI_TITLE); + $oCriteria->addAsColumn('CON_VALUE', TriggersPeer::TRI_TITLE); $oCriteria->add(TriggersPeer::TRI_UID, $aUIDs, Criteria::NOT_IN); $oCriteria->add(TriggersPeer::PRO_UID, $sProcessUID); $oDataset = TriggersPeer::doSelectRS($oCriteria); @@ -5727,22 +5569,9 @@ class processMap $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - //$oCriteria->addSelectColumn ( DynaformPeer::PRO_UID ); $oCriteria->addSelectColumn(DynaformPeer::DYN_TYPE); - $oCriteria->addAsColumn('DYN_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('DYN_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C1.CON_ID'); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C2.CON_ID'); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'DYN_DESCRIPTION' . $sDelimiter); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); + $oCriteria->addSelectColumn(DynaformPeer::DYN_DESCRIPTION); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); //if we have pagination, we use it and limit the query @@ -5760,16 +5589,6 @@ class processMap $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 - $aRow['DYN_TITLE'] = Content::Load("DYN_TITLE", "", $aRow['DYN_UID'], SYS_LANG); - } - 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; } @@ -5942,20 +5761,8 @@ class processMap $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_UID); $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TYPE); $oCriteria->addSelectColumn(OutputDocumentPeer::PRO_UID); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C1.CON_ID' ); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter ); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'OUT_DOC_DESCRIPTION' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TITLE); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_DESCRIPTION); $oCriteria->add(OutputDocumentPeer::PRO_UID, $sProcessUID); $this->tmpCriteria = clone $oCriteria; @@ -5972,13 +5779,6 @@ class processMap $outputDocArray = array(); $outputDocArray[] = array('d' => 'char' ); while ($aRow = $oDataset->getRow()) { - // There is no transaltion for this Document name, try to get/regenerate the label - if (($aRow['OUT_DOC_TITLE'] == null) || ($aRow['OUT_DOC_TITLE'] == "")) { - $outputDocument = new OutputDocument(); - $outputDocumentObj = $outputDocument->load($aRow['OUT_DOC_UID']); - $aRow['OUT_DOC_TITLE'] = $outputDocumentObj['OUT_DOC_TITLE']; - $aRow['OUT_DOC_DESCRIPTION'] = $outputDocumentObj['OUT_DOC_DESCRIPTION']; - } $outputDocArray[] = $aRow; $oDataset->next(); } @@ -6239,17 +6039,8 @@ class processMap $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, DynaformPeer::DYN_UID); - $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(StepSupervisorPeer::STEP_UID_OBJ, DynaformPeer::DYN_UID, Criteria::LEFT_JOIN); $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION); @@ -6293,13 +6084,7 @@ class processMap $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); $oCriteria->addSelectColumn(DynaformPeer::PRO_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(DynaformPeer::DYN_TYPE, 'xmlform'); $oCriteria->add(DynaformPeer::DYN_UID, $aUIDS, Criteria::NOT_IN); @@ -6718,13 +6503,7 @@ class processMap $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(DynaformPeer::DYN_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(DynaformPeer::DYN_TITLE); $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(DynaformPeer::DYN_TYPE, 'xmlform'); $oCriteria->add(DynaformPeer::DYN_UID, $aDynaformsUIDS, Criteria::NOT_IN); @@ -6751,13 +6530,7 @@ class processMap } $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_UID); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(OutputDocumentPeer::OUT_DOC_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TITLE); $oCriteria->add(OutputDocumentPeer::PRO_UID, $sProcessUID); $oCriteria->add(OutputDocumentPeer::OUT_DOC_UID, $aOutputsUIDS, Criteria::NOT_IN); @@ -6802,14 +6575,7 @@ class processMap $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_UID); $oCriteria->addSelectColumn(ReportTablePeer::PRO_UID); - // $oCriteria->addAsColumn ( 'REP_TAB_TITLE', 'C.CON_VALUE' ); - $oCriteria->addAsColumn('REP_TAB_TITLE', "CASE WHEN C.CON_VALUE IS NULL THEN (SELECT DISTINCT MAX(A.CON_VALUE) FROM CONTENT A WHERE A.CON_ID = REPORT_TABLE.REP_TAB_UID ) ELSE C.CON_VALUE END "); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(ReportTablePeer::REP_TAB_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'REP_TAB_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(ReportTablePeer::REP_TAB_TITLE); $oCriteria->add(ReportTablePeer::PRO_UID, $sProcessUID); $this->tmpCriteria = clone $oCriteria; @@ -7177,29 +6943,14 @@ class processMap public function getExtTriggersList($start, $limit, $sProcessUID = '') { - $sDelimiter = DBAdapter::getStringDelimiter(); $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn(TriggersPeer::TRI_UID); + $oCriteria->addSelectColumn(TriggersPeer::TRI_TITLE); + $oCriteria->addSelectColumn(TriggersPeer::TRI_DESCRIPTION); $oCriteria->addSelectColumn(TriggersPeer::PRO_UID); $oCriteria->add(TriggersPeer::PRO_UID, $sProcessUID); $this->tmpCriteria = clone $oCriteria; - - $oCriteria->addAsColumn('TRI_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('TRI_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(TriggersPeer::TRI_UID, 'C1.CON_ID'); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'TRI_TITLE' . $sDelimiter); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(TriggersPeer::TRI_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'TRI_TITLE' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); - $oCriteria->add(TriggersPeer::PRO_UID, $sProcessUID); - $oCriteria->addAscendingOrderByColumn('TRI_TITLE'); + $oCriteria->addAscendingOrderByColumn(TriggersPeer::TRI_TITLE); if ($start != '') { $oCriteria->setOffset($start); diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index c70ce6b2e..d52232315 100644 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -5984,15 +5984,8 @@ class Processes $criteriaTrigger = new Criteria("workflow"); $criteriaTrigger->addSelectColumn(TriggersPeer::TRI_UID); - $criteriaTrigger->addAsColumn("TRI_TITLE", ContentPeer::CON_VALUE); + $criteriaTrigger->addSelectColumn(TriggersPeer::TRI_TITLE); $criteriaTrigger->addSelectColumn(TriggersPeer::TRI_WEBBOT); - - $arrayCondition = array(); - $arrayCondition[] = array(TriggersPeer::TRI_UID, ContentPeer::CON_ID, Criteria::EQUAL); - $arrayCondition[] = array(ContentPeer::CON_CATEGORY, $delimiter . "TRI_TITLE" . $delimiter, Criteria::EQUAL); - $arrayCondition[] = array(ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL); - $criteriaTrigger->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); - $criteriaTrigger->add(TriggersPeer::PRO_UID, $processUid, Criteria::EQUAL); $rsCriteriaTrigger = TriggersPeer::doSelectRS($criteriaTrigger); diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index e2ed0269a..679894b28 100644 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -630,24 +630,11 @@ class wsBase public function triggerList () { try { - $del = DBAdapter::getStringDelimiter(); - $result = array (); $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( TriggersPeer::TRI_UID ); $oCriteria->addSelectColumn( TriggersPeer::PRO_UID ); - $oCriteria->addAsColumn( 'TITLE', 'C1.CON_VALUE' ); - $oCriteria->addAlias( "C1", 'CONTENT' ); - - $caseTitleConds = array (); - $caseTitleConds[] = array (TriggersPeer::TRI_UID,'C1.CON_ID' - ); - $caseTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TRI_TITLE' . $del - ); - $caseTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $caseTitleConds, Criteria::LEFT_JOIN ); - //$oCriteria->add(TriggersPeer::USR_STATUS, 'ACTIVE'); + $oCriteria->addAsColumn( 'TITLE', TriggersPeer::TRI_TITLE ); $oDataset = TriggersPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->next(); diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 56d240a96..f3b8d137b 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -2626,27 +2626,27 @@ class workspaceTools } } return true; - break; + break; case 'check': - $criteria = new Criteria("workflow"); - $criteria->addSelectColumn(ConfigurationPeer::CFG_UID); - if($list==='all'){ - $criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST", CRITERIA::EQUAL); - } - if($list==='unassigned'){ - $criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST_UNASSIGNED", CRITERIA::EQUAL); - } - $rsCriteria = AppCacheViewPeer::doSelectRS($criteria); - $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $aRows = array (); - while ($rsCriteria->next()) { - $aRows[] = $rsCriteria->getRow(); - } - if(empty($aRows)){ - return false; //If is false continue with the migrated - } else { - return true; //Stop - } + $criteria = new Criteria("workflow"); + $criteria->addSelectColumn(ConfigurationPeer::CFG_UID); + if($list==='all'){ + $criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST", CRITERIA::EQUAL); + } + if($list==='unassigned'){ + $criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST_UNASSIGNED", CRITERIA::EQUAL); + } + $rsCriteria = AppCacheViewPeer::doSelectRS($criteria); + $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $aRows = array (); + while ($rsCriteria->next()) { + $aRows[] = $rsCriteria->getRow(); + } + if(empty($aRows)){ + return false; //If is false continue with the migrated + } else { + return true; //Stop + } break; default: return true; @@ -3016,7 +3016,7 @@ class workspaceTools $criteria->addJoinMC(array( array(AppCacheViewPeer::APP_UID, ListParticipatedHistoryPeer::APP_UID), array(AppCacheViewPeer::DEL_INDEX, ListParticipatedHistoryPeer::DEL_INDEX) - ), + ), Criteria::LEFT_JOIN ); @@ -3185,22 +3185,27 @@ class workspaceTools } - public function migrateContent($workspace, $lang = SYS_LANG) { + public function migrateContent($workspace, $lang = SYS_LANG) + { if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) { define('MEMCACHED_ENABLED', false); } $this->initPropel(true); $conf = new Configuration(); - if (!$conf->exists('MIGRATED_CONTENT', 'content')) { - $data["CFG_UID"] ='MIGRATED_CONTENT'; - $data["OBJ_UID"] ='content'; - $data["CFG_VALUE"]='true'; - $data["PRO_UID"] =''; - $data["USR_UID"] =''; - $data["APP_UID"] =''; - $this->migrateContentRun($workspace, $lang); - $conf->create($data); + $blackList = array(); + if($bExist = $conf->exists('MIGRATED_CONTENT', 'content')){ + $oConfig = $conf->load('MIGRATED_CONTENT', 'content'); + $blackList = $oConfig['CFG_VALUE'] == 'true' ? array('Groupwf', 'Process', 'Department', 'Task', 'InputDocument', 'Application') : unserialize($oConfig['CFG_VALUE']); } + + $blackList = $this->migrateContentRun($workspace, $lang, $blackList); + $data["CFG_UID"] = 'MIGRATED_CONTENT'; + $data["OBJ_UID"] = 'content'; + $data["CFG_VALUE"] = serialize($blackList); + $data["PRO_UID"] = ''; + $data["USR_UID"] = ''; + $data["APP_UID"] = ''; + $conf->create($data); } /** @@ -3219,6 +3224,7 @@ class workspaceTools $oCriteria = new Criteria(); $oCriteria->clearSelectColumns(); $oCriteria->addAsColumn($fieldUidName, ContentPeer::CON_ID); + $oCriteria->addSelectColumn(ContentPeer::CON_PARENT); $oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY); $oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->add(ContentPeer::CON_CATEGORY, $fields['fields'], Criteria::IN); @@ -3231,23 +3237,42 @@ class workspaceTools $fieldName = $row['CON_CATEGORY']; $fieldName = isset($fields['alias']) && isset($fields['alias'][$fieldName]) ? $fields['alias'][$fieldName] : $fieldName; unset($row['CON_CATEGORY']); - $fieldValue = $row['CON_VALUE']; + $row[$fieldName] = $row['CON_VALUE']; unset($row['CON_VALUE']); - $row[$fieldName] = $fieldValue; $oTable = new $className(); - $mExists = $methods['exists']; - if ($oTable->$mExists($row[$fieldUidName])){ - $oTable->update($row); + $that = array($oTable, $methods['exists']); + $params = array($row[$fieldUidName]); + if (isset($row['CON_PARENT']) && $row['CON_PARENT'] != ''){ + array_push($params, $row['CON_PARENT']); + $fieldName = isset($fields['alias']) && isset($fields['alias']['CON_PARENT']) ? $fields['alias']['CON_PARENT'] : 'CON_PARENT'; + $row[$fieldName] = $row['CON_PARENT']; + } + unset($row['CON_PARENT']); + if (call_user_func_array($that, $params)){ + if (isset($methods['update'])){ + $fn = $methods['update']; + $fn($row); + } else { + $oTable->update($row); + } } } - $classNamePeer = $className . 'Peer'; + $classNamePeer = class_exists($className . 'Peer') ? $className . 'Peer' : $fields['peer']; CLI::logging("|--> Add content data in table " . $classNamePeer::TABLE_NAME . "\n"); } catch (Exception $e) { throw ($e); } } - public function migrateContentRun($workspace, $lang = SYS_LANG) { + /** + * Migration + * + * @param $workspace + * @param mixed|string $lang + * @return array + */ + public function migrateContentRun($workspace, $lang = SYS_LANG, $blackList = array()) + { if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) { define('MEMCACHED_ENABLED', false); } @@ -3282,11 +3307,60 @@ class workspaceTools 'uid' => 'APP_UID', 'fields' => array('APP_TITLE', 'APP_DESCRIPTION'), 'methods' => array('exists' => 'exists') + ), + 'AppDocument' => array( + 'uid' => 'APP_DOC_UID', + 'alias' => array('CON_PARENT' => 'DOC_VERSION'), + 'fields' => array('APP_DOC_TITLE', 'APP_DOC_COMMENT', 'APP_DOC_FILENAME'), + 'methods' => array('exists' => 'exists') + ), + 'Dynaform' => array( + 'uid' => 'DYN_UID', + 'fields' => array('DYN_TITLE', 'DYN_DESCRIPTION'), + 'methods' => array('exists' => 'exists') + ), + 'OutputDocument' => array( + 'uid' => 'OUT_DOC_UID', + 'fields' => array('OUT_DOC_TITLE', 'OUT_DOC_DESCRIPTION', 'OUT_DOC_FILENAME', 'OUT_DOC_TEMPLATE'), + 'methods' => array('exists' => 'OutputExists') + ), + 'ReportTable' => array( + 'uid' => 'REP_TAB_UID', + 'fields' => array('REP_TAB_TITLE'), + 'methods' => array('exists' => 'reportTableExists', 'update' => function ($row) { + $oRepTab = \ReportTablePeer::retrieveByPK($row['REP_TAB_UID']); + $oRepTab->fromArray($row, BasePeer::TYPE_FIELDNAME); + if ($oRepTab->validate()) { + $result = $oRepTab->save(); + } + }) + ), + 'Triggers' => array( + 'uid' => 'TRI_UID', + 'fields' => array('TRI_TITLE', 'TRI_DESCRIPTION'), + 'methods' => array('exists' => 'TriggerExists') + ), + '\ProcessMaker\BusinessModel\WebEntryEvent' => array( + 'uid' => 'WEE_UID', + 'fields' => array('WEE_TITLE', 'WEE_DESCRIPTION'), + 'methods' => array('exists' => 'exists', 'update' => function ($row) { + $webEntry = \WebEntryEventPeer::retrieveByPK($row['WEE_UID']); + $webEntry->fromArray($row, BasePeer::TYPE_FIELDNAME); + if ($webEntry->validate()) { + $result = $webEntry->save(); + } + }), + 'peer' => 'WebEntryEventPeer' ) ); + foreach ($content as $className => $fields) { - $this->migrateContentWorkspace($className, $fields, $lang); + if (!in_array($className, $blackList)) { + $this->migrateContentWorkspace($className, $fields, $lang); + $blackList[] = $className; + } } + return $blackList; } public function cleanTokens($workspace, $lang = SYS_LANG) diff --git a/workflow/engine/classes/class.xmlfield_InputPM.php b/workflow/engine/classes/class.xmlfield_InputPM.php index 1a35e5e25..a0c79db58 100644 --- a/workflow/engine/classes/class.xmlfield_InputPM.php +++ b/workflow/engine/classes/class.xmlfield_InputPM.php @@ -407,7 +407,7 @@ function getDynaformsVars ($sProcessUID, $typeVars = 'all', $bIncMulSelFields = $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME); $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE); $oCriteria->add(ProcessVariablesPeer::PRJ_UID, $sProcessUID); - $oDataset = DynaformPeer::doSelectRS($oCriteria); + $oDataset = ProcessVariablesPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); while ($oDataset->next()) { $row = $oDataset->getRow(); diff --git a/workflow/engine/classes/model/AppDocument.php b/workflow/engine/classes/model/AppDocument.php index 1fc120fe7..67f3d637a 100644 --- a/workflow/engine/classes/model/AppDocument.php +++ b/workflow/engine/classes/model/AppDocument.php @@ -43,27 +43,6 @@ class AppDocument extends BaseAppDocument { - /** - * This value goes in the content table - * - * @var string - */ - protected $app_doc_title = ''; - - /** - * This value goes in the content table - * - * @var string - */ - protected $app_doc_comment = ''; - - /** - * This value goes in the content table - * - * @var string - */ - protected $app_doc_filename = ''; - /*----------------------------------********---------------------------------*/ protected $driveDownload = array(); protected $syncWithDrive = ''; @@ -85,12 +64,6 @@ class AppDocument extends BaseAppDocument $oAppDocument = AppDocumentPeer::retrieveByPK( $sAppDocUid, $iVersion ); if (! is_null( $oAppDocument )) { $aFields = $oAppDocument->toArray( BasePeer::TYPE_FIELDNAME ); - //optimized for speed - $aContentFields = $oAppDocument->getContentFields(); - $aFields['APP_DOC_TITLE'] = $aContentFields['APP_DOC_TITLE']; - $aFields['APP_DOC_COMMENT'] = $aContentFields['APP_DOC_COMMENT']; - $aFields['APP_DOC_FILENAME'] = $aContentFields['APP_DOC_FILENAME']; - $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); /*----------------------------------********---------------------------------*/ $driveDownload = @unserialize($aFields['APP_DOC_DRIVE_DOWNLOAD']); @@ -232,13 +205,13 @@ class AppDocument extends BaseAppDocument if ($oAppDocument->validate()) { $oConnection->begin(); if (isset( $aData['APP_DOC_TITLE'] )) { - $oAppDocument->setAppDocTitle( $aData['APP_DOC_TITLE'] ); + $oAppDocument->setAppDocTitleContent( $aData['APP_DOC_TITLE'] ); } if (isset( $aData['APP_DOC_COMMENT'] )) { - $oAppDocument->setAppDocComment( $aData['APP_DOC_COMMENT'] ); + $oAppDocument->setAppDocCommentContent( $aData['APP_DOC_COMMENT'] ); } if (isset( $aData['APP_DOC_FILENAME'] )) { - $oAppDocument->setAppDocFilename( $aData['APP_DOC_FILENAME'] ); + $oAppDocument->setAppDocFilenameContent( $aData['APP_DOC_FILENAME'] ); } $iResult = $oAppDocument->save(); $oConnection->commit(); @@ -288,13 +261,13 @@ class AppDocument extends BaseAppDocument if ($oAppDocument->validate()) { $oConnection->begin(); if (isset( $aData['APP_DOC_TITLE'] )) { - $oAppDocument->setAppDocTitle( $aData['APP_DOC_TITLE'] ); + $oAppDocument->setAppDocTitleContent( $aData['APP_DOC_TITLE'] ); } if (isset( $aData['APP_DOC_COMMENT'] )) { - $oAppDocument->setAppDocComment( $aData['APP_DOC_COMMENT'] ); + $oAppDocument->setAppDocCommentContent( $aData['APP_DOC_COMMENT'] ); } if (isset( $aData['APP_DOC_FILENAME'] )) { - $oAppDocument->setAppDocFilename( $aData['APP_DOC_FILENAME'] ); + $oAppDocument->setAppDocFilenameContent( $aData['APP_DOC_FILENAME'] ); } $iResult = $oAppDocument->save(); $oConnection->commit(); @@ -370,7 +343,7 @@ class AppDocument extends BaseAppDocument * * @return string */ - public function getAppDocTitle () + public function getAppDocTitleContent () { if ($this->app_doc_title == '') { try { @@ -391,7 +364,7 @@ class AppDocument extends BaseAppDocument * @param string $sValue new value * @return void */ - public function setAppDocTitle ($sValue) + public function setAppDocTitleContent ($sValue) { if ($sValue !== null && ! is_string( $sValue )) { $sValue = (string) $sValue; @@ -412,7 +385,7 @@ class AppDocument extends BaseAppDocument * * @return string */ - public function getAppDocComment () + public function getAppDocCommentContent () { if ($this->app_doc_comment == '') { try { @@ -433,7 +406,7 @@ class AppDocument extends BaseAppDocument * @param string $sValue new value * @return void */ - public function setAppDocComment ($sValue) + public function setAppDocCommentContent ($sValue) { if ($sValue !== null && ! is_string( $sValue )) { $sValue = (string) $sValue; @@ -454,7 +427,7 @@ class AppDocument extends BaseAppDocument * * @return string */ - public function getAppDocFilename () + public function getAppDocFilenameContent () { if ($this->app_doc_filename == '') { try { @@ -475,7 +448,7 @@ class AppDocument extends BaseAppDocument * @param string $sValue new value * @return void */ - public function setAppDocFilename ($sValue) + public function setAppDocFilenameContent ($sValue) { if ($sValue !== null && ! is_string( $sValue )) { $sValue = (string) $sValue; @@ -516,136 +489,8 @@ class AppDocument extends BaseAppDocument } return $url; } - /*public function setSyncWithDrive ($key) - { - $data = array('SYNCHRONIZED', 'UNSYNCHRONIZED', 'NO_EXIST_FILE_PM'); - if (array_search($key, $data) === false) { - $key = 'UNSYNCHRONIZED'; - } - $this->syncWithDrive = $key; - }*/ - - /*public function getSyncWithDrive () - { - return $this->syncWithDrive; - }*/ - - /*public function setSyncPermissions ($email) - { - $this->syncPermissions = empty($this->syncPermissions) ? $email : ','.$email; - } - - public function getSyncPermissions () - { - return !empty($this->syncPermissions) ? explode(',', $this->syncPermissions) : ''; - }*/ - /*----------------------------------********---------------------------------*/ - public function updateInsertContent ($content, $field, $value) - { - if (isset( $content[$field]['en'] )) { - //update - $con = ContentPeer::retrieveByPK( $field, $this->getDocVersion(), $this->getAppDocUid(), 'en' ); - $con->setConValue( $value ); - if ($con->validate()) { - $res = $con->save(); - } - } else { - //insert - $con = new Content(); - $con->setConCategory( $field ); - $con->setConParent( $this->getDocVersion() ); - $con->setConId( $this->getAppDocUid() ); - $con->setConLang( 'en' ); - $con->setConValue( $value ); - if ($con->validate()) { - $res = $con->save(); - } - } - } - - public function normalizeContent ($content, $field, $lang) - { - $value = ''; - //if the lang row is not empty, update in 'en' row and continue - if (! $this->isEmptyInContent( $content, $field, $lang )) { - //update/insert only if this lang is != 'en', with this always we will have an en row with last value - $value = $content[$field][$lang]; - if ($lang != 'en') { - $this->updateInsertContent( $content, $field, $value ); - } - } else { - //if the lang row is empty, and 'en' row is not empty return 'en' value - if (! $this->isEmptyInContent( $content, $field, 'en' )) { - $value = $content[$field]['en']; - } - - //if the lang row is empty, and 'en' row is empty get value for 'other' row and update in 'en' row and continue - if ($this->isEmptyInContent( $content, $field, 'en' )) { - if (isset( $content[$field] ) && is_array( $content[$field] )) { - foreach ($content[$field] as $lan => $val) { - if (trim( $val ) != '') { - $value = $val; - if ($lan != 'en') { - $this->updateInsertContent( $content, $field, $value ); - continue; - } - } - } - } else { - $this->updateInsertContent( $content, $field, '' ); - } - } - } - return $value; - } - - /** - * Get the [app_description] , [app_title] column values. - * - * @return array of string - */ - public function getContentFields () - { - if ($this->getAppDocUid() == '') { - throw (new Exception( "Error in getContentFields, the APP_DOC_UID can't be blank" )); - } - $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; - $c = new Criteria(); - $c->clearSelectColumns(); - $c->addSelectColumn( ContentPeer::CON_CATEGORY ); - $c->addSelectColumn( ContentPeer::CON_PARENT ); - $c->addSelectColumn( ContentPeer::CON_LANG ); - $c->addSelectColumn( ContentPeer::CON_VALUE ); - $c->add( ContentPeer::CON_ID, $this->getAppDocUid() ); - $c->add( ContentPeer::CON_PARENT, $this->getDocVersion() ); - $c->addAscendingOrderByColumn( 'CON_CATEGORY' ); - $c->addAscendingOrderByColumn( 'CON_LANG' ); - $rs = ContentPeer::doSelectRS( $c ); - $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $rs->next(); - $content = array (); - while ($row = $rs->getRow()) { - $conCategory = $row['CON_CATEGORY']; - $conLang = $row['CON_LANG']; - if (! isset( $content[$conCategory] )) { - $content[$conCategory] = array (); - } - if (! isset( $content[$conCategory][$conLang] )) { - $content[$conCategory][$conLang] = array (); - } - $content[$conCategory][$conLang] = $row['CON_VALUE']; - $rs->next(); - $row = $rs->getRow(); - } - - $res['APP_DOC_TITLE'] = $this->normalizeContent( $content, 'APP_DOC_TITLE', $lang ); - $res['APP_DOC_COMMENT'] = $this->normalizeContent( $content, 'APP_DOC_COMMENT', $lang ); - $res['APP_DOC_FILENAME'] = $this->normalizeContent( $content, 'APP_DOC_FILENAME', $lang ); - return $res; - } - public function getObject ($APP_UID, $DEL_INDEX, $STEP_UID_OBJ, $APP_DOC_TYPE) { $oCriteria = new Criteria( 'workflow' ); @@ -684,5 +529,11 @@ class AppDocument extends BaseAppDocument return $documents; } + + public function exists ($sAppDocUid, $iVersion) + { + $oAppDocument = AppDocumentPeer::retrieveByPK( $sAppDocUid, $iVersion ); + return (is_object( $oAppDocument ) && get_class( $oAppDocument ) == 'AppDocument'); + } } diff --git a/workflow/engine/classes/model/AppFolder.php b/workflow/engine/classes/model/AppFolder.php index dc6554b5a..971997ef5 100644 --- a/workflow/engine/classes/model/AppFolder.php +++ b/workflow/engine/classes/model/AppFolder.php @@ -362,18 +362,14 @@ class AppFolder extends BaseAppFolder $oCriteria->add( AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE' ); } - $oCriteria->addSelectColumn( ContentPeer::CON_VALUE . ' AS NAME'); - $oCriteria->add( ContentPeer::CON_CATEGORY, "APP_DOC_FILENAME"); - $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG); - $oCriteria->addJoin( AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); - + $oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_FILENAME . ' AS NAME'); $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME); $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME); $oCriteria->addJoin( AppDocumentPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN ); if ($search) { $oCriteria->add( - $oCriteria->getNewCriterion( ContentPeer::CON_VALUE, '%' . $search . '%', Criteria::LIKE )-> + $oCriteria->getNewCriterion( AppDocumentPeer::APP_DOC_FILENAME, '%' . $search . '%', Criteria::LIKE )-> addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $search . '%', Criteria::LIKE )-> addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $search . '%', Criteria::LIKE ))) ); @@ -517,11 +513,7 @@ class AppFolder extends BaseAppFolder $oCriteria->add( AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE' ); } - $oCriteria->addSelectColumn( ContentPeer::CON_VALUE . ' AS NAME'); - $oCriteria->add( ContentPeer::CON_CATEGORY, "APP_DOC_FILENAME"); - $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG); - $oCriteria->addJoin( AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); - + $oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_FILENAME . ' AS NAME'); $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME); $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME); $oCriteria->addJoin( AppDocumentPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN ); diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php index bd147e1dd..13a159058 100644 --- a/workflow/engine/classes/model/Dynaform.php +++ b/workflow/engine/classes/model/Dynaform.php @@ -55,7 +55,7 @@ class Dynaform extends BaseDynaform * * @return string */ - public function getDynTitle () + public function getDynTitleContent () { if ($this->getDynUid() == '') { throw (new Exception( "Error in getDynTitle, the DYN_UID can't be blank" )); @@ -71,7 +71,7 @@ class Dynaform extends BaseDynaform * @param string $v new value * @return void */ - public function setDynTitle ($v) + public function setDynTitleContent ($v) { if ($this->getDynUid() == '') { throw (new Exception( "Error in setDynTitle, the DYN_UID can't be blank" )); @@ -104,7 +104,7 @@ class Dynaform extends BaseDynaform * * @return string */ - public function getDynDescription () + public function getDynDescriptionContent () { if ($this->getDynUid() == '') { throw (new Exception( "Error in getDynDescription, the DYN_UID can't be blank" )); @@ -120,7 +120,7 @@ class Dynaform extends BaseDynaform * @param string $v new value * @return void */ - public function setDynDescription ($v) + public function setDynDescriptionContent ($v) { if ($this->getDynUid() == '') { throw (new Exception( "Error in setDynDescription, the DYN_UID can't be blank" )); @@ -166,6 +166,10 @@ class Dynaform extends BaseDynaform $dynUid = $aData['DYN_UID']; } $this->setDynUid( $dynUid ); + $dynTitle = isset($aData['DYN_TITLE']) ? $aData['DYN_TITLE'] : 'Default Dynaform Title'; + $this->setDynTitle($dynTitle); + $dynDescription = isset($aData['DYN_DESCRIPTION']) ? $aData['DYN_DESCRIPTION'] : 'Default Dynaform Description'; + $this->setDynDescription($dynDescription); $this->setProUid( $aData['PRO_UID'] ); $this->setDynType( isset( $aData['DYN_TYPE'] ) ? $aData['DYN_TYPE'] : 'xmlform' ); $this->setDynFilename( $aData['PRO_UID'] . PATH_SEP . $dynUid ); @@ -206,19 +210,8 @@ class Dynaform extends BaseDynaform if ($this->validate()) { $con->begin(); $res = $this->save(); - - if (isset( $aData['DYN_TITLE'] )) { - $this->setDynTitle( $aData['DYN_TITLE'] ); - } else { - $this->setDynTitle( 'Default Dynaform Title' ); - } - - if (isset( $aData['DYN_DESCRIPTION'] )) { - $this->setDynDescription( $aData['DYN_DESCRIPTION'] ); - } else { - $this->setDynDescription( 'Default Dynaform Description' ); - } - + $this->setDynTitleContent( $dynTitle ); + $this->setDynDescriptionContent( $dynDescription ); $con->commit(); //Add Audit Log @@ -271,9 +264,6 @@ class Dynaform extends BaseDynaform { $this->create( $aData , $pmTableUid); $aData['DYN_UID'] = $this->getDynUid(); - //krumo(BasePeer::getFieldnames('Content')); - $fields = array (); - //$oCriteria = new Criteria('workflow'); $pmTable = AdditionalTablesPeer::retrieveByPK( $pmTableUid ); $addTabName = $pmTable->getAddTabName(); $keys = ''; @@ -289,19 +279,6 @@ class Dynaform extends BaseDynaform $keys = ' '; } - // $addTabKeys = $pmTable->getAddTabDynavars(); - // $addTabKeys = unserialize($addTabKeys); - // $keys = ''; - // foreach ( $addTabKeys as $addTabKey ){ - // if (trim($addTabKey['CASE_VARIABLE'])!=''&&$keys!=''){ - // $keys = $keys.'|'.$addTabKey['CASE_VARIABLE']; - // } else { - // $keys = $addTabKey['CASE_VARIABLE']; - // } - // - // } - - // Determines the engine to use // For a description of a table $sDataBase = 'database_' . strtolower( DB_ADAPTER ); @@ -319,7 +296,6 @@ class Dynaform extends BaseDynaform $file = $aData['PRO_UID'] . '/' . $aData['DYN_UID']; $dbc = new DBConnection( PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml' ); - $ses = new DBSession( $dbc ); $fieldXML = new DynaFormField( $dbc ); $pmConnectionName = $addTabName . '_CONNECTION'; @@ -348,7 +324,6 @@ class Dynaform extends BaseDynaform $res = $sth->executeQuery( $sql, ResultSet::FETCHMODE_ASSOC ); while ($res->next()) { - // if(strtoupper($res->get('Null'))=='NO') { if (strtoupper( $res->get( $oDataBase->getFieldNull() ) ) == 'NO') { if ($countKeys == 1 && $res->get( 'Field' ) == $keyRequered) { $required = '0'; @@ -559,10 +534,6 @@ class Dynaform extends BaseDynaform if (is_object( $oPro ) && get_class( $oPro ) == 'Dynaform') { $aFields = $oPro->toArray( BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); - $aFields['DYN_TITLE'] = $oPro->getDynTitle(); - $aFields['DYN_DESCRIPTION'] = $oPro->getDynDescription(); - $this->setDynTitle( $oPro->getDynTitle() ); - $this->setDynDescription( $oPro->getDynDescription() ); return $aFields; } else { throw (new Exception( "The row '$ProUid' in table Dynaform doesn't exist!" )); @@ -591,10 +562,10 @@ class Dynaform extends BaseDynaform $oPro->setDynUpdateDate(date("Y-m-d H:i:s")); if ($oPro->validate()) { if (isset( $aData['DYN_TITLE'] )) { - $oPro->setDynTitle( $aData['DYN_TITLE'] ); + $oPro->setDynTitleContent( $aData['DYN_TITLE'] ); } if (isset( $aData['DYN_DESCRIPTION'] )) { - $oPro->setDynDescription( $aData['DYN_DESCRIPTION'] ); + $oPro->setDynDescriptionContent( $aData['DYN_DESCRIPTION'] ); } $res = $oPro->save(); $con->commit(); @@ -715,37 +686,22 @@ class Dynaform extends BaseDynaform return $G_FORM->fields; } - public function verifyExistingName ($sName, $sProUid, $sDynUid) + public function verifyExistingName ($sName, $sProUid, $sDynUid = null) { $sNameDyanform = urldecode( $sName ); $sProUid = urldecode( $sProUid ); $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( DynaformPeer::DYN_UID ); $oCriteria->add( DynaformPeer::PRO_UID, $sProUid ); - $oCriteria->add( DynaformPeer::DYN_UID, $sDynUid ); + if (!is_null($sDynUid)) { + $oCriteria->add(DynaformPeer::DYN_UID, $sDynUid); + } + $oCriteria->add( DynaformPeer::DYN_TITLE, $sNameDyanform ); $oDataset = DynaformPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $flag = true; - while ($oDataset->next() && $flag) { - $aRow = $oDataset->getRow(); - $oCriteria1 = new Criteria( 'workflow' ); - $oCriteria1->addSelectColumn( 'COUNT(*) AS DYNAFORMS' ); - $oCriteria1->add( ContentPeer::CON_CATEGORY, 'DYN_TITLE' ); - $oCriteria1->add( ContentPeer::CON_ID, $sDynUid, Criteria::NOT_EQUAL); - $oCriteria1->add( ContentPeer::CON_VALUE, $sNameDyanform ); - $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG ); - $oCriteria1->add( DynaformPeer::PRO_UID, $sProUid); - $oCriteria1->addJoin( ContentPeer::CON_ID, DynaformPeer::DYN_UID, Criteria::INNER_JOIN ); - $oDataset1 = ContentPeer::doSelectRS( $oCriteria1 ); - $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDataset1->next(); - $aRow1 = $oDataset1->getRow(); - if ($aRow1['DYNAFORMS'] == 1) { - $flag = false; - break; - } - } - return $flag; + $oDataset->next(); + $aRow = $oDataset->getRow(); + return (!$aRow) ? true : false; } /** diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php index 9e7bb5123..bc6bec477 100644 --- a/workflow/engine/classes/model/OutputDocument.php +++ b/workflow/engine/classes/model/OutputDocument.php @@ -41,30 +41,6 @@ class OutputDocument extends BaseOutputDocument { - /** - * This value goes in the content table - * @var string - */ - protected $out_doc_title = ''; - - /** - * This value goes in the content table - * @var string - */ - protected $out_doc_description = ''; - - /** - * This value goes in the content table - * @var string - */ - protected $out_doc_filename = ''; - - /** - * This value goes in the content table - * @var string - */ - protected $out_doc_template = ''; - public function __construct() { $javaInput = PATH_C . 'javaBridgePM' . PATH_SEP . 'input' . PATH_SEP; @@ -84,10 +60,6 @@ class OutputDocument extends BaseOutputDocument } $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME); - $aFields['OUT_DOC_TITLE'] = $oOutputDocument->getOutDocTitle(); - $aFields['OUT_DOC_DESCRIPTION'] = $oOutputDocument->getOutDocDescription(); - $aFields['OUT_DOC_FILENAME'] = $oOutputDocument->getOutDocFilename(); - $aFields['OUT_DOC_TEMPLATE'] = $oOutputDocument->getOutDocTemplate(); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME); return $aFields; @@ -109,11 +81,6 @@ class OutputDocument extends BaseOutputDocument if (!is_null($oOutputDocument)) { $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME); - $aFields['OUT_DOC_TITLE'] = $oOutputDocument->getOutDocTitle(); - $aFields['PRO_UID'] = $oOutputDocument->getProUid(); - $aFields['OUT_DOC_DESCRIPTION'] = $oOutputDocument->getOutDocDescription(); - $aFields['OUT_DOC_FILENAME'] = $oOutputDocument->getOutDocFilename(); - $aFields['OUT_DOC_TEMPLATE'] = $oOutputDocument->getOutDocTemplate(); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME); return $aFields; @@ -158,17 +125,17 @@ class OutputDocument extends BaseOutputDocument $oConnection->begin(); if (isset($aData['OUT_DOC_TITLE'])) { - $oOutputDocument->setOutDocTitle($aData['OUT_DOC_TITLE']); + $oOutputDocument->setOutDocTitleContent($aData['OUT_DOC_TITLE']); } if (isset($aData['OUT_DOC_DESCRIPTION'])) { - $oOutputDocument->setOutDocDescription($aData['OUT_DOC_DESCRIPTION']); + $oOutputDocument->setOutDocDescriptionContent($aData['OUT_DOC_DESCRIPTION']); } - $oOutputDocument->setOutDocFilename($aData['OUT_DOC_FILENAME']); + $oOutputDocument->setOutDocFilenameContent($aData['OUT_DOC_FILENAME']); if (isset($aData['OUT_DOC_TEMPLATE'])) { - $oOutputDocument->setOutDocTemplate($aData['OUT_DOC_TEMPLATE']); + $oOutputDocument->setOutDocTemplateContent($aData['OUT_DOC_TEMPLATE']); } $iResult = $oOutputDocument->save(); @@ -246,19 +213,19 @@ class OutputDocument extends BaseOutputDocument $oConnection->begin(); if (isset($aData['OUT_DOC_TITLE'])) { - $oOutputDocument->setOutDocTitle($aData['OUT_DOC_TITLE']); + $oOutputDocument->setOutDocTitleContent($aData['OUT_DOC_TITLE']); } if (isset($aData['OUT_DOC_DESCRIPTION'])) { - $oOutputDocument->setOutDocDescription($aData['OUT_DOC_DESCRIPTION']); + $oOutputDocument->setOutDocDescriptionContent($aData['OUT_DOC_DESCRIPTION']); } if (isset($aData['OUT_DOC_FILENAME'])) { - $oOutputDocument->setOutDocFilename($aData['OUT_DOC_FILENAME']); + $oOutputDocument->setOutDocFilenameContent($aData['OUT_DOC_FILENAME']); } if (isset($aData['OUT_DOC_TEMPLATE'])) { - $oOutputDocument->setOutDocTemplate($aData['OUT_DOC_TEMPLATE']); + $oOutputDocument->setOutDocTemplateContent($aData['OUT_DOC_TEMPLATE']); } $iResult = $oOutputDocument->save(); @@ -371,7 +338,7 @@ class OutputDocument extends BaseOutputDocument * Get the [out_doc_title] column value. * @return string */ - public function getOutDocTitle() + public function getOutDocTitleContent() { if ($this->out_doc_title == '') { try { @@ -392,7 +359,7 @@ class OutputDocument extends BaseOutputDocument * @param string $sValue new value * @return void */ - public function setOutDocTitle($sValue) + public function setOutDocTitleContent($sValue) { if ($sValue !== null && !is_string($sValue)) { $sValue = (string) $sValue; @@ -417,7 +384,7 @@ class OutputDocument extends BaseOutputDocument * Get the [out_doc_comment] column value. * @return string */ - public function getOutDocDescription() + public function getOutDocDescriptionContent() { if ($this->out_doc_description == '') { try { @@ -438,7 +405,7 @@ class OutputDocument extends BaseOutputDocument * @param string $sValue new value * @return void */ - public function setOutDocDescription($sValue) + public function setOutDocDescriptionContent($sValue) { if ($sValue !== null && !is_string($sValue)) { $sValue = (string) $sValue; @@ -463,7 +430,7 @@ class OutputDocument extends BaseOutputDocument * Get the [out_doc_filename] column value. * @return string */ - public function getOutDocFilename() + public function getOutDocFilenameContent() { if ($this->out_doc_filename == '') { try { @@ -484,7 +451,7 @@ class OutputDocument extends BaseOutputDocument * @param string $sValue new value * @return void */ - public function setOutDocFilename($sValue) + public function setOutDocFilenameContent($sValue) { if ($sValue !== null && !is_string($sValue)) { $sValue = (string) $sValue; @@ -509,7 +476,7 @@ class OutputDocument extends BaseOutputDocument * Get the [out_doc_template] column value. * @return string */ - public function getOutDocTemplate() + public function getOutDocTemplateContent() { if ($this->out_doc_template == '') { try { @@ -530,7 +497,7 @@ class OutputDocument extends BaseOutputDocument * @param string $sValue new value * @return void */ - public function setOutDocTemplate($sValue) + public function setOutDocTemplateContent($sValue) { if ($sValue !== null && !is_string($sValue)) { $sValue = (string) $sValue; diff --git a/workflow/engine/classes/model/ReportTable.php b/workflow/engine/classes/model/ReportTable.php index f25660949..86c6ffcff 100644 --- a/workflow/engine/classes/model/ReportTable.php +++ b/workflow/engine/classes/model/ReportTable.php @@ -43,19 +43,12 @@ if (!class_exists('BaseReportTable')) { */ class ReportTable extends BaseReportTable { - /** - * This value goes in the content table - * - * @var string - */ - protected $rep_tab_title = ''; - /** * Get the rep_tab_title column value. * * @return string */ - public function getRepTabTitle () + public function getRepTabTitleContent () { if ($this->getRepTabUid() == "") { throw (new Exception( "Error in getRepTabTitle, the getRepTabUid() can't be blank" )); @@ -71,7 +64,7 @@ class ReportTable extends BaseReportTable * @param string $v new value * @return void */ - public function setRepTabTitle ($v) + public function setRepTabTitleContent ($v) { if ($this->getRepTabUid() == "") { throw (new Exception( "Error in setRepTabTitle, the setRepTabUid() can't be blank" )); @@ -94,7 +87,6 @@ class ReportTable extends BaseReportTable $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); $this->setNew( false ); - $this->setRepTabTitle( $aFields['REP_TAB_TITLE'] = $this->getRepTabTitle() ); return $aFields; } else { //throw( new Exception( "The row '$RepTabUid' in table ReportTable doesn't exist!" )); @@ -134,13 +126,10 @@ class ReportTable extends BaseReportTable } $this->setRepTabCreateDate( date( 'Y-m-d H:i:s' ) ); $this->setRepTabStatus( 'ACTIVE' ); - + $repTabTitle = !isset($aData['REP_TAB_TITLE']) ? '' : $aData['REP_TAB_TITLE']; + $this->setRepTabTitle($repTabTitle); if ($this->validate()) { - if (! isset( $aData['REP_TAB_TITLE'] )) { - $this->setRepTabTitle( "" ); - } else { - $this->setRepTabTitle( $aData['REP_TAB_TITLE'] ); - } + $this->setRepTabTitleContent($repTabTitle); $result = $this->save(); $con->commit(); return $result; @@ -174,7 +163,7 @@ class ReportTable extends BaseReportTable if ($oValidate) { $contentResult = 0; if (array_key_exists( "REP_TAB_TITLE", $fields )) { - $contentResult += $this->setRepTabTitle( $fields["REP_TAB_TITLE"] ); + $contentResult += $this->setRepTabTitleContent( $fields["REP_TAB_TITLE"] ); } $result = $this->save(); $result = ($result == 0) ? ($contentResult > 0 ? 1 : 0) : $result; diff --git a/workflow/engine/classes/model/Triggers.php b/workflow/engine/classes/model/Triggers.php index bf1f9ff52..5dae524bf 100644 --- a/workflow/engine/classes/model/Triggers.php +++ b/workflow/engine/classes/model/Triggers.php @@ -41,17 +41,12 @@ */ class Triggers extends BaseTriggers { - /** - * This value goes in the content table - * @var string - */ - protected $tri_title = ''; /** * Get the tri_title column value. * @return string */ - public function getTriTitle() + public function getTriTitleContent() { if ($this->getTriUid() == "") { throw ( new Exception( "Error in getTriTitle, the getTriUid() can't be blank") ); @@ -67,7 +62,7 @@ class Triggers extends BaseTriggers * @param string $v new value * @return void */ - public function setTriTitle($v) + public function setTriTitleContent($v) { if ($this->getTriUid() == "") { throw ( new Exception( "Error in setTriTitle, the getTriUid() can't be blank") ); @@ -82,17 +77,12 @@ class Triggers extends BaseTriggers return 0; } - /** - * This value goes in the content table - * @var string - */ - protected $tri_description = ''; /** * Get the tri_description column value. * @return string */ - public function getTriDescription() + public function getTriDescriptionContent() { if ($this->getTriUid() == "") { throw ( new Exception( "Error in getTriDescription, the getTriUid() can't be blank") ); @@ -108,7 +98,7 @@ class Triggers extends BaseTriggers * @param string $v new value * @return void */ - public function setTriDescription($v) + public function setTriDescriptionContent($v) { if ($this->getTriUid() == "") { throw ( new Exception( "Error in setTriDescription, the getTriUid() can't be blank") ); @@ -130,9 +120,6 @@ class Triggers extends BaseTriggers if (!is_null($oRow)) { $aFields = $oRow->toArray(BasePeer::TYPE_FIELDNAME); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME); - $this->setNew(false); - $this->setTriTitle($aFields['TRI_TITLE']=$this->getTriTitle()); - $this->setTriDescription($aFields['TRI_DESCRIPTION']=$this->getTriDescription()); return $aFields; } else { throw( new Exception( "The row '$TriUid' in table TRIGGERS doesn't exist!" )); @@ -157,6 +144,10 @@ class Triggers extends BaseTriggers } $triggerUid = $this->getTriUid(); $this->setProUid($aData['PRO_UID']); + $triTitle = isset($aData['TRI_TITLE']) ? $aData['TRI_TITLE'] : ''; + $this->setTriTitle($triTitle); + $triDescription = isset($aData['TRI_DESCRIPTION']) ? $aData['TRI_DESCRIPTION'] : ''; + $this->setTriDescription($triDescription); $this->setTriType("SCRIPT"); if (!isset ( $aData['TRI_WEBBOT'] )) { @@ -166,22 +157,14 @@ class Triggers extends BaseTriggers } if ($this->validate()) { - if (!isset ( $aData['TRI_TITLE'] )) { - $this->setTriTitle(""); - } else { - $this->setTriTitle( $aData['TRI_TITLE'] ); - } - if (!isset ( $aData['TRI_DESCRIPTION'] )) { - $this->setTriDescription(""); - } else { - $this->setTriDescription( $aData['TRI_DESCRIPTION'] ); - } if (!isset ( $aData['TRI_PARAM'] )) { $this->setTriParam(""); } else { $this->setTriParam( $aData['TRI_PARAM'] ); } $result=$this->save(); + $this->setTriTitleContent($triTitle); + $this->setTriDescriptionContent($triDescription); $con->commit(); //Add Audit Log $description = "Trigger Name: ".$aData['TRI_TITLE'].", Trigger Uid: ".$triggerUid; @@ -211,12 +194,13 @@ class Triggers extends BaseTriggers if ($this->validate()) { $contentResult=0; if (array_key_exists("TRI_TITLE", $fields)) { - $contentResult+=$this->setTriTitle($fields["TRI_TITLE"]); + $contentResult += $this->setTriTitleContent($fields["TRI_TITLE"]); } if (array_key_exists("TRI_DESCRIPTION", $fields)) { - $contentResult+=$this->setTriDescription($fields["TRI_DESCRIPTION"]); + $contentResult += $this->setTriDescriptionContent($fields["TRI_DESCRIPTION"]); } - $result=$this->save(); + $this->setNew(false); + $result = $this->save(); $result=($result==0)?($contentResult>0?1:0):$result; $con->commit(); return $result; @@ -364,10 +348,10 @@ class Triggers extends BaseTriggers $oResult->code = 1; } } - + /** * Process elements: - * + * * PRO_TRI_DELETED * PRO_TRI_CANCELED * PRO_TRI_PAUSED diff --git a/workflow/engine/classes/model/map/AppDocumentMapBuilder.php b/workflow/engine/classes/model/map/AppDocumentMapBuilder.php index 47df4b868..c0a6495d2 100644 --- a/workflow/engine/classes/model/map/AppDocumentMapBuilder.php +++ b/workflow/engine/classes/model/map/AppDocumentMapBuilder.php @@ -67,6 +67,12 @@ class AppDocumentMapBuilder $tMap->addPrimaryKey('APP_DOC_UID', 'AppDocUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('APP_DOC_FILENAME', 'AppDocFilename', 'string', CreoleTypes::LONGVARCHAR, true, null); + + $tMap->addColumn('APP_DOC_TITLE', 'AppDocTitle', 'string', CreoleTypes::LONGVARCHAR, false, null); + + $tMap->addColumn('APP_DOC_COMMENT', 'AppDocComment', 'string', CreoleTypes::LONGVARCHAR, false, null); + $tMap->addPrimaryKey('DOC_VERSION', 'DocVersion', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32); diff --git a/workflow/engine/classes/model/map/DynaformMapBuilder.php b/workflow/engine/classes/model/map/DynaformMapBuilder.php index 15d28846f..bdfb6ba30 100644 --- a/workflow/engine/classes/model/map/DynaformMapBuilder.php +++ b/workflow/engine/classes/model/map/DynaformMapBuilder.php @@ -67,6 +67,10 @@ class DynaformMapBuilder $tMap->addPrimaryKey('DYN_UID', 'DynUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('DYN_TITLE', 'DynTitle', 'string', CreoleTypes::LONGVARCHAR, true, null); + + $tMap->addColumn('DYN_DESCRIPTION', 'DynDescription', 'string', CreoleTypes::LONGVARCHAR, false, null); + $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('DYN_TYPE', 'DynType', 'string', CreoleTypes::VARCHAR, true, 20); diff --git a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php index 92c7d36a2..563fac153 100644 --- a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php +++ b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php @@ -67,6 +67,14 @@ class OutputDocumentMapBuilder $tMap->addPrimaryKey('OUT_DOC_UID', 'OutDocUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('OUT_DOC_TITLE', 'OutDocTitle', 'string', CreoleTypes::LONGVARCHAR, true, null); + + $tMap->addColumn('OUT_DOC_DESCRIPTION', 'OutDocDescription', 'string', CreoleTypes::LONGVARCHAR, false, null); + + $tMap->addColumn('OUT_DOC_FILENAME', 'OutDocFilename', 'string', CreoleTypes::LONGVARCHAR, false, null); + + $tMap->addColumn('OUT_DOC_TEMPLATE', 'OutDocTemplate', 'string', CreoleTypes::LONGVARCHAR, false, null); + $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('OUT_DOC_REPORT_GENERATOR', 'OutDocReportGenerator', 'string', CreoleTypes::VARCHAR, true, 10); diff --git a/workflow/engine/classes/model/map/ReportTableMapBuilder.php b/workflow/engine/classes/model/map/ReportTableMapBuilder.php index 488bdbbe0..afa42e060 100644 --- a/workflow/engine/classes/model/map/ReportTableMapBuilder.php +++ b/workflow/engine/classes/model/map/ReportTableMapBuilder.php @@ -67,6 +67,8 @@ class ReportTableMapBuilder $tMap->addPrimaryKey('REP_TAB_UID', 'RepTabUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('REP_TAB_TITLE', 'RepTabTitle', 'string', CreoleTypes::LONGVARCHAR, true, null); + $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('REP_TAB_NAME', 'RepTabName', 'string', CreoleTypes::VARCHAR, true, 100); diff --git a/workflow/engine/classes/model/map/TriggersMapBuilder.php b/workflow/engine/classes/model/map/TriggersMapBuilder.php index dfe4b9cc5..42557a9de 100644 --- a/workflow/engine/classes/model/map/TriggersMapBuilder.php +++ b/workflow/engine/classes/model/map/TriggersMapBuilder.php @@ -67,6 +67,10 @@ class TriggersMapBuilder $tMap->addPrimaryKey('TRI_UID', 'TriUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('TRI_TITLE', 'TriTitle', 'string', CreoleTypes::LONGVARCHAR, true, null); + + $tMap->addColumn('TRI_DESCRIPTION', 'TriDescription', 'string', CreoleTypes::LONGVARCHAR, false, null); + $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('TRI_TYPE', 'TriType', 'string', CreoleTypes::VARCHAR, true, 20); diff --git a/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php b/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php index d5557ec8e..826b445a0 100644 --- a/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php +++ b/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php @@ -67,6 +67,10 @@ class WebEntryEventMapBuilder $tMap->addPrimaryKey('WEE_UID', 'WeeUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('WEE_TITLE', 'WeeTitle', 'string', CreoleTypes::LONGVARCHAR, true, null); + + $tMap->addColumn('WEE_DESCRIPTION', 'WeeDescription', 'string', CreoleTypes::LONGVARCHAR, true, null); + $tMap->addColumn('PRJ_UID', 'PrjUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('EVN_UID', 'EvnUid', 'string', CreoleTypes::VARCHAR, true, 32); diff --git a/workflow/engine/classes/model/om/BaseAppDocument.php b/workflow/engine/classes/model/om/BaseAppDocument.php index d6b9eb56e..d4874f670 100644 --- a/workflow/engine/classes/model/om/BaseAppDocument.php +++ b/workflow/engine/classes/model/om/BaseAppDocument.php @@ -33,6 +33,24 @@ abstract class BaseAppDocument extends BaseObject implements Persistent */ protected $app_doc_uid = ''; + /** + * The value for the app_doc_filename field. + * @var string + */ + protected $app_doc_filename; + + /** + * The value for the app_doc_title field. + * @var string + */ + protected $app_doc_title; + + /** + * The value for the app_doc_comment field. + * @var string + */ + protected $app_doc_comment; + /** * The value for the doc_version field. * @var int @@ -160,6 +178,39 @@ abstract class BaseAppDocument extends BaseObject implements Persistent return $this->app_doc_uid; } + /** + * Get the [app_doc_filename] column value. + * + * @return string + */ + public function getAppDocFilename() + { + + return $this->app_doc_filename; + } + + /** + * Get the [app_doc_title] column value. + * + * @return string + */ + public function getAppDocTitle() + { + + return $this->app_doc_title; + } + + /** + * Get the [app_doc_comment] column value. + * + * @return string + */ + public function getAppDocComment() + { + + return $this->app_doc_comment; + } + /** * Get the [doc_version] column value. * @@ -411,6 +462,72 @@ abstract class BaseAppDocument extends BaseObject implements Persistent } // setAppDocUid() + /** + * Set the value of [app_doc_filename] column. + * + * @param string $v new value + * @return void + */ + public function setAppDocFilename($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->app_doc_filename !== $v) { + $this->app_doc_filename = $v; + $this->modifiedColumns[] = AppDocumentPeer::APP_DOC_FILENAME; + } + + } // setAppDocFilename() + + /** + * Set the value of [app_doc_title] column. + * + * @param string $v new value + * @return void + */ + public function setAppDocTitle($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->app_doc_title !== $v) { + $this->app_doc_title = $v; + $this->modifiedColumns[] = AppDocumentPeer::APP_DOC_TITLE; + } + + } // setAppDocTitle() + + /** + * Set the value of [app_doc_comment] column. + * + * @param string $v new value + * @return void + */ + public function setAppDocComment($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->app_doc_comment !== $v) { + $this->app_doc_comment = $v; + $this->modifiedColumns[] = AppDocumentPeer::APP_DOC_COMMENT; + } + + } // setAppDocComment() + /** * Set the value of [doc_version] column. * @@ -818,46 +935,52 @@ abstract class BaseAppDocument extends BaseObject implements Persistent $this->app_doc_uid = $rs->getString($startcol + 0); - $this->doc_version = $rs->getInt($startcol + 1); + $this->app_doc_filename = $rs->getString($startcol + 1); - $this->app_uid = $rs->getString($startcol + 2); + $this->app_doc_title = $rs->getString($startcol + 2); - $this->del_index = $rs->getInt($startcol + 3); + $this->app_doc_comment = $rs->getString($startcol + 3); - $this->doc_uid = $rs->getString($startcol + 4); + $this->doc_version = $rs->getInt($startcol + 4); - $this->usr_uid = $rs->getString($startcol + 5); + $this->app_uid = $rs->getString($startcol + 5); - $this->app_doc_type = $rs->getString($startcol + 6); + $this->del_index = $rs->getInt($startcol + 6); - $this->app_doc_create_date = $rs->getTimestamp($startcol + 7, null); + $this->doc_uid = $rs->getString($startcol + 7); - $this->app_doc_index = $rs->getInt($startcol + 8); + $this->usr_uid = $rs->getString($startcol + 8); - $this->folder_uid = $rs->getString($startcol + 9); + $this->app_doc_type = $rs->getString($startcol + 9); - $this->app_doc_plugin = $rs->getString($startcol + 10); + $this->app_doc_create_date = $rs->getTimestamp($startcol + 10, null); - $this->app_doc_tags = $rs->getString($startcol + 11); + $this->app_doc_index = $rs->getInt($startcol + 11); - $this->app_doc_status = $rs->getString($startcol + 12); + $this->folder_uid = $rs->getString($startcol + 12); - $this->app_doc_status_date = $rs->getTimestamp($startcol + 13, null); + $this->app_doc_plugin = $rs->getString($startcol + 13); - $this->app_doc_fieldname = $rs->getString($startcol + 14); + $this->app_doc_tags = $rs->getString($startcol + 14); - $this->app_doc_drive_download = $rs->getString($startcol + 15); + $this->app_doc_status = $rs->getString($startcol + 15); - $this->sync_with_drive = $rs->getString($startcol + 16); + $this->app_doc_status_date = $rs->getTimestamp($startcol + 16, null); - $this->sync_permissions = $rs->getString($startcol + 17); + $this->app_doc_fieldname = $rs->getString($startcol + 17); + + $this->app_doc_drive_download = $rs->getString($startcol + 18); + + $this->sync_with_drive = $rs->getString($startcol + 19); + + $this->sync_permissions = $rs->getString($startcol + 20); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 18; // 18 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 21; // 21 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating AppDocument object", $e); @@ -1065,54 +1188,63 @@ abstract class BaseAppDocument extends BaseObject implements Persistent return $this->getAppDocUid(); break; case 1: - return $this->getDocVersion(); + return $this->getAppDocFilename(); break; case 2: - return $this->getAppUid(); + return $this->getAppDocTitle(); break; case 3: - return $this->getDelIndex(); + return $this->getAppDocComment(); break; case 4: - return $this->getDocUid(); + return $this->getDocVersion(); break; case 5: - return $this->getUsrUid(); + return $this->getAppUid(); break; case 6: - return $this->getAppDocType(); + return $this->getDelIndex(); break; case 7: - return $this->getAppDocCreateDate(); + return $this->getDocUid(); break; case 8: - return $this->getAppDocIndex(); + return $this->getUsrUid(); break; case 9: - return $this->getFolderUid(); + return $this->getAppDocType(); break; case 10: - return $this->getAppDocPlugin(); + return $this->getAppDocCreateDate(); break; case 11: - return $this->getAppDocTags(); + return $this->getAppDocIndex(); break; case 12: - return $this->getAppDocStatus(); + return $this->getFolderUid(); break; case 13: - return $this->getAppDocStatusDate(); + return $this->getAppDocPlugin(); break; case 14: - return $this->getAppDocFieldname(); + return $this->getAppDocTags(); break; case 15: - return $this->getAppDocDriveDownload(); + return $this->getAppDocStatus(); break; case 16: - return $this->getSyncWithDrive(); + return $this->getAppDocStatusDate(); break; case 17: + return $this->getAppDocFieldname(); + break; + case 18: + return $this->getAppDocDriveDownload(); + break; + case 19: + return $this->getSyncWithDrive(); + break; + case 20: return $this->getSyncPermissions(); break; default: @@ -1136,23 +1268,26 @@ abstract class BaseAppDocument extends BaseObject implements Persistent $keys = AppDocumentPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getAppDocUid(), - $keys[1] => $this->getDocVersion(), - $keys[2] => $this->getAppUid(), - $keys[3] => $this->getDelIndex(), - $keys[4] => $this->getDocUid(), - $keys[5] => $this->getUsrUid(), - $keys[6] => $this->getAppDocType(), - $keys[7] => $this->getAppDocCreateDate(), - $keys[8] => $this->getAppDocIndex(), - $keys[9] => $this->getFolderUid(), - $keys[10] => $this->getAppDocPlugin(), - $keys[11] => $this->getAppDocTags(), - $keys[12] => $this->getAppDocStatus(), - $keys[13] => $this->getAppDocStatusDate(), - $keys[14] => $this->getAppDocFieldname(), - $keys[15] => $this->getAppDocDriveDownload(), - $keys[16] => $this->getSyncWithDrive(), - $keys[17] => $this->getSyncPermissions(), + $keys[1] => $this->getAppDocFilename(), + $keys[2] => $this->getAppDocTitle(), + $keys[3] => $this->getAppDocComment(), + $keys[4] => $this->getDocVersion(), + $keys[5] => $this->getAppUid(), + $keys[6] => $this->getDelIndex(), + $keys[7] => $this->getDocUid(), + $keys[8] => $this->getUsrUid(), + $keys[9] => $this->getAppDocType(), + $keys[10] => $this->getAppDocCreateDate(), + $keys[11] => $this->getAppDocIndex(), + $keys[12] => $this->getFolderUid(), + $keys[13] => $this->getAppDocPlugin(), + $keys[14] => $this->getAppDocTags(), + $keys[15] => $this->getAppDocStatus(), + $keys[16] => $this->getAppDocStatusDate(), + $keys[17] => $this->getAppDocFieldname(), + $keys[18] => $this->getAppDocDriveDownload(), + $keys[19] => $this->getSyncWithDrive(), + $keys[20] => $this->getSyncPermissions(), ); return $result; } @@ -1188,54 +1323,63 @@ abstract class BaseAppDocument extends BaseObject implements Persistent $this->setAppDocUid($value); break; case 1: - $this->setDocVersion($value); + $this->setAppDocFilename($value); break; case 2: - $this->setAppUid($value); + $this->setAppDocTitle($value); break; case 3: - $this->setDelIndex($value); + $this->setAppDocComment($value); break; case 4: - $this->setDocUid($value); + $this->setDocVersion($value); break; case 5: - $this->setUsrUid($value); + $this->setAppUid($value); break; case 6: - $this->setAppDocType($value); + $this->setDelIndex($value); break; case 7: - $this->setAppDocCreateDate($value); + $this->setDocUid($value); break; case 8: - $this->setAppDocIndex($value); + $this->setUsrUid($value); break; case 9: - $this->setFolderUid($value); + $this->setAppDocType($value); break; case 10: - $this->setAppDocPlugin($value); + $this->setAppDocCreateDate($value); break; case 11: - $this->setAppDocTags($value); + $this->setAppDocIndex($value); break; case 12: - $this->setAppDocStatus($value); + $this->setFolderUid($value); break; case 13: - $this->setAppDocStatusDate($value); + $this->setAppDocPlugin($value); break; case 14: - $this->setAppDocFieldname($value); + $this->setAppDocTags($value); break; case 15: - $this->setAppDocDriveDownload($value); + $this->setAppDocStatus($value); break; case 16: - $this->setSyncWithDrive($value); + $this->setAppDocStatusDate($value); break; case 17: + $this->setAppDocFieldname($value); + break; + case 18: + $this->setAppDocDriveDownload($value); + break; + case 19: + $this->setSyncWithDrive($value); + break; + case 20: $this->setSyncPermissions($value); break; } // switch() @@ -1266,71 +1410,83 @@ abstract class BaseAppDocument extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setDocVersion($arr[$keys[1]]); + $this->setAppDocFilename($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setAppUid($arr[$keys[2]]); + $this->setAppDocTitle($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setDelIndex($arr[$keys[3]]); + $this->setAppDocComment($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setDocUid($arr[$keys[4]]); + $this->setDocVersion($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setUsrUid($arr[$keys[5]]); + $this->setAppUid($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setAppDocType($arr[$keys[6]]); + $this->setDelIndex($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setAppDocCreateDate($arr[$keys[7]]); + $this->setDocUid($arr[$keys[7]]); } if (array_key_exists($keys[8], $arr)) { - $this->setAppDocIndex($arr[$keys[8]]); + $this->setUsrUid($arr[$keys[8]]); } if (array_key_exists($keys[9], $arr)) { - $this->setFolderUid($arr[$keys[9]]); + $this->setAppDocType($arr[$keys[9]]); } if (array_key_exists($keys[10], $arr)) { - $this->setAppDocPlugin($arr[$keys[10]]); + $this->setAppDocCreateDate($arr[$keys[10]]); } if (array_key_exists($keys[11], $arr)) { - $this->setAppDocTags($arr[$keys[11]]); + $this->setAppDocIndex($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setAppDocStatus($arr[$keys[12]]); + $this->setFolderUid($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setAppDocStatusDate($arr[$keys[13]]); + $this->setAppDocPlugin($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setAppDocFieldname($arr[$keys[14]]); + $this->setAppDocTags($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setAppDocDriveDownload($arr[$keys[15]]); + $this->setAppDocStatus($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setSyncWithDrive($arr[$keys[16]]); + $this->setAppDocStatusDate($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setSyncPermissions($arr[$keys[17]]); + $this->setAppDocFieldname($arr[$keys[17]]); + } + + if (array_key_exists($keys[18], $arr)) { + $this->setAppDocDriveDownload($arr[$keys[18]]); + } + + if (array_key_exists($keys[19], $arr)) { + $this->setSyncWithDrive($arr[$keys[19]]); + } + + if (array_key_exists($keys[20], $arr)) { + $this->setSyncPermissions($arr[$keys[20]]); } } @@ -1348,6 +1504,18 @@ abstract class BaseAppDocument extends BaseObject implements Persistent $criteria->add(AppDocumentPeer::APP_DOC_UID, $this->app_doc_uid); } + if ($this->isColumnModified(AppDocumentPeer::APP_DOC_FILENAME)) { + $criteria->add(AppDocumentPeer::APP_DOC_FILENAME, $this->app_doc_filename); + } + + if ($this->isColumnModified(AppDocumentPeer::APP_DOC_TITLE)) { + $criteria->add(AppDocumentPeer::APP_DOC_TITLE, $this->app_doc_title); + } + + if ($this->isColumnModified(AppDocumentPeer::APP_DOC_COMMENT)) { + $criteria->add(AppDocumentPeer::APP_DOC_COMMENT, $this->app_doc_comment); + } + if ($this->isColumnModified(AppDocumentPeer::DOC_VERSION)) { $criteria->add(AppDocumentPeer::DOC_VERSION, $this->doc_version); } @@ -1482,6 +1650,12 @@ abstract class BaseAppDocument extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setAppDocFilename($this->app_doc_filename); + + $copyObj->setAppDocTitle($this->app_doc_title); + + $copyObj->setAppDocComment($this->app_doc_comment); + $copyObj->setAppUid($this->app_uid); $copyObj->setDelIndex($this->del_index); diff --git a/workflow/engine/classes/model/om/BaseAppDocumentPeer.php b/workflow/engine/classes/model/om/BaseAppDocumentPeer.php index 988637f48..df748ac54 100644 --- a/workflow/engine/classes/model/om/BaseAppDocumentPeer.php +++ b/workflow/engine/classes/model/om/BaseAppDocumentPeer.php @@ -25,7 +25,7 @@ abstract class BaseAppDocumentPeer const CLASS_DEFAULT = 'classes.model.AppDocument'; /** The total number of columns. */ - const NUM_COLUMNS = 18; + const NUM_COLUMNS = 21; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,15 @@ abstract class BaseAppDocumentPeer /** the column name for the APP_DOC_UID field */ const APP_DOC_UID = 'APP_DOCUMENT.APP_DOC_UID'; + /** the column name for the APP_DOC_FILENAME field */ + const APP_DOC_FILENAME = 'APP_DOCUMENT.APP_DOC_FILENAME'; + + /** the column name for the APP_DOC_TITLE field */ + const APP_DOC_TITLE = 'APP_DOCUMENT.APP_DOC_TITLE'; + + /** the column name for the APP_DOC_COMMENT field */ + const APP_DOC_COMMENT = 'APP_DOCUMENT.APP_DOC_COMMENT'; + /** the column name for the DOC_VERSION field */ const DOC_VERSION = 'APP_DOCUMENT.DOC_VERSION'; @@ -96,10 +105,10 @@ abstract class BaseAppDocumentPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', 'AppDocDriveDownload', 'SyncWithDrive', 'SyncPermissions', ), - BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, AppDocumentPeer::SYNC_WITH_DRIVE, AppDocumentPeer::SYNC_PERMISSIONS, ), - BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', 'APP_DOC_DRIVE_DOWNLOAD', 'SYNC_WITH_DRIVE', 'SYNC_PERMISSIONS', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'AppDocFilename', 'AppDocTitle', 'AppDocComment', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', 'AppDocDriveDownload', 'SyncWithDrive', 'SyncPermissions', ), + BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::APP_DOC_FILENAME, AppDocumentPeer::APP_DOC_TITLE, AppDocumentPeer::APP_DOC_COMMENT, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, AppDocumentPeer::SYNC_WITH_DRIVE, AppDocumentPeer::SYNC_PERMISSIONS, ), + BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'APP_DOC_FILENAME', 'APP_DOC_TITLE', 'APP_DOC_COMMENT', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', 'APP_DOC_DRIVE_DOWNLOAD', 'SYNC_WITH_DRIVE', 'SYNC_PERMISSIONS', ), + 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, ) ); /** @@ -109,10 +118,10 @@ abstract class BaseAppDocumentPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'DocVersion' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'DocUid' => 4, 'UsrUid' => 5, 'AppDocType' => 6, 'AppDocCreateDate' => 7, 'AppDocIndex' => 8, 'FolderUid' => 9, 'AppDocPlugin' => 10, 'AppDocTags' => 11, 'AppDocStatus' => 12, 'AppDocStatusDate' => 13, 'AppDocFieldname' => 14, 'AppDocDriveDownload' => 15, 'SyncWithDrive' => 16, 'SyncPermissions' => 17, ), - BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::DOC_VERSION => 1, AppDocumentPeer::APP_UID => 2, AppDocumentPeer::DEL_INDEX => 3, AppDocumentPeer::DOC_UID => 4, AppDocumentPeer::USR_UID => 5, AppDocumentPeer::APP_DOC_TYPE => 6, AppDocumentPeer::APP_DOC_CREATE_DATE => 7, AppDocumentPeer::APP_DOC_INDEX => 8, AppDocumentPeer::FOLDER_UID => 9, AppDocumentPeer::APP_DOC_PLUGIN => 10, AppDocumentPeer::APP_DOC_TAGS => 11, AppDocumentPeer::APP_DOC_STATUS => 12, AppDocumentPeer::APP_DOC_STATUS_DATE => 13, AppDocumentPeer::APP_DOC_FIELDNAME => 14, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD => 15, AppDocumentPeer::SYNC_WITH_DRIVE => 16, AppDocumentPeer::SYNC_PERMISSIONS => 17, ), - BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'DOC_VERSION' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'DOC_UID' => 4, 'USR_UID' => 5, 'APP_DOC_TYPE' => 6, 'APP_DOC_CREATE_DATE' => 7, 'APP_DOC_INDEX' => 8, 'FOLDER_UID' => 9, 'APP_DOC_PLUGIN' => 10, 'APP_DOC_TAGS' => 11, 'APP_DOC_STATUS' => 12, 'APP_DOC_STATUS_DATE' => 13, 'APP_DOC_FIELDNAME' => 14, 'APP_DOC_DRIVE_DOWNLOAD' => 15, 'SYNC_WITH_DRIVE' => 16, 'SYNC_PERMISSIONS' => 17, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'AppDocFilename' => 1, 'AppDocTitle' => 2, 'AppDocComment' => 3, 'DocVersion' => 4, 'AppUid' => 5, 'DelIndex' => 6, 'DocUid' => 7, 'UsrUid' => 8, 'AppDocType' => 9, 'AppDocCreateDate' => 10, 'AppDocIndex' => 11, 'FolderUid' => 12, 'AppDocPlugin' => 13, 'AppDocTags' => 14, 'AppDocStatus' => 15, 'AppDocStatusDate' => 16, 'AppDocFieldname' => 17, 'AppDocDriveDownload' => 18, 'SyncWithDrive' => 19, 'SyncPermissions' => 20, ), + BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::APP_DOC_FILENAME => 1, AppDocumentPeer::APP_DOC_TITLE => 2, AppDocumentPeer::APP_DOC_COMMENT => 3, AppDocumentPeer::DOC_VERSION => 4, AppDocumentPeer::APP_UID => 5, AppDocumentPeer::DEL_INDEX => 6, AppDocumentPeer::DOC_UID => 7, AppDocumentPeer::USR_UID => 8, AppDocumentPeer::APP_DOC_TYPE => 9, AppDocumentPeer::APP_DOC_CREATE_DATE => 10, AppDocumentPeer::APP_DOC_INDEX => 11, AppDocumentPeer::FOLDER_UID => 12, AppDocumentPeer::APP_DOC_PLUGIN => 13, AppDocumentPeer::APP_DOC_TAGS => 14, AppDocumentPeer::APP_DOC_STATUS => 15, AppDocumentPeer::APP_DOC_STATUS_DATE => 16, AppDocumentPeer::APP_DOC_FIELDNAME => 17, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD => 18, AppDocumentPeer::SYNC_WITH_DRIVE => 19, AppDocumentPeer::SYNC_PERMISSIONS => 20, ), + BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'APP_DOC_FILENAME' => 1, 'APP_DOC_TITLE' => 2, 'APP_DOC_COMMENT' => 3, 'DOC_VERSION' => 4, 'APP_UID' => 5, 'DEL_INDEX' => 6, 'DOC_UID' => 7, 'USR_UID' => 8, 'APP_DOC_TYPE' => 9, 'APP_DOC_CREATE_DATE' => 10, 'APP_DOC_INDEX' => 11, 'FOLDER_UID' => 12, 'APP_DOC_PLUGIN' => 13, 'APP_DOC_TAGS' => 14, 'APP_DOC_STATUS' => 15, 'APP_DOC_STATUS_DATE' => 16, 'APP_DOC_FIELDNAME' => 17, 'APP_DOC_DRIVE_DOWNLOAD' => 18, 'SYNC_WITH_DRIVE' => 19, 'SYNC_PERMISSIONS' => 20, ), + 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, ) ); /** @@ -215,6 +224,12 @@ abstract class BaseAppDocumentPeer $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID); + $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_FILENAME); + + $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_TITLE); + + $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_COMMENT); + $criteria->addSelectColumn(AppDocumentPeer::DOC_VERSION); $criteria->addSelectColumn(AppDocumentPeer::APP_UID); diff --git a/workflow/engine/classes/model/om/BaseDynaform.php b/workflow/engine/classes/model/om/BaseDynaform.php index 44a3d5cb7..b4968eaf1 100644 --- a/workflow/engine/classes/model/om/BaseDynaform.php +++ b/workflow/engine/classes/model/om/BaseDynaform.php @@ -33,6 +33,18 @@ abstract class BaseDynaform extends BaseObject implements Persistent */ protected $dyn_uid = ''; + /** + * The value for the dyn_title field. + * @var string + */ + protected $dyn_title; + + /** + * The value for the dyn_description field. + * @var string + */ + protected $dyn_description; + /** * The value for the pro_uid field. * @var string @@ -100,6 +112,28 @@ abstract class BaseDynaform extends BaseObject implements Persistent return $this->dyn_uid; } + /** + * Get the [dyn_title] column value. + * + * @return string + */ + public function getDynTitle() + { + + return $this->dyn_title; + } + + /** + * Get the [dyn_description] column value. + * + * @return string + */ + public function getDynDescription() + { + + return $this->dyn_description; + } + /** * Get the [pro_uid] column value. * @@ -220,6 +254,50 @@ abstract class BaseDynaform extends BaseObject implements Persistent } // setDynUid() + /** + * Set the value of [dyn_title] column. + * + * @param string $v new value + * @return void + */ + public function setDynTitle($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->dyn_title !== $v) { + $this->dyn_title = $v; + $this->modifiedColumns[] = DynaformPeer::DYN_TITLE; + } + + } // setDynTitle() + + /** + * Set the value of [dyn_description] column. + * + * @param string $v new value + * @return void + */ + public function setDynDescription($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->dyn_description !== $v) { + $this->dyn_description = $v; + $this->modifiedColumns[] = DynaformPeer::DYN_DESCRIPTION; + } + + } // setDynDescription() + /** * Set the value of [pro_uid] column. * @@ -400,26 +478,30 @@ abstract class BaseDynaform extends BaseObject implements Persistent $this->dyn_uid = $rs->getString($startcol + 0); - $this->pro_uid = $rs->getString($startcol + 1); + $this->dyn_title = $rs->getString($startcol + 1); - $this->dyn_type = $rs->getString($startcol + 2); + $this->dyn_description = $rs->getString($startcol + 2); - $this->dyn_filename = $rs->getString($startcol + 3); + $this->pro_uid = $rs->getString($startcol + 3); - $this->dyn_content = $rs->getString($startcol + 4); + $this->dyn_type = $rs->getString($startcol + 4); - $this->dyn_label = $rs->getString($startcol + 5); + $this->dyn_filename = $rs->getString($startcol + 5); - $this->dyn_version = $rs->getInt($startcol + 6); + $this->dyn_content = $rs->getString($startcol + 6); - $this->dyn_update_date = $rs->getTimestamp($startcol + 7, null); + $this->dyn_label = $rs->getString($startcol + 7); + + $this->dyn_version = $rs->getInt($startcol + 8); + + $this->dyn_update_date = $rs->getTimestamp($startcol + 9, null); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 8; // 8 = DynaformPeer::NUM_COLUMNS - DynaformPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 10; // 10 = DynaformPeer::NUM_COLUMNS - DynaformPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Dynaform object", $e); @@ -627,24 +709,30 @@ abstract class BaseDynaform extends BaseObject implements Persistent return $this->getDynUid(); break; case 1: - return $this->getProUid(); + return $this->getDynTitle(); break; case 2: - return $this->getDynType(); + return $this->getDynDescription(); break; case 3: - return $this->getDynFilename(); + return $this->getProUid(); break; case 4: - return $this->getDynContent(); + return $this->getDynType(); break; case 5: - return $this->getDynLabel(); + return $this->getDynFilename(); break; case 6: - return $this->getDynVersion(); + return $this->getDynContent(); break; case 7: + return $this->getDynLabel(); + break; + case 8: + return $this->getDynVersion(); + break; + case 9: return $this->getDynUpdateDate(); break; default: @@ -668,13 +756,15 @@ abstract class BaseDynaform extends BaseObject implements Persistent $keys = DynaformPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getDynUid(), - $keys[1] => $this->getProUid(), - $keys[2] => $this->getDynType(), - $keys[3] => $this->getDynFilename(), - $keys[4] => $this->getDynContent(), - $keys[5] => $this->getDynLabel(), - $keys[6] => $this->getDynVersion(), - $keys[7] => $this->getDynUpdateDate(), + $keys[1] => $this->getDynTitle(), + $keys[2] => $this->getDynDescription(), + $keys[3] => $this->getProUid(), + $keys[4] => $this->getDynType(), + $keys[5] => $this->getDynFilename(), + $keys[6] => $this->getDynContent(), + $keys[7] => $this->getDynLabel(), + $keys[8] => $this->getDynVersion(), + $keys[9] => $this->getDynUpdateDate(), ); return $result; } @@ -710,24 +800,30 @@ abstract class BaseDynaform extends BaseObject implements Persistent $this->setDynUid($value); break; case 1: - $this->setProUid($value); + $this->setDynTitle($value); break; case 2: - $this->setDynType($value); + $this->setDynDescription($value); break; case 3: - $this->setDynFilename($value); + $this->setProUid($value); break; case 4: - $this->setDynContent($value); + $this->setDynType($value); break; case 5: - $this->setDynLabel($value); + $this->setDynFilename($value); break; case 6: - $this->setDynVersion($value); + $this->setDynContent($value); break; case 7: + $this->setDynLabel($value); + break; + case 8: + $this->setDynVersion($value); + break; + case 9: $this->setDynUpdateDate($value); break; } // switch() @@ -758,31 +854,39 @@ abstract class BaseDynaform extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setProUid($arr[$keys[1]]); + $this->setDynTitle($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setDynType($arr[$keys[2]]); + $this->setDynDescription($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setDynFilename($arr[$keys[3]]); + $this->setProUid($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setDynContent($arr[$keys[4]]); + $this->setDynType($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setDynLabel($arr[$keys[5]]); + $this->setDynFilename($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setDynVersion($arr[$keys[6]]); + $this->setDynContent($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setDynUpdateDate($arr[$keys[7]]); + $this->setDynLabel($arr[$keys[7]]); + } + + if (array_key_exists($keys[8], $arr)) { + $this->setDynVersion($arr[$keys[8]]); + } + + if (array_key_exists($keys[9], $arr)) { + $this->setDynUpdateDate($arr[$keys[9]]); } } @@ -800,6 +904,14 @@ abstract class BaseDynaform extends BaseObject implements Persistent $criteria->add(DynaformPeer::DYN_UID, $this->dyn_uid); } + if ($this->isColumnModified(DynaformPeer::DYN_TITLE)) { + $criteria->add(DynaformPeer::DYN_TITLE, $this->dyn_title); + } + + if ($this->isColumnModified(DynaformPeer::DYN_DESCRIPTION)) { + $criteria->add(DynaformPeer::DYN_DESCRIPTION, $this->dyn_description); + } + if ($this->isColumnModified(DynaformPeer::PRO_UID)) { $criteria->add(DynaformPeer::PRO_UID, $this->pro_uid); } @@ -882,6 +994,10 @@ abstract class BaseDynaform extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setDynTitle($this->dyn_title); + + $copyObj->setDynDescription($this->dyn_description); + $copyObj->setProUid($this->pro_uid); $copyObj->setDynType($this->dyn_type); diff --git a/workflow/engine/classes/model/om/BaseDynaformPeer.php b/workflow/engine/classes/model/om/BaseDynaformPeer.php index 0481bad40..bc634a568 100644 --- a/workflow/engine/classes/model/om/BaseDynaformPeer.php +++ b/workflow/engine/classes/model/om/BaseDynaformPeer.php @@ -25,7 +25,7 @@ abstract class BaseDynaformPeer const CLASS_DEFAULT = 'classes.model.Dynaform'; /** The total number of columns. */ - const NUM_COLUMNS = 8; + const NUM_COLUMNS = 10; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,12 @@ abstract class BaseDynaformPeer /** the column name for the DYN_UID field */ const DYN_UID = 'DYNAFORM.DYN_UID'; + /** the column name for the DYN_TITLE field */ + const DYN_TITLE = 'DYNAFORM.DYN_TITLE'; + + /** the column name for the DYN_DESCRIPTION field */ + const DYN_DESCRIPTION = 'DYNAFORM.DYN_DESCRIPTION'; + /** the column name for the PRO_UID field */ const PRO_UID = 'DYNAFORM.PRO_UID'; @@ -66,10 +72,10 @@ abstract class BaseDynaformPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('DynUid', 'ProUid', 'DynType', 'DynFilename', 'DynContent', 'DynLabel', 'DynVersion', 'DynUpdateDate', ), - BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID, DynaformPeer::PRO_UID, DynaformPeer::DYN_TYPE, DynaformPeer::DYN_FILENAME, DynaformPeer::DYN_CONTENT, DynaformPeer::DYN_LABEL, DynaformPeer::DYN_VERSION, DynaformPeer::DYN_UPDATE_DATE, ), - BasePeer::TYPE_FIELDNAME => array ('DYN_UID', 'PRO_UID', 'DYN_TYPE', 'DYN_FILENAME', 'DYN_CONTENT', 'DYN_LABEL', 'DYN_VERSION', 'DYN_UPDATE_DATE', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) + BasePeer::TYPE_PHPNAME => array ('DynUid', 'DynTitle', 'DynDescription', 'ProUid', 'DynType', 'DynFilename', 'DynContent', 'DynLabel', 'DynVersion', 'DynUpdateDate', ), + BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID, DynaformPeer::DYN_TITLE, DynaformPeer::DYN_DESCRIPTION, DynaformPeer::PRO_UID, DynaformPeer::DYN_TYPE, DynaformPeer::DYN_FILENAME, DynaformPeer::DYN_CONTENT, DynaformPeer::DYN_LABEL, DynaformPeer::DYN_VERSION, DynaformPeer::DYN_UPDATE_DATE, ), + BasePeer::TYPE_FIELDNAME => array ('DYN_UID', 'DYN_TITLE', 'DYN_DESCRIPTION', 'PRO_UID', 'DYN_TYPE', 'DYN_FILENAME', 'DYN_CONTENT', 'DYN_LABEL', 'DYN_VERSION', 'DYN_UPDATE_DATE', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) ); /** @@ -79,10 +85,10 @@ abstract class BaseDynaformPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('DynUid' => 0, 'ProUid' => 1, 'DynType' => 2, 'DynFilename' => 3, 'DynContent' => 4, 'DynLabel' => 5, 'DynVersion' => 6, 'DynUpdateDate' => 7, ), - BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID => 0, DynaformPeer::PRO_UID => 1, DynaformPeer::DYN_TYPE => 2, DynaformPeer::DYN_FILENAME => 3, DynaformPeer::DYN_CONTENT => 4, DynaformPeer::DYN_LABEL => 5, DynaformPeer::DYN_VERSION => 6, DynaformPeer::DYN_UPDATE_DATE => 7, ), - BasePeer::TYPE_FIELDNAME => array ('DYN_UID' => 0, 'PRO_UID' => 1, 'DYN_TYPE' => 2, 'DYN_FILENAME' => 3, 'DYN_CONTENT' => 4, 'DYN_LABEL' => 5, 'DYN_VERSION' => 6, 'DYN_UPDATE_DATE' => 7, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) + BasePeer::TYPE_PHPNAME => array ('DynUid' => 0, 'DynTitle' => 1, 'DynDescription' => 2, 'ProUid' => 3, 'DynType' => 4, 'DynFilename' => 5, 'DynContent' => 6, 'DynLabel' => 7, 'DynVersion' => 8, 'DynUpdateDate' => 9, ), + BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID => 0, DynaformPeer::DYN_TITLE => 1, DynaformPeer::DYN_DESCRIPTION => 2, DynaformPeer::PRO_UID => 3, DynaformPeer::DYN_TYPE => 4, DynaformPeer::DYN_FILENAME => 5, DynaformPeer::DYN_CONTENT => 6, DynaformPeer::DYN_LABEL => 7, DynaformPeer::DYN_VERSION => 8, DynaformPeer::DYN_UPDATE_DATE => 9, ), + BasePeer::TYPE_FIELDNAME => array ('DYN_UID' => 0, 'DYN_TITLE' => 1, 'DYN_DESCRIPTION' => 2, 'PRO_UID' => 3, 'DYN_TYPE' => 4, 'DYN_FILENAME' => 5, 'DYN_CONTENT' => 6, 'DYN_LABEL' => 7, 'DYN_VERSION' => 8, 'DYN_UPDATE_DATE' => 9, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) ); /** @@ -185,6 +191,10 @@ abstract class BaseDynaformPeer $criteria->addSelectColumn(DynaformPeer::DYN_UID); + $criteria->addSelectColumn(DynaformPeer::DYN_TITLE); + + $criteria->addSelectColumn(DynaformPeer::DYN_DESCRIPTION); + $criteria->addSelectColumn(DynaformPeer::PRO_UID); $criteria->addSelectColumn(DynaformPeer::DYN_TYPE); diff --git a/workflow/engine/classes/model/om/BaseOutputDocument.php b/workflow/engine/classes/model/om/BaseOutputDocument.php index 97ca4755a..b99e8e6d7 100644 --- a/workflow/engine/classes/model/om/BaseOutputDocument.php +++ b/workflow/engine/classes/model/om/BaseOutputDocument.php @@ -33,6 +33,30 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent */ protected $out_doc_uid = ''; + /** + * The value for the out_doc_title field. + * @var string + */ + protected $out_doc_title; + + /** + * The value for the out_doc_description field. + * @var string + */ + protected $out_doc_description; + + /** + * The value for the out_doc_filename field. + * @var string + */ + protected $out_doc_filename; + + /** + * The value for the out_doc_template field. + * @var string + */ + protected $out_doc_template; + /** * The value for the pro_uid field. * @var string @@ -178,6 +202,50 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent return $this->out_doc_uid; } + /** + * Get the [out_doc_title] column value. + * + * @return string + */ + public function getOutDocTitle() + { + + return $this->out_doc_title; + } + + /** + * Get the [out_doc_description] column value. + * + * @return string + */ + public function getOutDocDescription() + { + + return $this->out_doc_description; + } + + /** + * Get the [out_doc_filename] column value. + * + * @return string + */ + public function getOutDocFilename() + { + + return $this->out_doc_filename; + } + + /** + * Get the [out_doc_template] column value. + * + * @return string + */ + public function getOutDocTemplate() + { + + return $this->out_doc_template; + } + /** * Get the [pro_uid] column value. * @@ -420,6 +488,94 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent } // setOutDocUid() + /** + * Set the value of [out_doc_title] column. + * + * @param string $v new value + * @return void + */ + public function setOutDocTitle($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->out_doc_title !== $v) { + $this->out_doc_title = $v; + $this->modifiedColumns[] = OutputDocumentPeer::OUT_DOC_TITLE; + } + + } // setOutDocTitle() + + /** + * Set the value of [out_doc_description] column. + * + * @param string $v new value + * @return void + */ + public function setOutDocDescription($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->out_doc_description !== $v) { + $this->out_doc_description = $v; + $this->modifiedColumns[] = OutputDocumentPeer::OUT_DOC_DESCRIPTION; + } + + } // setOutDocDescription() + + /** + * Set the value of [out_doc_filename] column. + * + * @param string $v new value + * @return void + */ + public function setOutDocFilename($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->out_doc_filename !== $v) { + $this->out_doc_filename = $v; + $this->modifiedColumns[] = OutputDocumentPeer::OUT_DOC_FILENAME; + } + + } // setOutDocFilename() + + /** + * Set the value of [out_doc_template] column. + * + * @param string $v new value + * @return void + */ + public function setOutDocTemplate($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->out_doc_template !== $v) { + $this->out_doc_template = $v; + $this->modifiedColumns[] = OutputDocumentPeer::OUT_DOC_TEMPLATE; + } + + } // setOutDocTemplate() + /** * Set the value of [pro_uid] column. * @@ -879,52 +1035,60 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent $this->out_doc_uid = $rs->getString($startcol + 0); - $this->pro_uid = $rs->getString($startcol + 1); + $this->out_doc_title = $rs->getString($startcol + 1); - $this->out_doc_report_generator = $rs->getString($startcol + 2); + $this->out_doc_description = $rs->getString($startcol + 2); - $this->out_doc_landscape = $rs->getInt($startcol + 3); + $this->out_doc_filename = $rs->getString($startcol + 3); - $this->out_doc_media = $rs->getString($startcol + 4); + $this->out_doc_template = $rs->getString($startcol + 4); - $this->out_doc_left_margin = $rs->getInt($startcol + 5); + $this->pro_uid = $rs->getString($startcol + 5); - $this->out_doc_right_margin = $rs->getInt($startcol + 6); + $this->out_doc_report_generator = $rs->getString($startcol + 6); - $this->out_doc_top_margin = $rs->getInt($startcol + 7); + $this->out_doc_landscape = $rs->getInt($startcol + 7); - $this->out_doc_bottom_margin = $rs->getInt($startcol + 8); + $this->out_doc_media = $rs->getString($startcol + 8); - $this->out_doc_generate = $rs->getString($startcol + 9); + $this->out_doc_left_margin = $rs->getInt($startcol + 9); - $this->out_doc_type = $rs->getString($startcol + 10); + $this->out_doc_right_margin = $rs->getInt($startcol + 10); - $this->out_doc_current_revision = $rs->getInt($startcol + 11); + $this->out_doc_top_margin = $rs->getInt($startcol + 11); - $this->out_doc_field_mapping = $rs->getString($startcol + 12); + $this->out_doc_bottom_margin = $rs->getInt($startcol + 12); - $this->out_doc_versioning = $rs->getInt($startcol + 13); + $this->out_doc_generate = $rs->getString($startcol + 13); - $this->out_doc_destination_path = $rs->getString($startcol + 14); + $this->out_doc_type = $rs->getString($startcol + 14); - $this->out_doc_tags = $rs->getString($startcol + 15); + $this->out_doc_current_revision = $rs->getInt($startcol + 15); - $this->out_doc_pdf_security_enabled = $rs->getInt($startcol + 16); + $this->out_doc_field_mapping = $rs->getString($startcol + 16); - $this->out_doc_pdf_security_open_password = $rs->getString($startcol + 17); + $this->out_doc_versioning = $rs->getInt($startcol + 17); - $this->out_doc_pdf_security_owner_password = $rs->getString($startcol + 18); + $this->out_doc_destination_path = $rs->getString($startcol + 18); - $this->out_doc_pdf_security_permissions = $rs->getString($startcol + 19); + $this->out_doc_tags = $rs->getString($startcol + 19); - $this->out_doc_open_type = $rs->getInt($startcol + 20); + $this->out_doc_pdf_security_enabled = $rs->getInt($startcol + 20); + + $this->out_doc_pdf_security_open_password = $rs->getString($startcol + 21); + + $this->out_doc_pdf_security_owner_password = $rs->getString($startcol + 22); + + $this->out_doc_pdf_security_permissions = $rs->getString($startcol + 23); + + $this->out_doc_open_type = $rs->getInt($startcol + 24); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 21; // 21 = OutputDocumentPeer::NUM_COLUMNS - OutputDocumentPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 25; // 25 = OutputDocumentPeer::NUM_COLUMNS - OutputDocumentPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating OutputDocument object", $e); @@ -1132,63 +1296,75 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent return $this->getOutDocUid(); break; case 1: - return $this->getProUid(); + return $this->getOutDocTitle(); break; case 2: - return $this->getOutDocReportGenerator(); + return $this->getOutDocDescription(); break; case 3: - return $this->getOutDocLandscape(); + return $this->getOutDocFilename(); break; case 4: - return $this->getOutDocMedia(); + return $this->getOutDocTemplate(); break; case 5: - return $this->getOutDocLeftMargin(); + return $this->getProUid(); break; case 6: - return $this->getOutDocRightMargin(); + return $this->getOutDocReportGenerator(); break; case 7: - return $this->getOutDocTopMargin(); + return $this->getOutDocLandscape(); break; case 8: - return $this->getOutDocBottomMargin(); + return $this->getOutDocMedia(); break; case 9: - return $this->getOutDocGenerate(); + return $this->getOutDocLeftMargin(); break; case 10: - return $this->getOutDocType(); + return $this->getOutDocRightMargin(); break; case 11: - return $this->getOutDocCurrentRevision(); + return $this->getOutDocTopMargin(); break; case 12: - return $this->getOutDocFieldMapping(); + return $this->getOutDocBottomMargin(); break; case 13: - return $this->getOutDocVersioning(); + return $this->getOutDocGenerate(); break; case 14: - return $this->getOutDocDestinationPath(); + return $this->getOutDocType(); break; case 15: - return $this->getOutDocTags(); + return $this->getOutDocCurrentRevision(); break; case 16: - return $this->getOutDocPdfSecurityEnabled(); + return $this->getOutDocFieldMapping(); break; case 17: - return $this->getOutDocPdfSecurityOpenPassword(); + return $this->getOutDocVersioning(); break; case 18: - return $this->getOutDocPdfSecurityOwnerPassword(); + return $this->getOutDocDestinationPath(); break; case 19: - return $this->getOutDocPdfSecurityPermissions(); + return $this->getOutDocTags(); break; case 20: + return $this->getOutDocPdfSecurityEnabled(); + break; + case 21: + return $this->getOutDocPdfSecurityOpenPassword(); + break; + case 22: + return $this->getOutDocPdfSecurityOwnerPassword(); + break; + case 23: + return $this->getOutDocPdfSecurityPermissions(); + break; + case 24: return $this->getOutDocOpenType(); break; default: @@ -1212,26 +1388,30 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent $keys = OutputDocumentPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getOutDocUid(), - $keys[1] => $this->getProUid(), - $keys[2] => $this->getOutDocReportGenerator(), - $keys[3] => $this->getOutDocLandscape(), - $keys[4] => $this->getOutDocMedia(), - $keys[5] => $this->getOutDocLeftMargin(), - $keys[6] => $this->getOutDocRightMargin(), - $keys[7] => $this->getOutDocTopMargin(), - $keys[8] => $this->getOutDocBottomMargin(), - $keys[9] => $this->getOutDocGenerate(), - $keys[10] => $this->getOutDocType(), - $keys[11] => $this->getOutDocCurrentRevision(), - $keys[12] => $this->getOutDocFieldMapping(), - $keys[13] => $this->getOutDocVersioning(), - $keys[14] => $this->getOutDocDestinationPath(), - $keys[15] => $this->getOutDocTags(), - $keys[16] => $this->getOutDocPdfSecurityEnabled(), - $keys[17] => $this->getOutDocPdfSecurityOpenPassword(), - $keys[18] => $this->getOutDocPdfSecurityOwnerPassword(), - $keys[19] => $this->getOutDocPdfSecurityPermissions(), - $keys[20] => $this->getOutDocOpenType(), + $keys[1] => $this->getOutDocTitle(), + $keys[2] => $this->getOutDocDescription(), + $keys[3] => $this->getOutDocFilename(), + $keys[4] => $this->getOutDocTemplate(), + $keys[5] => $this->getProUid(), + $keys[6] => $this->getOutDocReportGenerator(), + $keys[7] => $this->getOutDocLandscape(), + $keys[8] => $this->getOutDocMedia(), + $keys[9] => $this->getOutDocLeftMargin(), + $keys[10] => $this->getOutDocRightMargin(), + $keys[11] => $this->getOutDocTopMargin(), + $keys[12] => $this->getOutDocBottomMargin(), + $keys[13] => $this->getOutDocGenerate(), + $keys[14] => $this->getOutDocType(), + $keys[15] => $this->getOutDocCurrentRevision(), + $keys[16] => $this->getOutDocFieldMapping(), + $keys[17] => $this->getOutDocVersioning(), + $keys[18] => $this->getOutDocDestinationPath(), + $keys[19] => $this->getOutDocTags(), + $keys[20] => $this->getOutDocPdfSecurityEnabled(), + $keys[21] => $this->getOutDocPdfSecurityOpenPassword(), + $keys[22] => $this->getOutDocPdfSecurityOwnerPassword(), + $keys[23] => $this->getOutDocPdfSecurityPermissions(), + $keys[24] => $this->getOutDocOpenType(), ); return $result; } @@ -1267,63 +1447,75 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent $this->setOutDocUid($value); break; case 1: - $this->setProUid($value); + $this->setOutDocTitle($value); break; case 2: - $this->setOutDocReportGenerator($value); + $this->setOutDocDescription($value); break; case 3: - $this->setOutDocLandscape($value); + $this->setOutDocFilename($value); break; case 4: - $this->setOutDocMedia($value); + $this->setOutDocTemplate($value); break; case 5: - $this->setOutDocLeftMargin($value); + $this->setProUid($value); break; case 6: - $this->setOutDocRightMargin($value); + $this->setOutDocReportGenerator($value); break; case 7: - $this->setOutDocTopMargin($value); + $this->setOutDocLandscape($value); break; case 8: - $this->setOutDocBottomMargin($value); + $this->setOutDocMedia($value); break; case 9: - $this->setOutDocGenerate($value); + $this->setOutDocLeftMargin($value); break; case 10: - $this->setOutDocType($value); + $this->setOutDocRightMargin($value); break; case 11: - $this->setOutDocCurrentRevision($value); + $this->setOutDocTopMargin($value); break; case 12: - $this->setOutDocFieldMapping($value); + $this->setOutDocBottomMargin($value); break; case 13: - $this->setOutDocVersioning($value); + $this->setOutDocGenerate($value); break; case 14: - $this->setOutDocDestinationPath($value); + $this->setOutDocType($value); break; case 15: - $this->setOutDocTags($value); + $this->setOutDocCurrentRevision($value); break; case 16: - $this->setOutDocPdfSecurityEnabled($value); + $this->setOutDocFieldMapping($value); break; case 17: - $this->setOutDocPdfSecurityOpenPassword($value); + $this->setOutDocVersioning($value); break; case 18: - $this->setOutDocPdfSecurityOwnerPassword($value); + $this->setOutDocDestinationPath($value); break; case 19: - $this->setOutDocPdfSecurityPermissions($value); + $this->setOutDocTags($value); break; case 20: + $this->setOutDocPdfSecurityEnabled($value); + break; + case 21: + $this->setOutDocPdfSecurityOpenPassword($value); + break; + case 22: + $this->setOutDocPdfSecurityOwnerPassword($value); + break; + case 23: + $this->setOutDocPdfSecurityPermissions($value); + break; + case 24: $this->setOutDocOpenType($value); break; } // switch() @@ -1354,83 +1546,99 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setProUid($arr[$keys[1]]); + $this->setOutDocTitle($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setOutDocReportGenerator($arr[$keys[2]]); + $this->setOutDocDescription($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setOutDocLandscape($arr[$keys[3]]); + $this->setOutDocFilename($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setOutDocMedia($arr[$keys[4]]); + $this->setOutDocTemplate($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setOutDocLeftMargin($arr[$keys[5]]); + $this->setProUid($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setOutDocRightMargin($arr[$keys[6]]); + $this->setOutDocReportGenerator($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setOutDocTopMargin($arr[$keys[7]]); + $this->setOutDocLandscape($arr[$keys[7]]); } if (array_key_exists($keys[8], $arr)) { - $this->setOutDocBottomMargin($arr[$keys[8]]); + $this->setOutDocMedia($arr[$keys[8]]); } if (array_key_exists($keys[9], $arr)) { - $this->setOutDocGenerate($arr[$keys[9]]); + $this->setOutDocLeftMargin($arr[$keys[9]]); } if (array_key_exists($keys[10], $arr)) { - $this->setOutDocType($arr[$keys[10]]); + $this->setOutDocRightMargin($arr[$keys[10]]); } if (array_key_exists($keys[11], $arr)) { - $this->setOutDocCurrentRevision($arr[$keys[11]]); + $this->setOutDocTopMargin($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setOutDocFieldMapping($arr[$keys[12]]); + $this->setOutDocBottomMargin($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setOutDocVersioning($arr[$keys[13]]); + $this->setOutDocGenerate($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setOutDocDestinationPath($arr[$keys[14]]); + $this->setOutDocType($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setOutDocTags($arr[$keys[15]]); + $this->setOutDocCurrentRevision($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setOutDocPdfSecurityEnabled($arr[$keys[16]]); + $this->setOutDocFieldMapping($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setOutDocPdfSecurityOpenPassword($arr[$keys[17]]); + $this->setOutDocVersioning($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setOutDocPdfSecurityOwnerPassword($arr[$keys[18]]); + $this->setOutDocDestinationPath($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setOutDocPdfSecurityPermissions($arr[$keys[19]]); + $this->setOutDocTags($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setOutDocOpenType($arr[$keys[20]]); + $this->setOutDocPdfSecurityEnabled($arr[$keys[20]]); + } + + if (array_key_exists($keys[21], $arr)) { + $this->setOutDocPdfSecurityOpenPassword($arr[$keys[21]]); + } + + if (array_key_exists($keys[22], $arr)) { + $this->setOutDocPdfSecurityOwnerPassword($arr[$keys[22]]); + } + + if (array_key_exists($keys[23], $arr)) { + $this->setOutDocPdfSecurityPermissions($arr[$keys[23]]); + } + + if (array_key_exists($keys[24], $arr)) { + $this->setOutDocOpenType($arr[$keys[24]]); } } @@ -1448,6 +1656,22 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent $criteria->add(OutputDocumentPeer::OUT_DOC_UID, $this->out_doc_uid); } + if ($this->isColumnModified(OutputDocumentPeer::OUT_DOC_TITLE)) { + $criteria->add(OutputDocumentPeer::OUT_DOC_TITLE, $this->out_doc_title); + } + + if ($this->isColumnModified(OutputDocumentPeer::OUT_DOC_DESCRIPTION)) { + $criteria->add(OutputDocumentPeer::OUT_DOC_DESCRIPTION, $this->out_doc_description); + } + + if ($this->isColumnModified(OutputDocumentPeer::OUT_DOC_FILENAME)) { + $criteria->add(OutputDocumentPeer::OUT_DOC_FILENAME, $this->out_doc_filename); + } + + if ($this->isColumnModified(OutputDocumentPeer::OUT_DOC_TEMPLATE)) { + $criteria->add(OutputDocumentPeer::OUT_DOC_TEMPLATE, $this->out_doc_template); + } + if ($this->isColumnModified(OutputDocumentPeer::PRO_UID)) { $criteria->add(OutputDocumentPeer::PRO_UID, $this->pro_uid); } @@ -1582,6 +1806,14 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setOutDocTitle($this->out_doc_title); + + $copyObj->setOutDocDescription($this->out_doc_description); + + $copyObj->setOutDocFilename($this->out_doc_filename); + + $copyObj->setOutDocTemplate($this->out_doc_template); + $copyObj->setProUid($this->pro_uid); $copyObj->setOutDocReportGenerator($this->out_doc_report_generator); diff --git a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php index f6b2c4744..be18142a0 100644 --- a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php +++ b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php @@ -25,7 +25,7 @@ abstract class BaseOutputDocumentPeer const CLASS_DEFAULT = 'classes.model.OutputDocument'; /** The total number of columns. */ - const NUM_COLUMNS = 21; + const NUM_COLUMNS = 25; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,18 @@ abstract class BaseOutputDocumentPeer /** the column name for the OUT_DOC_UID field */ const OUT_DOC_UID = 'OUTPUT_DOCUMENT.OUT_DOC_UID'; + /** the column name for the OUT_DOC_TITLE field */ + const OUT_DOC_TITLE = 'OUTPUT_DOCUMENT.OUT_DOC_TITLE'; + + /** the column name for the OUT_DOC_DESCRIPTION field */ + const OUT_DOC_DESCRIPTION = 'OUTPUT_DOCUMENT.OUT_DOC_DESCRIPTION'; + + /** the column name for the OUT_DOC_FILENAME field */ + const OUT_DOC_FILENAME = 'OUTPUT_DOCUMENT.OUT_DOC_FILENAME'; + + /** the column name for the OUT_DOC_TEMPLATE field */ + const OUT_DOC_TEMPLATE = 'OUTPUT_DOCUMENT.OUT_DOC_TEMPLATE'; + /** the column name for the PRO_UID field */ const PRO_UID = 'OUTPUT_DOCUMENT.PRO_UID'; @@ -105,10 +117,10 @@ abstract class BaseOutputDocumentPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('OutDocUid', 'ProUid', 'OutDocReportGenerator', 'OutDocLandscape', 'OutDocMedia', 'OutDocLeftMargin', 'OutDocRightMargin', 'OutDocTopMargin', 'OutDocBottomMargin', 'OutDocGenerate', 'OutDocType', 'OutDocCurrentRevision', 'OutDocFieldMapping', 'OutDocVersioning', 'OutDocDestinationPath', 'OutDocTags', 'OutDocPdfSecurityEnabled', 'OutDocPdfSecurityOpenPassword', 'OutDocPdfSecurityOwnerPassword', 'OutDocPdfSecurityPermissions', 'OutDocOpenType', ), - BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID, OutputDocumentPeer::PRO_UID, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR, OutputDocumentPeer::OUT_DOC_LANDSCAPE, OutputDocumentPeer::OUT_DOC_MEDIA, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN, OutputDocumentPeer::OUT_DOC_TOP_MARGIN, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN, OutputDocumentPeer::OUT_DOC_GENERATE, OutputDocumentPeer::OUT_DOC_TYPE, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING, OutputDocumentPeer::OUT_DOC_VERSIONING, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH, OutputDocumentPeer::OUT_DOC_TAGS, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS, OutputDocumentPeer::OUT_DOC_OPEN_TYPE, ), - BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID', 'PRO_UID', 'OUT_DOC_REPORT_GENERATOR', 'OUT_DOC_LANDSCAPE', 'OUT_DOC_MEDIA', 'OUT_DOC_LEFT_MARGIN', 'OUT_DOC_RIGHT_MARGIN', 'OUT_DOC_TOP_MARGIN', 'OUT_DOC_BOTTOM_MARGIN', 'OUT_DOC_GENERATE', 'OUT_DOC_TYPE', 'OUT_DOC_CURRENT_REVISION', 'OUT_DOC_FIELD_MAPPING', 'OUT_DOC_VERSIONING', 'OUT_DOC_DESTINATION_PATH', 'OUT_DOC_TAGS', 'OUT_DOC_PDF_SECURITY_ENABLED', 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD', 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD', 'OUT_DOC_PDF_SECURITY_PERMISSIONS', 'OUT_DOC_OPEN_TYPE', ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('OutDocUid', 'OutDocTitle', 'OutDocDescription', 'OutDocFilename', 'OutDocTemplate', 'ProUid', 'OutDocReportGenerator', 'OutDocLandscape', 'OutDocMedia', 'OutDocLeftMargin', 'OutDocRightMargin', 'OutDocTopMargin', 'OutDocBottomMargin', 'OutDocGenerate', 'OutDocType', 'OutDocCurrentRevision', 'OutDocFieldMapping', 'OutDocVersioning', 'OutDocDestinationPath', 'OutDocTags', 'OutDocPdfSecurityEnabled', 'OutDocPdfSecurityOpenPassword', 'OutDocPdfSecurityOwnerPassword', 'OutDocPdfSecurityPermissions', 'OutDocOpenType', ), + BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID, OutputDocumentPeer::OUT_DOC_TITLE, OutputDocumentPeer::OUT_DOC_DESCRIPTION, OutputDocumentPeer::OUT_DOC_FILENAME, OutputDocumentPeer::OUT_DOC_TEMPLATE, OutputDocumentPeer::PRO_UID, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR, OutputDocumentPeer::OUT_DOC_LANDSCAPE, OutputDocumentPeer::OUT_DOC_MEDIA, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN, OutputDocumentPeer::OUT_DOC_TOP_MARGIN, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN, OutputDocumentPeer::OUT_DOC_GENERATE, OutputDocumentPeer::OUT_DOC_TYPE, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING, OutputDocumentPeer::OUT_DOC_VERSIONING, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH, OutputDocumentPeer::OUT_DOC_TAGS, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS, OutputDocumentPeer::OUT_DOC_OPEN_TYPE, ), + BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID', 'OUT_DOC_TITLE', 'OUT_DOC_DESCRIPTION', 'OUT_DOC_FILENAME', 'OUT_DOC_TEMPLATE', 'PRO_UID', 'OUT_DOC_REPORT_GENERATOR', 'OUT_DOC_LANDSCAPE', 'OUT_DOC_MEDIA', 'OUT_DOC_LEFT_MARGIN', 'OUT_DOC_RIGHT_MARGIN', 'OUT_DOC_TOP_MARGIN', 'OUT_DOC_BOTTOM_MARGIN', 'OUT_DOC_GENERATE', 'OUT_DOC_TYPE', 'OUT_DOC_CURRENT_REVISION', 'OUT_DOC_FIELD_MAPPING', 'OUT_DOC_VERSIONING', 'OUT_DOC_DESTINATION_PATH', 'OUT_DOC_TAGS', 'OUT_DOC_PDF_SECURITY_ENABLED', 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD', 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD', 'OUT_DOC_PDF_SECURITY_PERMISSIONS', 'OUT_DOC_OPEN_TYPE', ), + 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, 24, ) ); /** @@ -118,10 +130,10 @@ abstract class BaseOutputDocumentPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('OutDocUid' => 0, 'ProUid' => 1, 'OutDocReportGenerator' => 2, 'OutDocLandscape' => 3, 'OutDocMedia' => 4, 'OutDocLeftMargin' => 5, 'OutDocRightMargin' => 6, 'OutDocTopMargin' => 7, 'OutDocBottomMargin' => 8, 'OutDocGenerate' => 9, 'OutDocType' => 10, 'OutDocCurrentRevision' => 11, 'OutDocFieldMapping' => 12, 'OutDocVersioning' => 13, 'OutDocDestinationPath' => 14, 'OutDocTags' => 15, 'OutDocPdfSecurityEnabled' => 16, 'OutDocPdfSecurityOpenPassword' => 17, 'OutDocPdfSecurityOwnerPassword' => 18, 'OutDocPdfSecurityPermissions' => 19, 'OutDocOpenType' => 20, ), - BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID => 0, OutputDocumentPeer::PRO_UID => 1, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR => 2, OutputDocumentPeer::OUT_DOC_LANDSCAPE => 3, OutputDocumentPeer::OUT_DOC_MEDIA => 4, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN => 5, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN => 6, OutputDocumentPeer::OUT_DOC_TOP_MARGIN => 7, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN => 8, OutputDocumentPeer::OUT_DOC_GENERATE => 9, OutputDocumentPeer::OUT_DOC_TYPE => 10, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION => 11, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING => 12, OutputDocumentPeer::OUT_DOC_VERSIONING => 13, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH => 14, OutputDocumentPeer::OUT_DOC_TAGS => 15, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED => 16, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD => 17, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD => 18, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS => 19, OutputDocumentPeer::OUT_DOC_OPEN_TYPE => 20, ), - BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID' => 0, 'PRO_UID' => 1, 'OUT_DOC_REPORT_GENERATOR' => 2, 'OUT_DOC_LANDSCAPE' => 3, 'OUT_DOC_MEDIA' => 4, 'OUT_DOC_LEFT_MARGIN' => 5, 'OUT_DOC_RIGHT_MARGIN' => 6, 'OUT_DOC_TOP_MARGIN' => 7, 'OUT_DOC_BOTTOM_MARGIN' => 8, 'OUT_DOC_GENERATE' => 9, 'OUT_DOC_TYPE' => 10, 'OUT_DOC_CURRENT_REVISION' => 11, 'OUT_DOC_FIELD_MAPPING' => 12, 'OUT_DOC_VERSIONING' => 13, 'OUT_DOC_DESTINATION_PATH' => 14, 'OUT_DOC_TAGS' => 15, 'OUT_DOC_PDF_SECURITY_ENABLED' => 16, 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD' => 17, 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD' => 18, 'OUT_DOC_PDF_SECURITY_PERMISSIONS' => 19, 'OUT_DOC_OPEN_TYPE' => 20, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('OutDocUid' => 0, 'OutDocTitle' => 1, 'OutDocDescription' => 2, 'OutDocFilename' => 3, 'OutDocTemplate' => 4, 'ProUid' => 5, 'OutDocReportGenerator' => 6, 'OutDocLandscape' => 7, 'OutDocMedia' => 8, 'OutDocLeftMargin' => 9, 'OutDocRightMargin' => 10, 'OutDocTopMargin' => 11, 'OutDocBottomMargin' => 12, 'OutDocGenerate' => 13, 'OutDocType' => 14, 'OutDocCurrentRevision' => 15, 'OutDocFieldMapping' => 16, 'OutDocVersioning' => 17, 'OutDocDestinationPath' => 18, 'OutDocTags' => 19, 'OutDocPdfSecurityEnabled' => 20, 'OutDocPdfSecurityOpenPassword' => 21, 'OutDocPdfSecurityOwnerPassword' => 22, 'OutDocPdfSecurityPermissions' => 23, 'OutDocOpenType' => 24, ), + BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID => 0, OutputDocumentPeer::OUT_DOC_TITLE => 1, OutputDocumentPeer::OUT_DOC_DESCRIPTION => 2, OutputDocumentPeer::OUT_DOC_FILENAME => 3, OutputDocumentPeer::OUT_DOC_TEMPLATE => 4, OutputDocumentPeer::PRO_UID => 5, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR => 6, OutputDocumentPeer::OUT_DOC_LANDSCAPE => 7, OutputDocumentPeer::OUT_DOC_MEDIA => 8, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN => 9, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN => 10, OutputDocumentPeer::OUT_DOC_TOP_MARGIN => 11, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN => 12, OutputDocumentPeer::OUT_DOC_GENERATE => 13, OutputDocumentPeer::OUT_DOC_TYPE => 14, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION => 15, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING => 16, OutputDocumentPeer::OUT_DOC_VERSIONING => 17, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH => 18, OutputDocumentPeer::OUT_DOC_TAGS => 19, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED => 20, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD => 21, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD => 22, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS => 23, OutputDocumentPeer::OUT_DOC_OPEN_TYPE => 24, ), + BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID' => 0, 'OUT_DOC_TITLE' => 1, 'OUT_DOC_DESCRIPTION' => 2, 'OUT_DOC_FILENAME' => 3, 'OUT_DOC_TEMPLATE' => 4, 'PRO_UID' => 5, 'OUT_DOC_REPORT_GENERATOR' => 6, 'OUT_DOC_LANDSCAPE' => 7, 'OUT_DOC_MEDIA' => 8, 'OUT_DOC_LEFT_MARGIN' => 9, 'OUT_DOC_RIGHT_MARGIN' => 10, 'OUT_DOC_TOP_MARGIN' => 11, 'OUT_DOC_BOTTOM_MARGIN' => 12, 'OUT_DOC_GENERATE' => 13, 'OUT_DOC_TYPE' => 14, 'OUT_DOC_CURRENT_REVISION' => 15, 'OUT_DOC_FIELD_MAPPING' => 16, 'OUT_DOC_VERSIONING' => 17, 'OUT_DOC_DESTINATION_PATH' => 18, 'OUT_DOC_TAGS' => 19, 'OUT_DOC_PDF_SECURITY_ENABLED' => 20, 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD' => 21, 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD' => 22, 'OUT_DOC_PDF_SECURITY_PERMISSIONS' => 23, 'OUT_DOC_OPEN_TYPE' => 24, ), + 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, 24, ) ); /** @@ -224,6 +236,14 @@ abstract class BaseOutputDocumentPeer $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_UID); + $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TITLE); + + $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_DESCRIPTION); + + $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_FILENAME); + + $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_TEMPLATE); + $criteria->addSelectColumn(OutputDocumentPeer::PRO_UID); $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR); diff --git a/workflow/engine/classes/model/om/BaseReportTable.php b/workflow/engine/classes/model/om/BaseReportTable.php index e8af3691d..88da5f3a3 100644 --- a/workflow/engine/classes/model/om/BaseReportTable.php +++ b/workflow/engine/classes/model/om/BaseReportTable.php @@ -33,6 +33,12 @@ abstract class BaseReportTable extends BaseObject implements Persistent */ protected $rep_tab_uid = ''; + /** + * The value for the rep_tab_title field. + * @var string + */ + protected $rep_tab_title; + /** * The value for the pro_uid field. * @var string @@ -100,6 +106,17 @@ abstract class BaseReportTable extends BaseObject implements Persistent return $this->rep_tab_uid; } + /** + * Get the [rep_tab_title] column value. + * + * @return string + */ + public function getRepTabTitle() + { + + return $this->rep_tab_title; + } + /** * Get the [pro_uid] column value. * @@ -220,6 +237,28 @@ abstract class BaseReportTable extends BaseObject implements Persistent } // setRepTabUid() + /** + * Set the value of [rep_tab_title] column. + * + * @param string $v new value + * @return void + */ + public function setRepTabTitle($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->rep_tab_title !== $v) { + $this->rep_tab_title = $v; + $this->modifiedColumns[] = ReportTablePeer::REP_TAB_TITLE; + } + + } // setRepTabTitle() + /** * Set the value of [pro_uid] column. * @@ -400,26 +439,28 @@ abstract class BaseReportTable extends BaseObject implements Persistent $this->rep_tab_uid = $rs->getString($startcol + 0); - $this->pro_uid = $rs->getString($startcol + 1); + $this->rep_tab_title = $rs->getString($startcol + 1); - $this->rep_tab_name = $rs->getString($startcol + 2); + $this->pro_uid = $rs->getString($startcol + 2); - $this->rep_tab_type = $rs->getString($startcol + 3); + $this->rep_tab_name = $rs->getString($startcol + 3); - $this->rep_tab_grid = $rs->getString($startcol + 4); + $this->rep_tab_type = $rs->getString($startcol + 4); - $this->rep_tab_connection = $rs->getString($startcol + 5); + $this->rep_tab_grid = $rs->getString($startcol + 5); - $this->rep_tab_create_date = $rs->getTimestamp($startcol + 6, null); + $this->rep_tab_connection = $rs->getString($startcol + 6); - $this->rep_tab_status = $rs->getString($startcol + 7); + $this->rep_tab_create_date = $rs->getTimestamp($startcol + 7, null); + + $this->rep_tab_status = $rs->getString($startcol + 8); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 8; // 8 = ReportTablePeer::NUM_COLUMNS - ReportTablePeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 9; // 9 = ReportTablePeer::NUM_COLUMNS - ReportTablePeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ReportTable object", $e); @@ -627,24 +668,27 @@ abstract class BaseReportTable extends BaseObject implements Persistent return $this->getRepTabUid(); break; case 1: - return $this->getProUid(); + return $this->getRepTabTitle(); break; case 2: - return $this->getRepTabName(); + return $this->getProUid(); break; case 3: - return $this->getRepTabType(); + return $this->getRepTabName(); break; case 4: - return $this->getRepTabGrid(); + return $this->getRepTabType(); break; case 5: - return $this->getRepTabConnection(); + return $this->getRepTabGrid(); break; case 6: - return $this->getRepTabCreateDate(); + return $this->getRepTabConnection(); break; case 7: + return $this->getRepTabCreateDate(); + break; + case 8: return $this->getRepTabStatus(); break; default: @@ -668,13 +712,14 @@ abstract class BaseReportTable extends BaseObject implements Persistent $keys = ReportTablePeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getRepTabUid(), - $keys[1] => $this->getProUid(), - $keys[2] => $this->getRepTabName(), - $keys[3] => $this->getRepTabType(), - $keys[4] => $this->getRepTabGrid(), - $keys[5] => $this->getRepTabConnection(), - $keys[6] => $this->getRepTabCreateDate(), - $keys[7] => $this->getRepTabStatus(), + $keys[1] => $this->getRepTabTitle(), + $keys[2] => $this->getProUid(), + $keys[3] => $this->getRepTabName(), + $keys[4] => $this->getRepTabType(), + $keys[5] => $this->getRepTabGrid(), + $keys[6] => $this->getRepTabConnection(), + $keys[7] => $this->getRepTabCreateDate(), + $keys[8] => $this->getRepTabStatus(), ); return $result; } @@ -710,24 +755,27 @@ abstract class BaseReportTable extends BaseObject implements Persistent $this->setRepTabUid($value); break; case 1: - $this->setProUid($value); + $this->setRepTabTitle($value); break; case 2: - $this->setRepTabName($value); + $this->setProUid($value); break; case 3: - $this->setRepTabType($value); + $this->setRepTabName($value); break; case 4: - $this->setRepTabGrid($value); + $this->setRepTabType($value); break; case 5: - $this->setRepTabConnection($value); + $this->setRepTabGrid($value); break; case 6: - $this->setRepTabCreateDate($value); + $this->setRepTabConnection($value); break; case 7: + $this->setRepTabCreateDate($value); + break; + case 8: $this->setRepTabStatus($value); break; } // switch() @@ -758,31 +806,35 @@ abstract class BaseReportTable extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setProUid($arr[$keys[1]]); + $this->setRepTabTitle($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setRepTabName($arr[$keys[2]]); + $this->setProUid($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setRepTabType($arr[$keys[3]]); + $this->setRepTabName($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setRepTabGrid($arr[$keys[4]]); + $this->setRepTabType($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setRepTabConnection($arr[$keys[5]]); + $this->setRepTabGrid($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setRepTabCreateDate($arr[$keys[6]]); + $this->setRepTabConnection($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setRepTabStatus($arr[$keys[7]]); + $this->setRepTabCreateDate($arr[$keys[7]]); + } + + if (array_key_exists($keys[8], $arr)) { + $this->setRepTabStatus($arr[$keys[8]]); } } @@ -800,6 +852,10 @@ abstract class BaseReportTable extends BaseObject implements Persistent $criteria->add(ReportTablePeer::REP_TAB_UID, $this->rep_tab_uid); } + if ($this->isColumnModified(ReportTablePeer::REP_TAB_TITLE)) { + $criteria->add(ReportTablePeer::REP_TAB_TITLE, $this->rep_tab_title); + } + if ($this->isColumnModified(ReportTablePeer::PRO_UID)) { $criteria->add(ReportTablePeer::PRO_UID, $this->pro_uid); } @@ -882,6 +938,8 @@ abstract class BaseReportTable extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setRepTabTitle($this->rep_tab_title); + $copyObj->setProUid($this->pro_uid); $copyObj->setRepTabName($this->rep_tab_name); diff --git a/workflow/engine/classes/model/om/BaseReportTablePeer.php b/workflow/engine/classes/model/om/BaseReportTablePeer.php index aa3d05563..5bc18ab46 100644 --- a/workflow/engine/classes/model/om/BaseReportTablePeer.php +++ b/workflow/engine/classes/model/om/BaseReportTablePeer.php @@ -25,7 +25,7 @@ abstract class BaseReportTablePeer const CLASS_DEFAULT = 'classes.model.ReportTable'; /** The total number of columns. */ - const NUM_COLUMNS = 8; + const NUM_COLUMNS = 9; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,9 @@ abstract class BaseReportTablePeer /** the column name for the REP_TAB_UID field */ const REP_TAB_UID = 'REPORT_TABLE.REP_TAB_UID'; + /** the column name for the REP_TAB_TITLE field */ + const REP_TAB_TITLE = 'REPORT_TABLE.REP_TAB_TITLE'; + /** the column name for the PRO_UID field */ const PRO_UID = 'REPORT_TABLE.PRO_UID'; @@ -66,10 +69,10 @@ abstract class BaseReportTablePeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('RepTabUid', 'ProUid', 'RepTabName', 'RepTabType', 'RepTabGrid', 'RepTabConnection', 'RepTabCreateDate', 'RepTabStatus', ), - BasePeer::TYPE_COLNAME => array (ReportTablePeer::REP_TAB_UID, ReportTablePeer::PRO_UID, ReportTablePeer::REP_TAB_NAME, ReportTablePeer::REP_TAB_TYPE, ReportTablePeer::REP_TAB_GRID, ReportTablePeer::REP_TAB_CONNECTION, ReportTablePeer::REP_TAB_CREATE_DATE, ReportTablePeer::REP_TAB_STATUS, ), - BasePeer::TYPE_FIELDNAME => array ('REP_TAB_UID', 'PRO_UID', 'REP_TAB_NAME', 'REP_TAB_TYPE', 'REP_TAB_GRID', 'REP_TAB_CONNECTION', 'REP_TAB_CREATE_DATE', 'REP_TAB_STATUS', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) + BasePeer::TYPE_PHPNAME => array ('RepTabUid', 'RepTabTitle', 'ProUid', 'RepTabName', 'RepTabType', 'RepTabGrid', 'RepTabConnection', 'RepTabCreateDate', 'RepTabStatus', ), + BasePeer::TYPE_COLNAME => array (ReportTablePeer::REP_TAB_UID, ReportTablePeer::REP_TAB_TITLE, ReportTablePeer::PRO_UID, ReportTablePeer::REP_TAB_NAME, ReportTablePeer::REP_TAB_TYPE, ReportTablePeer::REP_TAB_GRID, ReportTablePeer::REP_TAB_CONNECTION, ReportTablePeer::REP_TAB_CREATE_DATE, ReportTablePeer::REP_TAB_STATUS, ), + BasePeer::TYPE_FIELDNAME => array ('REP_TAB_UID', 'REP_TAB_TITLE', 'PRO_UID', 'REP_TAB_NAME', 'REP_TAB_TYPE', 'REP_TAB_GRID', 'REP_TAB_CONNECTION', 'REP_TAB_CREATE_DATE', 'REP_TAB_STATUS', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, ) ); /** @@ -79,10 +82,10 @@ abstract class BaseReportTablePeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('RepTabUid' => 0, 'ProUid' => 1, 'RepTabName' => 2, 'RepTabType' => 3, 'RepTabGrid' => 4, 'RepTabConnection' => 5, 'RepTabCreateDate' => 6, 'RepTabStatus' => 7, ), - BasePeer::TYPE_COLNAME => array (ReportTablePeer::REP_TAB_UID => 0, ReportTablePeer::PRO_UID => 1, ReportTablePeer::REP_TAB_NAME => 2, ReportTablePeer::REP_TAB_TYPE => 3, ReportTablePeer::REP_TAB_GRID => 4, ReportTablePeer::REP_TAB_CONNECTION => 5, ReportTablePeer::REP_TAB_CREATE_DATE => 6, ReportTablePeer::REP_TAB_STATUS => 7, ), - BasePeer::TYPE_FIELDNAME => array ('REP_TAB_UID' => 0, 'PRO_UID' => 1, 'REP_TAB_NAME' => 2, 'REP_TAB_TYPE' => 3, 'REP_TAB_GRID' => 4, 'REP_TAB_CONNECTION' => 5, 'REP_TAB_CREATE_DATE' => 6, 'REP_TAB_STATUS' => 7, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) + BasePeer::TYPE_PHPNAME => array ('RepTabUid' => 0, 'RepTabTitle' => 1, 'ProUid' => 2, 'RepTabName' => 3, 'RepTabType' => 4, 'RepTabGrid' => 5, 'RepTabConnection' => 6, 'RepTabCreateDate' => 7, 'RepTabStatus' => 8, ), + BasePeer::TYPE_COLNAME => array (ReportTablePeer::REP_TAB_UID => 0, ReportTablePeer::REP_TAB_TITLE => 1, ReportTablePeer::PRO_UID => 2, ReportTablePeer::REP_TAB_NAME => 3, ReportTablePeer::REP_TAB_TYPE => 4, ReportTablePeer::REP_TAB_GRID => 5, ReportTablePeer::REP_TAB_CONNECTION => 6, ReportTablePeer::REP_TAB_CREATE_DATE => 7, ReportTablePeer::REP_TAB_STATUS => 8, ), + BasePeer::TYPE_FIELDNAME => array ('REP_TAB_UID' => 0, 'REP_TAB_TITLE' => 1, 'PRO_UID' => 2, 'REP_TAB_NAME' => 3, 'REP_TAB_TYPE' => 4, 'REP_TAB_GRID' => 5, 'REP_TAB_CONNECTION' => 6, 'REP_TAB_CREATE_DATE' => 7, 'REP_TAB_STATUS' => 8, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, ) ); /** @@ -185,6 +188,8 @@ abstract class BaseReportTablePeer $criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID); + $criteria->addSelectColumn(ReportTablePeer::REP_TAB_TITLE); + $criteria->addSelectColumn(ReportTablePeer::PRO_UID); $criteria->addSelectColumn(ReportTablePeer::REP_TAB_NAME); diff --git a/workflow/engine/classes/model/om/BaseTriggers.php b/workflow/engine/classes/model/om/BaseTriggers.php index 4ed1ff21f..c456637c5 100644 --- a/workflow/engine/classes/model/om/BaseTriggers.php +++ b/workflow/engine/classes/model/om/BaseTriggers.php @@ -33,6 +33,18 @@ abstract class BaseTriggers extends BaseObject implements Persistent */ protected $tri_uid = ''; + /** + * The value for the tri_title field. + * @var string + */ + protected $tri_title; + + /** + * The value for the tri_description field. + * @var string + */ + protected $tri_description; + /** * The value for the pro_uid field. * @var string @@ -82,6 +94,28 @@ abstract class BaseTriggers extends BaseObject implements Persistent return $this->tri_uid; } + /** + * Get the [tri_title] column value. + * + * @return string + */ + public function getTriTitle() + { + + return $this->tri_title; + } + + /** + * Get the [tri_description] column value. + * + * @return string + */ + public function getTriDescription() + { + + return $this->tri_description; + } + /** * Get the [pro_uid] column value. * @@ -148,6 +182,50 @@ abstract class BaseTriggers extends BaseObject implements Persistent } // setTriUid() + /** + * Set the value of [tri_title] column. + * + * @param string $v new value + * @return void + */ + public function setTriTitle($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->tri_title !== $v) { + $this->tri_title = $v; + $this->modifiedColumns[] = TriggersPeer::TRI_TITLE; + } + + } // setTriTitle() + + /** + * Set the value of [tri_description] column. + * + * @param string $v new value + * @return void + */ + public function setTriDescription($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->tri_description !== $v) { + $this->tri_description = $v; + $this->modifiedColumns[] = TriggersPeer::TRI_DESCRIPTION; + } + + } // setTriDescription() + /** * Set the value of [pro_uid] column. * @@ -255,20 +333,24 @@ abstract class BaseTriggers extends BaseObject implements Persistent $this->tri_uid = $rs->getString($startcol + 0); - $this->pro_uid = $rs->getString($startcol + 1); + $this->tri_title = $rs->getString($startcol + 1); - $this->tri_type = $rs->getString($startcol + 2); + $this->tri_description = $rs->getString($startcol + 2); - $this->tri_webbot = $rs->getString($startcol + 3); + $this->pro_uid = $rs->getString($startcol + 3); - $this->tri_param = $rs->getString($startcol + 4); + $this->tri_type = $rs->getString($startcol + 4); + + $this->tri_webbot = $rs->getString($startcol + 5); + + $this->tri_param = $rs->getString($startcol + 6); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 5; // 5 = TriggersPeer::NUM_COLUMNS - TriggersPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 7; // 7 = TriggersPeer::NUM_COLUMNS - TriggersPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Triggers object", $e); @@ -476,15 +558,21 @@ abstract class BaseTriggers extends BaseObject implements Persistent return $this->getTriUid(); break; case 1: - return $this->getProUid(); + return $this->getTriTitle(); break; case 2: - return $this->getTriType(); + return $this->getTriDescription(); break; case 3: - return $this->getTriWebbot(); + return $this->getProUid(); break; case 4: + return $this->getTriType(); + break; + case 5: + return $this->getTriWebbot(); + break; + case 6: return $this->getTriParam(); break; default: @@ -508,10 +596,12 @@ abstract class BaseTriggers extends BaseObject implements Persistent $keys = TriggersPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getTriUid(), - $keys[1] => $this->getProUid(), - $keys[2] => $this->getTriType(), - $keys[3] => $this->getTriWebbot(), - $keys[4] => $this->getTriParam(), + $keys[1] => $this->getTriTitle(), + $keys[2] => $this->getTriDescription(), + $keys[3] => $this->getProUid(), + $keys[4] => $this->getTriType(), + $keys[5] => $this->getTriWebbot(), + $keys[6] => $this->getTriParam(), ); return $result; } @@ -547,15 +637,21 @@ abstract class BaseTriggers extends BaseObject implements Persistent $this->setTriUid($value); break; case 1: - $this->setProUid($value); + $this->setTriTitle($value); break; case 2: - $this->setTriType($value); + $this->setTriDescription($value); break; case 3: - $this->setTriWebbot($value); + $this->setProUid($value); break; case 4: + $this->setTriType($value); + break; + case 5: + $this->setTriWebbot($value); + break; + case 6: $this->setTriParam($value); break; } // switch() @@ -586,19 +682,27 @@ abstract class BaseTriggers extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setProUid($arr[$keys[1]]); + $this->setTriTitle($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setTriType($arr[$keys[2]]); + $this->setTriDescription($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setTriWebbot($arr[$keys[3]]); + $this->setProUid($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setTriParam($arr[$keys[4]]); + $this->setTriType($arr[$keys[4]]); + } + + if (array_key_exists($keys[5], $arr)) { + $this->setTriWebbot($arr[$keys[5]]); + } + + if (array_key_exists($keys[6], $arr)) { + $this->setTriParam($arr[$keys[6]]); } } @@ -616,6 +720,14 @@ abstract class BaseTriggers extends BaseObject implements Persistent $criteria->add(TriggersPeer::TRI_UID, $this->tri_uid); } + if ($this->isColumnModified(TriggersPeer::TRI_TITLE)) { + $criteria->add(TriggersPeer::TRI_TITLE, $this->tri_title); + } + + if ($this->isColumnModified(TriggersPeer::TRI_DESCRIPTION)) { + $criteria->add(TriggersPeer::TRI_DESCRIPTION, $this->tri_description); + } + if ($this->isColumnModified(TriggersPeer::PRO_UID)) { $criteria->add(TriggersPeer::PRO_UID, $this->pro_uid); } @@ -686,6 +798,10 @@ abstract class BaseTriggers extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setTriTitle($this->tri_title); + + $copyObj->setTriDescription($this->tri_description); + $copyObj->setProUid($this->pro_uid); $copyObj->setTriType($this->tri_type); diff --git a/workflow/engine/classes/model/om/BaseTriggersPeer.php b/workflow/engine/classes/model/om/BaseTriggersPeer.php index e02f1f532..65b23dbfc 100644 --- a/workflow/engine/classes/model/om/BaseTriggersPeer.php +++ b/workflow/engine/classes/model/om/BaseTriggersPeer.php @@ -25,7 +25,7 @@ abstract class BaseTriggersPeer const CLASS_DEFAULT = 'classes.model.Triggers'; /** The total number of columns. */ - const NUM_COLUMNS = 5; + const NUM_COLUMNS = 7; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,12 @@ abstract class BaseTriggersPeer /** the column name for the TRI_UID field */ const TRI_UID = 'TRIGGERS.TRI_UID'; + /** the column name for the TRI_TITLE field */ + const TRI_TITLE = 'TRIGGERS.TRI_TITLE'; + + /** the column name for the TRI_DESCRIPTION field */ + const TRI_DESCRIPTION = 'TRIGGERS.TRI_DESCRIPTION'; + /** the column name for the PRO_UID field */ const PRO_UID = 'TRIGGERS.PRO_UID'; @@ -57,10 +63,10 @@ abstract class BaseTriggersPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('TriUid', 'ProUid', 'TriType', 'TriWebbot', 'TriParam', ), - BasePeer::TYPE_COLNAME => array (TriggersPeer::TRI_UID, TriggersPeer::PRO_UID, TriggersPeer::TRI_TYPE, TriggersPeer::TRI_WEBBOT, TriggersPeer::TRI_PARAM, ), - BasePeer::TYPE_FIELDNAME => array ('TRI_UID', 'PRO_UID', 'TRI_TYPE', 'TRI_WEBBOT', 'TRI_PARAM', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) + BasePeer::TYPE_PHPNAME => array ('TriUid', 'TriTitle', 'TriDescription', 'ProUid', 'TriType', 'TriWebbot', 'TriParam', ), + BasePeer::TYPE_COLNAME => array (TriggersPeer::TRI_UID, TriggersPeer::TRI_TITLE, TriggersPeer::TRI_DESCRIPTION, TriggersPeer::PRO_UID, TriggersPeer::TRI_TYPE, TriggersPeer::TRI_WEBBOT, TriggersPeer::TRI_PARAM, ), + BasePeer::TYPE_FIELDNAME => array ('TRI_UID', 'TRI_TITLE', 'TRI_DESCRIPTION', 'PRO_UID', 'TRI_TYPE', 'TRI_WEBBOT', 'TRI_PARAM', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) ); /** @@ -70,10 +76,10 @@ abstract class BaseTriggersPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('TriUid' => 0, 'ProUid' => 1, 'TriType' => 2, 'TriWebbot' => 3, 'TriParam' => 4, ), - BasePeer::TYPE_COLNAME => array (TriggersPeer::TRI_UID => 0, TriggersPeer::PRO_UID => 1, TriggersPeer::TRI_TYPE => 2, TriggersPeer::TRI_WEBBOT => 3, TriggersPeer::TRI_PARAM => 4, ), - BasePeer::TYPE_FIELDNAME => array ('TRI_UID' => 0, 'PRO_UID' => 1, 'TRI_TYPE' => 2, 'TRI_WEBBOT' => 3, 'TRI_PARAM' => 4, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) + BasePeer::TYPE_PHPNAME => array ('TriUid' => 0, 'TriTitle' => 1, 'TriDescription' => 2, 'ProUid' => 3, 'TriType' => 4, 'TriWebbot' => 5, 'TriParam' => 6, ), + BasePeer::TYPE_COLNAME => array (TriggersPeer::TRI_UID => 0, TriggersPeer::TRI_TITLE => 1, TriggersPeer::TRI_DESCRIPTION => 2, TriggersPeer::PRO_UID => 3, TriggersPeer::TRI_TYPE => 4, TriggersPeer::TRI_WEBBOT => 5, TriggersPeer::TRI_PARAM => 6, ), + BasePeer::TYPE_FIELDNAME => array ('TRI_UID' => 0, 'TRI_TITLE' => 1, 'TRI_DESCRIPTION' => 2, 'PRO_UID' => 3, 'TRI_TYPE' => 4, 'TRI_WEBBOT' => 5, 'TRI_PARAM' => 6, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) ); /** @@ -176,6 +182,10 @@ abstract class BaseTriggersPeer $criteria->addSelectColumn(TriggersPeer::TRI_UID); + $criteria->addSelectColumn(TriggersPeer::TRI_TITLE); + + $criteria->addSelectColumn(TriggersPeer::TRI_DESCRIPTION); + $criteria->addSelectColumn(TriggersPeer::PRO_UID); $criteria->addSelectColumn(TriggersPeer::TRI_TYPE); diff --git a/workflow/engine/classes/model/om/BaseWebEntryEvent.php b/workflow/engine/classes/model/om/BaseWebEntryEvent.php index 430d98199..e7ff823d7 100644 --- a/workflow/engine/classes/model/om/BaseWebEntryEvent.php +++ b/workflow/engine/classes/model/om/BaseWebEntryEvent.php @@ -33,6 +33,18 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent */ protected $wee_uid; + /** + * The value for the wee_title field. + * @var string + */ + protected $wee_title; + + /** + * The value for the wee_description field. + * @var string + */ + protected $wee_description; + /** * The value for the prj_uid field. * @var string @@ -106,6 +118,28 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent return $this->wee_uid; } + /** + * Get the [wee_title] column value. + * + * @return string + */ + public function getWeeTitle() + { + + return $this->wee_title; + } + + /** + * Get the [wee_description] column value. + * + * @return string + */ + public function getWeeDescription() + { + + return $this->wee_description; + } + /** * Get the [prj_uid] column value. * @@ -216,6 +250,50 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent } // setWeeUid() + /** + * Set the value of [wee_title] column. + * + * @param string $v new value + * @return void + */ + public function setWeeTitle($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->wee_title !== $v) { + $this->wee_title = $v; + $this->modifiedColumns[] = WebEntryEventPeer::WEE_TITLE; + } + + } // setWeeTitle() + + /** + * Set the value of [wee_description] column. + * + * @param string $v new value + * @return void + */ + public function setWeeDescription($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->wee_description !== $v) { + $this->wee_description = $v; + $this->modifiedColumns[] = WebEntryEventPeer::WEE_DESCRIPTION; + } + + } // setWeeDescription() + /** * Set the value of [prj_uid] column. * @@ -411,28 +489,32 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent $this->wee_uid = $rs->getString($startcol + 0); - $this->prj_uid = $rs->getString($startcol + 1); + $this->wee_title = $rs->getString($startcol + 1); - $this->evn_uid = $rs->getString($startcol + 2); + $this->wee_description = $rs->getString($startcol + 2); - $this->act_uid = $rs->getString($startcol + 3); + $this->prj_uid = $rs->getString($startcol + 3); - $this->dyn_uid = $rs->getString($startcol + 4); + $this->evn_uid = $rs->getString($startcol + 4); - $this->usr_uid = $rs->getString($startcol + 5); + $this->act_uid = $rs->getString($startcol + 5); - $this->wee_status = $rs->getString($startcol + 6); + $this->dyn_uid = $rs->getString($startcol + 6); - $this->wee_we_uid = $rs->getString($startcol + 7); + $this->usr_uid = $rs->getString($startcol + 7); - $this->wee_we_tas_uid = $rs->getString($startcol + 8); + $this->wee_status = $rs->getString($startcol + 8); + + $this->wee_we_uid = $rs->getString($startcol + 9); + + $this->wee_we_tas_uid = $rs->getString($startcol + 10); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 9; // 9 = WebEntryEventPeer::NUM_COLUMNS - WebEntryEventPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 11; // 11 = WebEntryEventPeer::NUM_COLUMNS - WebEntryEventPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating WebEntryEvent object", $e); @@ -640,27 +722,33 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent return $this->getWeeUid(); break; case 1: - return $this->getPrjUid(); + return $this->getWeeTitle(); break; case 2: - return $this->getEvnUid(); + return $this->getWeeDescription(); break; case 3: - return $this->getActUid(); + return $this->getPrjUid(); break; case 4: - return $this->getDynUid(); + return $this->getEvnUid(); break; case 5: - return $this->getUsrUid(); + return $this->getActUid(); break; case 6: - return $this->getWeeStatus(); + return $this->getDynUid(); break; case 7: - return $this->getWeeWeUid(); + return $this->getUsrUid(); break; case 8: + return $this->getWeeStatus(); + break; + case 9: + return $this->getWeeWeUid(); + break; + case 10: return $this->getWeeWeTasUid(); break; default: @@ -684,14 +772,16 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent $keys = WebEntryEventPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getWeeUid(), - $keys[1] => $this->getPrjUid(), - $keys[2] => $this->getEvnUid(), - $keys[3] => $this->getActUid(), - $keys[4] => $this->getDynUid(), - $keys[5] => $this->getUsrUid(), - $keys[6] => $this->getWeeStatus(), - $keys[7] => $this->getWeeWeUid(), - $keys[8] => $this->getWeeWeTasUid(), + $keys[1] => $this->getWeeTitle(), + $keys[2] => $this->getWeeDescription(), + $keys[3] => $this->getPrjUid(), + $keys[4] => $this->getEvnUid(), + $keys[5] => $this->getActUid(), + $keys[6] => $this->getDynUid(), + $keys[7] => $this->getUsrUid(), + $keys[8] => $this->getWeeStatus(), + $keys[9] => $this->getWeeWeUid(), + $keys[10] => $this->getWeeWeTasUid(), ); return $result; } @@ -727,27 +817,33 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent $this->setWeeUid($value); break; case 1: - $this->setPrjUid($value); + $this->setWeeTitle($value); break; case 2: - $this->setEvnUid($value); + $this->setWeeDescription($value); break; case 3: - $this->setActUid($value); + $this->setPrjUid($value); break; case 4: - $this->setDynUid($value); + $this->setEvnUid($value); break; case 5: - $this->setUsrUid($value); + $this->setActUid($value); break; case 6: - $this->setWeeStatus($value); + $this->setDynUid($value); break; case 7: - $this->setWeeWeUid($value); + $this->setUsrUid($value); break; case 8: + $this->setWeeStatus($value); + break; + case 9: + $this->setWeeWeUid($value); + break; + case 10: $this->setWeeWeTasUid($value); break; } // switch() @@ -778,35 +874,43 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setPrjUid($arr[$keys[1]]); + $this->setWeeTitle($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setEvnUid($arr[$keys[2]]); + $this->setWeeDescription($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setActUid($arr[$keys[3]]); + $this->setPrjUid($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setDynUid($arr[$keys[4]]); + $this->setEvnUid($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setUsrUid($arr[$keys[5]]); + $this->setActUid($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setWeeStatus($arr[$keys[6]]); + $this->setDynUid($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setWeeWeUid($arr[$keys[7]]); + $this->setUsrUid($arr[$keys[7]]); } if (array_key_exists($keys[8], $arr)) { - $this->setWeeWeTasUid($arr[$keys[8]]); + $this->setWeeStatus($arr[$keys[8]]); + } + + if (array_key_exists($keys[9], $arr)) { + $this->setWeeWeUid($arr[$keys[9]]); + } + + if (array_key_exists($keys[10], $arr)) { + $this->setWeeWeTasUid($arr[$keys[10]]); } } @@ -824,6 +928,14 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent $criteria->add(WebEntryEventPeer::WEE_UID, $this->wee_uid); } + if ($this->isColumnModified(WebEntryEventPeer::WEE_TITLE)) { + $criteria->add(WebEntryEventPeer::WEE_TITLE, $this->wee_title); + } + + if ($this->isColumnModified(WebEntryEventPeer::WEE_DESCRIPTION)) { + $criteria->add(WebEntryEventPeer::WEE_DESCRIPTION, $this->wee_description); + } + if ($this->isColumnModified(WebEntryEventPeer::PRJ_UID)) { $criteria->add(WebEntryEventPeer::PRJ_UID, $this->prj_uid); } @@ -910,6 +1022,10 @@ abstract class BaseWebEntryEvent extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setWeeTitle($this->wee_title); + + $copyObj->setWeeDescription($this->wee_description); + $copyObj->setPrjUid($this->prj_uid); $copyObj->setEvnUid($this->evn_uid); diff --git a/workflow/engine/classes/model/om/BaseWebEntryEventPeer.php b/workflow/engine/classes/model/om/BaseWebEntryEventPeer.php index 10447b742..f1745c1e6 100644 --- a/workflow/engine/classes/model/om/BaseWebEntryEventPeer.php +++ b/workflow/engine/classes/model/om/BaseWebEntryEventPeer.php @@ -25,7 +25,7 @@ abstract class BaseWebEntryEventPeer const CLASS_DEFAULT = 'classes.model.WebEntryEvent'; /** The total number of columns. */ - const NUM_COLUMNS = 9; + const NUM_COLUMNS = 11; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,12 @@ abstract class BaseWebEntryEventPeer /** the column name for the WEE_UID field */ const WEE_UID = 'WEB_ENTRY_EVENT.WEE_UID'; + /** the column name for the WEE_TITLE field */ + const WEE_TITLE = 'WEB_ENTRY_EVENT.WEE_TITLE'; + + /** the column name for the WEE_DESCRIPTION field */ + const WEE_DESCRIPTION = 'WEB_ENTRY_EVENT.WEE_DESCRIPTION'; + /** the column name for the PRJ_UID field */ const PRJ_UID = 'WEB_ENTRY_EVENT.PRJ_UID'; @@ -69,10 +75,10 @@ abstract class BaseWebEntryEventPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('WeeUid', 'PrjUid', 'EvnUid', 'ActUid', 'DynUid', 'UsrUid', 'WeeStatus', 'WeeWeUid', 'WeeWeTasUid', ), - BasePeer::TYPE_COLNAME => array (WebEntryEventPeer::WEE_UID, WebEntryEventPeer::PRJ_UID, WebEntryEventPeer::EVN_UID, WebEntryEventPeer::ACT_UID, WebEntryEventPeer::DYN_UID, WebEntryEventPeer::USR_UID, WebEntryEventPeer::WEE_STATUS, WebEntryEventPeer::WEE_WE_UID, WebEntryEventPeer::WEE_WE_TAS_UID, ), - BasePeer::TYPE_FIELDNAME => array ('WEE_UID', 'PRJ_UID', 'EVN_UID', 'ACT_UID', 'DYN_UID', 'USR_UID', 'WEE_STATUS', 'WEE_WE_UID', 'WEE_WE_TAS_UID', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, ) + BasePeer::TYPE_PHPNAME => array ('WeeUid', 'WeeTitle', 'WeeDescription', 'PrjUid', 'EvnUid', 'ActUid', 'DynUid', 'UsrUid', 'WeeStatus', 'WeeWeUid', 'WeeWeTasUid', ), + BasePeer::TYPE_COLNAME => array (WebEntryEventPeer::WEE_UID, WebEntryEventPeer::WEE_TITLE, WebEntryEventPeer::WEE_DESCRIPTION, WebEntryEventPeer::PRJ_UID, WebEntryEventPeer::EVN_UID, WebEntryEventPeer::ACT_UID, WebEntryEventPeer::DYN_UID, WebEntryEventPeer::USR_UID, WebEntryEventPeer::WEE_STATUS, WebEntryEventPeer::WEE_WE_UID, WebEntryEventPeer::WEE_WE_TAS_UID, ), + BasePeer::TYPE_FIELDNAME => array ('WEE_UID', 'WEE_TITLE', 'WEE_DESCRIPTION', 'PRJ_UID', 'EVN_UID', 'ACT_UID', 'DYN_UID', 'USR_UID', 'WEE_STATUS', 'WEE_WE_UID', 'WEE_WE_TAS_UID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) ); /** @@ -82,10 +88,10 @@ abstract class BaseWebEntryEventPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('WeeUid' => 0, 'PrjUid' => 1, 'EvnUid' => 2, 'ActUid' => 3, 'DynUid' => 4, 'UsrUid' => 5, 'WeeStatus' => 6, 'WeeWeUid' => 7, 'WeeWeTasUid' => 8, ), - BasePeer::TYPE_COLNAME => array (WebEntryEventPeer::WEE_UID => 0, WebEntryEventPeer::PRJ_UID => 1, WebEntryEventPeer::EVN_UID => 2, WebEntryEventPeer::ACT_UID => 3, WebEntryEventPeer::DYN_UID => 4, WebEntryEventPeer::USR_UID => 5, WebEntryEventPeer::WEE_STATUS => 6, WebEntryEventPeer::WEE_WE_UID => 7, WebEntryEventPeer::WEE_WE_TAS_UID => 8, ), - BasePeer::TYPE_FIELDNAME => array ('WEE_UID' => 0, 'PRJ_UID' => 1, 'EVN_UID' => 2, 'ACT_UID' => 3, 'DYN_UID' => 4, 'USR_UID' => 5, 'WEE_STATUS' => 6, 'WEE_WE_UID' => 7, 'WEE_WE_TAS_UID' => 8, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, ) + BasePeer::TYPE_PHPNAME => array ('WeeUid' => 0, 'WeeTitle' => 1, 'WeeDescription' => 2, 'PrjUid' => 3, 'EvnUid' => 4, 'ActUid' => 5, 'DynUid' => 6, 'UsrUid' => 7, 'WeeStatus' => 8, 'WeeWeUid' => 9, 'WeeWeTasUid' => 10, ), + BasePeer::TYPE_COLNAME => array (WebEntryEventPeer::WEE_UID => 0, WebEntryEventPeer::WEE_TITLE => 1, WebEntryEventPeer::WEE_DESCRIPTION => 2, WebEntryEventPeer::PRJ_UID => 3, WebEntryEventPeer::EVN_UID => 4, WebEntryEventPeer::ACT_UID => 5, WebEntryEventPeer::DYN_UID => 6, WebEntryEventPeer::USR_UID => 7, WebEntryEventPeer::WEE_STATUS => 8, WebEntryEventPeer::WEE_WE_UID => 9, WebEntryEventPeer::WEE_WE_TAS_UID => 10, ), + BasePeer::TYPE_FIELDNAME => array ('WEE_UID' => 0, 'WEE_TITLE' => 1, 'WEE_DESCRIPTION' => 2, 'PRJ_UID' => 3, 'EVN_UID' => 4, 'ACT_UID' => 5, 'DYN_UID' => 6, 'USR_UID' => 7, 'WEE_STATUS' => 8, 'WEE_WE_UID' => 9, 'WEE_WE_TAS_UID' => 10, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) ); /** @@ -188,6 +194,10 @@ abstract class BaseWebEntryEventPeer $criteria->addSelectColumn(WebEntryEventPeer::WEE_UID); + $criteria->addSelectColumn(WebEntryEventPeer::WEE_TITLE); + + $criteria->addSelectColumn(WebEntryEventPeer::WEE_DESCRIPTION); + $criteria->addSelectColumn(WebEntryEventPeer::PRJ_UID); $criteria->addSelectColumn(WebEntryEventPeer::EVN_UID); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 099191d69..65ff7e4c4 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -173,6 +173,9 @@ + + + @@ -503,6 +506,8 @@ + + @@ -820,6 +825,10 @@ + + + + @@ -972,6 +981,7 @@ + @@ -1497,6 +1507,8 @@ + + @@ -4584,6 +4596,8 @@ + + diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 1a1f5a521..2f92242a9 100644 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -1566,14 +1566,7 @@ class pmTablesProxy extends HttpProxyController $criteria->addSelectColumn(DynaformPeer::DYN_UID); $criteria->addSelectColumn(DynaformPeer::DYN_FILENAME); $criteria->addSelectColumn(DynaformPeer::DYN_CONTENT); - $criteria->addSelectColumn(ContentPeer::CON_VALUE . ' AS DYN_TITLE'); - - $arrayCondition = []; - $arrayCondition[] = [DynaformPeer::DYN_UID, ContentPeer::CON_ID, Criteria::EQUAL]; - $arrayCondition[] = [ContentPeer::CON_CATEGORY, $delimiter . 'DYN_TITLE' . $delimiter, Criteria::EQUAL]; - $arrayCondition[] = [ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL]; - $criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(DynaformPeer::DYN_TITLE); $criteria->add(DynaformPeer::PRO_UID, $proUid, Criteria::EQUAL); $criteria->add(DynaformPeer::DYN_TYPE, 'xmlform', Criteria::EQUAL); diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 0a81a57e6..adfaa9a41 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -52,7 +52,6 @@ CREATE TABLE `APP_SEQUENCE` `ID` INTEGER NOT NULL, PRIMARY KEY (`ID`) )ENGINE=InnoDB ; - #----------------------------------------------------------------------------- #-- APP_DELEGATION #----------------------------------------------------------------------------- @@ -98,6 +97,9 @@ DROP TABLE IF EXISTS `APP_DOCUMENT`; CREATE TABLE `APP_DOCUMENT` ( `APP_DOC_UID` VARCHAR(32) default '' NOT NULL, + `APP_DOC_FILENAME` MEDIUMTEXT NOT NULL, + `APP_DOC_TITLE` MEDIUMTEXT, + `APP_DOC_COMMENT` MEDIUMTEXT, `DOC_VERSION` INTEGER default 1 NOT NULL, `APP_UID` VARCHAR(32) default '' NOT NULL, `DEL_INDEX` INTEGER default 0 NOT NULL, @@ -228,6 +230,8 @@ DROP TABLE IF EXISTS `DYNAFORM`; CREATE TABLE `DYNAFORM` ( `DYN_UID` VARCHAR(32) default '' NOT NULL, + `DYN_TITLE` MEDIUMTEXT NOT NULL, + `DYN_DESCRIPTION` MEDIUMTEXT, `PRO_UID` VARCHAR(32) default '0' NOT NULL, `DYN_TYPE` VARCHAR(20) default 'xmlform' NOT NULL, `DYN_FILENAME` VARCHAR(100) default '' NOT NULL, @@ -392,6 +396,10 @@ DROP TABLE IF EXISTS `OUTPUT_DOCUMENT`; CREATE TABLE `OUTPUT_DOCUMENT` ( `OUT_DOC_UID` VARCHAR(32) default '' NOT NULL, + `OUT_DOC_TITLE` MEDIUMTEXT NOT NULL, + `OUT_DOC_DESCRIPTION` MEDIUMTEXT, + `OUT_DOC_FILENAME` MEDIUMTEXT, + `OUT_DOC_TEMPLATE` MEDIUMTEXT, `PRO_UID` VARCHAR(32) default '' NOT NULL, `OUT_DOC_REPORT_GENERATOR` VARCHAR(10) default 'HTML2PDF' NOT NULL, `OUT_DOC_LANDSCAPE` TINYINT default 0 NOT NULL, @@ -488,6 +496,7 @@ DROP TABLE IF EXISTS `REPORT_TABLE`; CREATE TABLE `REPORT_TABLE` ( `REP_TAB_UID` VARCHAR(32) default '' NOT NULL, + `REP_TAB_TITLE` MEDIUMTEXT NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL, `REP_TAB_NAME` VARCHAR(100) default '' NOT NULL, `REP_TAB_TYPE` VARCHAR(6) default '' NOT NULL, @@ -665,13 +674,13 @@ CREATE TABLE `TASK` `TAS_OFFLINE` VARCHAR(20) default 'FALSE' NOT NULL, `TAS_EMAIL_SERVER_UID` VARCHAR(32) default '' NOT NULL, `TAS_AUTO_ROOT` VARCHAR(20) default 'FALSE' NOT NULL, - `TAS_RECEIVE_SERVER_UID` VARCHAR(32) default '' NOT NULL, - `TAS_RECEIVE_LAST_EMAIL` VARCHAR(20) default 'FALSE' NOT NULL, - `TAS_RECEIVE_EMAIL_FROM_FORMAT` INTEGER default 0, - `TAS_RECEIVE_MESSAGE_TYPE` VARCHAR(20) default 'text' NOT NULL, - `TAS_RECEIVE_MESSAGE_TEMPLATE` VARCHAR(100) default 'alert_message.html' NOT NULL, - `TAS_RECEIVE_SUBJECT_MESSAGE` MEDIUMTEXT, - `TAS_RECEIVE_MESSAGE` MEDIUMTEXT, + `TAS_RECEIVE_SERVER_UID` VARCHAR(32) default '' NOT NULL, + `TAS_RECEIVE_LAST_EMAIL` VARCHAR(20) default 'FALSE' NOT NULL, + `TAS_RECEIVE_EMAIL_FROM_FORMAT` INTEGER default 0, + `TAS_RECEIVE_MESSAGE_TYPE` VARCHAR(20) default 'text' NOT NULL, + `TAS_RECEIVE_MESSAGE_TEMPLATE` VARCHAR(100) default 'alert_message.html' NOT NULL, + `TAS_RECEIVE_SUBJECT_MESSAGE` MEDIUMTEXT, + `TAS_RECEIVE_MESSAGE` MEDIUMTEXT, PRIMARY KEY (`TAS_UID`), KEY `indexTasUid`(`TAS_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task of workflow'; @@ -716,6 +725,8 @@ DROP TABLE IF EXISTS `TRIGGERS`; CREATE TABLE `TRIGGERS` ( `TRI_UID` VARCHAR(32) default '' NOT NULL, + `TRI_TITLE` MEDIUMTEXT NOT NULL, + `TRI_DESCRIPTION` MEDIUMTEXT, `PRO_UID` VARCHAR(32) default '' NOT NULL, `TRI_TYPE` VARCHAR(20) default 'SCRIPT' NOT NULL, `TRI_WEBBOT` MEDIUMTEXT NOT NULL, @@ -2376,7 +2387,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST` `DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '', `DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '', `DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '', - `DEL_CURRENT_TAS_TITLE` VARCHAR(255) default '' NOT NULL, + `DEL_CURRENT_TAS_TITLE` VARCHAR(255) default '' NOT NULL, `DEL_DELEGATE_DATE` DATETIME NOT NULL, `DEL_INIT_DATE` DATETIME, `DEL_DUE_DATE` DATETIME, @@ -2617,6 +2628,8 @@ DROP TABLE IF EXISTS `WEB_ENTRY_EVENT`; CREATE TABLE `WEB_ENTRY_EVENT` ( `WEE_UID` VARCHAR(32) NOT NULL, + `WEE_TITLE` MEDIUMTEXT NOT NULL, + `WEE_DESCRIPTION` MEDIUMTEXT NOT NULL, `PRJ_UID` VARCHAR(32) NOT NULL, `EVN_UID` VARCHAR(32) NOT NULL, `ACT_UID` VARCHAR(32) NOT NULL, @@ -2981,14 +2994,10 @@ CREATE TABLE `NOTIFICATION_DEVICE` PRIMARY KEY (`DEV_UID`,`USR_UID`), KEY `indexUserNotification`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Definitions Notification device.'; -# This restores the fkey checks, after having unset them earlier -# SET FOREIGN_KEY_CHECKS = 1; - - - #----------------------------------------------------------------------------- #-- GMAIL_RELABELING #----------------------------------------------------------------------------- + DROP TABLE IF EXISTS `GMAIL_RELABELING`; CREATE TABLE `GMAIL_RELABELING` ( @@ -3003,11 +3012,13 @@ CREATE TABLE `GMAIL_RELABELING` ( PRIMARY KEY (`LABELING_UID`), KEY `indexStatus` (`STATUS`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task to synchronize Gmail Labels'; - -# This restores the fkey checks, after having unset them earlier +#----------------------------------------------------------------------------- +#-- NOTIFICATION_QUEUE +#----------------------------------------------------------------------------- DROP TABLE IF EXISTS `NOTIFICATION_QUEUE`; + CREATE TABLE `NOTIFICATION_QUEUE` ( `NOT_UID` VARCHAR(32) NOT NULL, diff --git a/workflow/engine/methods/cases/caseHistory_Ajax.php b/workflow/engine/methods/cases/caseHistory_Ajax.php index abb067dc5..1638b9601 100644 --- a/workflow/engine/methods/cases/caseHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseHistory_Ajax.php @@ -116,7 +116,6 @@ if ($actionAjax == 'historyGridListChangeLogPanelBody_JXP') { } if ($actionAjax == "showDynaformHistoryGetNomDynaform_JXP") { - require_once 'classes/model/ContentPeer.php'; //!dataInput $idDin = $_REQUEST['idDin']; @@ -126,15 +125,11 @@ if ($actionAjax == "showDynaformHistoryGetNomDynaform_JXP") { $md5Hash = ""; $dynTitle = ''; - $c = new Criteria(); - $c0 = $c->getNewCriterion( ContentPeer::CON_ID, $idDin ); - $c1 = $c->getNewCriterion( ContentPeer::CON_CATEGORY, 'DYN_TITLE' ); - $c0->addAnd( $c1 ); - $c->add( $c0 ); - $contentObjeto = ContentPeer::doSelectOne( $c ); + $dynaform = new Dynaform(); + $row = $dynaform->Load($idDin); - if (is_object( $contentObjeto )) { - $dynTitle = $contentObjeto->getConValue(); + if ($row) { + $dynTitle = $row['DYN_TITLE']; } $md5Hash = G::encryptOld( $idDin . $dynDate ); diff --git a/workflow/engine/methods/dynaforms/dynaforms_Save.php b/workflow/engine/methods/dynaforms/dynaforms_Save.php index f39e6a6f2..c84d36d49 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Save.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Save.php @@ -38,35 +38,8 @@ if (isset( $_POST['function'] )) { } if (isset( $sfunction ) && $sfunction == 'lookforNameDynaform') { - $snameDyanform = urldecode( $_POST['NAMEDYNAFORM'] ); - $sPRO_UID = urldecode( $_POST['proUid'] ); - - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->addSelectColumn( DynaformPeer::DYN_UID ); - $oCriteria->add( DynaformPeer::PRO_UID, $sPRO_UID ); - $oDataset = DynaformPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $flag = true; - - while ($oDataset->next() && $flag) { - $aRow = $oDataset->getRow(); - - $oCriteria1 = new Criteria( 'workflow' ); - $oCriteria1->addSelectColumn( 'COUNT(*) AS DYNAFORMS' ); - $oCriteria1->add( ContentPeer::CON_CATEGORY, 'DYN_TITLE' ); - $oCriteria1->add( ContentPeer::CON_ID, $aRow['DYN_UID'] ); - $oCriteria1->add( ContentPeer::CON_VALUE, $snameDyanform ); - $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG ); - $oDataset1 = ContentPeer::doSelectRS( $oCriteria1 ); - $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDataset1->next(); - $aRow1 = $oDataset1->getRow(); - - if ($aRow1['DYNAFORMS']) { - $flag = false; - } - } - print $flag; + $oDynaform = new Dynaform(); + print $oDynaform->verifyExistingName($_POST['NAMEDYNAFORM'], $_POST['proUid']); } else { if (isset( $_POST['form'] )) { @@ -90,7 +63,7 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameDynaform') { } //if ($aData['DYN_UID']==='') unset($aData['DYN_UID']); - $dynaform = new dynaform(); + $dynaform = new Dynaform(); $dynaFormAux = new ProcessMaker\BusinessModel\DynaForm(); if (isset($aData["DYN_UID"])) { @@ -128,38 +101,13 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameDynaform') { $copyDynaformGridUid = $value[1]; //Get data - $criteria = new Criteria(); - - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add(ContentPeer::CON_ID, $copyDynaformGridUid); - $criteria->add(ContentPeer::CON_CATEGORY, "DYN_TITLE"); - $criteria->add(ContentPeer::CON_LANG, SYS_LANG); - - $rsCriteria = ContentPeer::doSelectRS($criteria); - $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); - - $rsCriteria->next(); - $row = $rsCriteria->getRow(); - - $copyDynGrdTitle = $row["CON_VALUE"]; - - $criteria = new Criteria(); - - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add(ContentPeer::CON_ID, $copyDynaformGridUid); - $criteria->add(ContentPeer::CON_CATEGORY, "DYN_DESCRIPTION"); - $criteria->add(ContentPeer::CON_LANG, SYS_LANG); - - $rsCriteria = ContentPeer::doSelectRS($criteria); - $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); - - $rsCriteria->next(); - $row = $rsCriteria->getRow(); - - $copyDynGrdDescription = $row["CON_VALUE"]; + $dynaFormData = new \Dynaform(); + $row = $dynaFormData->Load($copyDynaformGridUid); + $copyDynGrdTitle = $row["DYN_TITLE"]; + $copyDynGrdDescription = $row["DYN_DESCRIPTION"]; //Create grid - $dynaformGrid = new dynaform(); + $dynaformGrid = new Dynaform(); $aDataAux = $aData; $aDataAux["DYN_TYPE"] = "grid"; diff --git a/workflow/engine/methods/outputdocs/outputdocs_Ajax.php b/workflow/engine/methods/outputdocs/outputdocs_Ajax.php index c187ae60f..7d31f2899 100644 --- a/workflow/engine/methods/outputdocs/outputdocs_Ajax.php +++ b/workflow/engine/methods/outputdocs/outputdocs_Ajax.php @@ -53,37 +53,11 @@ switch ($action) { case 'lookForNameOutput': $_POST = $filter->xssFilterHard($_POST); - require_once ('classes/model/Content.php'); - require_once ("classes/model/OutputDocument.php"); - $snameInput = urldecode( $_POST['NAMEOUTPUT'] ); - $sPRO_UID = urldecode( $_POST['proUid'] ); - - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->addSelectColumn( OutputDocumentPeer::OUT_DOC_UID ); - $oCriteria->add( OutputDocumentPeer::PRO_UID, $sPRO_UID ); - $oDataset = OutputDocumentPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $flag = true; - while ($oDataset->next() && $flag) { - $aRow = $oDataset->getRow(); - - $oCriteria1 = new Criteria( 'workflow' ); - $oCriteria1->addSelectColumn( 'COUNT(*) AS OUTPUTS' ); - $oCriteria1->add( ContentPeer::CON_CATEGORY, 'OUT_DOC_TITLE' ); - $oCriteria1->add( ContentPeer::CON_ID, $aRow['OUT_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['OUTPUTS']) - $flag = false; - } - echo $flag; - // G::json_encode($flag); + $snameInput = urldecode($_POST['NAMEOUTPUT']); + $sPRO_UID = urldecode($_POST['proUid']); + $oOutputDocument = new \ProcessMaker\BusinessModel\OutputDocument(); + echo !$oOutputDocument->existsTitle($sPRO_UID, $snameInput); break; case 'loadOutputEditor': diff --git a/workflow/engine/methods/triggers/triggers_Save.php b/workflow/engine/methods/triggers/triggers_Save.php index 275bc7f55..5f3969b6e 100644 --- a/workflow/engine/methods/triggers/triggers_Save.php +++ b/workflow/engine/methods/triggers/triggers_Save.php @@ -38,33 +38,9 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') { $snameTrigger = urldecode( $_POST['NAMETRIGGER'] ); $sPRO_UID = urldecode( $_POST['proUid'] ); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->addSelectColumn( TriggersPeer::TRI_UID ); - $oCriteria->add( TriggersPeer::PRO_UID, $sPRO_UID ); - $oDataset = TriggersPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $flag = true; - while ($oDataset->next() && $flag) { - $aRow = $oDataset->getRow(); + $oTrigger = new \ProcessMaker\BusinessModel\Trigger(); + echo $oTrigger->verifyNameTrigger($sPRO_UID, $snameTrigger); - $oCriteria1 = new Criteria( 'workflow' ); - $oCriteria1->addSelectColumn( 'COUNT(*) AS TRIGGERS' ); - $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TRI_TITLE' ); - $oCriteria1->add( ContentPeer::CON_ID, $aRow['TRI_UID'] ); - $oCriteria1->add( ContentPeer::CON_VALUE, $snameTrigger ); - $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG ); - $oDataset1 = ContentPeer::doSelectRS( $oCriteria1 ); - $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDataset1->next(); - $aRow1 = $oDataset1->getRow(); - - if ($aRow1['TRIGGERS']) { - $flag = false; - } - - } - - echo $flag; } else { G::LoadClass("processMap"); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php b/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php index 04dfe49e5..6bdcfdba2 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php @@ -155,24 +155,8 @@ class CaseTracker $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\DynaformPeer::DYN_UID); - $criteria->addAsColumn("DYN_TITLE", "CT.CON_VALUE"); - $criteria->addAsColumn("DYN_DESCRIPTION", "CD.CON_VALUE"); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\DynaformPeer::DYN_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DYN_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(\DynaformPeer::DYN_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "DYN_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $criteria->addSelectColumn(\DynaformPeer::DYN_DESCRIPTION); $criteria->add(\DynaformPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\DynaformPeer::DYN_UID, $arrayDynaFormUid, \Criteria::NOT_IN); $criteria->add(\DynaformPeer::DYN_TYPE, "xmlform", \Criteria::EQUAL); @@ -182,12 +166,6 @@ class CaseTracker while ($rsCriteria->next()) { $row = $rsCriteria->getRow(); - - if ($row["DYN_TITLE"] . "" == "") { - //There is no transaltion for this Document name, try to get/regenerate the label - $row["DYN_TITLE"] = \Content::Load("DYN_TITLE", "", $row["DYN_UID"], SYS_LANG); - } - $arrayCaseTrackerObject[] = array( "obj_uid" => $row["DYN_UID"], "obj_title" => $row["DYN_TITLE"], @@ -230,24 +208,8 @@ class CaseTracker $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_UID); - $criteria->addAsColumn("OUT_DOC_TITLE", "CT.CON_VALUE"); - $criteria->addAsColumn("OUT_DOC_DESCRIPTION", "CD.CON_VALUE"); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\OutputDocumentPeer::OUT_DOC_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "OUT_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(\OutputDocumentPeer::OUT_DOC_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "OUT_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TITLE); + $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_DESCRIPTION); $criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\OutputDocumentPeer::OUT_DOC_UID, $arrayOutputDocumentUid, \Criteria::NOT_IN); @@ -256,12 +218,6 @@ class CaseTracker while ($rsCriteria->next()) { $row = $rsCriteria->getRow(); - - if ($row["OUT_DOC_TITLE"] . "" == "") { - //There is no transaltion for this Document name, try to get/regenerate the label - $row["OUT_DOC_TITLE"] = \Content::Load("OUT_DOC_TITLE", "", $row["OUT_DOC_UID"], SYS_LANG); - } - $arrayCaseTrackerObject[] = array( "obj_uid" => $row["OUT_DOC_UID"], "obj_title" => $row["OUT_DOC_TITLE"], diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php index 0b891f7c2..e7d8ebd52 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php @@ -99,27 +99,16 @@ class DynaForm public function existsTitle($processUid, $dynaFormTitle, $dynaFormUidExclude = "") { try { - $delimiter = \DBAdapter::getStringDelimiter(); - $criteria = new \Criteria("workflow"); - $criteria->addSelectColumn(\DynaformPeer::DYN_UID); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\DynaformPeer::DYN_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DYN_TITLE" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(\DynaformPeer::DYN_TITLE); $criteria->add(\DynaformPeer::PRO_UID, $processUid, \Criteria::EQUAL); if ($dynaFormUidExclude != "") { $criteria->add(\DynaformPeer::DYN_UID, $dynaFormUidExclude, \Criteria::NOT_EQUAL); } - $criteria->add("CT.CON_VALUE", $dynaFormTitle, \Criteria::EQUAL); + $criteria->add(\DynaformPeer::DYN_TITLE, $dynaFormTitle, \Criteria::EQUAL); $rsCriteria = \DynaformPeer::doSelectRS($criteria); @@ -158,12 +147,9 @@ class DynaForm $oCriteria = new \Criteria( 'workflow' ); $oCriteria->addSelectColumn( \DynaformPeer::DYN_UID ); - $oCriteria->addSelectColumn( \ContentPeer::CON_VALUE ); + $oCriteria->addSelectColumn( \DynaformPeer::DYN_TITLE ); $oCriteria->add( \DynaformPeer::PRO_UID, $proUid ); $oCriteria->add( \DynaformPeer::DYN_TYPE, "xmlform" ); - $oCriteria->add( \ContentPeer::CON_CATEGORY, 'DYN_TITLE'); - $oCriteria->add( \ContentPeer::CON_LANG, SYS_LANG); - $oCriteria->addJoin( \DynaformPeer::DYN_UID, \ContentPeer::CON_ID, \Criteria::INNER_JOIN); $oDataset = \DynaformPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); @@ -177,7 +163,7 @@ class DynaForm $sxmlgrid = \Step::getAttribute( $field, 'xmlgrid' ); $aGridInfo = explode( "/", $sxmlgrid ); if ($aGridInfo[0] == $proUid && $aGridInfo[1] == $dynUid) { - $formsDepend[] = $dataForms["CON_VALUE"]; + $formsDepend[] = $dataForms["DYN_TITLE"]; } } } @@ -637,35 +623,10 @@ class DynaForm $dynaFormGridUidCopyImport = $value[1]; //Get data - $criteria = new \Criteria(); - - $criteria->addSelectColumn(\ContentPeer::CON_VALUE); - $criteria->add(\ContentPeer::CON_ID, $dynaFormGridUidCopyImport); - $criteria->add(\ContentPeer::CON_CATEGORY, "DYN_TITLE"); - $criteria->add(\ContentPeer::CON_LANG, SYS_LANG); - - $rsCriteria = \ContentPeer::doSelectRS($criteria); - $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); - - $rsCriteria->next(); - $row = $rsCriteria->getRow(); - - $dynGrdTitleCopyImport = $row["CON_VALUE"]; - - $criteria = new \Criteria(); - - $criteria->addSelectColumn(\ContentPeer::CON_VALUE); - $criteria->add(\ContentPeer::CON_ID, $dynaFormGridUidCopyImport); - $criteria->add(\ContentPeer::CON_CATEGORY, "DYN_DESCRIPTION"); - $criteria->add(\ContentPeer::CON_LANG, SYS_LANG); - - $rsCriteria = \ContentPeer::doSelectRS($criteria); - $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); - - $rsCriteria->next(); - $row = $rsCriteria->getRow(); - - $dynGrdDescriptionCopyImport = $row["CON_VALUE"]; + $dynaForm = new \Dynaform(); + $row = $dynaForm->Load($dynaFormGridUidCopyImport); + $dynGrdTitleCopyImport = $row["DYN_TITLE"]; + $dynGrdDescriptionCopyImport = $row["DYN_DESCRIPTION"]; //Create Grid $dynaFormGrid = new \Dynaform(); @@ -967,33 +928,14 @@ class DynaForm public function getDynaFormCriteria() { try { - $delimiter = \DBAdapter::getStringDelimiter(); - $criteria = new \Criteria("workflow"); - $criteria->addSelectColumn(\DynaformPeer::DYN_UID); - $criteria->addAsColumn("DYN_TITLE", "CT.CON_VALUE"); - $criteria->addAsColumn("DYN_DESCRIPTION", "CD.CON_VALUE"); + $criteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $criteria->addSelectColumn(\DynaformPeer::DYN_DESCRIPTION); $criteria->addSelectColumn(\DynaformPeer::DYN_TYPE); $criteria->addSelectColumn(\DynaformPeer::DYN_CONTENT); $criteria->addSelectColumn(\DynaformPeer::DYN_VERSION); $criteria->addSelectColumn(\DynaformPeer::DYN_UPDATE_DATE); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\DynaformPeer::DYN_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DYN_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(\DynaformPeer::DYN_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "DYN_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - return $criteria; } catch (\Exception $e) { throw $e; @@ -1010,16 +952,6 @@ class DynaForm public function getDynaFormDataFromRecord($record) { try { - if ($record["DYN_TITLE"] . "" == "") { - //There is no transaltion for this Document name, try to get/regenerate the label - $record["DYN_TITLE"] = \Content::load("DYN_TITLE", "", $record["DYN_UID"], SYS_LANG); - } - - if ($record["DYN_DESCRIPTION"] . "" == "") { - //There is no transaltion for this Document name, try to get/regenerate the label - $record["DYN_DESCRIPTION"] = \Content::load("DYN_DESCRIPTION", "", $record["DYN_UID"], SYS_LANG); - } - if ($record["DYN_VERSION"] == 0) { $record["DYN_VERSION"] = 1; } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php index b70f7aca2..ccdc5b1cc 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php @@ -39,34 +39,10 @@ class OutputDocument $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_OPEN_TYPE); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_FILENAME', 'C3.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_TEMPLATE', 'C4.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $oCriteria->addAlias('C3', 'CONTENT'); - $oCriteria->addAlias('C4', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C1.CON_ID' ); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter ); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'OUT_DOC_DESCRIPTION' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C3.CON_ID' ); - $aConditions[] = array('C3.CON_CATEGORY', $sDelimiter . 'OUT_DOC_FILENAME' . $sDelimiter ); - $aConditions[] = array('C3.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C4.CON_ID' ); - $aConditions[] = array('C4.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TEMPLATE' . $sDelimiter ); - $aConditions[] = array('C4.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TITLE); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_DESCRIPTION); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_FILENAME); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TEMPLATE); $oCriteria->add(\OutputDocumentPeer::PRO_UID, $sProcessUID); $oDataset = \OutputDocumentPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); @@ -146,35 +122,11 @@ class OutputDocument $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_OPEN_TYPE); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TITLE); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_DESCRIPTION); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_FILENAME); + $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TEMPLATE); $oCriteria->add(\OutputDocumentPeer::OUT_DOC_UID, $sOutputDocumentUID); - $oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_FILENAME', 'C3.CON_VALUE'); - $oCriteria->addAsColumn('OUT_DOC_TEMPLATE', 'C4.CON_VALUE'); - $oCriteria->addAlias('C1', 'CONTENT'); - $oCriteria->addAlias('C2', 'CONTENT'); - $oCriteria->addAlias('C3', 'CONTENT'); - $oCriteria->addAlias('C4', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C1.CON_ID' ); - $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter ); - $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C2.CON_ID' ); - $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'OUT_DOC_DESCRIPTION' . $sDelimiter ); - $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C3.CON_ID' ); - $aConditions[] = array('C3.CON_CATEGORY', $sDelimiter . 'OUT_DOC_FILENAME' . $sDelimiter ); - $aConditions[] = array('C3.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C4.CON_ID' ); - $aConditions[] = array('C4.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TEMPLATE' . $sDelimiter ); - $aConditions[] = array('C4.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); $oCriteria->add(\OutputDocumentPeer::PRO_UID, $sProcessUID); $oDataset = \OutputDocumentPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); @@ -323,18 +275,19 @@ class OutputDocument throw (new \Exception(\G::LoadTranslation("ID_OUTPUT_NOT_SAVE"))); } } - $oOutputDocument->setOutDocTitle($outputDocumentData['OUT_DOC_TITLE']); + $oOutputDocument->setOutDocTitleContent($outputDocumentData['OUT_DOC_TITLE']); } if (isset($outputDocumentData['OUT_DOC_DESCRIPTION'])) { - $oOutputDocument->setOutDocDescription($outputDocumentData['OUT_DOC_DESCRIPTION']); + $oOutputDocument->setOutDocDescriptionContent($outputDocumentData['OUT_DOC_DESCRIPTION']); } if (isset($outputDocumentData['OUT_DOC_FILENAME'])) { - $oOutputDocument->setOutDocFilename($outputDocumentData['OUT_DOC_FILENAME']); + $oOutputDocument->setOutDocFilenameContent($outputDocumentData['OUT_DOC_FILENAME']); } if (isset($outputDocumentData['OUT_DOC_TEMPLATE'])) { $outputDocumentData['OUT_DOC_TEMPLATE'] = stripslashes($outputDocumentData['OUT_DOC_TEMPLATE']); $outputDocumentData['OUT_DOC_TEMPLATE'] = str_replace("@amp@", "&", $outputDocumentData['OUT_DOC_TEMPLATE']); $oOutputDocument->setOutDocTemplate($outputDocumentData['OUT_DOC_TEMPLATE']); + $oOutputDocument->setOutDocTemplateContent($outputDocumentData['OUT_DOC_TEMPLATE']); } $oOutputDocument->save(); $oConnection->commit(); @@ -396,27 +349,12 @@ class OutputDocument public function existsTitle($processUid, $title) { try { - $delimiter = \DBAdapter::getStringDelimiter(); - $criteria = new \Criteria("workflow"); - $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_UID); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\OutputDocumentPeer::OUT_DOC_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "OUT_DOC_TITLE" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TITLE); $criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); - - - $criteria->add("CT.CON_VALUE", $title, \Criteria::EQUAL); - + $criteria->add(\OutputDocumentPeer::OUT_DOC_TITLE, $title, \Criteria::EQUAL); $rsCriteria = \OutputDocumentPeer::doSelectRS($criteria); - if ($rsCriteria->next()) { return true; } else { @@ -441,10 +379,7 @@ class OutputDocument $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_UID); $criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); - $criteria->add(\ContentPeer::CON_VALUE, $title, \Criteria::EQUAL); - $criteria->add(\ContentPeer::CON_CATEGORY, "OUT_DOC_TITLE", \Criteria::EQUAL); - $criteria->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL); - $criteria->addJoin( \ContentPeer::CON_ID, \OutputDocumentPeer::OUT_DOC_UID, \Criteria::LEFT_JOIN ); + $criteria->add(\OutputDocumentPeer::OUT_DOC_TITLE, $title, \Criteria::EQUAL); $rsCriteria = \OutputDocumentPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->next(); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php index e0bd1f559..fc8ff59e3 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php @@ -1431,7 +1431,7 @@ class Process $criteria = $dynaForm->getDynaFormCriteria(); $criteria->add(\DynaformPeer::PRO_UID, $processUid, \Criteria::EQUAL); - $criteria->addAscendingOrderByColumn("DYN_TITLE"); + $criteria->addAscendingOrderByColumn(\DynaformPeer::DYN_TITLE); $rsCriteria = \DynaformPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php index 82f0821e8..21807d68b 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php @@ -497,17 +497,8 @@ class ProcessSupervisor $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID ); - $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID, \Criteria::LEFT_JOIN); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION); @@ -552,17 +543,8 @@ class ProcessSupervisor $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID ); - $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID, \Criteria::LEFT_JOIN); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID, $sPudUID); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); @@ -602,17 +584,10 @@ class ProcessSupervisor foreach ($oCriteria as $oCriteria => $value) { $aUIDS[] = $value["dyn_uid"]; } - $sDelimiter = \DBAdapter::getStringDelimiter(); $oCriteria = new \Criteria('workflow'); $oCriteria->addSelectColumn(\DynaformPeer::DYN_UID); $oCriteria->addSelectColumn(\DynaformPeer::PRO_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); $oCriteria->add(\DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(\DynaformPeer::DYN_TYPE, 'xmlform'); $oCriteria->add(\DynaformPeer::DYN_UID, $aUIDS, \Criteria::NOT_IN); @@ -677,17 +652,8 @@ class ProcessSupervisor $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID ); - $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID, \Criteria::LEFT_JOIN); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION); @@ -760,17 +726,10 @@ class ProcessSupervisor foreach ($oCriteria as $oCriteria => $value) { $aUIDS[] = $value["dyn_uid"]; } - $sDelimiter = \DBAdapter::getStringDelimiter(); $oCriteria = new \Criteria('workflow'); $oCriteria->addSelectColumn(\DynaformPeer::DYN_UID); $oCriteria->addSelectColumn(\DynaformPeer::PRO_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID'); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); $oCriteria->add(\DynaformPeer::PRO_UID, $sProcessUID); $oCriteria->add(\DynaformPeer::DYN_TYPE, 'xmlform'); $oCriteria->add(\DynaformPeer::DYN_UID, $aUIDS, \Criteria::NOT_IN); @@ -1018,20 +977,10 @@ class ProcessSupervisor } $aResp = array(); $sPuUIDT = array(); - $sDelimiter = \DBAdapter::getStringDelimiter(); $oCriteria = new \Criteria('workflow'); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID ); - $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID, \Criteria::LEFT_JOIN); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sDynUID); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); @@ -1055,17 +1004,8 @@ class ProcessSupervisor $oCriteria->addSelectColumn(\StepSupervisorPeer::PRO_UID); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ); $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION); - $oCriteria->addAsColumn('DYN_TITLE', 'C.CON_VALUE'); - $oCriteria->addAlias('C', 'CONTENT'); - $aConditions = array(); - $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID ); - $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'DYNAFORM' . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); - $aConditions = array(); - $aConditions[] = array(\DynaformPeer::DYN_UID, 'C.CON_ID' ); - $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'DYN_TITLE' . $sDelimiter ); - $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN); + $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $oCriteria->addJoin(\StepSupervisorPeer::STEP_UID_OBJ, \DynaformPeer::DYN_UID, \Criteria::LEFT_JOIN); $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID); $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sDynUID); $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM'); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Step.php b/workflow/engine/src/ProcessMaker/BusinessModel/Step.php index 0674f88b6..7e53f4a56 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Step.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Step.php @@ -699,7 +699,7 @@ class Step $criteria->add(\TriggersPeer::TRI_UID, $arrayUid, \Criteria::NOT_IN); $criteria->add(\TriggersPeer::PRO_UID, $processUid, \Criteria::EQUAL); - $criteria->addAscendingOrderByColumn("TRI_TITLE"); + $criteria->addAscendingOrderByColumn(\TriggersPeer::TRI_TITLE); $rsCriteria = \TriggersPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 11540cf77..f80c8f7eb 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -563,24 +563,8 @@ class Task $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\DynaformPeer::DYN_UID); - $criteria->addAsColumn("DYN_TITLE", "CT.CON_VALUE"); - $criteria->addAsColumn("DYN_DESCRIPTION", "CD.CON_VALUE"); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\DynaformPeer::DYN_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DYN_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(\DynaformPeer::DYN_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "DYN_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(\DynaformPeer::DYN_TITLE); + $criteria->addSelectColumn(\DynaformPeer::DYN_DESCRIPTION); $criteria->add(\DynaformPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\DynaformPeer::DYN_UID, $arrayUid, \Criteria::NOT_IN); $criteria->add(\DynaformPeer::DYN_TYPE, "xmlform", \Criteria::EQUAL); @@ -590,12 +574,6 @@ class Task while ($rsCriteria->next()) { $row = $rsCriteria->getRow(); - - if ($row["DYN_TITLE"] . "" == "") { - //There is no transaltion for this Document name, try to get/regenerate the label - $row["DYN_TITLE"] = \Content::Load("DYN_TITLE", "", $row["DYN_UID"], SYS_LANG); - } - $arraydbStep[] = array( $this->getFieldNameByFormatFieldName("OBJ_UID") => $row["DYN_UID"], $this->getFieldNameByFormatFieldName("OBJ_TITLE") => $row["DYN_TITLE"], @@ -636,40 +614,16 @@ class Task //OutputDocuments $criteria = new \Criteria("workflow"); - $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_UID); - $criteria->addAsColumn("OUT_DOC_TITLE", "CT.CON_VALUE"); - $criteria->addAsColumn("OUT_DOC_DESCRIPTION", "CD.CON_VALUE"); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\OutputDocumentPeer::OUT_DOC_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "OUT_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(\OutputDocumentPeer::OUT_DOC_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "OUT_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - + $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TITLE); + $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_DESCRIPTION); $criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\OutputDocumentPeer::OUT_DOC_UID, $arrayUid, \Criteria::NOT_IN); - $rsCriteria = \OutputDocumentPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); while ($rsCriteria->next()) { $row = $rsCriteria->getRow(); - - if ($row["OUT_DOC_TITLE"] . "" == "") { - //There is no transaltion for this Document name, try to get/regenerate the label - $row["OUT_DOC_TITLE"] = \Content::Load("OUT_DOC_TITLE", "", $row["OUT_DOC_UID"], SYS_LANG); - } - $arraydbStep[] = array( $this->getFieldNameByFormatFieldName("OBJ_UID") => $row["OUT_DOC_UID"], $this->getFieldNameByFormatFieldName("OBJ_TITLE") => $row["OUT_DOC_TITLE"], diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php b/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php index 827269dc6..948a36597 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php @@ -16,27 +16,11 @@ class Trigger $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\TriggersPeer::TRI_UID); - $criteria->addAsColumn("TRI_TITLE", "CT.CON_VALUE"); - $criteria->addAsColumn("TRI_DESCRIPTION", "CD.CON_VALUE"); + $criteria->addSelectColumn(\TriggersPeer::TRI_TITLE); + $criteria->addSelectColumn(\TriggersPeer::TRI_DESCRIPTION); $criteria->addSelectColumn(\TriggersPeer::TRI_TYPE); $criteria->addSelectColumn(\TriggersPeer::TRI_WEBBOT); $criteria->addSelectColumn(\TriggersPeer::TRI_PARAM); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\TriggersPeer::TRI_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "TRI_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(\TriggersPeer::TRI_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "TRI_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - return $criteria; } catch (\Exception $e) { throw $e; @@ -57,7 +41,7 @@ class Trigger $criteria = $this->getTriggerCriteria(); $criteria->add(\TriggersPeer::PRO_UID, $sProcessUID); - $criteria->addAscendingOrderByColumn('TRI_TITLE'); + $criteria->addAscendingOrderByColumn(\TriggersPeer::TRI_TITLE); $oDataset = \TriggersPeer::doSelectRS($criteria); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); @@ -239,30 +223,15 @@ class Trigger $oCriteria = new \Criteria("workflow"); $oCriteria->addSelectColumn( \TriggersPeer::TRI_UID ); $oCriteria->add( \TriggersPeer::PRO_UID, $sProcessUID ); + $oCriteria->add( \TriggersPeer::TRI_TITLE, $sTriggerName ); if ($sTriggerUid != '') { $oCriteria->add( \TriggersPeer::TRI_UID, $sTriggerUid, \Criteria::NOT_EQUAL); } $oDataset = \TriggersPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - while ($oDataset->next()) { - $aRow = $oDataset->getRow(); - - $oCriteria1 = new \Criteria( 'workflow' ); - $oCriteria1->addSelectColumn( 'COUNT(*) AS TRIGGERS' ); - $oCriteria1->add( \ContentPeer::CON_CATEGORY, 'TRI_TITLE' ); - $oCriteria1->add( \ContentPeer::CON_ID, $aRow['TRI_UID'] ); - $oCriteria1->add( \ContentPeer::CON_VALUE, $sTriggerName ); - $oCriteria1->add( \ContentPeer::CON_LANG, SYS_LANG ); - $oDataset1 = \ContentPeer::doSelectRS( $oCriteria1 ); - $oDataset1->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $oDataset1->next(); - $aRow1 = $oDataset1->getRow(); - - if ($aRow1['TRIGGERS']) { - return false; - } - } - return true; + $oDataset->next(); + $aRow = $oDataset->getRow(); + return (!$aRow) ? true : false; } /** diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php index 6408ff059..9850a47ea 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php @@ -162,28 +162,15 @@ class WebEntryEvent public function existsTitle($projectUid, $webEntryEventTitle, $webEntryEventUidToExclude = "") { try { - $delimiter = \DBAdapter::getStringDelimiter(); - $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\WebEntryEventPeer::WEE_UID); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\WebEntryEventPeer::WEE_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "WEE_TITLE" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - $criteria->add(\WebEntryEventPeer::PRJ_UID, $projectUid, \Criteria::EQUAL); if ($webEntryEventUidToExclude != "") { $criteria->add(\WebEntryEventPeer::WEE_UID, $webEntryEventUidToExclude, \Criteria::NOT_EQUAL); } - - $criteria->add("CT.CON_VALUE", $webEntryEventTitle, \Criteria::EQUAL); - + $criteria->add(\WebEntryEventPeer::WEE_TITLE, $webEntryEventTitle); $rsCriteria = \WebEntryEventPeer::doSelectRS($criteria); return ($rsCriteria->next())? true : false; @@ -820,40 +807,20 @@ class WebEntryEvent public function getWebEntryEventCriteria() { try { - $delimiter = \DBAdapter::getStringDelimiter(); - $criteria = new \Criteria("workflow"); - $criteria->addSelectColumn(\WebEntryEventPeer::WEE_UID); $criteria->addSelectColumn(\WebEntryEventPeer::PRJ_UID); $criteria->addSelectColumn(\WebEntryEventPeer::EVN_UID); $criteria->addSelectColumn(\WebEntryEventPeer::ACT_UID); $criteria->addSelectColumn(\WebEntryEventPeer::DYN_UID); $criteria->addSelectColumn(\WebEntryEventPeer::USR_UID); - $criteria->addSelectColumn("CT.CON_VALUE AS WEE_TITLE"); - $criteria->addSelectColumn("CD.CON_VALUE AS WEE_DESCRIPTION"); + $criteria->addSelectColumn(\WebEntryEventPeer::WEE_TITLE); + $criteria->addSelectColumn(\WebEntryEventPeer::WEE_DESCRIPTION); $criteria->addSelectColumn(\WebEntryEventPeer::WEE_STATUS); $criteria->addSelectColumn(\WebEntryEventPeer::WEE_WE_UID); $criteria->addSelectColumn(\WebEntryEventPeer::WEE_WE_TAS_UID); $criteria->addSelectColumn(\WebEntryPeer::WE_DATA . " AS WEE_WE_URL"); - - $criteria->addAlias("CT", \ContentPeer::TABLE_NAME); - $criteria->addAlias("CD", \ContentPeer::TABLE_NAME); - - $arrayCondition = array(); - $arrayCondition[] = array(\WebEntryEventPeer::WEE_UID, "CT.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "WEE_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(\WebEntryEventPeer::WEE_UID, "CD.CON_ID", \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "WEE_DESCRIPTION" . $delimiter, \Criteria::EQUAL); - $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); - $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); - $criteria->addJoin(\WebEntryEventPeer::WEE_WE_UID, \WebEntryPeer::WE_UID, \Criteria::LEFT_JOIN); - return $criteria; } catch (\Exception $e) { throw $e; diff --git a/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php index ee6f24a36..13db20a7d 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php @@ -160,18 +160,15 @@ class ActionsByEmail extends Api { $criteria = new Criteria(); $criteria->addSelectColumn(DynaformPeer::DYN_UID); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->addJoin( DynaformPeer::DYN_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); + $criteria->addSelectColumn(DynaformPeer::DYN_TITLE); $criteria->add( DynaformPeer::PRO_UID, $proUid, Criteria::EQUAL ); $criteria->add( DynaformPeer::DYN_TYPE, 'xmlform', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'DYN_TITLE'); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG); $dataset = DynaformPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dynaform = array(); while ($dataset->next()) { $aRow = $dataset->getRow(); - $dynaform[] = array('DYN_UID' => $aRow['DYN_UID'], 'DYN_NAME' => $aRow['CON_VALUE']); + $dynaform[] = array('DYN_UID' => $aRow['DYN_UID'], 'DYN_NAME' => $aRow['DYN_TITLE']); } return $dynaform; } diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml b/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml index 2a8e463cb..9cb32b042 100644 --- a/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml @@ -1,8 +1,8 @@ - + - + diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_WebEntry.xml b/workflow/engine/xmlform/dynaforms/dynaforms_WebEntry.xml index cd4293ea5..b6b8b2293 100644 --- a/workflow/engine/xmlform/dynaforms/dynaforms_WebEntry.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_WebEntry.xml @@ -6,17 +6,15 @@ diff --git a/workflow/engine/xmlform/triggers/triggers_ShortList.xml b/workflow/engine/xmlform/triggers/triggers_ShortList.xml index 298537e8f..e41e536d9 100644 --- a/workflow/engine/xmlform/triggers/triggers_ShortList.xml +++ b/workflow/engine/xmlform/triggers/triggers_ShortList.xml @@ -1,5 +1,5 @@ - +