Remove "expected attendance" functionality. (#1288)

The was relying on a feature in the website, which has long been removed,
where users could flag interest in a talk.

Author: malemburg

conference/admin.py

@@ -550,7 +550,24 @@ class EventInlineAdmin(admin.TabularInline):
 
 
 class ScheduleAdmin(admin.ModelAdmin):
-    list_display = ('conference', 'slug', 'date')
+    list_display = (
+        "conference",
+        "slug",
+        "date",
+    )
+    list_filter = (
+        "conference",
+    )
+    search_fields = [
+        "conference",
+        "slug",
+        "date",
+    ]
+    ordering = (
+        "conference",
+        "date",
+    )
+
     inlines = [
         TrackInlineAdmin,
         EventInlineAdmin
@@ -560,11 +577,6 @@ def get_urls(self):
         urls = super(ScheduleAdmin, self).get_urls()
         v = self.admin_site.admin_view
         my_urls = [
-            re_path(
-                r'^stats/$',
-                v(self.expected_attendance),
-                name='conference-schedule-expected_attendance'
-            ),
             re_path(
                 r'^(?P<sid>\d+)/events/$',
                 v(self.events),
@@ -791,28 +803,6 @@ def tracks(self, request, sid, tid):
             }
             return TemplateResponse(request, 'conference/admin/schedule_tracks.html', ctx)
 
-    def expected_attendance(self, request):
-        allevents = defaultdict(dict)
-        for e, info in models.Schedule.objects.expected_attendance(settings.CONFERENCE_CONFERENCE).items():
-            allevents[e.schedule][e] = info
-        data = {}
-        for s, events in allevents.items():
-            data[s] = entry = {
-                'morning': [],
-                'afternoon': [],
-            }
-            for e, info in events.items():
-                item = dict(info)
-                item['event'] = e
-                if e.start_time.hour < 13 and e.start_time.minute < 30:
-                    entry['morning'].append(item)
-                else:
-                    entry['afternoon'].append(item)
-        ctx = {
-            'schedules': sorted(list(data.items()), key=lambda x: x[0].date),
-        }
-        return TemplateResponse(request, 'conference/admin/schedule_expected_attendance.html', ctx)
-
 
 class FilterFareByTicketCode(admin.SimpleListFilter):
 

conference/models.py

@@ -1006,61 +1006,13 @@ class Meta:
 
 
 class ScheduleManager(models.Manager):
+
     def attendees(self, conference, forecast=False):
         """
         Returns the number of participants for each of the conference schedule.
         """
         return settings.CONFERENCE_SCHEDULE_ATTENDEES(conference, forecast)
 
-    def events_score_by_attendance(self, conference):
-        return defaultdict(lambda: 0.0)
-
-    def expected_attendance(self, conference, factor=0.85):
-        """
-        Return for each event prediction of participation based on EventInterest
-        """
-        seats_available = defaultdict(lambda: 0)
-        qs = EventTrack.objects.filter(event__schedule__conference=conference).values('event', 'track__seats')
-        for row in qs:
-            seats_available[row['event']] += row['track__seats']
-
-        scores = self.events_score_by_attendance(conference)
-        events = Event.objects.filter(schedule__conference=conference).select_related('schedule')
-
-        output = {}
-        # Now I have to make the forecast of the participants for each event,
-        # to make it divide the score of an event by the number of voters who
-        # have expressed a vote for an event in the same time band * *; the number
-        # I get is a k factor when multiplied by the forecast of people a day gives
-        # me an indication of how many people are expected for the event.
-        forecasts = self.attendees(conference, forecast=True)
-
-        # to calculate the score for a time band I have to do a double for the
-        # events, to limit the number of internal iterations I group events per day
-        event_by_day = defaultdict(set)
-        for e in events:
-            event_by_day[e.schedule_id].add(e)
-
-        for event in events:
-            score = scores[event.id]
-            group = list(Event.objects.group_events_by_times(event_by_day[event.schedule_id], event=event))[0]
-            group_score = sum([scores[e.id] for e in group])
-
-            k = 0
-            if group_score:
-                k = score / group_score
-
-            expected = k * forecasts[event.schedule_id] * factor
-            seats = seats_available.get(event.id, 0)
-            output[event.id] = {
-                'score': score,
-                'seats': seats,
-                'expected': expected,
-                'overbook': seats and expected > seats,
-            }
-
-        return output
-
 
 class Schedule(models.Model):
     """

conference/templatetags/conference.py

@@ -49,15 +49,6 @@ def fare_blob(fare, field):
     return ''
 
 
-# XXX - remove
-@register.simple_tag(takes_context=True)
-def get_talk_speakers(context, talk):
-    c = _request_cache(context['request'], 'talk_speakers_%s' % talk.conference)
-    if not c:
-        c['items'] = models.TalkSpeaker.objects.speakers_by_talks(talk.conference)
-    return c['items'].get(talk.id, [])
-
-
 @register.simple_tag
 def tagged_items(tag):
     return dataaccess.tags().get(tag, {})

templates/admin/conference/schedule/change_list.html

@@ -9,8 +9,5 @@
         </a>
         </li>
     {% endif %}
-        <li>
-        <a href="{% url "admin:conference-schedule-expected_attendance" %}" class="">expected attendance</a>
-        </li>
     </ul>
 {% endblock %}

templates/conference/admin/schedule_expected_attendance.html

@@ -111,11 +111,3 @@ def test_conference_schedule_tracks_admin(admin_client):
     assert response.status_code == 200
 
 
-# /admin/conference/schedule/stats/ conference.admin.expected_attendance
-@mark.django_db
-def test_conference_schedule_expected_attendance_admin(admin_client):
-    url = reverse('admin:conference-schedule-expected_attendance')
-
-    response = admin_client.get(url)
-
-    assert response.status_code == 200