#1526

modules/boonex/analytics/classes/BxAnalyticsDb.php

@@ -20,7 +20,7 @@ class BxAnalyticsDb extends BxBaseModGeneralDb
             'datefrom' => $iDateFrom,
             'dateto' => $iDateTo
         );
-        $sQuery = "SELECT DATE(FROM_UNIXTIME(`" . $sColumnAdded . "`))  AS `period`, YEAR(FROM_UNIXTIME(`" . $sColumnAdded . "`))  AS `year`,  COUNT(*) AS `count` FROM " . $sTableName . " WHERE `" . $sColumnAdded . "` >= :datefrom AND `" . $sColumnAdded . "` <= :dateto   GROUP BY `period`, `year` ORDER BY `year`, `period` ASC";
+        $sQuery = "SELECT DATE(FROM_UNIXTIME(`" . $sColumnAdded . "`)) AS `period`, YEAR(FROM_UNIXTIME(`" . $sColumnAdded . "`)) AS `year`, COUNT(*) AS `count` FROM " . $sTableName . " WHERE `" . $sColumnAdded . "` >= :datefrom AND `" . $sColumnAdded . "` <= :dateto GROUP BY `period`, `year` ORDER BY `year`, `period` ASC";
         return $this->getAll($sQuery, $aBindings);
     }
           
@@ -29,7 +29,7 @@ class BxAnalyticsDb extends BxBaseModGeneralDb
         $aBindings = array(
             'datefrom' => $iDateFrom
         );
-        $sQuery = "SELECT  COUNT(*) AS `count` FROM " . $sTableName . " WHERE `" . $sColumnAdded . "` < :datefrom ";
+        $sQuery = "SELECT COUNT(*) AS `count` FROM " . $sTableName . " WHERE `" . $sColumnAdded . "` < :datefrom ";
         return $this->getOne($sQuery, $aBindings);
     }
           
@@ -39,7 +39,7 @@ class BxAnalyticsDb extends BxBaseModGeneralDb
             'datefrom' => $iDateFrom,
             'dateto' => $iDateTo
         );
-        $sQuery = "SELECT `object_id`,'" . $sModuleName . "' AS `module`, COUNT(*) AS `value` FROM `" . $sTableName . "` WHERE `date` >= :datefrom  AND `date` <= :dateto GROUP BY `object_id` ORDER BY  COUNT(*) DESC LIMIT 0, " . intval(getParam('bx_analytics_items_count'));
+        $sQuery = "SELECT `object_id`,'" . $sModuleName . "' AS `module`, COUNT(*) AS `value` FROM `" . $sTableName . "` WHERE `date` >= :datefrom AND `date` <= :dateto GROUP BY `object_id` ORDER BY COUNT(*) DESC LIMIT 0, " . intval(getParam('bx_analytics_items_count'));
         return $this->getAll($sQuery, $aBindings);
     }
           
@@ -50,7 +50,7 @@ class BxAnalyticsDb extends BxBaseModGeneralDb
             'dateto' => $iDateTo
         );
         $sQuery = "SELECT `sys_profiles`.`content_id` AS `object_id`, `sys_profiles`.`type` , COUNT(`sys_profiles_conn_subscriptions`.`id`) AS `value` FROM `sys_profiles_conn_subscriptions`
-INNER JOIN `sys_profiles`  ON `sys_profiles`.`id` = `sys_profiles_conn_subscriptions`.`content` WHERE sys_profiles.type='" . $sModuleName . "' AND  `sys_profiles_conn_subscriptions`.`added` >= :datefrom AND  `sys_profiles_conn_subscriptions`.`added` <= :dateto GROUP BY `sys_profiles`.`content_id`, `sys_profiles`.`type` ORDER BY COUNT(`sys_profiles_conn_subscriptions`.`id`) DESC LIMIT 0," . intval(getParam('bx_analytics_items_count'));
+INNER JOIN `sys_profiles` ON `sys_profiles`.`id` = `sys_profiles_conn_subscriptions`.`content` WHERE sys_profiles.type='" . $sModuleName . "' AND `sys_profiles_conn_subscriptions`.`added` >= :datefrom AND `sys_profiles_conn_subscriptions`.`added` <= :dateto GROUP BY `sys_profiles`.`content_id`, `sys_profiles`.`type` ORDER BY COUNT(`sys_profiles_conn_subscriptions`.`id`) DESC LIMIT 0," . intval(getParam('bx_analytics_items_count'));
         return $this->getAll($sQuery, $aBindings);
     }
           
@@ -60,8 +60,8 @@ INNER JOIN `sys_profiles`  ON `sys_profiles`.`id` = `sys_profiles_conn_subscript
             'datefrom' => $iDateFrom,
             'dateto' => $iDateTo
         );
-        $sQuery = "SELECT `sys_profiles`.`content_id`  AS `object_id`, `sys_profiles`.`type`, '" . $sContentModuleName . "' , COUNT(`" . $sTableName . "`.`id`) AS `value` FROM `" . $sTableName . "`
-INNER JOIN `sys_profiles`  ON `sys_profiles`.`id` = `" . $sTableName . "`.`" . $sColumnAuthor . "` WHERE sys_profiles.type='" . $sModuleName . "' AND  `" . $sTableName . "`.`" . $sColumnAdded . "` >= :datefrom AND `" . $sTableName . "`.`" . $sColumnAdded . "` <= :dateto GROUP BY `sys_profiles`.`content_id`, `sys_profiles`.`type` ORDER BY COUNT(`" . $sTableName . "`.`id`) DESC LIMIT 0," . intval(getParam('bx_analytics_items_count'));
+        $sQuery = "SELECT `sys_profiles`.`content_id` AS `object_id`, `sys_profiles`.`type`, '" . $sContentModuleName . "' , COUNT(`" . $sTableName . "`.`id`) AS `value` FROM `" . $sTableName . "`
+INNER JOIN `sys_profiles` ON `sys_profiles`.`id` = `" . $sTableName . "`.`" . $sColumnAuthor . "` WHERE sys_profiles.type='" . $sModuleName . "' AND `" . $sTableName . "`.`" . $sColumnAdded . "` >= :datefrom AND `" . $sTableName . "`.`" . $sColumnAdded . "` <= :dateto GROUP BY `sys_profiles`.`content_id`, `sys_profiles`.`type` ORDER BY COUNT(`" . $sTableName . "`.`id`) DESC LIMIT 0," . intval(getParam('bx_analytics_items_count'));
         return $this->getAll($sQuery, $aBindings);
     }
 }

modules/boonex/analytics/classes/BxAnalyticsModule.php

@@ -274,7 +274,7 @@ class BxAnalyticsModule extends BxDolModule
                  ),
                 'display' => true,
                 'distribution' => 'linear',
-                'ticks' =>  array(
+                'ticks' => array(
                     'display' => true, 
                     'autoSkip' => true, 
                 )
@@ -282,19 +282,19 @@ class BxAnalyticsModule extends BxDolModule
         }
         else{
             $aDataForChartXAxes = array(
-                'ticks' =>  array(
+                'ticks' => array(
                     'autoSkip' => false
                 ),
                 'display' => true
             );
         }
        
-        $aDataForChartDatasets = array();    
+        $aDataForChartDatasets = array();
         for($i = 0; $i < count($aValues['values']); $i++){
             $aDataForChartDatasets[] = array(
                 'label' => $aValues['values'][$i]['legend'],
                 'fill' => false,
-                'backgroundColor' =>  $this->aColors[$i],
+                'backgroundColor' => $this->aColors[$i],
                 'borderColor' => $this->aColors[$i],
                 'borderWidth' => 1,
                 'data' => $aValues['values'][$i]['data']
@@ -302,8 +302,8 @@ class BxAnalyticsModule extends BxDolModule
         }
             
         $aDataForChart = array(
-            'type' =>  $sType,
-            'data' =>  array(
+            'type' => $sType,
+            'data' => array(
                 'labels' => $aValues['labels'], 
                 'datasets' => $aDataForChartDatasets
             ),
@@ -313,9 +313,9 @@ class BxAnalyticsModule extends BxDolModule
                     'display' => count($aValues['values']) == 1 ? false :true
                 ),
                 'scales' => array(
-                    'yAxes' =>  array(
+                    'yAxes' => array(
                         array(
-                            'ticks' =>  array(
+                            'ticks' => array(
                                 'max' => $iMaxValueY, 
                                 'min' => $iMinValueY, 
                                 'stepSize' => $this->getStep($iMinValueY, $iMaxValueY), 
@@ -323,7 +323,7 @@ class BxAnalyticsModule extends BxDolModule
                             )
                         )
                     ),
-                    'xAxes' =>  array($aDataForChartXAxes)
+                    'xAxes' => array($aDataForChartXAxes)
                 )
             ),
             'links' => $aValues['links'],