Pluf Framework Commit Details

Date:

2010-03-25 03:23:22 (14 years 8 months ago)

Author:

Loic d'Anterroches

Branch:

develop, master

Commit:

6523fb7bf6b52a36a2f4cffea777992938e73366

Parents:

cb980652386ef9a7462fb11f4d996b6384eb4859

Message:

Added filtering of the funnel data by predefined periods.

Changes:

File differences

-71
72 72
73 73
74 
74
75 75
76 76
77 77
... ...
105 105
106 106
107 107
108
109
110
108 111
109 112
110 113
+        }␊
        switch ($period) {␊
        case 'yesterday':␊
            $q = array('t' => array('$eq' => (int) gmdate('Ymd', time()-86400)));␊
            $q = array('t' => (int) gmdate('Ymd', time()-86400));␊
            break;␊
        case 'today':␊
            $q = array('t' => (int) gmdate('Ymd'));␊

            }␊
        }␊
        // Now, compile the stats for steps 2 to n␊
        if (!isset($steps[1]['total'])) {␊
            return array();␊
        }␊
        $t1 = $steps[1]['total'];␊
        for ($i=2;$i<=20;$i++) {␊
            if ($steps[$i] and $steps[$i-1]) {␊
 ...
         }␊
         switch ($period) {␊
         case 'yesterday':␊
-            $q = array('t' => array('$eq' => (int) gmdate('Ymd', time()-86400)));␊
+            $q = array('t' => (int) gmdate('Ymd', time()-86400));␊
             break;␊
         case 'today':␊
             $q = array('t' => (int) gmdate('Ymd'));␊
             }␊
         }␊
         // Now, compile the stats for steps 2 to n␊
+        if (!isset($steps[1]['total'])) {␊
+            return array();␊
+        }␊
         $t1 = $steps[1]['total'];␊
         for ($i=2;$i<=20;$i++) {␊
             if ($steps[$i] and $steps[$i-1]) {␊

-110
111 111
112 112
113 
113
114
115
116
117
118
119
120
121
122
123
124
125
114 126
115 127
116 128
129
130
117 131
118 132
119 133
+                                         'Pluf_AB.view-funnels'));␊
    public function funnel($request, $match)␊
    {␊
        $stats = Pluf_AB_Funnel::getStats($match[1]);␊
        $periods = array('yesterday' => __('Yesterday'),␊
                         'today' => __('Today'),␊
                         '7days' => __('Last 7 days'),␊
                         'all' => __('All time'));␊
        $period = 'today';␊
        $nperiod = $periods[$period];␊
        if (isset($request->REQUEST['p']) ␊
            and isset($periods[$request->REQUEST['p']])) {␊
            $period = $request->REQUEST['p'];␊
            $nperiod = $periods[$request->REQUEST['p']];␊
        }␊
        //'yesterday', ('today'), '7days', 'all'        ␊
        $stats = Pluf_AB_Funnel::getStats($match[1], $period);␊
        return Pluf_Shortcuts_RenderToResponse('pluf/ab/funnel.html', ␊
                                               array('stats' => $stats,␊
                                                     'funnel' => $match[1],␊
                                                     'nperiod' => $nperiod,␊
                                                     'period' => $period,␊
                                                     ),␊
                                               $request);␊
    }␊
                                          'Pluf_AB.view-funnels'));␊
     public function funnel($request, $match)␊
     {␊
-        $stats = Pluf_AB_Funnel::getStats($match[1]);␊
+        $periods = array('yesterday' => __('Yesterday'),␊
+                         'today' => __('Today'),␊
+                         '7days' => __('Last 7 days'),␊
+                         'all' => __('All time'));␊
+        $period = 'today';␊
+        $nperiod = $periods[$period];␊
+        if (isset($request->REQUEST['p']) ␊
+            and isset($periods[$request->REQUEST['p']])) {␊
+            $period = $request->REQUEST['p'];␊
+            $nperiod = $periods[$request->REQUEST['p']];␊
+        }␊
+        //'yesterday', ('today'), '7days', 'all'        ␊
+        $stats = Pluf_AB_Funnel::getStats($match[1], $period);␊
         return Pluf_Shortcuts_RenderToResponse('pluf/ab/funnel.html', ␊
                                                array('stats' => $stats,␊
                                                      'funnel' => $match[1],␊
+                                                     'nperiod' => $nperiod,␊
+                                                     'period' => $period,␊
                                                      ),␊
                                                $request);␊
     }␊

-62
63 63
64 64
65
66
67
68
65 69
66 70
67 71
+  padding: 0;␊
}␊
␊
.strong {␊
   font-weight: bold;␊
}␊
␊
.note, .details {␊
   font-size: 0.8em;␊
}␊
   padding: 0;␊
 }␊
 ␊
+.strong {␊
+   font-weight: bold;␊
+}␊
+␊
 .note, .details {␊
    font-size: 0.8em;␊
 }␊

Download the corresponding diff file

Pluf Framework

File differences

Branches

Tags