Add a mechanism to get the scalars of only key metrics.

midasplatform · Oct 22, 2015 · e31e99b · e31e99b
1 parent 0c81d73
commit e31e99b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/modules/tracker/models/base/SubmissionModelBase.php b/modules/tracker/models/base/SubmissionModelBase.php
@@ -86,7 +86,8 @@ abstract public function getSubmissionsByProducer($producerDao);
     /**
      * Get the scalars associated with a submission.
      * @param Tracker_SubmissionDao $submissionDao submission DAO
+     * @param bool $key whether to only retrieve scalars of key trends
      * @return array submission DAOs
      */
-    abstract public function getScalars($submissionDao);
+    abstract public function getScalars($submissionDao, $key = false);
 }
diff --git a/modules/tracker/models/pdo/SubmissionModel.php b/modules/tracker/models/pdo/SubmissionModel.php
@@ -47,13 +47,22 @@ public function createSubmission($producerDao, $uuid, $name = '')
      * Return the scalars for a given submission.
      *
      * @param Tracker_SubmissionDao $submissionDao submission DAO
+     * @param bool $key whether to only retrieve scalars of key trends
      * @return array scalar DAOs
      */
-    public function getScalars($submissionDao)
+    public function getScalars($submissionDao, $key=false)
     {
-        $sql = $this->database->select()->setIntegrityCheck(false)
-             ->from('tracker_scalar')
-             ->where('submission_id = ?', $submissionDao->getKey());
+        if ($key) {
+            $sql = $this->database->select()->setIntegrityCheck(false)->from('tracker_scalar')->join(
+                'tracker_trend',
+                'tracker_scalar.trend_id = tracker_trend.trend_id',
+                array()
+            )->where('submission_id = ?', $submissionDao->getKey()
+            )->where('key_metric = ?', 1);
+        } else {
+            $sql = $this->database->select()->setIntegrityCheck(false)->from('tracker_scalar')
+                ->where('submission_id = ?', $submissionDao->getKey());
+        }
 
         $scalarDaos = array();
         $rows = $this->database->fetchAll($sql);