Merge remote branch 'petter/council-solve-rates'

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/showcouncilrates b/bin/showcouncilrates
index cc8ce8d10..1dacae597 100755
--- a/bin/showcouncilrates
+++ b/bin/showcouncilrates
@@ -26,9 +26,10 @@ BEGIN {
 
 my $query = "SELECT council, COUNT(*) AS total, SUM(fixed) AS fixed
   FROM (SELECT council,
-        CASE WHEN state = 'fixed' THEN 1 ELSE 0 END AS fixed
+        CASE WHEN state in ('fixed','fixed - user', 'fixed - council')
+             THEN 1 ELSE 0 END AS fixed
         FROM problem WHERE confirmed IS NOT NULL AND
-        state IN ('fixed', 'confirmed') AND
+        state IN ('fixed', 'fixed - user', 'fixed - council', 'confirmed') AND
         whensent < NOW() - INTERVAL '4 weeks') AS a
   GROUP BY council";