Add yearly charts for affiliation, country and continent, fix some bugs

 - Legacy-Id: 12894

Author: OleLaursen

ietf/stats/tests.py

@@ -26,7 +26,9 @@ def test_document_stats(self):
 
         # check various stats types
         for stats_type in ["authors", "pages", "words", "format", "formlang",
-                           "author/documents", "author/affiliation", "author/country", "author/continent"]:
+                           "author/documents", "author/affiliation", "author/country",
+                           "author/continent", "author/citations", "author/hindex",
+                           "yearly/affiliation", "yearly/country", "yearly/continent"]:
             for document_type in ["", "rfc", "draft"]:
                 for time_choice in ["", "5y"]:
                     url = urlreverse(ietf.stats.views.document_stats, kwargs={ "stats_type": stats_type })
@@ -37,7 +39,8 @@ def test_document_stats(self):
                     self.assertEqual(r.status_code, 200)
                     q = PyQuery(r.content)
                     self.assertTrue(q('#chart'))
-                    self.assertTrue(q('table.stats-data'))
+                    if not stats_type.startswith("yearly"):
+                        self.assertTrue(q('table.stats-data'))
 
     def test_known_country_list(self):
         make_test_data()

ietf/stats/urls.py

@@ -5,7 +5,7 @@
 
 urlpatterns = patterns('',
     url("^$", ietf.stats.views.stats_index),
-    url("^document/(?:(?P<stats_type>authors|pages|words|format|formlang|author/documents|author/affiliation|author/country|author/continent|author/citations||author/hindex)/)?$", ietf.stats.views.document_stats),
+    url("^document/(?:(?P<stats_type>authors|pages|words|format|formlang|author/(?:documents|affiliation|country|continent|citations|hindex)|yearly/(?:affiliation|country|continent))/)?$", ietf.stats.views.document_stats),
     url("^knowncountries/$", ietf.stats.views.known_countries_list),
     url("^review/(?:(?P<stats_type>completion|results|states|time)/)?(?:%(acronym)s/)?$" % settings.URL_REGEXPS, ietf.stats.views.review_stats),
 )