Add meeting statistics - overview and country/continent across

meetings + detail pages with country and continent
 - Legacy-Id: 13264

Author: OleLaursen

ietf/bin/fetch-meeting-registration-data

@@ -25,7 +25,7 @@ import syslog
 
 from ietf.meeting.models import Meeting
 
-from ietf.stats.utils import get_registration_data
+from ietf.stats.utils import get_meeting_registration_data
 
 meetings = Meeting.objects.none()
 if args.meeting:
@@ -39,7 +39,7 @@ else:
     sys.exit(1)
 
 for meeting in meetings:
-    total = get_registration_data(meeting)
+    total = get_meeting_registration_data(meeting)
     msg = "Fetched data for meeting {}: {} registrations added".format(meeting.number, total)
     if sys.stdout.isatty():
         print(msg) # make debugging a bit easier

ietf/static/ietf/js/document-stats.js ietf/static/ietf/js/stats.jsietf/static/ietf/js/document-stats.js renamed to ietf/static/ietf/js/stats.js

@@ -14,7 +14,7 @@ $(document).ready(function () {
 
         var chart = Highcharts.chart('chart', window.chartConf);
     }
-
+    /*
     $(".popover-details").each(function () {
         var stdNameRegExp = new RegExp("^(rfc|bcp|fyi|std)[0-9]+$", 'i');
         var draftRegExp = new RegExp("^draft-", 'i');
@@ -49,5 +49,5 @@ $(document).ready(function () {
         }).on("click", function (e) {
             e.preventDefault();
         });
-    });
+    });*/
 });

ietf/stats/migrations/0003_registration_registrationstats.py

@@ -16,13 +16,13 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Registration',
+            name='MeetingRegistration',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('first_name', models.CharField(max_length=255)),
                 ('last_name', models.CharField(max_length=255)),
                 ('affiliation', models.CharField(blank=True, max_length=255)),
-                ('country', models.CharField(max_length=2)),
+                ('country_code', models.CharField(max_length=2)),
                 ('meeting', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting')),
                 ('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],

ietf/stats/models.py

@@ -42,13 +42,13 @@ def __unicode__(self):
     class Meta:
         verbose_name_plural = "country aliases"
 
-class Registration(models.Model):
+class MeetingRegistration(models.Model):
     """Registration attendee records from the IETF registration system"""
     meeting = models.ForeignKey(Meeting)
     first_name = models.CharField(max_length=255)
     last_name = models.CharField(max_length=255)
     affiliation = models.CharField(blank=True, max_length=255)
-    country = models.CharField(max_length=2)        # ISO 3166
+    country_code = models.CharField(max_length=2)        # ISO 3166
     person = models.ForeignKey(Person, blank=True, null=True)
 
     def __unicode__(self):

ietf/stats/tests.py

@@ -8,8 +8,8 @@
 
 from ietf.utils.test_data import make_test_data, make_review_data
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
-from ietf.stats.models import Registration
-from ietf.stats.utils import get_registration_data
+from ietf.stats.models import MeetingRegistration
+from ietf.stats.utils import get_meeting_registration_data
 import ietf.stats.views
 
 from ietf.submit.models import Submission
@@ -154,12 +154,12 @@ def test_review_stats(self):
         self.assertTrue(q('.review-stats td:contains("1")'))
 
     @patch('requests.get')
-    def test_get_registration_data(self, mock_get):
+    def test_get_meeting_registration_data(self, mock_get):
         response = Response()
         response.status_code = 200
         response._content = '[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]'
         mock_get.return_value = response
         meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
-        get_registration_data(meeting)
-        query = Registration.objects.filter(first_name='John',last_name='Smith',country='US')
-        self.assertTrue(query.count(),1)
+        get_meeting_registration_data(meeting)
+        query = MeetingRegistration.objects.filter(first_name='John',last_name='Smith',country_code='US')
+        self.assertTrue(query.count(), 1)

ietf/stats/urls.py

@@ -7,5 +7,7 @@
     url("^$", views.stats_index),
     url("^document/(?:(?P<stats_type>authors|pages|words|format|formlang|author/(?:documents|affiliation|country|continent|citations|hindex)|yearly/(?:affiliation|country|continent))/)?$", views.document_stats),
     url("^knowncountries/$", views.known_countries_list),
+    url("^meeting/(?P<num>\d+)/(?P<stats_type>country|continent)/$", views.meeting_stats),
+    url("^meeting/(?:(?P<stats_type>overview|country|continent)/)?$", views.meeting_stats),
     url("^review/(?:(?P<stats_type>completion|results|states|time)/)?(?:%(acronym)s/)?$" % settings.URL_REGEXPS, views.review_stats),
 ]

ietf/stats/utils.py

@@ -4,7 +4,7 @@
 
 from django.conf import settings
 
-from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias, Registration
+from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias, MeetingRegistration
 from ietf.name.models import CountryName
 
 def compile_affiliation_ending_stripping_regexp():
@@ -210,7 +210,7 @@ def compute_hirsch_index(citation_counts):
     return i
 
 
-def get_registration_data(meeting):
+def get_meeting_registration_data(meeting):
     """"Retrieve registration attendee data and summary statistics.  Returns number
     of Registration records created."""
     num_created = 0
@@ -223,12 +223,12 @@ def get_registration_data(meeting):
             pass
 
         for registration in decoded:
-            object, created = Registration.objects.get_or_create(
+            object, created = MeetingRegistration.objects.get_or_create(
                 meeting_id=meeting.pk,
                 first_name=registration['FirstName'],
                 last_name=registration['LastName'],
                 affiliation=registration['Company'],
-                country=registration['Country'])
+                country_code=registration['Country'])
             if created:
                 num_created += 1
     return num_created