From f642bec47b5bb3567baa97897647e5fda60ea3a7 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 5 Jun 2015 09:58:35 -0400 Subject: [PATCH 01/17] PM-2815: I added MINUTES in end point --- .../engine/src/ProcessMaker/Services/Api/Project/Activity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php index 34d05b7d9..e40498771 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php @@ -258,7 +258,7 @@ class ActivityPropertiesStructure public $tas_selfservice_timeout; /** - * @var string {@from body} {@choice DAYS,,HOURS} + * @var string {@from body} {@choice DAYS,,HOURS,MINUTES} */ public $tas_selfservice_time_unit; From 193c996bfa3da913b5ee79040c0def7a6b366d3c Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 8 Jun 2015 11:34:13 -0400 Subject: [PATCH 02/17] PM-2815: I added minutes in Assigment rules > timing control --- workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml index 8bede4601..ba41668a2 100755 --- a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml +++ b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml @@ -28,7 +28,7 @@ - + Date: Mon, 8 Jun 2015 12:59:45 -0400 Subject: [PATCH 03/17] PM-2815: I checked the funcion in cron --- workflow/engine/bin/cron_single.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 205e981b3..ed7aa5b8d 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -967,7 +967,7 @@ function executeCaseSelfService() $dueDate = $calendar->calculateDate( $appcacheDelDelegateDate, $taskSelfServiceTime, - $taskSelfServiceTimeUnit //HOURS|DAYS + $taskSelfServiceTimeUnit //HOURS|DAYS|MINUTES //1 ); From 138388d9c1757ad53417070dacb47d17a75e58f6 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Wed, 10 Jun 2015 17:55:47 -0400 Subject: [PATCH 04/17] PM-2815: I added the dropdwon[Execute Trigger] --- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 9 ++++++++- .../src/ProcessMaker/Services/Api/Project/Activity.php | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index d2ac8fba8..af3cb9cc8 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -155,7 +155,8 @@ class Task "TAS_SELFSERVICE_TIMEOUT" => $arrayDataAux["TAS_SELFSERVICE_TIMEOUT"], "TAS_SELFSERVICE_TIME" => $arrayDataAux["TAS_SELFSERVICE_TIME"], "TAS_SELFSERVICE_TIME_UNIT" => $arrayDataAux["TAS_SELFSERVICE_TIME_UNIT"], - "TAS_SELFSERVICE_TRIGGER_UID" => $arrayDataAux["TAS_SELFSERVICE_TRIGGER_UID"] + "TAS_SELFSERVICE_TRIGGER_UID" => $arrayDataAux["TAS_SELFSERVICE_TRIGGER_UID"], + "TAS_SELFSERVICE_EXECUTION" => $arrayDataAux["TAS_SELFSERVICE_EXECUTION"] ), $keyCase ); @@ -277,6 +278,7 @@ class Task $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID"); + $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION"); break; case 'EVALUATE': if (empty($arrayProperty["TAS_ASSIGN_VARIABLE"])) { @@ -287,6 +289,7 @@ class Task $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID"); + $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION"); break; case 'SELF_SERVICE': case 'SELF_SERVICE_EVALUATE': @@ -312,10 +315,14 @@ class Task if (empty($arrayProperty["TAS_SELFSERVICE_TRIGGER_UID"])) { throw (new \Exception("Invalid value specified for 'tas_selfservice_trigger_uid'")); } + if (empty($arrayProperty["TAS_SELFSERVICE_EXECUTION"])) { + throw (new \Exception("Invalid value specified for 'tas_selfservice_execution'")); + } } else { $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID"); + $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION"); } break; } diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php index e40498771..a01bd3066 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php @@ -267,6 +267,11 @@ class ActivityPropertiesStructure */ public $tas_selfservice_trigger_uid; + /** + * @var string {@from body} {@choice EVERY_TIME,ONCE} + */ + public $tas_selfservice_execution; + /** * @var string {@from body} {@choice TRUE,FALSE} */ From bc6f4fae3153d476f1f226f876fb7451f5f73426 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Thu, 11 Jun 2015 17:01:06 -0400 Subject: [PATCH 05/17] PM-2938: Batch routing plugin and feature working together --- .../classes/class.consolidatedCases.php | 10 +-- ...solidated.php => CaseConsolidatedCore.php} | 4 +- ...dPeer.php => CaseConsolidatedCorePeer.php} | 6 +- ...php => CaseConsolidatedCoreMapBuilder.php} | 6 +- ...dated.php => BaseCaseConsolidatedCore.php} | 60 +++++++------- ...r.php => BaseCaseConsolidatedCorePeer.php} | 78 +++++++++---------- .../BusinessModel/Consolidated.php | 16 ++-- .../src/ProcessMaker/BusinessModel/Lists.php | 6 +- 8 files changed, 93 insertions(+), 93 deletions(-) rename workflow/engine/classes/model/{CaseConsolidated.php => CaseConsolidatedCore.php} (74%) rename workflow/engine/classes/model/{CaseConsolidatedPeer.php => CaseConsolidatedCorePeer.php} (68%) rename workflow/engine/classes/model/map/{CaseConsolidatedMapBuilder.php => CaseConsolidatedCoreMapBuilder.php} (92%) rename workflow/engine/classes/model/om/{BaseCaseConsolidated.php => BaseCaseConsolidatedCore.php} (88%) rename workflow/engine/classes/model/om/{BaseCaseConsolidatedPeer.php => BaseCaseConsolidatedCorePeer.php} (86%) diff --git a/workflow/engine/classes/class.consolidatedCases.php b/workflow/engine/classes/class.consolidatedCases.php index 3cabfd476..ecfad904f 100644 --- a/workflow/engine/classes/class.consolidatedCases.php +++ b/workflow/engine/classes/class.consolidatedCases.php @@ -16,10 +16,10 @@ class ConsolidatedCases if ($sRepTabUid != '') { if (!$status) { - $oCaseConsolidated = new CaseConsolidated(); - $oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid); + $oCaseConsolidated = new CaseConsolidatedCore(); + $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { - $oCaseConsolidated = new CaseConsolidated(); + $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setConStatus('INACTIVE'); $oCaseConsolidated->save(); @@ -168,9 +168,9 @@ class ConsolidatedCases $oReportTables->populateTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields, $_POST['form']['PRO_UID'], ''); $sRepTabUid = $_POST['form']['REP_TAB_UID']; - $oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid); + $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { - $oCaseConsolidated = new CaseConsolidated(); + $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated->setTasUid($sTasUid); } diff --git a/workflow/engine/classes/model/CaseConsolidated.php b/workflow/engine/classes/model/CaseConsolidatedCore.php similarity index 74% rename from workflow/engine/classes/model/CaseConsolidated.php rename to workflow/engine/classes/model/CaseConsolidatedCore.php index 972127612..17f661d0f 100644 --- a/workflow/engine/classes/model/CaseConsolidated.php +++ b/workflow/engine/classes/model/CaseConsolidatedCore.php @@ -1,6 +1,6 @@ tas_uid !== $v || $v === '') { $this->tas_uid = $v; - $this->modifiedColumns[] = CaseConsolidatedPeer::TAS_UID; + $this->modifiedColumns[] = CaseConsolidatedCorePeer::TAS_UID; } } // setTasUid() @@ -148,7 +148,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent if ($this->dyn_uid !== $v || $v === '') { $this->dyn_uid = $v; - $this->modifiedColumns[] = CaseConsolidatedPeer::DYN_UID; + $this->modifiedColumns[] = CaseConsolidatedCorePeer::DYN_UID; } } // setDynUid() @@ -170,7 +170,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent if ($this->rep_tab_uid !== $v || $v === '') { $this->rep_tab_uid = $v; - $this->modifiedColumns[] = CaseConsolidatedPeer::REP_TAB_UID; + $this->modifiedColumns[] = CaseConsolidatedCorePeer::REP_TAB_UID; } } // setRepTabUid() @@ -192,7 +192,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent if ($this->con_status !== $v || $v === 'ACTIVE') { $this->con_status = $v; - $this->modifiedColumns[] = CaseConsolidatedPeer::CON_STATUS; + $this->modifiedColumns[] = CaseConsolidatedCorePeer::CON_STATUS; } } // setConStatus() @@ -227,7 +227,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 4; // 4 = CaseConsolidatedPeer::NUM_COLUMNS - CaseConsolidatedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 4; // 4 = CaseConsolidatedCorePeer::NUM_COLUMNS - CaseConsolidatedCorePeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating CaseConsolidated object", $e); @@ -250,12 +250,12 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent } if ($con === null) { - $con = Propel::getConnection(CaseConsolidatedPeer::DATABASE_NAME); + $con = Propel::getConnection(CaseConsolidatedCorePeer::DATABASE_NAME); } try { $con->begin(); - CaseConsolidatedPeer::doDelete($this, $con); + CaseConsolidatedCorePeer::doDelete($this, $con); $this->setDeleted(true); $con->commit(); } catch (PropelException $e) { @@ -281,7 +281,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent } if ($con === null) { - $con = Propel::getConnection(CaseConsolidatedPeer::DATABASE_NAME); + $con = Propel::getConnection(CaseConsolidatedCorePeer::DATABASE_NAME); } try { @@ -316,14 +316,14 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent // If this object has been modified, then save it to the database. if ($this->isModified()) { if ($this->isNew()) { - $pk = CaseConsolidatedPeer::doInsert($this, $con); + $pk = CaseConsolidatedCorePeer::doInsert($this, $con); $affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which // should always be true here (even though technically // BasePeer::doInsert() can insert multiple rows). $this->setNew(false); } else { - $affectedRows += CaseConsolidatedPeer::doUpdate($this, $con); + $affectedRows += CaseConsolidatedCorePeer::doUpdate($this, $con); } $this->resetModified(); // [HL] After being saved an object is no longer 'modified' } @@ -394,7 +394,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent $failureMap = array(); - if (($retval = CaseConsolidatedPeer::doValidate($this, $columns)) !== true) { + if (($retval = CaseConsolidatedCorePeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -417,7 +417,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent */ public function getByName($name, $type = BasePeer::TYPE_PHPNAME) { - $pos = CaseConsolidatedPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + $pos = CaseConsolidatedCorePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); return $this->getByPosition($pos); } @@ -461,7 +461,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent */ public function toArray($keyType = BasePeer::TYPE_PHPNAME) { - $keys = CaseConsolidatedPeer::getFieldNames($keyType); + $keys = CaseConsolidatedCorePeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getTasUid(), $keys[1] => $this->getDynUid(), @@ -483,7 +483,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent */ public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME) { - $pos = CaseConsolidatedPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + $pos = CaseConsolidatedCorePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); return $this->setByPosition($pos, $value); } @@ -531,7 +531,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent */ public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME) { - $keys = CaseConsolidatedPeer::getFieldNames($keyType); + $keys = CaseConsolidatedCorePeer::getFieldNames($keyType); if (array_key_exists($keys[0], $arr)) { $this->setTasUid($arr[$keys[0]]); @@ -558,22 +558,22 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent */ public function buildCriteria() { - $criteria = new Criteria(CaseConsolidatedPeer::DATABASE_NAME); + $criteria = new Criteria(CaseConsolidatedCorePeer::DATABASE_NAME); - if ($this->isColumnModified(CaseConsolidatedPeer::TAS_UID)) { - $criteria->add(CaseConsolidatedPeer::TAS_UID, $this->tas_uid); + if ($this->isColumnModified(CaseConsolidatedCorePeer::TAS_UID)) { + $criteria->add(CaseConsolidatedCorePeer::TAS_UID, $this->tas_uid); } - if ($this->isColumnModified(CaseConsolidatedPeer::DYN_UID)) { - $criteria->add(CaseConsolidatedPeer::DYN_UID, $this->dyn_uid); + if ($this->isColumnModified(CaseConsolidatedCorePeer::DYN_UID)) { + $criteria->add(CaseConsolidatedCorePeer::DYN_UID, $this->dyn_uid); } - if ($this->isColumnModified(CaseConsolidatedPeer::REP_TAB_UID)) { - $criteria->add(CaseConsolidatedPeer::REP_TAB_UID, $this->rep_tab_uid); + if ($this->isColumnModified(CaseConsolidatedCorePeer::REP_TAB_UID)) { + $criteria->add(CaseConsolidatedCorePeer::REP_TAB_UID, $this->rep_tab_uid); } - if ($this->isColumnModified(CaseConsolidatedPeer::CON_STATUS)) { - $criteria->add(CaseConsolidatedPeer::CON_STATUS, $this->con_status); + if ($this->isColumnModified(CaseConsolidatedCorePeer::CON_STATUS)) { + $criteria->add(CaseConsolidatedCorePeer::CON_STATUS, $this->con_status); } @@ -590,9 +590,9 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent */ public function buildPkeyCriteria() { - $criteria = new Criteria(CaseConsolidatedPeer::DATABASE_NAME); + $criteria = new Criteria(CaseConsolidatedCorePeer::DATABASE_NAME); - $criteria->add(CaseConsolidatedPeer::TAS_UID, $this->tas_uid); + $criteria->add(CaseConsolidatedCorePeer::TAS_UID, $this->tas_uid); return $criteria; } @@ -671,12 +671,12 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent * same instance for all member of this class. The method could therefore * be static, but this would prevent one from overriding the behavior. * - * @return CaseConsolidatedPeer + * @return CaseConsolidatedCorePeer */ public function getPeer() { if (self::$peer === null) { - self::$peer = new CaseConsolidatedPeer(); + self::$peer = new CaseConsolidatedCorePeer(); } return self::$peer; } diff --git a/workflow/engine/classes/model/om/BaseCaseConsolidatedPeer.php b/workflow/engine/classes/model/om/BaseCaseConsolidatedCorePeer.php similarity index 86% rename from workflow/engine/classes/model/om/BaseCaseConsolidatedPeer.php rename to workflow/engine/classes/model/om/BaseCaseConsolidatedCorePeer.php index 5c280d57a..d422e57e1 100644 --- a/workflow/engine/classes/model/om/BaseCaseConsolidatedPeer.php +++ b/workflow/engine/classes/model/om/BaseCaseConsolidatedCorePeer.php @@ -2,8 +2,8 @@ require_once 'propel/util/BasePeer.php'; // The object class -- needed for instanceof checks in this class. -// actual class may be a subclass -- as returned by CaseConsolidatedPeer::getOMClass() -include_once 'classes/model/CaseConsolidated.php'; +// actual class may be a subclass -- as returned by CaseConsolidatedCorePeer::getOMClass() +include_once 'classes/model/CaseConsolidatedCore.php'; /** * Base static class for performing query and update operations on the 'CASE_CONSOLIDATED' table. @@ -12,7 +12,7 @@ include_once 'classes/model/CaseConsolidated.php'; * * @package workflow.classes.model.om */ -abstract class BaseCaseConsolidatedPeer +abstract class BaseCaseConsolidatedCorePeer { /** the default database name for this class */ @@ -22,7 +22,7 @@ abstract class BaseCaseConsolidatedPeer const TABLE_NAME = 'CASE_CONSOLIDATED'; /** A class that can be returned by this peer. */ - const CLASS_DEFAULT = 'classes.model.CaseConsolidated'; + const CLASS_DEFAULT = 'classes.model.CaseConsolidatedCore'; /** The total number of columns. */ const NUM_COLUMNS = 4; @@ -55,7 +55,7 @@ abstract class BaseCaseConsolidatedPeer */ private static $fieldNames = array ( BasePeer::TYPE_PHPNAME => array ('TasUid', 'DynUid', 'RepTabUid', 'ConStatus', ), - BasePeer::TYPE_COLNAME => array (CaseConsolidatedPeer::TAS_UID, CaseConsolidatedPeer::DYN_UID, CaseConsolidatedPeer::REP_TAB_UID, CaseConsolidatedPeer::CON_STATUS, ), + BasePeer::TYPE_COLNAME => array (CaseConsolidatedCorePeer::TAS_UID, CaseConsolidatedCorePeer::DYN_UID, CaseConsolidatedCorePeer::REP_TAB_UID, CaseConsolidatedCorePeer::CON_STATUS, ), BasePeer::TYPE_FIELDNAME => array ('TAS_UID', 'DYN_UID', 'REP_TAB_UID', 'CON_STATUS', ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); @@ -68,7 +68,7 @@ abstract class BaseCaseConsolidatedPeer */ private static $fieldKeys = array ( BasePeer::TYPE_PHPNAME => array ('TasUid' => 0, 'DynUid' => 1, 'RepTabUid' => 2, 'ConStatus' => 3, ), - BasePeer::TYPE_COLNAME => array (CaseConsolidatedPeer::TAS_UID => 0, CaseConsolidatedPeer::DYN_UID => 1, CaseConsolidatedPeer::REP_TAB_UID => 2, CaseConsolidatedPeer::CON_STATUS => 3, ), + BasePeer::TYPE_COLNAME => array (CaseConsolidatedCorePeer::TAS_UID => 0, CaseConsolidatedCorePeer::DYN_UID => 1, CaseConsolidatedCorePeer::REP_TAB_UID => 2, CaseConsolidatedCorePeer::CON_STATUS => 3, ), BasePeer::TYPE_FIELDNAME => array ('TAS_UID' => 0, 'DYN_UID' => 1, 'REP_TAB_UID' => 2, 'CON_STATUS' => 3, ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); @@ -80,8 +80,8 @@ abstract class BaseCaseConsolidatedPeer */ public static function getMapBuilder() { - include_once 'classes/model/map/CaseConsolidatedMapBuilder.php'; - return BasePeer::getMapBuilder('classes.model.map.CaseConsolidatedMapBuilder'); + include_once 'classes/model/map/CaseConsolidatedCoreMapBuilder.php'; + return BasePeer::getMapBuilder('classes.model.map.CaseConsolidatedCoreMapBuilder'); } /** * Gets a map (hash) of PHP names to DB column names. @@ -94,7 +94,7 @@ abstract class BaseCaseConsolidatedPeer public static function getPhpNameMap() { if (self::$phpNameMap === null) { - $map = CaseConsolidatedPeer::getTableMap(); + $map = CaseConsolidatedCorePeer::getTableMap(); $columns = $map->getColumns(); $nameMap = array(); foreach ($columns as $column) { @@ -149,12 +149,12 @@ abstract class BaseCaseConsolidatedPeer * $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN); * * @param string $alias The alias for the current table. - * @param string $column The column name for current table. (i.e. CaseConsolidatedPeer::COLUMN_NAME). + * @param string $column The column name for current table. (i.e. CaseConsolidatedCorePeer::COLUMN_NAME). * @return string */ public static function alias($alias, $column) { - return str_replace(CaseConsolidatedPeer::TABLE_NAME.'.', $alias.'.', $column); + return str_replace(CaseConsolidatedCorePeer::TABLE_NAME.'.', $alias.'.', $column); } /** @@ -171,13 +171,13 @@ abstract class BaseCaseConsolidatedPeer public static function addSelectColumns(Criteria $criteria) { - $criteria->addSelectColumn(CaseConsolidatedPeer::TAS_UID); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID); - $criteria->addSelectColumn(CaseConsolidatedPeer::DYN_UID); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::DYN_UID); - $criteria->addSelectColumn(CaseConsolidatedPeer::REP_TAB_UID); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::REP_TAB_UID); - $criteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::CON_STATUS); } @@ -200,9 +200,9 @@ abstract class BaseCaseConsolidatedPeer // clear out anything that might confuse the ORDER BY clause $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(CaseConsolidatedPeer::COUNT_DISTINCT); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::COUNT_DISTINCT); } else { - $criteria->addSelectColumn(CaseConsolidatedPeer::COUNT); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::COUNT); } // just in case we're grouping: add those columns to the select statement @@ -210,7 +210,7 @@ abstract class BaseCaseConsolidatedPeer $criteria->addSelectColumn($column); } - $rs = CaseConsolidatedPeer::doSelectRS($criteria, $con); + $rs = CaseConsolidatedCorePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); } else { @@ -231,7 +231,7 @@ abstract class BaseCaseConsolidatedPeer { $critcopy = clone $criteria; $critcopy->setLimit(1); - $objects = CaseConsolidatedPeer::doSelect($critcopy, $con); + $objects = CaseConsolidatedCorePeer::doSelect($critcopy, $con); if ($objects) { return $objects[0]; } @@ -248,7 +248,7 @@ abstract class BaseCaseConsolidatedPeer */ public static function doSelect(Criteria $criteria, $con = null) { - return CaseConsolidatedPeer::populateObjects(CaseConsolidatedPeer::doSelectRS($criteria, $con)); + return CaseConsolidatedCorePeer::populateObjects(CaseConsolidatedCorePeer::doSelectRS($criteria, $con)); } /** * Prepares the Criteria object and uses the parent doSelect() @@ -272,7 +272,7 @@ abstract class BaseCaseConsolidatedPeer if (!$criteria->getSelectColumns()) { $criteria = clone $criteria; - CaseConsolidatedPeer::addSelectColumns($criteria); + CaseConsolidatedCorePeer::addSelectColumns($criteria); } // Set the correct dbName @@ -294,7 +294,7 @@ abstract class BaseCaseConsolidatedPeer $results = array(); // set the class once to avoid overhead in the loop - $cls = CaseConsolidatedPeer::getOMClass(); + $cls = CaseConsolidatedCorePeer::getOMClass(); $cls = Propel::import($cls); // populate the object(s) while ($rs->next()) { @@ -329,7 +329,7 @@ abstract class BaseCaseConsolidatedPeer */ public static function getOMClass() { - return CaseConsolidatedPeer::CLASS_DEFAULT; + return CaseConsolidatedCorePeer::CLASS_DEFAULT; } /** @@ -391,8 +391,8 @@ abstract class BaseCaseConsolidatedPeer if ($values instanceof Criteria) { $criteria = clone $values; // rename for clarity - $comparison = $criteria->getComparison(CaseConsolidatedPeer::TAS_UID); - $selectCriteria->add(CaseConsolidatedPeer::TAS_UID, $criteria->remove(CaseConsolidatedPeer::TAS_UID), $comparison); + $comparison = $criteria->getComparison(CaseConsolidatedCorePeer::TAS_UID); + $selectCriteria->add(CaseConsolidatedCorePeer::TAS_UID, $criteria->remove(CaseConsolidatedCorePeer::TAS_UID), $comparison); } else { $criteria = $values->buildCriteria(); // gets full criteria @@ -420,7 +420,7 @@ abstract class BaseCaseConsolidatedPeer // use transaction because $criteria could contain info // for more than one table or we could emulating ON DELETE CASCADE, etc. $con->begin(); - $affectedRows += BasePeer::doDeleteAll(CaseConsolidatedPeer::TABLE_NAME, $con); + $affectedRows += BasePeer::doDeleteAll(CaseConsolidatedCorePeer::TABLE_NAME, $con); $con->commit(); return $affectedRows; } catch (PropelException $e) { @@ -444,7 +444,7 @@ abstract class BaseCaseConsolidatedPeer public static function doDelete($values, $con = null) { if ($con === null) { - $con = Propel::getConnection(CaseConsolidatedPeer::DATABASE_NAME); + $con = Propel::getConnection(CaseConsolidatedCorePeer::DATABASE_NAME); } if ($values instanceof Criteria) { @@ -455,7 +455,7 @@ abstract class BaseCaseConsolidatedPeer } else { // it must be the primary key $criteria = new Criteria(self::DATABASE_NAME); - $criteria->add(CaseConsolidatedPeer::TAS_UID, (array) $values, Criteria::IN); + $criteria->add(CaseConsolidatedCorePeer::TAS_UID, (array) $values, Criteria::IN); } // Set the correct dbName @@ -494,8 +494,8 @@ abstract class BaseCaseConsolidatedPeer $columns = array(); if ($cols) { - $dbMap = Propel::getDatabaseMap(CaseConsolidatedPeer::DATABASE_NAME); - $tableMap = $dbMap->getTable(CaseConsolidatedPeer::TABLE_NAME); + $dbMap = Propel::getDatabaseMap(CaseConsolidatedCorePeer::DATABASE_NAME); + $tableMap = $dbMap->getTable(CaseConsolidatedCorePeer::TABLE_NAME); if (! is_array($cols)) { $cols = array($cols); @@ -511,7 +511,7 @@ abstract class BaseCaseConsolidatedPeer } - return BasePeer::doValidate(CaseConsolidatedPeer::DATABASE_NAME, CaseConsolidatedPeer::TABLE_NAME, $columns); + return BasePeer::doValidate(CaseConsolidatedCorePeer::DATABASE_NAME, CaseConsolidatedCorePeer::TABLE_NAME, $columns); } /** @@ -527,12 +527,12 @@ abstract class BaseCaseConsolidatedPeer $con = Propel::getConnection(self::DATABASE_NAME); } - $criteria = new Criteria(CaseConsolidatedPeer::DATABASE_NAME); + $criteria = new Criteria(CaseConsolidatedCorePeer::DATABASE_NAME); - $criteria->add(CaseConsolidatedPeer::TAS_UID, $pk); + $criteria->add(CaseConsolidatedCorePeer::TAS_UID, $pk); - $v = CaseConsolidatedPeer::doSelect($criteria, $con); + $v = CaseConsolidatedCorePeer::doSelect($criteria, $con); return !empty($v) > 0 ? $v[0] : null; } @@ -556,8 +556,8 @@ abstract class BaseCaseConsolidatedPeer $objs = array(); } else { $criteria = new Criteria(); - $criteria->add(CaseConsolidatedPeer::TAS_UID, $pks, Criteria::IN); - $objs = CaseConsolidatedPeer::doSelect($criteria, $con); + $criteria->add(CaseConsolidatedCorePeer::TAS_UID, $pks, Criteria::IN); + $objs = CaseConsolidatedCorePeer::doSelect($criteria, $con); } return $objs; } @@ -569,14 +569,14 @@ if (Propel::isInit()) { // the MapBuilder classes register themselves with Propel during initialization // so we need to load them here. try { - BaseCaseConsolidatedPeer::getMapBuilder(); + BaseCaseConsolidatedCorePeer::getMapBuilder(); } catch (Exception $e) { Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR); } } else { // even if Propel is not yet initialized, the map builder class can be registered // now and then it will be loaded when Propel initializes. - require_once 'classes/model/map/CaseConsolidatedMapBuilder.php'; - Propel::registerMapBuilder('classes.model.map.CaseConsolidatedMapBuilder'); + require_once 'classes/model/map/CaseConsolidatedCoreMapBuilder.php'; + Propel::registerMapBuilder('classes.model.map.CaseConsolidatedCoreMapBuilder'); } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php index 8e590b361..41cf13800 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php @@ -7,7 +7,7 @@ use \Criteria; use \ReportTablePeer; use \ResultSet; use \AppCacheViewPeer; -use \CaseConsolidatedPeer; +use \CaseConsolidatedCorePeer; use \ContentPeer; /** @@ -29,21 +29,21 @@ class Consolidated public function get ($tas_uid) { $criteria = new Criteria(); - $criteria->addSelectColumn(CaseConsolidatedPeer::DYN_UID); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::DYN_UID); $criteria->addSelectColumn(\ReportTablePeer::REP_TAB_NAME); $criteria->addSelectColumn(\ReportTablePeer::REP_TAB_UID); $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::CON_STATUS); - $criteria->addJoin( CaseConsolidatedPeer::REP_TAB_UID, ReportTablePeer::REP_TAB_UID, Criteria::LEFT_JOIN ); - $criteria->addJoin( CaseConsolidatedPeer::REP_TAB_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); + $criteria->addJoin( CaseConsolidatedCorePeer::REP_TAB_UID, ReportTablePeer::REP_TAB_UID, Criteria::LEFT_JOIN ); + $criteria->addJoin( CaseConsolidatedCorePeer::REP_TAB_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); $criteria->add( ContentPeer::CON_CATEGORY, "REP_TAB_TITLE"); $criteria->add( ContentPeer::CON_LANG, SYS_LANG); - $criteria->add( CaseConsolidatedPeer::TAS_UID, $tas_uid, Criteria::EQUAL ); - $criteria->add( CaseConsolidatedPeer::CON_STATUS, 'ACTIVE', Criteria::EQUAL ); + $criteria->add( CaseConsolidatedCorePeer::TAS_UID, $tas_uid, Criteria::EQUAL ); + $criteria->add( CaseConsolidatedCorePeer::CON_STATUS, 'ACTIVE', Criteria::EQUAL ); - $dataset = CaseConsolidatedPeer::doSelectRS($criteria); + $dataset = CaseConsolidatedCorePeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); if ($dataset->next()) { $response = $dataset->getRow(); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php index b5a1eb92e..06bdad8d0 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php @@ -226,12 +226,12 @@ class Lists { $licensedFeatures = & \PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) { $criteria = new Criteria(); - $criteria->add(\CaseConsolidatedPeer::CON_STATUS, 'ACTIVE'); - $criteria->addJoin(\CaseConsolidatedPeer::TAS_UID, \AppCacheViewPeer::TAS_UID, Criteria::LEFT_JOIN); + $criteria->add(\CaseConsolidatedCorePeer::CON_STATUS, 'ACTIVE'); + $criteria->addJoin(\CaseConsolidatedCorePeer::TAS_UID, \AppCacheViewPeer::TAS_UID, Criteria::LEFT_JOIN); $criteria->add(\AppCacheViewPeer::USR_UID, $userId); $criteria->add(\AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN'); $criteria->add(\AppCacheViewPeer::APP_STATUS, 'TO_DO'); - $total = \CaseConsolidatedPeer::doCount( $criteria ); + $total = \CaseConsolidatedCorePeer::doCount( $criteria ); $response[] = array('count' => $total, 'item' => 'CONSOLIDATED_CASES'); } /*----------------------------------********---------------------------------*/ From 68d92c465b7a5539ebb3ce002671f61369b9ae71 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Thu, 11 Jun 2015 18:42:58 -0400 Subject: [PATCH 06/17] PM-2938: Show only 1 cases menu [Batch Routing] --- workflow/engine/menus/cases.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/workflow/engine/menus/cases.php b/workflow/engine/menus/cases.php index 4445714e4..82274f2a4 100755 --- a/workflow/engine/menus/cases.php +++ b/workflow/engine/menus/cases.php @@ -32,7 +32,16 @@ G::LoadTranslation('ID_NEW_CASE'), ''); /*----------------------------------********---------------------------------*/ $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) { - $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); + //If plugin is active doesnot show the menu in Cases + $pluginRegistry = & PMPluginRegistry::getSingleton (); + $pluginDetail = $pluginRegistry->getPluginDetails("pmConsolidatedCL.php"); + $pluginEnabled = 0; + if ($pluginDetail && $pluginDetail->enabled) { + $pluginEnabled = 1; + } + if($pluginEnabled == 0){ + $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); + } } /*----------------------------------********---------------------------------*/ From 28aa6afa42c408d626d4c157e135ee68fc882ca0 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 12 Jun 2015 11:32:29 -0400 Subject: [PATCH 07/17] IMPROVEMENT --- workflow/engine/classes/class.pmDynaform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index d53c5b749..70514d581 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -219,7 +219,7 @@ class pmDynaform $cells = array(); foreach ($json->columns as $column) { //data - if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "suggest" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $value === "hidden") { + if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "suggest" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link" || $column->type === "hidden") { array_push($cells, array( "value" => isset($row[$column->name]) ? $row[$column->name] : "", "label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "") From 1aec306dbe1d9e4c03176ac608e34b97a617556b Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 12 Jun 2015 15:27:01 -0400 Subject: [PATCH 08/17] PM-2938: I correct some issues --- workflow/engine/classes/class.library.php | 6 +- workflow/engine/classes/class.processMap.php | 2 +- workflow/engine/menus/cases.php | 14 +- .../cases/casesConsolidatedListExtJs.php | 33 +- .../methods/cases/proxyDataCombobox.php | 91 ++++++ .../templates/cases/casesListConsolidated.js | 295 +++++++++++++++++- 6 files changed, 406 insertions(+), 35 deletions(-) create mode 100755 workflow/engine/methods/cases/proxyDataCombobox.php diff --git a/workflow/engine/classes/class.library.php b/workflow/engine/classes/class.library.php index d280fa1b6..f83935f83 100644 --- a/workflow/engine/classes/class.library.php +++ b/workflow/engine/classes/class.library.php @@ -10,12 +10,12 @@ class Library $criteria = new Criteria("workflow"); //SELECT - $criteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS); + $criteria->addSelectColumn(CaseConsolidatedCorePeer::CON_STATUS); //FROM //WHERE - $criteria->add(CaseConsolidatedPeer::CON_STATUS, "ACTIVE"); + $criteria->add(CaseConsolidatedCorePeer::CON_STATUS, "ACTIVE"); - $activeNumRec = CaseConsolidatedPeer::doCount($criteria); + $activeNumRec = CaseConsolidatedCorePeer::doCount($criteria); //Number of records $numRec = 0; diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 7dd4742f1..1b5521d1a 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -1545,7 +1545,7 @@ class processMap } if ($iForm == 8) { - $oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"]); + $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"]); if ((is_object($oCaseConsolidated)) && get_class($oCaseConsolidated) == "CaseConsolidated") { require_once ("classes/model/ReportTable.php"); diff --git a/workflow/engine/menus/cases.php b/workflow/engine/menus/cases.php index 82274f2a4..2ebf51b92 100755 --- a/workflow/engine/menus/cases.php +++ b/workflow/engine/menus/cases.php @@ -32,16 +32,7 @@ G::LoadTranslation('ID_NEW_CASE'), ''); /*----------------------------------********---------------------------------*/ $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) { - //If plugin is active doesnot show the menu in Cases - $pluginRegistry = & PMPluginRegistry::getSingleton (); - $pluginDetail = $pluginRegistry->getPluginDetails("pmConsolidatedCL.php"); - $pluginEnabled = 0; - if ($pluginDetail && $pluginDetail->enabled) { - $pluginEnabled = 1; - } - if($pluginEnabled == 0){ - $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); - } + $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); } /*----------------------------------********---------------------------------*/ @@ -108,5 +99,4 @@ if (count($dashBoardPages)>0) { ucwords(strtolower($tabName)), ''); } } -} - +} \ No newline at end of file diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php index 9ce405b42..2861f4f95 100644 --- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php +++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php @@ -105,16 +105,31 @@ while ($rsSql->next()) { $grdTitle = htmlentities($proTitle . " / " . $tabTitle, ENT_QUOTES, "UTF-8"); $tabTitle = htmlentities(substr($proTitle, 0, 25) . ((strlen($proTitle) > 25)? "..." : null) . " / " . $tabTitle, ENT_QUOTES, "UTF-8"); - $arrayTabItem[] = " - { - title: \"$tabTitle\", - listeners: { - activate: function () - { - generateGrid(\"$processUid\", \"$taskUid\", \"$dynaformUid\"); + $oProcess = new Process(); + $isBpmn = $oProcess->isBpmnProcess($processUid); + if($isBpmn){ + $arrayTabItem[] = " + { + title: \"$tabTitle\", + listeners: { + activate: function () + { + generateGrid(\"$processUid\", \"$taskUid\", \"$dynaformUid\"); + } } - } - }"; + }"; + }else{ + $arrayTabItem[] = " + { + title: \"$tabTitle\", + listeners: { + activate: function () + { + generateGridClassic(\"$processUid\", \"$taskUid\", \"$dynaformUid\"); + } + } + }"; + } } if (count($arrayTabItem) > 0) { diff --git a/workflow/engine/methods/cases/proxyDataCombobox.php b/workflow/engine/methods/cases/proxyDataCombobox.php new file mode 100755 index 000000000..d8ffc0f3f --- /dev/null +++ b/workflow/engine/methods/cases/proxyDataCombobox.php @@ -0,0 +1,91 @@ +home = PATH_DYNAFORM; +$G_FORM->parseFile($filename, SYS_LANG, true); + +G::LoadClass("case"); +G::LoadClass("pmFunctions"); + +//Load the variables +$oCase = new Cases(); +$sqlQuery = null; +$array = array(); +$aFields = $oCase->loadCase($appUid); + +foreach ($G_FORM->fields as $key => $val) { + if ($fieldName == $val->name) { + if ($G_FORM->fields[$key]->sql != null) { + $sqlQuery = G::replaceDataField($G_FORM->fields[$key]->sql, $aFields ["APP_DATA"]); + } + //$coma = ""; + //$data1 = ""; + if (is_array($val->options)) { + foreach ($val->options as $key1 => $val1) { + $array[] = array("value" => $key1, "text" => $val1); + } + } + } +} + +//echo ($sqlQuery); +if ($sqlQuery != null) { + $aResult = executeQuery($sqlQuery); + //var_dump($aResult); + if ($aResult == "false" || $aResult == null) { + $aResult = array(); + } +} else { + $aResult = array(); +} +//var_dump($aResult); +$arrayTmp = array(); +foreach ($aResult as $field) { + $i = 0; + + foreach ($field as $key => $value) { + if ($i == 0) { + $arrayTmp["value"] = $value; + if (count($field) == 1) { + $arrayTmp["text"]=$value; + } + } + + if ($i == 1) { + $arrayTmp["text"] = $value; + } + $i++; + } + $array[] = $arrayTmp; +} + +//var_dump($array); +/* +if ($appUid == "5662082864d4c536a5d2a73024245754") { + $array[] = array("value"=>"BO", "text"=>"Bolivia"); + $array[] = array("value"=>"US", "text"=>"USA"); + $array[] = array("value"=>"AR", "text"=>"Argentina"); +} +else { + $array[] = array("value"=>"EC", "text" => "Ecuador"); + $array[] = array("value"=>"RU", "text" => "Rusia"); + $array[] = array("value"=>"DE", "text" => "Alemania"); +} +*/ + +$response["records"] = $array; + +echo G::json_encode($response); +// echo "[" . json_encode($response) . "]"; + diff --git a/workflow/engine/templates/cases/casesListConsolidated.js b/workflow/engine/templates/cases/casesListConsolidated.js index d8f8332b9..9e6fffa84 100644 --- a/workflow/engine/templates/cases/casesListConsolidated.js +++ b/workflow/engine/templates/cases/casesListConsolidated.js @@ -706,6 +706,279 @@ function renderSummary (val, p, r) { return summaryIcon; }; +function generateGridClassic(proUid, tasUid, dynUid){ + + var pager = 20; //pageSize + var pagei = 0; //start + Ext.Ajax.request({ + url: '../pmConsolidatedCL/proxyGenerateGrid', + success: function(response) { + //Obtenemos el column model y los reader fields de proxyGenerateGrid + var dataResponse = Ext.util.JSON.decode(response.responseText); + var viewConfigObject; + var textArea = dataResponse.hasTextArea; + + if (textArea == false) { + viewConfigObject = { //forceFit: true + }; + } else { + viewConfigObject = { + //forceFit:true, + enableRowBody:true, + showPreview:true, + getRowClass : function(record, rowIndex, p, store){ + if (this.showPreview) { + p.body = '


'; + return 'x-grid3-row-expanded'; + } + return 'x-grid3-row-collapsed'; + } + }; + } + + storeConsolidated = new Ext.data.Store({ + id: "storeConsolidatedGrid", + remoteSort: true, + //definimos un proxy como un objeto de la clase HttpProxy + proxy: new Ext.data.HttpProxy({ + url: "../pmConsolidatedCL/proxyConsolidated", + api: { + read: "../pmConsolidatedCL/proxyConsolidated", + //update: "../pmConsolidatedCL/proxySaveConsolidated" + update: "../pmConsolidatedCL/consolidatedUpdateAjax" + } + }), + + //el data reader obtiene los reader fields de la consulta en ajax + reader: new Ext.data.JsonReader({ + fields: dataResponse.readerFields, + totalProperty: "totalCount", + //successProperty: "success", + idProperty: "APP_UID", + root: "data", + messageProperty: "message" + }), + + //el data writer es un objeto generico pero q permitira a futuro el escribir los datos al servidor mediante el proxy + writer: new Ext.data.JsonWriter({ + encode: true, + writeAllFields: false + }), //<-- plug a DataWriter into the store just as you would a Reader + autoSave: true, //<-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton. + + //el ordenamiento para los campos posiblemente este tenga q ser el tercer dato obtenido del proxy dado q los listados son muy cambiantes de tarea en tarea + //sortInfo:{ + // field: 'APP_CACHE_VIEW.APP_NUMBER', + // direction: "DESC" + //} + + //, + listeners: { // + beforeload:function (store, options) { // + grdNumRows = 0; // + }, // + + load:function (store, records, options) { // + grdNumRows = store.getCount(); // + + consolidatedGrid.setDisabled(false); + } // + } // + }); + + var xColumns = dataResponse.columnModel; + xColumns.unshift(smodel); + + + var cm = new Ext.grid.ColumnModel(xColumns); + cm.config[2].renderer = renderTitle; //Case Number + cm.config[3].renderer = renderTitle; //Case Title + cm.config[4].renderer = renderSummary;//Case Summary + + //generacion del grid basados en los atributos definidos con anterioridad + storeConsolidated.setBaseParam("limit", pager); + storeConsolidated.setBaseParam("start", pagei); + storeConsolidated.setBaseParam('tasUid', tasUid); + storeConsolidated.setBaseParam('dynUid', dynUid); + storeConsolidated.setBaseParam('proUid', proUid); + storeConsolidated.setBaseParam('dropList', Ext.util.JSON.encode(dataResponse.dropList)); + storeConsolidated.load(); + + consolidatedGrid = new Ext.grid.EditorGridPanel({ + id: gridId, + region: "center", + + store: storeConsolidated, + cm: cm, + sm: smodel, + //autoHeight: true, + + //height: pnlMain.getSize().height - pnlMain.getFrameHeight(), // + width: pnlMain.getSize().width, // + height: browserHeight - 35, // + + layout: 'fit', + //plugins: filters, + viewConfig: viewConfigObject, + + listeners: { + beforeedit: function (e) { + var selRow = Ext.getCmp(gridId).getSelectionModel().getSelected(); + + var swDropdown = 0; + for (var i = 0; i <= dataResponse.dropList.length - 1 && swDropdown == 0; i++) { + if (dataResponse.dropList[i] == e.field) { + swDropdown = 1; + } + } + + var swYesNo = 0; + for (var i = 0; i <= dataResponse.comboBoxYesNoList.length - 1 && swYesNo == 0; i++) { + if (dataResponse.comboBoxYesNoList[i] == e.field) { + swYesNo = 1; + } + } + + if (swDropdown == 1 && swYesNo == 0) { + storeAux = Ext.StoreMgr.get("store" + e.field + "_" + proUid); + storeAux.setBaseParam("appUid", selRow.data["APP_UID"]); + storeAux.setBaseParam("dynUid", dynUid); + storeAux.setBaseParam("proUid", proUid); + storeAux.setBaseParam("fieldName", e.field); + //currentFieldEdited = e.field; + storeAux.load(); + } + }, + + afteredit: function (e) { + //var store = consolidatedGrid.getStore(); + + if (Ext.getCmp("chk_allColumn").checked) { + Ext.Msg.show({ + title: "", + msg: "The modification will be applied to all rows in your selection.", + buttons: Ext.Msg.YESNO, + fn: function (btn) { + if (btn == "yes") { + //storeConsolidated.each(function (record) { + // record.set(e.field, e.value); + //}); + + consolidatedGrid.setDisabled(true); + + var dataUpdate = ""; + var strValue = ""; + var sw = 0; + + if (e.value instanceof Date) { + var mAux = e.value.getMonth() + 1; + var dAux = e.value.getDate(); + var hAux = e.value.getHours(); + var iAux = e.value.getMinutes(); + var sAux = e.value.getSeconds(); + + strValue = e.value.getFullYear() + "-" + ((mAux <= 9)? "0" : "") + mAux + "-" + ((dAux <= 9)? "0" : "") + dAux; + strValue = strValue + " " + ((hAux <= 9)? "0" + ((hAux == 0)? "0" : hAux) : hAux) + ":" + ((iAux <= 9)? "0" + ((iAux == 0)? "0" : iAux) : iAux) + ":" + ((sAux <= 9)? "0" + ((sAux == 0)? "0" : sAux) : sAux); + } else { + strValue = strReplace("\"", "\\\"", e.value + ""); + } + + storeConsolidated.each(function (record) { + dataUpdate = dataUpdate + ((sw == 1)? "(sep1 /)": "") + record.data["APP_UID"] + "(sep2 /)" + e.field + "(sep2 /)" + strValue; + sw = 1; + }); + + /////// + Ext.Ajax.request({ + url: "consolidatedUpdateAjax", + method: "POST", + params: { + "option": "ALL", + "dynaformUid": dynUid, + "dataUpdate": dataUpdate + }, + + success: function (response, opts) { + var dataResponse = eval("(" + response.responseText + ")"); //json + + if (dataResponse.status && dataResponse.status == "OK") { + if (typeof(storeConsolidated.lastOptions.params) != "undefined") { + pagei = storeConsolidated.lastOptions.params.start; + } + + storeConsolidated.setBaseParam("start", pagei); + storeConsolidated.load(); + } else { + // + } + } + }); + } + }, + //animEl: "elId", + icon: Ext.MessageBox.QUESTION + }); + } + }, + + mouseover: function (e, cell) { + var rowIndex = consolidatedGrid.getView().findRowIndex(cell); + if (!(rowIndex === false)) { + var record = consolidatedGrid.store.getAt(rowIndex); + var msg = record.get('APP_TITLE'); + Ext.QuickTips.register({ + text: msg, + target: e.target + }); + } else { + Ext.QuickTips.unregister(e.target); + } + }, + + mouseout: function (e, cell) { + Ext.QuickTips.unregister(e.target); + } + }, + + //tbar: tb, + + tbar: new Ext.Toolbar({ + height: 33, + items: toolbarconsolidated + }), + + bbar: new Ext.PagingToolbar({ + pageSize: pager, + store: storeConsolidated, + displayInfo: true, + displayMsg: _("ID_DISPLAY_ITEMS"), + emptyMsg: _("ID_DISPLAY_EMPTY") + }) + }); + + //remocion de todos los elementos del panel principal donde se carga el grid + //Ext.ComponentMgr.get("myId").body.update(""); + //pnlMain.removeAll(false); + pnlMain.removeAll(); + //adicion del grid definido con anterioridad + pnlMain.add(consolidatedGrid); + //recarga de los elementos del grid, para su visualizacion. + pnlMain.doLayout(); + }, + + //en caso de fallo ejecutar la siguiente funcion. + failure: function(){ + alert("Failure..."); + }, + // parametros que son enviados en la peticion al servidor. + params: { + xaction: 'read', + tasUid: tasUid, + dynUid: dynUid, + proUid: proUid + } + }); +} function generateGrid(proUid, tasUid, dynUid) { @@ -1055,16 +1328,18 @@ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber){ buttons: Ext.MessageBox.OK, fn: function (btn, text, opt) { - //if (btn == "ok") {} - if (maxLenght == storeConsolidated.getCount()) { - window.location.reload(); - } - - if (fullResponseText.charAt(0) != "<") { - parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); - } - - storeConsolidated.reload(); + if (btn == "ok") { + if (maxLenght == storeConsolidated.getCount()) { + window.location.reload(); + } + if (fullResponseText.charAt(0) != "<") { + parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); + } + storeConsolidated.reload(); + }else{ + //Click in X + } + } }); } From 52bf21289dd920fa6dfb32d4b7e87d933b66b947 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 12 Jun 2015 15:32:55 -0400 Subject: [PATCH 09/17] PM-2938: I deleted the validacion in Ok windows --- .../templates/cases/casesListConsolidated.js | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/workflow/engine/templates/cases/casesListConsolidated.js b/workflow/engine/templates/cases/casesListConsolidated.js index 9e6fffa84..b2e9dd1df 100644 --- a/workflow/engine/templates/cases/casesListConsolidated.js +++ b/workflow/engine/templates/cases/casesListConsolidated.js @@ -1328,18 +1328,16 @@ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber){ buttons: Ext.MessageBox.OK, fn: function (btn, text, opt) { - if (btn == "ok") { - if (maxLenght == storeConsolidated.getCount()) { - window.location.reload(); - } - if (fullResponseText.charAt(0) != "<") { - parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); - } - storeConsolidated.reload(); - }else{ - //Click in X - } - + //if (btn == "ok") {} + if (maxLenght == storeConsolidated.getCount()) { + window.location.reload(); + } + + if (fullResponseText.charAt(0) != "<") { + parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); + } + + storeConsolidated.reload(); } }); } From e074485c54dc2412ccf58beb93d6ef2f3cbfb0d6 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 12 Jun 2015 16:29:10 -0400 Subject: [PATCH 10/17] PM-2879 Improve Case Tracker UX --- workflow/engine/templates/designer/index.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index 900944fe0..20d22ab62 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -150,23 +150,22 @@ -
  • - - -
    • -
  • - - -
    • +
  • + + +
    • +
  • + +
    • - + \ No newline at end of file From 601747e7b0b939f4d3f023cf285d7dbf4d6443f3 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 12 Jun 2015 16:34:35 -0400 Subject: [PATCH 11/17] PM-2879 Improve Case Tracker UX --- workflow/engine/templates/designer/index.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index 20d22ab62..4fa796318 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -151,12 +151,16 @@
  • - - + +
  • - - + + +
    • +
  • + +
  • From f350f2738648c86e53cd20b1800c981cdc55bd5e Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 12 Jun 2015 16:49:52 -0400 Subject: [PATCH 12/17] PM-2938: I solved the issue when deschecked the option [Enable consolidate for this task] --- workflow/engine/classes/class.consolidatedCases.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/classes/class.consolidatedCases.php b/workflow/engine/classes/class.consolidatedCases.php index ecfad904f..cbe1fb6fb 100644 --- a/workflow/engine/classes/class.consolidatedCases.php +++ b/workflow/engine/classes/class.consolidatedCases.php @@ -19,6 +19,9 @@ class ConsolidatedCases $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { + $oCaseConsolidated = new CaseConsolidatedCore(); + $oCaseConsolidated->setTasUid($sTasUid); + $oCaseConsolidated->delete(); $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setConStatus('INACTIVE'); From 1f08900b710020f159018f7ee29ee24da057641f Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 12 Jun 2015 17:30:18 -0400 Subject: [PATCH 13/17] PM-2939: Actions by email plugin and feature working together --- ...{class.actionsByEmail.php => class.actionsByEmailCore.php} | 2 +- workflow/engine/classes/model/AppDelegation.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename workflow/engine/classes/{class.actionsByEmail.php => class.actionsByEmailCore.php} (99%) diff --git a/workflow/engine/classes/class.actionsByEmail.php b/workflow/engine/classes/class.actionsByEmailCore.php similarity index 99% rename from workflow/engine/classes/class.actionsByEmail.php rename to workflow/engine/classes/class.actionsByEmailCore.php index b55754ab7..32614be98 100644 --- a/workflow/engine/classes/class.actionsByEmail.php +++ b/workflow/engine/classes/class.actionsByEmailCore.php @@ -1,7 +1,7 @@ verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { - G::LoadClass('actionsByEmail'); - $actionsByEmail = new actionsByEmailClass(); + G::LoadClass('actionsByEmailCore'); + $actionsByEmail = new actionsByEmailCoreClass(); $actionsByEmail->sendActionsByEmail($data); } /*----------------------------------********---------------------------------*/ From 89ddab8a30cc6dd45e0d856d96c3cfac99004fd5 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 15 Jun 2015 09:11:38 -0400 Subject: [PATCH 14/17] I deleted some lines --- .../engine/methods/cases/proxyDataCombobox.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/workflow/engine/methods/cases/proxyDataCombobox.php b/workflow/engine/methods/cases/proxyDataCombobox.php index d8ffc0f3f..4d086afc9 100755 --- a/workflow/engine/methods/cases/proxyDataCombobox.php +++ b/workflow/engine/methods/cases/proxyDataCombobox.php @@ -70,22 +70,6 @@ foreach ($aResult as $field) { $array[] = $arrayTmp; } -//var_dump($array); -/* -if ($appUid == "5662082864d4c536a5d2a73024245754") { - $array[] = array("value"=>"BO", "text"=>"Bolivia"); - $array[] = array("value"=>"US", "text"=>"USA"); - $array[] = array("value"=>"AR", "text"=>"Argentina"); -} -else { - $array[] = array("value"=>"EC", "text" => "Ecuador"); - $array[] = array("value"=>"RU", "text" => "Rusia"); - $array[] = array("value"=>"DE", "text" => "Alemania"); -} -*/ - $response["records"] = $array; -echo G::json_encode($response); -// echo "[" . json_encode($response) . "]"; - +echo G::json_encode($response); \ No newline at end of file From 2a82e14fedd4c77c73b448cfc67f85a4e8c79843 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 15 Jun 2015 10:17:14 -0400 Subject: [PATCH 15/17] PM-2939: I catch and show the error --- .../classes/class.actionsByEmailCore.php | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/workflow/engine/classes/class.actionsByEmailCore.php b/workflow/engine/classes/class.actionsByEmailCore.php index 32614be98..3596ea45f 100644 --- a/workflow/engine/classes/class.actionsByEmailCore.php +++ b/workflow/engine/classes/class.actionsByEmailCore.php @@ -25,32 +25,44 @@ class actionsByEmailCoreClass extends PMPlugin { try { // Validations - if (!is_object($data)) { - throw new Exception('The parameter $data is null.'); - } + try { + if (!is_object($data)) { + throw new Exception('The parameter $data is null.'); + } + if (!isset($data->TAS_UID)) { + throw new Exception('The parameter $data->TAS_UID is null.'); + } - if (!isset($data->TAS_UID)) { - throw new Exception('The parameter $data->TAS_UID is null.'); - } + if (!isset($data->APP_UID)) { + throw new Exception('The parameter $data->APP_UID is null.'); + } - if (!isset($data->APP_UID)) { - throw new Exception('The parameter $data->APP_UID is null.'); - } + if (!isset($data->DEL_INDEX)) { + throw new Exception('The parameter $data->DEL_INDEX is null.'); + } - if (!isset($data->DEL_INDEX)) { - throw new Exception('The parameter $data->DEL_INDEX is null.'); - } + if (!isset($data->USR_UID)) { + throw new Exception('The parameter $data->USR_UID is null.'); + } - if ($data->TAS_UID == '') { - throw new Exception('The parameter $data->TAS_UID is empty.'); - } + if ($data->TAS_UID == '') { + throw new Exception('The parameter $data->TAS_UID is empty.'); + } - if ($data->APP_UID == '') { - throw new Exception('The parameter $data->APP_UID is empty.'); - } + if ($data->APP_UID == '') { + throw new Exception('The parameter $data->APP_UID is empty.'); + } - if ($data->DEL_INDEX == '') { - throw new Exception('The parameter $data->DEL_INDEX is empty.'); + if ($data->DEL_INDEX == '') { + throw new Exception('The parameter $data->DEL_INDEX is empty.'); + } + + if ($data->USR_UID == '') { + throw new Exception('The parameter $data->USR_UID is empty.'); + } + } catch(Exception $e) { + echo $e->getMessage().' Please contact to your system administrator.'; + die; } G::LoadClass('pmFunctions'); From d37e76b6e5b2f1b6501d74317a704940be4e6d82 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 15 Jun 2015 11:42:53 -0400 Subject: [PATCH 16/17] PM-2934 Validacion en el listado de variables a la creacion de un ReportTable --- workflow/engine/controllers/pmTablesProxy.php | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 988d4b04a..d7def0d0b 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -1713,22 +1713,28 @@ class pmTablesProxy extends HttpProxyController $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_UID); $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME); $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE); + $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_SQL); + $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_ACCEPTED_VALUES); $oCriteria->add(ProcessVariablesPeer::PRJ_UID, $row["PRJ_UID"]); $oDataset = ProcessVariablesPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $index = 0; while ($oDataset->next()) { $row = $oDataset->getRow(); - $fieldType = isset($row["VAR_FIELD_TYPE"]) ? $row["VAR_FIELD_TYPE"]: ''; - if(! in_array( $fieldType, $excludeFieldsList )){ - array_push($fields, array( - "FIELD_UID" => $row["VAR_NAME"] . "-" . $row["VAR_FIELD_TYPE"], - "FIELD_NAME" => $row["VAR_NAME"], - "FIELD_VALIDATE" => "any", - "_index" => $index ++, - "_isset" => true - )); - } + $fieldType = isset($row["VAR_FIELD_TYPE"]) ? $row["VAR_FIELD_TYPE"]: ''; + $varSql = isset($row["VAR_SQL"]) ? $row["VAR_SQL"] : ''; + $varProcessVariable = isset($row["VAR_ACCEPTED_VALUES"]) ? $row["VAR_ACCEPTED_VALUES"] : '[]'; + if(! in_array( $fieldType, $excludeFieldsList )){ + if(strlen($varSql) == 0 && $varProcessVariable == '[]'){ + array_push($fields, array( + "FIELD_UID" => $row["VAR_NAME"] . "-" . $row["VAR_FIELD_TYPE"], + "FIELD_NAME" => $row["VAR_NAME"], + "FIELD_VALIDATE" => "any", + "_index" => $index ++, + "_isset" => true + )); + } + } } } From cd8c8ef9cccf9695acc4be3f3052a3a6a1d22fed Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Mon, 15 Jun 2015 12:53:25 -0400 Subject: [PATCH 17/17] =?UTF-8?q?PM-2930-2895=20MSSQL=20(http://php.net/ma?= =?UTF-8?q?nual/en/intro.mssql.php)=20These=20functions=20allow=20you=20to?= =?UTF-8?q?=20access=20MS=20SQL=20Server=20database.=20This=20extension=20?= =?UTF-8?q?is=20not=20available=20anymore=20on=20Windows=20with=20PHP=205.?= =?UTF-8?q?3=20or=20later.=20SQLSRV,=20an=20alternative=20extension=20for?= =?UTF-8?q?=20MS=20SQL=20connectivity=20is=20available=20from=20Microsoft:?= =?UTF-8?q?=20=C2=BB=20http://msdn.microsoft.com/en-us/sqlserver/ff657782.?= =?UTF-8?q?aspx.=20Alternatively=20to=20use=20the=20mssql=20functions=20in?= =?UTF-8?q?=20Windows,=20use=20php=5Fdblib.dll=20(FreeTDS)=20http://www.fr?= =?UTF-8?q?eetds.org/=20e.g.=20php.ini=20setting=20extension=3Dphp=5Fdblib?= =?UTF-8?q?.dll=20php=5Fdblib.dll=20(FreeTDS)=20use=20':'=20as=20the=20del?= =?UTF-8?q?imiter=20in=20all=20installations.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creole/drivers/mssql/MSSQLConnection.php | 17 +++++++++++++++++ workflow/engine/classes/class.dbConnections.php | 10 +++++++--- workflow/engine/controllers/pmTablesProxy.php | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/gulliver/thirdparty/creole/drivers/mssql/MSSQLConnection.php b/gulliver/thirdparty/creole/drivers/mssql/MSSQLConnection.php index 688eb48bd..0c3e1db2c 100755 --- a/gulliver/thirdparty/creole/drivers/mssql/MSSQLConnection.php +++ b/gulliver/thirdparty/creole/drivers/mssql/MSSQLConnection.php @@ -69,11 +69,28 @@ class MSSQLConnection extends ConnectionCommon implements Connection { $pw = $dsninfo['password']; $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; + /** + * MSSQL (http://php.net/manual/en/intro.mssql.php) + * These functions allow you to access MS SQL Server database. + * This extension is not available anymore on Windows with PHP 5.3 or later. + * SQLSRV, an alternative extension for MS SQL connectivity is available from + * Microsoft: » http://msdn.microsoft.com/en-us/sqlserver/ff657782.aspx. + * http://blogs.msdn.com/b/brian_swan/archive/2010/03/08/mssql-vs-sqlsrv-what-s-the-difference-part-1.aspx + * + * Alternatively to use the mssql functions in Windows, use php_dblib.dll (FreeTDS) http://www.freetds.org/ + * e.g. php.ini setting + * extension=php_dblib.dll + * + * php_dblib.dll (FreeTDS) use ':' as the delimiter in all installations. + */ + /* if (PHP_OS == "WINNT" || PHP_OS == "WIN32") { $portDelimiter = ","; } else { $portDelimiter = ":"; } + */ + $portDelimiter = ":"; if(!empty($dsninfo['port'])) { $dbhost .= $portDelimiter.$dsninfo['port']; diff --git a/workflow/engine/classes/class.dbConnections.php b/workflow/engine/classes/class.dbConnections.php index ec4ac1aa7..462932612 100755 --- a/workflow/engine/classes/class.dbConnections.php +++ b/workflow/engine/classes/class.dbConnections.php @@ -136,10 +136,13 @@ class dbConnections /** * getConnectionsProUid * - * @param string $pType + * Parameter $only list of items displayed, everything else is ignored. + * + * @param string $pProUid + * @param string $only * @return Array $connections */ - public function getConnectionsProUid ($pProUid) + public function getConnectionsProUid ($pProUid, $only = array()) { $connections = Array (); $c = new Criteria(); @@ -155,8 +158,9 @@ class dbConnections $result->next(); $row = $result->getRow(); + $sw = count($only) > 0; while ($row = $result->getRow()) { - if ((trim( $pProUid ) == trim( $row[1] )) && ($row[2] == 'mysql')) { + if ((trim( $pProUid ) == trim( $row[1] )) && ( $sw ? in_array($row[2], $only) : true )) { $connections[] = Array ('DBS_UID' => $row[0],'DBS_NAME' => '[' . $row[3] . '] ' . $row[2] . ': ' . $row[4] ); } diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index d7def0d0b..577daadab 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -116,7 +116,7 @@ class pmTablesProxy extends HttpProxyController G::LoadClass( 'dbConnections' ); $proUid = $_POST['PRO_UID']; $dbConn = new DbConnections(); - $dbConnections = $dbConn->getConnectionsProUid( $proUid ); + $dbConnections = $dbConn->getConnectionsProUid( $proUid, array('mysql') ); $workSpace = new workspaceTools(SYS_SYS); $workspaceDB = $workSpace->getDBInfo();