ENH: refs #0339. Place markers in correct location on download map

Author: zachmullen

modules/statistics/controllers/ItemController.php

@@ -1,45 +1,58 @@
 <?php
 
+/** Controller for statistics about an item */
 class Statistics_ItemController extends Statistics_AppController
-{  
-   public $_moduleModels=array('Download');
-   public $_models=array('Item');
+{
+   public $_moduleModels = array('Download');
+   public $_models = array('Item');
    public $_components = array('Utility');
+
    /** index action*/
    function indexAction()
     {
-    if(!$this->logged||!$this->userSession->Dao->getAdmin()==1)
-      {
-      throw new Zend_Exception("You should be an administrator");
-      }
-      
+
     $item = $this->Item->load($_GET['id']);
     if(!$item)
       {
       throw new Zend_Exception("Item doesn't exist");
       }
-      
-    $downloads = $this->Statistics_Download->getDownloads($item, date( 'c', strtotime ('-20 day'.date( 'Y-m-j G:i:s'))), date('c'));
+    if(!$this->Item->policyCheck($item, $this->userSession->Dao, MIDAS_POLICY_READ))
+      {
+      throw new Zend_Exception('You do not have read permission on this item');
+      }
+
+    //TODO instead of last 21 days, have that number be an adjustable parameter to the controller
+    $downloads = $this->Statistics_Download->getDownloads($item, date('c', strtotime('-20 day'.date( 'Y-m-j G:i:s'))), date('c'));
+
     $arrayDownload = array();
-    $format = 'Y-m-j'; 
-    for($i = 0; $i<21; $i++)
+    $format = 'Y-m-j';
+    $markers = array();
+    for($i = 0; $i < 21; $i++)
       {
-      $key =  date($format, strtotime(date( 'c', strtotime ('-'.$i.' day'.date( 'Y-m-j G:i:s')))));
+      $key = date($format, strtotime(date('c', strtotime('-'.$i.' day'.date( 'Y-m-j G:i:s')))));
       $arrayDownload[$key] = 0;
       }
     foreach($downloads as $download)
       {
-      $key =  date($format, strtotime($download->getDate()));
+      $key = date($format, strtotime($download->getDate()));
       $arrayDownload[$key]++;
+      $latitude = $download->getLatitude();
+      $longitude = $download->getLongitude();
+
+      if($latitude || $longitude)
+        {
+        $markers[] = array($latitude, $longitude);
+        }
       }
-      
+
     $jqplotArray = array();
     foreach($arrayDownload as $key => $value)
       {
       $jqplotArray[] = array($key.' 8:00AM', $value);
       }
     $this->view->json['stats']['downloads'] = $jqplotArray;
+    $this->view->markers = $markers;
     $this->view->itemDao = $item;
-    } 
-    
-}//end class
+    }
+
+}//end class

modules/statistics/views/item/index.phtml

@@ -34,7 +34,7 @@ $this->headScript()->appendFile($this->moduleWebroot.'/public/js/jqplot/jqplot.p
   </div>
   <h3>Statistics - <?php echo $this->itemDao->getName()?></h3>
 
-  <img class="tabsLoading" alt=""  src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif" />
+  <img class="tabsLoading" alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif" />
   <div class="tabs" id='tabsGeneric'>
     <ul>
       <li><a href="#tabs-map">Download Map</a></li>
@@ -52,13 +52,13 @@ $this->headScript()->appendFile($this->moduleWebroot.'/public/js/jqplot/jqplot.p
   <script type="text/javascript">
   function placeDownloadPins(theMap)
     {
-    var myLatlng = new google.maps.LatLng(35, -100.044922);
-
-    var marker = new google.maps.Marker({
-      position: myLatlng,
-      map: theMap,
-      title:"Hello World!!"
-      });
+    <?php
+    foreach($this->markers as $marker)
+      {
+      echo 'var myLatlng = new google.maps.LatLng('.$marker['latitude'].', '.$marker['longitude'].');';
+      echo 'new google.maps.Marker({ position: myLatlng, map: theMap, title: "'.$marker['date'].'"});';
+      }
+    ?>
     }
   </script>
 <!-- END -->