diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index bfbf47214..7634665f0 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -173,4 +173,128 @@ class Dashboard extends Controller {
// Functions for the dasboards administration module - End
+ public function ownerData($data)
+ { try {
+ require_once ("classes/model/Content.php");
+
+ require_once ("classes/model/Users.php");
+ require_once ("classes/model/Department.php");
+
+ G::LoadInclude("ajax");
+
+ //$option = $_POST["option"];
+ //$option = get_ajax_value("option");
+
+ $type = $data->type;
+
+ switch ($type) {
+ case "USER": //
+ break;
+
+ case "DEPARTMENT": $department = array();
+
+ $oCriteria = new Criteria("workflow");
+ $del = DBAdapter::getStringDelimiter();
+
+ /*
+ SELECT
+ DISTINCT
+ DEPARTMENT.DEP_UID,
+ CONTENT.CON_VALUE
+ FROM
+ DEPARTMENT AS DEP
+ LEFT JOIN CONTENT ON (DEPARTMENT.DEP_UID = CONTENT.CON_ID AND CONTENT.CON_CATEGORY = 'DYN_TITLE' AND CONTENT.CON_LANG = 'en')
+ WHERE
+ DEPARTMENT.DEP_STATUS = 'ACTIVE'
+ ORDER BY CONTENT.CON_VALUE ASC
+ */
+
+ //SELECT
+ $oCriteria->setDistinct();
+ $oCriteria->addSelectColumn(DepartmentPeer::DEP_UID);
+ $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
+ //FROM
+ $aConditions = array();
+ $aConditions[] = array(DepartmentPeer::DEP_UID, ContentPeer::CON_ID);
+ $aConditions[] = array(ContentPeer::CON_CATEGORY, $del . "DEPO_TITLE" . $del);
+ $aConditions[] = array(ContentPeer::CON_LANG, $del . "en" . $del);
+ $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+ //WHERE
+ $oCriteria->add(DepartmentPeer::DEP_STATUS, "ACTIVE");
+ //ORDER BY X ASC
+ $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+
+ $departmentNumRows = DepartmentPeer::doCount($oCriteria);
+
+ $oDataset = DepartmentPeer::doSelectRS($oCriteria);
+ $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+ while ($oDataset->next()) {
+ $row = $oDataset->getRow();
+
+ $departmentUID = $row["DEP_UID"];
+ $depName = $row["CON_VALUE"];
+
+ $department[] = array("TABLE_UID" => $departmentUID, "TABLE_NAME" => $depName);
+ }
+
+ echo G::json_encode(array("success" => true, "resultTotal" => $departmentNumRows, "resultRoot" => $department));
+ break;
+ }
+ }
+ catch (Exception $oException) {
+ echo $oException->getMessage();
+ exit(0);
+ }
+ }
+
+ public function dashletData($data)
+ { try {
+ require_once ("classes/model/Dashlet.php");
+
+ G::LoadInclude("ajax");
+
+ //$option = $_POST["option"];
+ //$option = get_ajax_value("option");
+
+ $dashlet = array();
+
+ $oCriteria = new Criteria("workflow");
+
+ //SELECT
+ //$oCriteria->setDistinct();
+ $oCriteria->addSelectColumn(DashletPeer::DAS_UID);
+ $oCriteria->addSelectColumn(DashletPeer::DAS_TITLE);
+ //FROM
+ //WHERE
+ //ORDER BY X ASC
+ $oCriteria->addAscendingOrderByColumn(DashletPeer::DAS_TITLE);
+
+ //echo "
" . $oCriteria->toString() . "
";
+
+ //query
+ //doCount(Criteria $criteria, $distinct = false, $con = null)
+ $dashletNumRows = DashletPeer::doCount($oCriteria);
+
+ $oDataset = DashletPeer::doSelectRS($oCriteria);
+ $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+ while ($oDataset->next()) {
+ $row = $oDataset->getRow();
+
+ $dashletUID = $row["DAS_UID"];
+ $dashTitle = $row["DAS_TITLE"];
+
+ $dashlet[] = array("DAS_UID" => $dashletUID, "DAS_TITLE" => $dashTitle);
+ }
+
+ //echo "{users: " . G::json_encode($rows) . ", total_users: " . $totalRows . "}";
+ //echo json_encode(array("success" => true, "resultTotal" => $dashletNumRows, "resultRoot" => $dashlet));
+ echo G::json_encode(array("success" => true, "resultTotal" => $dashletNumRows, "resultRoot" => $dashlet));
+ }
+ catch (Exception $oException) {
+ echo $oException->getMessage();
+ exit(0);
+ }
+ }
}
\ No newline at end of file
diff --git a/workflow/engine/methods/dashboard/dashletInstance.php b/workflow/engine/methods/dashboard/dashletInstance.php
deleted file mode 100644
index ee4cc132d..000000000
--- a/workflow/engine/methods/dashboard/dashletInstance.php
+++ /dev/null
@@ -1,115 +0,0 @@
-setDistinct();
- $oCriteria->addSelectColumn(DepartmentPeer::DEP_UID);
- $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
- //FROM
- $aConditions = array();
- $aConditions[] = array(DepartmentPeer::DEP_UID, ContentPeer::CON_ID);
- $aConditions[] = array(ContentPeer::CON_CATEGORY, $del . "DEPO_TITLE" . $del);
- $aConditions[] = array(ContentPeer::CON_LANG, $del . "en" . $del);
- $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
- //WHERE
- $oCriteria->add(DepartmentPeer::DEP_STATUS, "ACTIVE");
- //ORDER BY X ASC
- $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
-
- $departmentNumRows = DepartmentPeer::doCount($oCriteria);
-
- $oDataset = DepartmentPeer::doSelectRS($oCriteria);
- $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
- while ($oDataset->next()) {
- $row = $oDataset->getRow();
-
- $departmentUID = $row["DEP_UID"];
- $depName = $row["CON_VALUE"];
-
- $department[] = array("TABLE_UID" => $departmentUID, "TABLE_NAME" => $depName);
- }
-
- echo G::json_encode(array("success" => true, "resultTotal" => $departmentNumRows, "resultRoot" => $department));
- break;
- }
-
- break;
-
- case "DASHLST": $dashlet = array();
-
- $oCriteria = new Criteria("workflow");
-
- //SELECT
- //$oCriteria->setDistinct();
- $oCriteria->addSelectColumn(DashletPeer::DAS_UID);
- $oCriteria->addSelectColumn(DashletPeer::DAS_TITLE);
- //FROM
- //WHERE
- //ORDER BY X ASC
- $oCriteria->addAscendingOrderByColumn(DashletPeer::DAS_TITLE);
-
- //echo "
" . $oCriteria->toString() . "
";
-
- //query
- //doCount(Criteria $criteria, $distinct = false, $con = null)
- $dashletNumRows = DashletPeer::doCount($oCriteria);
-
- $oDataset = DashletPeer::doSelectRS($oCriteria);
- $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
- while ($oDataset->next()) {
- $row = $oDataset->getRow();
-
- $dashletUID = $row["DAS_UID"];
- $dashTitle = $row["DAS_TITLE"];
-
- $dashlet[] = array("DAS_UID" => $dashletUID, "DAS_TITLE" => $dashTitle);
- }
-
- //echo "{users: " . G::json_encode($rows) . ", total_users: " . $totalRows . "}";
- //echo json_encode(array("success" => true, "resultTotal" => $dashletNumRows, "resultRoot" => $dashlet));
- echo G::json_encode(array("success" => true, "resultTotal" => $dashletNumRows, "resultRoot" => $dashlet));
- break;
- }
-}
-catch (Exception $oException) {
- echo $oException->getMessage();
- exit(0);
-}
-?>
\ No newline at end of file
diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js
index c361a540e..6985ed7da 100644
--- a/workflow/engine/templates/dashboard/dashletInstanceForm.js
+++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js
@@ -2,8 +2,6 @@ Ext.namespace("dashletInstance");
dashletInstance.form = {
init: function () {
- var URL_DASHLET_INSTANCE = "dashletInstance";
-
dashletInstanceSaveProcessAjax = function () {
var myMask = new Ext.LoadMask(Ext.getBody(), {msg: "Saving. Please wait..."});
myMask.show();
@@ -59,7 +57,7 @@ dashletInstance.form = {
//------------------------------------------------------------------------------------------------------------------
var storeDasUID = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({
- url: URL_DASHLET_INSTANCE,
+ url: "dashletData",
method: "POST"
}),
@@ -116,7 +114,7 @@ dashletInstance.form = {
var storeDasInsOwnerUID = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({
- url: URL_DASHLET_INSTANCE,
+ url: "ownerData",
method: "POST"
}),