ENH: survey results -- mark later-on added entries with a dagger

diff --git a/survey/common.py b/survey/common.py
index 09596b1645c1308655689c0821b2c728c9b8e145..2c33c377500addd3a1180af83fb32e4d58371e21 100755 (executable)
--- a/survey/common.py
+++ b/survey/common.py
@@ -125,7 +125,7 @@ entries_to_refresh = dict(
                     '|spyder'
                     # Move into survey?
                     '|.*magnetic source locator.*' # Some kind of MEG inverse solver -- publications but no public project
                     '|spyder'
                     # Move into survey?
                     '|.*magnetic source locator.*' # Some kind of MEG inverse solver -- publications but no public project

-                    ')', True)
+                    ')', False)

                     ),
         ),
     )
                     ),
         ),
     )

diff --git a/survey/makestats b/survey/makestats
index 0959c3dc265805ae6e70a8982a686515b5fa7da8..6dcd20ff2c08f80170adcc0d7e4feae52d10b2ec 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -1,4 +1,5 @@
 #!/usr/bin/python
 #!/usr/bin/python

+# emacs: -*- coding: utf-8; mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-

 
 from glob import glob
 try:
 
 from glob import glob
 try:


@@ -14,6 +15,14 @@ import pylab as pl
 import numpy as np
 import time
 
 import numpy as np
 import time
 

+from common import entries_to_refresh
+fresh_keys = [k
+              for k, (regex, b) in
+                    reduce(list.__add__,[x.items()
+                                         for x in entries_to_refresh['sw_other_name'].values()],
+                           [])
+              if b]
+

 # uniform colors for OS results
 os_colors = ['#AA2029', '#D1942B', '#7FB142', '#69A7CE']
 os_order = ['linux', 'mac', 'win', 'otheros']
 # uniform colors for OS results
 os_colors = ['#AA2029', '#D1942B', '#7FB142', '#69A7CE']
 os_order = ['linux', 'mac', 'win', 'otheros']


@@ -196,11 +205,12 @@ class DB(dict):
                 resource_categories, time_categories,
                 DB.datamod_dict, DB.position_dict, DB.employer_dict,
                 DB.vm_dict, DB.ratings_dict]
                 resource_categories, time_categories,
                 DB.datamod_dict, DB.position_dict, DB.employer_dict,
                 DB.vm_dict, DB.ratings_dict]

+        suffix = u'$^†$' if id in fresh_keys else ''

         for src in srcs:
             if id in src:
         for src in srcs:
             if id in src:

-                return src[id]
+                return src[id] + suffix

         # not found, nothing nicer
         # not found, nothing nicer

-        return id
+        return id + suffix

 
 
 def mkpic_os_per_env(db, destdir):
 
 
 def mkpic_os_per_env(db, destdir):

diff --git a/survey/results.rst b/survey/results.rst
index 689adbad524ba490cbadbfa5af081a5af0a36ad7..81a3a33769f647af867c51406b7f792b2f9a206b 100644 (file)
--- a/survey/results.rst
+++ b/survey/results.rst
@@ -50,3 +50,8 @@ Software popularity
 .. figure:: figures/submissions_per_sw_rt.png
 .. figure:: figures/submissions_per_sw_psychphys.png
 
 .. figure:: figures/submissions_per_sw_rt.png
 .. figure:: figures/submissions_per_sw_psychphys.png
 

+
+.. note:: :sup:`†` Entries which were either mentioned in "Other"
+   field or were added to the survey while survey was already running.
+   Therefore their counts could be under-estimated.
+

diff --git a/survey/survey.css b/survey/survey.css
index 65e924a5b55529bfc8c07360dd354b442fda213e..53f34f57e2876f5427da92dbdf020242301f5aad 100644 (file)
--- a/survey/survey.css
+++ b/survey/survey.css
@@ -34,6 +34,15 @@ div.rating {
     padding: 0.5em;
 }
 
     padding: 0.5em;
 }
 

+div.note {
+    background-color: #eaf2f9;
+       margin: 1em;
+    border: 1px solid #3d7aa5;
+    border-left: none;
+    border-right: none;
+    font-size: .8em;
+}
+

 table.questionaire {
     padding: 0px;
 }
 table.questionaire {
     padding: 0px;
 }

diff --git a/survey/survey.rst b/survey/survey.rst
index 0e6f352a40cc1248e59783065d7cb736bce5af7d..97493c9e3cd59cc892729ebf505dad58ae9b23db 100644 (file)
--- a/survey/survey.rst
+++ b/survey/survey.rst
@@ -3,7 +3,7 @@ Scientific software usage in neuroscience research
 ==================================================
 
 **Survey for 2011 is already closed and no new submissions accepted.**
 ==================================================
 
 **Survey for 2011 is already closed and no new submissions accepted.**

-
+Please visit `2011 survey results <results.html>`_ page.

 
 This survey should take about five minutes. Immediately after submission you
 will be presented with some statistics on previous responses. Please try to
 
 This survey should take about five minutes. Immediately after submission you
 will be presented with some statistics on previous responses. Please try to