~ Slightly less wonky backend downloads graph

Author: Nicholas K. Dionysopoulos

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Protection of all component and plugin folders against direct web access
 * Update for new FOF 3 behavior regarding backend and frontend caching
+* Slightly less wonky backend downloads graph
 
 **Bug fixes**
 

component/backend/Model/ControlPanel.php

@@ -408,27 +408,18 @@ public function getMonthlyStats()
 	{
 		$db = $this->container->db;
 
-		$now = $this->container->platform->getDate();
-
-		// I need to do this since if I'm on March 30th and I go back of a month I would got February 30th
-		// that will we shifted to March 2nd. This is not a bug (!!!) it's the expected behavior of PHP (!!!!!!!)
-		if (date('d') > date('d', strtotime('last day of -1 month')))
-		{
-			$last_month = $this->container->platform->getDate(date('Y-m-d', strtotime('last day of -1 month')));
-		}
-		else
-		{
-			$last_month = $this->container->platform->getDate(date('Y-m-d', strtotime('-1 month')));
-		}
+		$now        = $this->container->platform->getDate();
+		$last_month = $this->container->platform->getDate();
+		$last_month->sub(new \DateInterval('P35D'));
 
 		$query = $db->getQuery(true)
-					->select(array(
-						'DATE(' . $db->qn('accessed_on') . ') AS ' . $db->qn('day'),
-						'COUNT(*) AS ' . $db->qn('dl')
-					))
-					->from($db->qn('#__ars_log'))
-					->where($db->qn('accessed_on') . ' BETWEEN ' . $db->q($last_month->toSql()) . ' AND ' . $db->q($now->toSql()))
-					->order($db->qn('accessed_on') . ' ASC');
+			->select([
+				'DATE(' . $db->qn('accessed_on') . ') AS ' . $db->qn('day'),
+				'COUNT(*) AS ' . $db->qn('dl'),
+			])
+			->from($db->qn('#__ars_log'))
+			->where($db->qn('accessed_on') . ' BETWEEN ' . $db->q($last_month->toSql()) . ' AND ' . $db->q($now->toSql()))
+			->order($db->qn('accessed_on') . ' ASC');
 
 		if ($db->name == 'postgresql')
 		{
@@ -444,12 +435,12 @@ public function getMonthlyStats()
 
 		if (is_null($data))
 		{
-			$data = array();
+			$data = [];
 		}
 
 		$nowParts = getdate();
-		$today = mktime(0, 0, 0, $nowParts['mon'], $nowParts['mday'], $nowParts['year']);
-		$ret = array();
+		$today    = mktime(0, 0, 0, $nowParts['mon'], $nowParts['mday'], $nowParts['year']);
+		$ret      = [];
 
 		for ($i = 30; $i >= 0; $i--)
 		{

component/backend/View/ControlPanel/tmpl/graphs.blade.php

@@ -10,17 +10,20 @@
 /** @var  \Akeeba\ReleaseSystem\Admin\View\ControlPanel\Html $this */
 
 $pointsJavascript = '';
+$min = null;
+$max = null;
 
 foreach ($this->monthlyDailyReport as $pointDate => $pointDownloads)
 {
+	$min            = is_null($min) ? $pointDate : $min;
+	$max            = $pointDate;
 	$pointDate      = $this->escape($pointDate);
-	$pointDownloads = (int)$pointDownloads;
+	$pointDownloads = (int) $pointDownloads;
 
 	$pointsJavascript .= <<< JS
 dlPoints.push(['$pointDate', parseInt('$pointDownloads' * 100) * 1 / 100]);
 
 JS;
-
 }
 
 $js = <<< JS
@@ -36,8 +39,9 @@
 		show:         true,
 		axes:         {
 			xaxis: {
-				renderer:     $.jqplot.DateAxisRenderer,
-				tickInterval: '1 week'
+			    min:          '{$min}',
+			    max:          '{$max}',
+				renderer:     $.jqplot.DateAxisRenderer
 			},
 			yaxis: {min: 0, tickOptions: {formatString: '%u'}}
 		},