Changeset 489

Timestamp:

03/13/08 00:07:58 (10 months ago)

Author:

padams

Message:

adding specific dashcountsby month metric
fixing last_thirty days period constraints
fixing dashboard trend graph

Location:

trunk

Files:

• modules/base/graphDashboardTrend.php (modified) (1 diff)
• modules/base/metrics/dashCoreByDay.php (modified) (1 diff)
• modules/base/metrics/dashCoreByMonth.php (added)
• modules/base/reportDashboard.php (modified) (3 diffs)
• owa_metric.php (modified) (1 diff)

trunk/modules/base/graphDashboardTrend.php

@@ -56 +56 @@
                                                 'is_browser' => 1,
                                                 'is_robot'      => 0),
-                                        'groupby'                       => array('day'),
+                                        
                                         'order'                         => 'ASC'
                                         ));
                 
+        
                 //Graph params
 

trunk/modules/base/metrics/dashCoreByDay.php

@@ -52 +52 @@
                 $this->params['use_summary'] = true;
                 
+                $this->params['groupby'] = array('day', 'month');
+
                 $this->params['orderby'] = array('year', 'month', 'day');
                 

trunk/modules/base/reportDashboard.php

@@ -61 +61 @@
 
                         case "this_year":
-                                $data['core_metrics_data'] = $api->getMetric('base.dashCoreByDay', array(
+                                $data['core_metrics_data'] = $api->getMetric('base.dashCoreByMonth', array(
                                 
-                                        'constraints'           => array('site_id'      => $this->params['site_id']),
-                                        'groupby'                       => array('month')
+                                        'constraints'           => array('site_id'      => $this->params['site_id'])
                                 
                                 ));
@@ -74 +73 @@
                         
                                         'constraints'           => array('site_id'      => $this->params['site_id']),
-                                        'groupby'                       => array('day')
+                                        'order'                         => ASC
                                 
                                 ));
@@ -86 +85 @@
                 
                 ));
-                
-                //print_r($data['summary_stats_data'] );
 
                 $data['latest_visits'] = $api->getMetric('base.latestVisits', array(

trunk/owa_metric.php

@@ -220 +220 @@
                         case "last_thirty_days":
                                 
-                                $bound = mktime(23, 59, 59, $this->time_now['month'], $this->time_now['day'], $this->time_now['year']) - 3600*24*30;
-
-                                $this->params['constraints']['timestamp'] = array('operator' => '>=', 'value' => $bound);
+                                $end = mktime(0, 0, 0, $this->time_now['month'], $this->time_now['day']+1, $this->time_now['year']);
+                                
+                                $start = mktime(0, 0, 0, $this->time_now['month'], $this->time_now['day']-29, $this->time_now['year']);
+                                //$start = $end - 3600*24*29;
+                                //$this->params['constraints']['timestamp'] = array('operator' => '>=', 'value' => $bound);
+                                
+                                $this->params['constraints']['timestamp'] = array('operator' => 'BETWEEN', 'start' => $start, 'end' => $end);
+
                                 
                                 break;