Changeset 699

Timestamp:

Feb 22, 2016, 10:09:57 AM (3 years ago)

Author:

mabarracus

Message:

Fixed bugs: Current month is not displayed, rotation stops when year change

Location:

lliurex-analytics-server/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-analytics-server/usr/lib/analytics-server/analytics/db.php (modified) (3 diffs)

lliurex-analytics-server/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-analytics-server (0.0.5) xenial; urgency=medium
+
+  * Fixed bugs: Current month is not displayed, rotation stops when year change.
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Mon, 22 Feb 2016 10:00:49 +0100
+
 lliurex-analytics-server (0.0.4) xenial; urgency=medium
 

lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/lib/analytics-server/analytics/db.php

@@ -66 +66 @@
         function rotate(){
             $sql="select max(fecha) from historico;";
-            $thismonth=intval(date("m"));
+            $thismonth=intval(date("Ym"));
             $lastmonth=$thismonth;
             if ($result=$this->dbconn->query($sql)){
@@ -78 +78 @@
                         $query->close();
                     }else{
-                        $lastmonth=intval(explode('-',$row[0])[1]);
+                        $lastmonth=intval(explode('-',$row[0])[0].explode('-',$row[0])[1]);
                     }
                 }
@@ -99 +99 @@
                 //echo $today.' '.$first_this_month.' '.$first_one_month_ago.' '.$last_one_month_ago.' '.$first_two_month_ago.' '.$last_two_month_ago.' EOL';
                 $obj=[];
-                $sql="SELECT app,count,fecha from historico where fecha BETWEEN '$first_this_month' and '$today' order by count DESC LIMIT 30";
+                $sql="SELECT app,count from packages UNION SELECT app,count from historico where fecha BETWEEN '$first_this_month' and '$today' order by count DESC LIMIT 30";
                 if ($result=$this->dbconn->query($sql)){
                         $obj2=[];