Kaynağa Gözat

Fixed daily downloads graph (display only -30 days)

Stefano Sala 11 yıl önce
ebeveyn
işleme
5da385bbb0

+ 5 - 2
src/Packagist/WebBundle/Controller/WebController.php

@@ -894,16 +894,19 @@ class WebController extends Controller
 
             $date = new \DateTime($downloadsStartDate.' 00:00:00');
             $yesterday = new \DateTime('-2days 00:00:00');
+            $oneMonthAgo = new \DateTime('-32days 00:00:00'); // 30 days before yesterday
 
             $dlChart = $dlChartMonthly = array();
             while ($date <= $yesterday) {
-                $dlChart[$date->format('Y-m-d')] = 'downloads:'.$date->format('Ymd');
+                if ($date > $oneMonthAgo) {
+                    $dlChart[$date->format('Y-m-d')] = 'downloads:'.$date->format('Ymd');
+                }
                 $dlChartMonthly[$date->format('Y-m')] = 'downloads:'.$date->format('Ym');
                 $date->modify('+1day');
             }
 
             $dlChart = array(
-                'labels' => array_keys($dlChartMonthly),
+                'labels' => array_keys($dlChart),
                 'values' => $redis->mget(array_values($dlChart))
             );
             $dlChartMonthly = array(

+ 1 - 1
src/Packagist/WebBundle/Resources/views/Web/stats.html.twig

@@ -13,7 +13,7 @@
         <p>The last data point is for the current month and shows partial data.</p>
 
         {% if downloadsChart %}
-            <h2>Packages installed per day</h2>
+            <h2>Packages installed in the last 30 days</h2>
             <p><canvas width="900" height="250" data-labels="{{ downloadsChart.labels|join(',') }}" data-values="{{ downloadsChart.values|join(',') }}"></canvas></p>
             <ul class="legend">
                 <li class="legend-first"><span>&#9632;</span> Installs</li>