ENH: refs #917. Show user's unofficial submissions on trend plot

Also show which user submitted the scalar on the scalar details page

Author: zachmullen

modules/tracker/controllers/ScalarController.php

@@ -52,6 +52,15 @@ public function detailsAction()
       }
     $this->view->resultItems = $this->Tracker_Scalar->getAssociatedItems($scalar);
     $this->view->otherValues = $this->Tracker_Scalar->getOtherValuesFromSubmission($scalar);
+
+    if($scalar->getUserId() != -1)
+      {
+      $this->view->submittedBy = $scalar->getUser();
+      }
+    else
+      {
+      $this->view->submittedBy = null;
+      }
     }
 
   /**

modules/tracker/controllers/TrendController.php

@@ -62,6 +62,8 @@ public function viewAction()
     $startDate = date('Y-m-d H:i:s', $startDate);
     $endDate = date('Y-m-d H:i:s', $endDate);
 
+    $userId = $this->userSession->Dao ? $this->userSession->Dao->getKey() : null;
+
     $trendIds = explode(' ', trim(str_replace(',', ' ', $trendId)));
     $this->view->trends = array();
     foreach($trendIds as $trendId)
@@ -72,7 +74,7 @@ public function viewAction()
         {
         throw new Zend_Exception('Read permission required on the community', 403);
         }
-      $this->view->json['tracker']['scalars'][] = $this->Tracker_Trend->getScalars($trend, $startDate, $endDate);
+      $this->view->json['tracker']['scalars'][] = $this->Tracker_Trend->getScalars($trend, $startDate, $endDate, $userId);
       $this->view->json['tracker']['trends'][] = $trend;
       $this->view->trends[] = $trend;
       }
@@ -117,7 +119,7 @@ public function viewAction()
     if(isset($rightTrend))
       {
       $this->view->json['tracker']['rightTrend'] = $rightTrend;
-      $this->view->json['tracker']['rightScalars'] = $this->Tracker_Trend->getScalars($rightTrend, $startDate, $endDate);
+      $this->view->json['tracker']['rightScalars'] = $this->Tracker_Trend->getScalars($rightTrend, $startDate, $endDate, $userId);
       }
     $this->view->json['tracker']['initialStartDate'] = date('n/j/Y', strtotime($startDate));
     $this->view->json['tracker']['initialEndDate'] = date('n/j/Y', strtotime($endDate));
@@ -149,6 +151,9 @@ public function scalarsAction()
     $rightTrendId = $this->_getParam('rightTrendId');
     $startDate = $this->_getParam('startDate');
     $endDate = $this->_getParam('endDate');
+
+    $userId = $this->userSession->Dao ? $this->userSession->Dao->getKey() : null;
+
     if(!isset($trendId))
       {
       throw new Zend_Exception('Must pass trendId parameter');
@@ -166,7 +171,7 @@ public function scalarsAction()
         {
         throw new Zend_Exception('Read permission required on the community', 403);
         }
-      $scalars[] = $this->Tracker_Trend->getScalars($trend, $startDate, $endDate);
+      $scalars[] = $this->Tracker_Trend->getScalars($trend, $startDate, $endDate, $userId);
       }
     $retVal = array('status' => 'ok', 'scalars' => $scalars);
 

modules/tracker/models/base/ScalarModelBase.php

@@ -49,7 +49,7 @@ public abstract function getByTrendAndTimestamp($trendId, $timestamp, $user = nu
 
   /**
    * Add a new scalar point to the trend.  If overwrite is true, and a scalar
-   * already exists on the trend with the same submit time, this will replace that scalar value.
+   * already exists on the trend with the same submit time and user, this will replace that scalar value.
    */
   public function addToTrend($trend, $submitTime, $producerRevision, $value, $user, $overwrite = true, $official = true)
     {

modules/tracker/models/base/TrendModelBase.php

@@ -58,7 +58,7 @@ public function __construct()
 
   public abstract function getMatch($producerId, $metricName, $configItemId, $testDatasetId, $truthDatasetId);
   public abstract function getAllByParams($params);
-  public abstract function getScalars($trend, $startDate = null, $endDate = null);
+  public abstract function getScalars($trend, $startDate = null, $endDate = null, $userId = null);
   public abstract function getTrendsGroupByDatasets($producerDao);
 
   /** 

modules/tracker/models/pdo/TrendModel.php

@@ -58,7 +58,7 @@ public function getMatch($producerId, $metricName, $configItemId, $testDatasetId
   /**
    * Return chronologically ordered list of scalars for this trend
    */
-  public function getScalars($trend, $startDate = null, $endDate = null)
+  public function getScalars($trend, $startDate = null, $endDate = null, $userId = null)
     {
     $sql = $this->database->select()
                           ->setIntegrityCheck(false)
@@ -73,6 +73,14 @@ public function getScalars($trend, $startDate = null, $endDate = null)
       {
       $sql->where('submit_time <= ?', $endDate);
       }
+    if($userId)
+      {
+      $sql->where('official = 1 OR user_id = ?', $userId);
+      }
+    else
+      {
+      $sql->where('official = 1');
+      }
     $scalars = array();
     $rowset = $this->database->fetchAll($sql);
     foreach($rowset as $row)

modules/tracker/public/js/trend/trend.view.js

@@ -76,11 +76,12 @@ midas.tracker.bindPlotEvents = function () {
             scalarId = json.tracker.rightScalars[pointIndex].scalar_id;
         }
         midas.loadDialog('scalarPoint'+scalarId, '/tracker/scalar/details?scalarId='+scalarId);
-        midas.showDialog('Scalar details', false);
+        midas.showDialog('Scalar details', false, {width: 500});
     });
 };
 
 midas.tracker.renderChartArea = function (curveData, first) {
+    console.log(curveData);
     if(midas.tracker.plot) {
         midas.tracker.plot.destroy();
     }

modules/tracker/views/scalar/details.phtml

@@ -20,7 +20,21 @@ PURPOSE.  See the above copyright notices for more information.
   <table class="scalarInfoTable"><tbody>
     <tr><th>Metric:</th><td><span id="thisMetric"><?php echo $this->scalar->getTrend()->getMetricName(); ?></span></td></tr>
     <tr><th>Value:</th><td><span id="thisValue"><?php echo $this->scalar->getValue().' '.$this->scalar->getTrend()->getUnit(); ?></span></td></tr>
-    <tr><th>Submitted:</th><td><span id="thisSubmitTime"><?php echo $this->scalar->getSubmitTime(); ?></span></td></tr>
+    <tr><th>Submitted:</th>
+        <td>
+          <span id="thisSubmitTime"><?php echo $this->scalar->getSubmitTime(); ?></span>
+          <?php
+          if($this->submittedBy)
+            {
+            echo ' by <a href="'.$this->webroot.'/user/'.$this->submittedBy->getKey().'">'.$this->submittedBy->getFullName().'</a> ';
+            }
+          if(!$this->scalar->getOfficial())
+            {
+            echo '(unofficial)';
+            }
+          ?>
+        </td>
+    </tr>
     <tr><th>Revision:</th><td><span id="thisProducerRev"><?php echo $this->revisionHtml; ?></span></td></tr>
   </tbody></table>
 </div>