Refs #472 Rounding values for mysqli build + introducing "Events with a value"

core/DataArray.php

@@ -215,12 +215,13 @@ class DataArray
     static protected function makeEmptyEventRow()
     {
         return array(
-            Metrics::INDEX_NB_UNIQ_VISITORS => 0,
-            Metrics::INDEX_NB_VISITS        => 0,
-            Metrics::INDEX_EVENT_NB_HITS    => 0,
-            Metrics::INDEX_EVENT_SUM_EVENT_VALUE => 0,
-            Metrics::INDEX_EVENT_MIN_EVENT_VALUE => 0,
-            Metrics::INDEX_EVENT_MAX_EVENT_VALUE => 0,
+            Metrics::INDEX_NB_UNIQ_VISITORS         => 0,
+            Metrics::INDEX_NB_VISITS                => 0,
+            Metrics::INDEX_EVENT_NB_HITS            => 0,
+            Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE => 0,
+            Metrics::INDEX_EVENT_SUM_EVENT_VALUE    => 0,
+            Metrics::INDEX_EVENT_MIN_EVENT_VALUE    => 0,
+            Metrics::INDEX_EVENT_MAX_EVENT_VALUE    => 0,
         );
     }
 
@@ -236,11 +237,12 @@ class DataArray
         $oldRowToUpdate[Metrics::INDEX_NB_VISITS] += $newRowToAdd[Metrics::INDEX_NB_VISITS];
         $oldRowToUpdate[Metrics::INDEX_NB_UNIQ_VISITORS] += $newRowToAdd[Metrics::INDEX_NB_UNIQ_VISITORS];
         $oldRowToUpdate[Metrics::INDEX_EVENT_NB_HITS] += $newRowToAdd[Metrics::INDEX_EVENT_NB_HITS];
+        $oldRowToUpdate[Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE] += $newRowToAdd[Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE];
 
         $newRowToAdd[Metrics::INDEX_EVENT_SUM_EVENT_VALUE] = round($newRowToAdd[Metrics::INDEX_EVENT_SUM_EVENT_VALUE], self::EVENT_VALUE_PRECISION);
         $oldRowToUpdate[Metrics::INDEX_EVENT_SUM_EVENT_VALUE] += $newRowToAdd[Metrics::INDEX_EVENT_SUM_EVENT_VALUE];
-        $oldRowToUpdate[Metrics::INDEX_EVENT_MAX_EVENT_VALUE] = max($newRowToAdd[Metrics::INDEX_EVENT_MAX_EVENT_VALUE], $oldRowToUpdate[Metrics::INDEX_EVENT_MAX_EVENT_VALUE]);
-        $oldRowToUpdate[Metrics::INDEX_EVENT_MIN_EVENT_VALUE] = min($newRowToAdd[Metrics::INDEX_EVENT_MIN_EVENT_VALUE], $oldRowToUpdate[Metrics::INDEX_EVENT_MIN_EVENT_VALUE]);
+        $oldRowToUpdate[Metrics::INDEX_EVENT_MAX_EVENT_VALUE] = round(max($newRowToAdd[Metrics::INDEX_EVENT_MAX_EVENT_VALUE], $oldRowToUpdate[Metrics::INDEX_EVENT_MAX_EVENT_VALUE]), self::EVENT_VALUE_PRECISION);
+        $oldRowToUpdate[Metrics::INDEX_EVENT_MIN_EVENT_VALUE] = round(min($newRowToAdd[Metrics::INDEX_EVENT_MIN_EVENT_VALUE], $oldRowToUpdate[Metrics::INDEX_EVENT_MIN_EVENT_VALUE]), self::EVENT_VALUE_PRECISION);
     }
 
     /**

core/Metrics.php

@@ -74,6 +74,7 @@ class Metrics
     const INDEX_EVENT_SUM_EVENT_VALUE = 35;
     const INDEX_EVENT_MIN_EVENT_VALUE = 36;
     const INDEX_EVENT_MAX_EVENT_VALUE = 37;
+    const INDEX_EVENT_NB_HITS_WITH_VALUE = 38;
 
     // Goal reports
     const INDEX_GOAL_NB_CONVERSIONS = 1;
@@ -130,6 +131,7 @@ class Metrics
         Metrics::INDEX_EVENT_SUM_EVENT_VALUE                 => 'sum_event_value',
         Metrics::INDEX_EVENT_MIN_EVENT_VALUE                 => 'min_event_value',
         Metrics::INDEX_EVENT_MAX_EVENT_VALUE                 => 'max_event_value',
+        Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE              => 'nb_events_with_value'
 
     );