Moved forward to 6.7.2.dev0 the changes to rename class ScheduledSession to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and rename reverse relationships involving this class appropriately. Accompanying changes in javascript and templates. Migrations to match.

 - Legacy-Id: 10297

Author: levkowetz

ietf/doc/tests_material.py

@@ -188,7 +188,7 @@ def test_material_presentations(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        when = meeting.agenda.scheduledsession_set.filter(session__group__acronym='testteam').first().timeslot.time
+        when = meeting.agenda.assignments.filter(session__group__acronym='testteam').first().timeslot.time
         mdw = when.date().isoformat()
         dow = ['mon','tue','wed','thu','fri','sat','sun'][when.weekday()]
 
@@ -212,7 +212,7 @@ def test_edit_material_presentations(self):
         meeting = make_meeting_test_data()
         meeting.session_set.filter(group__acronym='mars').update(group=doc.group)
 
-        session = meeting.agenda.scheduledsession_set.filter(session__group__acronym='testteam').first().session
+        session = meeting.agenda.assignments.filter(session__group__acronym='testteam').first().session
 
         url = urlreverse(edit_material_presentations,kwargs=dict(name=doc.name,acronym='testteam',seq=1))
         login_testing_unauthorized(self, "secretary", url)

ietf/doc/views_material.py

@@ -197,18 +197,18 @@ def get_upcoming_manageable_sessions(user, doc, acronym=None, date=None, seq=Non
     if date:
         if len(date)==15:
             start = datetime.datetime.strptime(date,"%Y-%m-%d-%H%M")
-            refined_candidates = [ sess for sess in refined_candidates if sess.scheduledsession_set.filter(schedule=sess.meeting.agenda,timeslot__time=start) ]
+            refined_candidates = [ sess for sess in refined_candidates if sess.timeslotassignments.filter(schedule=sess.meeting.agenda,timeslot__time=start) ]
         else:
             start = datetime.datetime.strptime(date,"%Y-%m-%d").date()
             end = start+datetime.timedelta(days=1)
-            refined_candidates = [ sess for sess in refined_candidates if sess.scheduledsession_set.filter(schedule=sess.meeting.agenda,timeslot__time__range=(start,end)) ]
+            refined_candidates = [ sess for sess in refined_candidates if sess.timeslotassignments.filter(schedule=sess.meeting.agenda,timeslot__time__range=(start,end)) ]
 
     if week_day:
         try:
             dow = ['sun','mon','tue','wed','thu','fri','sat'].index(week_day.lower()[:3]) + 1
         except ValueError:
             raise Http404
-        refined_candidates = [ sess for sess in refined_candidates if sess.scheduledsession_set.filter(schedule=sess.meeting.agenda,timeslot__time__week_day=dow) ]
+        refined_candidates = [ sess for sess in refined_candidates if sess.timeslotassignments.filter(schedule=sess.meeting.agenda,timeslot__time__week_day=dow) ]
 
     changeable_sessions = [ sess for sess in refined_candidates if can_manage_materials(user, sess.group) ]
 
@@ -226,7 +226,7 @@ def get_upcoming_manageable_sessions(user, doc, acronym=None, date=None, seq=Non
     # scheduled).
 
     def time_sort_key(session):
-        official_sessions = session.scheduledsession_set.filter(schedule=session.meeting.agenda)
+        official_sessions = session.timeslotassignments.filter(schedule=session.meeting.agenda)
         if official_sessions:
             return official_sessions.first().timeslot.time
         else:

ietf/meeting/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from ietf.meeting.models import Meeting, Room, Session, TimeSlot, Constraint, Schedule, ScheduledSession, ResourceAssociation
+from ietf.meeting.models import Meeting, Room, Session, TimeSlot, Constraint, Schedule, SchedTimeSessAssignment, ResourceAssociation
 
 class RoomAdmin(admin.ModelAdmin):
     list_display = ["id", "meeting", "name", "capacity", ]
@@ -87,11 +87,11 @@ class ScheduleAdmin(admin.ModelAdmin):
 admin.site.register(Schedule, ScheduleAdmin)
 
 
-class ScheduledSessionAdmin(admin.ModelAdmin):
+class SchedTimeSessAssignmentAdmin(admin.ModelAdmin):
     list_display = ["id", "schedule", "timeslot", "session", "modified"]
     list_filter = ["timeslot__meeting", "schedule"]
 
-admin.site.register(ScheduledSession, ScheduledSessionAdmin)
+admin.site.register(SchedTimeSessAssignment, SchedTimeSessAssignmentAdmin)
 
 
 class ResourceAssociationAdmin(admin.ModelAdmin):

ietf/meeting/ajax.py

@@ -8,7 +8,7 @@
 
 from ietf.ietfauth.utils import role_required, has_role
 from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_person_by_email, get_schedule_by_name
-from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint, ScheduledSession, ResourceAssociation
+from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint, SchedTimeSessAssignment, ResourceAssociation
 from ietf.meeting.views   import edit_timeslots, edit_agenda
 
 import debug                            # pyflakes:ignore
@@ -151,7 +151,7 @@ def timeslot_roomurl(request, num=None, roomid=None):
 
 #############################################################################
 ## DAY/SLOT API
-##  -- this creates groups of timeslots, and associated scheduledsessions.
+##  -- this creates groups of timeslots, and associated schedtimesessassignments.
 #############################################################################
 AddSlotForm = modelform_factory(TimeSlot, exclude=('meeting','name','location','sessions', 'modified'))
 
@@ -319,7 +319,7 @@ def agenda_update(request, meeting, schedule):
 
 @role_required('Secretariat')
 def agenda_del(request, meeting, schedule):
-    schedule.delete_scheduledsessions()
+    schedule.delete_assignments()
     #debug.log("deleting meeting: %s agenda: %s" % (meeting, meeting.agenda))
     if meeting.agenda == schedule:
         meeting.agenda = None
@@ -431,8 +431,8 @@ def sessions_json(request, num):
 ## Scheduledsesion
 #############################################################################
 
-# this creates an entirely *NEW* scheduledsession
-def scheduledsessions_post(request, meeting, schedule):
+# this creates an entirely *NEW* schedtimesessassignment
+def assignments_post(request, meeting, schedule):
     cansee,canedit,secretariat = agenda_permissions(meeting, schedule, request.user)
     if not canedit:
         return HttpResponse(json.dumps({'error':'no permission to modify this agenda'}),
@@ -446,15 +446,15 @@ def scheduledsessions_post(request, meeting, schedule):
                             status = 406,
                             content_type="application/json")
 
-    ss1 = ScheduledSession(schedule = schedule,
+    ss1 = SchedTimeSessAssignment(schedule = schedule,
                            session_id  = newvalues["session_id"],
                            timeslot_id = newvalues["timeslot_id"])
     if("extendedfrom_id" in newvalues):
         val = int(newvalues["extendedfrom_id"])
         try:
-            ss2 = schedule.scheduledsession_set.get(pk = val)
+            ss2 = schedule.assignments.get(pk = val)
             ss1.extendedfrom = ss2
-        except ScheduledSession.DoesNotExist:
+        except SchedTimeSessAssignment.DoesNotExist:
             return HttpResponse(json.dumps({'error':'invalid extendedfrom value: %u' % val}),
                                 status = 406,
                                 content_type="application/json")
@@ -467,28 +467,28 @@ def scheduledsessions_post(request, meeting, schedule):
     response['Location'] = ss1_dict["href"],
     return response
 
-def scheduledsessions_get(request, num, schedule):
-    scheduledsessions = schedule.scheduledsession_set.all()
+def assignments_get(request, num, schedule):
+    assignments = schedule.assignments.all()
 
-    sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in scheduledsessions ]
+    sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in assignments ]
     return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2),
                         content_type="application/json")
 
 # this returns the list of scheduled sessions for the given named agenda
-def scheduledsessions_json(request, num, owner, name):
+def assignments_json(request, num, owner, name):
     meeting, person, schedule = get_meeting_schedule(num, owner, name)
 
     if request.method == 'GET':
-        return scheduledsessions_get(request, meeting, schedule)
+        return assignments_get(request, meeting, schedule)
     elif request.method == 'POST':
-        return scheduledsessions_post(request, meeting, schedule)
+        return assignments_post(request, meeting, schedule)
     else:
         return HttpResponse(json.dumps({'error':'inappropriate action: %s' % (request.method)}),
                             status = 406,
                             content_type="application/json")
 
 # accepts both POST and PUT in order to implement Postel Doctrine.
-def scheduledsession_update(request, meeting, schedule, ss):
+def assignment_update(request, meeting, schedule, ss):
     cansee,canedit,secretariat = agenda_permissions(meeting, schedule, request.user)
     if not canedit:
         return HttpResponse(json.dumps({'error':'no permission to update this agenda'}),
@@ -506,29 +506,29 @@ def scheduledsession_update(request, meeting, schedule, ss):
     return HttpResponse(json.dumps({'message':'valid'}),
                         content_type="application/json")
 
-def scheduledsession_delete(request, meeting, schedule, ss):
+def assignment_delete(request, meeting, schedule, ss):
     cansee,canedit,secretariat = agenda_permissions(meeting, schedule, request.user)
     if not canedit:
         return HttpResponse(json.dumps({'error':'no permission to update this agenda'}),
                             status = 403,
                             content_type="application/json")
 
     # in case there is, somehow, more than one item with the same pk.. XXX
-    scheduledsessions = schedule.scheduledsession_set.filter(pk = ss.pk)
-    if len(scheduledsessions) == 0:
+    assignments = schedule.assignments.filter(pk = ss.pk)
+    if len(assignments) == 0:
         return HttpResponse(json.dumps({'error':'no such object'}),
                             status = 404,
                             content_type="application/json")
     count=0
-    for ss in scheduledsessions:
+    for ss in assignments:
         ss.delete()
         count += 1
 
     return HttpResponse(json.dumps({'result':"%u objects deleted"%(count)}),
                         status = 200,
                         content_type="application/json")
 
-def scheduledsession_get(request, meeting, schedule, ss):
+def assignment_get(request, meeting, schedule, ss):
     cansee,canedit,secretariat = agenda_permissions(meeting, schedule, request.user)
 
     if not cansee:
@@ -541,22 +541,22 @@ def scheduledsession_get(request, meeting, schedule, ss):
                         content_type="application/json")
 
 # this return a specific session, updates a session or deletes a SPECIFIC scheduled session
-def scheduledsession_json(request, num, owner, name, scheduledsession_id):
+def assignment_json(request, num, owner, name, assignment_id):
     meeting, person, schedule = get_meeting_schedule(num, owner, name)
 
-    scheduledsessions = schedule.scheduledsession_set.filter(pk = scheduledsession_id)
-    if len(scheduledsessions) == 0:
-        return HttpResponse(json.dumps({'error' : 'invalid scheduledsession'}),
+    assignments = schedule.assignments.filter(pk = assignment_id)
+    if len(assignments) == 0:
+        return HttpResponse(json.dumps({'error' : 'invalid assignment'}),
                             content_type="application/json",
                             status=404);
-    ss = scheduledsessions[0]
+    ss = assignments[0]
 
     if request.method == 'GET':
-        return scheduledsession_get(request, meeting, schedule, ss)
+        return assignment_get(request, meeting, schedule, ss)
     elif request.method == 'PUT' or request.method=='POST':
-        return scheduledsession_update(request, meeting, schedule, ss)
+        return assignment_update(request, meeting, schedule, ss)
     elif request.method == 'DELETE':
-        return scheduledsession_delete(request, meeting, schedule, ss)
+        return assignment_delete(request, meeting, schedule, ss)
 
 #############################################################################
 ## Constraints API

ietf/meeting/helpers.py

@@ -61,8 +61,8 @@ def get_areas():
                                 Q(state="active", type="area")).order_by('acronym')
 
 # get list of areas that are referenced.
-def get_area_list_from_sessions(scheduledsessions, num):
-    return scheduledsessions.filter(timeslot__type = 'Session',
+def get_area_list_from_sessions(assignments, num):
+    return assignments.filter(timeslot__type = 'Session',
                                     session__group__parent__isnull = False).order_by(
         'session__group__parent__acronym').distinct().values_list(
         'session__group__parent__acronym',flat=True)
@@ -85,25 +85,25 @@ def build_all_agenda_slices(meeting):
     time_slices.sort()
     return time_slices,date_slices
 
-def get_all_scheduledsessions_from_schedule(schedule):
-   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False)
+def get_all_assignments_from_schedule(schedule):
+   ss = schedule.assignments.filter(timeslot__location__isnull = False)
    ss = ss.filter(session__type__slug='session')
    ss = ss.order_by('timeslot__time','timeslot__name')
 
    return ss
 
-def get_modified_from_scheduledsessions(scheduledsessions):
-    return scheduledsessions.aggregate(Max('timeslot__modified'))['timeslot__modified__max']
+def get_modified_from_assignments(assignments):
+    return assignments.aggregate(Max('timeslot__modified'))['timeslot__modified__max']
 
-def get_wg_name_list(scheduledsessions):
-    return scheduledsessions.filter(timeslot__type = 'Session',
+def get_wg_name_list(assignments):
+    return assignments.filter(timeslot__type = 'Session',
                                     session__group__isnull = False,
                                     session__group__parent__isnull = False).order_by(
         'session__group__acronym').distinct().values_list(
         'session__group__acronym',flat=True)
 
-def get_wg_list(scheduledsessions):
-    wg_name_list = get_wg_name_list(scheduledsessions)
+def get_wg_list(assignments):
+    wg_name_list = get_wg_name_list(assignments)
     return Group.objects.filter(acronym__in = set(wg_name_list)).order_by('parent__acronym','acronym')
 
 

ietf/meeting/management/commands/schedwrite.py

@@ -27,15 +27,15 @@ def handle(self, *labels, **options):
         meeting = get_meeting(meetingname)
         schedule = get_schedule(meeting, schedname)
 
-        scheduledsessions = schedule.scheduledsession_set.all()
+        assignments = schedule.assignments.all()
 
         # cribbed from django/core/management/commands/dumpdata.py
         # Check that the serialization format exists; this is a shortcut to
         # avoid collating all the objects and _then_ failing.
         if format not in serializers.get_public_serializer_formats():
             raise CommandError("Unknown serialization format: %s" % format)
 
-        return serializers.serialize(format, scheduledsessions, indent=indent,
+        return serializers.serialize(format, assignments, indent=indent,
                                      use_natural_keys=True)
 
 

ietf/meeting/migrations/0012_auto_20151026_1406.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0011_ietf92_meetings'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='scheduledsession',
+            name='session',
+            field=models.ForeignKey(related_name='timeslotassignments', default=None, to='meeting.Session', help_text='Scheduled session.', null=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='scheduledsession',
+            name='timeslot',
+            field=models.ForeignKey(related_name='sessionassignments', to='meeting.TimeSlot'),
+            preserve_default=True,
+        ),
+    ]

ietf/meeting/migrations/0013_auto_20151026_1408.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0012_auto_20151026_1406'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Dummy',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('modified', models.DateTimeField(default=datetime.datetime.now)),
+                ('notes', models.TextField(blank=True)),
+                ('badness', models.IntegerField(default=0, null=True, blank=True)),
+                ('pinned', models.BooleanField(default=False, help_text=b'Do not move session during automatic placement.')),
+                ('extendedfrom', models.ForeignKey(default=None, to='self', help_text='Timeslot this session is an extension of.', null=True)),
+                ('schedule', models.ForeignKey(related_name='assignments', to='meeting.Schedule')),
+                ('session', models.ForeignKey(related_name='timeslotassignments', default=None, to='meeting.Session', help_text='Scheduled session.', null=True)),
+                ('timeslot', models.ForeignKey(related_name='sessionassignments', to='meeting.TimeSlot')),
+            ],
+            options={
+                'ordering': ['timeslot__time', 'timeslot__type__slug', 'session__group__parent__name', 'session__group__acronym', 'session__name'],
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterField(
+            model_name='timeslot',
+            name='sessions',
+            field=models.ManyToManyField(related_name='slots', to='meeting.Session', through='meeting.Dummy', blank=True, help_text='Scheduled session, if any.', null=True),
+            preserve_default=True,
+        ),
+    ]