From 42e4caa5edea4ba9379168bd269325e82e43884b Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 28 Jan 2014 20:19:19 +0000 Subject: [PATCH 01/21] Attempt to bring trunk fixes and branch updates together - Legacy-Id: 7176 --- ietf/meeting/ajax.py | 303 +++++++++++++++++++++++++++++++------------ 1 file changed, 221 insertions(+), 82 deletions(-) diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index a5794a790..0922b5c3f 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -1,4 +1,5 @@ import json +import datetime from django.core.urlresolvers import reverse from django.shortcuts import get_object_or_404, redirect @@ -9,10 +10,11 @@ from ietf.ietfauth.utils import role_required, has_role, user_is_person from ietf.name.models import TimeSlotTypeName from ietf.meeting.helpers import get_meeting, get_schedule, get_schedule_by_id, agenda_permissions +from ietf.meeting.models import ScheduledSession from ietf.meeting.views import edit_timeslots, edit_agenda from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint -import debug +#import debug def dajaxice_core_js(request): # this is a slightly weird hack to get, we seem to need this because @@ -64,83 +66,48 @@ def update_timeslot_pinned(request, schedule_id, scheduledsession_id, pinned=Fal if scheduledsession_id is not None: ss_id = int(scheduledsession_id) - if ss_id != 0: - ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id) + if ss_id == 0: + return json.dumps({'error':'no permission'}) + ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id) ss.pinned = pinned ss.save() return json.dumps({'message':'valid'}) - - -@role_required('Area Director','Secretariat') -@dajaxice_register -def update_timeslot(request, schedule_id, session_id, scheduledsession_id=None, extended_from_id=None, duplicate=False): - schedule = get_object_or_404(Schedule, pk = int(schedule_id)) - meeting = schedule.meeting - ss_id = 0 - ess_id = 0 - ess = None - ss = None - - #print "duplicate: %s schedule.owner: %s user: %s" % (duplicate, schedule.owner, request.user.person) - cansee,canedit = agenda_permissions(meeting, schedule, request.user) - - if not canedit: - #raise Exception("Not permitted") - return json.dumps({'error':'no permission'}) - - session_id = int(session_id) - session = get_object_or_404(meeting.session_set, pk=session_id) - - if scheduledsession_id is not None: - ss_id = int(scheduledsession_id) - - if extended_from_id is not None: - ess_id = int(extended_from_id) - - if ss_id != 0: - ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id) - - # this cleans up up two sessions in one slot situation, the - # ... extra scheduledsessions need to be cleaned up. - - if ess_id == 0: - # if this is None, then we must be moving. - for ssO in schedule.scheduledsession_set.filter(session=session): - #print "sched(%s): removing session %s from slot %u" % ( schedule, session, ssO.pk ) - #if ssO.extendedfrom is not None: - # ssO.extendedfrom.session = None - # ssO.extendedfrom.save() - ssO.session = None - ssO.extendedfrom = None - ssO.save() - else: - ess = get_object_or_404(schedule.scheduledsession_set, pk = ess_id) - ss.extendedfrom = ess - - try: - # find the scheduledsession, assign the Session to it. - if ss: - #print "ss.session: %s session:%s duplicate=%s"%(ss, session, duplicate) - ss.session = session - if duplicate: - ss.id = None - ss.save() - except Exception: - return json.dumps({'error':'invalid scheduledsession'}) - - return json.dumps({'message':'valid'}) - @role_required('Secretariat') @dajaxice_register -def update_timeslot_purpose(request, timeslot_id=None, purpose=None): +def update_timeslot_purpose(request, + meeting_num, + timeslot_id=None, + purpose =None, + room_id = None, + duration= None, + time = None): + + meeting = get_meeting(meeting_num) ts_id = int(timeslot_id) - try: - timeslot = TimeSlot.objects.get(pk=ts_id) - except: - return json.dumps({'error':'invalid timeslot'}) + time_str = time + if ts_id == 0: + try: + time = datetime.datetime.strptime(time_str, '%Y-%m-%d %H:%M:%S') + except: + return json.dumps({'error':'invalid time: %s' % (time_str)}) + + try: + room = meeting.room_set.get(pk = int(room_id)) + except Room.DoesNotExist: + return json.dumps({'error':'invalid room id'}) + + timeslot = TimeSlot(meeting=meeting, + location = room, + time = time, + duration = duration) + else: + try: + timeslot = TimeSlot.objects.get(pk=ts_id) + except: + return json.dumps({'error':'invalid timeslot'}) try: timeslottypename = TimeSlotTypeName.objects.get(pk = purpose) @@ -149,9 +116,17 @@ def update_timeslot_purpose(request, timeslot_id=None, purpose=None): 'extra': purpose}) timeslot.type = timeslottypename - timeslot.save() + try: + timeslot.save() + except: + return json.dumps({'error':'failed to save'}) - return json.dumps(timeslot.json_dict(request.build_absolute_uri('/'))) + try: + # really should return 201 created, but dajaxice sucks. + json_dict = timeslot.json_dict(request.build_absolute_uri('/')) + return json.dumps(json_dict) + except: + return json.dumps({'error':'failed to save'}) ############################################################################# ## ROOM API @@ -192,6 +167,25 @@ def timeslot_delroom(request, meeting, roomid): room.delete() return HttpResponse('{"error":"none"}', status = 200) +@role_required('Secretariat') +def timeslot_updroom(request, meeting, roomid): + room = get_object_or_404(meeting.room_set, pk=roomid) + + if "name" in request.POST: + room.name = request.POST["name"] + + if "capacity" in request.POST: + room.capacity = request.POST["capacity"] + + if "resources" in request.POST: + new_resource_ids = request.POST["resources"] + new_resources = [ ResourceAssociation.objects.get(pk=a) + for a in new_resource_ids] + room.resources = new_resources + + room.save() + return HttpResponse('{"error":"none"}', status = 200) + def timeslot_roomsurl(request, num=None): meeting = get_meeting(num) @@ -210,14 +204,14 @@ def timeslot_roomurl(request, num=None, roomid=None): room = get_object_or_404(meeting.room_set, pk=roomid) return HttpResponse(json.dumps(room.json_dict(request.build_absolute_uri('/'))), content_type="application/json") -# XXX FIXME: timeslot_updroom() doesn't exist -# elif request.method == 'POST': -# return timeslot_updroom(request, meeting) + elif request.method == 'PUT': + return timeslot_updroom(request, meeting, roomid) elif request.method == 'DELETE': return timeslot_delroom(request, meeting, roomid) ############################################################################# ## DAY/SLOT API +## -- this creates groups of timeslots, and associated scheduledsessions. ############################################################################# AddSlotForm = modelform_factory(TimeSlot, exclude=('meeting','name','location','sessions', 'modified')) @@ -227,7 +221,7 @@ def timeslot_slotlist(request, mtg): json_array=[] for slot in slots: json_array.append(slot.json_dict(request.build_absolute_uri('/'))) - return HttpResponse(json.dumps(json_array), + return HttpResponse(json.dumps(json_array, sort_keys=True, indent=2), content_type="application/json") @role_required('Secretariat') @@ -326,6 +320,10 @@ def agenda_update(request, meeting, schedule): # (schedule, update_dict, request.body)) user = request.user + + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + read_only = not canedit + if has_role(user, "Secretariat"): if "public" in request.POST: value1 = True @@ -335,13 +333,20 @@ def agenda_update(request, meeting, schedule): #debug.log("setting public for %s to %s" % (schedule, value1)) schedule.public = value1 - if "visible" in request.POST: + if "visible" in request.POST and cansee: value1 = True value = request.POST["visible"] if value == "0" or value == 0 or value=="false": value1 = False #debug.log("setting visible for %s to %s" % (schedule, value1)) schedule.visible = value1 + if has_role(user, "Secretariat") and canedit: + if "name" in request.POST: + value = request.POST["name"] + #log.debug("setting name for %s to %s" % (schedule, value)) + schedule.name = value + else: + return HttpResponse({'error':'no permission'}, status=401) if "name" in request.POST: value = request.POST["name"] @@ -382,11 +387,11 @@ def agenda_infosurl(request, num=None): # unacceptable action return HttpResponse(status=406) -def agenda_infourl(request, num=None, schedule_name=None): +def agenda_infourl(request, num=None, name=None): meeting = get_meeting(num) - #debug.log("agenda: %s / %s" % (meeting, schedule_name)) + #log.debug("agenda: %s / %s" % (meeting, name)) - schedule = get_schedule(meeting, schedule_name) + schedule = get_schedule(meeting, name) #debug.log("results in agenda: %u / %s" % (schedule.id, request.method)) if request.method == 'GET': @@ -417,13 +422,13 @@ def meeting_update(request, meeting): value = request.POST["agenda"] #debug.log("4 meeting.agenda: %s" % (value)) if not value or value == "None": # value == "None" is just weird, better with empty string - meeting.agenda = None + meeting.set_official_agenda(None) else: schedule = get_schedule(meeting, value) if not schedule.public: return HttpResponse(status = 406) #debug.log("3 meeting.agenda: %s" % (schedule)) - meeting.agenda = schedule + meeting.set_official_agenda(schedule) #debug.log("2 meeting.agenda: %s" % (meeting.agenda)) meeting.save() @@ -441,7 +446,7 @@ def meeting_json(request, num): ############################################################################# -## Agenda Editing API functions +## Session details API functions ############################################################################# def session_json(request, num, sessionid): @@ -459,6 +464,140 @@ def session_json(request, num, sessionid): return HttpResponse(json.dumps(sess1, sort_keys=True, indent=2), content_type="application/json") +# get group of all sessions. +def sessions_json(request, num): + meeting = get_meeting(num) + + sessions = meeting.sessions_that_can_meet.all() + + sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in sessions ] + return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2), + content_type="application/json") + +############################################################################# +## Scheduledsesion +############################################################################# + +def scheduledsessions_post(request, meeting, schedule): + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + if not canedit: + return HttpResponse(json.dumps({'error':'no permission to modify this agenda'}), + status = 403, + content_type="application/json") + + # get JSON out of raw body. XXX should check Content-Type! + newvalues = json.loads(request.raw_post_data) + if not ("session_id" in newvalues) or not ("timeslot_id" in newvalues): + return HttpResponse(json.dumps({'error':'missing values, timeslot_id and session_id required'}), + status = 406, + content_type="application/json") + + ss1 = ScheduledSession(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.scheduledsessions_set.get(pk = val) + ss1.extendedfrom = ss2 + except ScheduledSession.DoesNotExist: + return HttpResponse(json.dumps({'error':'invalid extendedfrom value: %u' % val}), + status = 406, + content_type="application/json") + + ss1.save() + ss1_dict = ss1.json_dict(request.build_absolute_uri('/')) + response = HttpResponse(json.dumps(ss1_dict), + status = 201, + content_type="application/json") + # 201 code needs a Location: header. + response['Location'] = ss1_dict["href"], + return response + +def scheduledsessions_get(request, num, schedule): + scheduledsessions = schedule.scheduledsession_set.all() + + sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in scheduledsessions ] + 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, name): + meeting = get_meeting(num) + schedule = get_schedule(meeting, name) + + if request.method == 'GET': + return scheduledsessions_get(request, meeting, schedule) + elif request.method == 'POST': + return scheduledsessions_post(request, meeting, schedule) + else: + return HttpResponse(json.dumps({'error':'inappropriate action: %s' % (request.method)}), + status = 406, + content_type="application/json") + + +def scheduledsession_update(request, meeting, schedule, scheduledsession_id): + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + if not canedit or True: + return HttpResponse(json.dumps({'error':'no permission to update this agenda'}), + status = 403, + content_type="application/json") + + +def scheduledsession_delete(request, meeting, schedule, scheduledsession_id): + cansee,canedit = 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") + + scheduledsessions = schedule.scheduledsession_set.filter(pk = scheduledsession_id) + if len(scheduledsessions) == 0: + return HttpResponse(json.dumps({'error':'no such object'}), + status = 404, + content_type="application/json") + + count=0 + for ss in scheduledsessions: + 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, scheduledsession_id): + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + + if not cansee: + return HttpResponse(json.dumps({'error':'no permission to see this agenda'}), + status = 403, + content_type="application/json") + + scheduledsessions = schedule.scheduledsession_set.filter(pk = scheduledsession_id) + if len(scheduledsessions) == 0: + return HttpResponse(json.dumps({'error':'no such object'}), + status = 404, + content_type="application/json") + + sess1_dict = scheduledsessions[0].json_dict(request.build_absolute_uri('/')) + 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 scheduledsession_json(request, num, name, scheduledsession_id): + meeting = get_meeting(num) + schedule = get_schedule(meeting, name) + + scheduledsession_id = int(scheduledsession_id) + + if request.method == 'GET': + return scheduledsession_get(request, meeting, schedule, scheduledsession_id) + elif request.method == 'PUT': + return scheduledsession_update(request, meeting, schedule, scheduledsession_id) + elif request.method == 'DELETE': + return scheduledsession_delete(request, meeting, schedule, scheduledsession_id) + # Would like to cache for 1 day, but there are invalidation issues. #@cache_page(86400) def constraint_json(request, num, constraintid): From 5cdfe6adbfb5a1eb294de4af09e2c3dc30088889 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 31 Jan 2014 01:13:53 +0000 Subject: [PATCH 02/21] reasonably complete merge, but some of the newer-style tests are failing because the js API changed - Legacy-Id: 7188 --- ietf/group/models.py | 3 + ietf/meeting/ajax.py | 2 +- ietf/meeting/management/__init__.py | 0 ietf/meeting/management/commands/__init__.py | 0 ietf/meeting/management/commands/autoplace.py | 124 + ietf/meeting/migrations/0014_add_room.py | 350 +++ .../migrations/0015_add_basic_resources.py | 339 +++ .../0016_add_resource_to_session.py | 341 +++ ..._remove_empty_session_scheduledsessions.py | 335 +++ ietf/meeting/models.py | 256 +- ietf/meeting/placement.py | 738 ++++++ ietf/meeting/tests_api.py | 6 +- ietf/meeting/tests_views.py | 2 +- ietf/meeting/urls.py | 10 +- ietf/meeting/views.py | 69 +- .../migrations/0020_add_default_penalties.py | 205 ++ ietf/name/migrations/0021_add_room.py | 200 ++ .../migrations/0022_add_room_resources.py | 201 ++ ietf/name/models.py | 4 +- ietf/secr/meetings/views.py | 7 +- ietf/secr/sreq/forms.py | 25 +- ietf/secr/sreq/urls.py | 2 + ietf/secr/sreq/views.py | 125 +- .../includes/sessions_request_form.html | 34 +- .../includes/sessions_request_view.html | 6 +- ietf/secr/templates/sreq/main.html | 2 +- ietf/secr/templates/sreq/view.html | 4 +- ietf/settings.py | 24 + ietf/templates/meeting/agenda-utc.html | 6 +- ietf/templates/meeting/landscape_edit.html | 349 +-- ietf/templates/meeting/requests.html | 3 +- ietf/templates/meeting/room_edit.html | 60 + ietf/templates/meeting/timeslot_edit.html | 63 +- static/css/agenda.css | 93 +- static/css/jquery-ui-timepicker-addon.css | 11 + static/css/lib/qunit-1.12.0.css | 244 ++ ...84425806666249pin_blue_nicu_buculei_01.svg | 70 + .../12161797831849255690jcartier_board.svg | 158 ++ ...97831849255690jcartier_board.svg.thumb.png | Bin 0 -> 4072 bytes static/images/meetecho-logo.png | Bin 0 -> 3005 bytes static/images/meetecho-mini.png | Bin 0 -> 1567 bytes static/images/meetecho-mini.xcf | Bin 0 -> 3415 bytes static/images/projector2.png | Bin 0 -> 2421 bytes static/images/projector2.svg | 175 ++ static/js/agenda/agenda_edit.js | 56 +- static/js/agenda/agenda_helpers.js | 295 +-- static/js/agenda/agenda_listeners.js | 725 +++--- static/js/agenda/agenda_objects.js | 577 ++++- static/js/agenda/timeslot_edit.js | 216 +- .../jquery-ui-sliderAccess.js | 91 + .../jquery-ui-timepicker-addon.js | 2134 ++++++++++++++++ static/js/lib/qunit-1.12.0.js | 2212 +++++++++++++++++ static/js/moment.min.js | 6 + static/js/test/agenda_funcs.js | 316 +++ static/js/test/agenda_tests.js | 370 +++ static/secretariat/css/custom.css | 5 + static/test/agenda_tests.html | 27 + static/test/agenda_ui.html | 603 +++++ 58 files changed, 11267 insertions(+), 1012 deletions(-) create mode 100644 ietf/meeting/management/__init__.py create mode 100644 ietf/meeting/management/commands/__init__.py create mode 100644 ietf/meeting/management/commands/autoplace.py create mode 100644 ietf/meeting/migrations/0014_add_room.py create mode 100644 ietf/meeting/migrations/0015_add_basic_resources.py create mode 100644 ietf/meeting/migrations/0016_add_resource_to_session.py create mode 100644 ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py create mode 100644 ietf/meeting/placement.py create mode 100644 ietf/name/migrations/0020_add_default_penalties.py create mode 100644 ietf/name/migrations/0021_add_room.py create mode 100644 ietf/name/migrations/0022_add_room_resources.py create mode 100644 ietf/templates/meeting/room_edit.html create mode 100644 static/css/jquery-ui-timepicker-addon.css create mode 100644 static/css/lib/qunit-1.12.0.css create mode 100644 static/images/1194984425806666249pin_blue_nicu_buculei_01.svg create mode 100644 static/images/12161797831849255690jcartier_board.svg create mode 100644 static/images/12161797831849255690jcartier_board.svg.thumb.png create mode 100644 static/images/meetecho-logo.png create mode 100644 static/images/meetecho-mini.png create mode 100644 static/images/meetecho-mini.xcf create mode 100644 static/images/projector2.png create mode 100644 static/images/projector2.svg create mode 100644 static/js/jquery-ui-timepicker/jquery-ui-sliderAccess.js create mode 100644 static/js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js create mode 100644 static/js/lib/qunit-1.12.0.js create mode 100644 static/js/moment.min.js create mode 100644 static/js/test/agenda_funcs.js create mode 100644 static/js/test/agenda_tests.js create mode 100644 static/test/agenda_tests.html create mode 100644 static/test/agenda_ui.html diff --git a/ietf/group/models.py b/ietf/group/models.py index 79e136512..2f5386c16 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -63,6 +63,9 @@ class Group(GroupInfo): role_names = [role_names] return user.is_authenticated() and self.role_set.filter(name__in=role_names, person__user=user).exists() + def is_bof(self): + return (self.state.slug in ["bof", "bof-conc"]) + def get_chair(self): chair = self.role_set.filter(name__slug='chair')[:1] return chair and chair[0] or None diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index 0922b5c3f..de84aa811 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -560,7 +560,7 @@ def scheduledsession_delete(request, meeting, schedule, scheduledsession_id): count=0 for ss in scheduledsessions: ss.delete() - count =+ 1 + count += 1 return HttpResponse(json.dumps({'result':"%u objects deleted"%(count)}), status = 200, diff --git a/ietf/meeting/management/__init__.py b/ietf/meeting/management/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ietf/meeting/management/commands/__init__.py b/ietf/meeting/management/commands/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ietf/meeting/management/commands/autoplace.py b/ietf/meeting/management/commands/autoplace.py new file mode 100644 index 000000000..8a96616b4 --- /dev/null +++ b/ietf/meeting/management/commands/autoplace.py @@ -0,0 +1,124 @@ +""" +Runs the automatic placement code (simulated annealing of glass) +for a given meeting number, using a schedule given by the schedule database ID. + +for help on this file: +https://docs.djangoproject.com/en/dev/howto/custom-management-commands/ + +""" + +from django.core.management.base import BaseCommand, CommandError +from optparse import make_option +#import cProfile, pstats, io +import os +import sys +import gzip +import time +import csv +import codecs +from ietf.meeting.models import Schedule, Meeting + +class Command(BaseCommand): + args = ' ' + help = 'perform automatic placement' + stderr = sys.stderr + stdout = sys.stdout + + verbose = False + profile = False + permit_movement = False + maxstep = 20000 + seed = None + recordsteps = False + + option_list = BaseCommand.option_list + ( + make_option('--profile', + action='store_true', + dest='profile', + default=False, + help='Enable verbose mode'), + make_option('--recordsteps', + action='store_true', + dest='recordsteps', + default=False, + help='Enable recording progress to table'), + make_option('--verbose', + action='count', + dest='verbose', + default=False, + help='Enable verbose mode'), + make_option('--maxstep', + action="store", type="int", + dest='maxstep', + default=20000, + help='Maximum number of steps'), + make_option('--seed', + action="store", type="int", + dest='seed', + default=None, + help='Seed to use for calculation'), + ) + + def handle(self, *labels, **options): + self.verbose = options.get('verbose', 1) + + meetingname = labels[0] + schedname = labels[1] + targetname = None + if labels[2] is not None: + targetname = labels[2] + + seed = options.get('seed', None) + maxstep = options.get('maxstep', 20000) + verbose = options.get('verbose', False) + profile = options.get('profile', False) + recordsteps = options.get('recordsteps', False) + + from ietf.meeting.helpers import get_meeting,get_schedule + try: + meeting = get_meeting(meetingname) + except Meeting.DoesNotExist: + print "No such meeting: %s" % (meetingname) + return + + try: + schedule = meeting.schedule_set.get(name = schedname) + except Schedule.DoesNotExist: + print "No such schedule: %s in meeting: %s" % (schedname, meeting) + return + + if targetname is not None: + try: + targetsched = meeting.schedule_set.get(name=targetname) + except Schedule.DoesNotExist: + print "Creating new schedule %s" % (targetname) + targetsched = Schedule(meeting = meeting, + owner = schedule.owner, + name = targetname) + targetsched.save() + else: + targetsched = schedule + + print "Saving results to %s" % (targetsched.name) + + from ietf.meeting.placement import CurrentScheduleState + css = CurrentScheduleState(schedule, seed) + css.recordsteps = recordsteps + css.verbose = verbose + + if profile: + import cProfile + import re + cProfile.runctx('css.do_placement(maxstep, targetsched)', + vars(), + vars(), + 'placestats.pyprof') + + import pstats + p = pstats.Stats('placestats.pyprof') + p.strip_dirs().sort_stats(-1).print_stats() + else: + css.do_placement(maxstep, targetsched) + + + diff --git a/ietf/meeting/migrations/0014_add_room.py b/ietf/meeting/migrations/0014_add_room.py new file mode 100644 index 000000000..eaa54b0b8 --- /dev/null +++ b/ietf/meeting/migrations/0014_add_room.py @@ -0,0 +1,350 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'ResourceAssociation' + db.create_table('meeting_resourceassociation', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.RoomResourceName'])), + ('icon', self.gf('django.db.models.fields.CharField')(max_length=64)), + ('desc', self.gf('django.db.models.fields.CharField')(max_length=256)), + )) + db.send_create_signal('meeting', ['ResourceAssociation']) + + # Adding M2M table for field resources on 'Room' + m2m_table_name = db.shorten_name('meeting_room_resources') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('room', models.ForeignKey(orm['meeting.room'], null=False)), + ('resourceassociation', models.ForeignKey(orm['meeting.resourceassociation'], null=False)) + )) + db.create_unique(m2m_table_name, ['room_id', 'resourceassociation_id']) + + def backwards(self, orm): + # Deleting model 'ResourceAssociation' + db.delete_table('meeting_resourceassociation') + + # Removing M2M table for field resources on 'Room' + db.delete_table(db.shorten_name('meeting_room_resources')) + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + 'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': "orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + 'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': "orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': "orm['group.Group']"}) + }, + 'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.RoomResourceName']"}) + }, + 'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + 'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.ScheduledSession']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.TimeSlot']"}) + }, + 'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.SessionStatusName']"}) + }, + 'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': "orm['meeting.Session']", 'through': "orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.TimeSlotTypeName']"}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] diff --git a/ietf/meeting/migrations/0015_add_basic_resources.py b/ietf/meeting/migrations/0015_add_basic_resources.py new file mode 100644 index 000000000..a1c87e780 --- /dev/null +++ b/ietf/meeting/migrations/0015_add_basic_resources.py @@ -0,0 +1,339 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + orm.ResourceAssociation(name_id = "project", + icon = "12161797831849255690jcartier_board.svg", + desc = "Projector in room").save() + orm.ResourceAssociation(name_id = "proj2", + icon = "projector2.svg", + desc = "Second projector in room").save() + orm.ResourceAssociation(name_id = "meetecho", + icon = "meetecho-mini.png", + desc = "Meetecho support in room").save() + + + def backwards(self, orm): + "Write your backwards methods here." + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + 'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': "orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + 'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': "orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': "orm['group.Group']"}) + }, + 'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.RoomResourceName']"}) + }, + 'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + 'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.ScheduledSession']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.TimeSlot']"}) + }, + 'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.SessionStatusName']"}) + }, + 'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': "orm['meeting.Session']", 'through': "orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.TimeSlotTypeName']"}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] + symmetrical = True diff --git a/ietf/meeting/migrations/0016_add_resource_to_session.py b/ietf/meeting/migrations/0016_add_resource_to_session.py new file mode 100644 index 000000000..c3a4a5eb3 --- /dev/null +++ b/ietf/meeting/migrations/0016_add_resource_to_session.py @@ -0,0 +1,341 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding M2M table for field resources on 'Session' + m2m_table_name = db.shorten_name('meeting_session_resources') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('session', models.ForeignKey(orm['meeting.session'], null=False)), + ('resourceassociation', models.ForeignKey(orm['meeting.resourceassociation'], null=False)) + )) + db.create_unique(m2m_table_name, ['session_id', 'resourceassociation_id']) + + + def backwards(self, orm): + # Removing M2M table for field resources on 'Session' + db.delete_table(db.shorten_name('meeting_session_resources')) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + 'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': "orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + 'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': "orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': "orm['group.Group']"}) + }, + 'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.RoomResourceName']"}) + }, + 'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + 'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.ScheduledSession']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.TimeSlot']"}) + }, + 'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.SessionStatusName']"}) + }, + 'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': "orm['meeting.Session']", 'through': "orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.TimeSlotTypeName']"}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] \ No newline at end of file diff --git a/ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py b/ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py new file mode 100644 index 000000000..d6427cec7 --- /dev/null +++ b/ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py @@ -0,0 +1,335 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + "Write your forwards methods here." + # Note: Don't use "from appname.models import ModelName". + # Use orm.ModelName to refer to models in this application, + # and orm['appname.ModelName'] for models in other applications. + orm.ScheduledSession.objects.exclude(session__isnull=False).delete() + + def backwards(self, orm): + "Write your backwards methods here." + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': u"orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['person.Email']", 'symmetrical': 'False', 'through': u"orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': u"orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + u'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.Document']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + u'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': u"orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + u'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': u"orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': u"orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': u"orm['group.Group']"}) + }, + u'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': u"orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + u'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.RoomResourceName']"}) + }, + u'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + u'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['meeting.ScheduledSession']", 'null': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': u"orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.TimeSlot']"}) + }, + u'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.SessionStatusName']"}) + }, + u'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': u"orm['meeting.Session']", 'through': u"orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.TimeSlotTypeName']"}) + }, + u'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + u'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] + symmetrical = True diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 363d3ae32..8c0364cca 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -4,6 +4,7 @@ import pytz, datetime from urlparse import urljoin import copy import os +import sys import re import debug @@ -18,7 +19,7 @@ from django.template.defaultfilters import slugify, date as date_format, time as from ietf.group.models import Group from ietf.person.models import Person from ietf.doc.models import Document -from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName +from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName countries = pytz.country_names.items() countries.sort(lambda x,y: cmp(x[1], y[1])) @@ -111,6 +112,15 @@ class Meeting(models.Model): def sessions_that_can_meet(self): return self.session_set.exclude(status__slug='notmeet').exclude(status__slug='disappr').exclude(status__slug='deleted').exclude(status__slug='apprw') + def sessions_that_can_be_placed(self): + from django.db.models import Q + donotplace_groups = Q(group__acronym="edu") + donotplace_groups |= Q(group__acronym="tools") + donotplace_groups |= Q(group__acronym="iesg") + donotplace_groups |= Q(group__acronym="ietf") + donotplace_groups |= Q(group__acronym="iepg") + donotplace_groups |= Q(group__acronym="iab") + return self.sessions_that_can_meet.exclude(donotplace_groups) def json_url(self): return "/meeting/%s.json" % (self.number, ) @@ -157,8 +167,8 @@ class Meeting(models.Model): if ymd in time_slices: # only keep unique entries - if [ts.time, ts.time + ts.duration] not in time_slices[ymd]: - time_slices[ymd].append([ts.time, ts.time + ts.duration]) + if [ts.time, ts.time + ts.duration, ts.duration.seconds] not in time_slices[ymd]: + time_slices[ymd].append([ts.time, ts.time + ts.duration, ts.duration.seconds]) slots[ymd].append(ts) days.sort() @@ -195,13 +205,38 @@ class Meeting(models.Model): pass return '' + def set_official_agenda(self, agenda): + if self.agenda != agenda: + self.agenda = agenda + if self.agenda is not None: + self.agenda.sendEmail() + self.save() + class Meta: ordering = ["-date", ] +class ResourceAssociation(models.Model): + name = models.ForeignKey(RoomResourceName) + #url = models.UrlField() # not sure what this was for. + icon = models.CharField(max_length=64) # icon to be found in /static/img + desc = models.CharField(max_length=256) + + def __unicode__(self): + return self.desc + + def json_dict(self, host_scheme): + res1 = dict() + res1['name'] = self.name.slug + res1['icon'] = "/images/%s" % (self.icon) + res1['desc'] = self.desc + res1['resource_id'] = self.pk + return res1 + class Room(models.Model): meeting = models.ForeignKey(Meeting) name = models.CharField(max_length=255) capacity = models.IntegerField(null=True, blank=True) + resources = models.ManyToManyField(ResourceAssociation) def __unicode__(self): return "%s size: %u" % (self.name, self.capacity) @@ -223,6 +258,9 @@ class Room(models.Model): duration=ts.duration) self.meeting.create_all_timeslots() + def domid(self): + return "room%u" % (self.pk) + def json_url(self): return "/meeting/%s/room/%s.json" % (self.meeting.number, self.id) @@ -325,16 +363,25 @@ class TimeSlot(models.Model): # {{s.timeslot.time|date:'Y-m-d'}}_{{ s.timeslot.time|date:'Hi' }}" # also must match: # {{r|slugify}}_{{day}}_{{slot.0|date:'Hi'}} - return "%s_%s_%s" % (slugify(self.get_location()), self.time.strftime('%Y-%m-%d'), self.time.strftime('%H%M')) + domid="ts%u" % (self.pk) + if self.location is not None: + domid = self.location.domid() + return "%s_%s_%s" % (domid, self.time.strftime('%Y-%m-%d'), self.time.strftime('%H%M')) - def json_dict(self, selfurl): + def json_dict(self, host_scheme): ts = dict() ts['timeslot_id'] = self.id - ts['room'] = slugify(self.location) + ts['href'] = urljoin(host_scheme, self.json_url()) + ts['room'] = self.get_location() ts['roomtype'] = self.type.slug + if self.location is not None: + ts['capacity'] = self.location.capacity ts["time"] = date_format(self.time, 'Hi') - ts["date"] = time_format(self.time, 'Y-m-d') + ts["date"] = fmt_date(self.time) ts["domid"] = self.js_identifier + following = self.slot_to_the_right + if following is not None: + ts["following_timeslot_id"] = following.id return ts def json_url(self): @@ -418,11 +465,18 @@ class Schedule(models.Model): # def url_edit(self): # return "/meeting/%s/agenda/%s/edit" % (self.meeting.number, self.name) -# +# # @property # def relurl_edit(self): # return self.url_edit("") + def owner_email(self): + emails = self.owner.email_set.all() + if len(emails)>0: + return emails[0].address + else: + return "noemail" + @property def visible_token(self): if self.visible: @@ -512,12 +566,11 @@ class Schedule(models.Model): scheduled += 1 return assignments,sessions,total,scheduled - cached_sessions_that_can_meet = None @property def sessions_that_can_meet(self): - if self.cached_sessions_that_can_meet is None: - self.cached_sessions_that_can_meet = self.meeting.sessions_that_can_meet.all() - return self.cached_sessions_that_can_meet + if not hasattr(self, "_cached_sessions_that_can_meet"): + self._cached_sessions_that_can_meet = self.meeting.sessions_that_can_meet.all() + return self._cached_sessions_that_can_meet def area_list(self): return ( self.assignments.filter(session__group__type__slug__in=['wg', 'rg', 'ag'], @@ -529,6 +582,41 @@ class Schedule(models.Model): def groups(self): return Group.objects.filter(type__slug__in=['wg', 'rg', 'ag'], session__scheduledsession__schedule=self).distinct().order_by('parent__acronym', 'acronym') + @property + def qs_scheduledsessions_with_assignments(self): + return self.scheduledsession_set.filter(session__isnull=False) + + # calculate badness of entire schedule + def calc_badness(self): + # now calculate badness + assignments = self.group_mapping + return self.calc_badness1(assignments) + + # calculate badness of entire schedule + def calc_badness1(self, assignments): + badness = 0 + for sess in self.sessions_that_can_meet: + badness += sess.badness(assignments) + self.badness = badness + return badness + + def delete_schedule(self): + self.scheduledsession_set.all().delete() + self.delete() + + # send email to every session requester whose session is now scheduled. + # mark the sessions as now state scheduled, rather than waiting. + def sendEmail(self): + for ss in self.scheduledsession_set.all(): + session = ss.session + if session.status.slug == "schedw": + session.status_id = "sched" + session.scheduled = datetime.datetime.now() + import ietf.secr.meetings.views + ietf.secr.meetings.views.send_notification(None, [session]) + session.save() + +# to be renamed ScheduleTimeslotSessionAssignments (stsa) class ScheduledSession(models.Model): """ This model provides an N:M relationship between Session and TimeSlot. @@ -601,27 +689,31 @@ class ScheduledSession(models.Model): else: return "" - @property - def empty_str(self): - # return JS happy value - if self.session: - return "False" - else: - return "True" + def json_url(self): + return "/meeting/%s/schedule/%s/session/%u.json" % (self.schedule.meeting.number, + self.schedule.name, self.id) - def json_dict(self, selfurl): + def json_dict(self, host_scheme): ss = dict() ss['scheduledsession_id'] = self.id - #ss['href'] = self.url(host_scheme) - ss['empty'] = self.empty_str + ss['href'] = urljoin(host_scheme, self.json_url()) ss['timeslot_id'] = self.timeslot.id + + efset = self.session.scheduledsession_set.filter(schedule=self.schedule).order_by("timeslot__time") + if efset.count() > 1: + # now we know that there is some work to do finding the extendedfrom_id. + # loop through the list of items + previous = None + for efss in efset: + if efss.pk == self.pk: + extendedfrom = previous + break + previous = efss + if extendedfrom is not None: + ss['extendedfrom_id'] = extendedfrom.id + if self.session: ss['session_id'] = self.session.id - ss['room'] = slugify(self.timeslot.location) - ss['roomtype'] = self.timeslot.type.slug - ss["time"] = date_format(self.timeslot.time, 'Hi') - ss["date"] = time_format(self.timeslot.time, 'Y-m-d') - ss["domid"] = self.timeslot.js_identifier ss["pinned"] = self.pinned return ss @@ -670,9 +762,8 @@ class Constraint(models.Model): return True return False - @property def constraint_cost(self): - return self.name.cost(); + return self.name.penalty; def json_url(self): return "/meeting/%s/constraint/%s.json" % (self.meeting.number, self.id) @@ -715,6 +806,7 @@ class Session(models.Model): modified = models.DateTimeField(default=datetime.datetime.now) materials = models.ManyToManyField(Document, blank=True) + resources = models.ManyToManyField(ResourceAssociation) unique_constraints_dict = None @@ -747,6 +839,9 @@ class Session(models.Model): ss0name = ss[0].timeslot.time.strftime("%H%M") return u"%s: %s %s[%u]" % (self.meeting, self.group.acronym, ss0name, self.pk) + def is_bof(self): + return self.group.is_bof(); + @property def short_name(self): if self.name: @@ -817,18 +912,20 @@ class Session(models.Model): sess1['href'] = urljoin(host_scheme, self.json_url()) if self.group is not None: sess1['group'] = self.group.json_dict(host_scheme) - # nuke rest of these as soon as JS cleaned up. sess1['group_href'] = urljoin(host_scheme, self.group.json_url()) - sess1['group_acronym'] = str(self.group.acronym) if self.group.parent is not None: sess1['area'] = str(self.group.parent.acronym).upper() - sess1['GroupInfo_state']= str(self.group.state) sess1['description'] = str(self.group.name) sess1['group_id'] = str(self.group.pk) + reslist = [] + for r in self.resources.all(): + reslist.append(r.json_dict(host_scheme)) + sess1['resources'] = reslist sess1['session_id'] = str(self.pk) sess1['name'] = str(self.name) sess1['title'] = str(self.short_name) sess1['short_name'] = str(self.short_name) + sess1['bof'] = str(self.is_bof()) sess1['agenda_note'] = str(self.agenda_note) sess1['attendees'] = str(self.attendees) sess1['status'] = str(self.status) @@ -843,17 +940,57 @@ class Session(models.Model): pass sess1['requested_duration']= "%.1f" % (float(self.requested_duration.seconds) / 3600) - sess1['duration'] = sess1['requested_duration'] sess1['special_request'] = str(self.special_request_token) return sess1 + def agenda_text(self): + doc = self.agenda() + if doc: + path = os.path.join(settings.AGENDA_PATH, self.meeting.number, "agenda", doc.external_url) + if os.path.exists(path): + with open(path) as f: + return f.read() + else: + return "No agenda file found" + else: + return "The agenda has not been uploaded yet." + + def type(self): + if self.group.type.slug in [ "wg" ]: + return "BOF" if self.group.state.slug in ["bof", "bof-conc"] else "WG" + else: + return "" + + def ical_status(self): + if self.status.slug == 'canceled': # sic + return "CANCELLED" + elif (datetime.date.today() - self.meeting.date) > datetime.timedelta(days=5): + # this is a bit simpleminded, better would be to look at the + # time(s) of the timeslot(s) of the official meeting schedule. + return "CONFIRMED" + else: + return "TENTATIVE" + + def agenda_file(self): + if not hasattr(self, '_agenda_file'): + self._agenda_file = "" + + docs = self.materials.filter(type="agenda", states__type="agenda", states__slug="active") + if not docs: + return "" + + # we use external_url at the moment, should probably regularize + # the filenames to match the document name instead + filename = docs[0].external_url + self._agenda_file = "%s/agenda/%s" % (self.meeting.number, filename) + + return self._agenda_file def badness_test(self, num): from settings import BADNESS_CALC_LOG #sys.stdout.write("num: %u / BAD: %u\n" % (num, BADNESS_CALC_LOG)) return BADNESS_CALC_LOG >= num def badness_log(self, num, msg): - import sys if self.badness_test(num): sys.stdout.write(msg) @@ -878,7 +1015,7 @@ class Session(models.Model): conflicts = self.unique_constraints() if self.badness_test(2): - self.badness_log(2, "badgroup: %s badness calculation has %u constraints\n" % (self.group.acronym, len(conflicts))) + self.badness_log(2, "badness for group: %s has %u constraints\n" % (self.group.acronym, len(conflicts))) from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG count = 0 myss_list = assignments[self.group] @@ -946,9 +1083,9 @@ class Session(models.Model): if self.badness_test(3): self.badness_log(3, " [%u] 4group: %s my_sessions: %s vs %s\n" % (count, group.acronym, myss.timeslot.time, ss.timeslot.time)) if ss.timeslot.time == myss.timeslot.time: - newcost = constraint.constraint_cost + newcost = constraint.constraint_cost() if self.badness_test(2): - self.badness_log(2, " [%u] 5group: %s conflicts: %s on %s cost %u\n" % (count, self.group.acronym, ss.session.group.acronym, ss.timeslot.time, newcost)) + self.badness_log(2, " [%u] 5group: %s conflict(%s): %s on %s cost %u\n" % (count, self.group.acronym, constraint.name_id, ss.session.group.acronym, ss.timeslot.time, newcost)) # yes accumulate badness. conflictbadness += newcost ss.badness = conflictbadness @@ -1035,51 +1172,8 @@ class Session(models.Model): if ss.timeslot is not None and ss.timeslot.location == timeslot.location: continue # ignore conflicts when two sessions in the same room constraint = conflict[1] - badness += constraint.constraint_cost + badness += constraint.constraint_cost() if self.badness_test(1): self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness)) return badness - - def agenda_text(self): - doc = self.agenda() - if doc: - path = os.path.join(settings.AGENDA_PATH, self.meeting.number, "agenda", doc.external_url) - if os.path.exists(path): - with open(path) as f: - return f.read() - else: - return "No agenda file found" - else: - return "The agenda has not been uploaded yet." - - def type(self): - if self.group.type.slug in [ "wg" ]: - return "BOF" if self.group.state.slug in ["bof", "bof-conc"] else "WG" - else: - return "" - - def ical_status(self): - if self.status.slug == 'canceled': # sic - return "CANCELLED" - elif (datetime.date.today() - self.meeting.date) > datetime.timedelta(days=5): - # this is a bit simpleminded, better would be to look at the - # time(s) of the timeslot(s) of the official meeting schedule. - return "CONFIRMED" - else: - return "TENTATIVE" - - def agenda_file(self): - if not hasattr(self, '_agenda_file'): - self._agenda_file = "" - - docs = self.materials.filter(type="agenda", states__type="agenda", states__slug="active") - if not docs: - return "" - - # we use external_url at the moment, should probably regularize - # the filenames to match the document name instead - filename = docs[0].external_url - self._agenda_file = "%s/agenda/%s" % (self.meeting.number, filename) - - return self._agenda_file diff --git a/ietf/meeting/placement.py b/ietf/meeting/placement.py new file mode 100644 index 000000000..bcd8d47b3 --- /dev/null +++ b/ietf/meeting/placement.py @@ -0,0 +1,738 @@ +# FILE: ietf/meeting/placement.py +# +# Copyright (c) 2013, The IETF Trust. See ../../../LICENSE. +# +# This file contains a model that encapsulates the progress of the automatic placer. +# Each step of placement is stored as a row in a table, not because this is necessary, +# but because it helps to debug things. +# +# A production run of the placer would do the same work, but simply not save anything. +# + +import sys +import datetime + +from random import Random +from datetime import datetime + +from django.db import models +from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG +from ietf.meeting.models import Schedule, ScheduledSession,TimeSlot,Room + +def do_prompt(): + print "waiting:" + sys.stdin.readline() + +class PlacementException(Exception): + pass + +# ScheduleSlot really represents a single column of time. +# The TimeSlot object would work here, but it associates a room. +# There is a special Schedule slot (subclass) which corresponds to unscheduled items. +class ScheduleSlot(object): + def __init__(self, daytime): + self.daytime = daytime + self.badness = None + self.slotgroups = {} + + # this is a partial copy of ScheduledSession's methods. Prune later. + #def __unicode__(self): + # return u"%s [%s<->%s]" % (self.schedule, self.session, self.timeslot) + # + #def __str__(self): + # return self.__unicode__() + + def add_scheduledsession(self,fs): + self.slotgroups[fs] = fs + + def scheduled_session_pk(self, assignments): + things = [] + slot1 = assignments.slot1 + slot2 = assignments.slot2 + for fs in self.slotgroups.iterkeys(): + session = fs.session + if slot1 is not None and fs == slot1: + session = slot2.session + if slot2 is not None and fs == slot2: + session = slot1.session + if session is not None: + things.append((session.pk,fs)) + return things + + def recalc_badness1(self, assignments): + badness = 0 + for fs,fs2 in self.slotgroups.iteritems(): + if fs.session is not None: + num = fs.session.badness2(self) + #print "rc,,,,%s,%s,%u,recalc1" % (self.daytime, fs.session.short_name, num) + badness += num + self.badness = badness + + def recalc_badness(self, assignments): + badness = 0 + session_pk_list = self.scheduled_session_pk(assignments) + #print "rc,,,%u,slot_recalc" % (len(session_pk_list)) + for pk,fs in session_pk_list: + #print "rc,,,,%u,%s,list" % (pk,fs.session) + if fs.session is not None: + num = fs.session.badness_fast(fs.timeslot, self, session_pk_list) + #print "rc,,,,%s,%s,%u,recalc0" % (self.daytime, fs.session.short_name, num) + badness += num + self.badness = badness + + def calc_badness(self, assignments): + if self.badness is None: + self.recalc_badness(assignments) + return self.badness + +# +# this subclass does everything a ScheduleSlot does, in particular it knows how to +# maintain and recalculate badness, but it also maintains a list of slots which +# are unplaced so as to accelerate finding things to place at the beginning of automatic placement. +# +# XXX perhaps this should be in the form an iterator? +# +class UnplacedScheduleSlot(ScheduleSlot): + def __init__(self): + super(UnplacedScheduleSlot, self).__init__(None) + self.unplaced_slot_numbers = [] + self.unplaced_slots_finishcount = 0 + + def shuffle(self, generator): + generator.shuffle(self.unplaced_slot_numbers) + self.unplaced_slots_finishcount = self.count / 10 + + def finished(self): + if len(self.unplaced_slot_numbers) <= self.unplaced_slots_finishcount: + return True + else: + return False + + @property + def count(self): + return len(self.unplaced_slot_numbers) + + def add_scheduledsession(self,fs): + super(UnplacedScheduleSlot, self).add_scheduledsession(fs) + #print "unplaced add: %s" % (fs.available_slot) + self.unplaced_slot_numbers.append(fs.available_slot) + + def get_unplaced_slot_number(self): + #print "unplaced slots: %s" % (self.unplaced_slot_numbers) + return self.unplaced_slot_numbers[0] + + def delete_first(self): + del self.unplaced_slot_numbers[0] + + +class FakeScheduledSession(object): + """ + This model provides a fake (not-backed by database) N:M relationship between + Session and TimeSlot, but in this case TimeSlot is always None, because the + Session is not scheduled. + """ + faked = "fake" + + def __init__(self, schedule): + self.extendedfrom = None + self.modified = None + self.notes = None + self.badness = None + self.available_slot = None + self.origss = None + self.timeslot = None + self.session = None + self.schedule = schedule + self.pinned = False + self.scheduleslot = None + + def fromScheduledSession(self, ss): # or from another FakeScheduledSession + self.session = ss.session + self.schedule = ss.schedule + self.timeslot = ss.timeslot + self.modified = ss.modified + self.pinned = ss.pinned + self.origss = ss + + def save(self): + pass + + # this is a partial copy of ScheduledSession's methods. Prune later. + def __unicode__(self): + return u"%s [%s<->%s]" % (self.schedule, self.session, self.timeslot) + + def __str__(self): + return self.__unicode__() + + @property + def room_name(self): + return "noroom" + + @property + def special_agenda_note(self): + return self.session.agenda_note if self.session else "" + + @property + def acronym(self): + if self.session and self.session.group: + return self.session.group.acronym + + @property + def slot_to_the_right(self): + return None + + @property + def acronym_name(self): + if not self.session: + return self.notes + if hasattr(self, "interim"): + return self.session.group.name + " (interim)" + elif self.session.name: + return self.session.name + else: + return self.session.group.name + + @property + def session_name(self): + return self.session.name + + @property + def area(self): + if not self.session or not self.session.group: + return "" + if self.session.group.type_id == "irtf": + return "irtf" + if self.timeslot.type_id == "plenary": + return "1plenary" + if not self.session.group.parent or not self.session.group.parent.type_id in ["area","irtf"]: + return "" + return self.session.group.parent.acronym + + @property + def break_info(self): + return None + + @property + def area_name(self): + if self.session and self.session.group and self.session.group.acronym == "edu": + return "Training" + elif not self.session or not self.session.group or not self.session.group.parent or not self.session.group.parent.type_id == "area": + return "" + return self.session.group.parent.name + + @property + def isWG(self): + if not self.session or not self.session.group: + return False + if self.session.group.type_id == "wg" and self.session.group.state_id != "bof": + return True + + @property + def group_type_str(self): + if not self.session or not self.session.group: + return "" + if self.session.group and self.session.group.type_id == "wg": + if self.session.group.state_id == "bof": + return "BOF" + else: + return "WG" + + return "" + + @property + def slottype(self): + return "" + + @property + def empty_str(self): + # return JS happy value + if self.session: + return "False" + else: + return "True" + + def json_dict(self, selfurl): + ss = dict() + ss['scheduledsession_id'] = self.id + #ss['href'] = self.url(sitefqdn) + ss['empty'] = self.empty_str + ss['timeslot_id'] = self.timeslot.id + if self.session: + ss['session_id'] = self.session.id + ss['room'] = slugify(self.timeslot.location) + ss['roomtype'] = self.timeslot.type.slug + ss["time"] = date_format(self.timeslot.time, 'Hi') + ss["date"] = time_format(self.timeslot.time, 'Y-m-d') + ss["domid"] = self.timeslot.js_identifier + return ss + +# this object maintains the current state of the placement tool. +# the assignments hash says where the sessions would go. +class CurrentScheduleState: + def __getitem__(self, key): + if key in self.tempdict: + return self.tempdict[key] + return self.current_assignments[key] + + def __iter__(self): + return self.current_assignments.__iter__() + def iterkeys(self): + return self.current_assignments.__iter__() + + def add_to_available_slot(self, fs): + size = len(self.available_slots) + if fs.session is not None: + fs.session.setup_conflicts() + + time_column = None + needs_to_be_added = True + #print "adding fs for slot: %s" % (fs.timeslot) + if fs.timeslot is not None: + if fs.timeslot in self.fs_by_timeslot: + ofs = self.fs_by_timeslot[fs.timeslot] + #print " duplicate timeslot[%s], updating old one: %s" % (ofs.available_slot, fs.timeslot) + if ofs.session is None: + # keep the one with the assignment. + self.fs_by_timeslot[fs.timeslot] = fs + # get rid of old item + fs.available_slot = ofs.available_slot + self.available_slots[ofs.available_slot] = fs + needs_to_be_added = False + else: + self.fs_by_timeslot[fs.timeslot] = fs + + # add the slot to the list of vertical slices. + time_column = self.timeslots[fs.timeslot.time] + group_name = "empty" + if fs.session is not None: + group_name = fs.session.group.acronym + #print " inserting fs %s / %s to slot: %s" % (fs.timeslot.location.name, + # group_name, + # time_column.daytime) + fs.scheduleslot = time_column + if fs.session is None: + self.placed_scheduleslots.append(fs) + else: + time_column = self.unplaced_scheduledslots + fs.scheduleslot = self.unplaced_scheduledslots + + if needs_to_be_added: + self.total_slots = size + self.available_slots.append(fs) + fs.available_slot = size + + if time_column is not None: + # needs available_slot to be filled in + time_column.add_scheduledsession(fs) + #print "adding item: %u to unplaced slots (pinned: %s)" % (fs.available_slot, fs.pinned) + + def __init__(self, schedule, seed=None): + # initialize available_slots with the places that a session can go based upon the + # scheduledsession objects of the provided schedule. + # for each session which is not initially scheduled, also create a scheduledsession + # that has a session, but no timeslot. + + self.recordsteps = True + self.debug_badness = False + self.lastSaveTime = datetime.now() + self.lastSaveStep = 0 + self.verbose = False + + # this maps a *group* to a list of (session,location) pairs, using FakeScheduledSession + self.current_assignments = {} + self.tempdict = {} # used when calculating badness. + + # this contains an entry for each location, and each un-location in the form of + # (session,location) with the appropriate part None. + self.fs_by_timeslot = {} + self.available_slots = [] + self.unplaced_scheduledslots = UnplacedScheduleSlot() + self.placed_scheduleslots = [] + self.sessions = {} + self.total_slots = 0 + + self.schedule = schedule + self.meeting = schedule.meeting + self.seed = seed + self.badness = schedule.badness + self.random_generator=Random() + self.random_generator.seed(seed) + self.temperature = 10000000 + self.stepnum = 1 + self.timeslots = {} + self.slot1 = None + self.slot2 = None + + # setup up array of timeslots objects + for timeslot in schedule.meeting.timeslot_set.filter(type = "session").all(): + if not timeslot.time in self.timeslots: + self.timeslots[timeslot.time] = ScheduleSlot(timeslot.time) + fs = FakeScheduledSession(self.schedule) + fs.timeslot = timeslot + self.add_to_available_slot(fs) + self.timeslots[None] = self.unplaced_scheduledslots + + # make list of things that need placement. + for sess in self.meeting.sessions_that_can_be_placed().all(): + fs = FakeScheduledSession(self.schedule) + fs.session = sess + self.sessions[sess] = fs + self.current_assignments[sess.group] = [] + + #print "Then had %u" % (self.total_slots) + # now find slots that are not empty. + # loop here and the one for useableslots could be merged into one loop + allschedsessions = self.schedule.qs_scheduledsessions_with_assignments.filter(timeslot__type = "session").all() + for ss in allschedsessions: + # do not need to check for ss.session is not none, because filter above only returns those ones. + sess = ss.session + if not (sess in self.sessions): + #print "Had to create sess for %s" % (sess) + self.sessions[sess] = FakeScheduledSession(self.schedule) + fs = self.sessions[sess] + #print "Updating %s from %s(%s)" % (fs.session.group.acronym, ss.timeslot.location.name, ss.timeslot.time) + fs.fromScheduledSession(ss) + + # if pinned, then do not consider it when selecting, but it needs to be in + # current_assignments so that conflicts are calculated. + if not ss.pinned: + self.add_to_available_slot(fs) + else: + del self.sessions[sess] + self.current_assignments[ss.session.group].append(fs) + + # XXX can not deal with a session in two slots yet?! + + # need to remove any sessions that might have gotten through above, but are in non-session + # places, otherwise these could otherwise appear to be unplaced. + allspecialsessions = self.schedule.qs_scheduledsessions_with_assignments.exclude(timeslot__type = "session").all() + for ss in allspecialsessions: + sess = ss.session + if sess is None: + continue + if (sess in self.sessions): + del self.sessions[sess] + + # now need to add entries for those sessions which are currently unscheduled (and yet not pinned) + for sess,fs in self.sessions.iteritems(): + if fs.timeslot is None: + #print "Considering sess: %s, and loc: %s" % (sess, str(fs.timeslot)) + self.add_to_available_slot(fs) + + #import pdb; pdb.set_trace() + # do initial badness calculation for placement that has been done + for daytime,scheduleslot in self.timeslots.iteritems(): + scheduleslot.recalc_badness(self) + + def dump_available_slot_state(self): + for fs in self.available_slots: + shortname="unplaced" + sessid = 0 + if fs.session is not None: + shortname=fs.session.short_name + sessid = fs.session.id + pinned = "unplaced" + ssid=0 + if fs.origss is not None: + pinned = fs.origss.pinned + ssid = fs.origss.id + print "%s: %s[%u] pinned: %s ssid=%u" % (fs.available_slot, shortname, sessid, pinned, ssid) + + def pick_initial_slot(self): + if self.unplaced_scheduledslots.finished(): + self.initial_stage = False + if self.initial_stage: + item = self.unplaced_scheduledslots.get_unplaced_slot_number() + slot1 = self.available_slots[item] + #print "item: %u points to %s" % (item, slot1) + else: + slot1 = self.random_generator.choice(self.available_slots) + return slot1 + + def pick_second_slot(self): + if self.initial_stage and len(self.placed_scheduleslots)>0: + self.random_generator.shuffle(self.placed_scheduleslots) + slot2 = self.placed_scheduleslots[0] + del self.placed_scheduleslots[0] + else: + slot2 = self.random_generator.choice(self.available_slots) + return slot2 + + def pick_two_slots(self): + slot1 = self.pick_initial_slot() + slot2 = self.pick_second_slot() + tries = 100 + self.repicking = 0 + # 1) no point in picking two slots which are the same. + # 2) no point in picking two slots which have no session (already empty) + # 3) no point in picking two slots which are both unscheduled sessions + # 4) limit outselves to ten tries. + while (slot1 == slot2 or slot1 is None or slot2 is None or + (slot1.session is None and slot2.session is None) or + (slot1.timeslot is None and slot2.timeslot is None) + ) and tries > 0: + self.repicking += 1 + #print "%u: .. repicking slots, had: %s and %s" % (self.stepnum, slot1, slot2) + slot1 = self.pick_initial_slot() + slot2 = self.pick_second_slot() + tries -= 1 + if tries == 0: + raise PlacementException("How can it pick the same slot ten times in a row") + + if slot1.pinned: + raise PlacementException("Should never attempt to move pinned slot1") + + if slot2.pinned: + raise PlacementException("Should never attempt to move pinned slot2") + + return slot1, slot2 + + # this assigns a session to a particular slot. + def assign_session(self, session, fslot, doubleup=False): + import copy + if session is None: + # we need to unschedule the session + session = fslot.session + self.tempdict[session.group] = [] + return + + if not session in self.sessions: + raise PlacementException("Is there a legit case where session is not in sessions here?") + + oldfs = self.sessions[session] + # find the group mapping. + pairs = copy.copy(self.current_assignments[session.group]) + #print "pairs is: %s" % (pairs) + if oldfs in pairs: + which = pairs.index(oldfs) + del pairs[which] + #print "new pairs is: %s" % (pairs) + + self.sessions[session] = fslot + # now fix up the other things. + pairs.append(fslot) + self.tempdict[session.group] = pairs + + def commit_tempdict(self): + for key,value in self.tempdict.iteritems(): + self.current_assignments[key] = value + self.tempdict = dict() + + # calculate badness of the columns which have changed + def calc_badness(self, slot1, slot2): + badness = 0 + for daytime,scheduleslot in self.timeslots.iteritems(): + oldbadness = scheduleslot.badness + if oldbadness is None: + oldbadness = 0 + recalc="" + if slot1 is not None and slot1.scheduleslot == scheduleslot: + recalc="recalc slot1" + scheduleslot.recalc_badness(self) + if slot2 is not None and slot2.scheduleslot == scheduleslot: + recalc="recalc slot2" + scheduleslot.recalc_badness(self) + + newbadness = scheduleslot.calc_badness(self) + if self.debug_badness: + print " calc: %s %u %u %s" % (scheduleslot.daytime, oldbadness, newbadness, recalc) + badness += newbadness + return badness + + def try_swap(self): + badness = self.badness + slot1,slot2 = self.pick_two_slots() + if self.debug_badness: + print "start\n slot1: %s.\n slot2: %s.\n badness: %s" % (slot1, slot2,badness) + self.slot1 = slot1 + self.slot2 = slot2 + #import pdb; pdb.set_trace() + #self.assign_session(slot2.session, slot1, False) + #self.assign_session(slot1.session, slot2, False) + # self can substitute for current_assignments thanks to getitem() above. + newbadness = self.calc_badness(slot1, slot2) + if self.debug_badness: + print "end\n slot1: %s.\n slot2: %s.\n badness: %s" % (slot1, slot2, newbadness) + return newbadness + + def log_step(self, accepted_str, change, dice, prob): + acronym1 = "empty" + if self.slot1.session is not None: + acronym1 = self.slot1.session.group.acronym + place1 = "nowhere" + if self.slot1.timeslot is not None: + place1 = str(self.slot1.timeslot.location.name) + + acronym2= "empty" + if self.slot2.session is not None: + acronym2 = self.slot2.session.group.acronym + place2 = "nowhere" + if self.slot2.timeslot is not None: + place2 = str(self.slot2.timeslot.location.name) + initial = " " + if self.initial_stage: + initial = "init" + + # note in logging: the swap has already occured, but the values were set before + if self.verbose: + print "% 5u:%s %s temp=%9u delta=%+9d badness=%10d dice=%.4f <=> prob=%.4f (repicking=%u) %9s:[%8s->%8s], %9s:[%8s->%8s]" % (self.stepnum, initial, + accepted_str, self.temperature, + change, self.badness, dice, prob, + self.repicking, acronym1, place2, place1, acronym2, place1, place2) + + def do_step(self): + self.stepnum += 1 + newbadness = self.try_swap() + if self.badness is None: + self.commit_tempdict + self.badness = newbadness + return True, 0 + + change = newbadness - self.badness + prob = self.calc_probability(change) + dice = self.random_generator.random() + + #self.log_step("consider", change, dice, prob) + + if dice < prob: + accepted_str = "accepted" + accepted = True + # swap things as planned + self.commit_tempdict + + # actually do the swap in the FS + tmp = self.slot1.session + self.slot1.session = self.slot2.session + self.slot2.session = tmp + self.badness = newbadness + # save state object + else: + accepted_str = "rejected" + accepted = False + self.tempdict = dict() + + self.log_step(accepted_str, change, dice, prob) + + if accepted and not self.initial_stage: + self.temperature = self.temperature * 0.9995 + + return accepted, change + + def calc_probability(self, change): + import math + return 1/(1 + math.exp(float(change)/self.temperature)) + + def delete_available_slot(self, number): + # because the numbers matter, we just None things out, and let repicking + # work on things. + #last = len(self.available_slots)-1 + #if number < last: + # self.available_slots[number] = self.available_slots[last] + # self.available_slots[last].available_slot = number + # + #del self.available_slots[last] + self.available_slots[number] = None + + def do_steps(self, limit=None, monitorSchedule=None): + print "do_steps(%s,%s)" % (limit, monitorSchedule) + if self.badness is None or self.badness == 0: + self.badness = self.schedule.calc_badness1(self) + self.oldbadness = self.badness + while (limit is None or self.stepnum < limit) and self.temperature > 1000: + accepted,change = self.do_step() + #set_prompt_wait(True) + if not accepted and self.initial_stage: + # randomize again! + self.unplaced_scheduledslots.shuffle(self.random_generator) + + if accepted and self.initial_stage and self.unplaced_scheduledslots.count>0: + # delete it from available slots, so as not to leave unplaced slots + self.delete_available_slot(self.slot1.available_slot) + # remove initial slot from list. + self.unplaced_scheduledslots.delete_first() + + if False and accepted and self.recordsteps: + ass1 = AutomaticScheduleStep() + ass1.schedule = self.schedule + if self.slot1.session is not None: + ass1.session = self.slot1.session + if self.slot1.origss is not None: + ass1.moved_to = self.slot1.origss + ass1.stepnum = self.stepnum + ass1.save() + ass2 = AutomaticScheduleStep() + ass2.schedule = self.schedule + if self.slot2.session is not None: + ass2.session = self.slot2.session + if self.slot2.origss is not None: + ass2.moved_to = self.slot2.origss + ass2.stepnum = self.stepnum + ass2.save() + #print "%u: accepted: %s change %d temp: %d" % (self.stepnum, accepted, change, self.temperature) + if (self.stepnum % 1000) == 0 and monitorSchedule is not None: + self.saveToSchedule(monitorSchedule) + print "Finished after %u steps, badness = %u->%u" % (self.stepnum, self.oldbadness, self.badness) + + def saveToSchedule(self, targetSchedule): + when = datetime.now() + since = 0 + rate = 0 + if targetSchedule is None: + targetSchedule = self.schedule + else: + # XXX more stuff to do here, setup mapping, copy pinned items + pass + + if self.lastSaveTime is not None: + since = when - self.lastSaveTime + if since.microseconds > 0: + rate = 1000 * float(self.stepnum - self.lastSaveStep) / (1000*since.seconds + since.microseconds / 1000) + print "%u: saved to schedule: %s %s elapsed=%s rate=%.2f" % (self.stepnum, targetSchedule.name, when, since, rate) + self.lastSaveTime = datetime.now() + self.lastSaveStep = self.stepnum + + # first, remove all assignments in the schedule. + for ss in targetSchedule.scheduledsession_set.all(): + if ss.pinned: + continue + ss.delete() + + # then, add new items for new placements. + for fs in self.available_slots: + if fs is None: + continue + ss = ScheduledSession(timeslot = fs.timeslot, + schedule = targetSchedule, + session = fs.session) + ss.save() + + def do_placement(self, limit=None, targetSchedule=None): + self.badness = self.schedule.calc_badness1(self) + if limit is None: + limitstr = "unlimited " + else: + limitstr = "%u" % (limit) + print "Initial stage (limit=%s) starting with: %u items to place" % (limitstr, self.unplaced_scheduledslots.count) + + # permute the unplaced sessions + self.unplaced_scheduledslots.shuffle(self.random_generator) + + self.initial_stage = True + monitorSchedule = targetSchedule + if monitorSchedule is None: + monitorSchedule = self.schedule + self.do_steps(limit, monitorSchedule) + self.saveToSchedule(targetSchedule) + +# +# this does not clearly have value at this point. +# Not worth a migration/table yet. +# +if False: + class AutomaticScheduleStep(models.Model): + schedule = models.ForeignKey('Schedule', null=False, blank=False, help_text=u"Who made this agenda") + session = models.ForeignKey('Session', null=True, default=None, help_text=u"Scheduled session involved") + moved_from = models.ForeignKey('ScheduledSession', related_name="+", null=True, default=None, help_text=u"Where session was") + moved_to = models.ForeignKey('ScheduledSession', related_name="+", null=True, default=None, help_text=u"Where session went") + stepnum = models.IntegerField(default=0, blank=True, null=True) + diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 01699928f..f1e3cb566 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -213,7 +213,7 @@ class ApiTests(TestCase): meeting = make_meeting_test_data() url = urlreverse("ietf.meeting.ajax.agenda_infourl", - kwargs=dict(num=meeting.number, schedule_name=meeting.agenda.name)) + kwargs=dict(num=meeting.number, name=meeting.agenda.name)) r = self.client.get(url) info = json.loads(r.content) @@ -247,7 +247,7 @@ class ApiTests(TestCase): url = urlreverse("ietf.meeting.ajax.agenda_infourl", kwargs=dict(num=meeting.number, - schedule_name=meeting.agenda.name)) + name=meeting.agenda.name)) post_data = { 'visible': 'false', @@ -272,7 +272,7 @@ class ApiTests(TestCase): url = urlreverse("ietf.meeting.ajax.agenda_infourl", kwargs=dict(num=meeting.number, - schedule_name=meeting.agenda.name)) + name=meeting.agenda.name)) # unauthorized delete self.client.login(remote_user="plain") r = self.client.delete(url) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 6b78c4ae2..5573e482e 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -174,7 +174,7 @@ class EditTests(TestCase): self.assertEqual(r.status_code, 302) # get - url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number, schedule_name="foo")) + url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number, name="foo")) r = self.client.get(url) self.assertEqual(r.status_code, 200) diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index c3743bdd5..6152ab8b8 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -20,11 +20,13 @@ urlpatterns = patterns('', (r'^agenda/week-view.html$', views.week_view), (r'^week-view.html$', views.week_view), (r'^(?P\d+)/schedule/edit$', views.edit_agenda), - (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/edit$', views.edit_agenda), - (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/details$', views.edit_agenda_properties), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/edit$', views.edit_agenda), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/details$', views.edit_agenda_properties), (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)(?P.html)?/?$', views.agenda), (r'^(?P\d+)/agenda(?P.html)?/?$', views.agenda), (r'^(?P\d+)/(?Pagenda-utc)(?P.html)?/?$', views.agenda), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/sessions.json$', ajax.scheduledsessions_json), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/session/(?P\d+).json$', ajax.scheduledsession_json), (r'^(?P\d+)/requests.html$', RedirectView.as_view(url='/meeting/%(num)s/requests', permanent=True)), (r'^(?P\d+)/requests$', views.meeting_requests), (r'^(?P\d+)/agenda(?P.txt)$', views.agenda), @@ -34,10 +36,11 @@ urlpatterns = patterns('', (r'^(?P\d+)/timeslots/edit$', views.edit_timeslots), (r'^(?P\d+)/rooms$', ajax.timeslot_roomsurl), (r'^(?P\d+)/room/(?P\d+).json$', ajax.timeslot_roomurl), + (r'^(?P\d+)/room/(?P\d+).html$', views.edit_roomurl), (r'^(?P\d+)/timeslots$', ajax.timeslot_slotsurl), (r'^(?P\d+)/timeslots.json$', ajax.timeslot_slotsurl), (r'^(?P\d+)/timeslot/(?P\d+).json$', ajax.timeslot_sloturl), - (r'^(?P\d+)/agendas/(?P[A-Za-z0-9-:_]+).json$', ajax.agenda_infourl), + (r'^(?P\d+)/agendas/(?P[A-Za-z0-9-:_]+).json$', ajax.agenda_infourl), (r'^(?P\d+)/agendas$', ajax.agenda_infosurl), (r'^(?P\d+)/agendas.json$', ajax.agenda_infosurl), (r'^(?P\d+)/week-view.html$', views.week_view), @@ -45,6 +48,7 @@ urlpatterns = patterns('', (r'^(?P\d+)/agenda/(?P[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf), (r'^(?P\d+)/agenda/(?P[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile), (r'^(?P\d+)/agenda/(?P[A-Za-z0-9-]+)/?$', views.session_agenda), + (r'^(?P\d+)/sessions.json', ajax.sessions_json), (r'^(?P\d+)/session/(?P\d+).json', ajax.session_json), (r'^(?P\d+)/session/(?P\d+)/constraints.json', ajax.session_constraints), (r'^(?P\d+)/constraint/(?P\d+).json', ajax.constraint_json), diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index f2bd733d1..44a0a0d30 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -23,12 +23,13 @@ from django.middleware.gzip import GZipMiddleware from django.db.models import Max from django.forms.models import modelform_factory from django.views.decorators.csrf import ensure_csrf_cookie +from django.forms import ModelForm from ietf.utils.pipe import pipe from ietf.ietfauth.utils import role_required, has_role from ietf.doc.models import Document, State from ietf.person.models import Person -from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule +from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule, Room from ietf.group.models import Group from ietf.meeting.helpers import get_areas @@ -97,13 +98,13 @@ class SaveAsForm(forms.Form): savename = forms.CharField(max_length=100) @role_required('Area Director','Secretariat') -def agenda_create(request, num=None, schedule_name=None): +def agenda_create(request, num=None, name=None): meeting = get_meeting(num) - schedule = get_schedule(meeting, schedule_name) + schedule = get_schedule(meeting, name) if schedule is None: # here we have to return some ajax to display an error. - raise Http404("No meeting information for meeting %s schedule %s available" % (num,schedule_name)) + raise Http404("No meeting information for meeting %s schedule %s available" % (num,name)) # authorization was enforced by the @group_require decorator above. @@ -160,6 +161,7 @@ def agenda_create(request, num=None, schedule_name=None): return redirect(edit_agenda, meeting.number, newschedule.name) +@role_required('Secretariat') @decorator_from_middleware(GZipMiddleware) @ensure_csrf_cookie def edit_timeslots(request, num=None): @@ -174,8 +176,8 @@ def edit_timeslots(request, num=None): rooms = meeting.room_set.order_by("capacity") + # this import locate here to break cyclic loop. from ietf.meeting.ajax import timeslot_roomsurl, AddRoomForm, timeslot_slotsurl, AddSlotForm - roomsurl = reverse(timeslot_roomsurl, args=[meeting.number]) adddayurl = reverse(timeslot_slotsurl, args=[meeting.number]) @@ -194,15 +196,47 @@ def edit_timeslots(request, num=None): "meeting":meeting}, RequestContext(request)), content_type="text/html") +class RoomForm(ModelForm): + class Meta: + model = Room + exclude = ('meeting',) + +@role_required('Secretariat') +def edit_roomurl(request, num, roomid): + meeting = get_meeting(num) + + try: + room = meeting.room_set.get(pk=roomid) + except Room.DoesNotExist: + raise Http404("No room %u for meeting %s" % (roomid, meeting.name)) + + if request.POST: + roomform = RoomForm(request.POST, instance=room) + new_room = roomform.save(commit=False) + new_room.meeting = meeting + new_room.save() + roomform.save_m2m() + return HttpResponseRedirect( reverse(edit_timeslots, args=[meeting.number]) ) + + roomform = RoomForm(instance=room) + meeting_base_url = request.build_absolute_uri(meeting.base_url()) + site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash + return HttpResponse(render_to_string("meeting/room_edit.html", + {"meeting_base_url": meeting_base_url, + "site_base_url": site_base_url, + "editroom": roomform, + "meeting":meeting}, + RequestContext(request)), content_type="text/html") + ############################################################################## #@role_required('Area Director','Secretariat') # disable the above security for now, check it below. @decorator_from_middleware(GZipMiddleware) @ensure_csrf_cookie -def edit_agenda(request, num=None, schedule_name=None): +def edit_agenda(request, num=None, name=None): if request.method == 'POST': - return agenda_create(request, num, schedule_name) + return agenda_create(request, num, name) user = request.user requestor = "AnonymousUser" @@ -215,8 +249,8 @@ def edit_agenda(request, num=None, schedule_name=None): pass meeting = get_meeting(num) - #sys.stdout.write("requestor: %s for sched_name: %s \n" % ( requestor, schedule_name )) - schedule = get_schedule(meeting, schedule_name) + #sys.stdout.write("requestor: %s for sched_name: %s \n" % ( requestor, name )) + schedule = get_schedule(meeting, name) #sys.stdout.write("2 requestor: %u for sched owned by: %u \n" % ( requestor.id, schedule.owner.id )) meeting_base_url = request.build_absolute_uri(meeting.base_url()) @@ -239,14 +273,8 @@ def edit_agenda(request, num=None, schedule_name=None): "meeting_base_url":meeting_base_url}, RequestContext(request)), status=403, content_type="text/html") - sessions = meeting.sessions_that_can_meet.order_by("id", "group", "requested_by") scheduledsessions = get_all_scheduledsessions_from_schedule(schedule) - session_jsons = [ json.dumps(s.json_dict(site_base_url)) for s in sessions ] - - # useful when debugging javascript - #session_jsons = session_jsons[1:20] - # get_modified_from needs the query set, not the list modified = get_modified_from_scheduledsessions(scheduledsessions) @@ -275,7 +303,6 @@ def edit_agenda(request, num=None, schedule_name=None): "area_list": area_list, "area_directors" : ads, "wg_list": wg_list , - "session_jsons": session_jsons, "scheduledsessions": scheduledsessions, "show_inline": set(["txt","htm","html"]) }, RequestContext(request)), content_type="text/html") @@ -289,10 +316,10 @@ AgendaPropertiesForm = modelform_factory(Schedule, fields=('name','visible', 'pu @role_required('Area Director','Secretariat') @decorator_from_middleware(GZipMiddleware) @ensure_csrf_cookie -def edit_agenda_properties(request, num=None, schedule_name=None): +def edit_agenda_properties(request, num=None, name=None): meeting = get_meeting(num) - schedule = get_schedule(meeting, schedule_name) + schedule = get_schedule(meeting, name) form = AgendaPropertiesForm(instance=schedule) return HttpResponse(render_to_string("meeting/properties_edit.html", @@ -311,7 +338,7 @@ def edit_agenda_properties(request, num=None, schedule_name=None): def edit_agendas(request, num=None, order=None): #if request.method == 'POST': - # return agenda_create(request, num, schedule_name) + # return agenda_create(request, num, name) meeting = get_meeting(num) user = request.user @@ -546,7 +573,7 @@ def ical_agenda(request, num=None, name=None, ext=None): # Process the special flags. # "-wgname" will remove a working group from the output. - # "~Type" will add that type to the output. + # "~Type" will add that type to the output. # "-~Type" will remove that type from the output # Current types are: # Session, Other (default on), Break, Plenary (default on) @@ -568,7 +595,7 @@ def ical_agenda(request, num=None, name=None, ext=None): Q(session__group__parent__acronym__in = include) ).exclude(session__group__acronym__in = exclude).distinct() #.exclude(Q(session__group__isnull = False), - #Q(session__group__acronym__in = exclude) | + #Q(session__group__acronym__in = exclude) | #Q(session__group__parent__acronym__in = exclude)) return HttpResponse(render_to_string("meeting/agenda.ics", diff --git a/ietf/name/migrations/0020_add_default_penalties.py b/ietf/name/migrations/0020_add_default_penalties.py new file mode 100644 index 000000000..53ac9c0d8 --- /dev/null +++ b/ietf/name/migrations/0020_add_default_penalties.py @@ -0,0 +1,205 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models +from settings import BADNESS_TOOBIG, BADNESS_MUCHTOOBIG +from settings import BADNESS_CONFLICT_1, BADNESS_CONFLICT_2, BADNESS_CONFLICT_3, BADNESS_BETHERE + +class Migration(DataMigration): + + def forwards(self, orm): + bethere = orm.ConstraintName.objects.get(slug="bethere") + if bethere.penalty is None or bethere.penalty == 0: + bethere.penalty = BADNESS_BETHERE + bethere.save() + + # + conflict = orm.ConstraintName.objects.get(slug="conflict") + if conflict.penalty is None or conflict.penalty == 0: + conflict.penalty = BADNESS_CONFLICT_1 + conflict.save() + + # + conflic2 = orm.ConstraintName.objects.get(slug="conflic2") + if conflic2.penalty is None or conflic2.penalty == 0: + conflic2.penalty = BADNESS_CONFLICT_2 + conflic2.save() + + # + conflic3 = orm.ConstraintName.objects.get(slug="conflic3") + if conflic3.penalty is None or conflic3.penalty == 0: + conflic3.penalty = BADNESS_CONFLICT_3 + conflic3.save() + + def backwards(self, orm): + pass + + models = { + 'name.ballotpositionname': { + 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, + 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.dbtemplatetypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docrelationshipname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docremindertypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.feedbacktype': { + 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupmilestonestatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.liaisonstatementpurposename': { + 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.nomineepositionstate': { + 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.rolename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + } + } + + complete_apps = ['name'] + symmetrical = True diff --git a/ietf/name/migrations/0021_add_room.py b/ietf/name/migrations/0021_add_room.py new file mode 100644 index 000000000..f7189b53f --- /dev/null +++ b/ietf/name/migrations/0021_add_room.py @@ -0,0 +1,200 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'RoomResourceName' + db.create_table('name_roomresourcename', ( + ('slug', self.gf('django.db.models.fields.CharField')(max_length=8, primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('desc', self.gf('django.db.models.fields.TextField')(blank=True)), + ('used', self.gf('django.db.models.fields.BooleanField')(default=True)), + ('order', self.gf('django.db.models.fields.IntegerField')(default=0)), + )) + db.send_create_signal('name', ['RoomResourceName']) + + def backwards(self, orm): + # Deleting model 'RoomResourceName' + db.delete_table('name_roomresourcename') + + + models = { + 'name.ballotpositionname': { + 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, + 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.dbtemplatetypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docrelationshipname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docremindertypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.feedbacktype': { + 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupmilestonestatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.liaisonstatementpurposename': { + 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.nomineepositionstate': { + 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.rolename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + } + } + + complete_apps = ['name'] diff --git a/ietf/name/migrations/0022_add_room_resources.py b/ietf/name/migrations/0022_add_room_resources.py new file mode 100644 index 000000000..d4db287d3 --- /dev/null +++ b/ietf/name/migrations/0022_add_room_resources.py @@ -0,0 +1,201 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + RoomResourceName = orm['name.RoomResourceName'] + RoomResourceName(slug='project', name='LCD projector', + desc='The room will have a computer projector', + used=True).save() + RoomResourceName(slug='proj2', name='second LCD projector', + desc='The room will have a second computer projector', + used=True).save() + RoomResourceName(slug='meetecho', name='Meetecho Remote Partition Support', + desc='The room will have a meetecho wrangler', + used=True).save() + + + def backwards(self, orm): + pass + + + models = { + 'name.ballotpositionname': { + 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, + 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.dbtemplatetypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docrelationshipname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docremindertypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.feedbacktype': { + 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupmilestonestatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.liaisonstatementpurposename': { + 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.nomineepositionstate': { + 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.rolename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + } + } + + complete_apps = ['name'] diff --git a/ietf/name/models.py b/ietf/name/models.py index 7403256d1..b18e9415b 100644 --- a/ietf/name/models.py +++ b/ietf/name/models.py @@ -31,7 +31,7 @@ class DocRelationshipName(NameModel): """Updates, Replaces, Obsoletes, Reviews, ... The relationship is always recorded in one direction.""" revname = models.CharField(max_length=255) - + class DocTypeName(NameModel): """Draft, Agenda, Minutes, Charter, Discuss, Guideline, Email, Review, Issue, Wiki""" @@ -71,3 +71,5 @@ class DraftSubmissionStateName(NameModel): Previous Version Authors, Awaiting Initial Version Approval, Awaiting Manual Post, Cancelled, Posted""" next_states = models.ManyToManyField('DraftSubmissionStateName', related_name="previous_states", blank=True) +class RoomResourceName(NameModel): + "Room resources: Audio Stream, Meetecho, . . ." diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index 1fd1cb05e..0e0fa7d1b 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -163,9 +163,14 @@ def send_notification(request, sessions): Room Name: {6} --------------------------------------------- ''' + + requestinguser = None + if request is not None: + requestinguser = request.user.person + group = sessions[0].group to_email = sessions[0].requested_by.role_email('chair').address - cc_list = get_cc_list(group, request.user.person) + cc_list = get_cc_list(group, requestinguser) from_email = ('"IETF Secretariat"','agenda@ietf.org') if sessions.count() == 1: subject = '%s - Requested session has been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number) diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py index 95c4231d5..20c90aad2 100644 --- a/ietf/secr/sreq/forms.py +++ b/ietf/secr/sreq/forms.py @@ -1,6 +1,9 @@ from django import forms from ietf.group.models import Group +from ietf.meeting.models import ResourceAssociation +from django.forms.formsets import formset_factory +from ietf.person.forms import EmailsField import os # ------------------------------------------------- @@ -44,12 +47,25 @@ def join_conflicts(data): class GroupSelectForm(forms.Form): group = forms.ChoiceField() - + def __init__(self,*args,**kwargs): choices = kwargs.pop('choices') super(GroupSelectForm, self).__init__(*args,**kwargs) self.fields['group'].widget.choices = choices +BETHERE_CHOICES = ((False , 'No'), (True , 'Yes')) +# not using the ModelFormset, too complex. +class MustBePresentForm(forms.Form): + from ietf.person.models import Person + + #person = forms.ModelChoiceField(queryset= Person.objects.all(), required=False) + person = EmailsField(required=False) + bethere = forms.ChoiceField(required = False, choices = BETHERE_CHOICES) + # something like this is desired to make pre-existing items read-only + #self.fields['person'].widget.attrs['readonly'] = True + + +MustBePresentFormSet = formset_factory(MustBePresentForm, extra = 1) class SessionForm(forms.Form): num_session = forms.ChoiceField(choices=NUM_SESSION_CHOICES) @@ -65,6 +81,7 @@ class SessionForm(forms.Form): wg_selector2 = forms.ChoiceField(choices=WG_CHOICES,required=False) wg_selector3 = forms.ChoiceField(choices=WG_CHOICES,required=False) third_session = forms.BooleanField(required=False) + resources = forms.MultipleChoiceField(choices=[(x.pk,x.desc) for x in ResourceAssociation.objects.all()], widget=forms.CheckboxSelectMultiple) def __init__(self, *args, **kwargs): super(SessionForm, self).__init__(*args, **kwargs) @@ -85,7 +102,11 @@ class SessionForm(forms.Form): if self.initial and 'length_session3' in self.initial: if self.initial['length_session3'] != '0' and self.initial['length_session3'] != None: self.fields['third_session'].initial = True - + + resources = self.initial['resources'] + resource_choices = [r.pk for r in resources] + self.initial['resources'] = resource_choices + def clean_conflict1(self): conflict = self.cleaned_data['conflict1'] check_conflict(conflict) diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py index 88fe5c1f2..32bd3a719 100644 --- a/ietf/secr/sreq/urls.py +++ b/ietf/secr/sreq/urls.py @@ -4,10 +4,12 @@ urlpatterns = patterns('ietf.secr.sreq.views', url(r'^$', 'main', name='sessions'), url(r'^status/$', 'tool_status', name='sessions_tool_status'), url(r'^(?P[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'), + url(r'^(?P[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'), url(r'^(?P[A-Za-z0-9_\-\+]+)/approve/$', 'approve', name='sessions_approve'), url(r'^(?P[A-Za-z0-9_\-\+]+)/cancel/$', 'cancel', name='sessions_cancel'), url(r'^(?P[A-Za-z0-9_\-\+]+)/confirm/$', 'confirm', name='sessions_confirm'), url(r'^(?P[A-Za-z0-9_\-\+]+)/edit/$', 'edit', name='sessions_edit'), url(r'^(?P[A-Za-z0-9_\-\+]+)/new/$', 'new', name='sessions_new'), url(r'^(?P[A-Za-z0-9_\-\+]+)/no_session/$', 'no_session', name='sessions_no_session'), + url(r'^(?P[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/edit/$', 'edit_mtg', name='sessions_edit'), ) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index 7ff24576e..c17c184bf 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -14,6 +14,7 @@ from ietf.secr.utils.group import get_my_groups, groups_by_session from ietf.ietfauth.utils import has_role from ietf.utils.mail import send_mail from ietf.meeting.models import Meeting, Session, Constraint +from ietf.meeting.helpers import get_meeting from ietf.group.models import Group, Role from ietf.name.models import SessionStatusName, ConstraintName @@ -44,10 +45,13 @@ def get_initial_session(sessions): This function takes a queryset of sessions ordered by 'id' for consistency. It returns a dictionary to be used as the initial for a legacy session form ''' + initial = {} + if(len(sessions) == 0): + return initial + meeting = sessions[0].meeting group = sessions[0].group conflicts = group.constraint_source_set.filter(meeting=meeting) - initial = {} # even if there are three sessions requested, the old form has 2 in this field initial['num_session'] = sessions.count() if sessions.count() <= 2 else 2 @@ -64,6 +68,7 @@ def get_initial_session(sessions): initial['conflict2'] = ' '.join([ c.target.acronym for c in conflicts.filter(name__slug='conflic2') ]) initial['conflict3'] = ' '.join([ c.target.acronym for c in conflicts.filter(name__slug='conflic3') ]) initial['comments'] = sessions[0].comments + initial['resources'] = sessions[0].resources.all() return initial def get_lock_message(): @@ -78,12 +83,6 @@ def get_lock_message(): message = "This application is currently locked." return message -def get_meeting(): - ''' - Function to get the current IETF regular meeting. Simply returns the meeting with the most recent date - ''' - return Meeting.objects.filter(type='ietf').order_by('-date')[0] - def get_requester_text(person,group): ''' This function takes a Person object and a Group object and returns the text to use in the @@ -181,7 +180,7 @@ def approve(request, acronym): if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.person): session.status = SessionStatusName.objects.get(slug='appr') - session.save() + session_save(session) messages.success(request, 'Third session approved') return redirect('sessions_view', acronym=acronym) @@ -212,7 +211,7 @@ def cancel(request, acronym): # mark sessions as deleted for session in sessions: session.status_id = 'deleted' - session.save() + session_save(session) # clear schedule assignments if already scheduled session.scheduledsession_set.all().delete() @@ -271,7 +270,7 @@ def confirm(request, acronym): requested_duration=datetime.timedelta(0,int(duration)), comments=form['comments'], status=SessionStatusName.objects.get(slug=slug)) - new_session.save() + session_save(new_session) # write constraint records save_conflicts(group,meeting,form['conflict1'],'conflict') @@ -302,12 +301,61 @@ def confirm(request, acronym): RequestContext(request, {}), ) +def make_essential_person(pk, person, required): + essential_person = dict() + essential_person["person"] = person.email_set.all()[0].pk + essential_person["bethere"] = required + return essential_person + +def make_bepresent_formset(group, session, default=True): + dict_of_essential_people = {} + + for x in session.people_constraints.all(): + #print "add db: %u %s" % (x.person.pk, x.person) + dict_of_essential_people[x.person.pk] = make_essential_person(x.person.pk, x.person, True) + + # now, add the co-chairs if they were not already present + chairs = group.role_set.filter(name='chair') + for chairrole in chairs: + chair = chairrole.person + if not chair.pk in dict_of_essential_people: + #print "add chair: %u" % (chair.pk) + dict_of_essential_people[chair.pk] = make_essential_person(chair.pk, chair, default) + + # add the responsible AD + if not group.ad.pk in dict_of_essential_people: + #print "add ad: %u" % (chair.pk) + dict_of_essential_people[group.ad.pk] = make_essential_person(group.ad.pk, group.ad, default) + + # make the form set of these people + list_of_essential_people = [] + for k,x in dict_of_essential_people.iteritems(): + #print "k: %s x: %s" % (k,x) + list_of_essential_people.append(x) + + list_of_essential_people.reverse() + #for t in list_of_essential_people: + # print "t: %s" % (t) + + formset = MustBePresentFormSet(initial=list_of_essential_people) + return formset + @check_permissions def edit(request, acronym): + return edit_mtg(request, None, acronym) + +def session_save(session): + session.save() + if session.status_id == "schedw" and session.meeting.agenda != None: + # send an email to iesg-secretariat to alert to change + pass + +@check_permissions +def edit_mtg(request, num, acronym): ''' This view allows the user to edit details of the session request ''' - meeting = get_meeting() + meeting = get_meeting(num) group = get_object_or_404(Group, acronym=acronym) sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id') sessions_count = sessions.count() @@ -315,13 +363,18 @@ def edit(request, acronym): session_conflicts = session_conflicts_as_string(group, meeting) login = request.user.person + session = Session() + if(len(sessions) > 0): + session = sessions[0] + if request.method == 'POST': button_text = request.POST.get('submit', '') if button_text == 'Cancel': return redirect('sessions_view', acronym=acronym) form = SessionForm(request.POST,initial=initial) - if form.is_valid(): + bepresent_formset = MustBePresentFormSet(request.POST) + if form.is_valid() or bepresent_formset.is_valid(): if form.has_changed(): # might be cleaner to simply delete and rewrite all records (but maintain submitter?) # adjust duration or add sessions @@ -329,7 +382,7 @@ def edit(request, acronym): if 'length_session1' in form.changed_data: session = sessions[0] session.requested_duration = datetime.timedelta(0,int(form.cleaned_data['length_session1'])) - session.save() + session_save(session) # session 2 if 'length_session2' in form.changed_data: @@ -351,7 +404,7 @@ def edit(request, acronym): duration = datetime.timedelta(0,int(form.cleaned_data['length_session2'])) session = sessions[1] session.requested_duration = duration - session.save() + session_save(session) # session 3 if 'length_session3' in form.changed_data: @@ -373,7 +426,7 @@ def edit(request, acronym): duration = datetime.timedelta(0,int(form.cleaned_data['length_session3'])) session = sessions[2] session.requested_duration = duration - session.save() + session_save(session) if 'attendees' in form.changed_data: @@ -390,6 +443,12 @@ def edit(request, acronym): Constraint.objects.filter(meeting=meeting,source=group,name='conflic3').delete() save_conflicts(group,meeting,form.cleaned_data['conflict3'],'conflic3') + if 'resources' in form.changed_data: + new_resource_ids = form.cleaned_data['resources'] + new_resources = [ ResourceAssociation.objects.get(pk=a) + for a in new_resource_ids] + session.resources = new_resources + # deprecated # log activity #add_session_activity(group,'Session Request was updated',meeting,user) @@ -397,16 +456,46 @@ def edit(request, acronym): # send notification send_notification(group,meeting,login,form.cleaned_data,'update') + for bepresent in bepresent_formset.forms: + if bepresent.is_valid() and 'person' in bepresent.cleaned_data: + persons_cleaned = bepresent.cleaned_data['person'] + if(len(persons_cleaned) == 0): + continue + + person = bepresent.cleaned_data['person'][0].person + if 'bethere' in bepresent.changed_data and bepresent.cleaned_data['bethere']=='True': + #print "Maybe adding bethere constraint for %s" % (person) + if session.people_constraints.filter(person = person).count()==0: + # need to create new constraint. + #print " yes" + nc = session.people_constraints.create(person = person, + meeting = meeting, + name_id = 'bethere', + source = session.group) + nc.save() + else: + #print "Maybe deleting bethere constraint for %s" % (person) + if session.people_constraints.filter(person = person).count() > 0: + #print " yes" + session.people_constraints.filter(person = person).delete() + + # nuke any cache that might be lingering around. + from ietf.meeting.helpers import session_constraint_expire + session_constraint_expire(session) + messages.success(request, 'Session Request updated') return redirect('sessions_view', acronym=acronym) else: form = SessionForm(initial=initial) + bepresent_formset = make_bepresent_formset(group, session, False) + return render_to_response('sreq/edit.html', { 'meeting': meeting, 'form': form, 'group': group, + 'bepresent_formset' : bepresent_formset, 'session_conflicts': session_conflicts}, RequestContext(request, {}), ) @@ -546,7 +635,7 @@ def no_session(request, acronym): requested_by=login, requested_duration=0, status=SessionStatusName.objects.get(slug='notmeet')) - session.save() + session_save(session) # send notification to_email = SESSION_REQUEST_EMAIL @@ -610,11 +699,11 @@ def tool_status(request): RequestContext(request, {}), ) -def view(request, acronym): +def view(request, acronym, num = None): ''' This view displays the session request info ''' - meeting = get_meeting() + meeting = get_meeting(num) group = get_object_or_404(Group, acronym=acronym) sessions = Session.objects.filter(~Q(status__in=('canceled','notmeet','deleted')),meeting=meeting,group=group).order_by('id') diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html index 629acc3e3..ab85655bb 100755 --- a/ietf/secr/templates/includes/sessions_request_form.html +++ b/ietf/secr/templates/includes/sessions_request_form.html @@ -1,4 +1,4 @@ - * Required Field + * Required Field
{% csrf_token %} {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %} @@ -50,12 +50,38 @@
- + People who need to be present: + + {{ bepresent_formset.management_form }} + + + + + + {% for essential_person_form in bepresent_formset.forms %} + + + + + {% endfor %} +
PersonMust be present?
{{ essential_person_form.person }}{{ essential_person_form.bethere }}
+ + + Resources requested: + + {{ form.resources }} + + + Special Requests:
 
i.e. Meetecho, WebEx (please state which, and the reason needed), restrictions on meeting times / days, etc. {{ form.comments.errors }}{{ form.comments }} - + {% include "includes/buttons_save_cancel.html" %} - +
+{% block content_end %} + + +{% endblock %} diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html index 5c761cc34..44614564c 100644 --- a/ietf/secr/templates/includes/sessions_request_view.html +++ b/ietf/secr/templates/includes/sessions_request_view.html @@ -26,7 +26,11 @@ Other WGs that included {{ group }} in their conflict list: {% if session_conflicts %}{{ session_conflicts }}{% else %}None so far{% endif %} + + Resources requested: + {% if session.resources %}
    {% for resource in session.resources %}
  • {{ resource.desc }}{% endfor %}
{% else %}None so far{% endif %} + {% autoescape off %} - Special Requests:{{ session.comments }} + Special Requests:{{ session.comments }} {% endautoescape %} diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html index 79e5a3206..e095c2cb8 100755 --- a/ietf/secr/templates/sreq/main.html +++ b/ietf/secr/templates/sreq/main.html @@ -14,7 +14,7 @@ {% endblock %} {% block content %} -

» View list of timeslot requests

+

» View list of timeslot requests

Sessions Request Tool: IETF {{ meeting.number }} diff --git a/ietf/secr/templates/sreq/view.html b/ietf/secr/templates/sreq/view.html index 56c783f02..4c4fdf97b 100644 --- a/ietf/secr/templates/sreq/view.html +++ b/ietf/secr/templates/sreq/view.html @@ -18,8 +18,8 @@ {% block content %}
-

Sessions - View

- +

Sessions - View (meeting: {{ meeting.number }})

+ {% include "includes/sessions_request_view.html" %}
diff --git a/ietf/settings.py b/ietf/settings.py index 30fc92fb3..63b11566d 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -383,6 +383,30 @@ USE_ETAGS=True PRODUCTION_TIMEZONE = "America/Los_Angeles" +# Automatic Scheduling +# +# how much to login while running, bigger numbers make it more verbose. +BADNESS_CALC_LOG = 0 +# +# these penalties affect the calculation of how bad the assignments are. +BADNESS_UNPLACED = 1000000 + +# following four are used only during migrations to setup up ConstraintName +# and penalties are taken from the database afterwards. +BADNESS_BETHERE = 200000 +BADNESS_CONFLICT_1 = 100000 +BADNESS_CONFLICT_2 = 10000 +BADNESS_CONFLICT_3 = 1000 + +BADNESS_TOOSMALL_50 = 5000 +BADNESS_TOOSMALL_100 = 50000 +BADNESS_TOOBIG = 100 +BADNESS_MUCHTOOBIG = 500 + +# do not run SELENIUM tests by default +SELENIUM_TESTS = False +SELENIUM_TESTS_ONLY = False + # Put SECRET_KEY in here, or any other sensitive or site-specific # changes. DO NOT commit settings_local.py to svn. from settings_local import * diff --git a/ietf/templates/meeting/agenda-utc.html b/ietf/templates/meeting/agenda-utc.html index 98c9295d0..7dd300b74 100644 --- a/ietf/templates/meeting/agenda-utc.html +++ b/ietf/templates/meeting/agenda-utc.html @@ -121,7 +121,7 @@ You can customize the agenda below to show only selected working group sessions. {% for wg in schedule.groups %}{% ifchanged wg.parent.acronym %}{% if forloop.counter > 1 %} {% endif %} {% endifchanged %} -
{% if wg.state.name = "BOF" %}{{wg.acronym}}{% else %}{{wg.acronym}}{% endif %}
{% endfor %} +
{% if wg.is_bof %}{{wg.acronym}}{% else %}{{wg.acronym}}{% endif %}
{% endfor %} @@ -182,7 +182,7 @@ You can customize the agenda below to show only selected working group sessions. {{item.timeslot.name}} - - + - {% if item.timeslot.show_location %}{{item.timeslot.get_location}}{% endif %} @@ -200,7 +200,7 @@ You can customize the agenda below to show only selected working group sessions. {% if item.session.agenda %}{{item.session.group.name}} {% else %}{{item.session.group.name}}{% endif %} - {% if item.session.group.state.name = "BOF" %} BOF {% endif %} + {% if item.session.is_bof %} BOF {% endif %} {% if item.session.agenda_note %}
{{item.session.agenda_note}}{% endif %} {% if item.session.agenda %}drafts: tar|pdf{%endif%} diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html index e2c296c29..f8b4d3833 100644 --- a/ietf/templates/meeting/landscape_edit.html +++ b/ietf/templates/meeting/landscape_edit.html @@ -30,7 +30,6 @@ - {% dajaxice_js_import %} @@ -44,14 +43,17 @@ + + + + + + + + + + + + + + + +{% dajaxice_js_import %} + + + +{% endblock js %} + + +{% block start_content_table %}{% endblock %} +{% block end_content_table %}{% endblock %} + +{% block content %} +
+
+< +
+ +
+ +
+
{% csrf_token %} + + {{ editroom.as_table }} + +
+
+
+ +{% endblock %} diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html index 2697cd672..591b3271c 100644 --- a/ietf/templates/meeting/timeslot_edit.html +++ b/ietf/templates/meeting/timeslot_edit.html @@ -20,17 +20,22 @@ + -{% if server_mode and server_mode != "production" %} - -{% endif %} + + + + + + + {% dajaxice_js_import %} - + @@ -41,29 +46,25 @@ function my_js_callback(data){ alert(data.message); } {% endcomment %} +var meeting_number = "{{ meeting.number }}"; var meeting_base_url = "{{ meeting_base_url }}"; var site_base_url = "{{ site_base_url }}"; total_days = {{time_slices|length}}; total_rooms = {{rooms|length}}; -function setup_slots(){ -{% for ts in timeslots %} - make_ss({ - "timeslot_id":"{{ts.id}}", - "room" :"{{ts.location|slugify}}", - "roomtype" :"{{ts.type.slug}}", - "time" :"{{ts.time|date:'Hi' }}", - "date" :"{{ts.time|date:'Y-m-d'}}", - "domid" :"{{ts.js_identifier}}"}); +first_day = new Date("{% with timeslots|first as day %} {{ day.time }} {% endwith %}"); /* needed for the datepicker */ + +function setup_slots(promiselist){ +var ts_promise = load_timeslots("{% url "ietf.meeting.ajax.timeslot_slotsurl" meeting.number %}"); +promiselist.push(ts_promise); + +{% for day in time_slices %} + days.push("{{day}}"); {% endfor %} - console.log("setup_slots run"); } - {% endblock js %} @@ -79,9 +80,10 @@ function setup_slots(){
- + {% for day in time_slices %} + {% for day in time_slices %} {% for slot in slot_slices|lookup:day %} + {% for day in time_slices %} {% for slot in date_slices|lookup:day %} - + {% endfor %} {% endfor %} @@ -148,7 +161,9 @@ function setup_slots(){
name: {{meeting.number}} +
@@ -99,6 +101,7 @@ function setup_slots(){
+ROOM
+DAY
 @@ -117,18 +120,28 @@ function setup_slots(){ {% endfor %} {% for r in rooms %} -
X
-
{{r}} ({{r.capacity}})
+
{{r.name}} ({{r.capacity}})
- + + 		+
+ {% for resource in r.resources.all %} + + {{resource.desc}} + + {% endfor %} +
+
{% csrf_token %} - {{ addday.as_table }} + {{ addday }} + +
diff --git a/static/css/agenda.css b/static/css/agenda.css index 388962c39..d24213b72 100644 --- a/static/css/agenda.css +++ b/static/css/agenda.css @@ -251,8 +251,9 @@ div.agenda_slot{ #session-info{ - min-height: 150px; + min-height: 160px; position: relative; + width:100%; } .ss_info { @@ -315,6 +316,18 @@ div.agenda_slot{ } +.wg_style { + font-style:normal; +} + +.bof_style { + font-style:italic; +} +#grp_type { + display: inline; + float: right; +} + .ss_info tr{ /* border-right: 1px solid #89D; */ /* border-top: 1px solid #89D; */ @@ -354,36 +367,36 @@ td.ss_info_name_short{ min-width:50px; } -.agenda_find_free{ +.agenda_nice_button { border: 1px solid #89D; background-color: #EDF5FF; padding: 5px; max-width: 150px; float:left; - margin-top:70px; - margin-left:3px; + margin-top: 5px; + margin-bottom: 10px; + margin-left:10px; +} + +.agenda_find_free{ } .agenda_double_slot { - border: 1px solid #89D; - background-color: #EDF5FF; - padding: 5px; - max-width: 150px; - float:left; - margin-top:70px; - margin-left:3px; } #agenda_pin_slot { - border: 1px solid #89D; - background-color: #EDF5FF; - padding: 5px; - max-width: 150px; - float:left; - margin-top:70px; - margin-left:3px; } +#agenda_prev_session { +} + +#agenda_show { +} + +#agenda_next_session { +} + + .button_disabled { color: #EDF4FF; text-color: #EDF4FF; @@ -1045,3 +1058,47 @@ div.line{ padding-top: 0px; padding-bottom: 0px; } + + +.ui-resizable-s { +height:6px; +/* background-color:aqua; */ +/* background: #99beff; /\* Old browsers *\/ */ +/* background: -moz-linear-gradient(top, #99beff 0%, #1e5799 100%); /\* FF3.6+ *\/ */ + +/* expect error on firefox */ +background: -webkit-gradient(linear, top, bottom, color-stop(0%,#99beff), color-stop(100%,#1e5799)); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, #99beff 0%,#1e5799 100%); /* Chrome10+,Safari5.1+ */ +/* background: -o-linear-gradient(left, #99beff 0%,#1e5799 100%); /\* Opera 11.10+ *\/ */ +/* background: -ms-linear-gradient(left, #99beff 0%,#1e5799 100%); /\* IE10+ *\/ */ +/* background: linear-gradient(to right, #99beff 0%,#1e5799 100%); /\* W3C *\/ */ + +/* expect error on firefox */ +/* filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99beff', endColorstr='#1e5799',GradientType=1 ); /\* IE6-9 *\/ */ + +} + +.resource_image { + float: left; +} +.resource_list { + width: 75px; +} +.room_features { + background-color:#2647A0; +} +.agenda_requested_feature { + float: right; +} + +/* copied from doc.css, maybe with some modifications. */ +a.editlink { + background-image: url("/images/pencil.png"); + background-size: 10px; + background-position: right top; + background-attachment: scroll; + background-repeat: no-repeat; + padding-right: 12px; +} +a.editlink:link {text-decoration:none; color:inherit;} +a.editlink:visited {text-decoration:none; color:inherit;} diff --git a/static/css/jquery-ui-timepicker-addon.css b/static/css/jquery-ui-timepicker-addon.css new file mode 100644 index 000000000..da12d9833 --- /dev/null +++ b/static/css/jquery-ui-timepicker-addon.css @@ -0,0 +1,11 @@ +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; } +.ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } + +.ui-timepicker-rtl{ direction: rtl; } +.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; } +.ui-timepicker-rtl dl dt{ float: right; clear: right; } +.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; } \ No newline at end of file diff --git a/static/css/lib/qunit-1.12.0.css b/static/css/lib/qunit-1.12.0.css new file mode 100644 index 000000000..7ba3f9a30 --- /dev/null +++ b/static/css/lib/qunit-1.12.0.css @@ -0,0 +1,244 @@ +/** + * QUnit v1.12.0 - A JavaScript Unit Testing Framework + * + * http://qunitjs.com + * + * Copyright 2012 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ + +/** Font Family and Sizes */ + +#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult { + font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; +} + +#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; } +#qunit-tests { font-size: smaller; } + + +/** Resets */ + +#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter { + margin: 0; + padding: 0; +} + + +/** Header */ + +#qunit-header { + padding: 0.5em 0 0.5em 1em; + + color: #8699a4; + background-color: #0d3349; + + font-size: 1.5em; + line-height: 1em; + font-weight: normal; + + border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; +} + +#qunit-header a { + text-decoration: none; + color: #c2ccd1; +} + +#qunit-header a:hover, +#qunit-header a:focus { + color: #fff; +} + +#qunit-testrunner-toolbar label { + display: inline-block; + padding: 0 .5em 0 .1em; +} + +#qunit-banner { + height: 5px; +} + +#qunit-testrunner-toolbar { + padding: 0.5em 0 0.5em 2em; + color: #5E740B; + background-color: #eee; + overflow: hidden; +} + +#qunit-userAgent { + padding: 0.5em 0 0.5em 2.5em; + background-color: #2b81af; + color: #fff; + text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; +} + +#qunit-modulefilter-container { + float: right; +} + +/** Tests: Pass/Fail */ + +#qunit-tests { + list-style-position: inside; +} + +#qunit-tests li { + padding: 0.4em 0.5em 0.4em 2.5em; + border-bottom: 1px solid #fff; + list-style-position: inside; +} + +#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running { + display: none; +} + +#qunit-tests li strong { + cursor: pointer; +} + +#qunit-tests li a { + padding: 0.5em; + color: #c2ccd1; + text-decoration: none; +} +#qunit-tests li a:hover, +#qunit-tests li a:focus { + color: #000; +} + +#qunit-tests li .runtime { + float: right; + font-size: smaller; +} + +.qunit-assert-list { + margin-top: 0.5em; + padding: 0.5em; + + background-color: #fff; + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; +} + +.qunit-collapsed { + display: none; +} + +#qunit-tests table { + border-collapse: collapse; + margin-top: .2em; +} + +#qunit-tests th { + text-align: right; + vertical-align: top; + padding: 0 .5em 0 0; +} + +#qunit-tests td { + vertical-align: top; +} + +#qunit-tests pre { + margin: 0; + white-space: pre-wrap; + word-wrap: break-word; +} + +#qunit-tests del { + background-color: #e0f2be; + color: #374e0c; + text-decoration: none; +} + +#qunit-tests ins { + background-color: #ffcaca; + color: #500; + text-decoration: none; +} + +/*** Test Counts */ + +#qunit-tests b.counts { color: black; } +#qunit-tests b.passed { color: #5E740B; } +#qunit-tests b.failed { color: #710909; } + +#qunit-tests li li { + padding: 5px; + background-color: #fff; + border-bottom: none; + list-style-position: inside; +} + +/*** Passing Styles */ + +#qunit-tests li li.pass { + color: #3c510c; + background-color: #fff; + border-left: 10px solid #C6E746; +} + +#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; } +#qunit-tests .pass .test-name { color: #366097; } + +#qunit-tests .pass .test-actual, +#qunit-tests .pass .test-expected { color: #999999; } + +#qunit-banner.qunit-pass { background-color: #C6E746; } + +/*** Failing Styles */ + +#qunit-tests li li.fail { + color: #710909; + background-color: #fff; + border-left: 10px solid #EE5757; + white-space: pre; +} + +#qunit-tests > li:last-child { + border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + -webkit-border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; +} + +#qunit-tests .fail { color: #000000; background-color: #EE5757; } +#qunit-tests .fail .test-name, +#qunit-tests .fail .module-name { color: #000000; } + +#qunit-tests .fail .test-actual { color: #EE5757; } +#qunit-tests .fail .test-expected { color: green; } + +#qunit-banner.qunit-fail { background-color: #EE5757; } + + +/** Result */ + +#qunit-testresult { + padding: 0.5em 0.5em 0.5em 2.5em; + + color: #2b81af; + background-color: #D2E0E6; + + border-bottom: 1px solid white; +} +#qunit-testresult .module-name { + font-weight: bold; +} + +/** Fixture */ + +#qunit-fixture { + position: absolute; + top: -10000px; + left: -10000px; + width: 1000px; + height: 1000px; +} diff --git a/static/images/1194984425806666249pin_blue_nicu_buculei_01.svg b/static/images/1194984425806666249pin_blue_nicu_buculei_01.svg new file mode 100644 index 000000000..42d962fe8 --- /dev/null +++ b/static/images/1194984425806666249pin_blue_nicu_buculei_01.svg @@ -0,0 +1,70 @@ + + + + + + + pin - blue + + + + office + + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + + Nicu Buculei + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/12161797831849255690jcartier_board.svg b/static/images/12161797831849255690jcartier_board.svg new file mode 100644 index 000000000..241a822e3 --- /dev/null +++ b/static/images/12161797831849255690jcartier_board.svg @@ -0,0 +1,158 @@ + + + + + + + + + image/svg+xml + + hw_board + 2008-05-15 + + + Jean Cartier + + + + fr-FR + + + hardware + computer + desk + business + + + + + Jean-Victor Balin (jean.victor.balin@gmail.com) + + + http://www.jcartier.net + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/12161797831849255690jcartier_board.svg.thumb.png b/static/images/12161797831849255690jcartier_board.svg.thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..06b2c69cc83ece07a6d43bd14957ec379328077a GIT binary patch literal 4072 zcmVP)hfNpjxbAM2bGiI~#J(B%6( z`$^8)?;1X5?e*@p_gU{!B0_djO4$QDY;CBSmQEzF9#}3S*Rst}h@|cVT_4z+B{>mT z1uPVitmg`i4EH%_Yx$>hdoUUSZ~_JZzbU1nlu|F7uZY4W5y|!d8Uq4IY!q^8H!^bq zQlpAayW=sBtE_@{-0$*k4D1Gojk5MM0MUnF>1tTL0ZB_knUfQMdBDdaa``dz zPp&CP&=y^|1fPV#(yvKRPQk{UoCqudW{Jqz$IkB&;O_^@+{ah0!r~RM z;7ihO-m?0F+rU@AOc6QySScP=4?Cvg4%;yuF{u1n=pNj15Ij?9%p^4k8O@Amx3zkp=z?a1z*WKEew;^oxCa%b}w& za^OgmELt*O0z0%98ykZa%FzLNr4Mo-Lg%}D2wD0e;#HEQ?5-5xbY4PRCm=bI!C;_i zvnDic)`ZyeuM_t9m#ka6mZap{EM5VhuYztt(6A27_yqon#{oc@N$-%iQtDX|+5UIh z^U&?it%AzOv*zh52*&e~DF(dHuazhUzFqzoShuO z-VT#Fdt3Arcdb(DsoZXxMY#@bk+ZWi{RZ@9^VSHaO`k&f@=pK|84bNcp+#3P+QZqs za3Kam*hf&d3^&c$p9c;prM^%~RmknOJvL~I?Ck95+N}%gH-0&9^LBx`=vp zD*+I57@i*p-3Gy-W6+}$9N3EE`xC*#jTFER7y_JBO1-C)^7z|r`MU+=M2#9ZBy7bR zK3VuN)vA^SV8?D~(*p*Kf-~pf<(_bO8^$Rkp@cKH(T}xn0;iNxZz-jmb6S7CKwH$J zWph@qThGi{@8MU@3lUiV12pXnBd5XDYw-F2IP@cSqhA9DBWZv;Fdg_qDb+J4_2w%y zfKrN%L4m9f4`=e!xA5|ECoLVmSOfJsz}p{buRne$9N3EO;J#p|y}dWEQYp1XDOKrF z>dbd&i)?Ic=-wlQ@EdYi~k)0tB>xU)RH!!TO#LR8xvb zrBuKBm0e(=E%Ges$(s|#vTnmSG-y~KfHmJklTNU9lYY7J<`CHNU#MOgM6fj&Sge#P zb+0lDJhVlAe&zTqY%x>boH5dXRw-2x9f4E-LB>vwdR1rC-e?jMuHxb0 z{@5G%IAj3E0`=|fpjriJR12Ed1t-V5jeB)Ap%ffFdW;vk_F~8OpYpoBxgrD531D1* zSTY4Z90l*auK!we{FMG1_$(})4UP^F7Z=B{&^H)9bR=xx_e zs+9+K7yW@3{rbE>O!WS|W_q9u=&(UXOv4m&*qo}sy);y+g(~T-d%0F6 z-RmR&tyk_{zX9XlgGNEHdIMA_2VozdQZcK zFuj_udSzYCw(a}r);WYJ6NYl(LjHStgNUp^N9G(cnJ_F_iG9u1B!0e%WQ#wtvxg`B zz`qu_l>!eJeT!T6A82Ln)ng~2&oBt+1;6amtNC_*1M{YXkGEdbx^~?!JQvuJ*)zv+ z^=kfwVH*HMBnqgDUQc}^F$t$J({ZTXj<{dpNKRC`T(Z@+h3!oQ#TM}=K(~Yjm>~JI)ZOSs9=VFwgD`E zSC4xyPe@OPEj0{QAr8yobI6{wts= zFbMb)u-o+;b?XFR-*q7SV&k}Bv2}2QvXwNvtEcwxt7gKG9^mQ>DXFkv8PsV9Gw12$ z%40*}Km^R30DeBYoXE)IygD$H7oHC$eB)+J>A5?@d#INPB9bN|OVHyz6gUUi{}f66 zT5Yipd4;`km+poyUmZM3Laz?6dKSDC3=T%PnF#MMgqp2k`bUtI3k6(dkg5m z*Z9La5cUrH#*Z9T`;hRCz)0Yt6<(3pz9qjN+nEjgZX{-{hW~aB(lby4Tk_i3BE32x z`@%EwY+sE$ABfl(GJgU76)Q-!YE^Rteb4Oy9!2IDsiD9aprlSCvBR^(%$dg1B|UJt z(?0nYT#kbqSK-D@_~u7g69Lwlpn{+_FnTc5tg6$_UC_a*tG`m#A@E2UUh@{;{MIY7hdyiz;`1wHJ?$Emnc$wpJvOo_O zk%if|CoiC_l_^yc-RtAf0b~H_^`GYV*;A=dql&&7EHat&c#n_6bUOvZ@zbz;BmA@v zOy*|W+CckO&^H8{H2~ktFS6GFV@2e2rgr2dw6#*DmZPV)iRfrq0I5-x|NCGPK8@;R zh8N(v89pTm!?}y_-459F3nX06uq)-MUt?uaGVmero`~Fn{DTeyUILZ@Kcg>wYaCTY zKTgkhi_)!|a#y(UjjIrUf%K$X*rcVy&(YfJ?>&+^fMrNeShs3!MV`i^$IW zhWd>xCOk2kT?$Kf8_7AKYEx5K1ckZ_6H*RNm@!6q&qA`imx(@?1_ zbZZOADX?rKtk{StEgb`Tcb!260y@jN4#0Szxh1W1NiI)%1Lq!{aJ01{lhV@Q>R+T> zi6c2Z9k=Z2``>wZdl7Qt3<~(G!2N0|BAY~{1@H{85#X%)_C2E7FEdBK6oGne!NpxRk9zqZ*AHUUG5w^vPOgenDGCW^1KX zAElJ*eXRizIVmEq0u_J{fNN=K*nYJR`(|CB%gdxi?0mQo#5{*qO8EfY%pc1F%YjQu zsr5>!7a#Nmh{y#I8H-*(@CNWdfS>nZ+cOjz24PyXJmZPYq9aGITXw-an`b*i-SG^* z676Wx$$rPGWZ>0DD9;86LBGVbmg8W=RIj${^=g$}5}h1vF5gk#CwUFr`i_Que#igQ z%sqbH{JB*Q%WndF33qM&W;wP2SjdWTc%TPUH;W7Xok-hIeCmV5UFz^Twdn;~8>U#<@Y0F(wIf%cEH aUH=aX>8ZhCMN)GB0000|9H18`l-R!#}CtNY>9uEzw1hO@WF=fwrr9gbK*g3i?R{v=+4}nr>>UK+yt4 zVH!ozMHiwL1zL0w%Fd=J3ebB29w$K3Hg!$GNRT)POv;WFT9!1_hvILBy>DhnK8|L{ z8IrOkbsjvXI5Y3Q&pq$nbMJeS1MFg#4vWK{0=sltT+JR{`q}jKN2g0L|lZVeXI4eLR0K)owU}T&PjJ^!Mp%L)*4}!z(k-@pYo)&i3 zKILp6ogH@;clmo{>*Ma}g@MsAcxAXBD)?Y+x0gH*m2!I#{JdeIotV?>Wo5a69_U3& z^vd`U_?!+{&y`?P_ehlB6wpDV9vAuAy&jnw`Yogx^ zPOlHG$WX+B6`Dk09C9kOW+>C?hT(o9(~XxCg81q22hiHF+&6y}o3vGO`lGXu{6BIP z3CXlrD#BjA1bMLnMG2sQpB1r;FH~3yZ3LmB)FWhCEEV7&Ur=OCouI9f zv*6B9;bJk5{O16Q*=<;R@)+`^aqzgD@ND-03cCV``9sSM5df7Bb5PpL!shxDcprh< z=l6n;E5MO86!)``d$xff+Wd9q-aDouDU?}2nZ*5li^w85CvwTw?vTjbg~HAz3W^I+60T59@A`w_vCdPHQ6h%e1Z7oploGLd&$t0j$vQ^PWSy&mM<}w9~GwB!6 z4c%>zRp%(E)<|1ecynnA{(Q}PQt-{CE2|111&!<={4_QPe~B#HsIXi@)LcfvTJG+6 zK?M6d3GnrDfNqDlpIY$-kRfAS{^Q?;;MQ-g0cj_bfc|qpuHK;$m>LN{3B&sbTY2sf zc@Y*HL}w<%Ck4ZMIYrH)MH)H}Fnj^PhXBf?UiuB_!&AL>j>f`$ZAnlSbsk zW!d`$z*ffA#3?T3kAg5v_d>$KQ5a(T!Q)^~$1Ew_!!DLAkxudXd{9JdB6ZZ72izCG zipK3F81yi(RygtCxuymegvZ(YdYxJ#pOb;%Ar{=@lWhaY_l;L!^uh#;`5n;XWD4Hz38fia&0#{CRP6|%!p zu{H4jszAjVkC)M`Toq-6+kQ2%ExF0Jqvb_P0-kdSo)NS{z1X5qtbmXgp;RcEnT(jqOSI1f`TpX}Z4=;$ zsfyJ;OR6$x<%HFoi%~uX)Ssty7$ZWy~>-$hZR!l&FmZ)ZB2xt&IcLGk}(QSof@ZfVo#z|ziTdKgjs}JGn zM@ciQdXBOlM_ra;PG>0)L<}M;mIC3bM#eJbwm4non&)fLTANyzrEnpR0)13RN}K{v zSOs!cBPZR02ePu9#hKS?V^!)bXxa?7nD45Lbi)`HXO=W|W7d<6GLj@nfA|3Y{a6sl z$wWW8r%~dr#Gq!sz8cUfSuGKu+_e{yZu8pV2w^!#5Md*TcWjq!Pp&E7amWIW6C;+ zWQJXWwfFCY9|&TcxF?czCK1=TkEyvgVwnhcB1HUYUV{7EVl?}~ij|ce(iyyw2?p8p zHoCM~g9+4AF5hHw&6L?%Uz$f?2?IrjTY}JBNi-Q}np$vNlV~(yB8rS_IFkA3tfA~} z3lCqrFkkw|WBA&jGmPXK-5Cla;Xiuf9`Yal+sH}q$*vgQ_`$?7eD9ZLCn(r3*$Uq< zDx5|!cXedUqKsJ+?X?S{Ae9EVZhBk*w>9^L4v%sOZ9WfaqRv)@*Vc7)&}n$|-3#-D zzpue11k#|_fdsn()gwxuA4u>~Rt!IVeZs1F=DOfwxGt@3Gr1JHO|FB!zNn+Yp$3=O zst}+rtTZePSEoH#|Ng|h__wv>SNb6~(Zk4D=tujK@ae7;-hN}E)8np56DzFMO5>lC zGE%0LU{+aYF=O4VWL}?G%D$aWe4J&%=*d!>g-SxYI@yh*t`W7y&>d2O7=TP72Y z!O!X@_nuD?G!dQ|&f2gTy7pH=@;{nPZ~buM1_EliLjdtDA_;3Ux{*jU2I$=`^fgKG zzZY@jBxyhcOuN66_@`x(UEoCBkYTm0*)~DI8>9=KPib5TX67oQjR;R3h#GS$p{Cm! z#xibGyd&I!H4=0pt7f^TSX*w8R?u-;&enZs9$_kh1XlyUn$$e0f8;6#joTX6Oh!nc z6O~o>*et98QetD{t5zZQbsbD9{;oz4=~PxuVHM zMY>9?kHH$PVy7ce-wueW-+5@uG ztqUvR+I?jkK(U<4eIDvtFkyAaJ4soxYJW-2Dy^f$YF}8YuL-I?r}q2OG0b;b9Ycaz zxDoZcp!T^jK}u~So!mdSr=-|tDbNI=eoP|@_46{u?nc=LpjTN)RdSS49NVP+k`D3Y zjzlragmM(WVb%Us+X+)j2pYI>4vub5(Dj4IO1>2e5Yo(db*@4bk><2pGcH52SCN7s ziH!q3+yfBHJh(mWNnw;*R{;6-qe4yq#=$ok*lpF6hA690&B?Sr@I}IIa+apP znnIc!RPzIFWG7oO?^W<5K`$|=0BKs~G_#ad5!Cln(Cl!SGKP8i+);gjgf#WF+Y%|t zZMVvY#aq6kjNzhYz6GcsO0$2>-7d#d{wKfy3XzjDM;Z-D00000NkvXXu0mjfbiAuj literal 0 HcmV?d00001 diff --git a/static/images/meetecho-mini.png b/static/images/meetecho-mini.png new file mode 100644 index 0000000000000000000000000000000000000000..c9c6fdeb9b8ca686217b3f9e71cc61f0e3b6446f GIT binary patch literal 1567 zcmV+)2H^RLP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00oChL_t(o!|j*NZyVPY#eeV3 z3^_wlUd zW-5PS(Vog<+75BhC+IXc`>m7J+t;qP7_&+%Yb9w}6=%9ocBTuMsWd1>&}r?So*b>- zzIJsFK$KS2E=$YWnJCVYnz?{Il_xQoMM#6l_h{bxqq_LaI7v0qC zGuXL2$;=eeN)QKqx(Bsp`@z4;x368@Gl5OhnZUFitcf()*#ghaWYEBab{b$Q^g64+ zJ7YAUVkDEU=}cgzCP+^gc&?bkHY5jL$f1yK=yfZ=Pfdhyg)|UCBFzNPx@j&=nva>9 zZJT5!H?o1!%Gv@#l%;7Qq(mAPGnq7(CM|3O5(d;eDH4-z`6s`tEJy&9LPZgA7|`)U z{8$qx=*JozM}T(6IQ=4e@SKW5;;>K8?+-X*2o$I|LYgKzjuuU{CJuZezemtI;labt z@WUbr)8M$>qu*{4`={e(5EX?)rygOa#iN6Ve4rGQPLihA=d@WT^17%nzyyYgZzH6E z){2Mi2GX?9aZKoS@f*k0F|?}yaTpSM9b_VjMiY7+j;$nGE22}6-qGi1rK%>dtCcE; zUI);qC?x2%k%oy@G5vM}zj0g{Ref(`y;WLStDyC2==DH@3i?D|cW@}JiM%de{iss? z!#gceT3O2iyTB4cAWaLyvOow_7!U`+=HABom2>QY_kl7(APo~~SqNziauM{aXkFgh zSZ|3TI18)-%fR9jt$cfLWBt#Zvq~##Zwz^tp5WZv+gQK;6-EH?=Jo6lRQ^AX`#_aH zzO^^D`kU7;pTSv0>neX*y#WkDNVl=bxyIJyt5NAB1ih(kE-f}N%t#N1MO zjHFGJ{2$bh9>e6B1W$J2dzLXZOU})Zkl*Ay(|~Q;NIUiYl+6Uzr5BjFaFKlS=?6O7 zfFYR4xmd-8bBo(Ay~6C=JOxKGVF_YAh5>lL|G%Z}Xgty(GdvtLt~ z%~P-?MMt1CXstCa)YP;ex9TP~#xcIAy)={pa;RlA%v#cnZ|rQisPjv$v1v_p+% z90LjrF(4?|g1jx4(w5jYw`wn+^-N;B_EyFcI|WC$196Ev6mR-5VLuq%fYO>?q?t+# zh=xYoNlWY|wrg*EBQx8z_uPc23~-X7BbhV>UIZT=bf`C)Fir=2-{-I!5~#r_ijJf( zG?KN%W^%js9)R4cWu2R~k8(+|{1v9)2vUZi7in&N`WZ+6xeHI3|JRG?DWx?W9zEiY zc6sq)nv@|Z*kB5YDKw^3%gvj$MML1`l5%M}DVRwLa!G+D1+74H>*KrB|NH4+xt*1n zZ%vd|)c&!Lj-PM7_^j(XreIcrDZ!8uQ>d~j2f{P9z)c7YAvozP{`%qHY3<*Jsp7Xv z$Wd16gAd+c-fza6y-1T73KnhgcqBzfGBp(c!dHBB62INL^OuocSveA_bJD!~i@7V+ zlX$ZeYD_t3bC_*a@-Aj@ap`Pzt!W_dtHSBVy*diCvJY+h=2aYYvYN3cL>j@ zqu1uIw{F&UK52<%Q*i%LU+<{b7h31KGR}L^`M+7H`Q!a9{V*f=q3cHjUjl_iSFhKu RS114g002ovPDHLkV1jkW-?IP! literal 0 HcmV?d00001 diff --git a/static/images/meetecho-mini.xcf b/static/images/meetecho-mini.xcf new file mode 100644 index 0000000000000000000000000000000000000000..42f6feceaa290aaea722f6926ebd7d20096c2e85 GIT binary patch literal 3415 zcmcImdr(x@89%%72Hhx)j3(8!oo2LCy`X>!n3aGc1OzIH53rQT-DP>L12}>gTo8do zAv~(`l;tH45mZ1>c`Pm_p-mcUG@3>fSy&jWQzWcVgx%Zk+`H)2(m&dn+?jLFcfQ~6 zeCK4HZ+OD%@o_Pd21GEOVelpM2Ib8VP z1-vyr_F%{XX|zOWH+L2&6XsJIbZZYqOXGyn=mTM7EZ#2@i(|>Smk#3H|EXd%uW!Y9 zFg(1*ISFQ=Vc?7|^b3i_3H1(1AY)+7)C12ZFmQcn7-j|;Z!kB=FrjxjvIR%B|NLBMgENW;}q)m&1%7Av^flcrl5H^)Bu^wuv?&OZ0@W zb8_?WaNUFuVdt`aXTV4PAe*Cq5VlV4-n%~f{q{|WaM=3c{?uck{w@r#;r$(Zj;2TM zaz%urt4~5z)v*9K@RUb9aS(Y$Drz$KdTb;dK`beyb{P=+Egm8H<>|XU9f=Lj?mI)n zKla|r?peS21MfdX1n%5sPuM!Rxb5)rbl(IBpLlBT?CRm=xy@+<0f^HU(fb<-IG;~U z*>8r0lPx0n#0xun`}G9G0cyJqAQBLVF|i046V7PH%GuEzy@PZ-BY4j)u(klhIx{|6 zgl3FwR^!#|TT6|R6?$Rz&bkezuzs=lcgxNBApC2A#me>D?My(NUgTuA!io&&wLzn=)U&&u8;*7Ms95nKE1Y+b#Zqem2Mg zJ>@M62=sSZ^R_ACn=fDI8W8BW6fHz!D+2;|ZC$&}+-im0w%tKK)<}THSL_P<*xmM* zs~kM{26+kK3o-GYf6$&C_M3h71#MpjAByLze1rCR`vnHNy$hd%+2tPw1@Z!QTbCjm zG;QO&chANpXc?L@v$o+QIm&{9lTpY1RDAl=1YB@3JSnHB;A8?qWcaZ&H7%`;SqZqV zq$Dw~s;TXAegYz6Pn37wy4BN|$^g-6C2f7*^)_W8@u8FF{`&CYtt+{ZfybmcCPVQ> z|G@X{MTf<)8D(GG@Bg+5BRuknEVZcf@BO#0md24$^4z-ao2^x!u}H*`tjhMA*K1G7 zNJ&gePO+jSFP=rj2a~f3OV6H4iXzFdn55$wX@|w&0FRs$%Z{XGq$f%d$s?!5;j)7f zB!q$iY4pKJF?>`>V-ku^E&kwFM+SyY*45qj2AX5i`)+tnA%OorWF;WB>*xR z5Ezk^TbLcs00BW!@&ZL>%uAr?6_8U~&H*a&4Lkn$dEG@WaIP+gF}3GReN#&rv*S5) z#<|Pqt12M8$%^6&&F#(XDOwh4ZN6}>9In;#it2_d9XA?TaDo9V+d5hrsw?1jX)9|k zwsxsHstXviKQVAcv#PVTv8EDk*+gaCr8cFitKu|EP&0(0nr@Y{?NV(es;D~Obgf&} zl`lWVB^2gV1LG>VckV*-^&35%*->v0vZ+dC&yDNN^$jf@s-BL|AWN@X$c_)c2#ofY z)=pJV`+1zkHwpVuLsyTgvrE-;tsZd*m76 z6ljWLghSz@nX1~l3fy$_6QKS-2Y|n()bX=T?JZS#xVfn0{Ko57>+%qylFzn&{o{k% z^?A65sH0~te|hi0-L^bLovc==pFMkgyOaUa$~zv6jX(XN9wmNW+xt(g_SyYQa9z~K7XydtEJ#LMIAknUshF~lZcy(noP_%Ra#kbMvf>R zHJzA}o{>V~<^mu&?bFmm3Su#)pt&e$u3TuYTzw7{Vm3K5CzqEyTU?Neo9jqc*%hU- ztq%9lq2x0czq#96%K(Q`3Y+fq-z<9x+YlOf2h#AA+9zJ|@ zq`UA9LT|%emcihfYmlYaE%er&9%2~a%&10<(`X>DPBQt$4BiNDRI5=V4#VIjPBc<$ zMn^`$0OArjC4%NsYam`VZZ3`u4h5QPPz}LCbInhH`u`jNLbFITK=WyxLI5{XM<_vl zp@g4!U)q?~^$Fnq>WDGgh@KfE&=_q(>*b)*D?!pJ5p7EA$KZD8SJGxQ^8!qSW&C<2 z1Fa9!1fbOk@Me85Hj@p~Og0kq!2x;&H~@x?Xe}Iz1o8oz?(>Bo@af<_kYtb>oj@e# z%XPu{--ymvuH-9q*};%h*kw%X31|{inr~Q%{=XFt85||RF~$;v*+;+~*ZJb$8I>um z8xz6B*2^FoMq`e{0ZBodvkD7(MuDTUV3(GVt3KM2U4W-!^pZJQ=c~Z!lFu18re{S+ z0V`cFdZn8YAy698v%&CZ*x&}(5#iWnG!Go|1(6#(T&R`uU;%i=)&6e@;-P;7VV7qN literal 0 HcmV?d00001 diff --git a/static/images/projector2.png b/static/images/projector2.png new file mode 100644 index 0000000000000000000000000000000000000000..b6dcd54f0af4da036df41a54224e0256aeca85c3 GIT binary patch literal 2421 zcmV-*35xcKP)WdJfTFgPtRH7zkUX8pev0000b7gZcaCKsAX=7w>ZDDC{FImI> z$^ZZeD@jB_R9Je@fsBvFV+r~XcZH)td$@Sipa9A3XZ?B3!2<*~v-$ODWZd z{{zYpE1*>~*t!bmD<^T97fE|}SBzS%I;)f#p_J0tiSu&APw_(rM6dLuK^@#vzs56W z4voA#*`yR#lu{FvQuvnT(IYf$9L%6_#qs}8L>T%6%|1FF6@4;hS)9ck7vspeaLt#CQ>GkZ5orlEEQ_`=0UrD)iR`!3n zM*zEo+l_^$FrB?nZm4~;t*E2h_jAE;&qiUsg3}=$gJ+m7$sBhD!T&3+z znN?S8Hk;Y}$rb?gdObmHTibTDIM`gz!-q>g;zH_00N$A~4THg8Gmcbxj~&F?xb+;^ z_cs7Kb?!*$*fI8<%hme1Q>HCgiY+W%9K&AYegHam>BRbv*PzkZ*HK<^Sz^ueyV`6v zGjH|+jvhG%K=0r5VpZI7^!m!z0x#9o1@{Y>{D;VAq{BzN&DwRVDxxUY!e!-hUkUwF=Ev4D$rSV zwY^d+r9ACj9u_hlQ??0!vEiZg>=lf~VzK95CFqn=QCcmrfQtx^09;)xT)Ub^US2-F zzCPT$d+*r=+qUjt+twZEbUF7@elCFztpbZpdRgBZ&!h+d~@k^T4Gj3;oPht zEZm6eg)~^cppe9*EZ!P0kQq_anHVvi%*-ruOu6Ld+sI3#r&#eI}8Q`27{sOvZ4}+qAE7ms=lLn5Wfvm4Fm2iUPl)-kw-gX z5K}gE8v=RxaNH=gY@A8xm3%1h|GOb#Ly*i+-=f>8z)YaQ9BUV zp1($I_<%?2=OT&UL+{~G!wXIr!9{bGA%jK{`$1@x6R^1g5s@Q6>!0tkX4GW7gWllW znTw>?X^iWj!Km#YQMhOl7!zP{ICN+Q2X{ijPpP~$a1`@rj^xtCa~0XD@^%uDA`w{! z1ZL%sFfa_?cKt|7O(VT-6I^~b3UQG%F0L<%87qN0!e=&i)gb7LIthD{0Z( zPoh7VEy2NErDUCsIP2M4CjRsORRFbswZOyI8j^T&Z%G2#-yuo+xW8ZmmU;%nuLiPc z26FK@vLYI3AEXndknL+qi1m&VTP08%*a$po+K6vY7)j4hMRJpn9D{Npoj=BFaJ&LNi%leapG2W^@n?rzA~ z;mEi9ONg~vvVq1gOl+0Fr@$GYpsqhD#?55qry_ahk*mkZ-L#Orfjtm67o@s3;^#ww zQal2d0nVy4h{I4ytt~ZUfOmmuwQ7>L;(go({gwcLyZL1OkcRnGGJ*9BAVTqi4dmat zL&i%Ji^z=9u@^8EnCVlU!X>kD9{DDJGDkMx`j?r61c%`6_T-S0Rs+3+%@UI*+0 z^yQAb0@HvD4|nnwOegPpVo8%d$sL$-?fW-MK5<`=R1cUanT>t|{sgor=c5BgDaC1> zmclVZxw~ae>-3P3b(6GOmHk4cR!YqWh63)uIUpCrYjYWq7H$6>`vsolU`5s4@re-0FjNT@@B98}vIxC8iF9SbN`-OZ6$j($4@ n1JNRqXO*}KSPXP`B+&l=ZL%(OFLR3800000NkvXXu0mjfd<%B} literal 0 HcmV?d00001 diff --git a/static/images/projector2.svg b/static/images/projector2.svg new file mode 100644 index 000000000..3a8939380 --- /dev/null +++ b/static/images/projector2.svg @@ -0,0 +1,175 @@ + + + + + + + + + + image/svg+xml + + + 2008-05-15 + + + Jean Cartier + + + + fr-FR + + + hardware + computer + desk + business + + + + + Jean-Victor Balin (jean.victor.balin@gmail.com) + + + http://www.jcartier.net + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + diff --git a/static/js/agenda/agenda_edit.js b/static/js/agenda/agenda_edit.js index bcac2b6a8..08230dab0 100644 --- a/static/js/agenda/agenda_edit.js +++ b/static/js/agenda/agenda_edit.js @@ -19,16 +19,21 @@ //////////////-GLOBALS----//////////////////////////////////////// -var meeting_number = 0; // is the meeting name. -var schedule_id = 0; // what is the schedule we are editing. -var schedule_owner_href = ''; // who owns this schedule -var is_secretariat = false; -var meeting_objs = {}; // contains a list of session objects -- by session_id -var session_objs = {}; // contains a list of session objects -- by session_name -var slot_status = {}; // indexed by domid, contains an array of ScheduledSessions objects -var slot_objs = {}; // scheduledsession indexed by id. +// these need to be setup in landscape_edit's setup_slots() inline function: +//var meeting_number = 0; // is the meeting name. +//var schedule_id = 0; // what is the schedule we are editing. +//var schedule_name; // what is the schedule we are editing. +//var schedule_owner_href = ''; // who owns this schedule +//var scheduledsession_post_href; +//var meeting_base_url; +//var site_base_url; +//var total_rooms = 0; // the number of rooms +//var total_days = 0; // the number of days + +var is_secretariat = false; + +var agenda_globals; -var group_objs = {}; // list of working groups var area_directors = {}; // list of promises of area directors, index by href. var read_only = true; // it is true until we learn otherwise. @@ -47,9 +52,7 @@ var last_json_txt = ""; // last txt from a json call. var last_json_reply = []; // last parsed content var hidden_rooms = []; -var total_rooms = 0; // the number of rooms var hidden_days = []; -var total_days = 0; // the number of days /****************************************************/ @@ -67,21 +70,38 @@ $(document).ready(function() { This is ran at page load and sets up the entire page. */ function initStuff(){ + agenda_globals = new AgendaGlobals(); + //agenda_globals.__debug_session_move = true; + log("initstuff() running..."); - setup_slots(); - directorpromises = mark_area_directors(); + var directorpromises = []; + + /* define a slot for unscheduled items */ + var unassigned = new ScheduledSlot(); + unassigned.make_unassigned(); + + setup_slots(directorpromises); + mark_area_directors(directorpromises); log("setup_slots() ran"); droppable(); + log("droppable() ran"); $.when.apply($,directorpromises).done(function() { - /* can not load events until area director info has been loaded */ - log("droppable() ran"); + /* can not load events until area director info, + timeslots, sessions, and scheduledsessions + have been loaded + */ + log("loading/linking objects"); load_events(); log("load_events() ran"); find_meeting_no_room(); + calculate_name_select_box(); + calculate_room_select_box(); listeners(); droppable(); duplicate_sessions = find_double_timeslots(); + empty_info_table(); + count_sessions(); if(load_conflicts) { recalculate(null); @@ -90,7 +110,6 @@ function initStuff(){ static_listeners(); log("listeners() ran"); - calculate_name_select_box(); start_spin(); @@ -99,7 +118,7 @@ function initStuff(){ read_only_check(); stop_spin(); - meeting_objs_length = Object.keys(meeting_objs).length; + meeting_objs_length = Object.keys(agenda_globals.meeting_objs).length; /* Comment this out for fast loading */ //load_conflicts = false; @@ -134,7 +153,8 @@ function read_only_result(msg) { // XX go fetch the owner and display it. console.log("owner href:", schedule_owner_href); - empty_info_table(); + $("#pageloaded").show(); + listeners(); droppable(); } diff --git a/static/js/agenda/agenda_helpers.js b/static/js/agenda/agenda_helpers.js index f1402ab40..c132496a0 100644 --- a/static/js/agenda/agenda_helpers.js +++ b/static/js/agenda/agenda_helpers.js @@ -39,83 +39,25 @@ function log(text){ console.log(text); } - -/* move_slot - Moves a meeting(from) to a slot (to). - No checks are done to see if the slot it's moving to is free, - this can be considered a method of forcing a slot to a place. - - @params: - 'from' - meeting key (searching in meeting_objs[]) - 'to' - slot_status key (searching in slot_status[]) - -*/ - - - -var gfrom = null; -function move_slot(from,to){ - console.log("!!!"); - var meeting = meeting_objs[from]; - var from_slot = meeting_objs[from].slot_status_key; - - var to_slot = slot_status[to]; - - console.log(meeting_objs[from]); - console.log(from_slot); - - var result = update_to_slot(from, to, true); // true if the job succeeded - - if(result){ - if(update_from_slot(from,from_slot)){ - console.log("move_slot: success"); - }else{ - console.log("move_slot: fail"); - } - } - - meeting_objs[from].slot_status_key = to; - //***** do dajaxice call here ****** // - - var eTemplate = meeting.event_template() - - $("#session_"+from).remove(); - $("#"+to).append(eTemplate); - - var session_id = from; - var scheduledsession_id = slot_status[to].scheduledsession_id; - console.log(session_id); - console.log(scheduledsession_id); - // start_spin(); - Dajaxice.ietf.meeting.update_timeslot(dajaxice_callback, - { - 'schedule_id':schedule_id, - 'session_id':session_id, - 'scheduledsession_id': scheduledsession_id, - }); - - -} - function print_all(){ console.log("all"); - console.log(meeting_objs.length); - for(var i=0; i b.room) { + return 1; + } else { + return -1; + } + }; + if(a.starttime > b.starttime) { + return 1; + } else { + return -1; + } + } + if(a.day > b.day) { + return 1; + } else { + return -1; + } +} + var room_select_html = ""; function calculate_room_select_box() { var html = ""; room_select_html = html; - + return room_select_html; } -var name_select_html = ""; + +var name_select_html = undefined; var temp_sorted = null; function calculate_name_select_box(){ var html = ""; html = html + ""; html = html + ""; @@ -222,9 +275,26 @@ function insert_timeslotedit_cell(ssid) { html = html + ""; html = html + ""; - $(slot_id).html(html) - $(slot_id).addClass(roomtypeclass) + $(slot_id).addClass(roomtypeclass); + return roomtypeclass; +} + + +function insert_timeslotedit_cell(ts) { + var roomtype=ts.roomtype; + var domid =ts.domid; + var slot_id =("#" + domid); + + $(slot_id).removeClass("agenda_slot_unavailable") + $(slot_id).removeClass("agenda_slot_other") + $(slot_id).removeClass("agenda_slot_session") + $(slot_id).removeClass("agenda_slot_plenary") + $(slot_id).removeClass("agenda_slot_reserved") + $(slot_id).removeClass("no_timeslot"); + + var select_id = domid + "_select"; + var roomtypeclass = build_select_box(roomtype, domid, slot_id, select_id); $("#"+select_id).change(function(eventObject) { start_spin(); @@ -239,18 +309,68 @@ function insert_timeslotedit_cell(ssid) { } else { stop_spin(); for(var key in json) { - ssid[key]=json[key]; + ts[key]=json[key]; } - console.log("server replied, updating cell contents: "+ssid.roomtype); - insert_timeslotedit_cell(ssid); + console.log("server replied, updating cell contents: "+ts.roomtype); + insert_timeslotedit_cell(ts); } }, { - 'timeslot_id': ssid.timeslot_id, + 'meeting_num': meeting_number, + 'timeslot_id': ts.timeslot_id, 'purpose': newpurpose, }); }); +} +var __debug_object; +function create_timeslotedit_cell(slot_id) { + var roomtype = "unavailable"; + + __debug_object = object; + + var object = $(slot_id); + var room = object.attr('slot_room'); + var time = object.attr('slot_time'); + var duration=object.attr('slot_duration'); + var domid= object.attr('id'); + + //$(slot_id).removeClass("agenda_slot_unavailable") + $(slot_id).removeClass("agenda_slot_other") + $(slot_id).removeClass("agenda_slot_session") + $(slot_id).removeClass("agenda_slot_plenary") + $(slot_id).removeClass("agenda_slot_reserved") + + var select_id = domid + "_select"; + var roomtypeclass = build_select_box(roomtype, "default", slot_id, select_id); + + $("#"+select_id).change(function(eventObject) { + start_spin(); + var newpurpose = $("#"+select_id).val() + console.log("creating setting id: #"+select_id+" to "+newpurpose+" ("+roomtypeclass+")"); + + Dajaxice.ietf.meeting.update_timeslot_purpose( + function(json) { + if(json == "") { + console.log("No reply from server...."); + } else { + stop_spin(); + for(var key in json) { + ts[key]=json[key]; + } + console.log("server replied, updating cell contents: "+ts.roomtype); + insert_timeslotedit_cell(ts); + } + }, + { + 'timeslot_id': "0", /* 0 indicates to make a new one */ + 'meeting_num': meeting_number, + 'room_id': room, + 'time' : time, + 'duration':duration, + 'purpose': newpurpose, + }); + }); } /* diff --git a/static/js/jquery-ui-timepicker/jquery-ui-sliderAccess.js b/static/js/jquery-ui-timepicker/jquery-ui-sliderAccess.js new file mode 100644 index 000000000..b075c6698 --- /dev/null +++ b/static/js/jquery-ui-timepicker/jquery-ui-sliderAccess.js @@ -0,0 +1,91 @@ +/* + * jQuery UI Slider Access + * By: Trent Richardson [http://trentrichardson.com] + * Version 0.3 + * Last Modified: 10/20/2012 + * + * Copyright 2011 Trent Richardson + * Dual licensed under the MIT and GPL licenses. + * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt + * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt + * + */ + (function($){ + + $.fn.extend({ + sliderAccess: function(options){ + options = options || {}; + options.touchonly = options.touchonly !== undefined? options.touchonly : true; // by default only show it if touch device + + if(options.touchonly === true && !("ontouchend" in document)){ + return $(this); + } + + return $(this).each(function(i,obj){ + var $t = $(this), + o = $.extend({},{ + where: 'after', + step: $t.slider('option','step'), + upIcon: 'ui-icon-plus', + downIcon: 'ui-icon-minus', + text: false, + upText: '+', + downText: '-', + buttonset: true, + buttonsetTag: 'span', + isRTL: false + }, options), + $buttons = $('<'+ o.buttonsetTag +' class="ui-slider-access">'+ + ''+ + ''+ + ''); + + $buttons.children('button').each(function(j, jobj){ + var $jt = $(this); + $jt.button({ + text: o.text, + icons: { primary: $jt.data('icon') } + }) + .click(function(e){ + var step = $jt.data('step'), + curr = $t.slider('value'), + newval = curr += step*1, + minval = $t.slider('option','min'), + maxval = $t.slider('option','max'), + slidee = $t.slider("option", "slide") || function(){}, + stope = $t.slider("option", "stop") || function(){}; + + e.preventDefault(); + + if(newval < minval || newval > maxval){ + return; + } + + $t.slider('value', newval); + + slidee.call($t, null, { value: newval }); + stope.call($t, null, { value: newval }); + }); + }); + + // before or after + $t[o.where]($buttons); + + if(o.buttonset){ + $buttons.removeClass('ui-corner-right').removeClass('ui-corner-left').buttonset(); + $buttons.eq(0).addClass('ui-corner-left'); + $buttons.eq(1).addClass('ui-corner-right'); + } + + // adjust the width so we don't break the original layout + var bOuterWidth = $buttons.css({ + marginLeft: ((o.where === 'after' && !o.isRTL) || (o.where === 'before' && o.isRTL)? 10:0), + marginRight: ((o.where === 'before' && !o.isRTL) || (o.where === 'after' && o.isRTL)? 10:0) + }).outerWidth(true) + 5; + var tOuterWidth = $t.outerWidth(true); + $t.css('display','inline-block').width(tOuterWidth-bOuterWidth); + }); + } + }); + +})(jQuery); \ No newline at end of file diff --git a/static/js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js b/static/js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js new file mode 100644 index 000000000..644703ff4 --- /dev/null +++ b/static/js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js @@ -0,0 +1,2134 @@ +/*! jQuery Timepicker Addon - v1.4 - 2013-08-11 +* http://trentrichardson.com/examples/timepicker +* Copyright (c) 2013 Trent Richardson; Licensed MIT */ +(function ($) { + + /* + * Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded" + */ + $.ui.timepicker = $.ui.timepicker || {}; + if ($.ui.timepicker.version) { + return; + } + + /* + * Extend jQueryUI, get it started with our version number + */ + $.extend($.ui, { + timepicker: { + version: "1.4" + } + }); + + /* + * Timepicker manager. + * Use the singleton instance of this class, $.timepicker, to interact with the time picker. + * Settings for (groups of) time pickers are maintained in an instance object, + * allowing multiple different settings on the same page. + */ + var Timepicker = function () { + this.regional = []; // Available regional settings, indexed by language code + this.regional[''] = { // Default regional settings + currentText: 'Now', + closeText: 'Done', + amNames: ['AM', 'A'], + pmNames: ['PM', 'P'], + timeFormat: 'HH:mm', + timeSuffix: '', + timeOnlyTitle: 'Choose Time', + timeText: 'Time', + hourText: 'Hour', + minuteText: 'Minute', + secondText: 'Second', + millisecText: 'Millisecond', + microsecText: 'Microsecond', + timezoneText: 'Time Zone', + isRTL: false + }; + this._defaults = { // Global defaults for all the datetime picker instances + showButtonPanel: true, + timeOnly: false, + showHour: null, + showMinute: null, + showSecond: null, + showMillisec: null, + showMicrosec: null, + showTimezone: null, + showTime: true, + stepHour: 1, + stepMinute: 1, + stepSecond: 1, + stepMillisec: 1, + stepMicrosec: 1, + hour: 0, + minute: 0, + second: 0, + millisec: 0, + microsec: 0, + timezone: null, + hourMin: 0, + minuteMin: 0, + secondMin: 0, + millisecMin: 0, + microsecMin: 0, + hourMax: 23, + minuteMax: 59, + secondMax: 59, + millisecMax: 999, + microsecMax: 999, + minDateTime: null, + maxDateTime: null, + onSelect: null, + hourGrid: 0, + minuteGrid: 0, + secondGrid: 0, + millisecGrid: 0, + microsecGrid: 0, + alwaysSetTime: true, + separator: ' ', + altFieldTimeOnly: true, + altTimeFormat: null, + altSeparator: null, + altTimeSuffix: null, + pickerTimeFormat: null, + pickerTimeSuffix: null, + showTimepicker: true, + timezoneList: null, + addSliderAccess: false, + sliderAccessArgs: null, + controlType: 'slider', + defaultValue: null, + parse: 'strict' + }; + $.extend(this._defaults, this.regional['']); + }; + + $.extend(Timepicker.prototype, { + $input: null, + $altInput: null, + $timeObj: null, + inst: null, + hour_slider: null, + minute_slider: null, + second_slider: null, + millisec_slider: null, + microsec_slider: null, + timezone_select: null, + hour: 0, + minute: 0, + second: 0, + millisec: 0, + microsec: 0, + timezone: null, + hourMinOriginal: null, + minuteMinOriginal: null, + secondMinOriginal: null, + millisecMinOriginal: null, + microsecMinOriginal: null, + hourMaxOriginal: null, + minuteMaxOriginal: null, + secondMaxOriginal: null, + millisecMaxOriginal: null, + microsecMaxOriginal: null, + ampm: '', + formattedDate: '', + formattedTime: '', + formattedDateTime: '', + timezoneList: null, + units: ['hour', 'minute', 'second', 'millisec', 'microsec'], + support: {}, + control: null, + + /* + * Override the default settings for all instances of the time picker. + * @param {Object} settings object - the new settings to use as defaults (anonymous object) + * @return {Object} the manager object + */ + setDefaults: function (settings) { + extendRemove(this._defaults, settings || {}); + return this; + }, + + /* + * Create a new Timepicker instance + */ + _newInst: function ($input, opts) { + var tp_inst = new Timepicker(), + inlineSettings = {}, + fns = {}, + overrides, i; + + for (var attrName in this._defaults) { + if (this._defaults.hasOwnProperty(attrName)) { + var attrValue = $input.attr('time:' + attrName); + if (attrValue) { + try { + inlineSettings[attrName] = eval(attrValue); + } catch (err) { + inlineSettings[attrName] = attrValue; + } + } + } + } + + overrides = { + beforeShow: function (input, dp_inst) { + if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) { + return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst); + } + }, + onChangeMonthYear: function (year, month, dp_inst) { + // Update the time as well : this prevents the time from disappearing from the $input field. + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) { + tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst); + } + }, + onClose: function (dateText, dp_inst) { + if (tp_inst.timeDefined === true && $input.val() !== '') { + tp_inst._updateDateTime(dp_inst); + } + if ($.isFunction(tp_inst._defaults.evnts.onClose)) { + tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst); + } + } + }; + for (i in overrides) { + if (overrides.hasOwnProperty(i)) { + fns[i] = opts[i] || null; + } + } + + tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, { + evnts: fns, + timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker'); + }); + tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) { + return val.toUpperCase(); + }); + tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) { + return val.toUpperCase(); + }); + + // detect which units are supported + tp_inst.support = detectSupport( + tp_inst._defaults.timeFormat + + (tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') + + (tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : '')); + + // controlType is string - key to our this._controls + if (typeof(tp_inst._defaults.controlType) === 'string') { + if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') { + tp_inst._defaults.controlType = 'select'; + } + tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType]; + } + // controlType is an object and must implement create, options, value methods + else { + tp_inst.control = tp_inst._defaults.controlType; + } + + // prep the timezone options + var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60, + 0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840]; + if (tp_inst._defaults.timezoneList !== null) { + timezoneList = tp_inst._defaults.timezoneList; + } + var tzl = timezoneList.length, tzi = 0, tzv = null; + if (tzl > 0 && typeof timezoneList[0] !== 'object') { + for (; tzi < tzl; tzi++) { + tzv = timezoneList[tzi]; + timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) }; + } + } + tp_inst._defaults.timezoneList = timezoneList; + + // set the default units + tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) : + ((new Date()).getTimezoneOffset() * -1); + tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin : + tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour; + tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin : + tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute; + tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin : + tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second; + tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin : + tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec; + tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin : + tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec; + tp_inst.ampm = ''; + tp_inst.$input = $input; + + if (tp_inst._defaults.altField) { + tp_inst.$altInput = $(tp_inst._defaults.altField).css({ + cursor: 'pointer' + }).focus(function () { + $input.trigger("focus"); + }); + } + + if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) { + tp_inst._defaults.minDate = new Date(); + } + if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) { + tp_inst._defaults.maxDate = new Date(); + } + + // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime.. + if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) { + tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime()); + } + if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) { + tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime()); + } + if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) { + tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime()); + } + if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) { + tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime()); + } + tp_inst.$input.bind('focus', function () { + tp_inst._onFocus(); + }); + + return tp_inst; + }, + + /* + * add our sliders to the calendar + */ + _addTimePicker: function (dp_inst) { + var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val(); + + this.timeDefined = this._parseTime(currDT); + this._limitMinMaxDateTime(dp_inst, false); + this._injectTimePicker(); + }, + + /* + * parse the time string from input value or _setTime + */ + _parseTime: function (timeString, withDate) { + if (!this.inst) { + this.inst = $.datepicker._getInst(this.$input[0]); + } + + if (withDate || !this._defaults.timeOnly) { + var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat'); + try { + var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults); + if (!parseRes.timeObj) { + return false; + } + $.extend(this, parseRes.timeObj); + } catch (err) { + $.timepicker.log("Error parsing the date/time string: " + err + + "\ndate/time string = " + timeString + + "\ntimeFormat = " + this._defaults.timeFormat + + "\ndateFormat = " + dp_dateFormat); + return false; + } + return true; + } else { + var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults); + if (!timeObj) { + return false; + } + $.extend(this, timeObj); + return true; + } + }, + + /* + * generate and inject html for timepicker into ui datepicker + */ + _injectTimePicker: function () { + var $dp = this.inst.dpDiv, + o = this.inst.settings, + tp_inst = this, + litem = '', + uitem = '', + show = null, + max = {}, + gridSize = {}, + size = null, + i = 0, + l = 0; + + // Prevent displaying twice + if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) { + var noDisplay = ' style="display:none;"', + html = '
' + '
' + o.timeText + '
' + + '
'; + + // Create the markup + for (i = 0, l = this.units.length; i < l; i++) { + litem = this.units[i]; + uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1); + show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem]; + + // Added by Peter Medeiros: + // - Figure out what the hour/minute/second max should be based on the step values. + // - Example: if stepMinute is 15, then minMax is 45. + max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10); + gridSize[litem] = 0; + + html += '
' + o[litem + 'Text'] + '
' + + '
'; + + if (show && o[litem + 'Grid'] > 0) { + html += '
'; + + if (litem === 'hour') { + for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) { + gridSize[litem]++; + var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o); + html += ''; + } + } + else { + for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) { + gridSize[litem]++; + html += ''; + } + } + + html += '
' + tmph + '' + ((m < 10) ? '0' : '') + m + '
'; + } + html += '
'; + } + + // Timezone + var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone; + html += '
' + o.timezoneText + '
'; + html += '
'; + + // Create the elements from string + html += '
'; + var $tp = $(html); + + // if we only want time picker... + if (o.timeOnly === true) { + $tp.prepend('
' + '
' + o.timeOnlyTitle + '
' + '
'); + $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide(); + } + + // add sliders, adjust grids, add events + for (i = 0, l = tp_inst.units.length; i < l; i++) { + litem = tp_inst.units[i]; + uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1); + show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem]; + + // add the slider + tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]); + + // adjust the grid and add click event + if (show && o[litem + 'Grid'] > 0) { + size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']); + $tp.find('.ui_tpicker_' + litem + ' table').css({ + width: size + "%", + marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"), + marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0', + borderCollapse: 'collapse' + }).find("td").click(function (e) { + var $t = $(this), + h = $t.html(), + n = parseInt(h.replace(/[^0-9]/g), 10), + ap = h.replace(/[^apm]/ig), + f = $t.data('for'); // loses scope, so we use data-for + + if (f === 'hour') { + if (ap.indexOf('p') !== -1 && n < 12) { + n += 12; + } + else { + if (ap.indexOf('a') !== -1 && n === 12) { + n = 0; + } + } + } + + tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n); + + tp_inst._onTimeChange(); + tp_inst._onSelectHandler(); + }).css({ + cursor: 'pointer', + width: (100 / gridSize[litem]) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + } // end if grid > 0 + } // end for loop + + // Add timezone options + this.timezone_select = $tp.find('.ui_tpicker_timezone').append('').find("select"); + $.fn.append.apply(this.timezone_select, + $.map(o.timezoneList, function (val, idx) { + return $("
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 +
x
+ Mon (2013-12-02) + 		+
+
+
+ 		+
x
+ Tue (2013-12-03) + + 		+
+
+
+
0900-1130 1300-1500 0900-1130
+
X
+
apple (61)
+ + +
+
X
+
orange (70)
+ + +
+
X
+
grape (80)
+ + +
+
X
+
pineapple (90)
+ + +
+
X
+
tomato (100)
+ + +
+
X
+
squash (110)
+ + +
+
X
+
raisin (120)
+ + +
+
X
+
cucumber (130)
+ + +
+ + + +
+ + +
+
Session Information:
+ +
+
+ + + + +
Group: +
Name:
Area:
+
+ +
+ + + + + +
Duration/Capacity:
Location:
Responsible AD:
Requested By:
+
+ +
+
Special Requests
+ + + + + + + + + + + +
+ Group conflicts + +
    +
+
+ be present + +
    +
+
+
+
+
+ +
+
+ +
+
+ + APP + + GEN + + INT + + IRTF + + OPS + + RAI + + RTG + + SEC + + TSV + +
+
+ +
+ +
Agenda name: mtg_83
+
+
+

+ +
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + From 91d0261c9e2f16db7f2b57f901ea37754d7767fe Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 3 Feb 2014 15:43:22 +0000 Subject: [PATCH 03/21] Django 1.4 changed how to get to request entities. See - Legacy-Id: 7200 --- ietf/meeting/ajax.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index de84aa811..1ded28ecd 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -486,7 +486,7 @@ def scheduledsessions_post(request, meeting, schedule): content_type="application/json") # get JSON out of raw body. XXX should check Content-Type! - newvalues = json.loads(request.raw_post_data) + newvalues = json.loads(request.body) if not ("session_id" in newvalues) or not ("timeslot_id" in newvalues): return HttpResponse(json.dumps({'error':'missing values, timeslot_id and session_id required'}), status = 406, From accbf3db720c1ac90601433d62075f72ed65e8bd Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 3 Feb 2014 21:15:28 +0000 Subject: [PATCH 04/21] Cleaned up some exceptions that were leading to quiet 500s when setting an official agenda. The secretariat code being reused expects querysets, not lists. Some objects needed to be saved before other functions tried to operate on them. - Legacy-Id: 7201 --- ietf/meeting/models.py | 6 +++--- ietf/secr/meetings/views.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 8c0364cca..4b182c206 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -208,9 +208,9 @@ class Meeting(models.Model): def set_official_agenda(self, agenda): if self.agenda != agenda: self.agenda = agenda + self.save() if self.agenda is not None: self.agenda.sendEmail() - self.save() class Meta: ordering = ["-date", ] @@ -612,9 +612,9 @@ class Schedule(models.Model): if session.status.slug == "schedw": session.status_id = "sched" session.scheduled = datetime.datetime.now() - import ietf.secr.meetings.views - ietf.secr.meetings.views.send_notification(None, [session]) session.save() + from ietf.secr.meetings.views import send_notification + send_notification(None, Session.objects.filter(id=session.id)) # to be renamed ScheduleTimeslotSessionAssignments (stsa) class ScheduledSession(models.Model): diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index 0e0fa7d1b..781c6a73a 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -172,7 +172,7 @@ def send_notification(request, sessions): to_email = sessions[0].requested_by.role_email('chair').address cc_list = get_cc_list(group, requestinguser) from_email = ('"IETF Secretariat"','agenda@ietf.org') - if sessions.count() == 1: + if len(sessions) == 1: subject = '%s - Requested session has been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number) else: subject = '%s - Requested sessions have been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number) @@ -198,6 +198,8 @@ def send_notification(request, sessions): context['agenda_note'] = sessions[0].agenda_note context['session'] = get_initial_session(sessions) context['session_info'] = session_info + context['group'] = group + context['login'] = sessions[0].requested_by send_mail(request, to_email, From 7c90ea5aa3a0a90498b7d7a418b1f91049ec22f3 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 20 Feb 2014 21:50:37 +0000 Subject: [PATCH 05/21] Merged in Michael's update to newer dajaxice. Repaired the existing tests in trunk except for one. That one points to a real bug in the code - the access protection for the functions that change visible and public for an agenda are not right, leading to pages that can't work (see the failing test for more notes). This should be ready to start porting the updated tests into the make_test_data framework. - Legacy-Id: 7283 --- django-dajaxice/.travis.yml | 33 +++ django-dajaxice/AUTHORS | 18 ++ django-dajaxice/COPYING | 62 +++++ django-dajaxice/MANIFEST.in | 8 + django-dajaxice/README.rst | 19 ++ .../dajaxice}/__init__.py | 0 .../dajaxice}/core/Dajaxice.py | 0 .../dajaxice}/core/__init__.py | 0 .../dajaxice}/decorators.py | 0 .../dajaxice}/exceptions.py | 0 .../dajaxice}/finders.py | 0 .../dajaxice}/models.py | 0 .../templates/dajaxice/dajaxice.core.js | 0 .../dajaxice/dajaxice_function_loop.js | 0 .../dajaxice/dajaxice_module_loop.js | 0 .../dajaxice}/templatetags/__init__.py | 0 .../templatetags/dajaxice_templatetags.py | 0 .../dajaxice}/tests/__init__.py | 0 .../dajaxice}/tests/ajax.py | 14 +- .../dajaxice}/tests/requirements.txt | 0 .../dajaxice}/tests/urls.py | 0 .../dajaxice}/urls.py | 2 +- .../dajaxice}/utils.py | 0 .../dajaxice}/views.py | 6 +- django-dajaxice/docs/Makefile | 130 ++++++++++ django-dajaxice/docs/available-settings.rst | 38 +++ django-dajaxice/docs/changelog.rst | 124 ++++++++++ django-dajaxice/docs/conf.py | 224 ++++++++++++++++++ .../docs/custom-error-callbacks.rst | 31 +++ django-dajaxice/docs/index.rst | 45 ++++ django-dajaxice/docs/installation.rst | 92 +++++++ django-dajaxice/docs/migrating-to-05.rst | 55 +++++ .../docs/production-environment.rst | 7 + django-dajaxice/docs/quickstart.rst | 80 +++++++ django-dajaxice/docs/utils.rst | 16 ++ django-dajaxice/examples/examples/__init__.py | 0 django-dajaxice/examples/examples/settings.py | 177 ++++++++++++++ django-dajaxice/examples/examples/urls.py | 25 ++ django-dajaxice/examples/examples/wsgi.py | 28 +++ django-dajaxice/examples/manage.py | 10 + django-dajaxice/examples/simple/__init__.py | 0 django-dajaxice/examples/simple/ajax.py | 26 ++ django-dajaxice/examples/simple/models.py | 3 + .../simple/templates/simple/index.html | 13 + django-dajaxice/examples/simple/tests.py | 16 ++ django-dajaxice/examples/simple/views.py | 9 + django-dajaxice/setup.py | 31 +++ ietf/meeting/models.py | 2 +- ietf/meeting/test_data.py | 4 +- ietf/meeting/tests_api.py | 82 ++++--- ietf/meeting/tests_views.py | 2 +- ietf/secr/sreq/tests.py | 16 +- ietf/settings.py | 4 + 53 files changed, 1401 insertions(+), 51 deletions(-) create mode 100644 django-dajaxice/.travis.yml create mode 100644 django-dajaxice/AUTHORS create mode 100644 django-dajaxice/COPYING create mode 100644 django-dajaxice/MANIFEST.in create mode 100644 django-dajaxice/README.rst rename {dajaxice => django-dajaxice/dajaxice}/__init__.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/core/Dajaxice.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/core/__init__.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/decorators.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/exceptions.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/finders.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/models.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/templates/dajaxice/dajaxice.core.js (100%) rename {dajaxice => django-dajaxice/dajaxice}/templates/dajaxice/dajaxice_function_loop.js (100%) rename {dajaxice => django-dajaxice/dajaxice}/templates/dajaxice/dajaxice_module_loop.js (100%) rename {dajaxice => django-dajaxice/dajaxice}/templatetags/__init__.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/templatetags/dajaxice_templatetags.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/tests/__init__.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/tests/ajax.py (66%) rename {dajaxice => django-dajaxice/dajaxice}/tests/requirements.txt (100%) rename {dajaxice => django-dajaxice/dajaxice}/tests/urls.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/urls.py (81%) rename {dajaxice => django-dajaxice/dajaxice}/utils.py (100%) rename {dajaxice => django-dajaxice/dajaxice}/views.py (92%) create mode 100644 django-dajaxice/docs/Makefile create mode 100644 django-dajaxice/docs/available-settings.rst create mode 100644 django-dajaxice/docs/changelog.rst create mode 100644 django-dajaxice/docs/conf.py create mode 100644 django-dajaxice/docs/custom-error-callbacks.rst create mode 100644 django-dajaxice/docs/index.rst create mode 100644 django-dajaxice/docs/installation.rst create mode 100644 django-dajaxice/docs/migrating-to-05.rst create mode 100644 django-dajaxice/docs/production-environment.rst create mode 100644 django-dajaxice/docs/quickstart.rst create mode 100644 django-dajaxice/docs/utils.rst create mode 100644 django-dajaxice/examples/examples/__init__.py create mode 100644 django-dajaxice/examples/examples/settings.py create mode 100644 django-dajaxice/examples/examples/urls.py create mode 100644 django-dajaxice/examples/examples/wsgi.py create mode 100644 django-dajaxice/examples/manage.py create mode 100644 django-dajaxice/examples/simple/__init__.py create mode 100644 django-dajaxice/examples/simple/ajax.py create mode 100644 django-dajaxice/examples/simple/models.py create mode 100644 django-dajaxice/examples/simple/templates/simple/index.html create mode 100644 django-dajaxice/examples/simple/tests.py create mode 100644 django-dajaxice/examples/simple/views.py create mode 100644 django-dajaxice/setup.py diff --git a/django-dajaxice/.travis.yml b/django-dajaxice/.travis.yml new file mode 100644 index 000000000..f8040fa4d --- /dev/null +++ b/django-dajaxice/.travis.yml @@ -0,0 +1,33 @@ +language: python +python: + - "2.6" + - "2.7" + - "3.2" + +env: + - DJANGO=django==1.3 + - DJANGO=django==1.4 + - DJANGO=https://github.com/django/django/tarball/stable/1.5.x + +install: + - pip install -q $DJANGO --use-mirrors + - pip install https://github.com/jorgebastida/django-app-test-runner/zipball/master + +script: + - app-test-runner dajaxice dajaxice + +branches: + only: + - master + - develop + +matrix: + exclude: + # Django < 1.5 not supported on python 3 + - python: "3.2" + env: DJANGO=django==1.3 + - python: "3.2" + env: DJANGO=django==1.4 + # Django 1.5 strongly recommends python 2.7 or later (so skip 2.6) + - python: "2.6" + env: DJANGO=https://github.com/django/django/tarball/stable/1.5.x diff --git a/django-dajaxice/AUTHORS b/django-dajaxice/AUTHORS new file mode 100644 index 000000000..7eb410402 --- /dev/null +++ b/django-dajaxice/AUTHORS @@ -0,0 +1,18 @@ +Glue is mainly developed and maintained by Jorge Bastida + +A big thanks to all the contributors: +Angel Abad for the Debian and Ubuntu distribution package. +Denis Darii +Florian Le Goff +Youen Péron <@youen> +Clément Nodet +Francisco Vianna <@fvianna> +Paweł Krawczyk <@kravietz> +Michael Fladischer +Anton Agestam +Michal Hořejšek +Ken <@kkansky> + +And the authors of: +XmlHttpRequest.js project (License inside COPYING) +json2.js Library (License inside COPYING) diff --git a/django-dajaxice/COPYING b/django-dajaxice/COPYING new file mode 100644 index 000000000..a9456831d --- /dev/null +++ b/django-dajaxice/COPYING @@ -0,0 +1,62 @@ +# django-dajaxixe License ################################################ + + Copyright (c) 2009-2012 Benito Jorge Bastida + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + 3. Neither the name of the author nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +# XMLHttpRequest.js License ################################################ + + XMLHttpRequest.js Copyright (C) 2008 Sergey Ilinsky (http://www.ilinsky.com) + + This work is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This work is distributed in the hope that it will be useful, + but without any warranty; without even the implied warranty of + merchantability or fitness for a particular purpose. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# json2.js License ########################################################### + + http://www.json.org/json2.js 2009-09-29 + + Public Domain. NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + See http://www.JSON.org/js.html + You are free to copy, modify, or redistribute. + +################################################################################ diff --git a/django-dajaxice/MANIFEST.in b/django-dajaxice/MANIFEST.in new file mode 100644 index 000000000..c51b67d83 --- /dev/null +++ b/django-dajaxice/MANIFEST.in @@ -0,0 +1,8 @@ +include *.py +include COPYING +include AUTHORS +recursive-include dajaxice * +recursive-exclude dajaxice *.pyc +recursive-include examples * +recursive-exclude examples *.pyc +recursive-include docs * diff --git a/django-dajaxice/README.rst b/django-dajaxice/README.rst new file mode 100644 index 000000000..cb2f6b580 --- /dev/null +++ b/django-dajaxice/README.rst @@ -0,0 +1,19 @@ +django-dajaxice +=============== + +Dajaxice is the communication core of dajaxproject. It's main goal is to trivialize the asynchronous communication within the django server side code and your js code. + +dajaxice is JS-framework agnostic and focuses on decoupling the presentation logic from the server-side logic. dajaxice only requieres 5 minutes to start working. + +Project Aims +------------ + + * Isolate the communication between the client and the server. + * JS Framework agnostic (No Prototype, JQuery... needed ). + * Presentation logic outside the views (No presentation code inside ajax functions). + * Lightweight. + * Crossbrowsing ready. + * Unobtrusive standard-compliant (W3C) XMLHttpRequest 1.0 object usage. + +Official site http://dajaxproject.com +Documentation http://readthedocs.org/projects/django-dajaxice/ diff --git a/dajaxice/__init__.py b/django-dajaxice/dajaxice/__init__.py similarity index 100% rename from dajaxice/__init__.py rename to django-dajaxice/dajaxice/__init__.py diff --git a/dajaxice/core/Dajaxice.py b/django-dajaxice/dajaxice/core/Dajaxice.py similarity index 100% rename from dajaxice/core/Dajaxice.py rename to django-dajaxice/dajaxice/core/Dajaxice.py diff --git a/dajaxice/core/__init__.py b/django-dajaxice/dajaxice/core/__init__.py similarity index 100% rename from dajaxice/core/__init__.py rename to django-dajaxice/dajaxice/core/__init__.py diff --git a/dajaxice/decorators.py b/django-dajaxice/dajaxice/decorators.py similarity index 100% rename from dajaxice/decorators.py rename to django-dajaxice/dajaxice/decorators.py diff --git a/dajaxice/exceptions.py b/django-dajaxice/dajaxice/exceptions.py similarity index 100% rename from dajaxice/exceptions.py rename to django-dajaxice/dajaxice/exceptions.py diff --git a/dajaxice/finders.py b/django-dajaxice/dajaxice/finders.py similarity index 100% rename from dajaxice/finders.py rename to django-dajaxice/dajaxice/finders.py diff --git a/dajaxice/models.py b/django-dajaxice/dajaxice/models.py similarity index 100% rename from dajaxice/models.py rename to django-dajaxice/dajaxice/models.py diff --git a/dajaxice/templates/dajaxice/dajaxice.core.js b/django-dajaxice/dajaxice/templates/dajaxice/dajaxice.core.js similarity index 100% rename from dajaxice/templates/dajaxice/dajaxice.core.js rename to django-dajaxice/dajaxice/templates/dajaxice/dajaxice.core.js diff --git a/dajaxice/templates/dajaxice/dajaxice_function_loop.js b/django-dajaxice/dajaxice/templates/dajaxice/dajaxice_function_loop.js similarity index 100% rename from dajaxice/templates/dajaxice/dajaxice_function_loop.js rename to django-dajaxice/dajaxice/templates/dajaxice/dajaxice_function_loop.js diff --git a/dajaxice/templates/dajaxice/dajaxice_module_loop.js b/django-dajaxice/dajaxice/templates/dajaxice/dajaxice_module_loop.js similarity index 100% rename from dajaxice/templates/dajaxice/dajaxice_module_loop.js rename to django-dajaxice/dajaxice/templates/dajaxice/dajaxice_module_loop.js diff --git a/dajaxice/templatetags/__init__.py b/django-dajaxice/dajaxice/templatetags/__init__.py similarity index 100% rename from dajaxice/templatetags/__init__.py rename to django-dajaxice/dajaxice/templatetags/__init__.py diff --git a/dajaxice/templatetags/dajaxice_templatetags.py b/django-dajaxice/dajaxice/templatetags/dajaxice_templatetags.py similarity index 100% rename from dajaxice/templatetags/dajaxice_templatetags.py rename to django-dajaxice/dajaxice/templatetags/dajaxice_templatetags.py diff --git a/dajaxice/tests/__init__.py b/django-dajaxice/dajaxice/tests/__init__.py similarity index 100% rename from dajaxice/tests/__init__.py rename to django-dajaxice/dajaxice/tests/__init__.py diff --git a/dajaxice/tests/ajax.py b/django-dajaxice/dajaxice/tests/ajax.py similarity index 66% rename from dajaxice/tests/ajax.py rename to django-dajaxice/dajaxice/tests/ajax.py index 7d62d2e88..0fe1360bd 100644 --- a/dajaxice/tests/ajax.py +++ b/django-dajaxice/dajaxice/tests/ajax.py @@ -1,4 +1,4 @@ -import json +from django.utils import simplejson from dajaxice.decorators import dajaxice_register @@ -9,7 +9,7 @@ def test_registered_function(request): @dajaxice_register def test_string(request): - return json.dumps({'string': 'hello world'}) + return simplejson.dumps({'string': 'hello world'}) @dajaxice_register @@ -19,25 +19,25 @@ def test_ajax_exception(request): @dajaxice_register def test_foo(request): - return json.dumps({'foo': 'bar'}) + return simplejson.dumps({'foo': 'bar'}) @dajaxice_register def test_foo_with_params(request, param1): - return json.dumps({'param1': param1}) + return simplejson.dumps({'param1': param1}) @dajaxice_register(method='GET') def test_get_register(request): - return json.dumps({'foo': 'user'}) + return simplejson.dumps({'foo': 'user'}) @dajaxice_register(method='GET', name="get_user_data") def test_get_with_name_register(request): - return json.dumps({'bar': 'user'}) + return simplejson.dumps({'bar': 'user'}) @dajaxice_register(method='GET', name="get_multi") @dajaxice_register(name="post_multi") def test_multi_register(request): - return json.dumps({'foo': 'multi'}) + return simplejson.dumps({'foo': 'multi'}) diff --git a/dajaxice/tests/requirements.txt b/django-dajaxice/dajaxice/tests/requirements.txt similarity index 100% rename from dajaxice/tests/requirements.txt rename to django-dajaxice/dajaxice/tests/requirements.txt diff --git a/dajaxice/tests/urls.py b/django-dajaxice/dajaxice/tests/urls.py similarity index 100% rename from dajaxice/tests/urls.py rename to django-dajaxice/dajaxice/tests/urls.py diff --git a/dajaxice/urls.py b/django-dajaxice/dajaxice/urls.py similarity index 81% rename from dajaxice/urls.py rename to django-dajaxice/dajaxice/urls.py index 767dc500b..c920d1991 100644 --- a/dajaxice/urls.py +++ b/django-dajaxice/dajaxice/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import * +from django.conf.urls import patterns, url, include from .views import DajaxiceRequest urlpatterns = patterns('dajaxice.views', diff --git a/dajaxice/utils.py b/django-dajaxice/dajaxice/utils.py similarity index 100% rename from dajaxice/utils.py rename to django-dajaxice/dajaxice/utils.py diff --git a/dajaxice/views.py b/django-dajaxice/dajaxice/views.py similarity index 92% rename from dajaxice/views.py rename to django-dajaxice/dajaxice/views.py index b1c8adc63..b25c6850c 100644 --- a/dajaxice/views.py +++ b/django-dajaxice/dajaxice/views.py @@ -1,6 +1,7 @@ -import logging, json +import logging from django.conf import settings +import json from django.views.generic.base import View from django.http import HttpResponse, Http404 @@ -50,11 +51,10 @@ class DajaxiceRequest(View): try: response = function.call(request, **data) except Exception: - raise # always give us a backtrace if settings.DEBUG: raise response = dajaxice_config.DAJAXICE_EXCEPTION - return HttpResponse(response, mimetype="application/x-json") + return HttpResponse(response, content_type="application/x-json") else: raise FunctionNotCallableError(name) diff --git a/django-dajaxice/docs/Makefile b/django-dajaxice/docs/Makefile new file mode 100644 index 000000000..580eafcb4 --- /dev/null +++ b/django-dajaxice/docs/Makefile @@ -0,0 +1,130 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = _build + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . + +.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf $(BUILDDIR)/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/django-dajaxice.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/django-dajaxice.qhc" + +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/django-dajaxice" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/django-dajaxice" + @echo "# devhelp" + +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + make -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." diff --git a/django-dajaxice/docs/available-settings.rst b/django-dajaxice/docs/available-settings.rst new file mode 100644 index 000000000..ac70aee5c --- /dev/null +++ b/django-dajaxice/docs/available-settings.rst @@ -0,0 +1,38 @@ +Available Settings +================== + +DAJAXICE_MEDIA_PREFIX +--------------------- + +This will be the namespace that dajaxice will use as endpoint. + +Defaults to ``dajaxice`` + +Optional: ``True`` + +DAJAXICE_XMLHTTPREQUEST_JS_IMPORT +--------------------------------- + +Include XmlHttpRequest.js inside dajaxice.core.js + +Defaults to ``True`` + +Optional: ``True`` + +DAJAXICE_JSON2_JS_IMPORT +------------------------ + +Include json2.js inside dajaxice.core.js + +Defaults to ``True`` + +Optional: ``True`` + +DAJAXICE_EXCEPTION +------------------ + +Default data sent when an exception occurs. + +Defaults to ``"DAJAXICE_EXCEPTION"`` + +Optional: ``True`` diff --git a/django-dajaxice/docs/changelog.rst b/django-dajaxice/docs/changelog.rst new file mode 100644 index 000000000..7304a432d --- /dev/null +++ b/django-dajaxice/docs/changelog.rst @@ -0,0 +1,124 @@ +Changelog +========= + +0.5.5 +^^^^^ +* Return XMLHttpRequest from concreate functions as well as from function call. +* Fixed django 1.5 compatibility: Content-Type have to be application/x-www-form-urlencoded otherwise Django discards POST data. +* Fix JS generation errors +* Fix @dajaxice_register legacy decorator + +0.5.4.1 +^^^^^^^ +* Fix JS generation errors. + +0.5.4 +^^^^^ +* Fix JS generation errors. + +0.5.3 +^^^^^ +* Fix some Windows bugs. +* Fix some JS generation errors. +* Make dajaxice use CSRF_COOKIE_NAME. + +0.5.2 +^^^^^ +* Fix GET dajaxice requests in order to send args as part of the url. + +0.5.1 +^^^^^ +* Make django-dajaxice work with django 1.3 +* Fix installation steps +* Update json2.js + +0.5 +^^^ +* General Project clean-up +* Django>=1.3 is now a requirement +* Fixed numerous CSRF issues +* Dajaxice now use django.contrib.staticfiles +* Fix SERVER_ROOT_URL issues +* Fixed js_core issues accepting multiple arguments +* New upgraded documentation +* Marketing site (http://dajaxproject.com) is now open-source +* Fix JS generation issues +* Travis-ci integration + + +0.2 +^^^ +* Fix bug with the 'is_callback_a_function' variable in dajaxice.core.js +* Fix bug with csrftoken in landing pages using dajaxice. +* Improve reliability handling server errors. +* Exception handling was fully rewritten. Dajaxice default_error_callback is now configurable using Dajaxice.setup. +* Custom error messages per dajaxice call. +* Dajaxice now propagate docstrings to javascript dajaxice functions. +* Added DAJAXICE_JS_DOCSTRINGS to configure docstrings propagation behaviour, default=False. +* Updated installation guide for compatibility with django 1.3 +* dajaxice now uses the logger 'dajaxice' and not 'dajaxice.DajaxiceRequest' +* Documentation Updated. + +0.1.8.1 +^^^^^^^ +* Fixed bug #25 related to CSRF verification on Django 1.2.5 + +0.1.8 +^^^^^ +* Add build dir to ignores +* Remove MANIFEST file and auto-generate it through MANIFEST.in +* Add MANIFEST to ignores +* Include examples and docs dirs to source distribution +* Add long_description to setup.py +* Fixed Flaw in AJAX CSRF handling (X-CSRFToken Django 1.2.5) + +0.1.7 +^^^^^ +* Fixing dajaxice callback model to improve security against XSS attacks. +* Dajaxice callbacks should be passed as functions and not as strings. +* Old string-callback maintained for backward compatibility.(usage not recommended) +* New documentation using Sphinx +* Adding a decorators.py file with a helper decorator to register functions (Douglas Soares de Andrade) + +0.1.6 +^^^^^ +* Fixing registration bugs +* Added some tests + +0.1.5 +^^^^^ +* Now dajaxice functions must be registered using dajaxice_functions.register instead of adding that functions to DAJAXICE_FUNCTIONS list inside settings.py. This pattern is very similar to django.contrib.admin model registration. +* Now dajaxice functions could be placed inside any module depth. +* With this approach dajaxice app reusability was improved. +* Old style registration (using DAJAXICE_FUNCTIONS) works too, but isn't recommended. +* New tests added. + +0.1.3 +^^^^^ +* CSRF middleware buf fixed +* Improved production and development logging +* New custom Exception message +* New notify_exception to send traceback to admins +* Fixed semicolon issues +* Fixed unicode errors +* Fixed generate_static_dajaxice before easy_install usage +* Fixed IE6 bug in dajaxice.core.js + +0.1.2 +^^^^^ +* New and cleaned setup.py + +0.1.1 +^^^^^ +* json2.js and XMLHttpRequest libs included +* New settings DAJAXICE_XMLHTTPREQUEST_JS_IMPORT and DAJAXICE_JSON2_JS_IMPORT + +0.1.0 +^^^^^ +* dajaxice AJAX functions now receive parameters as function arguments. +* dajaxice now uses standard python logging +* some bugs fixed + +0.0.1 +^^^^^ +* First Release diff --git a/django-dajaxice/docs/conf.py b/django-dajaxice/docs/conf.py new file mode 100644 index 000000000..e6e8445f7 --- /dev/null +++ b/django-dajaxice/docs/conf.py @@ -0,0 +1,224 @@ +# -*- coding: utf-8 -*- +# +# django-dajaxice documentation build configuration file, created by +# sphinx-quickstart on Fri May 25 08:02:23 2012. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = [] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'django-dajaxice' +copyright = u'2012, Jorge Bastida' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +import pkg_resources +try: + release = pkg_resources.get_distribution('django-dajaxice').version +except pkg_resources.DistributionNotFound: + print 'To build the documentation, The distribution information of django-dajaxice' + print 'Has to be available. Either install the package into your' + print 'development environment or run "setup.py develop" to setup the' + print 'metadata. A virtualenv is recommended!' + sys.exit(1) +del pkg_resources + +version = '.'.join(release.split('.')[:2]) + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'nature' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_domain_indices = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'django-dajaxicedoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'django-dajaxice.tex', u'django-dajaxice Documentation', + u'Jorge Bastida', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_domain_indices = True + + +# -- Options for manual page output -------------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'django-dajaxice', u'django-dajaxice Documentation', + [u'Jorge Bastida'], 1) +] diff --git a/django-dajaxice/docs/custom-error-callbacks.rst b/django-dajaxice/docs/custom-error-callbacks.rst new file mode 100644 index 000000000..3fe2e5b7f --- /dev/null +++ b/django-dajaxice/docs/custom-error-callbacks.rst @@ -0,0 +1,31 @@ +Custom error callbacks +====================== + + +How dajaxice handle errors +-------------------------- + +When one of your functions raises an exception dajaxice returns as response the ``DAJAXICE_EXCEPTION`` message. +On every response ``dajaxice.core.js`` checks if that response was an error or not and shows the user a default +error message ``Something goes wrong``. + + +Customize the default error message +----------------------------------- +This behaviour is configurable using the new ``Dajaxice.setup`` function. + +.. code-block:: javascript + + Dajaxice.setup({'default_exception_callback': function(){ alert('Error!'); }}); + +Customize error message per call +-------------------------------- +In this new version you can also specify an error callback per dajaxice call. + +.. code-block:: javascript + + function custom_error(){ + alert('Custom error of my_function.'); + } + + Dajaxice.simple.my_function(callback, {'user': 'tom'}, {'error_callback': custom_error}); diff --git a/django-dajaxice/docs/index.rst b/django-dajaxice/docs/index.rst new file mode 100644 index 000000000..b97695e24 --- /dev/null +++ b/django-dajaxice/docs/index.rst @@ -0,0 +1,45 @@ +.. django-dajaxice documentation master file, created by + sphinx-quickstart on Fri May 25 08:02:23 2012. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + + +django-dajaxice +=============== + +Dajaxixe is an Easy to use AJAX library for django. Its main goal is to trivialize the asynchronous communication within the django server code and your js code. Dajaxice uses the unobtrusive standard-compliant (W3C) XMLHttpRequest 1.0 object. + +django-dajaxice is a **JS-framework agnostic** library and focuses on decoupling the presentation logic from the server-side logic. dajaxice only requieres **5 minutes to start working.** + +Dajaxice has the following aims: + +* Isolate the communication between the client and the server. +* JS Framework agnostic (No Prototype, JQuery... needed ). +* Presentation logic outside the views (No presentation code inside ajax functions). +* Lightweight. +* Crossbrowsing ready. +* `Unobtrusive standard-compliant (W3C) XMLHttpRequest 1.0 `_ object usage. + +Documentation +------------- +.. toctree:: + :maxdepth: 2 + + installation + quickstart + + custom-error-callbacks + utils + production-environment + migrating-to-05 + available-settings + + changelog + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/django-dajaxice/docs/installation.rst b/django-dajaxice/docs/installation.rst new file mode 100644 index 000000000..b5d990460 --- /dev/null +++ b/django-dajaxice/docs/installation.rst @@ -0,0 +1,92 @@ +Installation +============ +Follow this instructions to start using dajaxice in your django project. + +Installing dajaxice +------------------- + +Add `dajaxice` in your project settings.py inside ``INSTALLED_APPS``:: + + INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'dajaxice', + ... + ) + +Ensure that your ``TEMPLATE_LOADERS``, looks like the following. Probably you'll only need to uncomment the last line.:: + + TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + 'django.template.loaders.eggs.Loader', + ) + +Ensure that ``TEMPLATE_CONTEXT_PROCESSORS`` has ``django.core.context_processors.request``. Probably you'll only need to add the last line:: + + TEMPLATE_CONTEXT_PROCESSORS = ( + 'django.contrib.auth.context_processors.auth', + 'django.core.context_processors.debug', + 'django.core.context_processors.i18n', + 'django.core.context_processors.media', + 'django.core.context_processors.static', + 'django.core.context_processors.request', + 'django.contrib.messages.context_processors.messages' + ) + +Add ``dajaxice.finders.DajaxiceFinder`` to ``STATICFILES_FINDERS``:: + + STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'dajaxice.finders.DajaxiceFinder', + ) + +Configure dajaxice url +---------------------- + +Add the following code inside urls.py:: + + from dajaxice.core import dajaxice_autodiscover, dajaxice_config + dajaxice_autodiscover() + +Add a new line in urls.py urlpatterns with this code:: + + urlpatterns = patterns('', + ... + url(dajaxice_config.dajaxice_url, include('dajaxice.urls')), + ... + ) + +If you aren't using ``django.contrib.staticfiles``, you should also enable it importing:: + + from django.contrib.staticfiles.urls import staticfiles_urlpatterns + +and adding this line to the bottom of your urls.py:: + + urlpatterns += staticfiles_urlpatterns() + +Install dajaxice in your templates +---------------------------------- +Dajaxice needs some JS to work. To include it in your templates, you should load ``dajaxice_templatetags`` and use ``dajaxice_js_import`` TemplateTag inside your head section. This TemplateTag will print needed js. + +.. code-block:: html + + {% load dajaxice_templatetags %} + + + + My base template + ... + {% dajaxice_js_import %} + + ... + + +This templatetag will include all the js dajaxice needs. + +Use Dajaxice! +------------- +Now you can create your first ajax function following the :doc:`quickstart`. diff --git a/django-dajaxice/docs/migrating-to-05.rst b/django-dajaxice/docs/migrating-to-05.rst new file mode 100644 index 000000000..ae117a18b --- /dev/null +++ b/django-dajaxice/docs/migrating-to-05.rst @@ -0,0 +1,55 @@ +Migrating to 0.5 +================= + +Upgrade to django 1.3 or 1.4 +---------------------------- + +Dajaxice ``0.5`` requires ``django>=1.3``, so in order to make dajaxice work you'll need to upgrade your app to any of these ones. + +* `Django 1.3 release notes `_ +* `Django 1.4 release notes `_ + + +Make django static-files work +----------------------------- + +Add this at the beginning of your ``urls.py`` file:: + + from django.contrib.staticfiles.urls import staticfiles_urlpatterns + +and add this line to the bottom of your urls.py:: + + urlpatterns += staticfiles_urlpatterns() + +Add a new staticfiles finder named ``dajaxice.finders.DajaxiceFinder`` to the list of ``STATICFILES_FINDERS``:: + + STATICFILES_FINDERS = ('django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'dajaxice.finders.DajaxiceFinder') + +Update dajaxice core url +------------------------ + +Add ``dajaxice_config`` to the list of modules to import:: + + # Old import + from dajaxice.core import dajaxice_autodiscover + + # New import + from dajaxice.core import dajaxice_autodiscover, dajaxice_config + + +And replate your old dajaxice url with the new one:: + + # Old style + (r'^%s/' % settings.DAJAXICE_MEDIA_PREFIX, include('dajaxice.urls')), + + # New style + url(dajaxice_config.dajaxice_url, include('dajaxice.urls')), + + +Done! +----- + +Your app should be working now! +You can now read the :doc:`quickstart ` to discover some of the new dajaxice features. diff --git a/django-dajaxice/docs/production-environment.rst b/django-dajaxice/docs/production-environment.rst new file mode 100644 index 000000000..37d0a98a8 --- /dev/null +++ b/django-dajaxice/docs/production-environment.rst @@ -0,0 +1,7 @@ +Production Environment +====================== + +Since ``0.5`` dajaxice takes advantage of ``django.contrib.staticfiles`` so deploying a dajaxice application live is much easy than in previous versions. + +You need to remember to run ``python manage.py collectstatic`` before deploying your code live. This command will collect all the static files your application need into ``STATIC_ROOT``. For further information, this is the `Django static files docuemntation `_ + diff --git a/django-dajaxice/docs/quickstart.rst b/django-dajaxice/docs/quickstart.rst new file mode 100644 index 000000000..a18ba7cdf --- /dev/null +++ b/django-dajaxice/docs/quickstart.rst @@ -0,0 +1,80 @@ +Quickstart +========== + +Create your first ajax function +------------------------------- +Create a file named ``ajax.py`` inside any of your apps. For example ``example/ajax.py``. + +Inside this file create a simple function that return json.:: + + from django.utils import simplejson + + def sayhello(request): + return simplejson.dumps({'message':'Hello World'}) + +Now you'll need to register this function as a dajaxice function using the ``dajaxice_register`` decorator:: + + from django.utils import simplejson + from dajaxice.decorators import dajaxice_register + + @dajaxice_register + def sayhello(request): + return simplejson.dumps({'message':'Hello World'}) + +Invoque it from your JS +----------------------- + +You can invoque your ajax fuctions from javascript using: + +.. code-block:: javascript + + onclick="Dajaxice.example.sayhello(my_js_callback);" + +The function ``my_js_callback`` is your JS function that will use your example return data. For example alert the message: + +.. code-block:: javascript + + function my_js_callback(data){ + alert(data.message); + } + +That callback will alert the message ``Hello World``. + + +How can I do a GET request instead of a POST one? +------------------------------------------------- + +When you register your functions as ajax functions, you can choose the http method using:: + + from django.utils import simplejson + from dajaxice.decorators import dajaxice_register + + @dajaxice_register(method='GET') + def saybye(request): + return simplejson.dumps({'message':'Bye!'}) + +This function will be executed doing a GET request and not a POST one. + + +Can I combine both? +------------------- + +Yes! You can register a function as many times as you want, for example:: + + from django.utils import simplejson + from dajaxice.decorators import dajaxice_register + + @dajaxice_register(method='POST', name='user.update') + @dajaxice_register(method='GET', name='user.info') + def list_user(request): + if request.method == 'POST': + ... + else: + ... + +In this case you'll be able to call this two JS functions:: + + Dajaxice.user.info( callback ); + Dajaxice.user.update( callback ); + +The first one will be a GET call and the second one a POST one. diff --git a/django-dajaxice/docs/utils.rst b/django-dajaxice/docs/utils.rst new file mode 100644 index 000000000..1d30972c3 --- /dev/null +++ b/django-dajaxice/docs/utils.rst @@ -0,0 +1,16 @@ +Utils +===== + +dajaxice.utils.deserialize_form +------------------------------- + +Using ``deserialize_form`` you will be able to deserialize a query_string and use it as input of a Form:: + + from dajaxice.utils import deserialize_form + + @dajaxice_register + def send_form(request, form): + form = ExampleForm(deserialize_form(form)) + if form.is_valid(): + ... + ... diff --git a/django-dajaxice/examples/examples/__init__.py b/django-dajaxice/examples/examples/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/django-dajaxice/examples/examples/settings.py b/django-dajaxice/examples/examples/settings.py new file mode 100644 index 000000000..a2b05b050 --- /dev/null +++ b/django-dajaxice/examples/examples/settings.py @@ -0,0 +1,177 @@ +# Django settings for examples project. + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@example.com'), +) + +MANAGERS = ADMINS + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': '', # Or path to database file if using sqlite3. + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } +} + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# On Unix systems, a value of None will cause Django to use the same +# timezone as the operating system. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'America/Chicago' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'en-us' + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# If you set this to False, Django will not format dates, numbers and +# calendars according to the current locale. +USE_L10N = True + +# If you set this to False, Django will not use timezone-aware datetimes. +USE_TZ = True + +# Absolute filesystem path to the directory that will hold user-uploaded files. +# Example: "/home/media/media.lawrence.com/media/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. Make sure to use a +# trailing slash. +# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" +MEDIA_URL = '' + +# Absolute path to the directory static files should be collected to. +# Don't put anything in this directory yourself; store your static files +# in apps' "static/" subdirectories and in STATICFILES_DIRS. +# Example: "/home/media/media.lawrence.com/static/" +STATIC_ROOT = 'static' + +# URL prefix for static files. +# Example: "http://media.lawrence.com/static/" +STATIC_URL = '/static/' + +# Additional locations of static files +STATICFILES_DIRS = ( + # Put strings here, like "/home/html/static" or "C:/www/django/static". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +# List of finder classes that know how to find static files in +# various locations. +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +# 'django.contrib.staticfiles.finders.DefaultStorageFinder', +) + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '$zr@-0lstgzehu)k(-pbg7wz=mv8%n%o7+j_@h&-yy&sx)pyau' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +# 'django.template.loaders.eggs.Loader', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + # Uncomment the next line for simple clickjacking protection: + # 'django.middleware.clickjacking.XFrameOptionsMiddleware', +) + +ROOT_URLCONF = 'examples.urls' + +# Python dotted path to the WSGI application used by Django's runserver. +WSGI_APPLICATION = 'examples.wsgi.application' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'dajaxice', + 'simple' + # Uncomment the next line to enable the admin: + # 'django.contrib.admin', + # Uncomment the next line to enable admin documentation: + # 'django.contrib.admindocs', +) + +# A sample logging configuration. The only tangible logging +# performed by this configuration is to send an email to +# the site admins on every HTTP 500 error when DEBUG=False. +# See http://docs.djangoproject.com/en/dev/topics/logging for +# more details on how to customize your logging configuration. +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + }, + 'console': { + 'level': 'INFO', + 'class': 'logging.StreamHandler' + } + }, + 'loggers': { + 'django.request': { + 'handlers': ['mail_admins'], + 'level': 'ERROR', + 'propagate': True, + }, + 'dajaxice': { + 'handlers': ['console'], + 'level': 'INFO', + 'propagate': True, + }, + } +} + +STATICFILES_FINDERS = ("django.contrib.staticfiles.finders.FileSystemFinder", + "django.contrib.staticfiles.finders.AppDirectoriesFinder", + "dajaxice.finders.DajaxiceFinder") + +TEMPLATE_CONTEXT_PROCESSORS = ("django.contrib.auth.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.static", + "django.core.context_processors.request", + "django.contrib.messages.context_processors.messages") diff --git a/django-dajaxice/examples/examples/urls.py b/django-dajaxice/examples/examples/urls.py new file mode 100644 index 000000000..3503483cf --- /dev/null +++ b/django-dajaxice/examples/examples/urls.py @@ -0,0 +1,25 @@ +from django.conf.urls import patterns, include, url +from django.contrib.staticfiles.urls import staticfiles_urlpatterns + +from dajaxice.core import dajaxice_autodiscover, dajaxice_config +dajaxice_autodiscover() + +# Uncomment the next two lines to enable the admin: +# from django.contrib import admin +# admin.autodiscover() + +urlpatterns = patterns('', + # Examples: + # url(r'^$', 'examples.views.home', name='home'), + # url(r'^examples/', include('examples.foo.urls')), + + # Uncomment the admin/doc line below to enable admin documentation: + # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + + # Uncomment the next line to enable the admin: + # url(r'^admin/', include(admin.site.urls)), + (dajaxice_config.dajaxice_url, include('dajaxice.urls')), + url(r'', 'simple.views.index') +) + +urlpatterns += staticfiles_urlpatterns() diff --git a/django-dajaxice/examples/examples/wsgi.py b/django-dajaxice/examples/examples/wsgi.py new file mode 100644 index 000000000..ebf0cf413 --- /dev/null +++ b/django-dajaxice/examples/examples/wsgi.py @@ -0,0 +1,28 @@ +""" +WSGI config for examples project. + +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover +this application via the ``WSGI_APPLICATION`` setting. + +Usually you will have the standard Django WSGI application here, but it also +might make sense to replace the whole Django WSGI application with a custom one +that later delegates to the Django one. For example, you could introduce WSGI +middleware here, or combine a Django application with an application of another +framework. + +""" +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "examples.settings") + +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/django-dajaxice/examples/manage.py b/django-dajaxice/examples/manage.py new file mode 100644 index 000000000..55e614cd9 --- /dev/null +++ b/django-dajaxice/examples/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "examples.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/django-dajaxice/examples/simple/__init__.py b/django-dajaxice/examples/simple/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/django-dajaxice/examples/simple/ajax.py b/django-dajaxice/examples/simple/ajax.py new file mode 100644 index 000000000..992068168 --- /dev/null +++ b/django-dajaxice/examples/simple/ajax.py @@ -0,0 +1,26 @@ +import simplejson + +from dajaxice.decorators import dajaxice_register + + +@dajaxice_register(method='GET') +@dajaxice_register(method='POST', name='other_post') +def hello(request): + return simplejson.dumps({'message': 'hello'}) + + +@dajaxice_register(method='GET') +@dajaxice_register(method='POST', name="more.complex.bye") +def bye(request): + raise Exception("PUMMMM") + return simplejson.dumps({'message': 'bye'}) + + +@dajaxice_register +def lol(request): + return simplejson.dumps({'message': 'lol'}) + + +@dajaxice_register(method='GET') +def get_args(request, foo): + return simplejson.dumps({'message': 'hello get args %s' % foo}) diff --git a/django-dajaxice/examples/simple/models.py b/django-dajaxice/examples/simple/models.py new file mode 100644 index 000000000..71a836239 --- /dev/null +++ b/django-dajaxice/examples/simple/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/django-dajaxice/examples/simple/templates/simple/index.html b/django-dajaxice/examples/simple/templates/simple/index.html new file mode 100644 index 000000000..b92241f02 --- /dev/null +++ b/django-dajaxice/examples/simple/templates/simple/index.html @@ -0,0 +1,13 @@ +{% load dajaxice_templatetags %} + + +{% dajaxice_js_import 'nocsrf' %} + + + + + + + + + diff --git a/django-dajaxice/examples/simple/tests.py b/django-dajaxice/examples/simple/tests.py new file mode 100644 index 000000000..501deb776 --- /dev/null +++ b/django-dajaxice/examples/simple/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/django-dajaxice/examples/simple/views.py b/django-dajaxice/examples/simple/views.py new file mode 100644 index 000000000..80c80dc5d --- /dev/null +++ b/django-dajaxice/examples/simple/views.py @@ -0,0 +1,9 @@ +# Create your views here. +from django.shortcuts import render + +from dajaxice.core import dajaxice_functions + + +def index(request): + + return render(request, 'simple/index.html') diff --git a/django-dajaxice/setup.py b/django-dajaxice/setup.py new file mode 100644 index 000000000..cc544bb88 --- /dev/null +++ b/django-dajaxice/setup.py @@ -0,0 +1,31 @@ +from distutils.core import setup + +setup( + name='django-dajaxice', + version='0.5.5', + author='Jorge Bastida', + author_email='me@jorgebastida.com', + description='Agnostic and easy to use ajax library for django', + url='http://dajaxproject.com', + license='BSD', + packages=['dajaxice', + 'dajaxice.templatetags', + 'dajaxice.core'], + package_data={'dajaxice': ['templates/dajaxice/*']}, + long_description=("Easy to use AJAX library for django, all the " + "presentation logic resides outside the views and " + "doesn't require any JS Framework. Dajaxice uses the " + "unobtrusive standard-compliant (W3C) XMLHttpRequest " + "1.0 object."), + install_requires=[ + 'Django>=1.3' + ], + classifiers=['Development Status :: 4 - Beta', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Utilities'] +) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 4b182c206..974179a98 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -236,7 +236,7 @@ class Room(models.Model): meeting = models.ForeignKey(Meeting) name = models.CharField(max_length=255) capacity = models.IntegerField(null=True, blank=True) - resources = models.ManyToManyField(ResourceAssociation) + resources = models.ManyToManyField(ResourceAssociation, blank = True) def __unicode__(self): return "%s size: %u" % (self.name, self.capacity) diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py index ff92707e7..85a204581 100644 --- a/ietf/meeting/test_data.py +++ b/ietf/meeting/test_data.py @@ -8,9 +8,11 @@ from ietf.group.models import Group def make_meeting_test_data(): - make_test_data() + if not Group.objects.filter(acronym='mars'): + make_test_data() system_person = Person.objects.get(name="(System)") plainman = Person.objects.get(user__username="plain") + secretary = Person.objects.get(user__username="secretary") meeting = Meeting.objects.get(number="42", type="ietf") schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-agenda", visible=True, public=True) diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index f1e3cb566..831db8da1 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -20,52 +20,67 @@ class ApiTests(TestCase): r = self.client.get("/dajaxice/dajaxice.core.js") self.assertEqual(r.status_code, 200) - def test_update_agenda_item(self): + def test_update_agenda(self): meeting = make_meeting_test_data() - session = Session.objects.filter(meeting=meeting, group__acronym="mars").first() - mars_scheduled = ScheduledSession.objects.get(session=session) + schedule = Schedule.objects.get(meeting__number=42,name="test-agenda") + mars_session = Session.objects.filter(meeting=meeting, group__acronym="mars").first() + ames_session = Session.objects.filter(meeting=meeting, group__acronym="ames").first() + + mars_scheduled = ScheduledSession.objects.get(session=mars_session) mars_slot = mars_scheduled.timeslot - ames_scheduled = ScheduledSession.objects.get(session__meeting=meeting, session__group__acronym="ames") + ames_scheduled = ScheduledSession.objects.get(session=ames_session) ames_slot = ames_scheduled.timeslot - def do_post(to): - # move this session from one timeslot to another - return self.client.post('/dajaxice/ietf.meeting.update_timeslot/', { - 'argv': json.dumps({ - "schedule_id": mars_scheduled.schedule.pk, - "session_id": session.pk, - "scheduledsession_id": to.pk if to else None, - })}) + def do_unschedule(scheduledsession): + url = urlreverse("ietf.meeting.ajax.scheduledsession_json", + kwargs=dict(num=scheduledsession.session.meeting.number, + name=scheduledsession.schedule.name, + scheduledsession_id=scheduledsession.pk,)) + return self.client.delete(url) - # faulty post - not logged in - r = do_post(to=ames_scheduled) - self.assertEqual(r.status_code, 200) - self.assertTrue("error" in json.loads(r.content)) - self.assertEqual(ScheduledSession.objects.get(pk=mars_scheduled.pk).session, session) + def do_schedule(schedule,session,timeslot): + url = urlreverse("ietf.meeting.ajax.scheduledsessions_json", + kwargs=dict(num=session.meeting.number, + name=schedule.name,)) + post_data = '{ "session_id": "%s", "timeslot_id": "%s" }'%(session.pk,timeslot.pk) + return self.client.post(url,post_data,content_type='application/x-www-form-urlencoded') - # faulty post - logged in as non-owner + # not logged in + # faulty delete + r = do_unschedule(mars_scheduled) + self.assertEqual(r.status_code, 403) + self.assertEqual(ScheduledSession.objects.get(pk=mars_scheduled.pk).session, mars_session) + # faulty post + r = do_schedule(schedule,ames_session,mars_slot) + self.assertEqual(r.status_code, 403) + + # logged in as non-owner + # faulty delete self.client.login(remote_user="ad") - r = do_post(to=ames_scheduled) - self.assertEqual(r.status_code, 200) + r = do_unschedule(mars_scheduled) + self.assertEqual(r.status_code, 403) self.assertTrue("error" in json.loads(r.content)) + # faulty post + r = do_schedule(schedule,ames_session,mars_slot) + self.assertEqual(r.status_code, 403) - # move to ames + # Put ames in the same timeslot as mars self.client.login(remote_user="plain") - r = do_post(to=ames_scheduled) + r = do_unschedule(ames_scheduled) self.assertEqual(r.status_code, 200) self.assertTrue("error" not in json.loads(r.content)) - self.assertEqual(ScheduledSession.objects.get(pk=mars_scheduled.pk).session, None) - self.assertEqual(ScheduledSession.objects.get(pk=ames_scheduled.pk).session, session) + r = do_schedule(schedule,ames_session,mars_slot) + self.assertEqual(r.status_code, 201) - # unschedule - self.client.login(remote_user="plain") - r = do_post(to=None) + # Unschedule mars + r = do_unschedule(mars_scheduled) self.assertEqual(r.status_code, 200) self.assertTrue("error" not in json.loads(r.content)) - self.assertEqual(ScheduledSession.objects.get(pk=ames_scheduled.pk).session, None) + self.assertEqual(ScheduledSession.objects.filter(session=mars_session).count(), 0) + self.assertEqual(ScheduledSession.objects.get(session=ames_session).timeslot, mars_slot) def test_constraints_json(self): @@ -106,7 +121,7 @@ class ApiTests(TestCase): timeslots_before = meeting.timeslot_set.count() url = urlreverse("ietf.meeting.ajax.timeslot_roomsurl", kwargs=dict(num=meeting.number)) - post_data = { "name": "new room", "capacity": "50" } + post_data = { "name": "new room", "capacity": "50" , "resources": []} # unauthorized post r = self.client.post(url, post_data) @@ -116,6 +131,7 @@ class ApiTests(TestCase): # create room self.client.login(remote_user="secretary") r = self.client.post(url, post_data) + self.assertEqual(r.status_code, 302) self.assertTrue(meeting.room_set.filter(name="new room")) timeslots_after = meeting.timeslot_set.count() @@ -259,8 +275,14 @@ class ApiTests(TestCase): r = self.client.post(url, post_data) self.assertEqual(r.status_code, 403) + # TODO - permission protection on this function are not right + # Normal users are prevented from changing public/private on their own schedule + # The secretariat can't change normal user's agendas settings for them, and the + # page at /meeting//schedule//details behaves badly for the secretariat + # (pushing save seems to do nothing as the POST 401s in the background) + # change agenda - self.client.login(remote_user="ad") + self.client.login(remote_user="secretary") r = self.client.post(url, post_data) self.assertEqual(r.status_code, 302) changed_schedule = Schedule.objects.get(pk=meeting.agenda.pk) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 5573e482e..6f7948ddc 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -159,7 +159,7 @@ class EditTests(TestCase): self.client.login(remote_user="secretary") r = self.client.get(urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number))) self.assertEqual(r.status_code, 200) - self.assertTrue("session_obj" in r.content) + self.assertTrue("load_scheduledsessions" in r.content) def test_save_agenda_as_and_read_permissions(self): meeting = make_meeting_test_data() diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 798bf03a7..bb7617a75 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -5,7 +5,8 @@ from django.core.urlresolvers import reverse from ietf.utils import TestCase from ietf.group.models import Group from ietf.ietfauth.utils import has_role -from ietf.utils.test_data import make_test_data +#from ietf.utils.test_data import make_test_data +from ietf.meeting.test_data import make_meeting_test_data as make_test_data #from pyquery import PyQuery @@ -13,7 +14,7 @@ SECR_USER='secretary' class SreqUrlTests(TestCase): def test_urls(self): - draft = make_test_data() + make_test_data() r = self.client.get("/secr/") self.assertEqual(r.status_code, 200) @@ -21,23 +22,24 @@ class SreqUrlTests(TestCase): r = self.client.get("/secr/sreq/") self.assertEqual(r.status_code, 200) - r = self.client.get("/secr/sreq/%s/new/" % draft.group.acronym) + testgroup=Group.objects.filter(type_id='wg').first() + r = self.client.get("/secr/sreq/%s/new/" % testgroup.acronym) self.assertEqual(r.status_code, 200) class MainTestCase(TestCase): def test_main(self): - draft = make_test_data() + make_test_data() url = reverse('sessions') r = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEqual(r.status_code, 200) sched = r.context['scheduled_groups'] unsched = r.context['unscheduled_groups'] - self.failUnless(len(sched) == 0) - self.failUnless(len(unsched) > 0) + self.failUnless(len(unsched) == 0) + self.failUnless(len(sched) > 0) class SubmitRequestCase(TestCase): def test_submit_request(self): - draft = make_test_data() + make_test_data() acronym = Group.objects.all()[0].acronym url = reverse('sessions_new',kwargs={'acronym':acronym}) post_data = {'id_num_session':'1', diff --git a/ietf/settings.py b/ietf/settings.py index 63b11566d..9f9e48bf2 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -19,6 +19,9 @@ LOG_DIR = '/var/log/datatracker' import sys sys.path.append(os.path.abspath(BASE_DIR + "/..")) +# dajaxice now in subdirectory +sys.path.append(os.path.abspath(BASE_DIR + "/../django-dajaxice")) + DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -137,6 +140,7 @@ ROOT_URLCONF = 'ietf.urls' TEMPLATE_DIRS = ( BASE_DIR + "/templates", BASE_DIR + "/secr/templates", + BASE_DIR+"/../django-dajaxice/dajaxice/templates", ) TEMPLATE_CONTEXT_PROCESSORS = ( From ad2784962fd9fffcd3ab927a887c0a1df26165bd Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sat, 8 Mar 2014 10:37:24 +0000 Subject: [PATCH 06/21] ported forward from personal/rjs/trunk-7174. Still one existing test failing - Legacy-Id: 7449 --- ietf/group/models.py | 3 + ietf/meeting/ajax.py | 303 +++++-- ietf/meeting/management/__init__.py | 0 ietf/meeting/management/commands/__init__.py | 0 ietf/meeting/management/commands/autoplace.py | 124 +++ ietf/meeting/migrations/0014_add_room.py | 350 +++++++++ .../migrations/0015_add_basic_resources.py | 339 ++++++++ .../0016_add_resource_to_session.py | 341 ++++++++ ..._remove_empty_session_scheduledsessions.py | 335 ++++++++ ietf/meeting/models.py | 256 ++++-- ietf/meeting/placement.py | 738 ++++++++++++++++++ ietf/meeting/test_data.py | 4 +- ietf/meeting/tests_api.py | 88 ++- ietf/meeting/tests_views.py | 4 +- ietf/meeting/urls.py | 10 +- ietf/meeting/views.py | 69 +- .../migrations/0020_add_default_penalties.py | 205 +++++ ietf/name/migrations/0021_add_room.py | 200 +++++ .../migrations/0022_add_room_resources.py | 201 +++++ ietf/name/models.py | 4 +- ietf/secr/meetings/views.py | 11 +- ietf/secr/sreq/forms.py | 25 +- ietf/secr/sreq/tests.py | 16 +- ietf/secr/sreq/urls.py | 2 + ietf/secr/sreq/views.py | 125 ++- .../includes/sessions_request_form.html | 34 +- .../includes/sessions_request_view.html | 6 +- ietf/secr/templates/sreq/main.html | 2 +- ietf/secr/templates/sreq/view.html | 4 +- ietf/settings.py | 29 + ietf/templates/meeting/agenda-utc.html | 6 +- ietf/templates/meeting/landscape_edit.html | 349 +++++---- ietf/templates/meeting/requests.html | 2 +- ietf/templates/meeting/room_edit.html | 60 ++ ietf/templates/meeting/timeslot_edit.html | 63 +- 35 files changed, 3847 insertions(+), 461 deletions(-) create mode 100644 ietf/meeting/management/__init__.py create mode 100644 ietf/meeting/management/commands/__init__.py create mode 100644 ietf/meeting/management/commands/autoplace.py create mode 100644 ietf/meeting/migrations/0014_add_room.py create mode 100644 ietf/meeting/migrations/0015_add_basic_resources.py create mode 100644 ietf/meeting/migrations/0016_add_resource_to_session.py create mode 100644 ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py create mode 100644 ietf/meeting/placement.py create mode 100644 ietf/name/migrations/0020_add_default_penalties.py create mode 100644 ietf/name/migrations/0021_add_room.py create mode 100644 ietf/name/migrations/0022_add_room_resources.py create mode 100644 ietf/templates/meeting/room_edit.html diff --git a/ietf/group/models.py b/ietf/group/models.py index 3d0161fbf..7d604d3b6 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -63,6 +63,9 @@ class Group(GroupInfo): role_names = [role_names] return user.is_authenticated() and self.role_set.filter(name__in=role_names, person__user=user).exists() + def is_bof(self): + return (self.state.slug in ["bof", "bof-conc"]) + def get_chair(self): chair = self.role_set.filter(name__slug='chair')[:1] return chair and chair[0] or None diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index a5794a790..1ded28ecd 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -1,4 +1,5 @@ import json +import datetime from django.core.urlresolvers import reverse from django.shortcuts import get_object_or_404, redirect @@ -9,10 +10,11 @@ from ietf.ietfauth.utils import role_required, has_role, user_is_person from ietf.name.models import TimeSlotTypeName from ietf.meeting.helpers import get_meeting, get_schedule, get_schedule_by_id, agenda_permissions +from ietf.meeting.models import ScheduledSession from ietf.meeting.views import edit_timeslots, edit_agenda from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint -import debug +#import debug def dajaxice_core_js(request): # this is a slightly weird hack to get, we seem to need this because @@ -64,83 +66,48 @@ def update_timeslot_pinned(request, schedule_id, scheduledsession_id, pinned=Fal if scheduledsession_id is not None: ss_id = int(scheduledsession_id) - if ss_id != 0: - ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id) + if ss_id == 0: + return json.dumps({'error':'no permission'}) + ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id) ss.pinned = pinned ss.save() return json.dumps({'message':'valid'}) - - -@role_required('Area Director','Secretariat') -@dajaxice_register -def update_timeslot(request, schedule_id, session_id, scheduledsession_id=None, extended_from_id=None, duplicate=False): - schedule = get_object_or_404(Schedule, pk = int(schedule_id)) - meeting = schedule.meeting - ss_id = 0 - ess_id = 0 - ess = None - ss = None - - #print "duplicate: %s schedule.owner: %s user: %s" % (duplicate, schedule.owner, request.user.person) - cansee,canedit = agenda_permissions(meeting, schedule, request.user) - - if not canedit: - #raise Exception("Not permitted") - return json.dumps({'error':'no permission'}) - - session_id = int(session_id) - session = get_object_or_404(meeting.session_set, pk=session_id) - - if scheduledsession_id is not None: - ss_id = int(scheduledsession_id) - - if extended_from_id is not None: - ess_id = int(extended_from_id) - - if ss_id != 0: - ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id) - - # this cleans up up two sessions in one slot situation, the - # ... extra scheduledsessions need to be cleaned up. - - if ess_id == 0: - # if this is None, then we must be moving. - for ssO in schedule.scheduledsession_set.filter(session=session): - #print "sched(%s): removing session %s from slot %u" % ( schedule, session, ssO.pk ) - #if ssO.extendedfrom is not None: - # ssO.extendedfrom.session = None - # ssO.extendedfrom.save() - ssO.session = None - ssO.extendedfrom = None - ssO.save() - else: - ess = get_object_or_404(schedule.scheduledsession_set, pk = ess_id) - ss.extendedfrom = ess - - try: - # find the scheduledsession, assign the Session to it. - if ss: - #print "ss.session: %s session:%s duplicate=%s"%(ss, session, duplicate) - ss.session = session - if duplicate: - ss.id = None - ss.save() - except Exception: - return json.dumps({'error':'invalid scheduledsession'}) - - return json.dumps({'message':'valid'}) - @role_required('Secretariat') @dajaxice_register -def update_timeslot_purpose(request, timeslot_id=None, purpose=None): +def update_timeslot_purpose(request, + meeting_num, + timeslot_id=None, + purpose =None, + room_id = None, + duration= None, + time = None): + + meeting = get_meeting(meeting_num) ts_id = int(timeslot_id) - try: - timeslot = TimeSlot.objects.get(pk=ts_id) - except: - return json.dumps({'error':'invalid timeslot'}) + time_str = time + if ts_id == 0: + try: + time = datetime.datetime.strptime(time_str, '%Y-%m-%d %H:%M:%S') + except: + return json.dumps({'error':'invalid time: %s' % (time_str)}) + + try: + room = meeting.room_set.get(pk = int(room_id)) + except Room.DoesNotExist: + return json.dumps({'error':'invalid room id'}) + + timeslot = TimeSlot(meeting=meeting, + location = room, + time = time, + duration = duration) + else: + try: + timeslot = TimeSlot.objects.get(pk=ts_id) + except: + return json.dumps({'error':'invalid timeslot'}) try: timeslottypename = TimeSlotTypeName.objects.get(pk = purpose) @@ -149,9 +116,17 @@ def update_timeslot_purpose(request, timeslot_id=None, purpose=None): 'extra': purpose}) timeslot.type = timeslottypename - timeslot.save() + try: + timeslot.save() + except: + return json.dumps({'error':'failed to save'}) - return json.dumps(timeslot.json_dict(request.build_absolute_uri('/'))) + try: + # really should return 201 created, but dajaxice sucks. + json_dict = timeslot.json_dict(request.build_absolute_uri('/')) + return json.dumps(json_dict) + except: + return json.dumps({'error':'failed to save'}) ############################################################################# ## ROOM API @@ -192,6 +167,25 @@ def timeslot_delroom(request, meeting, roomid): room.delete() return HttpResponse('{"error":"none"}', status = 200) +@role_required('Secretariat') +def timeslot_updroom(request, meeting, roomid): + room = get_object_or_404(meeting.room_set, pk=roomid) + + if "name" in request.POST: + room.name = request.POST["name"] + + if "capacity" in request.POST: + room.capacity = request.POST["capacity"] + + if "resources" in request.POST: + new_resource_ids = request.POST["resources"] + new_resources = [ ResourceAssociation.objects.get(pk=a) + for a in new_resource_ids] + room.resources = new_resources + + room.save() + return HttpResponse('{"error":"none"}', status = 200) + def timeslot_roomsurl(request, num=None): meeting = get_meeting(num) @@ -210,14 +204,14 @@ def timeslot_roomurl(request, num=None, roomid=None): room = get_object_or_404(meeting.room_set, pk=roomid) return HttpResponse(json.dumps(room.json_dict(request.build_absolute_uri('/'))), content_type="application/json") -# XXX FIXME: timeslot_updroom() doesn't exist -# elif request.method == 'POST': -# return timeslot_updroom(request, meeting) + elif request.method == 'PUT': + return timeslot_updroom(request, meeting, roomid) elif request.method == 'DELETE': return timeslot_delroom(request, meeting, roomid) ############################################################################# ## DAY/SLOT API +## -- this creates groups of timeslots, and associated scheduledsessions. ############################################################################# AddSlotForm = modelform_factory(TimeSlot, exclude=('meeting','name','location','sessions', 'modified')) @@ -227,7 +221,7 @@ def timeslot_slotlist(request, mtg): json_array=[] for slot in slots: json_array.append(slot.json_dict(request.build_absolute_uri('/'))) - return HttpResponse(json.dumps(json_array), + return HttpResponse(json.dumps(json_array, sort_keys=True, indent=2), content_type="application/json") @role_required('Secretariat') @@ -326,6 +320,10 @@ def agenda_update(request, meeting, schedule): # (schedule, update_dict, request.body)) user = request.user + + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + read_only = not canedit + if has_role(user, "Secretariat"): if "public" in request.POST: value1 = True @@ -335,13 +333,20 @@ def agenda_update(request, meeting, schedule): #debug.log("setting public for %s to %s" % (schedule, value1)) schedule.public = value1 - if "visible" in request.POST: + if "visible" in request.POST and cansee: value1 = True value = request.POST["visible"] if value == "0" or value == 0 or value=="false": value1 = False #debug.log("setting visible for %s to %s" % (schedule, value1)) schedule.visible = value1 + if has_role(user, "Secretariat") and canedit: + if "name" in request.POST: + value = request.POST["name"] + #log.debug("setting name for %s to %s" % (schedule, value)) + schedule.name = value + else: + return HttpResponse({'error':'no permission'}, status=401) if "name" in request.POST: value = request.POST["name"] @@ -382,11 +387,11 @@ def agenda_infosurl(request, num=None): # unacceptable action return HttpResponse(status=406) -def agenda_infourl(request, num=None, schedule_name=None): +def agenda_infourl(request, num=None, name=None): meeting = get_meeting(num) - #debug.log("agenda: %s / %s" % (meeting, schedule_name)) + #log.debug("agenda: %s / %s" % (meeting, name)) - schedule = get_schedule(meeting, schedule_name) + schedule = get_schedule(meeting, name) #debug.log("results in agenda: %u / %s" % (schedule.id, request.method)) if request.method == 'GET': @@ -417,13 +422,13 @@ def meeting_update(request, meeting): value = request.POST["agenda"] #debug.log("4 meeting.agenda: %s" % (value)) if not value or value == "None": # value == "None" is just weird, better with empty string - meeting.agenda = None + meeting.set_official_agenda(None) else: schedule = get_schedule(meeting, value) if not schedule.public: return HttpResponse(status = 406) #debug.log("3 meeting.agenda: %s" % (schedule)) - meeting.agenda = schedule + meeting.set_official_agenda(schedule) #debug.log("2 meeting.agenda: %s" % (meeting.agenda)) meeting.save() @@ -441,7 +446,7 @@ def meeting_json(request, num): ############################################################################# -## Agenda Editing API functions +## Session details API functions ############################################################################# def session_json(request, num, sessionid): @@ -459,6 +464,140 @@ def session_json(request, num, sessionid): return HttpResponse(json.dumps(sess1, sort_keys=True, indent=2), content_type="application/json") +# get group of all sessions. +def sessions_json(request, num): + meeting = get_meeting(num) + + sessions = meeting.sessions_that_can_meet.all() + + sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in sessions ] + return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2), + content_type="application/json") + +############################################################################# +## Scheduledsesion +############################################################################# + +def scheduledsessions_post(request, meeting, schedule): + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + if not canedit: + return HttpResponse(json.dumps({'error':'no permission to modify this agenda'}), + status = 403, + content_type="application/json") + + # get JSON out of raw body. XXX should check Content-Type! + newvalues = json.loads(request.body) + if not ("session_id" in newvalues) or not ("timeslot_id" in newvalues): + return HttpResponse(json.dumps({'error':'missing values, timeslot_id and session_id required'}), + status = 406, + content_type="application/json") + + ss1 = ScheduledSession(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.scheduledsessions_set.get(pk = val) + ss1.extendedfrom = ss2 + except ScheduledSession.DoesNotExist: + return HttpResponse(json.dumps({'error':'invalid extendedfrom value: %u' % val}), + status = 406, + content_type="application/json") + + ss1.save() + ss1_dict = ss1.json_dict(request.build_absolute_uri('/')) + response = HttpResponse(json.dumps(ss1_dict), + status = 201, + content_type="application/json") + # 201 code needs a Location: header. + response['Location'] = ss1_dict["href"], + return response + +def scheduledsessions_get(request, num, schedule): + scheduledsessions = schedule.scheduledsession_set.all() + + sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in scheduledsessions ] + 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, name): + meeting = get_meeting(num) + schedule = get_schedule(meeting, name) + + if request.method == 'GET': + return scheduledsessions_get(request, meeting, schedule) + elif request.method == 'POST': + return scheduledsessions_post(request, meeting, schedule) + else: + return HttpResponse(json.dumps({'error':'inappropriate action: %s' % (request.method)}), + status = 406, + content_type="application/json") + + +def scheduledsession_update(request, meeting, schedule, scheduledsession_id): + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + if not canedit or True: + return HttpResponse(json.dumps({'error':'no permission to update this agenda'}), + status = 403, + content_type="application/json") + + +def scheduledsession_delete(request, meeting, schedule, scheduledsession_id): + cansee,canedit = 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") + + scheduledsessions = schedule.scheduledsession_set.filter(pk = scheduledsession_id) + if len(scheduledsessions) == 0: + return HttpResponse(json.dumps({'error':'no such object'}), + status = 404, + content_type="application/json") + + count=0 + for ss in scheduledsessions: + 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, scheduledsession_id): + cansee,canedit = agenda_permissions(meeting, schedule, request.user) + + if not cansee: + return HttpResponse(json.dumps({'error':'no permission to see this agenda'}), + status = 403, + content_type="application/json") + + scheduledsessions = schedule.scheduledsession_set.filter(pk = scheduledsession_id) + if len(scheduledsessions) == 0: + return HttpResponse(json.dumps({'error':'no such object'}), + status = 404, + content_type="application/json") + + sess1_dict = scheduledsessions[0].json_dict(request.build_absolute_uri('/')) + 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 scheduledsession_json(request, num, name, scheduledsession_id): + meeting = get_meeting(num) + schedule = get_schedule(meeting, name) + + scheduledsession_id = int(scheduledsession_id) + + if request.method == 'GET': + return scheduledsession_get(request, meeting, schedule, scheduledsession_id) + elif request.method == 'PUT': + return scheduledsession_update(request, meeting, schedule, scheduledsession_id) + elif request.method == 'DELETE': + return scheduledsession_delete(request, meeting, schedule, scheduledsession_id) + # Would like to cache for 1 day, but there are invalidation issues. #@cache_page(86400) def constraint_json(request, num, constraintid): diff --git a/ietf/meeting/management/__init__.py b/ietf/meeting/management/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ietf/meeting/management/commands/__init__.py b/ietf/meeting/management/commands/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ietf/meeting/management/commands/autoplace.py b/ietf/meeting/management/commands/autoplace.py new file mode 100644 index 000000000..8a96616b4 --- /dev/null +++ b/ietf/meeting/management/commands/autoplace.py @@ -0,0 +1,124 @@ +""" +Runs the automatic placement code (simulated annealing of glass) +for a given meeting number, using a schedule given by the schedule database ID. + +for help on this file: +https://docs.djangoproject.com/en/dev/howto/custom-management-commands/ + +""" + +from django.core.management.base import BaseCommand, CommandError +from optparse import make_option +#import cProfile, pstats, io +import os +import sys +import gzip +import time +import csv +import codecs +from ietf.meeting.models import Schedule, Meeting + +class Command(BaseCommand): + args = ' ' + help = 'perform automatic placement' + stderr = sys.stderr + stdout = sys.stdout + + verbose = False + profile = False + permit_movement = False + maxstep = 20000 + seed = None + recordsteps = False + + option_list = BaseCommand.option_list + ( + make_option('--profile', + action='store_true', + dest='profile', + default=False, + help='Enable verbose mode'), + make_option('--recordsteps', + action='store_true', + dest='recordsteps', + default=False, + help='Enable recording progress to table'), + make_option('--verbose', + action='count', + dest='verbose', + default=False, + help='Enable verbose mode'), + make_option('--maxstep', + action="store", type="int", + dest='maxstep', + default=20000, + help='Maximum number of steps'), + make_option('--seed', + action="store", type="int", + dest='seed', + default=None, + help='Seed to use for calculation'), + ) + + def handle(self, *labels, **options): + self.verbose = options.get('verbose', 1) + + meetingname = labels[0] + schedname = labels[1] + targetname = None + if labels[2] is not None: + targetname = labels[2] + + seed = options.get('seed', None) + maxstep = options.get('maxstep', 20000) + verbose = options.get('verbose', False) + profile = options.get('profile', False) + recordsteps = options.get('recordsteps', False) + + from ietf.meeting.helpers import get_meeting,get_schedule + try: + meeting = get_meeting(meetingname) + except Meeting.DoesNotExist: + print "No such meeting: %s" % (meetingname) + return + + try: + schedule = meeting.schedule_set.get(name = schedname) + except Schedule.DoesNotExist: + print "No such schedule: %s in meeting: %s" % (schedname, meeting) + return + + if targetname is not None: + try: + targetsched = meeting.schedule_set.get(name=targetname) + except Schedule.DoesNotExist: + print "Creating new schedule %s" % (targetname) + targetsched = Schedule(meeting = meeting, + owner = schedule.owner, + name = targetname) + targetsched.save() + else: + targetsched = schedule + + print "Saving results to %s" % (targetsched.name) + + from ietf.meeting.placement import CurrentScheduleState + css = CurrentScheduleState(schedule, seed) + css.recordsteps = recordsteps + css.verbose = verbose + + if profile: + import cProfile + import re + cProfile.runctx('css.do_placement(maxstep, targetsched)', + vars(), + vars(), + 'placestats.pyprof') + + import pstats + p = pstats.Stats('placestats.pyprof') + p.strip_dirs().sort_stats(-1).print_stats() + else: + css.do_placement(maxstep, targetsched) + + + diff --git a/ietf/meeting/migrations/0014_add_room.py b/ietf/meeting/migrations/0014_add_room.py new file mode 100644 index 000000000..eaa54b0b8 --- /dev/null +++ b/ietf/meeting/migrations/0014_add_room.py @@ -0,0 +1,350 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'ResourceAssociation' + db.create_table('meeting_resourceassociation', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.RoomResourceName'])), + ('icon', self.gf('django.db.models.fields.CharField')(max_length=64)), + ('desc', self.gf('django.db.models.fields.CharField')(max_length=256)), + )) + db.send_create_signal('meeting', ['ResourceAssociation']) + + # Adding M2M table for field resources on 'Room' + m2m_table_name = db.shorten_name('meeting_room_resources') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('room', models.ForeignKey(orm['meeting.room'], null=False)), + ('resourceassociation', models.ForeignKey(orm['meeting.resourceassociation'], null=False)) + )) + db.create_unique(m2m_table_name, ['room_id', 'resourceassociation_id']) + + def backwards(self, orm): + # Deleting model 'ResourceAssociation' + db.delete_table('meeting_resourceassociation') + + # Removing M2M table for field resources on 'Room' + db.delete_table(db.shorten_name('meeting_room_resources')) + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + 'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': "orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + 'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': "orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': "orm['group.Group']"}) + }, + 'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.RoomResourceName']"}) + }, + 'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + 'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.ScheduledSession']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.TimeSlot']"}) + }, + 'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.SessionStatusName']"}) + }, + 'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': "orm['meeting.Session']", 'through': "orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.TimeSlotTypeName']"}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] diff --git a/ietf/meeting/migrations/0015_add_basic_resources.py b/ietf/meeting/migrations/0015_add_basic_resources.py new file mode 100644 index 000000000..a1c87e780 --- /dev/null +++ b/ietf/meeting/migrations/0015_add_basic_resources.py @@ -0,0 +1,339 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + orm.ResourceAssociation(name_id = "project", + icon = "12161797831849255690jcartier_board.svg", + desc = "Projector in room").save() + orm.ResourceAssociation(name_id = "proj2", + icon = "projector2.svg", + desc = "Second projector in room").save() + orm.ResourceAssociation(name_id = "meetecho", + icon = "meetecho-mini.png", + desc = "Meetecho support in room").save() + + + def backwards(self, orm): + "Write your backwards methods here." + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + 'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': "orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + 'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': "orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': "orm['group.Group']"}) + }, + 'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.RoomResourceName']"}) + }, + 'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + 'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.ScheduledSession']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.TimeSlot']"}) + }, + 'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.SessionStatusName']"}) + }, + 'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': "orm['meeting.Session']", 'through': "orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.TimeSlotTypeName']"}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] + symmetrical = True diff --git a/ietf/meeting/migrations/0016_add_resource_to_session.py b/ietf/meeting/migrations/0016_add_resource_to_session.py new file mode 100644 index 000000000..c3a4a5eb3 --- /dev/null +++ b/ietf/meeting/migrations/0016_add_resource_to_session.py @@ -0,0 +1,341 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding M2M table for field resources on 'Session' + m2m_table_name = db.shorten_name('meeting_session_resources') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('session', models.ForeignKey(orm['meeting.session'], null=False)), + ('resourceassociation', models.ForeignKey(orm['meeting.resourceassociation'], null=False)) + )) + db.create_unique(m2m_table_name, ['session_id', 'resourceassociation_id']) + + + def backwards(self, orm): + # Removing M2M table for field resources on 'Session' + db.delete_table(db.shorten_name('meeting_session_resources')) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['person.Email']", 'symmetrical': 'False', 'through': "orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': "orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + 'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': "orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + 'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': "orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': "orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': "orm['group.Group']"}) + }, + 'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.RoomResourceName']"}) + }, + 'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + 'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.ScheduledSession']", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.TimeSlot']"}) + }, + 'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['group.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.SessionStatusName']"}) + }, + 'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': "orm['meeting.Session']", 'through': "orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.TimeSlotTypeName']"}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] \ No newline at end of file diff --git a/ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py b/ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py new file mode 100644 index 000000000..d6427cec7 --- /dev/null +++ b/ietf/meeting/migrations/0017_remove_empty_session_scheduledsessions.py @@ -0,0 +1,335 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + "Write your forwards methods here." + # Note: Don't use "from appname.models import ModelName". + # Use orm.ModelName to refer to models in this application, + # and orm['appname.ModelName'] for models in other applications. + orm.ScheduledSession.objects.exclude(session__isnull=False).delete() + + def backwards(self, orm): + "Write your backwards methods here." + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'doc.document': { + 'Meta': {'object_name': 'Document'}, + 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': u"orm['person.Person']"}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['person.Email']", 'symmetrical': 'False', 'through': u"orm['doc.DocumentAuthor']", 'blank': 'True'}), + 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), + 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), + 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': u"orm['person.Person']"}), + 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) + }, + u'doc.documentauthor': { + 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Email']"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.Document']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + u'doc.state': { + 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': u"orm['doc.State']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.StateType']"}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'doc.statetype': { + 'Meta': {'object_name': 'StateType'}, + 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) + }, + u'group.group': { + 'Meta': {'object_name': 'Group'}, + 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), + 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': u"orm['doc.Document']"}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.GroupStateName']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.GroupTypeName']", 'null': 'True'}), + 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), + 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'meeting.constraint': { + 'Meta': {'object_name': 'Constraint'}, + 'day': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.ConstraintName']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True', 'blank': 'True'}), + 'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_source_set'", 'to': u"orm['group.Group']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'constraint_target_set'", 'null': 'True', 'to': u"orm['group.Group']"}) + }, + u'meeting.meeting': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Meeting'}, + 'agenda': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': u"orm['meeting.Schedule']"}), + 'agenda_note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'break_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '2', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'reg_area': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'time_zone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.MeetingTypeName']"}), + 'venue_addr': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'venue_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + u'meeting.resourceassociation': { + 'Meta': {'object_name': 'ResourceAssociation'}, + 'desc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'icon': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.RoomResourceName']"}) + }, + u'meeting.room': { + 'Meta': {'object_name': 'Room'}, + 'capacity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}) + }, + u'meeting.schedule': { + 'Meta': {'object_name': 'Schedule'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']", 'null': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'meeting.scheduledsession': { + 'Meta': {'ordering': "['timeslot__time', 'session__group__parent__name', 'session__group__acronym', 'session__name']", 'object_name': 'ScheduledSession'}, + 'badness': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'extendedfrom': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['meeting.ScheduledSession']", 'null': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'pinned': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': u"orm['meeting.Schedule']"}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['meeting.Session']", 'null': 'True'}), + 'timeslot': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.TimeSlot']"}) + }, + u'meeting.session': { + 'Meta': {'object_name': 'Session'}, + 'agenda_note': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'attendees': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'materials': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.Document']", 'symmetrical': 'False', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'requested': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'requested_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), + 'requested_duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {'default': '0'}), + 'resources': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['meeting.ResourceAssociation']", 'symmetrical': 'False'}), + 'scheduled': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'status': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.SessionStatusName']"}) + }, + u'meeting.timeslot': { + 'Meta': {'object_name': 'TimeSlot'}, + 'duration': ('ietf.meeting.timedeltafield.TimedeltaField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Room']", 'null': 'True', 'blank': 'True'}), + 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['meeting.Meeting']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'sessions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'slots'", 'to': u"orm['meeting.Session']", 'through': u"orm['meeting.ScheduledSession']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}), + 'show_location': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.TimeSlotTypeName']"}) + }, + u'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'person.email': { + 'Meta': {'object_name': 'Email'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + u'person.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), + 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['meeting'] + symmetrical = True diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 7dac474ee..2c50b8de5 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -4,6 +4,7 @@ import pytz, datetime from urlparse import urljoin import copy import os +import sys import re import debug @@ -18,7 +19,7 @@ from django.template.defaultfilters import slugify, date as date_format, time as from ietf.group.models import Group from ietf.person.models import Person from ietf.doc.models import Document -from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName +from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName countries = pytz.country_names.items() countries.sort(lambda x,y: cmp(x[1], y[1])) @@ -111,6 +112,15 @@ class Meeting(models.Model): def sessions_that_can_meet(self): return self.session_set.exclude(status__slug='notmeet').exclude(status__slug='disappr').exclude(status__slug='deleted').exclude(status__slug='apprw') + def sessions_that_can_be_placed(self): + from django.db.models import Q + donotplace_groups = Q(group__acronym="edu") + donotplace_groups |= Q(group__acronym="tools") + donotplace_groups |= Q(group__acronym="iesg") + donotplace_groups |= Q(group__acronym="ietf") + donotplace_groups |= Q(group__acronym="iepg") + donotplace_groups |= Q(group__acronym="iab") + return self.sessions_that_can_meet.exclude(donotplace_groups) def json_url(self): return "/meeting/%s.json" % (self.number, ) @@ -157,8 +167,8 @@ class Meeting(models.Model): if ymd in time_slices: # only keep unique entries - if [ts.time, ts.time + ts.duration] not in time_slices[ymd]: - time_slices[ymd].append([ts.time, ts.time + ts.duration]) + if [ts.time, ts.time + ts.duration, ts.duration.seconds] not in time_slices[ymd]: + time_slices[ymd].append([ts.time, ts.time + ts.duration, ts.duration.seconds]) slots[ymd].append(ts) days.sort() @@ -195,13 +205,38 @@ class Meeting(models.Model): pass return '' + def set_official_agenda(self, agenda): + if self.agenda != agenda: + self.agenda = agenda + self.save() + if self.agenda is not None: + self.agenda.sendEmail() + class Meta: ordering = ["-date", ] +class ResourceAssociation(models.Model): + name = models.ForeignKey(RoomResourceName) + #url = models.UrlField() # not sure what this was for. + icon = models.CharField(max_length=64) # icon to be found in /static/img + desc = models.CharField(max_length=256) + + def __unicode__(self): + return self.desc + + def json_dict(self, host_scheme): + res1 = dict() + res1['name'] = self.name.slug + res1['icon'] = "/images/%s" % (self.icon) + res1['desc'] = self.desc + res1['resource_id'] = self.pk + return res1 + class Room(models.Model): meeting = models.ForeignKey(Meeting) name = models.CharField(max_length=255) capacity = models.IntegerField(null=True, blank=True) + resources = models.ManyToManyField(ResourceAssociation, blank = True) def __unicode__(self): return "%s size: %u" % (self.name, self.capacity) @@ -223,6 +258,9 @@ class Room(models.Model): duration=ts.duration) self.meeting.create_all_timeslots() + def domid(self): + return "room%u" % (self.pk) + def json_url(self): return "/meeting/%s/room/%s.json" % (self.meeting.number, self.id) @@ -325,16 +363,25 @@ class TimeSlot(models.Model): # {{s.timeslot.time|date:'Y-m-d'}}_{{ s.timeslot.time|date:'Hi' }}" # also must match: # {{r|slugify}}_{{day}}_{{slot.0|date:'Hi'}} - return "%s_%s_%s" % (slugify(self.get_location()), self.time.strftime('%Y-%m-%d'), self.time.strftime('%H%M')) + domid="ts%u" % (self.pk) + if self.location is not None: + domid = self.location.domid() + return "%s_%s_%s" % (domid, self.time.strftime('%Y-%m-%d'), self.time.strftime('%H%M')) - def json_dict(self, selfurl): + def json_dict(self, host_scheme): ts = dict() ts['timeslot_id'] = self.id - ts['room'] = slugify(self.location) + ts['href'] = urljoin(host_scheme, self.json_url()) + ts['room'] = self.get_location() ts['roomtype'] = self.type.slug + if self.location is not None: + ts['capacity'] = self.location.capacity ts["time"] = date_format(self.time, 'Hi') - ts["date"] = time_format(self.time, 'Y-m-d') + ts["date"] = fmt_date(self.time) ts["domid"] = self.js_identifier + following = self.slot_to_the_right + if following is not None: + ts["following_timeslot_id"] = following.id return ts def json_url(self): @@ -418,11 +465,18 @@ class Schedule(models.Model): # def url_edit(self): # return "/meeting/%s/agenda/%s/edit" % (self.meeting.number, self.name) -# +# # @property # def relurl_edit(self): # return self.url_edit("") + def owner_email(self): + emails = self.owner.email_set.all() + if len(emails)>0: + return emails[0].address + else: + return "noemail" + @property def visible_token(self): if self.visible: @@ -512,12 +566,11 @@ class Schedule(models.Model): scheduled += 1 return assignments,sessions,total,scheduled - cached_sessions_that_can_meet = None @property def sessions_that_can_meet(self): - if self.cached_sessions_that_can_meet is None: - self.cached_sessions_that_can_meet = self.meeting.sessions_that_can_meet.all() - return self.cached_sessions_that_can_meet + if not hasattr(self, "_cached_sessions_that_can_meet"): + self._cached_sessions_that_can_meet = self.meeting.sessions_that_can_meet.all() + return self._cached_sessions_that_can_meet def area_list(self): return ( self.assignments.filter(session__group__type__slug__in=['wg', 'rg', 'ag', 'iab'], @@ -529,6 +582,41 @@ class Schedule(models.Model): def groups(self): return Group.objects.filter(type__slug__in=['wg', 'rg', 'ag', 'iab'], session__scheduledsession__schedule=self).distinct().order_by('parent__acronym', 'acronym') + @property + def qs_scheduledsessions_with_assignments(self): + return self.scheduledsession_set.filter(session__isnull=False) + + # calculate badness of entire schedule + def calc_badness(self): + # now calculate badness + assignments = self.group_mapping + return self.calc_badness1(assignments) + + # calculate badness of entire schedule + def calc_badness1(self, assignments): + badness = 0 + for sess in self.sessions_that_can_meet: + badness += sess.badness(assignments) + self.badness = badness + return badness + + def delete_schedule(self): + self.scheduledsession_set.all().delete() + self.delete() + + # send email to every session requester whose session is now scheduled. + # mark the sessions as now state scheduled, rather than waiting. + def sendEmail(self): + for ss in self.scheduledsession_set.all(): + session = ss.session + if session.status.slug == "schedw": + session.status_id = "sched" + session.scheduled = datetime.datetime.now() + session.save() + from ietf.secr.meetings.views import send_notification + send_notification(None, Session.objects.filter(id=session.id)) + +# to be renamed ScheduleTimeslotSessionAssignments (stsa) class ScheduledSession(models.Model): """ This model provides an N:M relationship between Session and TimeSlot. @@ -601,27 +689,31 @@ class ScheduledSession(models.Model): else: return "" - @property - def empty_str(self): - # return JS happy value - if self.session: - return "False" - else: - return "True" + def json_url(self): + return "/meeting/%s/schedule/%s/session/%u.json" % (self.schedule.meeting.number, + self.schedule.name, self.id) - def json_dict(self, selfurl): + def json_dict(self, host_scheme): ss = dict() ss['scheduledsession_id'] = self.id - #ss['href'] = self.url(host_scheme) - ss['empty'] = self.empty_str + ss['href'] = urljoin(host_scheme, self.json_url()) ss['timeslot_id'] = self.timeslot.id + + efset = self.session.scheduledsession_set.filter(schedule=self.schedule).order_by("timeslot__time") + if efset.count() > 1: + # now we know that there is some work to do finding the extendedfrom_id. + # loop through the list of items + previous = None + for efss in efset: + if efss.pk == self.pk: + extendedfrom = previous + break + previous = efss + if extendedfrom is not None: + ss['extendedfrom_id'] = extendedfrom.id + if self.session: ss['session_id'] = self.session.id - ss['room'] = slugify(self.timeslot.location) - ss['roomtype'] = self.timeslot.type.slug - ss["time"] = date_format(self.timeslot.time, 'Hi') - ss["date"] = time_format(self.timeslot.time, 'Y-m-d') - ss["domid"] = self.timeslot.js_identifier ss["pinned"] = self.pinned return ss @@ -670,9 +762,8 @@ class Constraint(models.Model): return True return False - @property def constraint_cost(self): - return self.name.cost(); + return self.name.penalty; def json_url(self): return "/meeting/%s/constraint/%s.json" % (self.meeting.number, self.id) @@ -715,6 +806,7 @@ class Session(models.Model): modified = models.DateTimeField(default=datetime.datetime.now) materials = models.ManyToManyField(Document, blank=True) + resources = models.ManyToManyField(ResourceAssociation) unique_constraints_dict = None @@ -747,6 +839,9 @@ class Session(models.Model): ss0name = ss[0].timeslot.time.strftime("%H%M") return u"%s: %s %s[%u]" % (self.meeting, self.group.acronym, ss0name, self.pk) + def is_bof(self): + return self.group.is_bof(); + @property def short_name(self): if self.name: @@ -817,18 +912,20 @@ class Session(models.Model): sess1['href'] = urljoin(host_scheme, self.json_url()) if self.group is not None: sess1['group'] = self.group.json_dict(host_scheme) - # nuke rest of these as soon as JS cleaned up. sess1['group_href'] = urljoin(host_scheme, self.group.json_url()) - sess1['group_acronym'] = str(self.group.acronym) if self.group.parent is not None: sess1['area'] = str(self.group.parent.acronym).upper() - sess1['GroupInfo_state']= str(self.group.state) sess1['description'] = str(self.group.name) sess1['group_id'] = str(self.group.pk) + reslist = [] + for r in self.resources.all(): + reslist.append(r.json_dict(host_scheme)) + sess1['resources'] = reslist sess1['session_id'] = str(self.pk) sess1['name'] = str(self.name) sess1['title'] = str(self.short_name) sess1['short_name'] = str(self.short_name) + sess1['bof'] = str(self.is_bof()) sess1['agenda_note'] = str(self.agenda_note) sess1['attendees'] = str(self.attendees) sess1['status'] = str(self.status) @@ -843,17 +940,57 @@ class Session(models.Model): pass sess1['requested_duration']= "%.1f" % (float(self.requested_duration.seconds) / 3600) - sess1['duration'] = sess1['requested_duration'] sess1['special_request'] = str(self.special_request_token) return sess1 + def agenda_text(self): + doc = self.agenda() + if doc: + path = os.path.join(settings.AGENDA_PATH, self.meeting.number, "agenda", doc.external_url) + if os.path.exists(path): + with open(path) as f: + return f.read() + else: + return "No agenda file found" + else: + return "The agenda has not been uploaded yet." + + def type(self): + if self.group.type.slug in [ "wg" ]: + return "BOF" if self.group.state.slug in ["bof", "bof-conc"] else "WG" + else: + return "" + + def ical_status(self): + if self.status.slug == 'canceled': # sic + return "CANCELLED" + elif (datetime.date.today() - self.meeting.date) > datetime.timedelta(days=5): + # this is a bit simpleminded, better would be to look at the + # time(s) of the timeslot(s) of the official meeting schedule. + return "CONFIRMED" + else: + return "TENTATIVE" + + def agenda_file(self): + if not hasattr(self, '_agenda_file'): + self._agenda_file = "" + + docs = self.materials.filter(type="agenda", states__type="agenda", states__slug="active") + if not docs: + return "" + + # we use external_url at the moment, should probably regularize + # the filenames to match the document name instead + filename = docs[0].external_url + self._agenda_file = "%s/agenda/%s" % (self.meeting.number, filename) + + return self._agenda_file def badness_test(self, num): from settings import BADNESS_CALC_LOG #sys.stdout.write("num: %u / BAD: %u\n" % (num, BADNESS_CALC_LOG)) return BADNESS_CALC_LOG >= num def badness_log(self, num, msg): - import sys if self.badness_test(num): sys.stdout.write(msg) @@ -878,7 +1015,7 @@ class Session(models.Model): conflicts = self.unique_constraints() if self.badness_test(2): - self.badness_log(2, "badgroup: %s badness calculation has %u constraints\n" % (self.group.acronym, len(conflicts))) + self.badness_log(2, "badness for group: %s has %u constraints\n" % (self.group.acronym, len(conflicts))) from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG count = 0 myss_list = assignments[self.group] @@ -946,9 +1083,9 @@ class Session(models.Model): if self.badness_test(3): self.badness_log(3, " [%u] 4group: %s my_sessions: %s vs %s\n" % (count, group.acronym, myss.timeslot.time, ss.timeslot.time)) if ss.timeslot.time == myss.timeslot.time: - newcost = constraint.constraint_cost + newcost = constraint.constraint_cost() if self.badness_test(2): - self.badness_log(2, " [%u] 5group: %s conflicts: %s on %s cost %u\n" % (count, self.group.acronym, ss.session.group.acronym, ss.timeslot.time, newcost)) + self.badness_log(2, " [%u] 5group: %s conflict(%s): %s on %s cost %u\n" % (count, self.group.acronym, constraint.name_id, ss.session.group.acronym, ss.timeslot.time, newcost)) # yes accumulate badness. conflictbadness += newcost ss.badness = conflictbadness @@ -1035,51 +1172,8 @@ class Session(models.Model): if ss.timeslot is not None and ss.timeslot.location == timeslot.location: continue # ignore conflicts when two sessions in the same room constraint = conflict[1] - badness += constraint.constraint_cost + badness += constraint.constraint_cost() if self.badness_test(1): self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness)) return badness - - def agenda_text(self): - doc = self.agenda() - if doc: - path = os.path.join(settings.AGENDA_PATH, self.meeting.number, "agenda", doc.external_url) - if os.path.exists(path): - with open(path) as f: - return f.read() - else: - return "No agenda file found" - else: - return "The agenda has not been uploaded yet." - - def type(self): - if self.group.type.slug in [ "wg" ]: - return "BOF" if self.group.state.slug in ["bof", "bof-conc"] else "WG" - else: - return "" - - def ical_status(self): - if self.status.slug == 'canceled': # sic - return "CANCELLED" - elif (datetime.date.today() - self.meeting.date) > datetime.timedelta(days=5): - # this is a bit simpleminded, better would be to look at the - # time(s) of the timeslot(s) of the official meeting schedule. - return "CONFIRMED" - else: - return "TENTATIVE" - - def agenda_file(self): - if not hasattr(self, '_agenda_file'): - self._agenda_file = "" - - docs = self.materials.filter(type="agenda", states__type="agenda", states__slug="active") - if not docs: - return "" - - # we use external_url at the moment, should probably regularize - # the filenames to match the document name instead - filename = docs[0].external_url - self._agenda_file = "%s/agenda/%s" % (self.meeting.number, filename) - - return self._agenda_file diff --git a/ietf/meeting/placement.py b/ietf/meeting/placement.py new file mode 100644 index 000000000..bcd8d47b3 --- /dev/null +++ b/ietf/meeting/placement.py @@ -0,0 +1,738 @@ +# FILE: ietf/meeting/placement.py +# +# Copyright (c) 2013, The IETF Trust. See ../../../LICENSE. +# +# This file contains a model that encapsulates the progress of the automatic placer. +# Each step of placement is stored as a row in a table, not because this is necessary, +# but because it helps to debug things. +# +# A production run of the placer would do the same work, but simply not save anything. +# + +import sys +import datetime + +from random import Random +from datetime import datetime + +from django.db import models +from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG +from ietf.meeting.models import Schedule, ScheduledSession,TimeSlot,Room + +def do_prompt(): + print "waiting:" + sys.stdin.readline() + +class PlacementException(Exception): + pass + +# ScheduleSlot really represents a single column of time. +# The TimeSlot object would work here, but it associates a room. +# There is a special Schedule slot (subclass) which corresponds to unscheduled items. +class ScheduleSlot(object): + def __init__(self, daytime): + self.daytime = daytime + self.badness = None + self.slotgroups = {} + + # this is a partial copy of ScheduledSession's methods. Prune later. + #def __unicode__(self): + # return u"%s [%s<->%s]" % (self.schedule, self.session, self.timeslot) + # + #def __str__(self): + # return self.__unicode__() + + def add_scheduledsession(self,fs): + self.slotgroups[fs] = fs + + def scheduled_session_pk(self, assignments): + things = [] + slot1 = assignments.slot1 + slot2 = assignments.slot2 + for fs in self.slotgroups.iterkeys(): + session = fs.session + if slot1 is not None and fs == slot1: + session = slot2.session + if slot2 is not None and fs == slot2: + session = slot1.session + if session is not None: + things.append((session.pk,fs)) + return things + + def recalc_badness1(self, assignments): + badness = 0 + for fs,fs2 in self.slotgroups.iteritems(): + if fs.session is not None: + num = fs.session.badness2(self) + #print "rc,,,,%s,%s,%u,recalc1" % (self.daytime, fs.session.short_name, num) + badness += num + self.badness = badness + + def recalc_badness(self, assignments): + badness = 0 + session_pk_list = self.scheduled_session_pk(assignments) + #print "rc,,,%u,slot_recalc" % (len(session_pk_list)) + for pk,fs in session_pk_list: + #print "rc,,,,%u,%s,list" % (pk,fs.session) + if fs.session is not None: + num = fs.session.badness_fast(fs.timeslot, self, session_pk_list) + #print "rc,,,,%s,%s,%u,recalc0" % (self.daytime, fs.session.short_name, num) + badness += num + self.badness = badness + + def calc_badness(self, assignments): + if self.badness is None: + self.recalc_badness(assignments) + return self.badness + +# +# this subclass does everything a ScheduleSlot does, in particular it knows how to +# maintain and recalculate badness, but it also maintains a list of slots which +# are unplaced so as to accelerate finding things to place at the beginning of automatic placement. +# +# XXX perhaps this should be in the form an iterator? +# +class UnplacedScheduleSlot(ScheduleSlot): + def __init__(self): + super(UnplacedScheduleSlot, self).__init__(None) + self.unplaced_slot_numbers = [] + self.unplaced_slots_finishcount = 0 + + def shuffle(self, generator): + generator.shuffle(self.unplaced_slot_numbers) + self.unplaced_slots_finishcount = self.count / 10 + + def finished(self): + if len(self.unplaced_slot_numbers) <= self.unplaced_slots_finishcount: + return True + else: + return False + + @property + def count(self): + return len(self.unplaced_slot_numbers) + + def add_scheduledsession(self,fs): + super(UnplacedScheduleSlot, self).add_scheduledsession(fs) + #print "unplaced add: %s" % (fs.available_slot) + self.unplaced_slot_numbers.append(fs.available_slot) + + def get_unplaced_slot_number(self): + #print "unplaced slots: %s" % (self.unplaced_slot_numbers) + return self.unplaced_slot_numbers[0] + + def delete_first(self): + del self.unplaced_slot_numbers[0] + + +class FakeScheduledSession(object): + """ + This model provides a fake (not-backed by database) N:M relationship between + Session and TimeSlot, but in this case TimeSlot is always None, because the + Session is not scheduled. + """ + faked = "fake" + + def __init__(self, schedule): + self.extendedfrom = None + self.modified = None + self.notes = None + self.badness = None + self.available_slot = None + self.origss = None + self.timeslot = None + self.session = None + self.schedule = schedule + self.pinned = False + self.scheduleslot = None + + def fromScheduledSession(self, ss): # or from another FakeScheduledSession + self.session = ss.session + self.schedule = ss.schedule + self.timeslot = ss.timeslot + self.modified = ss.modified + self.pinned = ss.pinned + self.origss = ss + + def save(self): + pass + + # this is a partial copy of ScheduledSession's methods. Prune later. + def __unicode__(self): + return u"%s [%s<->%s]" % (self.schedule, self.session, self.timeslot) + + def __str__(self): + return self.__unicode__() + + @property + def room_name(self): + return "noroom" + + @property + def special_agenda_note(self): + return self.session.agenda_note if self.session else "" + + @property + def acronym(self): + if self.session and self.session.group: + return self.session.group.acronym + + @property + def slot_to_the_right(self): + return None + + @property + def acronym_name(self): + if not self.session: + return self.notes + if hasattr(self, "interim"): + return self.session.group.name + " (interim)" + elif self.session.name: + return self.session.name + else: + return self.session.group.name + + @property + def session_name(self): + return self.session.name + + @property + def area(self): + if not self.session or not self.session.group: + return "" + if self.session.group.type_id == "irtf": + return "irtf" + if self.timeslot.type_id == "plenary": + return "1plenary" + if not self.session.group.parent or not self.session.group.parent.type_id in ["area","irtf"]: + return "" + return self.session.group.parent.acronym + + @property + def break_info(self): + return None + + @property + def area_name(self): + if self.session and self.session.group and self.session.group.acronym == "edu": + return "Training" + elif not self.session or not self.session.group or not self.session.group.parent or not self.session.group.parent.type_id == "area": + return "" + return self.session.group.parent.name + + @property + def isWG(self): + if not self.session or not self.session.group: + return False + if self.session.group.type_id == "wg" and self.session.group.state_id != "bof": + return True + + @property + def group_type_str(self): + if not self.session or not self.session.group: + return "" + if self.session.group and self.session.group.type_id == "wg": + if self.session.group.state_id == "bof": + return "BOF" + else: + return "WG" + + return "" + + @property + def slottype(self): + return "" + + @property + def empty_str(self): + # return JS happy value + if self.session: + return "False" + else: + return "True" + + def json_dict(self, selfurl): + ss = dict() + ss['scheduledsession_id'] = self.id + #ss['href'] = self.url(sitefqdn) + ss['empty'] = self.empty_str + ss['timeslot_id'] = self.timeslot.id + if self.session: + ss['session_id'] = self.session.id + ss['room'] = slugify(self.timeslot.location) + ss['roomtype'] = self.timeslot.type.slug + ss["time"] = date_format(self.timeslot.time, 'Hi') + ss["date"] = time_format(self.timeslot.time, 'Y-m-d') + ss["domid"] = self.timeslot.js_identifier + return ss + +# this object maintains the current state of the placement tool. +# the assignments hash says where the sessions would go. +class CurrentScheduleState: + def __getitem__(self, key): + if key in self.tempdict: + return self.tempdict[key] + return self.current_assignments[key] + + def __iter__(self): + return self.current_assignments.__iter__() + def iterkeys(self): + return self.current_assignments.__iter__() + + def add_to_available_slot(self, fs): + size = len(self.available_slots) + if fs.session is not None: + fs.session.setup_conflicts() + + time_column = None + needs_to_be_added = True + #print "adding fs for slot: %s" % (fs.timeslot) + if fs.timeslot is not None: + if fs.timeslot in self.fs_by_timeslot: + ofs = self.fs_by_timeslot[fs.timeslot] + #print " duplicate timeslot[%s], updating old one: %s" % (ofs.available_slot, fs.timeslot) + if ofs.session is None: + # keep the one with the assignment. + self.fs_by_timeslot[fs.timeslot] = fs + # get rid of old item + fs.available_slot = ofs.available_slot + self.available_slots[ofs.available_slot] = fs + needs_to_be_added = False + else: + self.fs_by_timeslot[fs.timeslot] = fs + + # add the slot to the list of vertical slices. + time_column = self.timeslots[fs.timeslot.time] + group_name = "empty" + if fs.session is not None: + group_name = fs.session.group.acronym + #print " inserting fs %s / %s to slot: %s" % (fs.timeslot.location.name, + # group_name, + # time_column.daytime) + fs.scheduleslot = time_column + if fs.session is None: + self.placed_scheduleslots.append(fs) + else: + time_column = self.unplaced_scheduledslots + fs.scheduleslot = self.unplaced_scheduledslots + + if needs_to_be_added: + self.total_slots = size + self.available_slots.append(fs) + fs.available_slot = size + + if time_column is not None: + # needs available_slot to be filled in + time_column.add_scheduledsession(fs) + #print "adding item: %u to unplaced slots (pinned: %s)" % (fs.available_slot, fs.pinned) + + def __init__(self, schedule, seed=None): + # initialize available_slots with the places that a session can go based upon the + # scheduledsession objects of the provided schedule. + # for each session which is not initially scheduled, also create a scheduledsession + # that has a session, but no timeslot. + + self.recordsteps = True + self.debug_badness = False + self.lastSaveTime = datetime.now() + self.lastSaveStep = 0 + self.verbose = False + + # this maps a *group* to a list of (session,location) pairs, using FakeScheduledSession + self.current_assignments = {} + self.tempdict = {} # used when calculating badness. + + # this contains an entry for each location, and each un-location in the form of + # (session,location) with the appropriate part None. + self.fs_by_timeslot = {} + self.available_slots = [] + self.unplaced_scheduledslots = UnplacedScheduleSlot() + self.placed_scheduleslots = [] + self.sessions = {} + self.total_slots = 0 + + self.schedule = schedule + self.meeting = schedule.meeting + self.seed = seed + self.badness = schedule.badness + self.random_generator=Random() + self.random_generator.seed(seed) + self.temperature = 10000000 + self.stepnum = 1 + self.timeslots = {} + self.slot1 = None + self.slot2 = None + + # setup up array of timeslots objects + for timeslot in schedule.meeting.timeslot_set.filter(type = "session").all(): + if not timeslot.time in self.timeslots: + self.timeslots[timeslot.time] = ScheduleSlot(timeslot.time) + fs = FakeScheduledSession(self.schedule) + fs.timeslot = timeslot + self.add_to_available_slot(fs) + self.timeslots[None] = self.unplaced_scheduledslots + + # make list of things that need placement. + for sess in self.meeting.sessions_that_can_be_placed().all(): + fs = FakeScheduledSession(self.schedule) + fs.session = sess + self.sessions[sess] = fs + self.current_assignments[sess.group] = [] + + #print "Then had %u" % (self.total_slots) + # now find slots that are not empty. + # loop here and the one for useableslots could be merged into one loop + allschedsessions = self.schedule.qs_scheduledsessions_with_assignments.filter(timeslot__type = "session").all() + for ss in allschedsessions: + # do not need to check for ss.session is not none, because filter above only returns those ones. + sess = ss.session + if not (sess in self.sessions): + #print "Had to create sess for %s" % (sess) + self.sessions[sess] = FakeScheduledSession(self.schedule) + fs = self.sessions[sess] + #print "Updating %s from %s(%s)" % (fs.session.group.acronym, ss.timeslot.location.name, ss.timeslot.time) + fs.fromScheduledSession(ss) + + # if pinned, then do not consider it when selecting, but it needs to be in + # current_assignments so that conflicts are calculated. + if not ss.pinned: + self.add_to_available_slot(fs) + else: + del self.sessions[sess] + self.current_assignments[ss.session.group].append(fs) + + # XXX can not deal with a session in two slots yet?! + + # need to remove any sessions that might have gotten through above, but are in non-session + # places, otherwise these could otherwise appear to be unplaced. + allspecialsessions = self.schedule.qs_scheduledsessions_with_assignments.exclude(timeslot__type = "session").all() + for ss in allspecialsessions: + sess = ss.session + if sess is None: + continue + if (sess in self.sessions): + del self.sessions[sess] + + # now need to add entries for those sessions which are currently unscheduled (and yet not pinned) + for sess,fs in self.sessions.iteritems(): + if fs.timeslot is None: + #print "Considering sess: %s, and loc: %s" % (sess, str(fs.timeslot)) + self.add_to_available_slot(fs) + + #import pdb; pdb.set_trace() + # do initial badness calculation for placement that has been done + for daytime,scheduleslot in self.timeslots.iteritems(): + scheduleslot.recalc_badness(self) + + def dump_available_slot_state(self): + for fs in self.available_slots: + shortname="unplaced" + sessid = 0 + if fs.session is not None: + shortname=fs.session.short_name + sessid = fs.session.id + pinned = "unplaced" + ssid=0 + if fs.origss is not None: + pinned = fs.origss.pinned + ssid = fs.origss.id + print "%s: %s[%u] pinned: %s ssid=%u" % (fs.available_slot, shortname, sessid, pinned, ssid) + + def pick_initial_slot(self): + if self.unplaced_scheduledslots.finished(): + self.initial_stage = False + if self.initial_stage: + item = self.unplaced_scheduledslots.get_unplaced_slot_number() + slot1 = self.available_slots[item] + #print "item: %u points to %s" % (item, slot1) + else: + slot1 = self.random_generator.choice(self.available_slots) + return slot1 + + def pick_second_slot(self): + if self.initial_stage and len(self.placed_scheduleslots)>0: + self.random_generator.shuffle(self.placed_scheduleslots) + slot2 = self.placed_scheduleslots[0] + del self.placed_scheduleslots[0] + else: + slot2 = self.random_generator.choice(self.available_slots) + return slot2 + + def pick_two_slots(self): + slot1 = self.pick_initial_slot() + slot2 = self.pick_second_slot() + tries = 100 + self.repicking = 0 + # 1) no point in picking two slots which are the same. + # 2) no point in picking two slots which have no session (already empty) + # 3) no point in picking two slots which are both unscheduled sessions + # 4) limit outselves to ten tries. + while (slot1 == slot2 or slot1 is None or slot2 is None or + (slot1.session is None and slot2.session is None) or + (slot1.timeslot is None and slot2.timeslot is None) + ) and tries > 0: + self.repicking += 1 + #print "%u: .. repicking slots, had: %s and %s" % (self.stepnum, slot1, slot2) + slot1 = self.pick_initial_slot() + slot2 = self.pick_second_slot() + tries -= 1 + if tries == 0: + raise PlacementException("How can it pick the same slot ten times in a row") + + if slot1.pinned: + raise PlacementException("Should never attempt to move pinned slot1") + + if slot2.pinned: + raise PlacementException("Should never attempt to move pinned slot2") + + return slot1, slot2 + + # this assigns a session to a particular slot. + def assign_session(self, session, fslot, doubleup=False): + import copy + if session is None: + # we need to unschedule the session + session = fslot.session + self.tempdict[session.group] = [] + return + + if not session in self.sessions: + raise PlacementException("Is there a legit case where session is not in sessions here?") + + oldfs = self.sessions[session] + # find the group mapping. + pairs = copy.copy(self.current_assignments[session.group]) + #print "pairs is: %s" % (pairs) + if oldfs in pairs: + which = pairs.index(oldfs) + del pairs[which] + #print "new pairs is: %s" % (pairs) + + self.sessions[session] = fslot + # now fix up the other things. + pairs.append(fslot) + self.tempdict[session.group] = pairs + + def commit_tempdict(self): + for key,value in self.tempdict.iteritems(): + self.current_assignments[key] = value + self.tempdict = dict() + + # calculate badness of the columns which have changed + def calc_badness(self, slot1, slot2): + badness = 0 + for daytime,scheduleslot in self.timeslots.iteritems(): + oldbadness = scheduleslot.badness + if oldbadness is None: + oldbadness = 0 + recalc="" + if slot1 is not None and slot1.scheduleslot == scheduleslot: + recalc="recalc slot1" + scheduleslot.recalc_badness(self) + if slot2 is not None and slot2.scheduleslot == scheduleslot: + recalc="recalc slot2" + scheduleslot.recalc_badness(self) + + newbadness = scheduleslot.calc_badness(self) + if self.debug_badness: + print " calc: %s %u %u %s" % (scheduleslot.daytime, oldbadness, newbadness, recalc) + badness += newbadness + return badness + + def try_swap(self): + badness = self.badness + slot1,slot2 = self.pick_two_slots() + if self.debug_badness: + print "start\n slot1: %s.\n slot2: %s.\n badness: %s" % (slot1, slot2,badness) + self.slot1 = slot1 + self.slot2 = slot2 + #import pdb; pdb.set_trace() + #self.assign_session(slot2.session, slot1, False) + #self.assign_session(slot1.session, slot2, False) + # self can substitute for current_assignments thanks to getitem() above. + newbadness = self.calc_badness(slot1, slot2) + if self.debug_badness: + print "end\n slot1: %s.\n slot2: %s.\n badness: %s" % (slot1, slot2, newbadness) + return newbadness + + def log_step(self, accepted_str, change, dice, prob): + acronym1 = "empty" + if self.slot1.session is not None: + acronym1 = self.slot1.session.group.acronym + place1 = "nowhere" + if self.slot1.timeslot is not None: + place1 = str(self.slot1.timeslot.location.name) + + acronym2= "empty" + if self.slot2.session is not None: + acronym2 = self.slot2.session.group.acronym + place2 = "nowhere" + if self.slot2.timeslot is not None: + place2 = str(self.slot2.timeslot.location.name) + initial = " " + if self.initial_stage: + initial = "init" + + # note in logging: the swap has already occured, but the values were set before + if self.verbose: + print "% 5u:%s %s temp=%9u delta=%+9d badness=%10d dice=%.4f <=> prob=%.4f (repicking=%u) %9s:[%8s->%8s], %9s:[%8s->%8s]" % (self.stepnum, initial, + accepted_str, self.temperature, + change, self.badness, dice, prob, + self.repicking, acronym1, place2, place1, acronym2, place1, place2) + + def do_step(self): + self.stepnum += 1 + newbadness = self.try_swap() + if self.badness is None: + self.commit_tempdict + self.badness = newbadness + return True, 0 + + change = newbadness - self.badness + prob = self.calc_probability(change) + dice = self.random_generator.random() + + #self.log_step("consider", change, dice, prob) + + if dice < prob: + accepted_str = "accepted" + accepted = True + # swap things as planned + self.commit_tempdict + + # actually do the swap in the FS + tmp = self.slot1.session + self.slot1.session = self.slot2.session + self.slot2.session = tmp + self.badness = newbadness + # save state object + else: + accepted_str = "rejected" + accepted = False + self.tempdict = dict() + + self.log_step(accepted_str, change, dice, prob) + + if accepted and not self.initial_stage: + self.temperature = self.temperature * 0.9995 + + return accepted, change + + def calc_probability(self, change): + import math + return 1/(1 + math.exp(float(change)/self.temperature)) + + def delete_available_slot(self, number): + # because the numbers matter, we just None things out, and let repicking + # work on things. + #last = len(self.available_slots)-1 + #if number < last: + # self.available_slots[number] = self.available_slots[last] + # self.available_slots[last].available_slot = number + # + #del self.available_slots[last] + self.available_slots[number] = None + + def do_steps(self, limit=None, monitorSchedule=None): + print "do_steps(%s,%s)" % (limit, monitorSchedule) + if self.badness is None or self.badness == 0: + self.badness = self.schedule.calc_badness1(self) + self.oldbadness = self.badness + while (limit is None or self.stepnum < limit) and self.temperature > 1000: + accepted,change = self.do_step() + #set_prompt_wait(True) + if not accepted and self.initial_stage: + # randomize again! + self.unplaced_scheduledslots.shuffle(self.random_generator) + + if accepted and self.initial_stage and self.unplaced_scheduledslots.count>0: + # delete it from available slots, so as not to leave unplaced slots + self.delete_available_slot(self.slot1.available_slot) + # remove initial slot from list. + self.unplaced_scheduledslots.delete_first() + + if False and accepted and self.recordsteps: + ass1 = AutomaticScheduleStep() + ass1.schedule = self.schedule + if self.slot1.session is not None: + ass1.session = self.slot1.session + if self.slot1.origss is not None: + ass1.moved_to = self.slot1.origss + ass1.stepnum = self.stepnum + ass1.save() + ass2 = AutomaticScheduleStep() + ass2.schedule = self.schedule + if self.slot2.session is not None: + ass2.session = self.slot2.session + if self.slot2.origss is not None: + ass2.moved_to = self.slot2.origss + ass2.stepnum = self.stepnum + ass2.save() + #print "%u: accepted: %s change %d temp: %d" % (self.stepnum, accepted, change, self.temperature) + if (self.stepnum % 1000) == 0 and monitorSchedule is not None: + self.saveToSchedule(monitorSchedule) + print "Finished after %u steps, badness = %u->%u" % (self.stepnum, self.oldbadness, self.badness) + + def saveToSchedule(self, targetSchedule): + when = datetime.now() + since = 0 + rate = 0 + if targetSchedule is None: + targetSchedule = self.schedule + else: + # XXX more stuff to do here, setup mapping, copy pinned items + pass + + if self.lastSaveTime is not None: + since = when - self.lastSaveTime + if since.microseconds > 0: + rate = 1000 * float(self.stepnum - self.lastSaveStep) / (1000*since.seconds + since.microseconds / 1000) + print "%u: saved to schedule: %s %s elapsed=%s rate=%.2f" % (self.stepnum, targetSchedule.name, when, since, rate) + self.lastSaveTime = datetime.now() + self.lastSaveStep = self.stepnum + + # first, remove all assignments in the schedule. + for ss in targetSchedule.scheduledsession_set.all(): + if ss.pinned: + continue + ss.delete() + + # then, add new items for new placements. + for fs in self.available_slots: + if fs is None: + continue + ss = ScheduledSession(timeslot = fs.timeslot, + schedule = targetSchedule, + session = fs.session) + ss.save() + + def do_placement(self, limit=None, targetSchedule=None): + self.badness = self.schedule.calc_badness1(self) + if limit is None: + limitstr = "unlimited " + else: + limitstr = "%u" % (limit) + print "Initial stage (limit=%s) starting with: %u items to place" % (limitstr, self.unplaced_scheduledslots.count) + + # permute the unplaced sessions + self.unplaced_scheduledslots.shuffle(self.random_generator) + + self.initial_stage = True + monitorSchedule = targetSchedule + if monitorSchedule is None: + monitorSchedule = self.schedule + self.do_steps(limit, monitorSchedule) + self.saveToSchedule(targetSchedule) + +# +# this does not clearly have value at this point. +# Not worth a migration/table yet. +# +if False: + class AutomaticScheduleStep(models.Model): + schedule = models.ForeignKey('Schedule', null=False, blank=False, help_text=u"Who made this agenda") + session = models.ForeignKey('Session', null=True, default=None, help_text=u"Scheduled session involved") + moved_from = models.ForeignKey('ScheduledSession', related_name="+", null=True, default=None, help_text=u"Where session was") + moved_to = models.ForeignKey('ScheduledSession', related_name="+", null=True, default=None, help_text=u"Where session went") + stepnum = models.IntegerField(default=0, blank=True, null=True) + diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py index ff92707e7..85a204581 100644 --- a/ietf/meeting/test_data.py +++ b/ietf/meeting/test_data.py @@ -8,9 +8,11 @@ from ietf.group.models import Group def make_meeting_test_data(): - make_test_data() + if not Group.objects.filter(acronym='mars'): + make_test_data() system_person = Person.objects.get(name="(System)") plainman = Person.objects.get(user__username="plain") + secretary = Person.objects.get(user__username="secretary") meeting = Meeting.objects.get(number="42", type="ietf") schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-agenda", visible=True, public=True) diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 01699928f..831db8da1 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -20,52 +20,67 @@ class ApiTests(TestCase): r = self.client.get("/dajaxice/dajaxice.core.js") self.assertEqual(r.status_code, 200) - def test_update_agenda_item(self): + def test_update_agenda(self): meeting = make_meeting_test_data() - session = Session.objects.filter(meeting=meeting, group__acronym="mars").first() - mars_scheduled = ScheduledSession.objects.get(session=session) + schedule = Schedule.objects.get(meeting__number=42,name="test-agenda") + mars_session = Session.objects.filter(meeting=meeting, group__acronym="mars").first() + ames_session = Session.objects.filter(meeting=meeting, group__acronym="ames").first() + + mars_scheduled = ScheduledSession.objects.get(session=mars_session) mars_slot = mars_scheduled.timeslot - ames_scheduled = ScheduledSession.objects.get(session__meeting=meeting, session__group__acronym="ames") + ames_scheduled = ScheduledSession.objects.get(session=ames_session) ames_slot = ames_scheduled.timeslot - def do_post(to): - # move this session from one timeslot to another - return self.client.post('/dajaxice/ietf.meeting.update_timeslot/', { - 'argv': json.dumps({ - "schedule_id": mars_scheduled.schedule.pk, - "session_id": session.pk, - "scheduledsession_id": to.pk if to else None, - })}) + def do_unschedule(scheduledsession): + url = urlreverse("ietf.meeting.ajax.scheduledsession_json", + kwargs=dict(num=scheduledsession.session.meeting.number, + name=scheduledsession.schedule.name, + scheduledsession_id=scheduledsession.pk,)) + return self.client.delete(url) - # faulty post - not logged in - r = do_post(to=ames_scheduled) - self.assertEqual(r.status_code, 200) - self.assertTrue("error" in json.loads(r.content)) - self.assertEqual(ScheduledSession.objects.get(pk=mars_scheduled.pk).session, session) + def do_schedule(schedule,session,timeslot): + url = urlreverse("ietf.meeting.ajax.scheduledsessions_json", + kwargs=dict(num=session.meeting.number, + name=schedule.name,)) + post_data = '{ "session_id": "%s", "timeslot_id": "%s" }'%(session.pk,timeslot.pk) + return self.client.post(url,post_data,content_type='application/x-www-form-urlencoded') - # faulty post - logged in as non-owner + # not logged in + # faulty delete + r = do_unschedule(mars_scheduled) + self.assertEqual(r.status_code, 403) + self.assertEqual(ScheduledSession.objects.get(pk=mars_scheduled.pk).session, mars_session) + # faulty post + r = do_schedule(schedule,ames_session,mars_slot) + self.assertEqual(r.status_code, 403) + + # logged in as non-owner + # faulty delete self.client.login(remote_user="ad") - r = do_post(to=ames_scheduled) - self.assertEqual(r.status_code, 200) + r = do_unschedule(mars_scheduled) + self.assertEqual(r.status_code, 403) self.assertTrue("error" in json.loads(r.content)) + # faulty post + r = do_schedule(schedule,ames_session,mars_slot) + self.assertEqual(r.status_code, 403) - # move to ames + # Put ames in the same timeslot as mars self.client.login(remote_user="plain") - r = do_post(to=ames_scheduled) + r = do_unschedule(ames_scheduled) self.assertEqual(r.status_code, 200) self.assertTrue("error" not in json.loads(r.content)) - self.assertEqual(ScheduledSession.objects.get(pk=mars_scheduled.pk).session, None) - self.assertEqual(ScheduledSession.objects.get(pk=ames_scheduled.pk).session, session) + r = do_schedule(schedule,ames_session,mars_slot) + self.assertEqual(r.status_code, 201) - # unschedule - self.client.login(remote_user="plain") - r = do_post(to=None) + # Unschedule mars + r = do_unschedule(mars_scheduled) self.assertEqual(r.status_code, 200) self.assertTrue("error" not in json.loads(r.content)) - self.assertEqual(ScheduledSession.objects.get(pk=ames_scheduled.pk).session, None) + self.assertEqual(ScheduledSession.objects.filter(session=mars_session).count(), 0) + self.assertEqual(ScheduledSession.objects.get(session=ames_session).timeslot, mars_slot) def test_constraints_json(self): @@ -106,7 +121,7 @@ class ApiTests(TestCase): timeslots_before = meeting.timeslot_set.count() url = urlreverse("ietf.meeting.ajax.timeslot_roomsurl", kwargs=dict(num=meeting.number)) - post_data = { "name": "new room", "capacity": "50" } + post_data = { "name": "new room", "capacity": "50" , "resources": []} # unauthorized post r = self.client.post(url, post_data) @@ -116,6 +131,7 @@ class ApiTests(TestCase): # create room self.client.login(remote_user="secretary") r = self.client.post(url, post_data) + self.assertEqual(r.status_code, 302) self.assertTrue(meeting.room_set.filter(name="new room")) timeslots_after = meeting.timeslot_set.count() @@ -213,7 +229,7 @@ class ApiTests(TestCase): meeting = make_meeting_test_data() url = urlreverse("ietf.meeting.ajax.agenda_infourl", - kwargs=dict(num=meeting.number, schedule_name=meeting.agenda.name)) + kwargs=dict(num=meeting.number, name=meeting.agenda.name)) r = self.client.get(url) info = json.loads(r.content) @@ -247,7 +263,7 @@ class ApiTests(TestCase): url = urlreverse("ietf.meeting.ajax.agenda_infourl", kwargs=dict(num=meeting.number, - schedule_name=meeting.agenda.name)) + name=meeting.agenda.name)) post_data = { 'visible': 'false', @@ -259,8 +275,14 @@ class ApiTests(TestCase): r = self.client.post(url, post_data) self.assertEqual(r.status_code, 403) + # TODO - permission protection on this function are not right + # Normal users are prevented from changing public/private on their own schedule + # The secretariat can't change normal user's agendas settings for them, and the + # page at /meeting//schedule//details behaves badly for the secretariat + # (pushing save seems to do nothing as the POST 401s in the background) + # change agenda - self.client.login(remote_user="ad") + self.client.login(remote_user="secretary") r = self.client.post(url, post_data) self.assertEqual(r.status_code, 302) changed_schedule = Schedule.objects.get(pk=meeting.agenda.pk) @@ -272,7 +294,7 @@ class ApiTests(TestCase): url = urlreverse("ietf.meeting.ajax.agenda_infourl", kwargs=dict(num=meeting.number, - schedule_name=meeting.agenda.name)) + name=meeting.agenda.name)) # unauthorized delete self.client.login(remote_user="plain") r = self.client.delete(url) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 6b78c4ae2..6f7948ddc 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -159,7 +159,7 @@ class EditTests(TestCase): self.client.login(remote_user="secretary") r = self.client.get(urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number))) self.assertEqual(r.status_code, 200) - self.assertTrue("session_obj" in r.content) + self.assertTrue("load_scheduledsessions" in r.content) def test_save_agenda_as_and_read_permissions(self): meeting = make_meeting_test_data() @@ -174,7 +174,7 @@ class EditTests(TestCase): self.assertEqual(r.status_code, 302) # get - url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number, schedule_name="foo")) + url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number, name="foo")) r = self.client.get(url) self.assertEqual(r.status_code, 200) diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index c3743bdd5..6152ab8b8 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -20,11 +20,13 @@ urlpatterns = patterns('', (r'^agenda/week-view.html$', views.week_view), (r'^week-view.html$', views.week_view), (r'^(?P\d+)/schedule/edit$', views.edit_agenda), - (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/edit$', views.edit_agenda), - (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/details$', views.edit_agenda_properties), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/edit$', views.edit_agenda), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/details$', views.edit_agenda_properties), (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)(?P.html)?/?$', views.agenda), (r'^(?P\d+)/agenda(?P.html)?/?$', views.agenda), (r'^(?P\d+)/(?Pagenda-utc)(?P.html)?/?$', views.agenda), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/sessions.json$', ajax.scheduledsessions_json), + (r'^(?P\d+)/schedule/(?P[A-Za-z0-9-:_]+)/session/(?P\d+).json$', ajax.scheduledsession_json), (r'^(?P\d+)/requests.html$', RedirectView.as_view(url='/meeting/%(num)s/requests', permanent=True)), (r'^(?P\d+)/requests$', views.meeting_requests), (r'^(?P\d+)/agenda(?P.txt)$', views.agenda), @@ -34,10 +36,11 @@ urlpatterns = patterns('', (r'^(?P\d+)/timeslots/edit$', views.edit_timeslots), (r'^(?P\d+)/rooms$', ajax.timeslot_roomsurl), (r'^(?P\d+)/room/(?P\d+).json$', ajax.timeslot_roomurl), + (r'^(?P\d+)/room/(?P\d+).html$', views.edit_roomurl), (r'^(?P\d+)/timeslots$', ajax.timeslot_slotsurl), (r'^(?P\d+)/timeslots.json$', ajax.timeslot_slotsurl), (r'^(?P\d+)/timeslot/(?P\d+).json$', ajax.timeslot_sloturl), - (r'^(?P\d+)/agendas/(?P[A-Za-z0-9-:_]+).json$', ajax.agenda_infourl), + (r'^(?P\d+)/agendas/(?P[A-Za-z0-9-:_]+).json$', ajax.agenda_infourl), (r'^(?P\d+)/agendas$', ajax.agenda_infosurl), (r'^(?P\d+)/agendas.json$', ajax.agenda_infosurl), (r'^(?P\d+)/week-view.html$', views.week_view), @@ -45,6 +48,7 @@ urlpatterns = patterns('', (r'^(?P\d+)/agenda/(?P[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf), (r'^(?P\d+)/agenda/(?P[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile), (r'^(?P\d+)/agenda/(?P[A-Za-z0-9-]+)/?$', views.session_agenda), + (r'^(?P\d+)/sessions.json', ajax.sessions_json), (r'^(?P\d+)/session/(?P\d+).json', ajax.session_json), (r'^(?P\d+)/session/(?P\d+)/constraints.json', ajax.session_constraints), (r'^(?P\d+)/constraint/(?P\d+).json', ajax.constraint_json), diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index f2bd733d1..44a0a0d30 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -23,12 +23,13 @@ from django.middleware.gzip import GZipMiddleware from django.db.models import Max from django.forms.models import modelform_factory from django.views.decorators.csrf import ensure_csrf_cookie +from django.forms import ModelForm from ietf.utils.pipe import pipe from ietf.ietfauth.utils import role_required, has_role from ietf.doc.models import Document, State from ietf.person.models import Person -from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule +from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule, Room from ietf.group.models import Group from ietf.meeting.helpers import get_areas @@ -97,13 +98,13 @@ class SaveAsForm(forms.Form): savename = forms.CharField(max_length=100) @role_required('Area Director','Secretariat') -def agenda_create(request, num=None, schedule_name=None): +def agenda_create(request, num=None, name=None): meeting = get_meeting(num) - schedule = get_schedule(meeting, schedule_name) + schedule = get_schedule(meeting, name) if schedule is None: # here we have to return some ajax to display an error. - raise Http404("No meeting information for meeting %s schedule %s available" % (num,schedule_name)) + raise Http404("No meeting information for meeting %s schedule %s available" % (num,name)) # authorization was enforced by the @group_require decorator above. @@ -160,6 +161,7 @@ def agenda_create(request, num=None, schedule_name=None): return redirect(edit_agenda, meeting.number, newschedule.name) +@role_required('Secretariat') @decorator_from_middleware(GZipMiddleware) @ensure_csrf_cookie def edit_timeslots(request, num=None): @@ -174,8 +176,8 @@ def edit_timeslots(request, num=None): rooms = meeting.room_set.order_by("capacity") + # this import locate here to break cyclic loop. from ietf.meeting.ajax import timeslot_roomsurl, AddRoomForm, timeslot_slotsurl, AddSlotForm - roomsurl = reverse(timeslot_roomsurl, args=[meeting.number]) adddayurl = reverse(timeslot_slotsurl, args=[meeting.number]) @@ -194,15 +196,47 @@ def edit_timeslots(request, num=None): "meeting":meeting}, RequestContext(request)), content_type="text/html") +class RoomForm(ModelForm): + class Meta: + model = Room + exclude = ('meeting',) + +@role_required('Secretariat') +def edit_roomurl(request, num, roomid): + meeting = get_meeting(num) + + try: + room = meeting.room_set.get(pk=roomid) + except Room.DoesNotExist: + raise Http404("No room %u for meeting %s" % (roomid, meeting.name)) + + if request.POST: + roomform = RoomForm(request.POST, instance=room) + new_room = roomform.save(commit=False) + new_room.meeting = meeting + new_room.save() + roomform.save_m2m() + return HttpResponseRedirect( reverse(edit_timeslots, args=[meeting.number]) ) + + roomform = RoomForm(instance=room) + meeting_base_url = request.build_absolute_uri(meeting.base_url()) + site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash + return HttpResponse(render_to_string("meeting/room_edit.html", + {"meeting_base_url": meeting_base_url, + "site_base_url": site_base_url, + "editroom": roomform, + "meeting":meeting}, + RequestContext(request)), content_type="text/html") + ############################################################################## #@role_required('Area Director','Secretariat') # disable the above security for now, check it below. @decorator_from_middleware(GZipMiddleware) @ensure_csrf_cookie -def edit_agenda(request, num=None, schedule_name=None): +def edit_agenda(request, num=None, name=None): if request.method == 'POST': - return agenda_create(request, num, schedule_name) + return agenda_create(request, num, name) user = request.user requestor = "AnonymousUser" @@ -215,8 +249,8 @@ def edit_agenda(request, num=None, schedule_name=None): pass meeting = get_meeting(num) - #sys.stdout.write("requestor: %s for sched_name: %s \n" % ( requestor, schedule_name )) - schedule = get_schedule(meeting, schedule_name) + #sys.stdout.write("requestor: %s for sched_name: %s \n" % ( requestor, name )) + schedule = get_schedule(meeting, name) #sys.stdout.write("2 requestor: %u for sched owned by: %u \n" % ( requestor.id, schedule.owner.id )) meeting_base_url = request.build_absolute_uri(meeting.base_url()) @@ -239,14 +273,8 @@ def edit_agenda(request, num=None, schedule_name=None): "meeting_base_url":meeting_base_url}, RequestContext(request)), status=403, content_type="text/html") - sessions = meeting.sessions_that_can_meet.order_by("id", "group", "requested_by") scheduledsessions = get_all_scheduledsessions_from_schedule(schedule) - session_jsons = [ json.dumps(s.json_dict(site_base_url)) for s in sessions ] - - # useful when debugging javascript - #session_jsons = session_jsons[1:20] - # get_modified_from needs the query set, not the list modified = get_modified_from_scheduledsessions(scheduledsessions) @@ -275,7 +303,6 @@ def edit_agenda(request, num=None, schedule_name=None): "area_list": area_list, "area_directors" : ads, "wg_list": wg_list , - "session_jsons": session_jsons, "scheduledsessions": scheduledsessions, "show_inline": set(["txt","htm","html"]) }, RequestContext(request)), content_type="text/html") @@ -289,10 +316,10 @@ AgendaPropertiesForm = modelform_factory(Schedule, fields=('name','visible', 'pu @role_required('Area Director','Secretariat') @decorator_from_middleware(GZipMiddleware) @ensure_csrf_cookie -def edit_agenda_properties(request, num=None, schedule_name=None): +def edit_agenda_properties(request, num=None, name=None): meeting = get_meeting(num) - schedule = get_schedule(meeting, schedule_name) + schedule = get_schedule(meeting, name) form = AgendaPropertiesForm(instance=schedule) return HttpResponse(render_to_string("meeting/properties_edit.html", @@ -311,7 +338,7 @@ def edit_agenda_properties(request, num=None, schedule_name=None): def edit_agendas(request, num=None, order=None): #if request.method == 'POST': - # return agenda_create(request, num, schedule_name) + # return agenda_create(request, num, name) meeting = get_meeting(num) user = request.user @@ -546,7 +573,7 @@ def ical_agenda(request, num=None, name=None, ext=None): # Process the special flags. # "-wgname" will remove a working group from the output. - # "~Type" will add that type to the output. + # "~Type" will add that type to the output. # "-~Type" will remove that type from the output # Current types are: # Session, Other (default on), Break, Plenary (default on) @@ -568,7 +595,7 @@ def ical_agenda(request, num=None, name=None, ext=None): Q(session__group__parent__acronym__in = include) ).exclude(session__group__acronym__in = exclude).distinct() #.exclude(Q(session__group__isnull = False), - #Q(session__group__acronym__in = exclude) | + #Q(session__group__acronym__in = exclude) | #Q(session__group__parent__acronym__in = exclude)) return HttpResponse(render_to_string("meeting/agenda.ics", diff --git a/ietf/name/migrations/0020_add_default_penalties.py b/ietf/name/migrations/0020_add_default_penalties.py new file mode 100644 index 000000000..53ac9c0d8 --- /dev/null +++ b/ietf/name/migrations/0020_add_default_penalties.py @@ -0,0 +1,205 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models +from settings import BADNESS_TOOBIG, BADNESS_MUCHTOOBIG +from settings import BADNESS_CONFLICT_1, BADNESS_CONFLICT_2, BADNESS_CONFLICT_3, BADNESS_BETHERE + +class Migration(DataMigration): + + def forwards(self, orm): + bethere = orm.ConstraintName.objects.get(slug="bethere") + if bethere.penalty is None or bethere.penalty == 0: + bethere.penalty = BADNESS_BETHERE + bethere.save() + + # + conflict = orm.ConstraintName.objects.get(slug="conflict") + if conflict.penalty is None or conflict.penalty == 0: + conflict.penalty = BADNESS_CONFLICT_1 + conflict.save() + + # + conflic2 = orm.ConstraintName.objects.get(slug="conflic2") + if conflic2.penalty is None or conflic2.penalty == 0: + conflic2.penalty = BADNESS_CONFLICT_2 + conflic2.save() + + # + conflic3 = orm.ConstraintName.objects.get(slug="conflic3") + if conflic3.penalty is None or conflic3.penalty == 0: + conflic3.penalty = BADNESS_CONFLICT_3 + conflic3.save() + + def backwards(self, orm): + pass + + models = { + 'name.ballotpositionname': { + 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, + 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.dbtemplatetypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docrelationshipname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docremindertypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.feedbacktype': { + 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupmilestonestatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.liaisonstatementpurposename': { + 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.nomineepositionstate': { + 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.rolename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + } + } + + complete_apps = ['name'] + symmetrical = True diff --git a/ietf/name/migrations/0021_add_room.py b/ietf/name/migrations/0021_add_room.py new file mode 100644 index 000000000..f7189b53f --- /dev/null +++ b/ietf/name/migrations/0021_add_room.py @@ -0,0 +1,200 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'RoomResourceName' + db.create_table('name_roomresourcename', ( + ('slug', self.gf('django.db.models.fields.CharField')(max_length=8, primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('desc', self.gf('django.db.models.fields.TextField')(blank=True)), + ('used', self.gf('django.db.models.fields.BooleanField')(default=True)), + ('order', self.gf('django.db.models.fields.IntegerField')(default=0)), + )) + db.send_create_signal('name', ['RoomResourceName']) + + def backwards(self, orm): + # Deleting model 'RoomResourceName' + db.delete_table('name_roomresourcename') + + + models = { + 'name.ballotpositionname': { + 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, + 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.dbtemplatetypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docrelationshipname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docremindertypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.feedbacktype': { + 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupmilestonestatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.liaisonstatementpurposename': { + 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.nomineepositionstate': { + 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.rolename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + } + } + + complete_apps = ['name'] diff --git a/ietf/name/migrations/0022_add_room_resources.py b/ietf/name/migrations/0022_add_room_resources.py new file mode 100644 index 000000000..d4db287d3 --- /dev/null +++ b/ietf/name/migrations/0022_add_room_resources.py @@ -0,0 +1,201 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + RoomResourceName = orm['name.RoomResourceName'] + RoomResourceName(slug='project', name='LCD projector', + desc='The room will have a computer projector', + used=True).save() + RoomResourceName(slug='proj2', name='second LCD projector', + desc='The room will have a second computer projector', + used=True).save() + RoomResourceName(slug='meetecho', name='Meetecho Remote Partition Support', + desc='The room will have a meetecho wrangler', + used=True).save() + + + def backwards(self, orm): + pass + + + models = { + 'name.ballotpositionname': { + 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, + 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.constraintname': { + 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.dbtemplatetypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docrelationshipname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.docremindertypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctagname': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.doctypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.feedbacktype': { + 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupmilestonestatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.groupstatename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.grouptypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.intendedstdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.liaisonstatementpurposename': { + 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.meetingtypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.nomineepositionstate': { + 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.rolename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.roomresourcename': { + 'Meta': {'ordering': "['order']", 'object_name': 'RoomResourceName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.sessionstatusname': { + 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.stdlevelname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.streamname': { + 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + 'name.timeslottypename': { + 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, + 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), + 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + } + } + + complete_apps = ['name'] diff --git a/ietf/name/models.py b/ietf/name/models.py index 7403256d1..b18e9415b 100644 --- a/ietf/name/models.py +++ b/ietf/name/models.py @@ -31,7 +31,7 @@ class DocRelationshipName(NameModel): """Updates, Replaces, Obsoletes, Reviews, ... The relationship is always recorded in one direction.""" revname = models.CharField(max_length=255) - + class DocTypeName(NameModel): """Draft, Agenda, Minutes, Charter, Discuss, Guideline, Email, Review, Issue, Wiki""" @@ -71,3 +71,5 @@ class DraftSubmissionStateName(NameModel): Previous Version Authors, Awaiting Initial Version Approval, Awaiting Manual Post, Cancelled, Posted""" next_states = models.ManyToManyField('DraftSubmissionStateName', related_name="previous_states", blank=True) +class RoomResourceName(NameModel): + "Room resources: Audio Stream, Meetecho, . . ." diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index 893a56999..eee4326f4 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -163,11 +163,16 @@ def send_notification(request, sessions): Room Name: {6} --------------------------------------------- ''' + + requestinguser = None + if request is not None: + requestinguser = request.user.person + group = sessions[0].group to_email = sessions[0].requested_by.role_email('chair').address - cc_list = get_cc_list(group, request.user.person) + cc_list = get_cc_list(group, requestinguser) from_email = ('"IETF Secretariat"','agenda@ietf.org') - if sessions.count() == 1: + if len(sessions) == 1: subject = '%s - Requested session has been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number) else: subject = '%s - Requested sessions have been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number) @@ -193,6 +198,8 @@ def send_notification(request, sessions): context['agenda_note'] = sessions[0].agenda_note context['session'] = get_initial_session(sessions) context['session_info'] = session_info + context['group'] = group + context['login'] = sessions[0].requested_by send_mail(request, to_email, diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py index 95c4231d5..20c90aad2 100644 --- a/ietf/secr/sreq/forms.py +++ b/ietf/secr/sreq/forms.py @@ -1,6 +1,9 @@ from django import forms from ietf.group.models import Group +from ietf.meeting.models import ResourceAssociation +from django.forms.formsets import formset_factory +from ietf.person.forms import EmailsField import os # ------------------------------------------------- @@ -44,12 +47,25 @@ def join_conflicts(data): class GroupSelectForm(forms.Form): group = forms.ChoiceField() - + def __init__(self,*args,**kwargs): choices = kwargs.pop('choices') super(GroupSelectForm, self).__init__(*args,**kwargs) self.fields['group'].widget.choices = choices +BETHERE_CHOICES = ((False , 'No'), (True , 'Yes')) +# not using the ModelFormset, too complex. +class MustBePresentForm(forms.Form): + from ietf.person.models import Person + + #person = forms.ModelChoiceField(queryset= Person.objects.all(), required=False) + person = EmailsField(required=False) + bethere = forms.ChoiceField(required = False, choices = BETHERE_CHOICES) + # something like this is desired to make pre-existing items read-only + #self.fields['person'].widget.attrs['readonly'] = True + + +MustBePresentFormSet = formset_factory(MustBePresentForm, extra = 1) class SessionForm(forms.Form): num_session = forms.ChoiceField(choices=NUM_SESSION_CHOICES) @@ -65,6 +81,7 @@ class SessionForm(forms.Form): wg_selector2 = forms.ChoiceField(choices=WG_CHOICES,required=False) wg_selector3 = forms.ChoiceField(choices=WG_CHOICES,required=False) third_session = forms.BooleanField(required=False) + resources = forms.MultipleChoiceField(choices=[(x.pk,x.desc) for x in ResourceAssociation.objects.all()], widget=forms.CheckboxSelectMultiple) def __init__(self, *args, **kwargs): super(SessionForm, self).__init__(*args, **kwargs) @@ -85,7 +102,11 @@ class SessionForm(forms.Form): if self.initial and 'length_session3' in self.initial: if self.initial['length_session3'] != '0' and self.initial['length_session3'] != None: self.fields['third_session'].initial = True - + + resources = self.initial['resources'] + resource_choices = [r.pk for r in resources] + self.initial['resources'] = resource_choices + def clean_conflict1(self): conflict = self.cleaned_data['conflict1'] check_conflict(conflict) diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 798bf03a7..bb7617a75 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -5,7 +5,8 @@ from django.core.urlresolvers import reverse from ietf.utils import TestCase from ietf.group.models import Group from ietf.ietfauth.utils import has_role -from ietf.utils.test_data import make_test_data +#from ietf.utils.test_data import make_test_data +from ietf.meeting.test_data import make_meeting_test_data as make_test_data #from pyquery import PyQuery @@ -13,7 +14,7 @@ SECR_USER='secretary' class SreqUrlTests(TestCase): def test_urls(self): - draft = make_test_data() + make_test_data() r = self.client.get("/secr/") self.assertEqual(r.status_code, 200) @@ -21,23 +22,24 @@ class SreqUrlTests(TestCase): r = self.client.get("/secr/sreq/") self.assertEqual(r.status_code, 200) - r = self.client.get("/secr/sreq/%s/new/" % draft.group.acronym) + testgroup=Group.objects.filter(type_id='wg').first() + r = self.client.get("/secr/sreq/%s/new/" % testgroup.acronym) self.assertEqual(r.status_code, 200) class MainTestCase(TestCase): def test_main(self): - draft = make_test_data() + make_test_data() url = reverse('sessions') r = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEqual(r.status_code, 200) sched = r.context['scheduled_groups'] unsched = r.context['unscheduled_groups'] - self.failUnless(len(sched) == 0) - self.failUnless(len(unsched) > 0) + self.failUnless(len(unsched) == 0) + self.failUnless(len(sched) > 0) class SubmitRequestCase(TestCase): def test_submit_request(self): - draft = make_test_data() + make_test_data() acronym = Group.objects.all()[0].acronym url = reverse('sessions_new',kwargs={'acronym':acronym}) post_data = {'id_num_session':'1', diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py index 88fe5c1f2..32bd3a719 100644 --- a/ietf/secr/sreq/urls.py +++ b/ietf/secr/sreq/urls.py @@ -4,10 +4,12 @@ urlpatterns = patterns('ietf.secr.sreq.views', url(r'^$', 'main', name='sessions'), url(r'^status/$', 'tool_status', name='sessions_tool_status'), url(r'^(?P[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'), + url(r'^(?P[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'), url(r'^(?P[A-Za-z0-9_\-\+]+)/approve/$', 'approve', name='sessions_approve'), url(r'^(?P[A-Za-z0-9_\-\+]+)/cancel/$', 'cancel', name='sessions_cancel'), url(r'^(?P[A-Za-z0-9_\-\+]+)/confirm/$', 'confirm', name='sessions_confirm'), url(r'^(?P[A-Za-z0-9_\-\+]+)/edit/$', 'edit', name='sessions_edit'), url(r'^(?P[A-Za-z0-9_\-\+]+)/new/$', 'new', name='sessions_new'), url(r'^(?P[A-Za-z0-9_\-\+]+)/no_session/$', 'no_session', name='sessions_no_session'), + url(r'^(?P[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/edit/$', 'edit_mtg', name='sessions_edit'), ) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index c70def36a..415df6191 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -14,6 +14,7 @@ from ietf.secr.utils.group import get_my_groups, groups_by_session from ietf.ietfauth.utils import has_role from ietf.utils.mail import send_mail from ietf.meeting.models import Meeting, Session, Constraint +from ietf.meeting.helpers import get_meeting from ietf.group.models import Group, Role from ietf.name.models import SessionStatusName, ConstraintName @@ -44,10 +45,13 @@ def get_initial_session(sessions): This function takes a queryset of sessions ordered by 'id' for consistency. It returns a dictionary to be used as the initial for a legacy session form ''' + initial = {} + if(len(sessions) == 0): + return initial + meeting = sessions[0].meeting group = sessions[0].group conflicts = group.constraint_source_set.filter(meeting=meeting) - initial = {} # even if there are three sessions requested, the old form has 2 in this field initial['num_session'] = sessions.count() if sessions.count() <= 2 else 2 @@ -64,6 +68,7 @@ def get_initial_session(sessions): initial['conflict2'] = ' '.join([ c.target.acronym for c in conflicts.filter(name__slug='conflic2') ]) initial['conflict3'] = ' '.join([ c.target.acronym for c in conflicts.filter(name__slug='conflic3') ]) initial['comments'] = sessions[0].comments + initial['resources'] = sessions[0].resources.all() return initial def get_lock_message(): @@ -78,12 +83,6 @@ def get_lock_message(): message = "This application is currently locked." return message -def get_meeting(): - ''' - Function to get the current IETF regular meeting. Simply returns the meeting with the most recent date - ''' - return Meeting.objects.filter(type='ietf').order_by('-date')[0] - def get_requester_text(person,group): ''' This function takes a Person object and a Group object and returns the text to use in the @@ -181,7 +180,7 @@ def approve(request, acronym): if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.person): session.status = SessionStatusName.objects.get(slug='appr') - session.save() + session_save(session) messages.success(request, 'Third session approved') return redirect('sessions_view', acronym=acronym) @@ -212,7 +211,7 @@ def cancel(request, acronym): # mark sessions as deleted for session in sessions: session.status_id = 'deleted' - session.save() + session_save(session) # clear schedule assignments if already scheduled session.scheduledsession_set.all().delete() @@ -271,7 +270,7 @@ def confirm(request, acronym): requested_duration=datetime.timedelta(0,int(duration)), comments=form['comments'], status=SessionStatusName.objects.get(slug=slug)) - new_session.save() + session_save(new_session) # write constraint records save_conflicts(group,meeting,form['conflict1'],'conflict') @@ -302,12 +301,61 @@ def confirm(request, acronym): RequestContext(request, {}), ) +def make_essential_person(pk, person, required): + essential_person = dict() + essential_person["person"] = person.email_set.all()[0].pk + essential_person["bethere"] = required + return essential_person + +def make_bepresent_formset(group, session, default=True): + dict_of_essential_people = {} + + for x in session.people_constraints.all(): + #print "add db: %u %s" % (x.person.pk, x.person) + dict_of_essential_people[x.person.pk] = make_essential_person(x.person.pk, x.person, True) + + # now, add the co-chairs if they were not already present + chairs = group.role_set.filter(name='chair') + for chairrole in chairs: + chair = chairrole.person + if not chair.pk in dict_of_essential_people: + #print "add chair: %u" % (chair.pk) + dict_of_essential_people[chair.pk] = make_essential_person(chair.pk, chair, default) + + # add the responsible AD + if not group.ad.pk in dict_of_essential_people: + #print "add ad: %u" % (chair.pk) + dict_of_essential_people[group.ad.pk] = make_essential_person(group.ad.pk, group.ad, default) + + # make the form set of these people + list_of_essential_people = [] + for k,x in dict_of_essential_people.iteritems(): + #print "k: %s x: %s" % (k,x) + list_of_essential_people.append(x) + + list_of_essential_people.reverse() + #for t in list_of_essential_people: + # print "t: %s" % (t) + + formset = MustBePresentFormSet(initial=list_of_essential_people) + return formset + @check_permissions def edit(request, acronym): + return edit_mtg(request, None, acronym) + +def session_save(session): + session.save() + if session.status_id == "schedw" and session.meeting.agenda != None: + # send an email to iesg-secretariat to alert to change + pass + +@check_permissions +def edit_mtg(request, num, acronym): ''' This view allows the user to edit details of the session request ''' - meeting = get_meeting() + meeting = get_meeting(num) group = get_object_or_404(Group, acronym=acronym) sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id') sessions_count = sessions.count() @@ -315,13 +363,18 @@ def edit(request, acronym): session_conflicts = session_conflicts_as_string(group, meeting) login = request.user.person + session = Session() + if(len(sessions) > 0): + session = sessions[0] + if request.method == 'POST': button_text = request.POST.get('submit', '') if button_text == 'Cancel': return redirect('sessions_view', acronym=acronym) form = SessionForm(request.POST,initial=initial) - if form.is_valid(): + bepresent_formset = MustBePresentFormSet(request.POST) + if form.is_valid() or bepresent_formset.is_valid(): if form.has_changed(): # might be cleaner to simply delete and rewrite all records (but maintain submitter?) # adjust duration or add sessions @@ -329,7 +382,7 @@ def edit(request, acronym): if 'length_session1' in form.changed_data: session = sessions[0] session.requested_duration = datetime.timedelta(0,int(form.cleaned_data['length_session1'])) - session.save() + session_save(session) # session 2 if 'length_session2' in form.changed_data: @@ -351,7 +404,7 @@ def edit(request, acronym): duration = datetime.timedelta(0,int(form.cleaned_data['length_session2'])) session = sessions[1] session.requested_duration = duration - session.save() + session_save(session) # session 3 if 'length_session3' in form.changed_data: @@ -373,7 +426,7 @@ def edit(request, acronym): duration = datetime.timedelta(0,int(form.cleaned_data['length_session3'])) session = sessions[2] session.requested_duration = duration - session.save() + session_save(session) if 'attendees' in form.changed_data: @@ -390,6 +443,12 @@ def edit(request, acronym): Constraint.objects.filter(meeting=meeting,source=group,name='conflic3').delete() save_conflicts(group,meeting,form.cleaned_data['conflict3'],'conflic3') + if 'resources' in form.changed_data: + new_resource_ids = form.cleaned_data['resources'] + new_resources = [ ResourceAssociation.objects.get(pk=a) + for a in new_resource_ids] + session.resources = new_resources + # deprecated # log activity #add_session_activity(group,'Session Request was updated',meeting,user) @@ -397,16 +456,46 @@ def edit(request, acronym): # send notification send_notification(group,meeting,login,form.cleaned_data,'update') + for bepresent in bepresent_formset.forms: + if bepresent.is_valid() and 'person' in bepresent.cleaned_data: + persons_cleaned = bepresent.cleaned_data['person'] + if(len(persons_cleaned) == 0): + continue + + person = bepresent.cleaned_data['person'][0].person + if 'bethere' in bepresent.changed_data and bepresent.cleaned_data['bethere']=='True': + #print "Maybe adding bethere constraint for %s" % (person) + if session.people_constraints.filter(person = person).count()==0: + # need to create new constraint. + #print " yes" + nc = session.people_constraints.create(person = person, + meeting = meeting, + name_id = 'bethere', + source = session.group) + nc.save() + else: + #print "Maybe deleting bethere constraint for %s" % (person) + if session.people_constraints.filter(person = person).count() > 0: + #print " yes" + session.people_constraints.filter(person = person).delete() + + # nuke any cache that might be lingering around. + from ietf.meeting.helpers import session_constraint_expire + session_constraint_expire(session) + messages.success(request, 'Session Request updated') return redirect('sessions_view', acronym=acronym) else: form = SessionForm(initial=initial) + bepresent_formset = make_bepresent_formset(group, session, False) + return render_to_response('sreq/edit.html', { 'meeting': meeting, 'form': form, 'group': group, + 'bepresent_formset' : bepresent_formset, 'session_conflicts': session_conflicts}, RequestContext(request, {}), ) @@ -550,7 +639,7 @@ def no_session(request, acronym): requested_by=login, requested_duration=0, status=SessionStatusName.objects.get(slug='notmeet')) - session.save() + session_save(session) # send notification to_email = SESSION_REQUEST_EMAIL @@ -614,11 +703,11 @@ def tool_status(request): RequestContext(request, {}), ) -def view(request, acronym): +def view(request, acronym, num = None): ''' This view displays the session request info ''' - meeting = get_meeting() + meeting = get_meeting(num) group = get_object_or_404(Group, acronym=acronym) sessions = Session.objects.filter(~Q(status__in=('canceled','notmeet','deleted')),meeting=meeting,group=group).order_by('id') diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html index 629acc3e3..ab85655bb 100755 --- a/ietf/secr/templates/includes/sessions_request_form.html +++ b/ietf/secr/templates/includes/sessions_request_form.html @@ -1,4 +1,4 @@ - * Required Field + * Required Field
{% csrf_token %} {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %} @@ -50,12 +50,38 @@
- + People who need to be present: + + {{ bepresent_formset.management_form }} + + + + + + {% for essential_person_form in bepresent_formset.forms %} + + + + + {% endfor %} +
PersonMust be present?
{{ essential_person_form.person }}{{ essential_person_form.bethere }}
+ + + Resources requested: + + {{ form.resources }} + + + Special Requests:
 
i.e. Meetecho, WebEx (please state which, and the reason needed), restrictions on meeting times / days, etc. {{ form.comments.errors }}{{ form.comments }} - + {% include "includes/buttons_save_cancel.html" %} - +
+{% block content_end %} + + +{% endblock %} diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html index 5c761cc34..44614564c 100644 --- a/ietf/secr/templates/includes/sessions_request_view.html +++ b/ietf/secr/templates/includes/sessions_request_view.html @@ -26,7 +26,11 @@ Other WGs that included {{ group }} in their conflict list: {% if session_conflicts %}{{ session_conflicts }}{% else %}None so far{% endif %} + + Resources requested: + {% if session.resources %}
    {% for resource in session.resources %}
  • {{ resource.desc }}{% endfor %}
{% else %}None so far{% endif %} + {% autoescape off %} - Special Requests:{{ session.comments }} + Special Requests:{{ session.comments }} {% endautoescape %} diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html index 79e5a3206..e095c2cb8 100755 --- a/ietf/secr/templates/sreq/main.html +++ b/ietf/secr/templates/sreq/main.html @@ -14,7 +14,7 @@ {% endblock %} {% block content %} -

» View list of timeslot requests

+

» View list of timeslot requests

Sessions Request Tool: IETF {{ meeting.number }} diff --git a/ietf/secr/templates/sreq/view.html b/ietf/secr/templates/sreq/view.html index 56c783f02..4c4fdf97b 100644 --- a/ietf/secr/templates/sreq/view.html +++ b/ietf/secr/templates/sreq/view.html @@ -18,8 +18,8 @@ {% block content %}
-

Sessions - View

- +

Sessions - View (meeting: {{ meeting.number }})

+ {% include "includes/sessions_request_view.html" %}
diff --git a/ietf/settings.py b/ietf/settings.py index 8928fc9d8..f888afb94 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -19,6 +19,9 @@ LOG_DIR = '/var/log/datatracker' import sys sys.path.append(os.path.abspath(BASE_DIR + "/..")) +# dajaxice now in subdirectory +sys.path.append(os.path.abspath(BASE_DIR + "/../django-dajaxice")) + DEBUG = False TEMPLATE_DEBUG = DEBUG @@ -153,6 +156,7 @@ ROOT_URLCONF = 'ietf.urls' TEMPLATE_DIRS = ( BASE_DIR + "/templates", BASE_DIR + "/secr/templates", + BASE_DIR+"/../django-dajaxice/dajaxice/templates", ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -400,8 +404,33 @@ USE_ETAGS=True PRODUCTION_TIMEZONE = "America/Los_Angeles" +# Automatic Scheduling +# +# how much to login while running, bigger numbers make it more verbose. +BADNESS_CALC_LOG = 0 +# +# these penalties affect the calculation of how bad the assignments are. +BADNESS_UNPLACED = 1000000 + +# following four are used only during migrations to setup up ConstraintName +# and penalties are taken from the database afterwards. +BADNESS_BETHERE = 200000 +BADNESS_CONFLICT_1 = 100000 +BADNESS_CONFLICT_2 = 10000 +BADNESS_CONFLICT_3 = 1000 + +BADNESS_TOOSMALL_50 = 5000 +BADNESS_TOOSMALL_100 = 50000 +BADNESS_TOOBIG = 100 +BADNESS_MUCHTOOBIG = 500 + +# do not run SELENIUM tests by default +SELENIUM_TESTS = False +SELENIUM_TESTS_ONLY = False + # Put the production SECRET_KEY in settings_local.py, and also any other # sensitive or site-specific changes. DO NOT commit settings_local.py to svn. + from settings_local import * # We provide a secret key only for test and development modes. It's diff --git a/ietf/templates/meeting/agenda-utc.html b/ietf/templates/meeting/agenda-utc.html index 98c9295d0..7dd300b74 100644 --- a/ietf/templates/meeting/agenda-utc.html +++ b/ietf/templates/meeting/agenda-utc.html @@ -121,7 +121,7 @@ You can customize the agenda below to show only selected working group sessions. {% for wg in schedule.groups %}{% ifchanged wg.parent.acronym %}{% if forloop.counter > 1 %} {% endif %} {% endifchanged %} -
{% if wg.state.name = "BOF" %}{{wg.acronym}}{% else %}{{wg.acronym}}{% endif %}
{% endfor %} +
{% if wg.is_bof %}{{wg.acronym}}{% else %}{{wg.acronym}}{% endif %}
{% endfor %} @@ -182,7 +182,7 @@ You can customize the agenda below to show only selected working group sessions. {{item.timeslot.name}} - - + - {% if item.timeslot.show_location %}{{item.timeslot.get_location}}{% endif %} @@ -200,7 +200,7 @@ You can customize the agenda below to show only selected working group sessions. {% if item.session.agenda %}{{item.session.group.name}} {% else %}{{item.session.group.name}}{% endif %} - {% if item.session.group.state.name = "BOF" %} BOF {% endif %} + {% if item.session.is_bof %} BOF {% endif %} {% if item.session.agenda_note %}
{{item.session.agenda_note}}{% endif %} {% if item.session.agenda %}drafts: tar|pdf{%endif%} diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html index e2c296c29..f8b4d3833 100644 --- a/ietf/templates/meeting/landscape_edit.html +++ b/ietf/templates/meeting/landscape_edit.html @@ -30,7 +30,6 @@ - {% dajaxice_js_import %} @@ -44,14 +43,17 @@ + + + + + + + + + + + + + + + +{% dajaxice_js_import %} + + + +{% endblock js %} + + +{% block start_content_table %}{% endblock %} +{% block end_content_table %}{% endblock %} + +{% block content %} +
+
+< +
+ +
+ +
+
{% csrf_token %} + + {{ editroom.as_table }} + +
+
+
+ +{% endblock %} diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html index 2697cd672..591b3271c 100644 --- a/ietf/templates/meeting/timeslot_edit.html +++ b/ietf/templates/meeting/timeslot_edit.html @@ -20,17 +20,22 @@ + -{% if server_mode and server_mode != "production" %} - -{% endif %} + + + + + + + {% dajaxice_js_import %} - + @@ -41,29 +46,25 @@ function my_js_callback(data){ alert(data.message); } {% endcomment %} +var meeting_number = "{{ meeting.number }}"; var meeting_base_url = "{{ meeting_base_url }}"; var site_base_url = "{{ site_base_url }}"; total_days = {{time_slices|length}}; total_rooms = {{rooms|length}}; -function setup_slots(){ -{% for ts in timeslots %} - make_ss({ - "timeslot_id":"{{ts.id}}", - "room" :"{{ts.location|slugify}}", - "roomtype" :"{{ts.type.slug}}", - "time" :"{{ts.time|date:'Hi' }}", - "date" :"{{ts.time|date:'Y-m-d'}}", - "domid" :"{{ts.js_identifier}}"}); +first_day = new Date("{% with timeslots|first as day %} {{ day.time }} {% endwith %}"); /* needed for the datepicker */ + +function setup_slots(promiselist){ +var ts_promise = load_timeslots("{% url "ietf.meeting.ajax.timeslot_slotsurl" meeting.number %}"); +promiselist.push(ts_promise); + +{% for day in time_slices %} + days.push("{{day}}"); {% endfor %} - console.log("setup_slots run"); } - {% endblock js %} @@ -79,9 +80,10 @@ function setup_slots(){
- + {% for day in time_slices %} + {% for day in time_slices %} {% for slot in slot_slices|lookup:day %} + {% for day in time_slices %} {% for slot in date_slices|lookup:day %} - + {% endfor %} {% endfor %} @@ -148,7 +161,9 @@ function setup_slots(){
name: {{meeting.number}} +
@@ -99,6 +101,7 @@ function setup_slots(){
+ROOM
+DAY
 @@ -117,18 +120,28 @@ function setup_slots(){ {% endfor %} {% for r in rooms %} -
X
-
{{r}} ({{r.capacity}})
+
{{r.name}} ({{r.capacity}})
- + + 		+
+ {% for resource in r.resources.all %} + + {{resource.desc}} + + {% endfor %} +
+
{% csrf_token %} - {{ addday.as_table }} + {{ addday }} + +
From f292af9949dec4daa61f3b1ea84c07f98f97556c Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 12 Mar 2014 17:34:27 +0000 Subject: [PATCH 07/21] minor comments and one addition to test_save_agenda... - Legacy-Id: 7453 --- ietf/meeting/tests_api.py | 2 ++ ietf/meeting/tests_views.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 831db8da1..5ac68efc7 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -155,6 +155,7 @@ class ApiTests(TestCase): self.assertTrue(not meeting.room_set.filter(pk=room.pk)) self.assertTrue(not TimeSlot.objects.filter(pk__in=timeslots_before)) + # This really belongs in group tests def test_group_json(self): meeting = make_meeting_test_data() group = Group.objects.get(acronym="mars") @@ -165,6 +166,7 @@ class ApiTests(TestCase): info = json.loads(r.content) self.assertEqual(info["name"], group.name) + # This really belongs in person tests def test_person_json(self): meeting = make_meeting_test_data() person = Person.objects.get(user__username="ad") diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 6f7948ddc..e8679a428 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -163,9 +163,14 @@ class EditTests(TestCase): def test_save_agenda_as_and_read_permissions(self): meeting = make_meeting_test_data() - url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number)) + + # try to get non-existing agenda + url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number, name="foo")) + r = self.client.get(url) + self.assertEqual(r.status_code, 404) # save as + url = urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number)) self.client.login(remote_user="ad") r = self.client.post(url, { 'savename': "foo", From f4a72ffe2a3d49b520f9f77c89c68fa22b90d1f2 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 13 Mar 2014 18:47:31 +0000 Subject: [PATCH 08/21] cleaned up permissions on dajaxice calls, ported and expanded more tests, refactored sendEmail, made a secr filter more robust - Legacy-Id: 7457 --- ietf/meeting/ajax.py | 9 +- ietf/meeting/models.py | 23 ++--- ietf/meeting/test_data.py | 4 +- ietf/meeting/tests_api.py | 91 ++++++++++++++++++- ietf/secr/meetings/views.py | 7 ++ .../proceedings/templatetags/ams_filters.py | 6 +- 6 files changed, 121 insertions(+), 19 deletions(-) diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index 1ded28ecd..7177c40ce 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -53,9 +53,12 @@ def readonly(request, meeting_num, schedule_id): 'owner_href': request.build_absolute_uri(schedule.owner.json_url()), 'read_only': read_only}) -@role_required('Area Director','Secretariat') @dajaxice_register def update_timeslot_pinned(request, schedule_id, scheduledsession_id, pinned=False): + + if not has_role(request.user,('Area Director','Secretariat')): + return json.dumps({'error':'no permission'}) + schedule = get_object_or_404(Schedule, pk = int(schedule_id)) meeting = schedule.meeting cansee,canedit = agenda_permissions(meeting, schedule, request.user) @@ -75,7 +78,6 @@ def update_timeslot_pinned(request, schedule_id, scheduledsession_id, pinned=Fal return json.dumps({'message':'valid'}) -@role_required('Secretariat') @dajaxice_register def update_timeslot_purpose(request, meeting_num, @@ -85,6 +87,9 @@ def update_timeslot_purpose(request, duration= None, time = None): + if not has_role(request.user,'Secretariat'): + return json.dumps({'error':'no permission'}) + meeting = get_meeting(meeting_num) ts_id = int(timeslot_id) time_str = time diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 2c50b8de5..6c543d8b0 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -206,11 +206,20 @@ class Meeting(models.Model): return '' def set_official_agenda(self, agenda): + # send_notification should be refactored into Session + from ietf.secr.meetings.views import send_notification if self.agenda != agenda: self.agenda = agenda self.save() if self.agenda is not None: - self.agenda.sendEmail() + for ss in self.agenda.scheduledsession_set.all(): + session = ss.session + if session.status.slug == "schedw": + session.status_id = "sched" + session.scheduled = datetime.datetime.now() + session.save() + # refactoring send_notification will obviate this odd hoop-jump + send_notification(None, Session.objects.filter(id=session.id)) class Meta: ordering = ["-date", ] @@ -604,18 +613,6 @@ class Schedule(models.Model): self.scheduledsession_set.all().delete() self.delete() - # send email to every session requester whose session is now scheduled. - # mark the sessions as now state scheduled, rather than waiting. - def sendEmail(self): - for ss in self.scheduledsession_set.all(): - session = ss.session - if session.status.slug == "schedw": - session.status_id = "sched" - session.scheduled = datetime.datetime.now() - session.save() - from ietf.secr.meetings.views import send_notification - send_notification(None, Session.objects.filter(id=session.id)) - # to be renamed ScheduleTimeslotSessionAssignments (stsa) class ScheduledSession(models.Model): """ diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py index 85a204581..38bd3e967 100644 --- a/ietf/meeting/test_data.py +++ b/ietf/meeting/test_data.py @@ -23,7 +23,7 @@ def make_meeting_test_data(): time=datetime.datetime.combine(datetime.date.today(), datetime.time(9, 30))) mars_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="mars"), attendees=10, requested_by=system_person, - requested_duration=20, status_id="sched", + requested_duration=20, status_id="schedw", scheduled=datetime.datetime.now()) ScheduledSession.objects.create(timeslot=slot, session=mars_session, schedule=schedule) @@ -32,7 +32,7 @@ def make_meeting_test_data(): time=datetime.datetime.combine(datetime.date.today(), datetime.time(10, 30))) ames_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="ames"), attendees=10, requested_by=system_person, - requested_duration=20, status_id="sched", + requested_duration=20, status_id="schedw", scheduled=datetime.datetime.now()) ScheduledSession.objects.create(timeslot=slot, session=ames_session, schedule=schedule) diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 5ac68efc7..01e0bcc83 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -10,6 +10,7 @@ from ietf.group.models import Group from ietf.meeting.models import Schedule, TimeSlot, Session, ScheduledSession, Meeting, Constraint from ietf.meeting.helpers import get_meeting from ietf.meeting.test_data import make_meeting_test_data +from ietf.utils.mail import outbox class ApiTests(TestCase): @@ -173,9 +174,26 @@ class ApiTests(TestCase): url = urlreverse("ietf.person.ajax.person_json", kwargs=dict(personid=person.pk)) r = self.client.get(url) + self.assertEqual(r.status_code, 200) info = json.loads(r.content) self.assertEqual(info["name"], person.name) + def test_sessions_json(self): + meeting = make_meeting_test_data() + + url = urlreverse("ietf.meeting.ajax.sessions_json",kwargs=dict(num=meeting.number)) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + info = json.loads(r.content) + self.assertEqual(set([x['short_name'] for x in info]),set(['mars','ames'])) + + schedule = Schedule.objects.filter(meeting=meeting).first() + url = urlreverse("ietf.meeting.ajax.scheduledsessions_json",kwargs=dict(num=meeting.number,name=schedule.name)) + self.assertEqual(r.status_code, 200) + info = json.loads(r.content) + self.assertEqual(set([x['short_name'] for x in info]),set(['mars','ames'])) + + def test_slot_json(self): meeting = make_meeting_test_data() slot = meeting.timeslot_set.all()[0] @@ -183,6 +201,7 @@ class ApiTests(TestCase): url = urlreverse("ietf.meeting.ajax.timeslot_sloturl", kwargs=dict(num=meeting.number, slotid=slot.pk)) r = self.client.get(url) + self.assertEqual(r.status_code, 200) info = json.loads(r.content) self.assertEqual(info["timeslot_id"], slot.pk) @@ -200,15 +219,18 @@ class ApiTests(TestCase): } # unauthorized post + prior_slotcount = meeting.timeslot_set.count() self.client.login(remote_user="ad") r = self.client.post(url, post_data) self.assertEqual(r.status_code, 403) + self.assertEqual(meeting.timeslot_set.count(),prior_slotcount) - # create room + # create slot self.client.login(remote_user="secretary") r = self.client.post(url, post_data) self.assertEqual(r.status_code, 302) self.assertTrue(meeting.timeslot_set.filter(time=slot_time)) + self.assertEqual(meeting.timeslot_set.count(),prior_slotcount+1) def test_delete_slot(self): meeting = make_meeting_test_data() @@ -343,9 +365,19 @@ class ApiTests(TestCase): schedule.public = True schedule.save() + prior_length= len(outbox) r = self.client.post(url, post_data) self.assertEqual(r.status_code, 200) self.assertEqual(Meeting.objects.get(pk=meeting.pk).agenda, schedule) + self.assertEqual(len(outbox),prior_length+2) + + # Post it again, and make sure mail isn't resent + + prior_length= len(outbox) + r = self.client.post(url, post_data) + self.assertEqual(r.status_code, 200) + self.assertEqual(Meeting.objects.get(pk=meeting.pk).agenda, schedule) + self.assertEqual(len(outbox),prior_length) def test_read_only(self): meeting = make_meeting_test_data() @@ -404,3 +436,60 @@ class ApiTests(TestCase): r = self.client.post(url, post_data) self.assertEqual(r.status_code, 200) self.assertTrue(ScheduledSession.objects.get(pk=scheduled.pk).pinned) + +class UnusedButExposedApiTests(TestCase): + + def test_manipulate_timeslot_via_dajaxice(self): + meeting = make_meeting_test_data() + slot_time = datetime.date.today() + + url = '/dajaxice/ietf.meeting.update_timeslot_purpose/' + + create_post_data = { + 'argv' : json.dumps({ + "meeting_num" : meeting.number, + "timeslot_id" : 0, + "purpose" : "plenary", + "room_id" : meeting.room_set.first().id, + "time" : slot_time.strftime("%Y-%m-%d %H:%M:%S"), + "duration" : 3600 + })} + + prior_timeslot_count = meeting.timeslot_set.count() + # Create as nobody should fail + r = self.client.post(url, create_post_data) + self.assertEqual(r.status_code, 200) + info = json.loads(r.content) + self.assertTrue('error' in info and info['error']=='no permission') + self.assertEqual(meeting.timeslot_set.count(),prior_timeslot_count) + + # Successful create + self.client.login(remote_user="secretary") + r = self.client.post(url, create_post_data) + self.assertEqual(r.status_code, 200) + info = json.loads(r.content) + self.assertFalse('error' in info) + self.assertTrue('roomtype' in info) + self.assertEqual(info['roomtype'],'plenary') + self.assertEqual(meeting.timeslot_set.count(),prior_timeslot_count+1) + + modify_post_data = { + 'argv' : json.dumps({ + "meeting_num" : meeting.number, + "timeslot_id" : meeting.timeslot_set.get(time=slot_time).id, + "purpose" : "session" + })} + + # Fail as non-secretariat + self.client.login(remote_user="plain") + r = self.client.post(url, modify_post_data) + self.assertEqual(r.status_code, 200) + info = json.loads(r.content) + self.assertTrue('error' in info and info['error']=='no permission') + self.assertEqual(meeting.timeslot_set.get(time=slot_time).type.name,'Plenary') + + # Successful change of purpose + self.client.login(remote_user="secretary") + r = self.client.post(url, modify_post_data) + self.assertEqual(r.status_code, 200) + self.assertEqual(meeting.timeslot_set.get(time=slot_time).type.name,'Session') diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index eee4326f4..209965de9 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -273,6 +273,13 @@ def add(request): if form.is_valid(): meeting = form.save() + schedule = Schedule.objects.create(meeting = meeting, + name = 'Empty Schedule', + owner = Person.objects.get(name='(System)'), + visible = True, + public = True) + meeting.set_official_agenda(schedule) + #Create Physical new meeting directory and subdirectories make_directories(meeting) diff --git a/ietf/secr/proceedings/templatetags/ams_filters.py b/ietf/secr/proceedings/templatetags/ams_filters.py index 4dec005da..161236f1d 100644 --- a/ietf/secr/proceedings/templatetags/ams_filters.py +++ b/ietf/secr/proceedings/templatetags/ams_filters.py @@ -31,7 +31,11 @@ def display_duration(value): '5400':'1.5 Hours', '7200':'2 Hours', '9000':'2.5 Hours'} - return map[value] + if value in map: + return map[value] + else: + x=int(value) + return "%d Hours %d Minutes %d Seconds"%(x//3600,(x%3600)//60,x%60) @register.filter def get_published_date(doc): From 1ef73b5a766c4d24bb81afd6fe6c11d4a561c5f0 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 13 Mar 2014 20:45:06 +0000 Subject: [PATCH 09/21] Reworked the worst of the conflicting permissions policies - Legacy-Id: 7458 --- ietf/meeting/ajax.py | 46 ++++++++++++++----------------------- ietf/meeting/tests_api.py | 13 ++++------- ietf/meeting/views.py | 17 +++++++++----- ietf/secr/meetings/views.py | 3 ++- 4 files changed, 35 insertions(+), 44 deletions(-) diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index 7177c40ce..28e2ae2e2 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -4,6 +4,7 @@ import datetime from django.core.urlresolvers import reverse from django.shortcuts import get_object_or_404, redirect from django.http import HttpResponseRedirect, HttpResponse +from django.views.decorators.http import require_POST from dajaxice.decorators import dajaxice_register from ietf.ietfauth.utils import role_required, has_role, user_is_person @@ -316,47 +317,34 @@ def agenda_add(request, meeting): else: return redirect(edit_agenda, meeting.number, newagenda.name) -@role_required('Area Director','Secretariat') +@require_POST def agenda_update(request, meeting, schedule): # forms are completely useless for update actions that want to # accept a subset of values. (huh? we could use required=False) - #debug.log("99 meeting.agenda: %s / %s / %s" % - # (schedule, update_dict, request.body)) - user = request.user + if not user.is_authenticated(): + return HttpResponse({'error':'no permission'}, status=403) + cansee,canedit = agenda_permissions(meeting, schedule, request.user) read_only = not canedit - if has_role(user, "Secretariat"): - if "public" in request.POST: - value1 = True - value = request.POST["public"] - if value == "0" or value == 0 or value=="false": - value1 = False - #debug.log("setting public for %s to %s" % (schedule, value1)) - schedule.public = value1 + def is_truthy_enough(value): + return not (value == "0" or value == 0 or value=="false") - if "visible" in request.POST and cansee: - value1 = True - value = request.POST["visible"] - if value == "0" or value == 0 or value=="false": - value1 = False - #debug.log("setting visible for %s to %s" % (schedule, value1)) - schedule.visible = value1 - if has_role(user, "Secretariat") and canedit: - if "name" in request.POST: - value = request.POST["name"] - #log.debug("setting name for %s to %s" % (schedule, value)) - schedule.name = value - else: - return HttpResponse({'error':'no permission'}, status=401) + # TODO: Secretariat should always get canedit + if not (canedit or has_role(user, "Secretariat")): + return HttpResponse({'error':'no permission'}, status=403) + + if "public" in request.POST: + schedule.public = is_truthy_enough(request.POST["public"]) + + if "visible" in request.POST: + schedule.visible = is_truthy_enough(request.POST["visible"]) if "name" in request.POST: - value = request.POST["name"] - #debug.log("setting name for %s to %s" % (schedule, value)) - schedule.name = value + schedule.name = request.POST["name"] schedule.save() diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 01e0bcc83..0f8db0bc5 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -294,16 +294,13 @@ class ApiTests(TestCase): 'name': 'new-test-name', } - # unauthorized post - self.client.login(remote_user="plain") + # unauthorized posts + self.client.logout() + r = self.client.post(url, post_data) + self.assertEqual(r.status_code, 403) + self.client.login(remote_user="ad") r = self.client.post(url, post_data) self.assertEqual(r.status_code, 403) - - # TODO - permission protection on this function are not right - # Normal users are prevented from changing public/private on their own schedule - # The secretariat can't change normal user's agendas settings for them, and the - # page at /meeting//schedule//details behaves badly for the secretariat - # (pushing save seems to do nothing as the POST 401s in the background) # change agenda self.client.login(remote_user="secretary") diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 44a0a0d30..29bcfbcfa 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -12,7 +12,7 @@ from tempfile import mkstemp from django import forms from django.shortcuts import render_to_response, get_object_or_404, redirect -from django.http import HttpResponse, Http404 +from django.http import HttpResponse, HttpResponseForbidden, Http404 from django.core.urlresolvers import reverse from django.db.models import Q from django.template import RequestContext @@ -322,11 +322,16 @@ def edit_agenda_properties(request, num=None, name=None): schedule = get_schedule(meeting, name) form = AgendaPropertiesForm(instance=schedule) - return HttpResponse(render_to_string("meeting/properties_edit.html", - {"schedule":schedule, - "form":form, - "meeting":meeting}, - RequestContext(request)), content_type="text/html") + cansee, canedit = agenda_permissions(meeting, schedule, request.user) + + if not (canedit or has_role(request.user,'Secretariat')): + return HttpResponseForbidden("You may not edit this agenda") + else: + return HttpResponse(render_to_string("meeting/properties_edit.html", + {"schedule":schedule, + "form":form, + "meeting":meeting}, + RequestContext(request)), content_type="text/html") ############################################################################## # show list of agendas. diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index 209965de9..77ebde8f2 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -278,7 +278,8 @@ def add(request): owner = Person.objects.get(name='(System)'), visible = True, public = True) - meeting.set_official_agenda(schedule) + meeting.agenda = schedule + meeting.save() #Create Physical new meeting directory and subdirectories make_directories(meeting) From 62600beefaaa3b7c86cc43ab21bba65482b1d4ee Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 14 Mar 2014 03:39:42 +0000 Subject: [PATCH 10/21] improved test of scheduledsessions_json, added tests for extending a session - Legacy-Id: 7459 --- ietf/meeting/ajax.py | 2 +- ietf/meeting/tests_api.py | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index 28e2ae2e2..ba4d33fb6 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -491,7 +491,7 @@ def scheduledsessions_post(request, meeting, schedule): if("extendedfrom_id" in newvalues): val = int(newvalues["extendedfrom_id"]) try: - ss2 = schedule.scheduledsessions_set.get(pk = val) + ss2 = schedule.scheduledsession_set.get(pk = val) ss1.extendedfrom = ss2 except ScheduledSession.DoesNotExist: return HttpResponse(json.dumps({'error':'invalid extendedfrom value: %u' % val}), diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 0f8db0bc5..78f8d5626 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -47,6 +47,14 @@ class ApiTests(TestCase): post_data = '{ "session_id": "%s", "timeslot_id": "%s" }'%(session.pk,timeslot.pk) return self.client.post(url,post_data,content_type='application/x-www-form-urlencoded') + def do_extend(schedule,scheduledsession): + session = scheduledsession.session + url = urlreverse("ietf.meeting.ajax.scheduledsessions_json", + kwargs=dict(num=session.meeting.number, + name=schedule.name,)) + post_data = '{ "session_id": "%s", "timeslot_id": "%s", "extendedfrom_id": "%s" }'%(session.pk,scheduledsession.timeslot.slot_to_the_right.pk,scheduledsession.timeslot.pk) + return self.client.post(url,post_data,content_type='application/x-www-form-urlencoded') + # not logged in # faulty delete r = do_unschedule(mars_scheduled) @@ -75,12 +83,23 @@ class ApiTests(TestCase): r = do_schedule(schedule,ames_session,mars_slot) self.assertEqual(r.status_code, 201) - # Unschedule mars + # Move the two timeslots close enough together for extension to work + ames_slot_qs=TimeSlot.objects.filter(id=ames_slot.id) + ames_slot_qs.update(time=mars_slot.time+mars_slot.duration+datetime.timedelta(minutes=10)) + + # Extend the mars session + r = do_extend(schedule,mars_scheduled) + self.assertEqual(r.status_code, 201) + self.assertTrue("error" not in json.loads(r.content)) + self.assertEqual(mars_session.scheduledsession_set.count(),2) + + # Unschedule mars r = do_unschedule(mars_scheduled) self.assertEqual(r.status_code, 200) self.assertTrue("error" not in json.loads(r.content)) + # Make sure it got both the original and extended session + self.assertEqual(mars_session.scheduledsession_set.count(),0) - self.assertEqual(ScheduledSession.objects.filter(session=mars_session).count(), 0) self.assertEqual(ScheduledSession.objects.get(session=ames_session).timeslot, mars_slot) @@ -187,11 +206,12 @@ class ApiTests(TestCase): info = json.loads(r.content) self.assertEqual(set([x['short_name'] for x in info]),set(['mars','ames'])) - schedule = Schedule.objects.filter(meeting=meeting).first() + schedule = meeting.agenda url = urlreverse("ietf.meeting.ajax.scheduledsessions_json",kwargs=dict(num=meeting.number,name=schedule.name)) + r = self.client.get(url) self.assertEqual(r.status_code, 200) info = json.loads(r.content) - self.assertEqual(set([x['short_name'] for x in info]),set(['mars','ames'])) + self.assertEqual(len(info),2) def test_slot_json(self): From 08ae032169a9c4ef1050520720957e4ae94cdeb4 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 14 Mar 2014 20:24:03 +0000 Subject: [PATCH 11/21] added a roomresource to the meeting test data - Legacy-Id: 7460 --- ietf/meeting/test_data.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py index 38bd3e967..fe155313b 100644 --- a/ietf/meeting/test_data.py +++ b/ietf/meeting/test_data.py @@ -1,7 +1,8 @@ import datetime from ietf.utils.test_data import make_test_data -from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession +from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession, ResourceAssociation +from ietf.name.models import RoomResourceName from ietf.person.models import Person from ietf.doc.models import Document, State from ietf.group.models import Group @@ -16,7 +17,10 @@ def make_meeting_test_data(): meeting = Meeting.objects.get(number="42", type="ietf") schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-agenda", visible=True, public=True) + pname = RoomResourceName.objects.create(name='projector',slug='proj') + projector = ResourceAssociation.objects.create(name=pname,icon="notfound.png",desc="Basic projector") room = Room.objects.create(meeting=meeting, name="Test Room", capacity=123) + room.resources = [projector] # mars WG slot = TimeSlot.objects.create(meeting=meeting, type_id="session", duration=30 * 60, location=room, @@ -25,6 +29,7 @@ def make_meeting_test_data(): attendees=10, requested_by=system_person, requested_duration=20, status_id="schedw", scheduled=datetime.datetime.now()) + mars_session.resources = [projector] ScheduledSession.objects.create(timeslot=slot, session=mars_session, schedule=schedule) # ames WG From 59fe8ee3bf86fe8ffc68ae80bdb41b10aab9cf04 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sun, 16 Mar 2014 19:07:51 +0000 Subject: [PATCH 12/21] Valid name for initial schedule - Legacy-Id: 7507 --- ietf/secr/meetings/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index 77ebde8f2..cb5af43f5 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -274,7 +274,7 @@ def add(request): meeting = form.save() schedule = Schedule.objects.create(meeting = meeting, - name = 'Empty Schedule', + name = 'Empty-Schedule', owner = Person.objects.get(name='(System)'), visible = True, public = True) From ad54cfe230caad815ecd9cd426cc420ec0c31c63 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sun, 16 Mar 2014 21:32:13 +0000 Subject: [PATCH 13/21] resolved an ambiguous URL pattern added to secr.sreq.urls and (hopefully) fixed a broken form initializer in code added to secr/sreq/forms - Legacy-Id: 7508 --- ietf/secr/sreq/forms.py | 8 +++++--- ietf/secr/sreq/urls.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py index 20c90aad2..c82799697 100644 --- a/ietf/secr/sreq/forms.py +++ b/ietf/secr/sreq/forms.py @@ -103,9 +103,11 @@ class SessionForm(forms.Form): if self.initial['length_session3'] != '0' and self.initial['length_session3'] != None: self.fields['third_session'].initial = True - resources = self.initial['resources'] - resource_choices = [r.pk for r in resources] - self.initial['resources'] = resource_choices + if self.initial and 'resources' in self.initial: + resources = self.initial['resources'] + resource_choices = [r.pk for r in resources] + #self.initial['resources'] = resource_choices + self.fields['resources'].initial = resource_choices def clean_conflict1(self): conflict = self.cleaned_data['conflict1'] diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py index 32bd3a719..f27189bc6 100644 --- a/ietf/secr/sreq/urls.py +++ b/ietf/secr/sreq/urls.py @@ -4,7 +4,7 @@ urlpatterns = patterns('ietf.secr.sreq.views', url(r'^$', 'main', name='sessions'), url(r'^status/$', 'tool_status', name='sessions_tool_status'), url(r'^(?P[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'), - url(r'^(?P[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'), + url(r'^(?P[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/view/$', 'view', name='sessions_view'), url(r'^(?P[A-Za-z0-9_\-\+]+)/approve/$', 'approve', name='sessions_approve'), url(r'^(?P[A-Za-z0-9_\-\+]+)/cancel/$', 'cancel', name='sessions_cancel'), url(r'^(?P[A-Za-z0-9_\-\+]+)/confirm/$', 'confirm', name='sessions_confirm'), From 0d5a940f555e77137acafb092ce86cd521f63a60 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 17 Mar 2014 18:54:11 +0000 Subject: [PATCH 14/21] Create no ScheduledSessions with session=None - Legacy-Id: 7510 --- ietf/meeting/models.py | 24 ++++++++++++------------ ietf/secr/meetings/views.py | 10 ++++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 6c543d8b0..da0310319 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -179,16 +179,16 @@ class Meeting(models.Model): # this functions makes a list of timeslices and rooms, and # makes sure that all schedules have all of them. - def create_all_timeslots(self): - alltimeslots = self.timeslot_set.all() - for sched in self.schedule_set.all(): - ts_hash = {} - for ss in sched.scheduledsession_set.all(): - ts_hash[ss.timeslot] = ss - for ts in alltimeslots: - if not (ts in ts_hash): - ScheduledSession.objects.create(schedule = sched, - timeslot = ts) +# def create_all_timeslots(self): +# alltimeslots = self.timeslot_set.all() +# for sched in self.schedule_set.all(): +# ts_hash = {} +# for ss in sched.scheduledsession_set.all(): +# ts_hash[ss.timeslot] = ss +# for ts in alltimeslots: +# if not (ts in ts_hash): +# ScheduledSession.objects.create(schedule = sched, +# timeslot = ts) def vtimezone(self): if self.time_zone: @@ -265,7 +265,7 @@ class Room(models.Model): time=ts.time, location=self, duration=ts.duration) - self.meeting.create_all_timeslots() + #self.meeting.create_all_timeslots() def domid(self): return "room%u" % (self.pk) @@ -411,7 +411,7 @@ class TimeSlot(models.Model): ts.location = room ts.save() - self.meeting.create_all_timeslots() + #self.meeting.create_all_timeslots() """ This routine deletes all timeslots which are in the same time as this slot. diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index cb5af43f5..c836eb135 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -95,8 +95,9 @@ def build_timeslots(meeting,room=None): time=new_time, location=room, duration=t.duration) - ScheduledSession.objects.create(schedule=schedule,timeslot=t) - meeting.create_all_timeslots(); + # Is this still right? I thought we had already moved away from dangling ScheduledSessions. + # ScheduledSession.objects.create(schedule=schedule,timeslot=t) + #meeting.create_all_timeslots(); def build_nonsession(meeting): ''' @@ -127,7 +128,8 @@ def build_nonsession(meeting): time=new_time, duration=slot.duration, show_location=slot.show_location) - ScheduledSession.objects.create(schedule=schedule,session=session,timeslot=ts) + if session: + ScheduledSession.objects.create(schedule=schedule,session=session,timeslot=ts) def get_last_meeting(meeting): last_number = int(meeting.number) - 1 @@ -815,7 +817,7 @@ def times(request, meeting_id): time=new_time, location=room, duration=duration) - ScheduledSession.objects.create(schedule=meeting.agenda,timeslot=ts) + #ScheduledSession.objects.create(schedule=meeting.agenda,timeslot=ts) messages.success(request, 'Timeslots created') return redirect('meetings_times', meeting_id=meeting_id) From be81557611b3be4e52d26a1ee43da747436b6d75 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 17 Mar 2014 21:49:01 +0000 Subject: [PATCH 15/21] Shifted building the edit time slices from looking at scheduledsessions to looking at timeslots - Legacy-Id: 7511 --- ietf/meeting/helpers.py | 14 ++++++-------- ietf/meeting/views.py | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index 9acc05cc1..8973c5a20 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -65,26 +65,24 @@ def get_area_list_from_sessions(scheduledsessions, num): 'session__group__parent__acronym').distinct().values_list( 'session__group__parent__acronym',flat=True) -def build_all_agenda_slices(scheduledsessions, all = False): +def build_all_agenda_slices(meeting): time_slices = [] date_slices = {} - for ss in scheduledsessions: - if(all or ss.session != None):# and len(ss.timeslot.session.agenda_note)>1): - ymd = ss.timeslot.time.date() + for ts in meeting.timeslot_set.exclude(type__in=['reg','break']).order_by('time','name'): + ymd = ts.time.date() - if ymd not in date_slices and ss.timeslot.location != None: + if ymd not in date_slices and ts.location != None: date_slices[ymd] = [] time_slices.append(ymd) if ymd in date_slices: - if [ss.timeslot.time, ss.timeslot.time+ss.timeslot.duration] not in date_slices[ymd]: # only keep unique entries - date_slices[ymd].append([ss.timeslot.time, ss.timeslot.time+ss.timeslot.duration]) + if [ts.time, ts.time+ts.duration] not in date_slices[ymd]: # only keep unique entries + date_slices[ymd].append([ts.time, ts.time+ts.duration]) time_slices.sort() return time_slices,date_slices - def get_scheduledsessions_from_schedule(schedule): ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False).exclude(session__isnull = True).order_by('timeslot__time','timeslot__name','session__group__group') diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 29bcfbcfa..44dfb1820 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -287,7 +287,7 @@ def edit_agenda(request, num=None, name=None): # django 1.3+ ad.default_hostscheme = site_base_url - time_slices,date_slices = build_all_agenda_slices(scheduledsessions, True) + time_slices,date_slices = build_all_agenda_slices(meeting) return HttpResponse(render_to_string("meeting/landscape_edit.html", {"schedule":schedule, From 73c4f694ca7d360409babf5f32bdb5cf3c30d1ce Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 19 Mar 2014 21:00:14 +0000 Subject: [PATCH 16/21] remove agenda from the meeting creation/edit form - that is managed elsewhere now - Legacy-Id: 7528 --- ietf/secr/meetings/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/secr/meetings/forms.py b/ietf/secr/meetings/forms.py index 02885e060..81bf25284 100644 --- a/ietf/secr/meetings/forms.py +++ b/ietf/secr/meetings/forms.py @@ -91,7 +91,7 @@ class TimeChoiceField(forms.ChoiceField): class MeetingModelForm(forms.ModelForm): class Meta: model = Meeting - exclude = ('type',) + exclude = ('type', 'agenda') def clean_number(self): number = self.cleaned_data['number'] From e3d946999c66b34a6c141147a729d1478df79d35 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 25 Mar 2014 22:29:58 +0000 Subject: [PATCH 17/21] Reworked add/edit of resources and people who must be there on session requests - Legacy-Id: 7543 --- ietf/secr/sreq/forms.py | 23 +---- ietf/secr/sreq/views.py | 84 ++++++++++++------- .../includes/sessions_request_form.html | 30 ++----- .../includes/sessions_request_view.html | 7 +- ietf/secr/templates/sreq/edit.html | 4 +- ietf/secr/templates/sreq/new.html | 3 + 6 files changed, 73 insertions(+), 78 deletions(-) diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py index c82799697..d28618bd9 100644 --- a/ietf/secr/sreq/forms.py +++ b/ietf/secr/sreq/forms.py @@ -53,20 +53,6 @@ class GroupSelectForm(forms.Form): super(GroupSelectForm, self).__init__(*args,**kwargs) self.fields['group'].widget.choices = choices -BETHERE_CHOICES = ((False , 'No'), (True , 'Yes')) -# not using the ModelFormset, too complex. -class MustBePresentForm(forms.Form): - from ietf.person.models import Person - - #person = forms.ModelChoiceField(queryset= Person.objects.all(), required=False) - person = EmailsField(required=False) - bethere = forms.ChoiceField(required = False, choices = BETHERE_CHOICES) - # something like this is desired to make pre-existing items read-only - #self.fields['person'].widget.attrs['readonly'] = True - - -MustBePresentFormSet = formset_factory(MustBePresentForm, extra = 1) - class SessionForm(forms.Form): num_session = forms.ChoiceField(choices=NUM_SESSION_CHOICES) length_session1 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES) @@ -81,7 +67,8 @@ class SessionForm(forms.Form): wg_selector2 = forms.ChoiceField(choices=WG_CHOICES,required=False) wg_selector3 = forms.ChoiceField(choices=WG_CHOICES,required=False) third_session = forms.BooleanField(required=False) - resources = forms.MultipleChoiceField(choices=[(x.pk,x.desc) for x in ResourceAssociation.objects.all()], widget=forms.CheckboxSelectMultiple) + resources = forms.MultipleChoiceField(choices=[(x.pk,x.desc) for x in ResourceAssociation.objects.all()], widget=forms.CheckboxSelectMultiple,required=False) + bethere = EmailsField(label="Must be present", required=False) def __init__(self, *args, **kwargs): super(SessionForm, self).__init__(*args, **kwargs) @@ -103,12 +90,6 @@ class SessionForm(forms.Form): if self.initial['length_session3'] != '0' and self.initial['length_session3'] != None: self.fields['third_session'].initial = True - if self.initial and 'resources' in self.initial: - resources = self.initial['resources'] - resource_choices = [r.pk for r in resources] - #self.initial['resources'] = resource_choices - self.fields['resources'].initial = resource_choices - def clean_conflict1(self): conflict = self.cleaned_data['conflict1'] check_conflict(conflict) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index 415df6191..171fe64bd 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -18,6 +18,7 @@ from ietf.meeting.helpers import get_meeting from ietf.group.models import Group, Role from ietf.name.models import SessionStatusName, ConstraintName +from ietf.person.models import Email from forms import * @@ -52,6 +53,14 @@ def get_initial_session(sessions): meeting = sessions[0].meeting group = sessions[0].group conflicts = group.constraint_source_set.filter(meeting=meeting) + + bethere_people = [x.person for x in sessions[0].constraints().filter(name='bethere')] + bethere_email = [] + for person in bethere_people: + e = person.email_set.order_by("-active","-time").first() + if e: + bethere_email.append(e) + # even if there are three sessions requested, the old form has 2 in this field initial['num_session'] = sessions.count() if sessions.count() <= 2 else 2 @@ -69,6 +78,7 @@ def get_initial_session(sessions): initial['conflict3'] = ' '.join([ c.target.acronym for c in conflicts.filter(name__slug='conflic3') ]) initial['comments'] = sessions[0].comments initial['resources'] = sessions[0].resources.all() + initial['bethere'] = bethere_email return initial def get_lock_message(): @@ -238,6 +248,10 @@ def confirm(request, acronym): if not querydict: raise Http404 form = querydict.copy() + if 'resources' in form: + form['resources'] = [ ResourceAssociation.objects.get(pk=pk) for pk in form['resources'].split(',')] + if 'bethere' in form: + form['bethere'] = [Email.objects.get(address=addr) for addr in form['bethere'].split(',')] meeting = get_meeting() group = get_object_or_404(Group,acronym=acronym) login = request.user.person @@ -271,12 +285,19 @@ def confirm(request, acronym): comments=form['comments'], status=SessionStatusName.objects.get(slug=slug)) session_save(new_session) + if 'resources' in form: + new_session.resources = form['resources'] # write constraint records save_conflicts(group,meeting,form['conflict1'],'conflict') save_conflicts(group,meeting,form['conflict2'],'conflic2') save_conflicts(group,meeting,form['conflict3'],'conflic3') + if 'bethere' in form: + bethere_cn = ConstraintName.objects.get(slug='bethere') + for email in form['bethere']: + Constraint.objects.create(name=bethere_cn,source=group,person=email.person,meeting=new_session.meeting) + # deprecated in new schema # log activity #add_session_activity(group,'New session was requested',meeting,user) @@ -301,6 +322,7 @@ def confirm(request, acronym): RequestContext(request, {}), ) +#Begin dead code def make_essential_person(pk, person, required): essential_person = dict() essential_person["person"] = person.email_set.all()[0].pk @@ -339,6 +361,23 @@ def make_bepresent_formset(group, session, default=True): formset = MustBePresentFormSet(initial=list_of_essential_people) return formset +# end dead code + +#Move this into make_initial +def add_essential_people(group,initial): + # This will be easier when the form uses Person instead of Email + people = set() + if 'bethere' in initial: + people.update(initial['bethere']) + for role in group.role_set.filter(name='chair'): + e = role.person.email_set.order_by("-active","-time").first() + if e: + people.add(e) + e = group.ad.email_set.order_by("-active","-time").first() + if e: + people.add(e) + initial['bethere'] = list(people) + @check_permissions def edit(request, acronym): @@ -360,6 +399,9 @@ def edit_mtg(request, num, acronym): sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id') sessions_count = sessions.count() initial = get_initial_session(sessions) + if 'resources' in initial: + initial['resources'] = [x.pk for x in initial['resources']] + session_conflicts = session_conflicts_as_string(group, meeting) login = request.user.person @@ -373,8 +415,7 @@ def edit_mtg(request, num, acronym): return redirect('sessions_view', acronym=acronym) form = SessionForm(request.POST,initial=initial) - bepresent_formset = MustBePresentFormSet(request.POST) - if form.is_valid() or bepresent_formset.is_valid(): + if form.is_valid(): if form.has_changed(): # might be cleaner to simply delete and rewrite all records (but maintain submitter?) # adjust duration or add sessions @@ -449,6 +490,12 @@ def edit_mtg(request, num, acronym): for a in new_resource_ids] session.resources = new_resources + if 'bethere' in form.changed_data and set(form.cleaned_data['bethere'])!=set(initial['bethere']): + session.constraints().filter(name='bethere').delete() + bethere_cn = ConstraintName.objects.get(slug='bethere') + for email in form.cleaned_data['bethere']: + Constraint.objects.create(name=bethere_cn,source=group,person=email.person,meeting=session.meeting) + # deprecated # log activity #add_session_activity(group,'Session Request was updated',meeting,user) @@ -456,29 +503,6 @@ def edit_mtg(request, num, acronym): # send notification send_notification(group,meeting,login,form.cleaned_data,'update') - for bepresent in bepresent_formset.forms: - if bepresent.is_valid() and 'person' in bepresent.cleaned_data: - persons_cleaned = bepresent.cleaned_data['person'] - if(len(persons_cleaned) == 0): - continue - - person = bepresent.cleaned_data['person'][0].person - if 'bethere' in bepresent.changed_data and bepresent.cleaned_data['bethere']=='True': - #print "Maybe adding bethere constraint for %s" % (person) - if session.people_constraints.filter(person = person).count()==0: - # need to create new constraint. - #print " yes" - nc = session.people_constraints.create(person = person, - meeting = meeting, - name_id = 'bethere', - source = session.group) - nc.save() - else: - #print "Maybe deleting bethere constraint for %s" % (person) - if session.people_constraints.filter(person = person).count() > 0: - #print " yes" - session.people_constraints.filter(person = person).delete() - # nuke any cache that might be lingering around. from ietf.meeting.helpers import session_constraint_expire session_constraint_expire(session) @@ -489,13 +513,10 @@ def edit_mtg(request, num, acronym): else: form = SessionForm(initial=initial) - bepresent_formset = make_bepresent_formset(group, session, False) - return render_to_response('sreq/edit.html', { 'meeting': meeting, 'form': form, 'group': group, - 'bepresent_formset' : bepresent_formset, 'session_conflicts': session_conflicts}, RequestContext(request, {}), ) @@ -600,10 +621,15 @@ def new(request, acronym): return redirect('sessions_new', acronym=acronym) initial = get_initial_session(previous_sessions) + add_essential_people(group,initial) + if 'resources' in initial: + initial['resources'] = [x.pk for x in initial['resources']] form = SessionForm(initial=initial) else: - form = SessionForm() + initial={} + add_essential_people(group,initial) + form = SessionForm(initial=initial) return render_to_response('sreq/new.html', { 'meeting': meeting, diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html index ab85655bb..afd9fee13 100755 --- a/ietf/secr/templates/includes/sessions_request_form.html +++ b/ietf/secr/templates/includes/sessions_request_form.html @@ -14,7 +14,8 @@ Length of Third Session: {{ form.length_session3.errors }}{{ form.length_session3 }} {% endif %} Number of Attendees:*{{ form.attendees.errors }}{{ form.attendees }} - Conflicts to Avoid: + People who must be present:{{ form.bethere.errors }}{{ form.bethere }} + Conflicts to Avoid: @@ -50,27 +51,10 @@
- People who need to be present: - - {{ bepresent_formset.management_form }} - - - - - - {% for essential_person_form in bepresent_formset.forms %} - - - - - {% endfor %} -
PersonMust be present?
{{ essential_person_form.person }}{{ essential_person_form.bethere }}
- - Resources requested: - - {{ form.resources }} - + + {{ form.resources }} + Special Requests:
 
i.e. Meetecho, WebEx (please state which, and the reason needed), restrictions on meeting times / days, etc. @@ -81,7 +65,3 @@ {% include "includes/buttons_save_cancel.html" %} -{% block content_end %} - - -{% endblock %} diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html index 44614564c..54e08719b 100644 --- a/ietf/secr/templates/includes/sessions_request_view.html +++ b/ietf/secr/templates/includes/sessions_request_view.html @@ -28,9 +28,12 @@ Resources requested: - {% if session.resources %}
    {% for resource in session.resources %}
  • {{ resource.desc }}{% endfor %}
{% else %}None so far{% endif %} + {% if session.resources %}
    {% for resource in session.resources %}
  • {{ resource.desc }}
    • {% endfor %}
{% else %}None so far{% endif %} + + People who must be present: + {% if session.bethere %}
    {% for email in session.bethere %}
  • {{ email.person }}
    • {% endfor %}
{% else %}None{% endif %} {% autoescape off %} - Special Requests:{{ session.comments }} + Special Requests:{{ session.comments }} {% endautoescape %} diff --git a/ietf/secr/templates/sreq/edit.html b/ietf/secr/templates/sreq/edit.html index 5345f0bd9..f4432cdfa 100755 --- a/ietf/secr/templates/sreq/edit.html +++ b/ietf/secr/templates/sreq/edit.html @@ -5,6 +5,9 @@ {% block extrahead %}{{ block.super }} + + + {% endblock %} {% block breadcrumbs %}{{ block.super }} @@ -17,7 +20,6 @@ Instructions {% endblock %} - {% block content %}
diff --git a/ietf/secr/templates/sreq/new.html b/ietf/secr/templates/sreq/new.html index e99bd34ba..24ca758c2 100755 --- a/ietf/secr/templates/sreq/new.html +++ b/ietf/secr/templates/sreq/new.html @@ -5,6 +5,9 @@ {% block extrahead %}{{ block.super }} + + + {% endblock %} {% block breadcrumbs %}{{ block.super }} From e953538543278b9241efbaf428739d1814b3e332 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 27 Mar 2014 15:00:14 +0000 Subject: [PATCH 18/21] checkpoint before refactoring the conflict array - Legacy-Id: 7548 --- static/css/agenda.css | 2 + static/js/agenda/agenda_objects.js | 106 ++++++++++++++++++++++------- 2 files changed, 82 insertions(+), 26 deletions(-) diff --git a/static/css/agenda.css b/static/css/agenda.css index d24213b72..f9073e897 100644 --- a/static/css/agenda.css +++ b/static/css/agenda.css @@ -847,11 +847,13 @@ table.actual_conflic3 { border: solid 1px #203E5F; } +/* .agenda_row_alt td { /* for now, use no alternating theme */ border-bottom: 1px solid orange; margin-bottom: 5px; } +*/ .agenda_slot_plenary { /* background-color: #d38f2d; */ /* dark orange */ diff --git a/static/js/agenda/agenda_objects.js b/static/js/agenda/agenda_objects.js index 56996364e..a3c8e3d32 100644 --- a/static/js/agenda/agenda_objects.js +++ b/static/js/agenda/agenda_objects.js @@ -183,6 +183,25 @@ function find_and_populate_conflicts(session_obj) { }); } + if(session_obj.theirconstraints.conflict != null){ + $.each(session_obj.theirconstraints.conflict, function(i){ + var conflict = session_obj.theirconstraints.conflict[i]; + calculate_real_conflict(conflict, vertical_location, room_tag, session_obj); + }); + } + if(session_obj.theirconstraints.conflic2 != null){ + $.each(session_obj.theirconstraints.conflic2, function(i){ + var conflict = session_obj.theirconstraints.conflic2[i]; + calculate_real_conflict(conflict, vertical_location, room_tag, session_obj); + }); + } + if(session_obj.theirconstraints.conflic3 != null){ + $.each(session_obj.theirconstraints.conflic3, function(i){ + var conflict = session_obj.theirconstraints.conflic3[i]; + calculate_real_conflict(conflict, vertical_location, room_tag, session_obj); + }); + } + /* bethere constraints are processed in another loop */ } } @@ -649,6 +668,7 @@ function make_ss(json) { function Session() { this.constraints = {}; + this.theirconstraints = {}; this.constraint_load_andthen_list = []; this.constraints_loaded = false; this.last_timeslot_id = null; @@ -660,6 +680,7 @@ function Session() { this.area = "noarea"; this.special_request = ""; this.conflicted = false; + this.theirconflicted = false; this.double_wide = false; this.attendees = undefined; } @@ -865,19 +886,35 @@ Session.prototype.mark_conflict = function(value) { this.conflicted = value; }; Session.prototype.add_conflict = function(conflict) { - this.conflicted = true; - if(this.highest_conflict==undefined) { - this.highest_conflict = conflict; - } else { - var oldhighest = this.highest_conflict; - this.highest_conflict = this.highest_conflict.conflict_compare(conflict); - if(_conflict_debug) { - console.log("add conflict for", this.title, - oldhighest.conflict_type, ">?", conflict.conflict_type, - "=", this.highest_conflict.conflict_type); + if (conflict.direction==='ours') { + this.conflicted = true; + if(this.highest_conflict==undefined) { + this.highest_conflict = conflict; + } else { + var oldhighest = this.highest_conflict; + this.highest_conflict = this.highest_conflict.conflict_compare(conflict); + if(_conflict_debug) { + console.log("add conflict for", this.title, + oldhighest.conflict_type, ">?", conflict.conflict_type, + "=", this.highest_conflict.conflict_type); + } } + this.conflict_level = this.highest_conflict.conflict_type; + } else { + this.theirconflicted = true; + if(this.highest_theirconflict==undefined) { + this.highest_theirconflict = conflict; + } else { + var oldhighest = this.highest_theirconflict; + this.highest_theirconflict = this.highest_theirconflict.conflict_compare(conflict); + if(_conflict_debug) { + console.log("add conflict for", this.title, + oldhighest.conflict_type, ">?", conflict.conflict_type, + "=", this.highest_theirconflict.conflict_type); + } + } + this.theirconflict_level = this.highest_theirconflict.conflict_type; } - this.conflict_level = this.highest_conflict.conflict_type; }; Session.prototype.clear_conflict = function() { this.conflicted = false; @@ -901,16 +938,26 @@ Session.prototype.show_conflict = function() { if(_conflict_debug) { console.log("showing conflict for", this.title, this.conflict_level); } - this.element().addClass("actual_" + this.conflict_level); +// this.element().find('.ourconflicts').addClass("actual_" + this.conflict_level); +// this.element().find('.theirconflicts').addClass("actual_" + this.conflict_level); + var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' }; + if (this.conflicted) { + this.element().find('.ourconflicts').text('->'+display[this.conflict_level]); + } + if (this.theirconflicted) { + this.element().find('.theirconflicts').text(display[this.theirconflict_level]+'->'); + } }; Session.prototype.hide_conflict = function() { if(_conflict_debug) { console.log("removing conflict for", this.title); } - this.element().removeClass("actual_conflict"); +// this.element().removeClass("actual_conflict"); + this.element().find('.ourconflicts').text(''); + this.element().find('.theirconflicts').text(''); }; Session.prototype.display_conflict = function() { - if(this.conflicted) { + if(this.conflicted || this.theirconflicted) { this.show_conflict(); } else { this.hide_conflict(); @@ -920,6 +967,9 @@ Session.prototype.reset_conflicts = function() { this.conflict_level = undefined; this.highest_conflict = undefined; this.conflicted = false; + this.theirconflict_level = undefined; + this.highest_theirconflict = undefined; + this.theirconflicted = false; }; Session.prototype.show_personconflict = function() { @@ -1106,12 +1156,12 @@ Session.prototype.event_template = function() { "' id='session_"+ this.session_id+ "' session_id=\""+this.session_id+"\"" + - ">"+ this.visible_title()+ " ("+this.requested_duration+")" + - ""+pinned+""+ area_mark +"
"; + ""+pinned+""+ area_mark +"
"; }; function andthen_alert(object, result, arg) { @@ -1524,17 +1574,13 @@ Constraint.prototype.show_conflict_view = function() { }; Constraint.prototype.build_group_conflict_view = function() { - var bothways = "   "; - if(this.bothways) { - bothways=" <->"; - } // this is used for the red square highlighting. var checkbox_id = "conflict_"+this.dom_id; conflict_classes[checkbox_id] = this; return "
"+this.othergroup_name+bothways+"
"; + "'>"+this.othergroup_name+"
"; }; @@ -1593,6 +1639,9 @@ Session.prototype.add_constraint_obj = function(obj) { if(this.constraints[listname]==undefined) { this.constraints[listname]={}; } + if(this.theirconstraints[listname]==undefined) { + this.theirconstraints[listname]={}; + } if(listname == "bethere") { //console.log("bethere constraint: ", obj); @@ -1611,18 +1660,23 @@ Session.prototype.add_constraint_obj = function(obj) { if(obj.source_href == this.group_href) { obj.thisgroup = this.group; obj.othergroup = find_group_by_href(obj.target_href, "constraint src"+obj.href); + obj.direction = 'ours'; ogroupname = obj.target_href; + if(this.constraints[listname][ogroupname]) { + console.log("Found multiple instances of",this.group_href,listname,ogroupname); + } + this.constraints[listname][ogroupname] = obj } else { obj.thisgroup = this.group; obj.othergroup = find_group_by_href(obj.source_href, "constraint dst"+obj.href); + obj.direction = 'theirs'; ogroupname = obj.source_href; + if(this.theirconstraints[listname][ogroupname]) { + console.log("Found multiple instances of",ogroupname,listname,this.group_href); + } + this.theirconstraints[listname][ogroupname] = obj } - if(this.constraints[listname][ogroupname]) { - this.constraints[listname][ogroupname].bothways = true; - } else { - this.constraints[listname][ogroupname]=obj; - } } }; From 53feb01d6781dc999bfa052d22eb9b350386f2c7 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 27 Mar 2014 19:47:31 +0000 Subject: [PATCH 19/21] Have group conflicts showing now - not sure find-free is working yet - Legacy-Id: 7551 --- static/css/agenda.css | 5 ++ static/js/agenda/agenda_listeners.js | 31 ++++++- static/js/agenda/agenda_objects.js | 125 +++++++++++++++++---------- 3 files changed, 113 insertions(+), 48 deletions(-) diff --git a/static/css/agenda.css b/static/css/agenda.css index f9073e897..786c44539 100644 --- a/static/css/agenda.css +++ b/static/css/agenda.css @@ -502,6 +502,11 @@ div#conflict_table { background-color: #89D; } +div.conflictlevel { + display: inline-block; + min-width: 1.5em; +} + div.our-conflict { padding-left: 20px; background-image: url('/images/conflict-boxes/narow3.png'); diff --git a/static/js/agenda/agenda_listeners.js b/static/js/agenda/agenda_listeners.js index 0db9e98da..5f17dac30 100644 --- a/static/js/agenda/agenda_listeners.js +++ b/static/js/agenda/agenda_listeners.js @@ -881,15 +881,42 @@ function group_name_or_empty(constraint) { function draw_constraints(session) { if("conflicts" in session) { + var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' }; var group_icons = ""; - + var group_set = {}; $.each(session.conflicts, function(index) { conflict = session.conflicts[index]; + conflict.build_othername(); if(conflict.conflict_groupP()) { - group_icons += "
  • "+conflict.conflict_view(); + if ( ! (conflict.othergroup_name in group_set) ) { + group_set[conflict.othergroup_name] = {}; + } + group_set[conflict.othergroup_name][conflict.direction]=display[conflict.conflict_type]; + // This had been in build_group_conflict_view + conflict.populate_conflict_classes(); highlight_conflict(conflict); } }); + + + $.each(group_set, function(index) { + group = group_set[index]; + group_view = "
  • "; + group_view += "
    " + if ('ours' in group_set[index]) { + group_view += group_set[index].ours+"->" + } + group_view += "
    " + group_view += index; + group_view += "
    " + if ('theirs' in group_set[index]) { + group_view += "->"+group_set[index].theirs + } + group_view += "
    " + group_view += "
    • "; + group_icons += group_view; + }); + if(group_icons == "") { $("#conflict_group_list").html("none"); } else { diff --git a/static/js/agenda/agenda_objects.js b/static/js/agenda/agenda_objects.js index a3c8e3d32..7ef62bf6b 100644 --- a/static/js/agenda/agenda_objects.js +++ b/static/js/agenda/agenda_objects.js @@ -680,6 +680,7 @@ function Session() { this.area = "noarea"; this.special_request = ""; this.conflicted = false; + this.conflicted_direction = {}; this.theirconflicted = false; this.double_wide = false; this.attendees = undefined; @@ -886,36 +887,31 @@ Session.prototype.mark_conflict = function(value) { this.conflicted = value; }; Session.prototype.add_conflict = function(conflict) { - if (conflict.direction==='ours') { - this.conflicted = true; - if(this.highest_conflict==undefined) { - this.highest_conflict = conflict; - } else { - var oldhighest = this.highest_conflict; - this.highest_conflict = this.highest_conflict.conflict_compare(conflict); - if(_conflict_debug) { - console.log("add conflict for", this.title, - oldhighest.conflict_type, ">?", conflict.conflict_type, - "=", this.highest_conflict.conflict_type); - } - } - this.conflict_level = this.highest_conflict.conflict_type; - } else { - this.theirconflicted = true; - if(this.highest_theirconflict==undefined) { - this.highest_theirconflict = conflict; - } else { - var oldhighest = this.highest_theirconflict; - this.highest_theirconflict = this.highest_theirconflict.conflict_compare(conflict); - if(_conflict_debug) { - console.log("add conflict for", this.title, - oldhighest.conflict_type, ">?", conflict.conflict_type, - "=", this.highest_theirconflict.conflict_type); - } - } - this.theirconflict_level = this.highest_theirconflict.conflict_type; + this.conflicted = true; + if (this.conflicted_direction==undefined) { + this.conflicted_direction={}; } + this.conflicted_direction[conflict.direction] = true; + if (this.highest_conflict==undefined) { + this.highest_conflict={}; + } + if(this.highest_conflict[conflict.direction]==undefined) { + this.highest_conflict[conflict.direction] = conflict; + } else { + var oldhighest = this.highest_conflict[conflict.direction]; + this.highest_conflict[conflict.direction] = this.highest_conflict[conflict.direction].conflict_compare(conflict); + if(_conflict_debug) { + console.log("add conflict for", this.title, + oldhighest.conflict_type, ">?", conflict.conflict_type, + "=", this.highest_conflict[conflict.direction].conflict_type); + } + } + if (this.conflict_level==undefined){ + this.conflict_level={}; + } + this.conflict_level[conflict.direction] = this.highest_conflict[conflict.direction].conflict_type; }; + Session.prototype.clear_conflict = function() { this.conflicted = false; }; @@ -936,26 +932,27 @@ Session.prototype.clear_all_conflicts = function(old_column_classes) { Session.prototype.show_conflict = function() { if(_conflict_debug) { - console.log("showing conflict for", this.title, this.conflict_level); + console.log("showing conflict for", this.title, this.conflict_level['ours'],this.conflict_level['theirs']); } -// this.element().find('.ourconflicts').addClass("actual_" + this.conflict_level); -// this.element().find('.theirconflicts').addClass("actual_" + this.conflict_level); var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' }; if (this.conflicted) { - this.element().find('.ourconflicts').text('->'+display[this.conflict_level]); - } - if (this.theirconflicted) { - this.element().find('.theirconflicts').text(display[this.theirconflict_level]+'->'); + if ('ours' in this.conflict_level) { + this.element().find('.ourconflicts').text('->'+display[this.conflict_level.ours]); + } + if ('theirs' in this.conflict_level) { + this.element().find('.theirconflicts').text(display[this.conflict_level.theirs]+'->'); + } } }; + Session.prototype.hide_conflict = function() { if(_conflict_debug) { console.log("removing conflict for", this.title); } -// this.element().removeClass("actual_conflict"); this.element().find('.ourconflicts').text(''); this.element().find('.theirconflicts').text(''); }; + Session.prototype.display_conflict = function() { if(this.conflicted || this.theirconflicted) { this.show_conflict(); @@ -963,10 +960,12 @@ Session.prototype.display_conflict = function() { this.hide_conflict(); } }; + Session.prototype.reset_conflicts = function() { this.conflict_level = undefined; this.highest_conflict = undefined; this.conflicted = false; + this.conflicted_direction = undefined; this.theirconflict_level = undefined; this.highest_theirconflict = undefined; this.theirconflicted = false; @@ -974,7 +973,7 @@ Session.prototype.reset_conflicts = function() { Session.prototype.show_personconflict = function() { if(_conflict_debug) { - console.log("showing person conflict for", this.title, this.conflict_level); + console.log("showing person conflict for", this.title, this.conflict_level.ours); } this.personconflict_element().removeClass("hidepersonconflict"); this.personconflict_element().addClass("showpersonconflict"); @@ -1294,6 +1293,21 @@ Session.prototype.fill_in_constraints = function(constraint_list) { session_obj.conflicts.push(session_obj.constraints["conflic3"][index]); }); } + if("conflict" in this.theirconstraints) { + $.each(this.theirconstraints["conflict"], function(index) { + session_obj.conflicts.push(session_obj.theirconstraints["conflict"][index]); + }); + } + if("conflic2" in this.theirconstraints) { + $.each(this.theirconstraints["conflic2"], function(index) { + session_obj.conflicts.push(session_obj.theirconstraints["conflic2"][index]); + }); + } + if("conflic3" in this.theirconstraints) { + $.each(this.theirconstraints["conflic3"], function(index) { + session_obj.conflicts.push(session_obj.theirconstraints["conflic3"][index]); + }); + } this.calculate_bethere(); this.conflicts = sort_conflict_list(this.conflicts) }; @@ -1573,17 +1587,35 @@ Constraint.prototype.show_conflict_view = function() { //console.log("viewed", this.thisgroup.href); }; -Constraint.prototype.build_group_conflict_view = function() { - +Constraint.prototype.populate_conflict_classes = function() { // this is used for the red square highlighting. var checkbox_id = "conflict_"+this.dom_id; conflict_classes[checkbox_id] = this; - - return "
    "+this.othergroup_name+"
    "; - }; +// Made dead by change to how the group view is built out +//Constraint.prototype.build_group_conflict_view = function() { +// +// var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' }; +// +// // this is used for the red square highlighting. +// var checkbox_id = "conflict_"+this.dom_id; +// conflict_classes[checkbox_id] = this; +// +// build = "
    "; +// if (this.direction=='theirs') { +// build += display[this.conflict_type]+"->"; +// } +// build += this.othergroup_name; +// if (this.direction=='ours') { +// build += "->"+display[this.conflict_type]; +// } +// build += "
    "; +// +// return build +// +//}; + Constraint.prototype.build_people_conflict_view = function() { var area_mark = ""; if(this.person != undefined && this.person.area_mark_basic != undefined) { @@ -1612,9 +1644,10 @@ Constraint.prototype.conflict_view = function() { return this.build_people_conflict_view(); } else { - //console.log("conflict_view for", this.href); - this.build_othername(); - return this.build_group_conflict_view(); + // This function is currently never called for this case + console.log("!! unexpected conflict_view for", this.href); + //this.build_othername(); + //return this.build_group_conflict_view(); } }; From 0fafe5638172e777985d186f058d410475aad670 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Fri, 28 Mar 2014 23:16:41 +0000 Subject: [PATCH 20/21] allow edit of timeslots, changes to scheduled notifications, support non-official schedules - Legacy-Id: 7554 --- ietf/group/models.py | 7 +- ietf/meeting/models.py | 12 +- ietf/secr/meetings/tests.py | 13 +- ietf/secr/meetings/urls.py | 21 +- ietf/secr/meetings/views.py | 345 ++++++++++++------ .../templates/meetings/base_rooms_times.html | 11 +- ietf/secr/templates/meetings/blue_sheet.html | 7 +- ietf/secr/templates/meetings/non_session.html | 4 +- .../templates/meetings/notifications.html | 53 +++ ietf/secr/templates/meetings/schedule.html | 5 +- ietf/secr/templates/meetings/select.html | 51 +++ .../secr/templates/meetings/select_group.html | 7 +- ietf/secr/templates/meetings/times.html | 4 +- ietf/secr/templates/meetings/times_edit.html | 18 + ietf/secr/templates/meetings/view.html | 15 +- static/secretariat/css/custom.css | 4 + static/secretariat/js/dynamic_inlines.js | 2 +- 17 files changed, 422 insertions(+), 157 deletions(-) create mode 100644 ietf/secr/templates/meetings/notifications.html create mode 100644 ietf/secr/templates/meetings/select.html create mode 100755 ietf/secr/templates/meetings/times_edit.html diff --git a/ietf/group/models.py b/ietf/group/models.py index 7d604d3b6..b4f836aa0 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -139,10 +139,10 @@ class GroupMilestoneInfo(models.Model): docs = models.ManyToManyField('doc.Document', blank=True) def __unicode__(self): - return self.desc[:20] + "..." + return self.desc[:20] + "..." class Meta: abstract = True - ordering = ['due', 'id'] + ordering = ['due', 'id'] class GroupMilestone(GroupMilestoneInfo): time = models.DateTimeField(auto_now=True) @@ -159,7 +159,7 @@ class GroupStateTransitions(models.Model): next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states') def __unicode__(self): - return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()]) + return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()]) GROUP_EVENT_CHOICES = [ ("changed_state", "Changed state"), @@ -167,6 +167,7 @@ GROUP_EVENT_CHOICES = [ ("info_changed", "Changed metadata"), ("requested_close", "Requested closing group"), ("changed_milestone", "Changed milestone"), + ("sent_notification", "Sent notification") ] class GroupEvent(models.Model): diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index da0310319..8d70a9a03 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -206,20 +206,9 @@ class Meeting(models.Model): return '' def set_official_agenda(self, agenda): - # send_notification should be refactored into Session - from ietf.secr.meetings.views import send_notification if self.agenda != agenda: self.agenda = agenda self.save() - if self.agenda is not None: - for ss in self.agenda.scheduledsession_set.all(): - session = ss.session - if session.status.slug == "schedw": - session.status_id = "sched" - session.scheduled = datetime.datetime.now() - session.save() - # refactoring send_notification will obviate this odd hoop-jump - send_notification(None, Session.objects.filter(id=session.id)) class Meta: ordering = ["-date", ] @@ -1174,3 +1163,4 @@ class Session(models.Model): if self.badness_test(1): self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness)) return badness + diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index cc81c2a71..dee0f47f3 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -1,7 +1,7 @@ from django.core.urlresolvers import reverse from ietf.utils import TestCase -from ietf.meeting.models import Meeting +from ietf.meeting.models import Meeting, Schedule from ietf.utils.test_data import make_test_data from pyquery import PyQuery @@ -22,3 +22,14 @@ class MainTestCase(TestCase): url = reverse('meetings_view', kwargs={'meeting_id':meeting.number}) response = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEqual(response.status_code, 200) + + def test_add_meeting(self): + "Add Meeting" + url = reverse('meetings_add') + post_data = dict(number=1,city='Seattle',date='2014-07-20',country='US', + time_zone='America/Los_Angeles',venue_name='Hilton', + venue_addr='100 First Ave') + response = self.client.post(url, post_data,follow=True,REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + self.assertEqual(Meeting.objects.count(),1) + self.assertEqual(Schedule.objects.count(),1) diff --git a/ietf/secr/meetings/urls.py b/ietf/secr/meetings/urls.py index c4bf64658..182b2ae8b 100644 --- a/ietf/secr/meetings/urls.py +++ b/ietf/secr/meetings/urls.py @@ -9,14 +9,17 @@ urlpatterns = patterns('ietf.secr.meetings.views', url(r'^(?P\d{1,6})/blue_sheet/$', 'blue_sheet', name='meetings_blue_sheet'), url(r'^(?P\d{1,6})/blue_sheet/generate/$', 'blue_sheet_generate', name='meetings_blue_sheet_generate'), url(r'^(?P\d{1,6})/edit/$', 'edit_meeting', name='meetings_edit_meeting'), - url(r'^(?P\d{1,6})/rooms/$', 'rooms', name='meetings_rooms'), - url(r'^(?P\d{1,6})/times/$', 'times', name='meetings_times'), - url(r'^(?P\d{1,6})/times/delete/(?P

    diff --git a/ietf/secr/templates/meetings/select.html b/ietf/secr/templates/meetings/select.html new file mode 100644 index 000000000..263b466fb --- /dev/null +++ b/ietf/secr/templates/meetings/select.html @@ -0,0 +1,51 @@ +{% extends "base_site.html" %} + +{% block title %}Meetings{% endblock %} + +{% block extrahead %}{{ block.super }} + +{% endblock %} + +{% block breadcrumbs %}{{ block.super }} + » Meetings + » {{ meeting.number }} + » {{ schedule.name }} +{% endblock %} + +{% block content %} + +
    +

    IETF {{ meeting.number }}

    + +
    +
      +
      • +
      • +
      • +
    +
    + +
    + +{% endblock %} + + + + + + + + + + + + + + + + + + + + + diff --git a/ietf/secr/templates/meetings/select_group.html b/ietf/secr/templates/meetings/select_group.html index 89a1de112..cf406fa0f 100644 --- a/ietf/secr/templates/meetings/select_group.html +++ b/ietf/secr/templates/meetings/select_group.html @@ -7,8 +7,9 @@ {% endblock %} {% block breadcrumbs %}{{ block.super }} - » Meetings - » {{ meeting.number }} + » Meetings + » {{ meeting.number }} + » {{ schedule.name }} » Select Group {% endblock %} @@ -49,7 +50,7 @@

    Scheduled Sessions

    diff --git a/ietf/secr/templates/meetings/times.html b/ietf/secr/templates/meetings/times.html index 40ba348e0..5dd85d42a 100644 --- a/ietf/secr/templates/meetings/times.html +++ b/ietf/secr/templates/meetings/times.html @@ -13,6 +13,7 @@ Time Name + @@ -21,7 +22,8 @@ {{ item.time|date:"D" }} {{ item.time|date:"H:i" }} - {{ item.end_time|date:"H:i" }} {{ item.name }} - Delete + Edit + Delete {% endfor %} diff --git a/ietf/secr/templates/meetings/times_edit.html b/ietf/secr/templates/meetings/times_edit.html new file mode 100755 index 000000000..80911db5e --- /dev/null +++ b/ietf/secr/templates/meetings/times_edit.html @@ -0,0 +1,18 @@ +{% extends "meetings/base_rooms_times.html" %} + +{% block subsection %} + +
    +

    Meeting - {{ meeting }}

    +

    TimeSlot:

    +
    {% csrf_token %} + + {{ form.as_table }} +
    + + {% include "includes/buttons_save_cancel.html" %} + +
    +
    + +{% endblock %} diff --git a/ietf/secr/templates/meetings/view.html b/ietf/secr/templates/meetings/view.html index 7b67687f3..96ac24f9f 100644 --- a/ietf/secr/templates/meetings/view.html +++ b/ietf/secr/templates/meetings/view.html @@ -34,8 +34,16 @@
      • -
      • -
      • +
      • +
      • +
    • + +
    @@ -44,7 +52,8 @@ {% endblock %} - +
    • +
    • diff --git a/static/secretariat/css/custom.css b/static/secretariat/css/custom.css index bb78c87e3..3b1b6231c 100644 --- a/static/secretariat/css/custom.css +++ b/static/secretariat/css/custom.css @@ -490,6 +490,10 @@ tr.break td { border-top: 2px solid black; } +#schedule-selector { + display: inline; +} + /* ========================================================================== Proceedings Tool ========================================================================== */ diff --git a/static/secretariat/js/dynamic_inlines.js b/static/secretariat/js/dynamic_inlines.js index a2ebab3ac..af53ec813 100644 --- a/static/secretariat/js/dynamic_inlines.js +++ b/static/secretariat/js/dynamic_inlines.js @@ -59,7 +59,7 @@ $(function() { '' $('.inline-group').each(function(i) { //prefix is in the name of the input fields before the "-" - var prefix = $("input[type='hidden']", this).attr("name").split("-")[0] + var prefix = $("input[type='hidden'][name!='csrfmiddlewaretoken']", this).attr("name").split("-")[0] $(this).append(html_template.replace("{{prefix}}", prefix)) }) }) From 2ff790032669fe4df85f2c6b45b9ac4848fa800a Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Tue, 1 Apr 2014 18:09:11 +0000 Subject: [PATCH 21/21] fix various issues with recent changes - Legacy-Id: 7559 --- ietf/secr/meetings/forms.py | 3 - ietf/secr/meetings/tests.py | 173 +++++++++++++++++- ietf/secr/meetings/views.py | 68 ++++--- .../templates/meetings/notifications.html | 2 +- ietf/secr/templates/meetings/rooms.html | 2 +- ietf/secr/templates/meetings/schedule.html | 9 +- .../secr/templates/meetings/select_group.html | 2 +- ietf/secr/templates/meetings/times.html | 2 +- ietf/secr/templates/meetings/view.html | 4 +- static/secretariat/css/custom.css | 2 +- 10 files changed, 207 insertions(+), 60 deletions(-) diff --git a/ietf/secr/meetings/forms.py b/ietf/secr/meetings/forms.py index 81bf25284..17b72feec 100644 --- a/ietf/secr/meetings/forms.py +++ b/ietf/secr/meetings/forms.py @@ -111,9 +111,6 @@ class MeetingRoomForm(forms.ModelForm): model = Room fields = '__all__' -class ExtraSessionForm(forms.Form): - no_notify = forms.BooleanField(required=False, label="Do NOT notify this action") - class NewSessionForm(forms.Form): day = forms.ChoiceField(choices=SESSION_DAYS) time = TimeChoiceField() diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index dee0f47f3..720f5d45c 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -1,14 +1,33 @@ +from django.conf import settings from django.core.urlresolvers import reverse from ietf.utils import TestCase -from ietf.meeting.models import Meeting, Schedule +from ietf.person.models import Person +from ietf.group.models import Group, GroupEvent +from ietf.meeting.models import Meeting, Schedule, Room, TimeSlot, ScheduledSession from ietf.utils.test_data import make_test_data +from ietf.utils.mail import outbox +from ietf.meeting.test_data import make_meeting_test_data from pyquery import PyQuery +from pprint import pprint + +import datetime +import os +import shutil SECR_USER='secretary' class MainTestCase(TestCase): + def setUp(self): + self.bluesheet_dir = os.path.abspath("tmp-bluesheet-dir") + self.bluesheet_path = os.path.join(self.bluesheet_dir,'blue_sheet.rtf') + os.mkdir(self.bluesheet_dir) + settings.SECR_BLUE_SHEET_PATH = self.bluesheet_path + + def tearDown(self): + shutil.rmtree(self.bluesheet_dir) + def test_main(self): "Main Test" url = reverse('meetings') @@ -17,19 +36,161 @@ class MainTestCase(TestCase): def test_view(self): "View Test" - draft = make_test_data() - meeting = Meeting.objects.all()[0] + meeting = make_meeting_test_data() url = reverse('meetings_view', kwargs={'meeting_id':meeting.number}) response = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEqual(response.status_code, 200) - + q = PyQuery(response.content) + self.assertEqual(len(q('#id_schedule_selector option')),2) + def test_add_meeting(self): "Add Meeting" url = reverse('meetings_add') - post_data = dict(number=1,city='Seattle',date='2014-07-20',country='US', - time_zone='America/Los_Angeles',venue_name='Hilton', + post_data = dict(number=1,city='Toronto',date='2014-07-20',country='CA', + time_zone='America/New_York',venue_name='Hilton', venue_addr='100 First Ave') response = self.client.post(url, post_data,follow=True,REMOTE_USER=SECR_USER) self.assertEqual(response.status_code, 200) self.assertEqual(Meeting.objects.count(),1) self.assertEqual(Schedule.objects.count(),1) + + def test_edit_meeting(self): + "Edit Meeting" + Meeting.objects.create(number=1, + type_id='ietf', + date=datetime.datetime(2014,7,20)) + url = reverse('meetings_edit_meeting',kwargs={'meeting_id':1}) + post_data = dict(number='1',date='2014-07-20',city='Toronto') + response = self.client.post(url, post_data,follow=True,REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + meeting = Meeting.objects.get(number=1) + self.assertEqual(meeting.city,'Toronto') + + def test_blue_sheets(self): + "Test Bluesheets" + meeting = make_meeting_test_data() + url = reverse('meetings_blue_sheet',kwargs={'meeting_id':meeting.number}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + + url = reverse('meetings_blue_sheet_generate',kwargs={'meeting_id':meeting.number}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 302) + self.assertTrue(os.path.exists(self.bluesheet_path)) + + def test_notifications(self): + "Test Notifications" + meeting = make_meeting_test_data() + url = reverse('meetings_notifications',kwargs={'meeting_id':42}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + q = PyQuery(response.content) + self.assertEqual(q('#id_notification_list').html(),'ames,mars') + + # test that only changes since last notification show up + mars_group = Group.objects.get(acronym='mars') + ames_group = Group.objects.get(acronym='ames') + now = datetime.datetime.now() + then = datetime.datetime.now()+datetime.timedelta(hours=1) + person = Person.objects.get(name="(System)") + GroupEvent.objects.create(group=mars_group,time=now,type='sent_notification', + by=person,desc='sent scheduled notification for %s' % meeting) + ss = meeting.agenda.scheduledsession_set.get(session__group=ames_group) + ss.modified = then + ss.save() + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + q = PyQuery(response.content) + self.assertEqual(q('#id_notification_list').html(),'ames') + + # test that email goes out + mailbox_before = len(outbox) + response = self.client.post(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 302) + self.assertEqual(len(outbox), mailbox_before + 1) + + def test_meetings_select(self): + meeting = make_meeting_test_data() + url = reverse('meetings_select',kwargs={'meeting_id':42,'schedule_name':'test-agenda'}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + + def test_meetings_rooms(self): + meeting = make_meeting_test_data() + url = reverse('meetings_rooms',kwargs={'meeting_id':42,'schedule_name':'test-agenda'}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + q = PyQuery(response.content) + self.assertEqual(len(q("#id_rooms_table tr")),2) + + # test delete + # first unschedule sessions so we can delete + ScheduledSession.objects.filter(schedule=meeting.agenda).delete() + response = self.client.post(url, { + 'room-TOTAL_FORMS': q('input[name="room-TOTAL_FORMS"]').val(), + 'room-INITIAL_FORMS': q('input[name="room-INITIAL_FORMS"]').val(), + 'room-0-meeting': q('input[name="room-0-meeting"]').val(), + 'room-0-id': q('input[name="room-0-id"]').val(), + 'room-0-name': q('input[name="room-0-name"]').val(), + 'room-0-capacity': q('input[name="room-0-capacity"]').val(), + 'room-0-DELETE': 'on' + }, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 302) + self.assertEqual(Room.objects.filter(meeting=meeting).count(),0) + + def test_meetings_times(self): + meeting = make_meeting_test_data() + url = reverse('meetings_times',kwargs={'meeting_id':42,'schedule_name':'test-agenda'}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + + def test_meetings_times_delete(self): + meeting = make_meeting_test_data() + qs = TimeSlot.objects.filter(meeting=meeting,type='session') + before = qs.count() + url = reverse('meetings_times_delete',kwargs={ + 'meeting_id':42, + 'schedule_name':'test-agenda', + 'time':qs.first().time.strftime("%Y:%m:%d:%H:%M") + }) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 302) + pprint(response.content) + after = TimeSlot.objects.filter(meeting=meeting,type='session').count() + self.assertEqual(after,before - (Room.objects.filter(meeting=meeting).count())) + + def test_meetings_times_edit(self): + meeting = make_meeting_test_data() + timeslot = TimeSlot.objects.filter(meeting=meeting,type='session').first() + url = reverse('meetings_times_edit',kwargs={ + 'meeting_id':42, + 'schedule_name':'test-agenda', + 'time':timeslot.time.strftime("%Y:%m:%d:%H:%M") + }) + response = self.client.post(url, { + 'day':'1', + 'time':'08:00', + 'duration_hours':'1', + 'duration_minutes':'0', + 'name':'Testing' + },REMOTE_USER=SECR_USER) + pprint(response.content) + self.assertEqual(response.status_code, 302) + self.assertTrue(TimeSlot.objects.filter(meeting=meeting,name='Testing')) + + def test_meetings_nonsession(self): + meeting = make_meeting_test_data() + url = reverse('meetings_non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + + def test_meetings_select_group(self): + meeting = make_meeting_test_data() + url = reverse('meetings_select_group',kwargs={'meeting_id':42,'schedule_name':'test-agenda'}) + response = self.client.get(url, REMOTE_USER=SECR_USER) + self.assertEqual(response.status_code, 200) + q = PyQuery(response.content) + self.assertEqual(len(q("#id_scheduled_sessions")),1) + + # def test_meetings_schedule(): + \ No newline at end of file diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index e545bc08d..af811fe6d 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -93,6 +93,9 @@ def build_nonsession(meeting): for a new meeting, based on the last meeting ''' last_meeting = get_last_meeting(meeting) + if not last_meeting: + return None + delta = meeting.date - last_meeting.date system = Person.objects.get(name='(system)') schedule = get_schedule(meeting) @@ -121,8 +124,11 @@ def build_nonsession(meeting): def get_last_meeting(meeting): last_number = int(meeting.number) - 1 - return Meeting.objects.get(number=last_number) - + try: + return Meeting.objects.get(number=last_number) + except Meeting.DoesNotExist: + return None + def is_combined(session,meeting,schedule=None): ''' Check to see if this session is using two combined timeslots @@ -204,11 +210,13 @@ def send_notifications(meeting, groups, person): GroupEvent.objects.create(group=group,time=now,type='sent_notification', by=person,desc='sent scheduled notification for %s' % meeting) -def sort_groups(meeting): +def sort_groups(meeting,schedule=None): ''' Similar to sreq.views.sort_groups Takes a Meeting object and returns a tuple scheduled_groups, unscheduled groups. ''' + if not schedule: + schedule = meeting.agenda scheduled_groups = [] unscheduled_groups = [] #sessions = Session.objects.filter(meeting=meeting,status__in=('schedw','apprw','appr','sched','notmeet','canceled')) @@ -216,7 +224,7 @@ def sort_groups(meeting): groups_with_sessions = [ s.group for s in sessions ] gset = set(groups_with_sessions) sorted_groups_with_sessions = sorted(gset, key = lambda instance: instance.acronym) - scheduled_sessions = ScheduledSession.objects.filter(schedule=meeting.agenda,session__isnull=False) + scheduled_sessions = ScheduledSession.objects.filter(schedule=schedule,session__isnull=False) groups_with_timeslots = [ x.session.group for x in scheduled_sessions ] for group in sorted_groups_with_sessions: if group in groups_with_timeslots: @@ -358,15 +366,15 @@ def edit_meeting(request, meeting_id): if request.method == 'POST': button_text = request.POST.get('submit','') - if button_text == 'Save': - form = MeetingModelForm(request.POST, instance=meeting) - if form.is_valid(): - form.save() - messages.success(request,'The meeting entry was changed successfully') - return redirect('meetings_view', meeting_id=meeting_id) - - else: + if button_text == 'Cancel': return redirect('meetings_view', meeting_id=meeting_id) + + form = MeetingModelForm(request.POST, instance=meeting) + if form.is_valid(): + form.save() + messages.success(request,'The meeting entry was changed successfully') + return redirect('meetings_view', meeting_id=meeting_id) + else: form = MeetingModelForm(instance=meeting) @@ -559,7 +567,7 @@ def notifications(request, meeting_id): return render_to_response('meetings/notifications.html', { 'meeting': meeting, - 'groups': groups, + 'groups': sorted(groups, key=lambda a: a.acronym), 'last_notice': last_notice }, RequestContext(request, {}), ) @@ -671,9 +679,8 @@ def schedule(request, meeting_id, schedule_name, acronym): return redirect('meetings_select_group', meeting_id=meeting_id,schedule_name=schedule_name) formset = NewSessionFormset(request.POST,initial=initial) - extra_form = ExtraSessionForm(request.POST) - if formset.is_valid() and extra_form.is_valid(): + if formset.is_valid(): # TODO formsets don't have has_changed until Django 1.3 has_changed = False for form in formset.forms: @@ -728,28 +735,15 @@ def schedule(request, meeting_id, schedule_name, acronym): assign(session,next_slot,meeting,schedule=schedule) # --------------------------------------- - # notify. dont send if Tutorial, BOF or indicated on form - #notification_message = "No notification has been sent to anyone for this session." - #if (has_changed - # and not extra_form.cleaned_data.get('no_notify',False) - # and group.state.slug != 'bof' - # and get_timeslot(session,schedule=schedule)): # and the session is scheduled, else skip - - # send_notification(request, sessions) - # notification_message = "Notification sent." - if has_changed: - messages.success(request, 'Session(s) Scheduled for %s. %s' % (group.acronym, notification_message)) + messages.success(request, 'Session(s) Scheduled for %s.' % group.acronym ) return redirect('meetings_select_group', meeting_id=meeting_id,schedule_name=schedule_name) - else: formset = NewSessionFormset(initial=initial) - extra_form = ExtraSessionForm() return render_to_response('meetings/schedule.html', { - 'extra_form': extra_form, 'group': group, 'meeting': meeting, 'schedule': schedule, @@ -785,15 +779,15 @@ def select_group(request, meeting_id, schedule_name): if request.method == 'POST': group = request.POST.get('group',None) if group: - redirect_url = reverse('meetings_schedule', kwargs={'meeting_id':meeting_id,'acronym':group}) + redirect_url = reverse('meetings_schedule', kwargs={'meeting_id':meeting_id,'acronym':group,'schedule_name':schedule_name}) else: - redirect_url = reverse('meetings_select_group',kwargs={'meeting_id':meeting_id}) + redirect_url = reverse('meetings_select_group',kwargs={'meeting_id':meeting_id,'schedule_name':schedule_name}) messages.error(request, 'No group selected') return HttpResponseRedirect(redirect_url) # split groups into scheduled / unscheduled - scheduled_groups, unscheduled_groups = sort_groups(meeting) + scheduled_groups, unscheduled_groups = sort_groups(meeting,schedule) # prep group form wgs = filter(lambda a: a.type_id in ('wg','ag') and a.state_id=='active', unscheduled_groups) @@ -947,12 +941,12 @@ def times_delete(request, meeting_id, schedule_name, time): parts = [ int(x) for x in time.split(':') ] dtime = datetime.datetime(*parts) - qs = meeting.agenda.scheduledsession_set.filter(timeslot__time=dtime, - session__isnull=False) + # qs = meeting.agenda.scheduledsession_set.filter(timeslot__time=dtime, + # session__isnull=False) - if qs: - messages.error(request, 'ERROR deleting timeslot. There is one or more sessions scheduled for this timeslot.') - return redirect('meetings_times', meeting_id=meeting_id,schedule_name=schedule_name) + #if qs: + # messages.error(request, 'ERROR deleting timeslot. There is one or more sessions scheduled for this timeslot.') + # return redirect('meetings_times', meeting_id=meeting_id,schedule_name=schedule_name) TimeSlot.objects.filter(meeting=meeting,time=dtime).delete() diff --git a/ietf/secr/templates/meetings/notifications.html b/ietf/secr/templates/meetings/notifications.html index f7489ff90..4b4f8c6c2 100644 --- a/ietf/secr/templates/meetings/notifications.html +++ b/ietf/secr/templates/meetings/notifications.html @@ -19,7 +19,7 @@
    {% csrf_token %}

    Send email notifications to all groups that have been scheduled since the last notification went out on {{ last_notice.time|date:"Y-m-d" }}:

    -

    {% if not groups %}(none){% endif %}{% for group in groups %}{{ group.acronym }}{% if not forloop.last %},{% endif %}{% endfor %}

    +

    {% if not groups %}(none){% endif %}{% for group in groups %}{{ group.acronym }}{% if not forloop.last %},{% endif %}{% endfor %}

    diff --git a/ietf/secr/templates/meetings/rooms.html b/ietf/secr/templates/meetings/rooms.html index 5c52282a5..ef681d398 100644 --- a/ietf/secr/templates/meetings/rooms.html +++ b/ietf/secr/templates/meetings/rooms.html @@ -10,7 +10,7 @@
    {% csrf_token %} {{ formset.management_form }} {{ formset.non_form_errors }} - +
    {% for field in formset.forms.0.visible_fields %} diff --git a/ietf/secr/templates/meetings/schedule.html b/ietf/secr/templates/meetings/schedule.html index 376934dcd..1ad13c9ee 100644 --- a/ietf/secr/templates/meetings/schedule.html +++ b/ietf/secr/templates/meetings/schedule.html @@ -35,8 +35,8 @@ {% endblock %} {% block breadcrumbs %}{{ block.super }} - » Meetings - » {{ meeting }} + » Meetings + » {{ meeting.number }} » {{ schedule.name }} » Select » {{ group.acronym }} @@ -67,11 +67,6 @@ {% endfor %} -
    - - {{ extra_form }} -
    -
      • diff --git a/ietf/secr/templates/meetings/select_group.html b/ietf/secr/templates/meetings/select_group.html index cf406fa0f..8b6a8beba 100644 --- a/ietf/secr/templates/meetings/select_group.html +++ b/ietf/secr/templates/meetings/select_group.html @@ -48,7 +48,7 @@

      Scheduled Sessions

      -
        +
          {% for group in scheduled_groups %}
        • {{ group.acronym }}
          • {% endfor %} diff --git a/ietf/secr/templates/meetings/times.html b/ietf/secr/templates/meetings/times.html index 5dd85d42a..129f75aa2 100644 --- a/ietf/secr/templates/meetings/times.html +++ b/ietf/secr/templates/meetings/times.html @@ -23,7 +23,7 @@ {{ item.time|date:"H:i" }} - {{ item.end_time|date:"H:i" }} {{ item.name }} Edit - Delete + Delete {% endfor %} diff --git a/ietf/secr/templates/meetings/view.html b/ietf/secr/templates/meetings/view.html index 96ac24f9f..f1b61a907 100644 --- a/ietf/secr/templates/meetings/view.html +++ b/ietf/secr/templates/meetings/view.html @@ -36,10 +36,10 @@
          • -
        • +
        • diff --git a/static/secretariat/css/custom.css b/static/secretariat/css/custom.css index 3b1b6231c..05b9a3819 100644 --- a/static/secretariat/css/custom.css +++ b/static/secretariat/css/custom.css @@ -490,7 +490,7 @@ tr.break td { border-top: 2px solid black; } -#schedule-selector { +#id_schedule_selector { display: inline; }