diff --git a/workflow/engine/classes/model/DashboardDasInd.php b/workflow/engine/classes/model/DashboardDasInd.php index d6796bfa0..002555fd8 100644 --- a/workflow/engine/classes/model/DashboardDasInd.php +++ b/workflow/engine/classes/model/DashboardDasInd.php @@ -108,10 +108,40 @@ class DashboardDasInd extends BaseDashboardDasInd } } - public function getOwnerByDashboard ($dasUid) + public function loadOwnerByUserId ($usrId) { - - } + try { + $criteria = new Criteria('workflow'); + $criteria->add(DashboardDasIndPeer::OWNER_UID, $usrId); + $criteria->add(DashboardDasIndPeer::OWNER_TYPE, "USER"); + + $dataset = DashboardDasIndPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $fields = array(); + + while ($dataset->next()) { + $auxField = $dataset->getRow(); + $fields[] = $auxField; + } + + $criteria = new Criteria('workflow'); + $criteria->add(DashboardDasIndPeer::OWNER_TYPE, "GROUP"); + $criteria->add(GroupUserPeer::USR_UID, $usrId); + $criteria->addJoin(GroupUserPeer::GRP_UID, DashboardDasIndPeer::OWNER_UID); + + $dataset = DashboardDasIndPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + + while ($dataset->next()) { + $auxField = $dataset->getRow(); + $fields[] = $auxField; + } + + return $fields; + } catch (Exception $error) { + throw $error; + } + } } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php index 8e92f4fcf..741af63e9 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php @@ -23,7 +23,7 @@ class Dashboard { require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "DashboardDasInd.php"); $oDashboardDasInd = new \DashboardDasInd(); - $response = $oDashboardDasInd->loadByOwner($usr_uid); + $response = $oDashboardDasInd->loadOwnerByUserId($usr_uid); return $response; }