Changeset 6125 for trunk

Timestamp:

May 8, 2010, 8:43:50 PM (14 years ago)

Author:

nikrou

Message:

Amend bug 1559. standard deviation was not removed in some places.
So, sqlite crashed because std function has been removed.

Location:

trunk

Files:

• admin/rating.php (modified) (2 diffs)
• admin/themes/default/template/rating.tpl (modified) (2 diffs)
• include/functions_rate.inc.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (1 diff)

trunk/admin/rating.php

@@ -170 +170 @@
        MAX(r.date)          AS recently_rated,
        COUNT(r.rate)        AS nb_rates,
-       SUM(r.rate)          AS sum_rates,
-       ROUND(STD(r.rate),2) AS std_rates
+       SUM(r.rate)          AS sum_rates
   FROM '.RATE_TABLE.' AS r
     LEFT JOIN '.IMAGES_TABLE.' AS i ON r.element_id = i.id
@@ -207 +206 @@
        'U_URL' => $image_url,
        'AVG_RATE' => $image['average_rate'],
-       'STD_RATE' => $image['std_rates'],
        'SUM_RATE' => $image['sum_rates'],
        'NB_RATES' => (int)$image['nb_rates'],

trunk/admin/themes/default/template/rating.tpl

@@ -39 +39 @@
   <td>{'Number of rates'|@translate}</td>
   <td>{'Average rate'|@translate}</td>
-  <td>{'Controversy'|@translate}</td>
   <td>{'Sum of rates'|@translate}</td>
   <td>{'Rate'|@translate}</td>
@@ -51 +50 @@
   <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td>
   <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td>
-  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.STD_RATE}</strong></td>
   <td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td>
 </tr>

trunk/include/functions_rate.inc.php

@@ -121 +121 @@
 SELECT COUNT(rate) AS count
      , ROUND(AVG(rate),2) AS average
-     , ROUND(STD(rate),2) AS stdev
   FROM '.RATE_TABLE.'
   WHERE element_id = '.$image_id.'

trunk/include/ws_functions.inc.php

@@ -677 +677 @@
 SELECT COUNT(rate) AS count
      , ROUND(AVG(rate),2) AS average
-     , ROUND(STD(rate),2) AS stdev
   FROM '.RATE_TABLE.'
   WHERE element_id = '.$image_row['id'].'