From b0b62c523dad7c638b280ae3130f34a3f442db7e Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Mon, 31 Oct 2011 18:18:19 -0400 Subject: [PATCH 1/3] BUG 7448 Adjustment in the height dimension of the javascript editor. --- workflow/engine/js/dynaformEditor/core/dynaformEditor.js | 2 +- workflow/engine/xmlform/dynaforms/dynaforms_JSEditor.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js index c2296dafa..48165870b 100755 --- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js +++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js @@ -259,7 +259,7 @@ var dynaformEditor={ clientWinSize = getClientWindowSize(); startJSCodePress(); jsEditor = CodeMirror.fromTextArea('form[JS]', { - height: (clientWinSize.height - 120) + "px", + height: (clientWinSize.height - 140) + "px", width: (_BROWSER.name == 'msie' ? '100%' : '98%'), parserfile: ["tokenizejavascript.js", "parsejavascript.js"], stylesheet: ["css/jscolors.css"], diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_JSEditor.xml b/workflow/engine/xmlform/dynaforms/dynaforms_JSEditor.xml index e96104223..58f7bbe50 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_JSEditor.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_JSEditor.xml @@ -20,7 +20,7 @@ SELECT XMLNODE_NAME AS UID, XMLNODE_NAME AS NAME FROM dynaForm WHERE TYPE = "jav Code - + +]]> \ No newline at end of file From 280e2a89cb74d42aca10eb9c8e54d519bf45e957 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 31 Oct 2011 18:27:10 -0400 Subject: [PATCH 2/3] Progress 11 for the dashboards --- workflow/engine/classes/class.pmDashlet.php | 8 +++++-- workflow/engine/classes/model/Department.php | 23 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.pmDashlet.php b/workflow/engine/classes/class.pmDashlet.php index db0b725fe..988714c4a 100644 --- a/workflow/engine/classes/class.pmDashlet.php +++ b/workflow/engine/classes/class.pmDashlet.php @@ -108,13 +108,17 @@ class PMDashlet extends DashletInstance implements DashletInterface { public function getDashletsInstancesForUser($userUid) { try { // Include required classes - // + require_once 'classes/mode/Department.php' // Check for "public" dashlets // ToDo: Next release // Check for the direct assignments // ToDo: Next release // Check for department assigments - // + $departmentInstance = new Department(); + $departments = $departmentInstance->getDepartmentsForUser($userUid); + foreach ($departments as $department) { + // + } // Check for group assignments // ToDo: Next release // Check for role assigments diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php index 1501fc72a..a87b4c89d 100755 --- a/workflow/engine/classes/model/Department.php +++ b/workflow/engine/classes/model/Department.php @@ -591,4 +591,27 @@ function getDepartments( $DepParent ) { return $aRows; } + function getDepartmentsForUser($userUid) { + $criteria = new Criteria('workflow'); + $criteria->addSelectColumn(DepartmentPeer::DEP_UID); + $criteria->addAsColumn('DEP_TITLE', 'C.CON_VALUE'); + $criteria->addAlias('C', 'CONTENT'); + $criteria->add(DepartmentPeer::USR_UID, $userUid); + $delimiter = DBAdapter::getStringDelimiter(); + $conditions = array(); + $conditions [] = array(DepartmentPeer::DEP_UID, 'C.CON_ID'); + $conditions [] = array('C.CON_CATEGORY', $delimiter . 'DEPO_TITLE' . $delimiter); + $conditions [] = array('C.CON_LANG', $delimiter . SYS_LANG . $delimiter); + $criteria->addJoinMC($conditions, Criteria::LEFT_JOIN); + $dataset = DepartmentPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $dataset->next(); + $departments = array(); + while ($row = $dataset->getRow()) { + $departments[] = $row; + $dataset->next(); + } + return $departments; + } + } // Department From 69353947278f465254bae056876c0d703dd8d319 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 31 Oct 2011 18:45:18 -0400 Subject: [PATCH 3/3] Progress 12for the dashboards --- workflow/engine/classes/class.pmDashlet.php | 21 +++++++++++++++++--- workflow/engine/classes/model/Department.php | 10 +++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/workflow/engine/classes/class.pmDashlet.php b/workflow/engine/classes/class.pmDashlet.php index 988714c4a..7f3ff876a 100644 --- a/workflow/engine/classes/class.pmDashlet.php +++ b/workflow/engine/classes/class.pmDashlet.php @@ -107,8 +107,9 @@ class PMDashlet extends DashletInstance implements DashletInterface { public function getDashletsInstancesForUser($userUid) { try { + $dashletsInstances = array(); // Include required classes - require_once 'classes/mode/Department.php' + require_once 'classes/model/Department.php'; // Check for "public" dashlets // ToDo: Next release // Check for the direct assignments @@ -116,8 +117,21 @@ class PMDashlet extends DashletInstance implements DashletInterface { // Check for department assigments $departmentInstance = new Department(); $departments = $departmentInstance->getDepartmentsForUser($userUid); - foreach ($departments as $department) { - // + foreach ($departments as $depUid => $department) { + $criteria = new Criteria('workflow'); + $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID); + $criteria->addSelectColumn(DashletPeer::DAS_TITLE); + $criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT'); + $criteria->add(DashletInstancePeer::DAS_INS_OWNER_UID, $depUid); + $dataset = DashletInstancePeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $dataset->next(); + while ($row = $dataset->getRow()) { + if (!isset($dashletsInstances[$row['DAS_INS_UID']])) { + $dashletsInstances[$row['DAS_INS_UID']] = $row; + } + $dataset->next(); + } } // Check for group assignments // ToDo: Next release @@ -125,6 +139,7 @@ class PMDashlet extends DashletInstance implements DashletInterface { // ToDo: Next release // Check for permission assigments // ToDo: Next release + return array_values($dashletsInstances); } catch (Exception $error) { throw $error; diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php index a87b4c89d..331c79e88 100755 --- a/workflow/engine/classes/model/Department.php +++ b/workflow/engine/classes/model/Department.php @@ -593,22 +593,26 @@ function getDepartments( $DepParent ) { function getDepartmentsForUser($userUid) { $criteria = new Criteria('workflow'); - $criteria->addSelectColumn(DepartmentPeer::DEP_UID); + $criteria->addSelectColumn(UsersPeer::DEP_UID); $criteria->addAsColumn('DEP_TITLE', 'C.CON_VALUE'); $criteria->addAlias('C', 'CONTENT'); - $criteria->add(DepartmentPeer::USR_UID, $userUid); + $criteria->addJoin(UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN); $delimiter = DBAdapter::getStringDelimiter(); $conditions = array(); $conditions [] = array(DepartmentPeer::DEP_UID, 'C.CON_ID'); $conditions [] = array('C.CON_CATEGORY', $delimiter . 'DEPO_TITLE' . $delimiter); $conditions [] = array('C.CON_LANG', $delimiter . SYS_LANG . $delimiter); $criteria->addJoinMC($conditions, Criteria::LEFT_JOIN); + $criteria->add(UsersPeer::USR_UID, $userUid); + $criteria->add(UsersPeer::DEP_UID, '', Criteria::NOT_EQUAL); $dataset = DepartmentPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $departments = array(); while ($row = $dataset->getRow()) { - $departments[] = $row; + if (!isset($departments[$row['DEP_UID']])) { + $departments[$row['DEP_UID']] = $row; + } $dataset->next(); } return $departments;