From 2ba705c898aa607f30edd438762de34b8368e3e0 Mon Sep 17 00:00:00 2001
From: francis <francis>
Date: Tue, 11 Aug 2009 16:50:50 +0000
Subject: Add missing states.

---
 script/request-creation-graph | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'script/request-creation-graph')

diff --git a/script/request-creation-graph b/script/request-creation-graph
index 7a6b4a383..609411b10 100755
--- a/script/request-creation-graph
+++ b/script/request-creation-graph
@@ -5,7 +5,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org. WWW: http://www.mysociety.org/
 # 
-# $Id: request-creation-graph,v 1.6 2008-05-09 01:34:24 francis Exp $
+# $Id: request-creation-graph,v 1.7 2009-08-11 16:50:50 francis Exp $
 
 GPLOT_OUTPUT="set terminal png font 'Vera.ttf' 9 size 1200,400"
 EXTENSION=".png"
@@ -31,6 +31,10 @@ SOURCED=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
 SOURCEE=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
 SOURCEF=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
 SOURCEG=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
+SOURCEH=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
+SOURCEI=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
+SOURCEJ=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
+SOURCEK=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM
 GPSCRIPT=/tmp/foi-creation-rate-graph-script-$RANDOM$RANDOM
 
 #    where status in ('draft') 
@@ -54,14 +58,11 @@ grab_data "where described_state not in ('waiting_response', 'waiting_clarificat
 grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected')" $SOURCEE
 grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected', 'successful')" $SOURCEF
 grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected', 'successful', 'partially_successful')" $SOURCEG
-
-
-#state = 'unconfirmed'
-#or state = 'confirmed'
-#or state = 'fixed'
-#or state = 'hidden'
-#or state = 'flickr'
-
+grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected', 'successful', 'partially_successful', 'requires_admin')" $SOURCEH
+grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected', 'successful', 'partially_successful', 'requires_admin', 'gone_postal')" $SOURCEI
+grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected', 'successful', 'partially_successful', 'requires_admin', 'gone_postal', 'internal_review')" $SOURCEJ
+grab_data "where described_state not in ('waiting_response', 'waiting_clarification', 'not_held', 'rejected', 'successful', 'partially_successful', 'requires_admin', 'gone_postal', 'internal_review', 'error_message')" $SOURCEK
+#user_withdrawn
 
 cat >$GPSCRIPT <<END 
     unset border
@@ -87,16 +88,22 @@ cat >$GPSCRIPT <<END
 #    set label 1 'launch of beta' at '2005-02-17', 900
 
     n = 0
-    plot "$SOURCEA" using 1:2 with impulses lt 8 lw 15 title "waiting_response",\
-         "$SOURCEB" using 1:2 with impulses lt 3 lw 15 title "waiting_clarification",\
-         "$SOURCEC" using 1:2 with impulses lt 9 lw 15 title "not_held",\
-         "$SOURCED" using 1:2 with impulses lt 6 lw 15 title "rejected",\
-         "$SOURCEE" using 1:2 with impulses lt 2 lw 15 title "successful",\
-         "$SOURCEF" using 1:2 with impulses lt 10 lw 15 title "partially_successful",\
-         "$SOURCEG" using 1:2 with impulses lt 5 lw 15 title "requires_admin",\
+    plot "$SOURCEA" using 1:2 with impulses lt 8 lw 15 title "waiting_response", # dark blue \
+         "$SOURCEB" using 1:2 with impulses lt 3 lw 15 title "waiting_clarification", # light blue \
+         "$SOURCEC" using 1:2 with impulses lt 9 lw 15 title "not_held", # yellow \
+         "$SOURCED" using 1:2 with impulses lt 6 lw 15 title "rejected", # red \
+         "$SOURCEE" using 1:2 with impulses lt 2 lw 15 title "successful", # light green \
+         "$SOURCEF" using 1:2 with impulses lt 10 lw 15 title "partially_successful", # dark green \
+         "$SOURCEG" using 1:2 with impulses lt 5 lw 15 title "requires_admin", # cyan \
+         "$SOURCEH" using 1:2 with impulses lt 7 lw 15 title "gone_postal", # dark yellow \
+         "$SOURCEI" using 1:2 with impulses lt 4 lw 15 title "internal_review", # mauve\
+         "$SOURCEJ" using 1:2 with impulses lt 12 lw 15 title "error_message", # dark redy brown \
+         "$SOURCEK" using 1:2 with impulses lt 13 lw 15 title "user_withdrawn", # pink \
     "< awk 'BEGIN { n = 0 } { n += \$2; print \$1, \$2, n; }' $SOURCEA" using 1:3 axes x1y2 with lines lt 2 title "cumulative total number of requests"
 END
 #echo "gpscript $GPSCRIPT"
+# 11 bluey mauve
+# 14 lime green
 
 export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera
 gnuplot < $GPSCRIPT > foi/public/foi-live-creation$EXTENSION
-- 
cgit v1.2.3