[A-Za-z0-9_\-\+]+)/remove/$', 'remove_session', name='meetings_remove_session'),
+)
diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py
new file mode 100644
index 000000000..dfe14a2e3
--- /dev/null
+++ b/ietf/secr/meetings/views.py
@@ -0,0 +1,861 @@
+from django.conf import settings
+from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
+from django.core.urlresolvers import reverse
+from django.db.models import Max, Min, Q
+from django.forms.formsets import formset_factory
+from django.forms.models import inlineformset_factory, modelformset_factory
+from django.http import HttpResponseRedirect, HttpResponse
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+from django.utils.functional import curry
+from django.utils import simplejson
+
+from ietf.utils.mail import send_mail
+from ietf.meeting.models import Meeting, Session, Room, TimeSlot
+from ietf.group.models import Group
+from ietf.name.models import SessionStatusName, TimeSlotTypeName
+from ietf.person.models import Person
+from ietf.secr.meetings.blue_sheets import create_blue_sheets
+from ietf.secr.proceedings.views import build_choices, handle_upload_file
+from ietf.secr.sreq.forms import GroupSelectForm
+from ietf.secr.sreq.views import get_initial_session, session_conflicts_as_string
+from ietf.secr.utils.mail import get_cc_list
+from ietf.secr.utils.meeting import get_upload_root
+
+from forms import *
+
+import os
+import datetime
+
+# --------------------------------------------------
+# Helper Functions
+# --------------------------------------------------
+def build_timeslots(meeting,room=None):
+ '''
+ This function takes a Meeting object and an optional room argument. If room isn't passed we
+ pre-create the full set of timeslot records using the last meeting as a template.
+ If room is passed pre-create timeslots for the new room. Call this after saving new rooms
+ or adding a room.
+ '''
+ slots = meeting.timeslot_set.filter(type='session')
+ if room:
+ rooms = [room]
+ else:
+ rooms = meeting.room_set.all()
+ if not slots or room:
+ # if we are just building timeslots for a new room, the room argument was passed,
+ # then we need to use current meeting times as a template, not the last meeting times
+ if room:
+ source_meeting = meeting
+ else:
+ source_meeting = get_last_meeting(meeting)
+
+ delta = meeting.date - source_meeting.date
+ initial = []
+ timeslots = []
+ time_seen = set()
+ for t in source_meeting.timeslot_set.filter(type='session'):
+ if not t.time in time_seen:
+ time_seen.add(t.time)
+ timeslots.append(t)
+ for t in timeslots:
+ new_time = t.time + delta
+ for room in rooms:
+ TimeSlot.objects.create(type_id='session',
+ meeting=meeting,
+ name=t.name,
+ time=new_time,
+ location=room,
+ duration=t.duration)
+
+def build_nonsession(meeting):
+ '''
+ This function takes a meeting object and creates non-session records
+ for a new meeting, based on the last meeting
+ '''
+ last_meeting = get_last_meeting(meeting)
+ delta = meeting.date - last_meeting.date
+ system = Person.objects.get(name='(system)')
+ for slot in TimeSlot.objects.filter(meeting=last_meeting,type__in=('break','reg','other','plenary')):
+ new_time = slot.time + delta
+ session = None
+ # create Session object for Tutorials to hold materials
+ if slot.type.slug in ('other','plenary'):
+ session = Session(meeting=meeting,
+ name=slot.name,
+ short=slot.session.short,
+ group=slot.session.group,
+ requested_by=system,
+ status_id='sched')
+ session.save()
+
+ TimeSlot.objects.create(type=slot.type,
+ meeting=meeting,
+ session=session,
+ name=slot.name,
+ time=new_time,
+ duration=slot.duration,
+ show_location=slot.show_location)
+
+def get_last_meeting(meeting):
+ last_number = int(meeting.number) - 1
+ return Meeting.objects.get(number=last_number)
+
+def is_combined(session):
+ '''
+ Check to see if this session is using two combined timeslots
+ '''
+ if session.timeslot_set.count() > 1:
+ return True
+ else:
+ return False
+
+def make_directories(meeting):
+ '''
+ This function takes a meeting object and creates the appropriate materials directories
+ '''
+ path = get_upload_root(meeting)
+ os.umask(0)
+ if not os.path.exists(path):
+ os.makedirs(path)
+ for d in ('slides','agenda','minutes','id','rfc','bluesheets'):
+ if not os.path.exists(os.path.join(path,d)):
+ os.mkdir(os.path.join(path,d))
+
+def send_notification(request, sessions):
+ '''
+ This view generates notifications for schedule sessions
+ '''
+ session_info_template = '''{0} Session {1} ({2})
+ {3}, {4} {5}
+ Room Name: {6}
+ ---------------------------------------------
+ '''
+ group = sessions[0].group
+ to_email = sessions[0].requested_by.role_email('chair').address
+ cc_list = get_cc_list(group, request.user.get_profile())
+ 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)
+ else:
+ subject = '%s - Requested sessions have been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number)
+ template = 'meetings/session_schedule_notification.txt'
+
+ # easier to populate template from timeslot perspective. assuming one-to-one timeslot-session
+ count = 0
+ session_info = ''
+ data = [ (s,s.timeslot_set.all()[0]) for s in sessions ]
+ for s,t in data:
+ count += 1
+ session_info += session_info_template.format(group.acronym,
+ count,
+ s.requested_duration,
+ t.time.strftime('%A'),
+ t.name,
+ '%s-%s' % (t.time.strftime('%H%M'),(t.time + t.duration).strftime('%H%M')),
+ t.location)
+
+ # send email
+ context = {}
+ context['to_name'] = sessions[0].requested_by
+ context['agenda_note'] = sessions[0].agenda_note
+ context['session'] = get_initial_session(sessions)
+ context['session_info'] = session_info
+
+ send_mail(request,
+ to_email,
+ from_email,
+ subject,
+ template,
+ context,
+ cc=cc_list)
+
+def sort_groups(meeting):
+ '''
+ Similar to sreq.views.sort_groups
+ Takes a Django User object and a Meeting object
+ Returns a tuple scheduled_groups, unscheduled groups.
+ '''
+ scheduled_groups = []
+ unscheduled_groups = []
+ #sessions = Session.objects.filter(meeting=meeting,status__in=('schedw','apprw','appr','sched','notmeet','canceled'))
+ sessions = Session.objects.filter(meeting=meeting,status__in=('schedw','apprw','appr','sched','canceled'))
+ 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)
+ slots = TimeSlot.objects.filter(meeting=meeting,session__isnull=False)
+ groups_with_timeslots = [ s.session.group for s in slots ]
+ for group in sorted_groups_with_sessions:
+ if group in groups_with_timeslots:
+ scheduled_groups.append(group)
+ else:
+ unscheduled_groups.append(group)
+
+ return scheduled_groups, unscheduled_groups
+
+# -------------------------------------------------
+# AJAX Functions
+# -------------------------------------------------
+def ajax_get_times(request, meeting_id, day):
+ '''
+ Ajax function to get timeslot times for a given day.
+ returns JSON format response: [{id:start_time, value:start_time-end_time},...]
+ '''
+ # TODO strip duplicates if there are any
+ results=[]
+ room = Room.objects.filter(meeting__number=meeting_id)[0]
+ slots = TimeSlot.objects.filter(meeting__number=meeting_id,time__week_day=day,location=room).order_by('time')
+ for slot in slots:
+ d = {'id': slot.time.strftime('%H%M'), 'value': '%s-%s' % (slot.time.strftime('%H%M'), slot.end_time().strftime('%H%M'))}
+ results.append(d)
+
+ return HttpResponse(simplejson.dumps(results), mimetype='application/javascript')
+# --------------------------------------------------
+# STANDARD VIEW FUNCTIONS
+# --------------------------------------------------
+def add(request):
+ '''
+ Add a new IETF Meeting. Creates Meeting and Proceeding objects.
+
+ **Templates:**
+
+ * ``meetings/add.html``
+
+ **Template Variables:**
+
+ * proceedingform
+
+ '''
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('meetings')
+ return HttpResponseRedirect(url)
+
+ form = MeetingModelForm(request.POST)
+ if form.is_valid():
+ meeting = form.save()
+
+ #Create Physical new meeting directory and subdirectories
+ make_directories(meeting)
+
+ messages.success(request, 'The Meeting was created successfully!')
+ url = reverse('meetings')
+ return HttpResponseRedirect(url)
+ else:
+ # display initial forms
+ max_number = Meeting.objects.filter(type='ietf').aggregate(Max('number'))['number__max']
+ form = MeetingModelForm(initial={'number':int(max_number) + 1})
+
+ return render_to_response('meetings/add.html', {
+ 'form': form},
+ RequestContext(request, {}),
+ )
+
+def blue_sheet(request, meeting_id):
+ '''
+ Blue Sheet view. The user can generate blue sheets or upload scanned bluesheets
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ url = settings.SECR_BLUE_SHEET_URL
+
+ if request.method == 'POST':
+ form = UploadBlueSheetForm(request.POST,request.FILES)
+ if form.is_valid():
+ file = request.FILES['file']
+ handle_upload_file(file,file.name,meeting,'bluesheets')
+ messages.success(request, 'File Uploaded')
+ url = reverse('meetings_blue_sheet', kwargs={'meeting_id':meeting.number})
+ return HttpResponseRedirect(url)
+
+ else:
+ form = UploadBlueSheetForm()
+
+ return render_to_response('meetings/blue_sheet.html', {
+ 'meeting': meeting,
+ 'url': url,
+ 'form': form},
+ RequestContext(request, {}),
+ )
+
+def blue_sheet_generate(request, meeting_id):
+ '''
+ Generate bluesheets
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ groups = Group.objects.filter(session__meeting=meeting).order_by('acronym')
+ create_blue_sheets(meeting, groups)
+
+ messages.success(request, 'Blue Sheets generated')
+ url = reverse('meetings_blue_sheet', kwargs={'meeting_id':meeting.number})
+ return HttpResponseRedirect(url)
+
+def blue_sheet_redirect(request):
+ '''
+ This is the generic blue sheet URL. It gets the next IETF meeting and redirects
+ to the meeting specific URL.
+ '''
+ today = datetime.date.today()
+ qs = Meeting.objects.filter(date__gt=today,type='ietf').order_by('date')
+ if qs:
+ meeting = qs[0]
+ else:
+ meeting = Meeting.objects.filter(type='ietf').order_by('-date')[0]
+ url = reverse('meetings_blue_sheet', kwargs={'meeting_id':meeting.number})
+ return HttpResponseRedirect(url)
+
+def edit_meeting(request, meeting_id):
+ '''
+ Edit Meeting information.
+
+ **Templates:**
+
+ * ``meetings/meeting_edit.html``
+
+ **Template Variables:**
+
+ * meeting, form
+
+ '''
+ meeting = get_object_or_404(Meeting, number=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')
+ url = reverse('meetings_view', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ else:
+ url = reverse('meetings_view', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+ else:
+ form = MeetingModelForm(instance=meeting)
+
+ return render_to_response('meetings/edit_meeting.html', {
+ 'meeting': meeting,
+ 'form' : form, },
+ RequestContext(request,{}),
+ )
+
+def main(request):
+ '''
+ In this view the user can choose a meeting to manage or elect to create a new meeting.
+ '''
+ meetings = Meeting.objects.filter(type='ietf').order_by('-number')
+
+ if request.method == 'POST':
+ redirect_url = reverse('meetings_view', kwargs={'meeting_id':request.POST['group']})
+ return HttpResponseRedirect(redirect_url)
+
+ choices = [ (str(x.number),str(x.number)) for x in meetings ]
+ form = GroupSelectForm(choices=choices)
+
+ return render_to_response('meetings/main.html', {
+ 'form': form,
+ 'meetings': meetings},
+ RequestContext(request, {}),
+ )
+
+def non_session(request, meeting_id):
+ '''
+ Display and add "non-session" time slots, ie. registration, beverage and snack breaks
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ # if the Break/Registration records don't exist yet (new meeting) create them
+ if not TimeSlot.objects.filter(meeting=meeting,type__in=('break','reg','other')):
+ build_nonsession(meeting)
+
+ slots = TimeSlot.objects.filter(meeting=meeting,type__in=('break','reg','other','plenary')).order_by('-type__name','time')
+
+ if request.method == 'POST':
+ form = NonSessionForm(request.POST)
+ if form.is_valid():
+ day = form.cleaned_data['day']
+ time = form.cleaned_data['time']
+ name = form.cleaned_data['name']
+ short = form.cleaned_data['short']
+ type = form.cleaned_data['type']
+ group = form.cleaned_data['group']
+ duration = form.cleaned_data['duration']
+ t = meeting.date + datetime.timedelta(days=int(day))
+ new_time = datetime.datetime(t.year,t.month,t.day,time.hour,time.minute)
+
+ # create a dummy Session object to hold materials
+ # NOTE: we're setting group to none here, but the set_room page will force user
+ # to pick a legitimate group
+ session = None
+ if type.slug in ('other','plenary'):
+ session = Session(meeting=meeting,
+ name=name,
+ short=short,
+ group=group,
+ requested_by=Person.objects.get(name='(system)'),
+ status_id='sched')
+ session.save()
+
+ # create TimeSlot object
+ TimeSlot.objects.create(type=form.cleaned_data['type'],
+ meeting=meeting,
+ session=session,
+ name=name,
+ time=new_time,
+ duration=duration,
+ show_location=form.cleaned_data['show_location'])
+
+ messages.success(request, 'Non-Sessions updated successfully')
+ url = reverse('meetings_non_session', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+ else:
+ form = NonSessionForm(initial={'show_location':True})
+
+ if TimeSlot.objects.filter(meeting=meeting,type='other',location__isnull=True):
+ messages.warning(request, 'There are non-session items which do not have a room assigned')
+
+ return render_to_response('meetings/non_session.html', {
+ 'slots': slots,
+ 'form': form,
+ 'meeting': meeting},
+ RequestContext(request, {}),
+ )
+
+def non_session_delete(request, meeting_id, slot_id):
+ '''
+ This function deletes the non-session TimeSlot. For "other" and "plenary" timeslot types
+ we need to delete the corresponding Session object as well. Check for uploaded material
+ first.
+ '''
+ slot = get_object_or_404(TimeSlot, id=slot_id)
+ if slot.type_id in ('other','plenary'):
+ if slot.session.materials.exclude(states__slug='deleted'):
+ messages.error(request, 'Materials have already been uploaded for "%s". You must delete those before deleting the timeslot.' % slot.name)
+ url = reverse('meetings_non_session', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ else:
+ slot.session.delete()
+ slot.delete()
+
+ messages.success(request, 'Non-Session timeslot deleted successfully')
+ url = reverse('meetings_non_session', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+def non_session_edit(request, meeting_id, slot_id):
+ '''
+ Allows the user to assign a location to this non-session timeslot
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+ slot = get_object_or_404(TimeSlot, id=slot_id)
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('meetings_non_session', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ form = NonSessionEditForm(request.POST,meeting=meeting, session=slot.session)
+ if form.is_valid():
+ location = form.cleaned_data['location']
+ group = form.cleaned_data['group']
+ name = form.cleaned_data['name']
+ short = form.cleaned_data['short']
+ slot.location = location
+ slot.name = name
+ slot.save()
+ # save group to session object
+ session = slot.session
+ session.group = group
+ session.name = name
+ session.short = short
+ session.save()
+
+ messages.success(request, 'Location saved')
+ url = reverse('meetings_non_session', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ else:
+ # we need to pass the session to the form in order to disallow changing
+ # of group after materials have been uploaded
+ initial = {'location':slot.location,
+ 'group':slot.session.group,
+ 'name':slot.session.name,
+ 'short':slot.session.short}
+ form = NonSessionEditForm(meeting=meeting,session=slot.session,initial=initial)
+
+ return render_to_response('meetings/non_session_edit.html', {
+ 'meeting': meeting,
+ 'form': form,
+ 'slot': slot},
+ RequestContext(request, {}),
+ )
+
+def remove_session(request, meeting_id, acronym):
+ '''
+ Remove session from agenda. Disassociate session from timeslot and set status.
+ According to Wanda this option is used when people cancel, so the Session
+ request should be deleted as well.
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+ group = get_object_or_404(Group, acronym=acronym)
+ sessions = Session.objects.filter(meeting=meeting,group=group)
+ now = datetime.datetime.now()
+
+ for session in sessions:
+ timeslot = session.timeslot_set.all()[0]
+ timeslot.session = None
+ timeslot.modified = now
+ timeslot.save()
+ session.status_id = 'canceled'
+ session.modified = now
+ session.save()
+
+ messages.success(request, '%s Session removed from agenda' % (group.acronym))
+ url = reverse('meetings_select_group', kwargs={'meeting_id':meeting.number})
+ return HttpResponseRedirect(url)
+
+def rooms(request, meeting_id):
+ '''
+ Display and edit MeetingRoom records for the specified meeting
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ # if no rooms exist yet (new meeting) formset extra=10
+ first_time = not bool(meeting.room_set.all())
+ extra = 10 if first_time else 0
+ RoomFormset = inlineformset_factory(Meeting, Room, form=MeetingRoomForm, formset=BaseMeetingRoomFormSet, can_delete=True, extra=extra)
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('meetings', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ formset = RoomFormset(request.POST, instance=meeting, prefix='room')
+ if formset.is_valid():
+ formset.save()
+
+ # if we are creating rooms for the first time create full set of timeslots
+ if first_time:
+ build_timeslots(meeting)
+
+ # otherwise if we're modifying rooms
+ else:
+ # add timeslots for new rooms, deleting rooms automatically deletes timeslots
+ for form in formset.forms[formset.initial_form_count():]:
+ if form.instance.pk:
+ build_timeslots(meeting,room=form.instance)
+
+ messages.success(request, 'Meeting Rooms changed successfully')
+ url = reverse('meetings_rooms', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+ else:
+ formset = RoomFormset(instance=meeting, prefix='room')
+
+ return render_to_response('meetings/rooms.html', {
+ 'meeting': meeting,
+ 'formset': formset},
+ RequestContext(request, {}),
+ )
+
+def schedule(request, meeting_id, acronym):
+ '''
+ This view handles scheduling session requests to TimeSlots
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+ group = get_object_or_404(Group, acronym=acronym)
+ sessions = Session.objects.filter(meeting=meeting,group=group,status__in=('schedw','apprw','appr','sched','canceled'))
+ legacy_session = get_initial_session(sessions)
+ session_conflicts = session_conflicts_as_string(group, meeting)
+ now = datetime.datetime.now()
+
+ # build initial
+ initial = []
+ for s in sessions:
+ d = {'session':s.id,
+ 'note':s.agenda_note}
+ qs = s.timeslot_set.all()
+ if qs:
+ d['room'] = qs[0].location.id
+ d['day'] = qs[0].time.isoweekday() % 7 + 1 # adjust to django week_day
+ d['time'] = qs[0].time.strftime('%H%M')
+ else:
+ d['day'] = 2
+ if is_combined(s):
+ d['combine'] = True
+ initial.append(d)
+
+ # need to use curry here to pass custom variable to form init
+ NewSessionFormset = formset_factory(NewSessionForm, extra=0)
+ NewSessionFormset.form = staticmethod(curry(NewSessionForm, meeting=meeting))
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('meetings_select_group', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ formset = NewSessionFormset(request.POST,initial=initial)
+ extra_form = ExtraSessionForm(request.POST)
+
+ if formset.is_valid() and extra_form.is_valid():
+ # TODO formsets don't have has_changed until Django 1.3
+ has_changed = False
+ for form in formset.forms:
+ if form.has_changed():
+ has_changed = True
+ id = form.cleaned_data['session']
+ note = form.cleaned_data['note']
+ room = form.cleaned_data['room']
+ time = form.cleaned_data['time']
+ day = form.cleaned_data['day']
+ combine = form.cleaned_data.get('combine',None)
+ session = Session.objects.get(id=id)
+ if session.timeslot_set.all():
+ initial_timeslot = session.timeslot_set.all()[0]
+ else:
+ initial_timeslot = None
+
+ # find new timeslot
+ new_day = meeting.date + datetime.timedelta(days=int(day)-1)
+ hour = datetime.time(int(time[:2]),int(time[2:]))
+ new_time = datetime.datetime.combine(new_day,hour)
+ qs = TimeSlot.objects.filter(meeting=meeting,time=new_time,location=room)
+ if qs.filter(session=None):
+ timeslot = qs.filter(session=None)[0]
+ else:
+ # we need to create another, identical timeslot
+ timeslot = TimeSlot.objects.create(meeting=qs[0].meeting,
+ type=qs[0].type,
+ name=qs[0].name,
+ time=qs[0].time,
+ duration=qs[0].duration,
+ location=qs[0].location,
+ show_location=qs[0].show_location,
+ modified=now)
+ messages.warning(request, 'WARNING: There are now two sessions scheduled for the timeslot: %s' % timeslot)
+
+ if any(x in form.changed_data for x in ('day','time','room')):
+ # clear the old timeslot
+ if initial_timeslot:
+ # if the initial timeslot is one of multiple we should delete it
+ tqs = TimeSlot.objects.filter(meeting=meeting,
+ type='session',
+ time=initial_timeslot.time,
+ location=initial_timeslot.location)
+ if tqs.count() > 1:
+ initial_timeslot.delete()
+ else:
+ initial_timeslot.session = None
+ initial_timeslot.modified = now
+ initial_timeslot.save()
+ if timeslot:
+ timeslot.session = session
+ timeslot.modified = now
+ timeslot.save()
+ session.status_id = 'sched'
+ else:
+ session.status_id = 'schedw'
+
+ session.modified = now
+ session.save()
+
+ if 'note' in form.changed_data:
+ session.agenda_note = note
+ session.modified = now
+ session.save()
+
+ # COMBINE SECTION ----------------------
+ if 'combine' in form.changed_data:
+ next_slot = get_next_slot(timeslot)
+ if combine:
+ next_slot.session = session
+ else:
+ next_slot.session = None
+ next_slot.modified = now
+ next_slot.save()
+ # ---------------------------------------
+
+ # 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 session.timeslot_set.all()): # 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))
+
+ url = reverse('meetings_select_group', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ else:
+ formset = NewSessionFormset(initial=initial)
+ extra_form = ExtraSessionForm()
+
+ return render_to_response('meetings/schedule.html', {
+ 'extra_form': extra_form,
+ 'group': group,
+ 'meeting': meeting,
+ 'show_request': True,
+ 'session': legacy_session,
+ 'formset': formset},
+ RequestContext(request, {}),
+ )
+
+def select_group(request, meeting_id):
+ '''
+ In this view the user can select the group to schedule. Only those groups that have
+ submitted session requests appear in the dropdowns.
+
+ NOTE: BOF list includes Proposed Working Group type, per Wanda
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ if request.method == 'POST':
+ group = request.POST.get('group',None)
+ if group:
+ redirect_url = reverse('meetings_schedule', kwargs={'meeting_id':meeting_id,'acronym':group})
+ else:
+ redirect_url = reverse('meetings_select_group',kwargs={'meeting_id':meeting_id})
+ messages.error(request, 'No group selected')
+
+ return HttpResponseRedirect(redirect_url)
+
+ # split groups into scheduled / unscheduled
+ scheduled_groups, unscheduled_groups = sort_groups(meeting)
+
+ # prep group form
+ wgs = filter(lambda a: a.type_id in ('wg','ag') and a.state_id=='active', unscheduled_groups)
+ group_form = GroupSelectForm(choices=build_choices(wgs))
+
+ # prep BOFs form
+ bofs = filter(lambda a: a.type_id=='wg' and a.state_id in ('bof','proposed'), unscheduled_groups)
+ bof_form = GroupSelectForm(choices=build_choices(bofs))
+
+ # prep IRTF form
+ irtfs = filter(lambda a: a.type_id=='rg' and a.state_id in ('active','proposed'), unscheduled_groups)
+ irtf_form = GroupSelectForm(choices=build_choices(irtfs))
+
+ return render_to_response('meetings/select_group.html', {
+ 'group_form': group_form,
+ 'bof_form': bof_form,
+ 'irtf_form': irtf_form,
+ 'scheduled_groups': scheduled_groups,
+ 'meeting': meeting},
+ RequestContext(request, {}),
+ )
+
+def times(request, meeting_id):
+ '''
+ Display and edit time slots (TimeSlots). It doesn't display every TimeSlot
+ object for the meeting because there is one timeslot per time per room,
+ rather it displays all the unique times.
+ The first time this view is called for a meeting it creates a form with times
+ prepopulated from the last meeting
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ # build list of timeslots
+ slots = []
+ timeslots = []
+ time_seen = set()
+ for t in meeting.timeslot_set.filter(type='session'):
+ if not t.time in time_seen:
+ time_seen.add(t.time)
+ timeslots.append(t)
+ for t in timeslots:
+ slots.append({'name':t.name,
+ 'time':t.time,
+ 'end_time':t.end_time()})
+ times = sorted(slots, key=lambda a: a['time'])
+
+ if request.method == 'POST':
+ form = TimeSlotForm(request.POST)
+ if form.is_valid():
+ day = form.cleaned_data['day']
+ time = form.cleaned_data['time']
+ duration = form.cleaned_data['duration']
+ name = form.cleaned_data['name']
+
+ t = meeting.date + datetime.timedelta(days=int(day))
+ new_time = datetime.datetime(t.year,t.month,t.day,time.hour,time.minute)
+
+ # don't allow creation of timeslots with same start time as existing timeslots
+ # assert False, (new_time, time_seen)
+ if new_time in time_seen:
+ messages.error(request, 'There is already a timeslot for %s. To change you must delete the old one first.' % new_time.strftime('%a %H:%M'))
+ url = reverse('meetings_times', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ for room in meeting.room_set.all():
+ TimeSlot.objects.create(type_id='session',
+ meeting=meeting,
+ name=name,
+ time=new_time,
+ location=room,
+ duration=duration)
+
+ messages.success(request, 'Timeslots created')
+ url = reverse('meetings_times', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ else:
+ form = TimeSlotForm()
+
+ return render_to_response('meetings/times.html', {
+ 'form': form,
+ 'meeting': meeting,
+ 'times': times},
+ RequestContext(request, {}),
+ )
+
+def times_delete(request, meeting_id, time):
+ '''
+ This view handles bulk delete of all timeslots matching time (datetime) for the given
+ meeting. There is one timeslot for each room.
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ parts = [ int(x) for x in time.split(':') ]
+ dtime = datetime.datetime(*parts)
+
+ if Session.objects.filter(timeslot__time=dtime,timeslot__meeting=meeting):
+ messages.error(request, 'ERROR deleting timeslot. There is one or more sessions scheduled for this timeslot.')
+ url = reverse('meetings_times', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+ TimeSlot.objects.filter(meeting=meeting,time=dtime).delete()
+
+ messages.success(request, 'Timeslot deleted')
+ url = reverse('meetings_times', kwargs={'meeting_id':meeting_id})
+ return HttpResponseRedirect(url)
+
+def view(request, meeting_id):
+ '''
+ View Meeting information.
+
+ **Templates:**
+
+ * ``meetings/view.html``
+
+ **Template Variables:**
+
+ * meeting , proceeding
+
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_id)
+
+ return render_to_response('meetings/view.html', {
+ 'meeting': meeting},
+ RequestContext(request, {}),
+ )
diff --git a/ietf/secr/middleware/__init__.py b/ietf/secr/middleware/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/middleware/secauth.py b/ietf/secr/middleware/secauth.py
new file mode 100644
index 000000000..327080284
--- /dev/null
+++ b/ietf/secr/middleware/secauth.py
@@ -0,0 +1,58 @@
+from django.conf import settings
+from django.http import HttpResponseForbidden
+from django.shortcuts import render_to_response
+
+from ietf.ietfauth.decorators import has_role
+
+import re
+
+class SecAuthMiddleware(object):
+ """
+ Middleware component that performs custom auth check for every
+ request except those excluded by SECR_AUTH_UNRESTRICTED_URLS.
+
+ Since authentication is performed externally at the apache level
+ REMOTE_USER should contain the name of the authenticated
+ user. If the user is a secretariat than access is granted.
+ Otherwise return a 401 error page.
+
+ To use, add the class to MIDDLEWARE_CLASSES and define
+ SECR_AUTH_UNRESTRICTED_URLS in your settings.py.
+
+ The following example allows access to anything under "/interim/"
+ to non-secretariat users:
+
+ SECR_AUTH_UNRESTRICTED_URLS = (
+ (r'^/interim/'),
+
+ Also sets custom request attributes:
+ user_is_secretariat
+ user_is_chair
+ user_is_ad
+ )
+
+ """
+
+ def __init__(self):
+ self.unrestricted = [re.compile(pattern) for pattern in
+ settings.SECR_AUTH_UNRESTRICTED_URLS]
+
+ def process_view(self, request, view_func, view_args, view_kwargs):
+ # need to initialize user, it doesn't get set when running tests for example
+
+ if request.path.startswith('/secr/'):
+ user = ''
+ request.user_is_secretariat = False
+
+ if request.user.is_anonymous():
+ return render_to_response('401.html', {'user':user})
+
+ if 'REMOTE_USER' in request.META:
+ # do custom auth
+ if has_role(request.user,'Secretariat'):
+ request.user_is_secretariat = True
+
+ return None
+
+ return None
+
diff --git a/ietf/secr/proceedings/__init__.py b/ietf/secr/proceedings/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/proceedings/forms.py b/ietf/secr/proceedings/forms.py
new file mode 100644
index 000000000..385e6df66
--- /dev/null
+++ b/ietf/secr/proceedings/forms.py
@@ -0,0 +1,104 @@
+from django import forms
+from django.conf import settings
+from django.db.models import Max
+from django.template.defaultfilters import filesizeformat
+
+from ietf.doc.models import Document
+from ietf.name.models import DocTypeName
+from ietf.meeting.models import Meeting
+
+import os
+import re
+# ---------------------------------------------
+# Globals
+# ---------------------------------------------
+
+VALID_SLIDE_EXTENSIONS = ('.doc','.docx','.pdf','.ppt','.pptx','.txt')
+VALID_MINUTES_EXTENSIONS = ('.txt','.html','.htm','.pdf')
+VALID_AGENDA_EXTENSIONS = ('.txt','.html','.htm')
+
+#----------------------------------------------------------
+# Forms
+#----------------------------------------------------------
+
+class EditSlideForm(forms.ModelForm):
+ class Meta:
+ model = Document
+ fields = ('title',)
+
+class InterimMeetingForm(forms.Form):
+ date = forms.DateField(help_text="(YYYY-MM-DD Format, please)")
+ group_acronym_id = forms.CharField(widget=forms.HiddenInput())
+
+ def clean(self):
+ super(InterimMeetingForm, self).clean()
+ cleaned_data = self.cleaned_data
+ # need to use get() here, if the date field isn't valid it won't exist
+ date = cleaned_data.get('date','')
+ group_acronym_id = cleaned_data["group_acronym_id"]
+ qs = Meeting.objects.filter(type='interim',date=date,session__group__acronym=group_acronym_id)
+ if qs:
+ raise forms.ValidationError('A meeting already exists for this date.')
+ return cleaned_data
+
+class ReplaceSlideForm(forms.ModelForm):
+ file = forms.FileField(label='Select File')
+
+ class Meta:
+ model = Document
+ fields = ('title',)
+
+ def clean_file(self):
+ file = self.cleaned_data.get('file')
+ ext = os.path.splitext(file.name)[1].lower()
+ if ext not in VALID_SLIDE_EXTENSIONS:
+ raise forms.ValidationError('Only these file types supported for presentation slides: %s' % ','.join(VALID_SLIDE_EXTENSIONS))
+ if file._size > settings.SECR_MAX_UPLOAD_SIZE:
+ raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file._size)))
+ return file
+
+class UnifiedUploadForm(forms.Form):
+ acronym = forms.CharField(widget=forms.HiddenInput())
+ meeting_id = forms.CharField(widget=forms.HiddenInput())
+ material_type = forms.ModelChoiceField(queryset=DocTypeName.objects.filter(name__in=('minutes','agenda','slides')),empty_label=None)
+ slide_name = forms.CharField(label='Name of Presentation',max_length=255,required=False,help_text="For presentations only")
+ file = forms.FileField(label='Select File',help_text='Note 1: You can only upload a presentation file in txt, pdf, doc, or ppt/pptx. System will not accept presentation files in any other format.
')
+
+ def clean_file(self):
+ file = self.cleaned_data['file']
+ if file._size > settings.SECR_MAX_UPLOAD_SIZE:
+ raise forms.ValidationError('Please keep filesize under %s. Current filesize %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file._size)))
+ return file
+
+ def clean(self):
+ super(UnifiedUploadForm, self).clean()
+ # if an invalid file type is supplied no file attribute will exist
+ if self.errors:
+ return self.cleaned_data
+ cleaned_data = self.cleaned_data
+ material_type = cleaned_data['material_type']
+ slide_name = cleaned_data['slide_name']
+ file = cleaned_data['file']
+ ext = os.path.splitext(file.name)[1].lower()
+
+ if material_type.slug == 'slides' and not slide_name:
+ raise forms.ValidationError('ERROR: Name of Presentaion cannot be blank')
+
+ # only supporting PDFs per Alexa 04-05-2011
+ #if material_type == 1 and not file_ext[1] == '.pdf':
+ # raise forms.ValidationError('Presentations must be a PDF file')
+
+ # validate file extensions based on material type (presentation,agenda,minutes)
+ # valid extensions per online documentation: meeting-materials.html
+ # 09-14-11 added ppt, pdf per Alexa
+ # 04-19-12 txt/html for agenda, +pdf for minutes per Russ
+ if material_type.slug == 'slides' and ext not in VALID_SLIDE_EXTENSIONS:
+ raise forms.ValidationError('Only these file types supported for presentation slides: %s' % ','.join(VALID_SLIDE_EXTENSIONS))
+ if material_type.slug == 'agenda' and ext not in VALID_AGENDA_EXTENSIONS:
+ raise forms.ValidationError('Only these file types supported for agendas: %s' % ','.join(VALID_AGENDA_EXTENSIONS))
+ if material_type.slug == 'minutes' and ext not in VALID_MINUTES_EXTENSIONS:
+ raise forms.ValidationError('Only these file types supported for minutes: %s' % ','.join(VALID_MINUTES_EXTENSIONS))
+
+ return cleaned_data
+
+
\ No newline at end of file
diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py
new file mode 100644
index 000000000..38e455881
--- /dev/null
+++ b/ietf/secr/proceedings/models.py
@@ -0,0 +1,73 @@
+from django.conf import settings
+from django.db import models
+from django.shortcuts import get_object_or_404
+
+from ietf.meeting.models import Meeting
+from ietf.secr.utils.meeting import get_upload_root
+
+import datetime
+import os
+
+class InterimManager(models.Manager):
+ '''A custom manager to limit objects to type=interim'''
+ def get_query_set(self):
+ return super(InterimManager, self).get_query_set().filter(type='interim')
+
+class InterimMeeting(Meeting):
+ '''
+ This class is a proxy of Meeting. It's purpose is to provide extra methods that are
+ useful for an interim meeting, to help in templates. Most information is derived from
+ the session associated with this meeting. We are assuming there is only one.
+ '''
+ class Meta:
+ proxy = True
+
+ objects = InterimManager()
+
+ def group(self):
+ return self.session_set.all()[0].group
+
+ def agenda(self):
+ session = self.session_set.all()[0]
+ agendas = session.materials.exclude(states__slug='deleted').filter(type='agenda')
+ if agendas:
+ return agendas[0]
+ else:
+ return None
+
+ def minutes(self):
+ session = self.session_set.all()[0]
+ minutes = session.materials.exclude(states__slug='deleted').filter(type='minutes')
+ if minutes:
+ return minutes[0]
+ else:
+ return None
+
+ def get_proceedings_path(self, group=None):
+ path = os.path.join(get_upload_root(self),'proceedings.html')
+ return path
+
+ def get_proceedings_url(self, group=None):
+ '''
+ If the proceedings file doesn't exist return empty string. For use in templates.
+ '''
+ if os.path.exists(self.get_proceedings_path()):
+ url = "%s/proceedings/interim/%s/%s/proceedings.html" % (
+ settings.MEDIA_URL,
+ self.date.strftime('%Y/%m/%d'),
+ self.group().acronym)
+ return url
+ else:
+ return ''
+
+class Registration(models.Model):
+ rsn = models.AutoField(primary_key=True)
+ fname = models.CharField(max_length=255)
+ lname = models.CharField(max_length=255)
+ company = models.CharField(max_length=255)
+ country = models.CharField(max_length=2)
+
+ def __unicode__(self):
+ return "%s %s" % (fname, lname)
+ class Meta:
+ db_table = 'registrations'
\ No newline at end of file
diff --git a/ietf/secr/proceedings/new_tables.sql b/ietf/secr/proceedings/new_tables.sql
new file mode 100644
index 000000000..43d590f3d
--- /dev/null
+++ b/ietf/secr/proceedings/new_tables.sql
@@ -0,0 +1,50 @@
+CREATE TABLE `interim_slides` (
+ `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ `meeting_num` integer NOT NULL,
+ `group_acronym_id` integer,
+ `slide_num` integer,
+ `slide_type_id` integer NOT NULL,
+ `slide_name` varchar(255) NOT NULL,
+ `irtf` integer NOT NULL,
+ `interim` bool NOT NULL,
+ `order_num` integer,
+ `in_q` integer
+)
+;
+CREATE TABLE `interim_minutes` (
+ `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ `meeting_num` integer NOT NULL,
+ `group_acronym_id` integer NOT NULL,
+ `filename` varchar(255) NOT NULL,
+ `irtf` integer NOT NULL,
+ `interim` bool NOT NULL
+)
+;
+CREATE TABLE `interim_agenda` (
+ `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ `meeting_num` integer NOT NULL,
+ `group_acronym_id` integer NOT NULL,
+ `filename` varchar(255) NOT NULL,
+ `irtf` integer NOT NULL,
+ `interim` bool NOT NULL
+)
+;
+CREATE TABLE `interim_meetings` (
+ `meeting_num` integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ `start_date` date ,
+ `end_date` date ,
+ `city` varchar(255) ,
+ `state` varchar(255) ,
+ `country` varchar(255) ,
+ `time_zone` integer,
+ `ack` longtext ,
+ `agenda_html` longtext ,
+ `agenda_text` longtext ,
+ `future_meeting` longtext ,
+ `overview1` longtext ,
+ `overview2` longtext ,
+ `group_acronym_id` integer
+)
+;
+alter table interim_meetings auto_increment=201;
+
diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py
new file mode 100644
index 000000000..191fe0bce
--- /dev/null
+++ b/ietf/secr/proceedings/proc_utils.py
@@ -0,0 +1,543 @@
+'''
+proc_utils.py
+
+This module contains all the functions for generating static proceedings pages
+'''
+from django.conf import settings
+from django.shortcuts import render_to_response
+from ietf.group.models import Group, Role
+from ietf.group.utils import get_charter_text
+from ietf.meeting.models import Session, TimeSlot, Meeting
+from ietf.meeting.views import agenda_info
+from ietf.doc.models import Document, RelatedDocument, DocEvent
+from itertools import chain
+from ietf.secr.proceedings.models import Registration
+from ietf.secr.utils.document import get_rfc_num
+from ietf.secr.utils.group import groups_by_session
+from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material
+from models import InterimMeeting # proxy model
+
+from urllib2 import urlopen
+import datetime
+import glob
+import os
+import shutil
+import stat
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+def mycomp(timeslot):
+ '''
+ This takes a timeslot object and returns a key to sort by the area acronym or None
+ '''
+ try:
+ group = timeslot.session.group
+ key = '%s:%s' % (group.parent.acronym, group.acronym)
+ except AttributeError:
+ key = None
+ return key
+
+def get_progress_stats(sdate,edate):
+ '''
+ This function takes a date range and produces a dictionary of statistics / objects for use
+ in a progress report.
+ '''
+ data = {}
+ data['sdate'] = sdate
+ data['edate'] = edate
+
+ # Activty Report Section
+ new_docs = Document.objects.filter(type='draft').filter(docevent__type='new_revision',
+ docevent__newrevisiondocevent__rev='00',
+ docevent__time__gte=sdate,
+ docevent__time__lte=edate)
+ data['new'] = new_docs.count()
+ data['updated'] = 0
+ data['updated_more'] = 0
+ for d in new_docs:
+ updates = d.docevent_set.filter(type='new_revision',time__gte=sdate,time__lte=edate).count()
+ if updates > 1:
+ data['updated'] += 1
+ if updates > 2:
+ data['updated_more'] +=1
+
+ # calculate total documents updated, not counting new, rev=00
+ result = set()
+ events = DocEvent.objects.filter(doc__type='draft',time__gte=sdate,time__lte=edate)
+ for e in events.filter(type='new_revision').exclude(newrevisiondocevent__rev='00'):
+ result.add(e.doc)
+ data['total_updated'] = len(result)
+
+ # calculate sent last call
+ data['last_call'] = events.filter(type='sent_last_call').count()
+
+ # calculate approved
+ data['approved'] = events.filter(type='iesg_approved').count()
+
+ # get 4 weeks
+ monday = Meeting.get_ietf_monday()
+ cutoff = monday + datetime.timedelta(days=3)
+ ff1_date = cutoff - datetime.timedelta(days=28)
+ ff2_date = cutoff - datetime.timedelta(days=21)
+ ff3_date = cutoff - datetime.timedelta(days=14)
+ ff4_date = cutoff - datetime.timedelta(days=7)
+
+ ff_docs = Document.objects.filter(type='draft').filter(docevent__type='new_revision',
+ docevent__newrevisiondocevent__rev='00',
+ docevent__time__gte=ff1_date,
+ docevent__time__lte=cutoff)
+ ff_new_count = ff_docs.count()
+ ff_new_percent = format(ff_new_count / float(data['new']),'.0%')
+
+ # calculate total documents updated in final four weeks, not counting new, rev=00
+ result = set()
+ events = DocEvent.objects.filter(doc__type='draft',time__gte=ff1_date,time__lte=cutoff)
+ for e in events.filter(type='new_revision').exclude(newrevisiondocevent__rev='00'):
+ result.add(e.doc)
+ ff_update_count = len(result)
+ ff_update_percent = format(ff_update_count / float(data['total_updated']),'.0%')
+
+ data['ff_new_count'] = ff_new_count
+ data['ff_new_percent'] = ff_new_percent
+ data['ff_update_count'] = ff_update_count
+ data['ff_update_percent'] = ff_update_percent
+
+ # Progress Report Section
+ data['docevents'] = DocEvent.objects.filter(doc__type='draft',time__gte=sdate,time__lte=edate)
+ data['action_events'] = data['docevents'].filter(type='iesg_approved')
+ data['lc_events'] = data['docevents'].filter(type='sent_last_call')
+
+ data['new_groups'] = Group.objects.filter(type='wg',
+ groupevent__changestategroupevent__state='active',
+ groupevent__time__gte=sdate,
+ groupevent__time__lte=edate)
+
+ data['concluded_groups'] = Group.objects.filter(type='wg',
+ groupevent__changestategroupevent__state='conclude',
+ groupevent__time__gte=sdate,
+ groupevent__time__lte=edate)
+
+ data['new_docs'] = Document.objects.filter(type='draft').filter(docevent__type='new_revision',
+ docevent__time__gte=sdate,
+ docevent__time__lte=edate).distinct()
+
+ data['rfcs'] = DocEvent.objects.filter(type='published_rfc',
+ doc__type='draft',
+ time__gte=sdate,
+ time__lte=edate)
+
+ # attach the ftp URL for use in the template
+ for event in data['rfcs']:
+ num = get_rfc_num(event.doc)
+ event.ftp_url = 'ftp://ftp.ietf.org/rfc/rfc%s.txt' % num
+
+ data['counts'] = {'std':data['rfcs'].filter(doc__intended_std_level__in=('ps','ds','std')).count(),
+ 'bcp':data['rfcs'].filter(doc__intended_std_level='bcp').count(),
+ 'exp':data['rfcs'].filter(doc__intended_std_level='exp').count(),
+ 'inf':data['rfcs'].filter(doc__intended_std_level='inf').count()}
+
+ return data
+
+def write_html(path,content):
+ f = open(path,'w')
+ f.write(content)
+ f.close()
+ try:
+ os.chmod(path, 0664)
+ except OSError:
+ pass
+# -------------------------------------------------
+# End Helper Functions
+# -------------------------------------------------
+
+def create_interim_directory():
+ '''
+ Create static Interim Meeting directory pages that will live in a different URL space than
+ the secretariat Django project
+ '''
+
+ # produce date sorted output
+ page = 'proceedings.html'
+ meetings = InterimMeeting.objects.order_by('-date')
+ response = render_to_response('proceedings/interim_directory.html',{'meetings': meetings})
+ path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
+ f = open(path,'w')
+ f.write(response.content)
+ f.close()
+
+ # produce group sorted output
+ page = 'proceedings-bygroup.html'
+ qs = InterimMeeting.objects.all()
+ meetings = sorted(qs, key=lambda a: a.group().acronym)
+ response = render_to_response('proceedings/interim_directory.html',{'meetings': meetings})
+ path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
+ f = open(path,'w')
+ f.write(response.content)
+ f.close()
+
+def create_proceedings(meeting, group, is_final=False):
+ '''
+ This function creates the proceedings html document. It gets called anytime there is an
+ update to the meeting or the slides for the meeting.
+ NOTE: execution is aborted if the meeting is older than 79 because the format changed.
+ '''
+ # abort, proceedings from meetings before 79 have a different format, don't overwrite
+ if meeting.type_id == 'ietf' and int(meeting.number) < 79:
+ return
+
+ sessions = Session.objects.filter(meeting=meeting,group=group)
+ if sessions:
+ session = sessions[0]
+ agenda,minutes,slides = get_material(session)
+ else:
+ agenda = None
+ minutes = None
+ slides = None
+
+ chairs = group.role_set.filter(name='chair')
+ secretaries = group.role_set.filter(name='secr')
+ if group.parent: # Certain groups like Tools Team do no have a parent
+ ads = group.parent.role_set.filter(name='ad')
+ else:
+ ads = None
+ tas = group.role_set.filter(name='techadv')
+
+ docs = Document.objects.filter(group=group,type='draft').order_by('time')
+
+ meeting_root = get_upload_root(meeting)
+ if meeting.type.slug == 'ietf':
+ url_root = "%s/proceedings/%s/" % (settings.MEDIA_URL,meeting.number)
+ else:
+ url_root = "%s/proceedings/interim/%s/%s/" % (
+ settings.MEDIA_URL,
+ meeting.date.strftime('%Y/%m/%d'),
+ group.acronym)
+
+ # Only do these tasks if we are running official proceedings generation,
+ # otherwise skip them for expediency. This procedure is called any time meeting
+ # materials are uploaded/deleted, and we don't want to do all this work each time.
+
+ if is_final:
+ # ----------------------------------------------------------------------
+ # Find active Drafts and RFCs, copy them to id and rfc directories
+
+ drafts = docs.filter(states__slug='active')
+ for draft in drafts:
+ source = os.path.join(draft.get_file_path(),draft.filename_with_rev())
+ target = os.path.join(meeting_root,'id')
+ if not os.path.exists(target):
+ os.makedirs(target)
+ if os.path.exists(source):
+ shutil.copy(source,target)
+ draft.bytes = os.path.getsize(source)
+ else:
+ draft.bytes = 0
+ draft.url = url_root + "id/%s" % draft.filename_with_rev()
+
+ rfcs = docs.filter(states__slug='rfc')
+ for rfc in rfcs:
+ # TODO should use get_file_path() here but is incorrect for rfcs
+ rfc_num = get_rfc_num(rfc)
+ filename = "rfc%s.txt" % rfc_num
+ alias = rfc.docalias_set.filter(name='rfc%s' % rfc_num)
+ source = os.path.join(settings.RFC_PATH,filename)
+ target = os.path.join(meeting_root,'rfc')
+ rfc.rmsg = ''
+ rfc.msg = ''
+
+ if not os.path.exists(target):
+ os.makedirs(target)
+ shutil.copy(source,target)
+ rfc.url = url_root + "rfc/%s" % filename
+ rfc.bytes = os.path.getsize(source)
+ rfc.num = "RFC %s" % rfc_num
+ # check related documents
+ # check obsoletes
+ related = rfc.relateddocument_set.all()
+ for item in related.filter(relationship='obs'):
+ rfc.msg += 'obsoletes %s ' % item.target.name
+ #rfc.msg += ' '.join(item.__str__().split()[1:])
+ updates_list = [x.target.name.upper() for x in related.filter(relationship='updates')]
+ if updates_list:
+ rfc.msg += 'updates ' + ','.join(updates_list)
+ # check reverse related
+ rdocs = RelatedDocument.objects.filter(target=alias)
+ for item in rdocs.filter(relationship='obs'):
+ rfc.rmsg += 'obsoleted by RFC %s ' % get_rfc_num(item.source)
+ updated_list = ['RFC %s' % get_rfc_num(x.source) for x in rdocs.filter(relationship='updates')]
+ if updated_list:
+ rfc.msg += 'updated by ' + ','.join(updated_list)
+ # ----------------------------------------------------------------------
+ # check for blue sheets
+ pattern = os.path.join(meeting_root,'bluesheets','bluesheets-%s-%s-*' % (meeting.number,group.acronym.lower()))
+ files = glob.glob(pattern)
+ bluesheets = []
+ for name in files:
+ basename = os.path.basename(name)
+ obj = {'name': basename,
+ 'url': url_root + "bluesheets/" + basename}
+ bluesheets.append(obj)
+ bluesheets = sorted(bluesheets, key = lambda x: x['name'])
+ # ----------------------------------------------------------------------
+ else:
+ drafts = rfcs = bluesheets = None
+
+ # the simplest way to display the charter is to place it in a block
+ # however, because this forces a fixed-width font, different than the rest of
+ # the document we modify the charter by adding replacing linefeeds with \d{1,3})/$', 'ajax_generate_proceedings', name='proceedings_ajax_generate_proceedings'),
+ url(r'^ajax/order-slide/$', 'ajax_order_slide', name='proceedings_ajax_order_slide'),
+ # special offline URL for testing proceedings build
+ url(r'^build/(?P\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/$',
+ 'build', name='proceedings_build'),
+ url(r'^delete/(?P[A-Za-z0-9._\-\+]+)/$', 'delete_material', name='proceedings_delete_material'),
+ url(r'^edit-slide/(?P[A-Za-z0-9._\-\+]+)/$', 'edit_slide', name='proceedings_edit_slide'),
+ url(r'^move-slide/(?P[A-Za-z0-9._\-\+]+)/(?P(up|down))/$',
+ 'move_slide', name='proceedings_move_slide'),
+ url(r'^process-pdfs/(?P\d{1,3})/$', 'process_pdfs', name='proceedings_process_pdfs'),
+ url(r'^progress-report/(?P\d{1,3})/$', 'progress_report', name='proceedings_progress_report'),
+ url(r'^replace-slide/(?P[A-Za-z0-9._\-\+]+)/$', 'replace_slide', name='proceedings_replace_slide'),
+ url(r'^(?P\d{1,3})/$', 'select', name='proceedings_select'),
+ # NOTE: we have two entries here which both map to upload_unified, passing session_id or acronym
+ url(r'^(?P\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P\d{1,6})/$',
+ 'upload_unified', name='proceedings_upload_unified'),
+ url(r'^(?P\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P[A-Za-z0-9_\-\+]+)/$',
+ 'upload_unified', name='proceedings_upload_unified'),
+ # interim stuff
+ url(r'^interim/$', 'select_interim', name='proceedings_select_interim'),
+ url(r'^interim/(?Pinterim-\d{4}-[A-Za-z0-9_\-\+]+)/delete/$', 'delete_interim_meeting',
+ name='proceedings_delete_interim_meeting'),
+ url(r'^interim/(?P[A-Za-z0-9_\-\+]+)/$', 'interim', name='proceedings_interim'),
+ #url(r'^interim/directory/$', 'interim_directory', name='proceedings_interim_directory'),
+ #url(r'^interim/directory/(?P(group|date))/$', 'interim_directory',
+ # name='proceedings_interim_directory_sort'),
+)
diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py
new file mode 100644
index 000000000..de172c99c
--- /dev/null
+++ b/ietf/secr/proceedings/views.py
@@ -0,0 +1,915 @@
+from django.conf import settings
+from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
+from django.core.urlresolvers import reverse
+from django.db.models import Max
+from django.forms.formsets import formset_factory
+from django.forms.models import inlineformset_factory, modelformset_factory
+from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+from django.template import Context
+from django.template.defaultfilters import slugify
+from django.template.loader import get_template
+from django.utils import simplejson
+from django.db.models import Max,Count,get_model
+
+from ietf.secr.lib import jsonapi
+from ietf.secr.proceedings.proc_utils import *
+from ietf.secr.sreq.forms import GroupSelectForm
+from ietf.secr.utils.decorators import check_permissions, sec_only
+from ietf.secr.utils.document import get_rfc_num, get_full_path
+from ietf.secr.utils.group import get_my_groups, groups_by_session
+from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material
+
+from ietf.doc.models import Document, DocAlias, DocEvent, State, NewRevisionDocEvent, RelatedDocument
+from ietf.group.models import Group
+from ietf.group.proxy import IETFWG
+from ietf.group.utils import get_charter_text
+from ietf.ietfauth.decorators import has_role
+from ietf.meeting.models import Meeting, Session, TimeSlot
+from ietf.name.models import MeetingTypeName, SessionStatusName
+from ietf.person.models import Person
+
+from forms import *
+from models import InterimMeeting # proxy model
+
+import datetime
+import glob
+import itertools
+import os
+import re
+import shutil
+import zipfile
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+
+def build_choices(queryset):
+ '''
+ This function takes a queryset (or list) of Groups and builds a list of tuples for use
+ as choices in a select widget. Using acronym for both value and label.
+ '''
+ choices = [ (g.acronym,g.acronym) for g in queryset ]
+ return sorted(choices, key=lambda choices: choices[1])
+
+def find_index(slide_id, qs):
+ '''
+ This function looks up a slide in a queryset of slides,
+ returning the index.
+ '''
+ for i in range(0,qs.count()):
+ if str(qs[i].pk) == slide_id:
+ return i
+
+def get_doc_filename(doc):
+ '''
+ This function takes a Document of type slides,minute or agenda and returns
+ the full path to the file on disk. During migration of the system the
+ filename was saved in external_url, new files will also use this convention.
+ '''
+ session = doc.session_set.all()[0]
+ meeting = session.meeting
+ if doc.external_url:
+ return os.path.join(get_upload_root(meeting),doc.type.slug,doc.external_url)
+ else:
+ path = os.path.join(get_upload_root(meeting),doc.type.slug,doc.name)
+ files = glob.glob(path + '.*')
+ # TODO we might want to choose from among multiple files using some logic
+ return files[0]
+
+def get_next_interim_num(acronym,date):
+ '''
+ This function takes a group acronym and date object and returns the next number to use for an
+ interim meeting. The format is interim-[year]-[acronym]-[1-9]
+ '''
+ base = 'interim-%s-%s-' % (date.year, acronym)
+ # can't use count() to calculate the next number in case one was deleted
+ meetings = list(Meeting.objects.filter(type='interim',number__startswith=base).order_by('number'))
+ if meetings:
+ parts = meetings[-1].number.split('-')
+ return base + str(int(parts[-1]) + 1)
+ else:
+ return base + '1'
+
+def get_next_slide_num(session):
+ '''
+ This function takes a session object and returns the
+ next slide number to use for a newly added slide as a string.
+ '''
+
+ """
+ slides = session.materials.filter(type='slides').order_by('-name')
+ if slides:
+ # we need this special case for non wg/rg sessions because the name format is different
+ # it should be changed to match the rest
+ if session.group.type.slug not in ('wg','rg'):
+ nums = [ s.name.split('-')[3] for s in slides ]
+ else:
+ nums = [ s.name.split('-')[-1] for s in slides ]
+ """
+ if session.meeting.type_id == 'ietf':
+ pattern = 'slides-%s-%s' % (session.meeting.number,session.group.acronym)
+ elif session.meeting.type_id == 'interim':
+ pattern = 'slides-%s' % (session.meeting.number)
+ slides = Document.objects.filter(type='slides',name__startswith=pattern)
+ if slides:
+ nums = [ s.name.split('-')[-1] for s in slides ]
+ nums.sort(key=int)
+ return str(int(nums[-1]) + 1)
+ else:
+ return '0'
+
+def get_next_order_num(session):
+ '''
+ This function takes a session object and returns the
+ next slide order number to use for a newly added slide as an integer.
+ '''
+ max_order = session.materials.aggregate(Max('order'))['order__max']
+
+ return max_order + 1 if max_order else 1
+
+# --- These could be properties/methods on meeting
+def get_proceedings_path(meeting,group):
+ if meeting.type_id == 'ietf':
+ path = os.path.join(get_upload_root(meeting),group.acronym + '.html')
+ elif meeting.type_id == 'interim':
+ path = os.path.join(get_upload_root(meeting),'proceedings.html')
+ return path
+
+def get_proceedings_url(meeting,group=None):
+ if meeting.type_id == 'ietf':
+ url = "%s/proceedings/%s/" % (settings.MEDIA_URL,meeting.number)
+ if group:
+ url = url + "%s.html" % group.acronym
+
+ elif meeting.type_id == 'interim':
+ url = "%s/proceedings/interim/%s/%s/proceedings.html" % (
+ settings.MEDIA_URL,
+ meeting.date.strftime('%Y/%m/%d'),
+ group.acronym)
+ return url
+
+def handle_upload_file(file,filename,meeting,subdir):
+ '''
+ This function takes a file object, a filename and a meeting object and subdir as string.
+ It saves the file to the appropriate directory, get_upload_root() + subdir.
+ If the file is a zip file, it creates a new directory in 'slides', which is the basename of the
+ zip file and unzips the file in the new directory.
+ '''
+ base, extension = os.path.splitext(filename)
+
+ if extension == '.zip':
+ path = os.path.join(get_upload_root(meeting),subdir,base)
+ if not os.path.exists(path):
+ os.mkdir(path)
+ else:
+ path = os.path.join(get_upload_root(meeting),subdir)
+
+ # agendas and minutes can only have one file instance so delete file if it already exists
+ if subdir in ('agenda','minutes'):
+ old_files = glob.glob(os.path.join(path,base) + '.*')
+ for f in old_files:
+ os.remove(f)
+
+ destination = open(os.path.join(path,filename), 'wb+')
+ for chunk in file.chunks():
+ destination.write(chunk)
+ destination.close()
+
+ # unzip zipfile
+ if extension == '.zip':
+ os.chdir(path)
+ os.system('unzip %s' % filename)
+
+def make_directories(meeting):
+ '''
+ This function takes a meeting object and creates the appropriate materials directories
+ '''
+ path = get_upload_root(meeting)
+ os.umask(0)
+ for leaf in ('slides','agenda','minutes','id','rfc'):
+ target = os.path.join(path,leaf)
+ if not os.path.exists(target):
+ os.makedirs(target)
+
+def parsedate(d):
+ '''
+ This function takes a date object and returns a tuple of year,month,day
+ '''
+ return (d.strftime('%Y'),d.strftime('%m'),d.strftime('%d'))
+
+# -------------------------------------------------
+# AJAX Functions
+# -------------------------------------------------
+@sec_only
+def ajax_generate_proceedings(request, meeting_num):
+ '''
+ Ajax function which takes a meeting number and generates the proceedings
+ pages for the meeting. It returns a snippet of HTML that gets placed in the
+ Secretariat Only section of the select page.
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_num)
+ areas = Group.objects.filter(type='area',state='active').order_by('name')
+ others = TimeSlot.objects.filter(meeting=meeting,type='other').order_by('time')
+ context = {'meeting':meeting,
+ 'areas':areas,
+ 'others':others}
+ proceedings_url = get_proceedings_url(meeting)
+
+ # the acknowledgement page can be edited manually so only produce if it doesn't already exist
+ path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'acknowledgement.html')
+ if not os.path.exists(path):
+ gen_acknowledgement(context)
+ gen_overview(context)
+ gen_progress(context)
+ gen_agenda(context)
+ gen_attendees(context)
+ gen_index(context)
+ gen_areas(context)
+ gen_plenaries(context)
+ gen_training(context)
+ gen_irtf(context)
+ gen_research(context)
+ gen_group_pages(context)
+
+ # get the time proceedings were generated
+ path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html')
+ last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path))
+
+ return render_to_response('includes/proceedings_functions.html',{
+ 'meeting':meeting,
+ 'last_run':last_run,
+ 'proceedings_url':proceedings_url},
+ RequestContext(request,{}),
+ )
+
+@jsonapi
+def ajax_order_slide(request):
+ '''
+ Ajax function to change the order of presentation slides.
+ This function expects a POST request with the following parameters
+ order: new order of slide, 0 based
+ slide_name: slide primary key (name)
+ '''
+ if request.method != 'POST' or not request.POST:
+ return { 'success' : False, 'error' : 'No data submitted or not POST' }
+ slide_name = request.POST.get('slide_name',None)
+ order = request.POST.get('order',None)
+ slide = get_object_or_404(Document, name=slide_name)
+
+ # get all the slides for this session
+ session = slide.session_set.all()[0]
+ meeting = session.meeting
+ group = session.group
+ qs = session.materials.exclude(states__slug='deleted').filter(type='slides').order_by('order')
+
+ # move slide and reorder list
+ slides = list(qs)
+ index = slides.index(slide)
+ slides.pop(index)
+ slides.insert(int(order),slide)
+ for ord,item in enumerate(slides,start=1):
+ if item.order != ord:
+ item.order = ord
+ item.save()
+
+ return {'success':True,'order':order,'slide':slide_name}
+
+# --------------------------------------------------
+# STANDARD VIEW FUNCTIONS
+# --------------------------------------------------
+@sec_only
+def build(request,meeting_num,acronym):
+ '''
+ This is a utility or test view. It simply rebuilds the proceedings html for the specified
+ meeting / group.
+ '''
+ meeting = Meeting.objects.get(number=meeting_num)
+ group = get_object_or_404(Group,acronym=acronym)
+
+ create_proceedings(meeting,group)
+
+ messages.success(request,'proceedings.html was rebuilt')
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting_num,'acronym':acronym})
+ return HttpResponseRedirect(url)
+
+@check_permissions
+def delete_material(request,slide_id):
+ '''
+ This view handles deleting meeting materials. We don't actually delete the
+ document object but set the state to deleted and add a 'deleted' DocEvent.
+ '''
+ doc = get_object_or_404(Document, name=slide_id)
+ # derive other objects
+ session = doc.session_set.all()[0]
+ meeting = session.meeting
+ group = session.group
+
+ path = get_full_path(doc)
+ if path and os.path.exists(path):
+ os.remove(path)
+
+ # leave it related
+ #session.materials.remove(doc)
+
+ state = State.objects.get(type=doc.type,slug='deleted')
+ doc.set_state(state)
+
+ # create deleted_document
+ DocEvent.objects.create(doc=doc,
+ by=request.user.get_profile(),
+ type='deleted')
+
+ create_proceedings(meeting,group)
+
+ messages.success(request,'The material was deleted successfully')
+ if group.type.slug in ('wg','rg'):
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'acronym':group.acronym})
+ else:
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'session_id':session.id})
+
+ return HttpResponseRedirect(url)
+
+@sec_only
+def delete_interim_meeting(request, meeting_num):
+ '''
+ This view deletes the specified Interim Meeting and any material that has been
+ uploaded for it. The pattern in urls.py ensures we don't call this with a regular
+ meeting number.
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_num)
+ sessions = Session.objects.filter(meeting=meeting)
+ group = sessions[0].group
+
+ # delete directories
+ path = get_upload_root(meeting)
+
+ # do a quick sanity check on this path before we go and delete it
+ parts = path.split('/')
+ assert parts[-1] == group.acronym
+
+ if os.path.exists(path):
+ shutil.rmtree(path)
+
+ meeting.delete()
+ sessions.delete()
+
+ url = reverse('proceedings_interim', kwargs={'acronym':group.acronym})
+ return HttpResponseRedirect(url)
+
+@check_permissions
+def edit_slide(request, slide_id):
+ '''
+ This view allows the user to edit the name of a slide.
+ '''
+ slide = get_object_or_404(Document, name=slide_id)
+ # derive other objects
+ session = slide.session_set.all()[0]
+ meeting = session.meeting
+ group = session.group
+
+ if group.type.slug in ('wg','rg'):
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'acronym':group.acronym})
+ else:
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'session_id':session.id})
+
+ if request.method == 'POST': # If the form has been submitted...
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ return HttpResponseRedirect(url)
+
+ form = EditSlideForm(request.POST, instance=slide) # A form bound to the POST data
+ if form.is_valid():
+ form.save()
+
+ # rebuild proceedings.html
+ create_proceedings(meeting,group)
+ return HttpResponseRedirect(url)
+ else:
+ form = EditSlideForm(instance=slide)
+
+ return render_to_response('proceedings/edit_slide.html',{
+ 'group': group,
+ 'meeting':meeting,
+ 'slide':slide,
+ 'form':form},
+ RequestContext(request, {}),
+ )
+
+def interim(request, acronym):
+ '''
+ This view presents the user with a list of interim meetings for the specified group.
+ The user can select a meeting to manage or create a new interim meeting by entering
+ a date.
+ '''
+ group = get_object_or_404(Group, acronym=acronym)
+ if request.method == 'POST': # If the form has been submitted...
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Back':
+ url = reverse('proceedings_select_interim')
+ return HttpResponseRedirect(url)
+
+ form = InterimMeetingForm(request.POST) # A form bound to the POST data
+ if form.is_valid():
+ date = form.cleaned_data['date']
+ number = get_next_interim_num(acronym,date)
+ meeting=Meeting.objects.create(type_id='interim',
+ date=date,
+ number=number)
+
+ # create session to associate this meeting with a group and hold material
+ Session.objects.create(meeting=meeting,
+ group=group,
+ requested_by=request.user.get_profile(),
+ status_id='sched')
+
+ create_interim_directory()
+ make_directories(meeting)
+
+ messages.success(request, 'Meeting created')
+ url = reverse('proceedings_interim', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(url)
+ else:
+ form = InterimMeetingForm(initial={'group_acronym_id':acronym}) # An unbound form
+
+ meetings = Meeting.objects.filter(type='interim',session__group__acronym=acronym).order_by('date')
+
+ return render_to_response('proceedings/interim_meeting.html',{
+ 'group': group,
+ 'meetings':meetings,
+ 'form':form},
+ RequestContext(request, {}),
+ )
+
+def interim_directory(request, sortby=None):
+
+ if sortby == 'group':
+ qs = InterimMeeting.objects.all()
+ meetings = sorted(qs, key=lambda a: a.group.acronym)
+ else:
+ meetings = InterimMeeting.objects.all().order_by('-date')
+
+ return render_to_response('proceedings/interim_directory.html', {
+ 'meetings': meetings},
+)
+
+def main(request):
+ '''
+ List IETF Meetings. If the user is Secratariat list includes all meetings otherwise
+ show only those meetings whose corrections submission date has not passed.
+
+ **Templates:**
+
+ * ``proceedings/main.html``
+
+ **Template Variables:**
+
+ * meetings, interim_meetings, today
+
+ '''
+ # getting numerous errors when people try to access using the wrong account
+ try:
+ person = request.user.get_profile()
+ except Person.DoesNotExist:
+ return HttpResponseForbidden('ACCESS DENIED: user=%s' % request.META['REMOTE_USER'])
+
+ if has_role(request.user,'Secretariat'):
+ meetings = Meeting.objects.filter(type='ietf').order_by('-number')
+ else:
+ # select meetings still within the cutoff period
+ meetings = Meeting.objects.filter(type='ietf',date__gt=datetime.datetime.today() - datetime.timedelta(days=settings.SUBMISSION_CORRECTION_DAYS)).order_by('number')
+
+ groups = get_my_groups(request.user)
+ interim_meetings = Meeting.objects.filter(type='interim',session__group__in=groups).order_by('-date')
+ # tac on group for use in templates
+ for m in interim_meetings:
+ m.group = m.session_set.all()[0].group
+
+ # we today's date to see if we're past the submissio cutoff
+ today = datetime.date.today()
+
+ return render_to_response('proceedings/main.html',{
+ 'meetings': meetings,
+ 'interim_meetings': interim_meetings,
+ 'today': today},
+ RequestContext(request,{}),
+ )
+
+@check_permissions
+def move_slide(request, slide_id, direction):
+ '''
+ This view will re-order slides. In addition to meeting, group and slide IDs it takes
+ a direction argument which is a string [up|down].
+ '''
+ slide = get_object_or_404(Document, name=slide_id)
+
+ # derive other objects
+ session = slide.session_set.all()[0]
+ meeting = session.meeting
+ group = session.group
+ qs = session.materials.exclude(states__slug='deleted').filter(type='slides').order_by('order')
+
+ # if direction is up and we aren't already the first slide
+ if direction == 'up' and slide_id != str(qs[0].pk):
+ index = find_index(slide_id, qs)
+ slide_before = qs[index-1]
+ slide_before.order, slide.order = slide.order, slide_before.order
+ slide.save()
+ slide_before.save()
+
+ # if direction is down, more than one slide and we aren't already the last slide
+ if direction == 'down' and qs.count() > 1 and slide_id != str(qs[qs.count()-1].pk):
+ index = find_index(slide_id, qs)
+ slide_after = qs[index+1]
+ slide_after.order, slide.order = slide.order, slide_after.order
+ slide.save()
+ slide_after.save()
+
+ if group.type.slug in ('wg','rg'):
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'acronym':group.acronym})
+ else:
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'session_id':session.id})
+ return HttpResponseRedirect(url)
+
+@sec_only
+def process_pdfs(request, meeting_num):
+ '''
+ This function is used to update the database once meeting materials in PPT format
+ are converted to PDF format and uploaded to the server. It basically finds every PowerPoint
+ slide document for the given meeting and checks to see if there is a PDF version. If there
+ is external_url is changed. Then when proceedings are generated the URL will refer to the
+ PDF document.
+ '''
+ warn_count = 0
+ count = 0
+ meeting = get_object_or_404(Meeting, number=meeting_num)
+ ppt = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.ppt').exclude(states__slug='deleted')
+ pptx = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.pptx').exclude(states__slug='deleted')
+ for doc in itertools.chain(ppt,pptx):
+ base,ext = os.path.splitext(doc.external_url)
+ pdf_file = base + '.pdf'
+ path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting_num,'slides',pdf_file)
+ if os.path.exists(path):
+ doc.external_url = pdf_file
+ doc.save()
+ count += 1
+ else:
+ warn_count += 1
+
+ if warn_count:
+ messages.warning(request, '%s PDF files processed. %s PowerPoint files still not converted.' % (count, warn_count))
+ else:
+ messages.success(request, '%s PDF files processed' % count)
+ url = reverse('proceedings_select', kwargs={'meeting_num':meeting_num})
+ return HttpResponseRedirect(url)
+
+@sec_only
+def progress_report(request, meeting_num):
+ '''
+ This function generates the proceedings progress report for use at the Plenary.
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_num)
+ gen_progress({'meeting':meeting},final=False)
+
+ url = reverse('proceedings_select', kwargs={'meeting_num':meeting_num})
+ return HttpResponseRedirect(url)
+
+@check_permissions
+def replace_slide(request, slide_id):
+ '''
+ This view allows the user to upload a new file to replace a slide.
+ '''
+ slide = get_object_or_404(Document, name=slide_id)
+ # derive other objects
+ session = slide.session_set.all()[0]
+ meeting = session.meeting
+ group = session.group
+
+ if group.type.slug in ('wg','rg'):
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'acronym':group.acronym})
+ else:
+ url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting.number,'session_id':session.id})
+
+ if request.method == 'POST': # If the form has been submitted...
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ return HttpResponseRedirect(url)
+
+ form = ReplaceSlideForm(request.POST,request.FILES,instance=slide) # A form bound to the POST data
+ if form.is_valid():
+ new_slide = form.save(commit=False)
+ new_slide.time = datetime.datetime.now()
+
+ file = request.FILES[request.FILES.keys()[0]]
+ file_ext = os.path.splitext(file.name)[1]
+ disk_filename = new_slide.name + file_ext
+ handle_upload_file(file,disk_filename,meeting,'slides')
+
+ new_slide.external_url = disk_filename
+ new_slide.save()
+
+ # create DocEvent uploaded
+ DocEvent.objects.create(doc=slide,
+ by=request.user.get_profile(),
+ type='uploaded')
+
+ # rebuild proceedings.html
+ create_proceedings(meeting,group)
+
+ return HttpResponseRedirect(url)
+ else:
+ form = ReplaceSlideForm(instance=slide)
+
+ return render_to_response('proceedings/replace_slide.html',{
+ 'group': group,
+ 'meeting':meeting,
+ 'slide':slide,
+ 'form':form},
+ RequestContext(request, {}),
+ )
+
+def select(request, meeting_num):
+ '''
+ A screen to select which group you want to upload material for. Users of this view area
+ Secretariat staff and community (WG Chairs, ADs, etc). Only those groups with sessions
+ scheduled for the given meeting will appear in drop-downs. For Group and IRTF selects, the
+ value will be group.acronym to use in pretty URLs. Since Training sessions have no acronym
+ we'll use the session id.
+ '''
+ if request.method == 'POST':
+ if request.POST.get('group',None):
+ redirect_url = reverse('proceedings_upload_unified', kwargs={'meeting_num':meeting_num,'acronym':request.POST['group']})
+ return HttpResponseRedirect(redirect_url)
+ else:
+ messages.error(request, 'No Group selected')
+
+
+ meeting = get_object_or_404(Meeting, number=meeting_num)
+ user = request.user
+ person = user.get_profile()
+ groups_session, groups_no_session = groups_by_session(user, meeting)
+ proceedings_url = get_proceedings_url(meeting)
+
+ # get the time proceedings were generated
+ path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html')
+ if os.path.exists(path):
+ last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path))
+ else:
+ last_run = None
+
+ # initialize group form
+ wgs = filter(lambda x: x.type_id in ('wg','ag','team'),groups_session)
+ group_form = GroupSelectForm(choices=build_choices(wgs))
+
+ # intialize IRTF form, only show if user is sec or irtf chair
+ if has_role(user,'Secretariat') or person.role_set.filter(name__slug='chair',group__type__slug__in=('irtf','rg')):
+ rgs = filter(lambda x: x.type_id == 'rg',groups_session)
+ irtf_form = GroupSelectForm(choices=build_choices(rgs))
+ else:
+ irtf_form = None
+
+ # initialize Training form, this select widget needs to have a session id, because it's
+ # utilmately the session that we associate material with
+ # NOTE: there are two ways to query for the groups we want, the later seems more specific
+ if has_role(user,'Secretariat'):
+ choices = []
+ #for session in Session.objects.filter(meeting=meeting).exclude(name=""):
+ for session in Session.objects.filter(meeting=meeting,timeslot__type='other').order_by('name'):
+ choices.append((session.id,session.timeslot_set.all()[0].name))
+ training_form = GroupSelectForm(choices=choices)
+ else:
+ training_form = None
+
+ # iniialize plenary form
+ if has_role(user,['Secretariat','IETF Chair','IAB Chair']):
+ choices = []
+ for session in Session.objects.filter(meeting=meeting,
+ timeslot__type='plenary').order_by('name'):
+ choices.append((session.id,session.timeslot_set.all()[0].name))
+ plenary_form = GroupSelectForm(choices=choices)
+ else:
+ plenary_form = None
+
+ # count PowerPoint files waiting to be converted
+ if has_role(user,'Secretariat'):
+ ppt = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.ppt').exclude(states__slug='deleted')
+ pptx = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.pptx').exclude(states__slug='deleted')
+ ppt_count = ppt.count() + pptx.count()
+ else:
+ ppt_count = 0
+
+ return render_to_response('proceedings/select.html', {
+ 'group_form': group_form,
+ 'irtf_form': irtf_form,
+ 'training_form': training_form,
+ 'plenary_form': plenary_form,
+ 'meeting': meeting,
+ 'last_run': last_run,
+ 'proceedings_url': proceedings_url,
+ 'ppt_count': ppt_count},
+ RequestContext(request,{}),
+ )
+
+def select_interim(request):
+ '''
+ A screen to select which group you want to upload Interim material for. Works for Secretariat staff
+ and external (ADs, chairs, etc)
+ '''
+ if request.method == 'POST':
+ redirect_url = reverse('proceedings_interim', kwargs={'acronym':request.POST['group']})
+ return HttpResponseRedirect(redirect_url)
+
+ if request.user_is_secretariat:
+ # initialize working groups form
+ choices = build_choices(Group.objects.active_wgs())
+ group_form = GroupSelectForm(choices=choices)
+
+ # per Alexa, not supporting Interim IRTF meetings at this time
+ # intialize IRTF form
+ #choices = build_choices(Group.objects.filter(type='wg', state='active')
+ #irtf_form = GroupSelectForm(choices=choices)
+
+ else:
+ # these forms aren't used for non-secretariat
+ groups = get_my_groups(request.user)
+ choices = build_choices(groups)
+ group_form = GroupSelectForm(choices=choices)
+ irtf_form = None
+ training_form = None
+
+ return render_to_response('proceedings/interim_select.html', {
+ 'group_form': group_form},
+ #'irtf_form': irtf_form,
+ RequestContext(request,{}),
+ )
+
+@check_permissions
+def upload_unified(request, meeting_num, acronym=None, session_id=None):
+ '''
+ This view is the main view for uploading / re-ordering material for regular and interim
+ meetings. There are two urls.py entries which map to this view. The acronym_id option is used
+ most often for groups of regular and interim meetings. session_id is used for uploading
+ material for Training sessions (where group is not a unique identifier). We could have used
+ session_id all the time but this makes for an ugly URL which most of the time would be
+ avoided by using acronym.
+ '''
+ meeting = get_object_or_404(Meeting, number=meeting_num)
+ now = datetime.datetime.now()
+ if acronym:
+ group = get_object_or_404(Group, acronym=acronym)
+ sessions = Session.objects.filter(meeting=meeting,group=group)
+ session = sessions[0]
+ session_name = ''
+ elif session_id:
+ sessions = None
+ session = get_object_or_404(Session, id=int(session_id))
+ group = session.group
+ session_name = session.name
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit','')
+ if button_text == 'Back':
+ if meeting.type.slug == 'interim':
+ url = reverse('proceedings_interim', kwargs={'acronym':group.acronym})
+ else:
+ url = reverse('proceedings_select', kwargs={'meeting_num':meeting_num})
+ return HttpResponseRedirect(url)
+
+ form = UnifiedUploadForm(request.POST,request.FILES)
+ if form.is_valid():
+ material_type = form.cleaned_data['material_type']
+ slide_name = form.cleaned_data['slide_name']
+
+ file = request.FILES[request.FILES.keys()[0]]
+ file_ext = os.path.splitext(file.name)[1]
+
+ # set the filename
+ if meeting.type.slug == 'ietf':
+ filename = '%s-%s-%s' % (material_type.slug,meeting.number,group.acronym)
+ elif meeting.type.slug == 'interim':
+ filename = '%s-%s' % (material_type.slug,meeting.number)
+
+ # NonSession material, use short name for shorter URLs
+ if session.short:
+ filename += "-%s" % session.short
+ elif session_name:
+ filename += "-%s" % slugify(session_name)
+ # --------------------------------
+
+ if material_type.slug == 'slides':
+ order_num = get_next_order_num(session)
+ slide_num = get_next_slide_num(session)
+ filename += "-%s" % slide_num
+
+ disk_filename = filename + file_ext
+
+ # create the Document object, in the case of slides the name will always be unique
+ # so you'll get a new object, agenda and minutes will reuse doc object if it exists
+ doc, created = Document.objects.get_or_create(type=material_type,
+ group=group,
+ name=filename)
+ doc.external_url = disk_filename
+ doc.time = now
+ if created:
+ doc.rev = '1'
+ else:
+ doc.rev = str(int(doc.rev) + 1)
+ if material_type.slug == 'slides':
+ doc.order=order_num
+ if slide_name:
+ doc.title = slide_name
+ else:
+ doc.title = doc.name
+ else:
+ doc.title = '%s for %s at %s' % (material_type.slug.capitalize(), group.acronym.upper(), meeting)
+ doc.save()
+
+ DocAlias.objects.get_or_create(name=doc.name, document=doc)
+
+ handle_upload_file(file,disk_filename,meeting,material_type.slug)
+
+ # set Doc state
+ state = State.objects.get(type=doc.type,slug='active')
+ doc.set_state(state)
+
+ # create session relationship, per Henrik we should associate documents to all sessions
+ # for the current meeting (until tools support different materials for diff sessions)
+ if sessions:
+ for s in sessions:
+ s.materials.add(doc)
+ else:
+ session.materials.add(doc)
+
+ # create NewRevisionDocEvent instead of uploaded, per Ole
+ NewRevisionDocEvent.objects.create(type='new_revision',
+ by=request.user.get_profile(),
+ doc=doc,
+ rev=doc.rev,
+ desc='New revision available',
+ time=now)
+
+ create_proceedings(meeting,group)
+ messages.success(request,'File uploaded sucessfully')
+
+ else:
+ form = UnifiedUploadForm(initial={'meeting_id':meeting.id,'acronym':group.acronym,'material_type':'slides'})
+
+ agenda,minutes,slides = get_material(session)
+
+ # gather DocEvents
+ # include deleted material to catch deleted doc events
+ docs = session.materials.all()
+ docevents = DocEvent.objects.filter(doc__in=docs)
+
+ path = get_proceedings_path(meeting,group)
+ if os.path.exists(path):
+ proceedings_url = get_proceedings_url(meeting,group)
+ else:
+ proceedings_url = ''
+
+ return render_to_response('proceedings/upload_unified.html', {
+ 'docevents': docevents,
+ 'meeting': meeting,
+ 'group': group,
+ 'minutes': minutes,
+ 'agenda': agenda,
+ 'form': form,
+ 'session_name': session_name, # for Tutorials, etc
+ 'slides':slides,
+ 'proceedings_url': proceedings_url},
+ RequestContext(request, {}),
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ietf/secr/roles/__init__.py b/ietf/secr/roles/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/roles/forms.py b/ietf/secr/roles/forms.py
new file mode 100644
index 000000000..9249db14c
--- /dev/null
+++ b/ietf/secr/roles/forms.py
@@ -0,0 +1,44 @@
+from django import forms
+from ietf.secr.areas.models import *
+import re
+
+class LiaisonForm(forms.Form):
+ liaison_name = forms.CharField(max_length=100,label='Name',help_text="To see a list of people type the first name, or last name, or both.")
+ affiliation = forms.CharField(max_length=50)
+
+ # set css class=name-autocomplete for name field (to provide select list)
+ def __init__(self, *args, **kwargs):
+ super(LiaisonForm, self).__init__(*args, **kwargs)
+ self.fields['liaison_name'].widget.attrs['class'] = 'name-autocomplete'
+
+ def clean_liaison_name(self):
+ name = self.cleaned_data.get('liaison_name', '')
+ # check for tag within parenthesis to ensure name was selected from the list
+ m = re.search(r'(\d+)', name)
+ if name and not m:
+ raise forms.ValidationError("You must select an entry from the list!")
+ return name
+
+ def clean_affiliation(self):
+ affiliation = self.cleaned_data.get('affiliation', '')
+ # give error if field ends with "Liaison", application adds this label
+ m = re.search(r'[L|l]iaison$', affiliation)
+ if affiliation and m:
+ raise forms.ValidationError("Don't use 'Liaison' in field. Application adds this.")
+ return affiliation
+
+class ChairForm(forms.Form):
+ chair_name = forms.CharField(max_length=100,label='Name',help_text="To see a list of people type the first name, or last name, or both.")
+
+ # set css class=name-autocomplete for name field (to provide select list)
+ def __init__(self, *args, **kwargs):
+ super(ChairForm, self).__init__(*args, **kwargs)
+ self.fields['chair_name'].widget.attrs['class'] = 'name-autocomplete'
+
+ def clean_chair_name(self):
+ name = self.cleaned_data.get('chair_name', '')
+ # check for tag within parenthesis to ensure name was selected from the list
+ m = re.search(r'(\d+)', name)
+ if name and not m:
+ raise forms.ValidationError("You must select an entry from the list!")
+ return name
diff --git a/ietf/secr/roles/models.py b/ietf/secr/roles/models.py
new file mode 100644
index 000000000..137941ffa
--- /dev/null
+++ b/ietf/secr/roles/models.py
@@ -0,0 +1 @@
+from django.db import models
diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py
new file mode 100644
index 000000000..e4ebf5df6
--- /dev/null
+++ b/ietf/secr/roles/tests.py
@@ -0,0 +1,52 @@
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+
+from ietf.group.models import Group
+from ietf.person.models import Person
+from ietf.utils.test_data import make_test_data
+
+from pyquery import PyQuery
+
+SECR_USER='secretary'
+
+def augment_data():
+ # need this for the RoleForm intialization
+ Group.objects.create(acronym='dummy',name='Dummy Group',type_id='sdo')
+
+class MainTestCase(TestCase):
+ fixtures = ['names']
+
+ def test_main(self):
+ "Main Test"
+ augment_data()
+ url = reverse('roles')
+ response = self.client.get(url, REMOTE_USER=SECR_USER)
+ self.assertEquals(response.status_code, 200)
+
+ def test_roles_delete(self):
+ draft = make_test_data()
+ augment_data()
+ group = Group.objects.filter(type='wg')[0]
+ role = group.role_set.all()[0]
+ url = reverse('roles_delete_role', kwargs={'acronym':group.acronym,'id':role.id})
+ target = reverse('roles') + '?group=%s' % group.acronym
+ response = self.client.get(url,follow=True, REMOTE_USER=SECR_USER)
+ self.assertRedirects(response, target)
+ self.failUnless('deleted successfully' in response.content)
+
+ def test_roles_add(self):
+ draft = make_test_data()
+ augment_data()
+ person = Person.objects.get(name='Aread Irector')
+ group = Group.objects.filter(type='wg')[0]
+ url = reverse('roles')
+ target = reverse('roles') + '?group=%s' % group.acronym
+ post_data = {'group_acronym':group.acronym,
+ 'name':'chair',
+ 'person':'Joe Smith - (%s)' % person.id,
+ 'email':person.email_set.all()[0].address,
+ 'submit':'Add'}
+ response = self.client.post(url,post_data,follow=True, REMOTE_USER=SECR_USER)
+ self.assertRedirects(response, target)
+ self.failUnless('added successfully' in response.content)
+
diff --git a/ietf/secr/roles/urls.py b/ietf/secr/roles/urls.py
new file mode 100644
index 000000000..fe97ddc41
--- /dev/null
+++ b/ietf/secr/roles/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('ietf.secr.roles.views',
+ url(r'^$', 'main', name='roles'),
+ url(r'^ajax/get-roles/(?P[A-Za-z0-9_\-\+\.]+)/$', 'ajax_get_roles', name='roles_ajax_get_roles'),
+ url(r'^(?P[A-Za-z0-9_\-\+\.]+)/delete/(?P\d{1,6})/$', 'delete_role', name='roles_delete_role'),
+)
diff --git a/ietf/secr/roles/views.py b/ietf/secr/roles/views.py
new file mode 100644
index 000000000..556e37a87
--- /dev/null
+++ b/ietf/secr/roles/views.py
@@ -0,0 +1,114 @@
+from django.contrib import messages
+from django.core.urlresolvers import reverse
+from django.db.models import Max
+from django.forms.formsets import formset_factory
+from django.http import HttpResponseRedirect, HttpResponse
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+from django.utils import simplejson
+
+from ietf.group.models import Group, GroupHistory, Role, RoleHistory
+from ietf.group.utils import save_group_in_history
+from ietf.secr.groups.forms import RoleForm
+from ietf.secr.sreq.forms import GroupSelectForm
+
+from forms import *
+import re
+import datetime
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+
+def build_choices(queryset):
+ '''
+ This function takes a queryset (or list) of Groups and builds a list of tuples for use
+ as choices in a select widget. Using acronym for both value and label.
+ '''
+ choices = [ (g.acronym,g.acronym) for g in queryset ]
+ return sorted(choices, key=lambda choices: choices[1])
+
+# -------------------------------------------------
+# AJAX Functions
+# -------------------------------------------------
+def ajax_get_roles(request, acronym):
+ '''
+ Ajax function which takes a group acronym and returns the
+ roles for the group in the form of a table
+ '''
+ group = get_object_or_404(Group, acronym=acronym)
+
+ return render_to_response('roles/roles.html', {
+ 'group': group,
+ 'roles': group.role_set.all()},
+ RequestContext(request, {}),
+ )
+# --------------------------------------------------
+# STANDARD VIEW FUNCTIONS
+# --------------------------------------------------
+def delete_role(request, acronym, id):
+ """
+ Handle deleting roles
+
+ **Templates:**
+
+ * none
+
+ """
+ role = get_object_or_404(Role, id=id)
+ group = get_object_or_404(Group, acronym=acronym)
+
+ # save group
+ save_group_in_history(role.group)
+
+ role.delete()
+
+ messages.success(request, 'The entry was deleted successfully')
+ url = reverse('roles') + '?group=%s' % group.acronym
+ return HttpResponseRedirect(url)
+
+def main(request):
+ '''
+ Main view for generic Roles App
+ '''
+ groups = Group.objects.filter(type__in=('sdo','ietf')).order_by('acronym')
+ choices=build_choices(groups)
+ choices.insert(0,('','------------'))
+ group_form = GroupSelectForm(choices=choices)
+
+ # prime form with random sdo group so all roles are available
+ group = Group.objects.filter(type='sdo')[0]
+
+ if request.method == 'POST':
+ role_form = RoleForm(request.POST,group=group)
+ if role_form.is_valid():
+ name = role_form.cleaned_data['name']
+ person = role_form.cleaned_data['person']
+ email = role_form.cleaned_data['email']
+ acronym = role_form.cleaned_data['group_acronym']
+
+ group = Group.objects.get(acronym=acronym)
+
+ # save group
+ save_group_in_history(group)
+
+ Role.objects.create(name=name,
+ person=person,
+ email=email,
+ group=group)
+
+ messages.success(request, 'New %s added successfully!' % name)
+ url = reverse('roles') + '?group=%s' % group.acronym
+ return HttpResponseRedirect(url)
+
+ else:
+ role_form = RoleForm(initial={'name':'chair'},group=group)
+ # accept get argument to select group if we're returning after a change
+ if 'group' in request.GET:
+ group_form = GroupSelectForm(choices=choices,initial={'group':request.GET['group']})
+
+ return render_to_response('roles/main.html', {
+ 'group_form': group_form,
+ 'role_form': role_form},
+ RequestContext(request, {}),
+ )
\ No newline at end of file
diff --git a/ietf/secr/rolodex/__init__.py b/ietf/secr/rolodex/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/rolodex/forms.py b/ietf/secr/rolodex/forms.py
new file mode 100644
index 000000000..6d30478c7
--- /dev/null
+++ b/ietf/secr/rolodex/forms.py
@@ -0,0 +1,120 @@
+from django import forms
+from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import email_re
+
+from ietf.person.models import Email, Person
+
+import re
+
+class SearchForm(forms.Form):
+ name = forms.CharField(max_length=50,required=False)
+ email = forms.CharField(max_length=255,required=False)
+ id = forms.IntegerField(required=False)
+
+ def clean(self):
+ super(SearchForm, self).clean()
+ if any(self.errors):
+ return
+ data = self.cleaned_data
+ if not data['name'] and not data['email'] and not data['id']:
+ raise forms.ValidationError("You must fill out at least one field")
+
+ return data
+
+class EmailForm(forms.ModelForm):
+ class Meta:
+ model = Email
+
+class EditPersonForm(forms.ModelForm):
+ class Meta:
+ model = Person
+ exclude = ('time')
+
+ def __init__(self, *args, **kwargs):
+ super(EditPersonForm, self).__init__(*args,**kwargs)
+ self.fields['user'] = forms.CharField(max_length=64,required=False,help_text="Corresponds to Django User ID (usually email address)")
+ if self.instance.user:
+ self.initial['user'] = self.instance.user.username
+
+ def clean_user(self):
+ user = self.cleaned_data['user']
+ if user:
+ # if Django User object exists return it, otherwise create one
+ try:
+ user_obj = User.objects.get(username=user)
+ except User.DoesNotExist:
+ user_obj = User.objects.create_user(user,user)
+
+ return user_obj
+ else:
+ return None
+
+ """
+ def save(self, force_insert=False, force_update=False, commit=True):
+ obj = super(EditPersonForm, self).save(commit=False)
+ user = self.cleaned_data['user']
+ self.user = User.objects.get(username=user)
+
+ if commit:
+ obj.save()
+ return obj
+ """
+# ------------------------------------------------------
+# Forms for addition of new contacts
+# These sublcass the regular forms, with additional
+# validations
+# ------------------------------------------------------
+
+class NameForm(forms.Form):
+ name = forms.CharField(max_length=255)
+
+ def clean_name(self):
+ # get name, strip leading and trailing spaces
+ name = self.cleaned_data.get('name', '')
+ # check for invalid characters
+ r1 = re.compile(r'[a-zA-Z23\-\.\(\) ]+$')
+ if not r1.match(name):
+ raise forms.ValidationError("Enter a valid name. (only letters,period,hyphen,paren,numerals 2 and 3 allowed)")
+ return name
+
+class NewEmailForm(EmailForm):
+ def clean_address(self):
+ cleaned_data = self.cleaned_data
+ address = cleaned_data.get("address")
+
+ if address and not email_re.match(address):
+ raise forms.ValidationError("Enter a valid email address")
+
+ return address
+
+class NewPersonForm(forms.ModelForm):
+ email = forms.EmailField()
+
+ class Meta:
+ model = Person
+ exclude = ('time','user')
+
+ #def __init__(self, *args, **kwargs):
+ # super(NewPersonForm, self).__init__(*args, **kwargs)
+
+ def clean_email(self):
+ email = self.cleaned_data['email']
+
+ # error if there is already an account (User, Person) associated with this email
+ try:
+ user = User.objects.get(username=email)
+ person = Person.objects.get(user=user)
+ if user and person:
+ raise forms.ValidationError("This account already exists. [name=%s, id=%s, email=%s]" % (person.name,person.id,email))
+ except ObjectDoesNotExist:
+ pass
+
+ # error if email already exists
+ if Email.objects.filter(address=email,active=True):
+ raise forms.ValidationError("This email address already exists in the database")
+
+ return email
+
+
+
diff --git a/ietf/secr/rolodex/models.py b/ietf/secr/rolodex/models.py
new file mode 100644
index 000000000..137941ffa
--- /dev/null
+++ b/ietf/secr/rolodex/models.py
@@ -0,0 +1 @@
+from django.db import models
diff --git a/ietf/secr/rolodex/tests.py b/ietf/secr/rolodex/tests.py
new file mode 100644
index 000000000..31b661602
--- /dev/null
+++ b/ietf/secr/rolodex/tests.py
@@ -0,0 +1,28 @@
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+
+from ietf.person.models import Person
+from ietf.utils.test_data import make_test_data
+
+from pyquery import PyQuery
+
+SECR_USER='secretary'
+
+class MainTestCase(TestCase):
+ fixtures = ['names']
+
+ def test_main(self):
+ "Main Test"
+ url = reverse('rolodex')
+ response = self.client.get(url, REMOTE_USER=SECR_USER)
+ self.assertEquals(response.status_code, 200)
+
+ def test_view(self):
+ "View Test"
+ draft = make_test_data()
+ person = Person.objects.all()[0]
+ url = reverse('rolodex_view', kwargs={'id':person.id})
+ response = self.client.get(url, REMOTE_USER=SECR_USER)
+ self.assertEquals(response.status_code, 200)
+
+
diff --git a/ietf/secr/rolodex/urls.py b/ietf/secr/rolodex/urls.py
new file mode 100644
index 000000000..92d67df4e
--- /dev/null
+++ b/ietf/secr/rolodex/urls.py
@@ -0,0 +1,10 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('ietf.secr.rolodex.views',
+ url(r'^$', 'search', name='rolodex'),
+ url(r'^add/$', 'add', name='rolodex_add'),
+ url(r'^add-proceed/$', 'add_proceed', name='rolodex_add_proceed'),
+ url(r'^(?P\d{1,6})/edit/$', 'edit', name='rolodex_edit'),
+ #url(r'^(?P\d{1,6})/delete/$', 'delete', name='rolodex_delete'),
+ url(r'^(?P\d{1,6})/$', 'view', name='rolodex_view'),
+)
diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py
new file mode 100644
index 000000000..86b669755
--- /dev/null
+++ b/ietf/secr/rolodex/views.py
@@ -0,0 +1,287 @@
+from django.contrib import messages
+from django.core.urlresolvers import reverse
+from django.db.models import Q
+from django.forms.formsets import formset_factory
+from django.forms.models import inlineformset_factory, modelformset_factory
+from django.http import HttpResponseRedirect
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+
+from ietf.person.models import Person, Email, Alias
+
+from forms import *
+
+# ---------------------------------------
+# Views
+# ---------------------------------------
+
+def add(request):
+ """
+ Add contact information.
+
+ **Templates:**
+
+ * ``rolodex/add.html``
+
+ **Template Variables:**
+
+ * form
+ * results: the list of similar names to allow user to check for dupes
+ * name: the new name that is submitted
+
+ """
+ results = []
+ name = None
+ if request.method == 'POST':
+ form = NameForm(request.POST)
+ if form.is_valid():
+ request.session['post_data'] = request.POST
+
+ # search to see if contact already exists
+ name = form.cleaned_data['name']
+ results = Person.objects.filter(name=name)
+ if not results:
+ return HttpResponseRedirect('../add-proceed/')
+
+ else:
+ form = NameForm()
+
+ return render_to_response('rolodex/add.html', {
+ 'form': form,
+ 'results': results,
+ 'name': name},
+ RequestContext(request, {}),
+ )
+
+def add_proceed(request):
+ """
+ Add contact information. (2nd page, allows entry of address, phone and email records)
+
+ **Templates:**
+
+ * ``rolodex/add_proceeed.html``
+
+ **Template Variables:**
+
+ * name: new contact name
+ * form
+
+ """
+ # if we get to this page from the add page, as expected, the session will have post_data.
+ if request.session['post_data']:
+ post_data = request.session['post_data']
+ else:
+ messages.error('ERROR: unable to save session data (enable cookies)')
+ url = reverse('rolodex_add')
+ return HttpResponseRedirect(url)
+
+ name = post_data['name']
+
+ if request.method == 'POST':
+ form = NewPersonForm(request.POST)
+ if form.is_valid():
+ email = form.cleaned_data['email']
+ # save person here
+ person = form.save()
+
+ # save email
+ Email.objects.create(address=email,
+ person=person)
+
+ # in theory a user record could exist which wasn't associated with a Person
+ try:
+ user = User.objects.create_user(email, email)
+ except IntegrityError:
+ user = User.objects.get(username=email)
+
+ person.user = user
+ person.save()
+
+ # create the Alias
+ Alias.objects.create(person=person,name=name)
+ if person.ascii != person.name:
+ Alias.objects.create(person=person,name=person.ascii)
+
+ messages.success(request, 'The Rolodex entry was added successfully')
+ url = reverse('rolodex_view', kwargs={'id': person.id})
+ return HttpResponseRedirect(url)
+ else:
+ form = NewPersonForm(initial={'name':name,'ascii':name})
+
+ return render_to_response('rolodex/add_proceed.html', {
+ 'name': name,
+ 'form': form},
+ RequestContext(request, {}),
+ )
+
+def delete(request, id):
+ """
+ Delete contact information.
+ Note: access to this view was disabled per Glen 3-16-10.
+
+ **Templates:**
+
+ * ``rolodex/delete.html``
+
+ **Template Variables:**
+
+ * person
+
+ """
+ person = get_object_or_404(Person, id=id)
+
+ if request.method == 'POST':
+ if request.POST.get('post', '') == "yes":
+
+ # Django does cascading delete (deletes all objects with foreign
+ # keys to this object). Since this isn't what we want, ie. you don't
+ # want to delete a group which has a foreign key, "ad" to this person.
+ # Django 1.3 has a way to override, on_delete
+ #person.delete()
+
+ messages.warning(request, 'This feature is disabled')
+ url = reverse('rolodex')
+ return HttpResponseRedirect(url)
+
+ return render_to_response('rolodex/delete.html', {
+ 'person': person},
+ RequestContext(request, {}),
+ )
+
+def edit(request, id):
+ """
+ Edit contact information. Address, Email and Phone records are provided as inlineformsets.
+
+ **Templates:**
+
+ * ``rolodex/edit.html``
+
+ **Template Variables:**
+
+ * person, person_form, email_formset
+
+ """
+ person = get_object_or_404(Person, id=id)
+
+ EmailFormset = inlineformset_factory(Person, Email, form=EmailForm, can_delete=False, extra=0)
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('rolodex_view', kwargs={'id':id})
+ return HttpResponseRedirect(url)
+
+ person_form = EditPersonForm(request.POST, instance=person)
+ email_formset = EmailFormset(request.POST, instance=person, prefix='email')
+ if person_form.is_valid() and email_formset.is_valid():
+ # handle aliases
+ for field in ('name','ascii','ascii_short'):
+ if field in person_form.changed_data:
+ person.alias_set.filter(name=getattr(person,field)).delete()
+ Alias.objects.get_or_create(person=person,name=person_form.cleaned_data[field])
+
+ person_form.save()
+ email_formset.save()
+
+ # add new names to alias
+
+ messages.success(request, 'The Rolodex entry was changed successfully')
+ url = reverse('rolodex_view', kwargs={'id': id})
+ return HttpResponseRedirect(url)
+
+ else:
+ person_form = EditPersonForm(instance=person)
+ # if any inlineformsets will be empty, need to initialize with extra=1
+ # this is because the javascript for adding new forms requires a first one to copy
+ if not person.email_set.all():
+ EmailFormset.extra = 1
+ # initialize formsets
+ email_formset = EmailFormset(instance=person, prefix='email')
+
+ return render_to_response('rolodex/edit.html', {
+ 'person': person,
+ 'person_form': person_form,
+ 'email_formset': email_formset},
+ RequestContext(request, {}),
+ )
+
+def search(request):
+ """
+ Search Person by any combination of name, email or tag. email matches
+ any substring, if tag is provided only exact tag matches are returned.
+
+ **Templates:**
+
+ * ``rolodex/search.html``
+
+ **Template Variables:**
+
+ * results: list of dictionaries of search results (first_name, last_name, tag, email, company
+ * form: the search form
+ * not_found: contains text "No record found" if search results are empty
+
+ """
+ results = []
+ not_found = ''
+ if request.method == 'POST':
+ form = SearchForm(request.POST)
+ if form.is_valid():
+ kwargs = {}
+ name = form.cleaned_data['name']
+ email = form.cleaned_data['email']
+ id = form.cleaned_data['id']
+ if name:
+ kwargs['name__icontains'] = name
+ if email:
+ #kwargs['email__address__istartswith'] = email
+ kwargs['person__email__address__istartswith'] = email
+ if id:
+ #kwargs['id'] = id
+ kwargs['person__id'] = id
+ # perform query
+ if kwargs:
+ #qs = Person.objects.filter(**kwargs)
+ qs = Alias.objects.filter(**kwargs).distinct()
+
+ results = qs.order_by('name')
+
+ # if there's just one result go straight to view
+ if len(results) == 1:
+ url = reverse('rolodex_view', kwargs={'id':results[0].person.id})
+ return HttpResponseRedirect(url)
+
+ if not results:
+ not_found = 'No record found'
+ else:
+ form = SearchForm()
+
+ return render_to_response('rolodex/search.html', {
+ 'results' : results,
+ 'form': form,
+ 'not_found': not_found},
+ RequestContext(request, {}),
+ )
+
+def view(request, id):
+ """
+ View contact information.
+
+ **Templates:**
+
+ * ``rolodex/view.html``
+
+ **Template Variables:**
+
+ * person
+
+ """
+ person = get_object_or_404(Person, id=id)
+
+ # must filter for active emails only
+ person.emails = person.email_set.filter(active=True)
+
+ return render_to_response('rolodex/view.html', {
+ 'person': person},
+ RequestContext(request, {}),
+ )
+
diff --git a/ietf/secr/sreq/__init__.py b/ietf/secr/sreq/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py
new file mode 100644
index 000000000..95c4231d5
--- /dev/null
+++ b/ietf/secr/sreq/forms.py
@@ -0,0 +1,133 @@
+from django import forms
+
+from ietf.group.models import Group
+import os
+
+# -------------------------------------------------
+# Globals
+# -------------------------------------------------
+
+NUM_SESSION_CHOICES = (('','--Please select'),('1','1'),('2','2'))
+LENGTH_SESSION_CHOICES = (('','--Please select'),('1800','30 minutes'),('3600','1 hour'),('5400','1.5 hours'), ('7200','2 hours'),('9000','2.5 hours'))
+WG_CHOICES = list( Group.objects.filter(type__in=('wg','rg','ag'),state__in=('bof','proposed','active')).values_list('acronym','acronym').order_by('acronym'))
+WG_CHOICES.insert(0,('','--Select WG(s)'))
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+def check_conflict(groups):
+ '''
+ Takes a string which is a list of group acronyms. Checks that they are all active groups
+ '''
+ # convert to python list (allow space or comma separated lists)
+ items = groups.replace(',',' ').split()
+ active_groups = Group.objects.filter(type__in=('wg','ag','rg'), state__in=('bof','proposed','active'))
+ for group in items:
+ if not active_groups.filter(acronym=group):
+ raise forms.ValidationError("Invalid or inactive group acronym: %s" % group)
+
+def join_conflicts(data):
+ '''
+ Takes a dictionary (ie. data dict from a form) and concatenates all
+ conflict fields into one list
+ '''
+ conflicts = []
+ for groups in (data['conflict1'],data['conflict2'],data['conflict3']):
+ # convert to python list (allow space or comma separated lists)
+ items = groups.replace(',',' ').split()
+ conflicts.extend(items)
+ return conflicts
+
+# -------------------------------------------------
+# Forms
+# -------------------------------------------------
+
+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
+
+
+class SessionForm(forms.Form):
+ num_session = forms.ChoiceField(choices=NUM_SESSION_CHOICES)
+ length_session1 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES)
+ length_session2 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES,required=False)
+ length_session3 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES,required=False)
+ attendees = forms.IntegerField()
+ conflict1 = forms.CharField(max_length=255,required=False)
+ conflict2 = forms.CharField(max_length=255,required=False)
+ conflict3 = forms.CharField(max_length=255,required=False)
+ comments = forms.CharField(max_length=200,required=False)
+ wg_selector1 = forms.ChoiceField(choices=WG_CHOICES,required=False)
+ wg_selector2 = forms.ChoiceField(choices=WG_CHOICES,required=False)
+ wg_selector3 = forms.ChoiceField(choices=WG_CHOICES,required=False)
+ third_session = forms.BooleanField(required=False)
+
+ def __init__(self, *args, **kwargs):
+ super(SessionForm, self).__init__(*args, **kwargs)
+ self.fields['num_session'].widget.attrs['onChange'] = "stat_ls(this.selectedIndex);"
+ self.fields['length_session1'].widget.attrs['onClick'] = "if (check_num_session(1)) this.disabled=true;"
+ self.fields['length_session2'].widget.attrs['onClick'] = "if (check_num_session(2)) this.disabled=true;"
+ self.fields['length_session3'].widget.attrs['onClick'] = "if (check_third_session()) { this.disabled=true;}"
+ self.fields['comments'].widget = forms.Textarea(attrs={'rows':'6','cols':'65'})
+ self.fields['wg_selector1'].widget.attrs['onChange'] = "document.form_post.conflict1.value=document.form_post.conflict1.value + ' ' + this.options[this.selectedIndex].value; return handleconflictfield(1);"
+ self.fields['wg_selector2'].widget.attrs['onChange'] = "document.form_post.conflict2.value=document.form_post.conflict2.value + ' ' + this.options[this.selectedIndex].value; return handleconflictfield(2);"
+ self.fields['wg_selector2'].widget.attrs['onClick'] = "return check_prior_conflict(2);"
+ self.fields['wg_selector3'].widget.attrs['onChange'] = "document.form_post.conflict3.value=document.form_post.conflict3.value + ' ' + this.options[this.selectedIndex].value; return handleconflictfield(3);"
+ self.fields['wg_selector3'].widget.attrs['onClick'] = "return check_prior_conflict(3);"
+ self.fields['third_session'].widget.attrs['onClick'] = "if (document.form_post.num_session.selectedIndex < 2) { alert('Cannot use this field - Number of Session is not set to 2'); return false; } else { if (this.checked==true) { document.form_post.length_session3.disabled=false; } else { document.form_post.length_session3.value=0;document.form_post.length_session3.disabled=true; } }"
+
+ # check third_session checkbox if instance and length_session3
+ # assert False, (self.instance, self.fields['length_session3'].initial)
+ 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
+
+ def clean_conflict1(self):
+ conflict = self.cleaned_data['conflict1']
+ check_conflict(conflict)
+ return conflict
+
+ def clean_conflict2(self):
+ conflict = self.cleaned_data['conflict2']
+ check_conflict(conflict)
+ return conflict
+
+ def clean_conflict3(self):
+ conflict = self.cleaned_data['conflict3']
+ check_conflict(conflict)
+ return conflict
+
+ def clean(self):
+ super(SessionForm, self).clean()
+ data = self.cleaned_data
+ if self.errors:
+ return self.cleaned_data
+
+ # error if conflits contain dupes
+ all_conflicts = join_conflicts(data)
+ temp = []
+ for c in all_conflicts:
+ if c not in temp:
+ temp.append(c)
+ else:
+ raise forms.ValidationError('%s appears in conflicts more than once' % c)
+
+ # verify session_length and num_session correspond
+ # if default (empty) option is selected, cleaned_data won't include num_session key
+ if data.get('num_session','') == 2:
+ if not data['length_session2']:
+ raise forms.ValidationError('You must enter a length for session 2')
+
+ if data.get('third_session',False):
+ if not data.get('length_session3',None):
+ raise forms.ValidationError('Length of third session not selected')
+
+ return data
+
+class ToolStatusForm(forms.Form):
+ message = forms.CharField(widget=forms.Textarea(attrs={'rows':'3','cols':'80'}))
+
diff --git a/ietf/secr/sreq/models.py b/ietf/secr/sreq/models.py
new file mode 100644
index 000000000..137941ffa
--- /dev/null
+++ b/ietf/secr/sreq/models.py
@@ -0,0 +1 @@
+from django.db import models
diff --git a/ietf/secr/sreq/templatetags/__init__.py b/ietf/secr/sreq/templatetags/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/sreq/templatetags/ams_filters.py b/ietf/secr/sreq/templatetags/ams_filters.py
new file mode 100644
index 000000000..4dec005da
--- /dev/null
+++ b/ietf/secr/sreq/templatetags/ams_filters.py
@@ -0,0 +1,70 @@
+from django import template
+from ietf.person.models import Person
+import datetime
+
+register = template.Library()
+
+@register.filter
+def abbr_status(value):
+ """
+ Converts RFC Status to a short abbreviation
+ """
+ d = {'Proposed Standard':'PS',
+ 'Draft Standard':'DS',
+ 'Standard':'S',
+ 'Historic':'H',
+ 'Informational':'I',
+ 'Experimental':'E',
+ 'Best Current Practice':'BCP',
+ 'Internet Standard':'IS'}
+
+ return d.get(value,value)
+
+@register.filter(name='display_duration')
+def display_duration(value):
+ """
+ Maps a session requested duration from select index to
+ label."""
+ map = {'0':'None',
+ '1800':'30 Minutes',
+ '3600':'1 Hour',
+ '5400':'1.5 Hours',
+ '7200':'2 Hours',
+ '9000':'2.5 Hours'}
+ return map[value]
+
+@register.filter
+def get_published_date(doc):
+ '''
+ Returns the published date for a RFC Document
+ '''
+ event = doc.latest_event(type='published_rfc')
+ if event:
+ return event.time
+ event = doc.latest_event(type='new_revision')
+ if event:
+ return event.time
+ else:
+ return None
+
+@register.filter
+def is_ppt(value):
+ '''
+ Checks if the value ends in ppt or pptx
+ '''
+ if value.endswith('ppt') or value.endswith('pptx'):
+ return True
+ else:
+ return False
+
+@register.filter
+def smart_login(user):
+ '''
+ Expects a Person object. If person is a Secretariat returns "on behalf of the"
+ '''
+ if not isinstance (user, Person):
+ return value
+ if user.role_set.filter(name='secr',group__acronym='secretariat'):
+ return '%s, on behalf of the' % user
+ else:
+ return '%s, a chair of the' % user
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
new file mode 100644
index 000000000..23ae5958e
--- /dev/null
+++ b/ietf/secr/sreq/tests.py
@@ -0,0 +1,73 @@
+import unittest
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+from django.test.client import Client
+from ietf.group.models import Group
+from ietf.ietfauth.decorators import has_role
+from ietf.utils.test_data import make_test_data
+from ietf.utils.test_utils import SimpleUrlTestCase, RealDatabaseTest
+from ietf.idtracker.models import Role
+
+from urlparse import urlsplit
+#from pyquery import PyQuery
+
+SECR_USER='secretary'
+
+class SreqUrlTestCase(SimpleUrlTestCase):
+ def testUrls(self):
+ self.doTestUrls(__file__)
+
+class MainTestCase(TestCase):
+ fixtures = ['names']
+
+ def test_main(self):
+ draft = make_test_data()
+ url = reverse('sessions')
+ r = self.client.get(url, REMOTE_USER=SECR_USER)
+ self.assertEquals(r.status_code, 200)
+ sched = r.context['scheduled_groups']
+ unsched = r.context['unscheduled_groups']
+ self.failUnless(len(sched) == 0)
+ self.failUnless(len(unsched) > 0)
+
+class SubmitRequestCase(TestCase):
+ fixtures = ['names']
+
+ def test_submit_request(self):
+ draft = make_test_data()
+ acronym = Group.objects.all()[0].acronym
+ url = reverse('sessions_new',kwargs={'acronym':acronym})
+ post_data = {'id_num_session':'1',
+ 'id_length_session1':'3600',
+ 'id_attendees':'10',
+ 'id_conflict1':'',
+ 'id_comments':'need projector'}
+ self.client.login( REMOTE_USER=SECR_USER)
+ r = self.client.post(url,post_data)
+ self.assertEquals(r.status_code, 200)
+"""
+ #assert False, self.client.session..__dict__
+
+ url = reverse('sessions_confirm',kwargs={'acronym':acronym})
+ #s = self.client.session
+ #s['session_form'] = post_data
+ r = self.client.get(url)
+ assert False, r.content
+"""
+class EditRequestCase(TestCase):
+ pass
+
+class NotMeetingCase(TestCase):
+ pass
+
+class RetrievePreviousCase(TestCase):
+ pass
+
+
+
+ # test error if already scheduled
+ # test get previous exists/doesn't exist
+ # test that groups scheduled and unscheduled add up to total groups
+ # test locking function, access by unauthorized
\ No newline at end of file
diff --git a/ietf/secr/sreq/testurl.list b/ietf/secr/sreq/testurl.list
new file mode 100644
index 000000000..5ae678bdd
--- /dev/null
+++ b/ietf/secr/sreq/testurl.list
@@ -0,0 +1,3 @@
+200 /secr/
+200 /secr/sreq/
+200 /secr/sreq/6lowpan/new/
diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py
new file mode 100644
index 000000000..b25d22ba8
--- /dev/null
+++ b/ietf/secr/sreq/urls.py
@@ -0,0 +1,13 @@
+from django.conf.urls.defaults import *
+
+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_\-\+]+)/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'),
+)
diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py
new file mode 100644
index 000000000..4cb6fae20
--- /dev/null
+++ b/ietf/secr/sreq/views.py
@@ -0,0 +1,669 @@
+from django.conf import settings
+from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
+from django.db.models import Q
+from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+
+from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list
+from ietf.secr.utils.decorators import check_permissions, sec_only
+from ietf.secr.utils.group import get_my_groups, groups_by_session
+
+from ietf.ietfauth.decorators import has_role
+from ietf.utils.mail import send_mail
+from ietf.meeting.models import Meeting, Session, Constraint
+
+from ietf.group.models import Group, Role
+from ietf.name.models import SessionStatusName, ConstraintName
+
+from forms import *
+
+from itertools import chain
+import datetime
+import itertools
+
+# -------------------------------------------------
+# Globals
+# -------------------------------------------------
+SESSION_REQUEST_EMAIL = 'session-request@ietf.org'
+LOCKFILE = os.path.join(settings.SECR_PROCEEDINGS_DIR,'session_request.lock')
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+
+def check_app_locked():
+ '''
+ This function returns True if the application is locked to non-secretariat users.
+ '''
+ return os.path.exists(LOCKFILE)
+
+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
+ '''
+ 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
+
+ # accessing these foreign key fields throw errors if they are unset so we
+ # need to catch these
+ initial['length_session1'] = str(sessions[0].requested_duration.seconds)
+ try:
+ initial['length_session2'] = str(sessions[1].requested_duration.seconds)
+ initial['length_session3'] = str(sessions[2].requested_duration.seconds)
+ except IndexError:
+ pass
+ initial['attendees'] = sessions[0].attendees
+ initial['conflict1'] = ' '.join([ c.target.acronym for c in conflicts.filter(name__slug='conflict') ])
+ 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
+ return initial
+
+def get_lock_message():
+ '''
+ Returns the message to display to non-secretariat users when the tool is locked.
+ '''
+ try:
+ f = open(LOCKFILE,'r')
+ message = f.read()
+ f.close()
+ except IOError:
+ 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 save_conflicts(group, meeting, conflicts, name):
+ '''
+ This function takes a Group, Meeting a string which is a list of Groups acronyms (conflicts),
+ and the constraint name (conflict|conflic2|conflic3) and creates Constraint records
+ '''
+ constraint_name = ConstraintName.objects.get(slug=name)
+ acronyms = conflicts.replace(',',' ').split()
+ for acronym in acronyms:
+ target = Group.objects.get(acronym=acronym)
+
+ constraint = Constraint(source=group,
+ target=target,
+ meeting=meeting,
+ name=constraint_name)
+ constraint.save()
+
+def send_notification(group,meeting,login,session,action):
+ '''
+ This function generates email notifications for various session request activities.
+ session argument is a dictionary of fields from the session request form
+ action argument is a string [new|update].
+ '''
+ to_email = SESSION_REQUEST_EMAIL
+ cc_list = get_cc_list(group, login)
+ from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org')
+ subject = '%s - New Meeting Session Request for IETF %s' % (group.acronym, meeting.number)
+ template = 'sreq/session_request_notification.txt'
+
+ # send email
+ context = {}
+ context['session'] = session
+ context['group'] = group
+ context['meeting'] = meeting
+ context['login'] = login
+ context['header'] = 'A new'
+
+ # update overrides
+ if action == 'update':
+ subject = '%s - Update to a Meeting Session Request for IETF %s' % (group.acronym, meeting.number)
+ context['header'] = 'An update to a'
+
+ # if third session requested approval is required
+ # change headers TO=ADs, CC=session-request, submitter and cochairs
+ if session.get('length_session3',None):
+ context['session']['num_session'] = 3
+ to_email = get_ad_email_list(group)
+ cc_list = get_chair_email_list(group)
+ cc_list.append(SESSION_REQUEST_EMAIL)
+ if login.role_email(role_name='wg').address not in cc_list:
+ cc_list.append(login.role_email(role_name='wg').address)
+ subject = '%s - Request for meeting session approval for IETF %s' % (group.acronym, meeting.number)
+ template = 'sreq/session_approval_notification.txt'
+ status_text = 'the %s Directors for approval' % group.parent
+ send_mail(None,
+ to_email,
+ from_email,
+ subject,
+ template,
+ context,
+ cc=cc_list)
+
+def session_conflicts_as_string(group, meeting):
+ '''
+ Takes a Group object and Meeting object and returns a string of other groups which have
+ a conflict with this one
+ '''
+ group_list = [ g.source.acronym for g in group.constraint_target_set.filter(meeting=meeting) ]
+ return ', '.join(group_list)
+
+# -------------------------------------------------
+# View Functions
+# -------------------------------------------------
+@check_permissions
+def approve(request, acronym):
+ '''
+ This view approves the third session. For use by ADs or Secretariat.
+ '''
+ meeting = get_meeting()
+ group = get_object_or_404(Group, acronym=acronym)
+ session = Session.objects.get(meeting=meeting,group=group,status='apprw')
+
+ if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.get_profile()):
+ session.status = SessionStatusName.objects.get(slug='appr')
+ session.save()
+
+ messages.success(request, 'Third session approved')
+ url = reverse('sessions_view', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(url)
+ else:
+ # if an unauthorized user gets here return error
+ messages.error(request, 'Not authorized to approve the third session')
+ url = reverse('sessions_view', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(url)
+
+@check_permissions
+def cancel(request, acronym):
+ '''
+ This view cancels a session request and sends a notification.
+ To cancel, or withdraw the request set status = deleted.
+ "canceled" status is used by the secretariat.
+
+ NOTE: this function can also be called after a session has been
+ scheduled during the period when the session request tool is
+ reopened. In this case be sure to clear the timeslot assignment as well.
+ '''
+ meeting = get_meeting()
+ group = get_object_or_404(Group, acronym=acronym)
+ sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id')
+ login = request.user.get_profile()
+
+ # delete conflicts
+ Constraint.objects.filter(meeting=meeting,source=group).delete()
+
+ # mark sessions as deleted
+ for session in sessions:
+ session.status_id = 'deleted'
+ session.save()
+
+ # clear timeslot assignment if already scheduled
+ if session.timeslot_set.all():
+ timeslot = session.timeslot_set.all()[0]
+ timeslot.session = None
+ timeslot.save()
+
+ # log activity
+ #add_session_activity(group,'Session was cancelled',meeting,user)
+
+ # send notifitcation
+ to_email = SESSION_REQUEST_EMAIL
+ cc_list = get_cc_list(group, login)
+ from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org')
+ subject = '%s - Cancelling a meeting request for IETF %s' % (group.acronym, meeting.number)
+ send_mail(request, to_email, from_email, subject, 'sreq/session_cancel_notification.txt',
+ {'login':login,
+ 'group':group,
+ 'meeting':meeting}, cc=cc_list)
+
+ messages.success(request, 'The %s Session Request has been canceled' % group.acronym)
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+def confirm(request, acronym):
+ '''
+ This view displays details of the new session that has been requested for the user
+ to confirm for submission.
+ '''
+ querydict = request.session.get('session_form',None)
+ if not querydict:
+ raise Http404
+ form = querydict.copy()
+ meeting = get_meeting()
+ group = get_object_or_404(Group,acronym=acronym)
+ login = request.user.get_profile()
+
+ if request.method == 'POST':
+ # clear http session data
+ del request.session['session_form']
+
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ messages.success(request, 'Session Request has been canceled')
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ # delete any existing session records with status = canceled or notmeet
+ Session.objects.filter(group=group,meeting=meeting,status__in=('canceled','notmeet')).delete()
+
+ # create new session records
+ count = 0
+ # lenth_session2 and length_session3 fields might be disabled by javascript and so
+ # wouldn't appear in form data
+ for duration in (form.get('length_session1',None),form.get('length_session2',None),form.get('length_session3',None)):
+ count += 1
+ if duration:
+ slug = 'apprw' if count == 3 else 'schedw'
+ new_session = Session(meeting=meeting,
+ group=group,
+ attendees=form['attendees'],
+ requested=datetime.datetime.now(),
+ requested_by=login,
+ requested_duration=datetime.timedelta(0,int(duration)),
+ comments=form['comments'],
+ status=SessionStatusName.objects.get(slug=slug))
+ new_session.save()
+
+ # write constraint records
+ save_conflicts(group,meeting,form['conflict1'],'conflict')
+ save_conflicts(group,meeting,form['conflict2'],'conflic2')
+ save_conflicts(group,meeting,form['conflict3'],'conflic3')
+
+ # deprecated in new schema
+ # log activity
+ #add_session_activity(group,'New session was requested',meeting,user)
+
+ # clear not meeting
+ Session.objects.filter(group=group,meeting=meeting,status='notmeet').delete()
+
+ # send notification
+ send_notification(group,meeting,login,form,'new')
+
+ status_text = 'IETF Agenda to be scheduled'
+ messages.success(request, 'Your request has been sent to %s' % status_text)
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ # GET logic
+ session_conflicts = session_conflicts_as_string(group, meeting)
+
+ return render_to_response('sreq/confirm.html', {
+ 'session': form,
+ 'group': group,
+ 'session_conflicts': session_conflicts},
+ RequestContext(request, {}),
+ )
+
+@check_permissions
+def edit(request, acronym):
+ '''
+ This view allows the user to edit details of the session request
+ '''
+ meeting = get_meeting()
+ group = get_object_or_404(Group, acronym=acronym)
+ sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id')
+ sessions_count = sessions.count()
+ initial = get_initial_session(sessions)
+ session_conflicts = session_conflicts_as_string(group, meeting)
+ login = request.user.get_profile()
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('sessions_view', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(url)
+
+ form = SessionForm(request.POST,initial=initial)
+ 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
+ # session 1
+ 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 2
+ if 'length_session2' in form.changed_data:
+ length_session2 = form.cleaned_data['length_session2']
+ if length_session2 == '':
+ sessions[1].delete()
+ elif sessions_count < 2:
+ duration = datetime.timedelta(0,int(form.cleaned_data['length_session2']))
+ new_session = Session(meeting=meeting,
+ group=group,
+ attendees=form.cleaned_data['attendees'],
+ requested=datetime.datetime.now(),
+ requested_by=login,
+ requested_duration=duration,
+ comments=form.cleaned_data['comments'],
+ status=SessionStatusName.objects.get(slug='schedw'))
+ new_session.save()
+ else:
+ duration = datetime.timedelta(0,int(form.cleaned_data['length_session2']))
+ session = sessions[1]
+ session.requested_duration = duration
+ session.save()
+
+ # session 3
+ if 'length_session3' in form.changed_data:
+ length_session3 = form.cleaned_data['length_session3']
+ if length_session3 == '':
+ sessions[2].delete()
+ elif sessions_count < 3:
+ duration = datetime.timedelta(0,int(form.cleaned_data['length_session3']))
+ new_session = Session(meeting=meeting,
+ group=group,
+ attendees=form.cleaned_data['attendees'],
+ requested=datetime.datetime.now(),
+ requested_by=login,
+ requested_duration=duration,
+ comments=form.cleaned_data['comments'],
+ status=SessionStatusName.objects.get(slug='apprw'))
+ new_session.save()
+ else:
+ duration = datetime.timedelta(0,int(form.cleaned_data['length_session3']))
+ session = sessions[2]
+ session.requested_duration = duration
+ session.save()
+
+
+ if 'attendees' in form.changed_data:
+ sessions.update(attendees=form.cleaned_data['attendees'])
+ if 'comments' in form.changed_data:
+ sessions.update(comments=form.cleaned_data['comments'])
+ if 'conflict1' in form.changed_data:
+ Constraint.objects.filter(meeting=meeting,source=group,name='conflict').delete()
+ save_conflicts(group,meeting,form.cleaned_data['conflict1'],'conflict')
+ if 'conflict2' in form.changed_data:
+ Constraint.objects.filter(meeting=meeting,source=group,name='conflic2').delete()
+ save_conflicts(group,meeting,form.cleaned_data['conflict2'],'conflic2')
+ if 'conflict3' in form.changed_data:
+ Constraint.objects.filter(meeting=meeting,source=group,name='conflic3').delete()
+ save_conflicts(group,meeting,form.cleaned_data['conflict3'],'conflic3')
+
+ # deprecated
+ # log activity
+ #add_session_activity(group,'Session Request was updated',meeting,user)
+
+ # send notification
+ send_notification(group,meeting,login,form.cleaned_data,'update')
+
+ messages.success(request, 'Session Request updated')
+ url = reverse('sessions_view', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(url)
+
+ else:
+ form = SessionForm(initial=initial)
+
+ return render_to_response('sreq/edit.html', {
+ 'meeting': meeting,
+ 'form': form,
+ 'group': group,
+ 'session_conflicts': session_conflicts},
+ RequestContext(request, {}),
+ )
+
+def main(request):
+ '''
+ Display list of groups the user has access to.
+
+ Template variables
+ form: a select box populated with unscheduled groups
+ meeting: the current meeting
+ scheduled_sessions:
+ '''
+ # check for locked flag
+ is_locked = check_app_locked()
+
+ if is_locked and not has_role(request.user,'Secretariat'):
+ message = get_lock_message()
+ return render_to_response('sreq/locked.html', {
+ 'message': message},
+ RequestContext(request, {}),
+ )
+
+ # TODO this is not currently used in the main template
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Group will not meet':
+ url = reverse('sessions_no_session', kwargs={'acronym':request.POST['group']})
+ return HttpResponseRedirect(url)
+ else:
+ redirect_url = reverse('sessions_new', kwargs={'acronym':request.POST['group']})
+ return HttpResponseRedirect(redirect_url)
+
+ meeting = get_meeting()
+ scheduled_groups,unscheduled_groups = groups_by_session(request.user, meeting)
+
+ # load form select with unscheduled groups
+ choices = zip([ g.pk for g in unscheduled_groups ],
+ [ str(g) for g in unscheduled_groups ])
+ form = GroupSelectForm(choices=choices)
+
+ # add session status messages for use in template
+ for group in scheduled_groups:
+ sessions = group.session_set.filter(meeting=meeting)
+ if sessions.count() < 3:
+ group.status_message = sessions[0].status
+ else:
+ group.status_message = 'First two sessions: %s, Third session: %s' % (sessions[0].status,sessions[2].status)
+
+ # add not meeting indicators for use in template
+ for group in unscheduled_groups:
+ if group.session_set.filter(meeting=meeting,status='notmeet'):
+ group.not_meeting = True
+
+ return render_to_response('sreq/main.html', {
+ 'is_locked': is_locked,
+ 'form': form,
+ 'meeting': meeting,
+ 'scheduled_groups': scheduled_groups,
+ 'unscheduled_groups': unscheduled_groups},
+ RequestContext(request, {}),
+ )
+
+@check_permissions
+def new(request, acronym):
+ '''
+ This view gathers details for a new session request. The user proceeds to confirm()
+ to create the request.
+ '''
+
+ group = get_object_or_404(Group, acronym=acronym)
+ meeting = get_meeting()
+ session_conflicts = session_conflicts_as_string(group, meeting)
+ user = request.user
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Cancel':
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ form = SessionForm(request.POST)
+ if form.is_valid():
+ # check if request already exists for this group
+ if Session.objects.filter(group=group,meeting=meeting).exclude(status__in=('deleted','notmeet')):
+ messages.warning(request, 'Sessions for working group %s have already been requested once.' % group.acronym)
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ # save in user session
+ request.session['session_form'] = form.data
+
+ url = reverse('sessions_confirm',kwargs={'acronym':acronym})
+ return HttpResponseRedirect(url)
+
+ # the "previous" querystring causes the form to be returned
+ # pre-populated with data from last meeeting's session request
+ elif request.method == 'GET' and request.GET.has_key('previous'):
+ previous_meeting = Meeting.objects.get(number=str(int(meeting.number) - 1))
+ previous_sessions = Session.objects.filter(meeting=previous_meeting,group=group).exclude(status__in=('notmeet','deleted')).order_by('id')
+ if not previous_sessions:
+ messages.warning(request, 'This group did not meet at %s' % previous_meeting)
+ redirect_url = reverse('sessions_new', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(redirect_url)
+
+ initial = get_initial_session(previous_sessions)
+ form = SessionForm(initial=initial)
+
+ else:
+ form = SessionForm()
+
+ return render_to_response('sreq/new.html', {
+ 'meeting': meeting,
+ 'form': form,
+ 'group': group,
+ 'session_conflicts': session_conflicts},
+ RequestContext(request, {}),
+ )
+
+@check_permissions
+def no_session(request, acronym):
+ '''
+ The user has indicated that the named group will not be having a session this IETF meeting.
+ Actions:
+ - send notification
+ - update session_activity log
+ '''
+ meeting = get_meeting()
+ group = get_object_or_404(Group, acronym=acronym)
+ login = request.user.get_profile()
+
+ # delete canceled record if there is one
+ Session.objects.filter(group=group,meeting=meeting,status='canceled').delete()
+
+ # skip if state is already notmeet
+ if Session.objects.filter(group=group,meeting=meeting,status='notmeet'):
+ messages.info(request, 'The group %s is already marked as not meeting' % group.acronym)
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ session = Session(group=group,
+ meeting=meeting,
+ requested=datetime.datetime.now(),
+ requested_by=login,
+ requested_duration=0,
+ status=SessionStatusName.objects.get(slug='notmeet'))
+ session.save()
+
+ # send notification
+ to_email = SESSION_REQUEST_EMAIL
+ cc_list = get_cc_list(group, login)
+ from_email = ('"IETF Meeting Session Request Tool"','session_request_developers@ietf.org')
+ subject = '%s - Not having a session at IETF %s' % (group.acronym, meeting.number)
+ send_mail(request, to_email, from_email, subject, 'sreq/not_meeting_notification.txt',
+ {'login':login,
+ 'group':group,
+ 'meeting':meeting}, cc=cc_list)
+
+ # deprecated?
+ # log activity
+ #text = 'A message was sent to notify not having a session at IETF %d' % meeting.meeting_num
+ #add_session_activity(group,text,meeting,request.person)
+
+ # redirect
+ messages.success(request, 'A message was sent to notify not having a session at IETF %s' % meeting.number)
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+@sec_only
+def tool_status(request):
+ '''
+ This view handles locking and unlocking of the tool to the public.
+ '''
+ is_locked = check_app_locked()
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+ if button_text == 'Done':
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ form = ToolStatusForm(request.POST)
+
+ if button_text == 'Lock':
+ if form.is_valid():
+ f = open(LOCKFILE,'w')
+ f.write(form.cleaned_data['message'])
+ f.close()
+
+ messages.success(request, 'Session Request Tool is now Locked')
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ elif button_text == 'Unlock':
+ os.remove(LOCKFILE)
+
+ messages.success(request, 'Session Request Tool is now Unlocked')
+ url = reverse('sessions')
+ return HttpResponseRedirect(url)
+
+ else:
+ if is_locked:
+ message = get_lock_message()
+ initial = {'message': message}
+ form = ToolStatusForm(initial=initial)
+ else:
+ form = ToolStatusForm()
+
+ return render_to_response('sreq/tool_status.html', {
+ 'is_locked': is_locked,
+ 'form': form},
+ RequestContext(request, {}),
+ )
+
+def view(request, acronym):
+ '''
+ This view displays the session request info
+ '''
+ meeting = get_meeting()
+ 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')
+
+ # if there are no session requests yet, redirect to new session request page
+ if not sessions:
+ redirect_url = reverse('sessions_new', kwargs={'acronym':acronym})
+ return HttpResponseRedirect(redirect_url)
+
+ # TODO simulate activity records
+ activities = [{'act_date':sessions[0].requested.strftime('%b %d, %Y'),
+ 'act_time':sessions[0].requested.strftime('%H:%M:%S'),
+ 'activity':'New session was requested',
+ 'act_by':sessions[0].requested_by}]
+ if sessions[0].scheduled:
+ activities.append({'act_date':sessions[0].scheduled.strftime('%b %d, %Y'),
+ 'act_time':sessions[0].scheduled.strftime('%H:%M:%S'),
+ 'activity':'Session was scheduled',
+ 'act_by':'Secretariat'})
+
+ # other groups that list this group in their conflicts
+ session_conflicts = session_conflicts_as_string(group, meeting)
+ show_approve_button = False
+
+ # if sessions include a 3rd session waiting approval and the user is a secretariat or AD of the group
+ # display approve button
+ if sessions.filter(status='apprw'):
+ if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.get_profile()):
+ show_approve_button = True
+
+ # build session dictionary (like querydict from new session request form) for use in template
+ session = get_initial_session(sessions)
+
+ return render_to_response('sreq/view.html', {
+ 'session': session,
+ 'activities': activities,
+ 'meeting': meeting,
+ 'group': group,
+ 'session_conflicts': session_conflicts,
+ 'show_approve_button': show_approve_button},
+ RequestContext(request, {}),
+ )
+
diff --git a/ietf/secr/telechat/__init__.py b/ietf/secr/telechat/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/secr/telechat/forms.py b/ietf/secr/telechat/forms.py
new file mode 100644
index 000000000..f17c47931
--- /dev/null
+++ b/ietf/secr/telechat/forms.py
@@ -0,0 +1,48 @@
+from ietf.iesg.models import TelechatAgendaItem
+from ietf.doc.models import State
+from ietf.name.models import BallotPositionName, DocTagName
+from ietf.person.models import Person
+
+from django import forms
+
+# -------------------------------------------------
+# Globals
+# -------------------------------------------------
+
+TELECHAT_TAGS = ('point','ad-f-up','extpty','need-rev')
+
+# -------------------------------------------------
+# Forms
+# -------------------------------------------------
+
+class BallotForm(forms.Form):
+ name = forms.CharField(max_length=50,widget=forms.HiddenInput)
+ id = forms.IntegerField(widget=forms.HiddenInput)
+ position = forms.ModelChoiceField(queryset=BallotPositionName.objects.exclude(slug='block').order_by('order'), widget=forms.RadioSelect, initial="norecord", required=True)
+
+class ChangeStateForm(forms.Form):
+ '''
+ This form needs to handle documents of different types (draft, and conflrev for now).
+ Start with all document states in the state ModelChoice query, on init restrict the
+ query to be the same type as the initial doc_state.
+ '''
+ state = forms.ModelChoiceField(State.objects.all(), empty_label=None, required=True)
+ substate = forms.ModelChoiceField(DocTagName.objects.filter(slug__in=(TELECHAT_TAGS)), required=False)
+
+ def __init__(self,*args,**kwargs):
+ super(ChangeStateForm, self).__init__(*args,**kwargs)
+ state = State.objects.get(id=self.initial['state'])
+ self.fields['state'].queryset = State.objects.filter(type=state.type)
+
+class DateSelectForm(forms.Form):
+ date = forms.ChoiceField()
+
+ def __init__(self,*args,**kwargs):
+ choices = kwargs.pop('choices')
+ super(DateSelectForm, self).__init__(*args,**kwargs)
+ self.fields['date'].widget.choices = choices
+
+class IssueModelForm(forms.ModelForm):
+ class Meta:
+ model = TelechatAgendaItem
+
\ No newline at end of file
diff --git a/ietf/secr/telechat/models.py b/ietf/secr/telechat/models.py
new file mode 100644
index 000000000..137941ffa
--- /dev/null
+++ b/ietf/secr/telechat/models.py
@@ -0,0 +1 @@
+from django.db import models
diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py
new file mode 100644
index 000000000..e9e0eea99
--- /dev/null
+++ b/ietf/secr/telechat/tests.py
@@ -0,0 +1,35 @@
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+
+from ietf.iesg.models import TelechatDate, TelechatAgendaItem, WGAction
+from ietf.person.models import Person
+from ietf.utils.test_data import make_test_data
+
+from pyquery import PyQuery
+
+import datetime
+
+SECR_USER='secretary'
+
+def augment_data():
+ TelechatDate.objects.create(date=datetime.datetime.today())
+
+class MainTestCase(TestCase):
+ fixtures = ['names']
+
+ def test_main(self):
+ "Main Test"
+ augment_data()
+ url = reverse('telechat')
+ response = self.client.get(url, REMOTE_USER=SECR_USER)
+ self.assertEquals(response.status_code, 200)
+
+ def test_doc(self):
+ "View Test"
+ augment_data()
+ d = TelechatDate.objects.all()[0]
+ date = d.date.strftime('%Y-%m-%d')
+ url = reverse('telechat_doc', kwargs={'date':date})
+ response = self.client.get(url, REMOTE_USER=SECR_USER)
+ self.assertEquals(response.status_code, 200)
+
diff --git a/ietf/secr/telechat/urls.py b/ietf/secr/telechat/urls.py
new file mode 100644
index 000000000..f9287495e
--- /dev/null
+++ b/ietf/secr/telechat/urls.py
@@ -0,0 +1,14 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('ietf.secr.telechat.views',
+ url(r'^$', 'main', name='telechat'),
+ url(r'^(?P[0-9\-]+)/bash/$', 'bash', name='telechat_bash'),
+ url(r'^(?P[0-9\-]+)/doc/$', 'doc', name='telechat_doc'),
+ url(r'^(?P[0-9\-]+)/doc/(?P[A-Za-z0-9.-]+)/$', 'doc_detail', name='telechat_doc_detail'),
+ url(r'^(?P[0-9\-]+)/doc/(?P[A-Za-z0-9.-]+)/(?Pnext|previous)/$', 'doc_navigate',
+ name='telechat_doc_navigate'),
+ url(r'^(?P[0-9\-]+)/management/$', 'management', name='telechat_management'),
+ url(r'^(?P[0-9\-]+)/minutes/$', 'minutes', name='telechat_minutes'),
+ url(r'^(?P[0-9\-]+)/roll-call/$', 'roll_call', name='telechat_roll_call'),
+ url(r'^new/$', 'new', name='telechat_new'),
+)
diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py
new file mode 100644
index 000000000..0de92237a
--- /dev/null
+++ b/ietf/secr/telechat/views.py
@@ -0,0 +1,439 @@
+from django.contrib import messages
+from django.core.urlresolvers import reverse
+from django.db.models import Count
+from django.forms.models import inlineformset_factory, modelformset_factory
+from django.forms.formsets import formset_factory
+from django.http import HttpResponseRedirect, HttpResponse
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+
+from ietf.doc.models import DocEvent, Document, BallotDocEvent, BallotPositionDocEvent, TelechatDocEvent, WriteupDocEvent, save_document_in_history
+from ietf.doc.proxy import InternetDraft
+from ietf.doc.utils import get_document_content, log_state_changed
+from ietf.group.models import Group
+from ietf.name.models import BallotPositionName
+from ietf.person.models import Person
+from ietf.idrfc.lastcall import request_last_call
+from ietf.idrfc.mails import email_owner, email_state_changed
+from ietf.idrfc.utils import add_document_comment
+from ietf.iesg.models import TelechatDate, TelechatAgendaItem, WGAction
+from ietf.iesg.views import _agenda_data
+
+from forms import *
+import os
+import datetime
+
+'''
+EXPECTED CHANGES:
+x group pages will be just another doc, charter doc
+x charter docs to discuss will be passed in the 'docs' section of agenda
+x expand get_section_header to include section 4
+x consolidate views (get rid of get_group_header,group,group_navigate)
+
+'''
+# -------------------------------------------------
+# Notes on external helpers
+# -------------------------------------------------
+'''
+active_ballot_positions: takes one argument, doc. returns a dictionary with a key for each ad Person object
+NOTE: this function has been deprecated as of Datatracker 4.34. Should now use methods on the Document.
+For example: doc.active_ballot().active_ad_positions()
+
+_agenda_data: takes a request object and a date string in the format YYYY-MM-DD.
+ - 2012-07-28 this function was changed to return Document objects instead
+ of old InternetDraft wrappers
+'''
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+def get_doc_list(agenda):
+ '''
+ This function takes an agenda dictionary and returns a list of
+ Document objects in the order they appear in the agenda sections 1-3.
+ '''
+ docs = []
+ for key in sorted(agenda['docs']):
+ docs.extend(agenda['docs'][key])
+
+ return [x['obj'] for x in docs]
+
+def get_doc_writeup(doc):
+ '''
+ This function takes a Document object and returns the ballot writeup for display
+ in the detail view. In the case of Conflict Review documents we actually
+ want to display the contents of the document
+ '''
+ writeup = 'This document has no writeup'
+ if doc.type_id in ('draft','charter'):
+ latest = doc.latest_event(WriteupDocEvent, type='changed_ballot_writeup_text')
+ if latest:
+ writeup = latest.text
+ elif doc.type_id == 'conflrev':
+ path = os.path.join(doc.get_file_path(),doc.filename_with_rev())
+ writeup = get_document_content(doc.name,path,split=False,markup=False)
+ return writeup
+
+def get_last_telechat_date():
+ '''
+ This function returns the date of the last telechat
+ Tried TelechatDocEvent.objects.latest but that will return today's telechat
+ '''
+ return TelechatDate.objects.filter(date__lt=datetime.date.today()).order_by('-date')[0].date
+ #return '2011-11-01' # uncomment for testing
+
+def get_next_telechat_date():
+ '''
+ This function returns the date of the next telechat
+ '''
+ return TelechatDate.objects.filter(date__gte=datetime.date.today()).order_by('date')[0].date
+
+def get_section_header(file,agenda):
+ '''
+ This function takes a filename and an agenda dictionary and returns the
+ agenda section header as a string for use in the doc template
+ '''
+ h1 = {'2':'Protocol Actions','3':'Document Actions','4':'Working Group Actions'}
+ h2a = {'1':'WG Submissions','2':'Individual Submissions'}
+ h2b = {'1':'WG Submissions','2':'Individual Submissions via AD','3':'IRTF and Independent Submission Stream Documents'}
+ h2c = {'1':'WG Creation','2':'WG Chartering'}
+ h3a = {'1':'New Item','2':'Returning Item','3':'For Action'}
+ h3b = {'1':'Proposed for IETF Review','2':'Proposed for Approval'}
+ h3c = {'1':'Under Evaluation for IETF Review','2':'Proposed for Approval'}
+
+ # Robert updated _agenda_data to return Document objects instead of the ID wrapper
+ #doc = InternetDraft.objects.get(filename=file)
+ doc = Document.objects.get(name=file)
+
+ test = {'obj':doc}
+ for k,v in agenda['docs'].iteritems():
+ if test in v:
+ section = k
+ count = '%s of %s' % (v.index(test) + 1, len(v))
+ break
+
+ header = [ '%s %s' % (section[1], h1[section[1]]) ]
+ if section[1] == '2':
+ header.append('%s.%s %s' % (section[1], section[2], h2a[section[2]]))
+ elif section[1] == '4':
+ header.append('%s.%s %s' % (section[1], section[2], h2c[section[2]]))
+ else:
+ header.append('%s.%s %s' % (section[1], section[2], h2b[section[2]]))
+ if section[1] == '4':
+ if section[2] == '1':
+ header.append('%s.%s.%s %s' % (section[1], section[2], section[3], h3b[section[3]]))
+ elif section[2] == '2':
+ header.append('%s.%s.%s %s' % (section[1], section[2], section[3], h3c[section[3]]))
+ else:
+ header.append('%s.%s.%s %s' % (section[1], section[2], section[3], h3a[section[3]]))
+ header.append(count)
+
+ return header
+
+def get_first_doc(agenda):
+ '''
+ This function takes an agenda dictionary and returns the first document in the agenda
+ '''
+ for k,v in sorted(agenda['docs'].iteritems()):
+ if v:
+ return v[0]['obj']
+
+ return None
+
+# -------------------------------------------------
+# View Functions
+# -------------------------------------------------
+def bash(request, date):
+
+ agenda = _agenda_data(request, date=date)
+
+ return render_to_response('telechat/bash.html', {
+ 'agenda': agenda,
+ 'date': date},
+ RequestContext(request, {}),
+ )
+
+def doc(request, date):
+ '''
+ This view redirects to doc_detail using the first document in the agenda or
+ displays the message "No Documents"
+ '''
+
+ agenda = _agenda_data(request, date=date)
+ doc = get_first_doc(agenda)
+ if doc:
+ url = reverse('telechat_doc_detail', kwargs={'date':date,'name':doc.name})
+ return HttpResponseRedirect(url)
+ else:
+ return render_to_response('telechat/doc.html', {
+ 'agenda': agenda,
+ 'date': date,
+ 'document': None},
+ RequestContext(request, {}),
+ )
+
+def doc_detail(request, date, name):
+ '''
+ This view displays the ballot information for the document, and lets the user make
+ changes to ballot positions and document state.
+ '''
+ doc = get_object_or_404(Document, docalias__name=name)
+
+ # As of Datatracker v4.32, Conflict Review (conflrev) Document Types can
+ # be added to the Telechat agenda. We need to check the document type here
+ # and set the state_type for use later in the view
+ if doc.type_id == 'draft':
+ state_type = 'draft-iesg'
+ elif doc.type_id == 'conflrev':
+ state_type = 'conflrev'
+ elif doc.type_id == 'charter':
+ state_type = 'charter'
+
+ started_process = doc.latest_event(type="started_iesg_process")
+ login = request.user.get_profile()
+
+ if doc.active_ballot():
+ ballots = doc.active_ballot().active_ad_positions() # returns dict of ad:ballotpositiondocevent
+ else:
+ ballots = []
+
+ # setup form initials
+ initial_ballot = []
+ open_positions = 0
+ for key in sorted(ballots, key = lambda a: a.name_parts()[3]):
+ initial_ballot.append({'name':key.name,'id':key.id,'position':ballots[key].pos.slug if ballots[key] else None})
+ if ballots[key] and ballots[key].pos.slug == 'norecord':
+ open_positions += 1
+ elif not ballots[key]:
+ open_positions += 1
+
+ tags = doc.tags.filter(slug__in=TELECHAT_TAGS)
+ tag = tags[0].pk if tags else None
+
+ writeup = get_doc_writeup(doc)
+
+ initial_state = {'state':doc.get_state(state_type).pk,
+ 'substate':tag}
+
+ BallotFormset = formset_factory(BallotForm, extra=0)
+ agenda = _agenda_data(request, date=date)
+ header = get_section_header(name,agenda) if name else ''
+
+ # nav button logic
+ doc_list = get_doc_list(agenda)
+ nav_start = nav_end = False
+ if doc == doc_list[0]:
+ nav_start = True
+ if doc == doc_list[-1]:
+ nav_end = True
+
+ if request.method == 'POST':
+ button_text = request.POST.get('submit', '')
+
+ # logic from idrfc/views_ballot.py EditPositionRedesign
+ if button_text == 'update_ballot':
+ formset = BallotFormset(request.POST, initial=initial_ballot)
+ state_form = ChangeStateForm(initial=initial_state)
+ has_changed = False
+ for form in formset.forms:
+ if form.is_valid() and form.changed_data:
+ # create new BallotPositionDocEvent
+ clean = form.cleaned_data
+ ad = Person.objects.get(id=clean['id'])
+ pos = BallotPositionDocEvent(doc=doc,by=login)
+ pos.type = "changed_ballot_position"
+ pos.ad = ad
+ pos.ballot = doc.latest_event(BallotDocEvent, type="created_ballot")
+ pos.pos = clean['position']
+ if form.initial['position'] == None:
+ pos.desc = '[Ballot Position Update] New position, %s, has been recorded for %s by %s' % (pos.pos.name, ad.name, login.name)
+ else:
+ pos.desc = '[Ballot Position Update] Position for %s has been changed to %s by %s' % (ad.name, pos.pos.name, login.name)
+ pos.save()
+ has_changed = True
+
+ if has_changed:
+ messages.success(request,'Ballot position changed.')
+ url = reverse('telechat_doc_detail', kwargs={'date':date,'name':name})
+ return HttpResponseRedirect(url)
+
+ # logic from idrfc/views_edit.py change_stateREDESIGN
+ elif button_text == 'update_state':
+ formset = BallotFormset(initial=initial_ballot)
+ state_form = ChangeStateForm(request.POST, initial=initial_state)
+ if state_form.is_valid():
+ state = state_form.cleaned_data['state']
+ tag = state_form.cleaned_data['substate']
+ prev = doc.get_state(state_type)
+
+ # tag handling is a bit awkward since the UI still works
+ # as if IESG tags are a substate
+ prev_tag = doc.tags.filter(slug__in=(TELECHAT_TAGS))
+ prev_tag = prev_tag[0] if prev_tag else None
+
+ #if state != prev or tag != prev_tag:
+ if state_form.changed_data:
+ save_document_in_history(doc)
+ old_description = doc.friendly_state()
+
+ if 'state' in state_form.changed_data:
+ doc.set_state(state)
+
+ if 'substate' in state_form.changed_data:
+ if prev_tag:
+ doc.tags.remove(prev_tag)
+ if tag:
+ doc.tags.add(tag)
+
+ new_description = doc.friendly_state()
+ e = log_state_changed(request, doc, login, new_description, old_description)
+ doc.time = e.time
+ doc.save()
+
+ email_state_changed(request, doc, e.desc)
+ email_owner(request, doc, doc.ad, login, e.desc)
+
+ if state.slug == "lc-req":
+ request_last_call(request, doc)
+
+ messages.success(request,'Document state updated')
+ url = reverse('telechat_doc_detail', kwargs={'date':date,'name':name})
+ return HttpResponseRedirect(url)
+ else:
+ formset = BallotFormset(initial=initial_ballot)
+ state_form = ChangeStateForm(initial=initial_state)
+
+ # if this is a conflict review document add referenced document
+ if doc.type_id == 'conflrev':
+ conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target.document
+ else:
+ conflictdoc = None
+
+ return render_to_response('telechat/doc.html', {
+ 'date': date,
+ 'document': doc,
+ 'conflictdoc': conflictdoc,
+ 'agenda': agenda,
+ 'formset': formset,
+ 'header': header,
+ 'open_positions': open_positions,
+ 'state_form': state_form,
+ 'writeup': writeup,
+ 'nav_start': nav_start,
+ 'nav_end': nav_end},
+ RequestContext(request, {}),
+ )
+
+def doc_navigate(request, date, name, nav):
+ '''
+ This view takes three arguments:
+ date - the date of the Telechat
+ name - the name of the current document being displayed
+ nav - [next|previous] which direction the user wants to navigate in the list of docs
+ The view retrieves the appropriate document and redirects to the doc view.
+ '''
+ doc = get_object_or_404(Document, docalias__name=name)
+ agenda = _agenda_data(request, date=date)
+ target = name
+
+ docs = get_doc_list(agenda)
+ index = docs.index(doc)
+
+ if nav == 'next' and index < len(docs) - 1:
+ target = docs[index + 1].name
+ elif nav == 'previous' and index != 0:
+ target = docs[index - 1].name
+
+ url = reverse('telechat_doc_detail', kwargs={'date':date,'name':target})
+ return HttpResponseRedirect(url)
+
+def main(request):
+ '''
+ The is the main view where the user selects an existing telechat or creates a new one.
+
+ NOTES ON EXTERNAL HELPER FUNCTIONS:
+ _agenda_data(): returns dictionary of agenda sections
+ get_ballot(name): returns a BallotWrapper and RfcWrapper or IdWrapper
+ '''
+ if request.method == 'POST':
+ date=request.POST['date']
+ url = reverse('telechat_doc', kwargs={'date':date})
+ return HttpResponseRedirect(url)
+
+ choices = [ (d.date.strftime('%Y-%m-%d'),
+ d.date.strftime('%Y-%m-%d')) for d in TelechatDate.objects.all() ]
+ next_telechat = get_next_telechat_date().strftime('%Y-%m-%d')
+ form = DateSelectForm(choices=choices,initial={'date':next_telechat})
+
+ return render_to_response('telechat/main.html', {
+ 'form': form},
+ RequestContext(request, {}),
+ )
+
+def management(request, date):
+ '''
+ This view displays management issues and lets the user update the status
+ '''
+
+ agenda = _agenda_data(request, date=date)
+ issues = TelechatAgendaItem.objects.filter(type=3).order_by('id')
+
+ return render_to_response('telechat/management.html', {
+ 'agenda': agenda,
+ 'date': date,
+ 'issues': issues},
+ RequestContext(request, {}),
+ )
+
+def minutes(request, date):
+ '''
+ This view shows a list of documents that were approved since the last telechat
+ '''
+ # get the telechat previous to selected one
+ dates = [ t.date for t in TelechatDate.objects.all() ]
+ y,m,d = date.split('-')
+ current = datetime.date(int(y),int(m),int(d))
+ index = dates.index(current)
+ previous = dates[index + 1]
+ events = DocEvent.objects.filter(type='iesg_approved',time__gte=previous,time__lt=current,doc__type='draft')
+ docs = [ e.doc for e in events ]
+ pa_docs = [ d for d in docs if d.intended_std_level.slug not in ('inf','exp','hist') ]
+ da_docs = [ d for d in docs if d.intended_std_level.slug in ('inf','exp','hist') ]
+
+ agenda = _agenda_data(request, date=date)
+
+ return render_to_response('telechat/minutes.html', {
+ 'agenda': agenda,
+ 'date': date,
+ 'last_date': previous,
+ 'pa_docs': pa_docs,
+ 'da_docs': da_docs},
+ RequestContext(request, {}),
+ )
+
+def new(request):
+ '''
+ This view creates a new telechat agenda and redirects to the default view
+ '''
+ if request.method == 'POST':
+ date = request.POST['date']
+ # create legacy telechat record
+ Telechat.objects.create(telechat_date=date)
+
+ messages.success(request,'New Telechat Agenda created')
+ url = reverse('telechat_doc', kwargs={'date':date,'name':name})
+ return HttpResponseRedirect(url)
+
+def roll_call(request, date):
+
+ agenda = _agenda_data(request, date=date)
+ ads = Person.objects.filter(role__name='ad')
+ sorted_ads = sorted(ads, key = lambda a: a.name_parts()[3])
+
+ return render_to_response('telechat/roll_call.html', {
+ 'agenda': agenda,
+ 'date': date,
+ 'people':sorted_ads},
+ RequestContext(request, {}),
+ )
+
\ No newline at end of file
diff --git a/ietf/secr/templates/announcement/confirm.html b/ietf/secr/templates/announcement/confirm.html
new file mode 100644
index 000000000..2b74516a8
--- /dev/null
+++ b/ietf/secr/templates/announcement/confirm.html
@@ -0,0 +1,41 @@
+{% extends "base_site.html" %}
+
+{% block title %}Announcement{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Announcement
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/announcement/main.html b/ietf/secr/templates/announcement/main.html
new file mode 100644
index 000000000..61df88e35
--- /dev/null
+++ b/ietf/secr/templates/announcement/main.html
@@ -0,0 +1,34 @@
+{% extends "base_site.html" %}
+
+{% block title %}Announcement{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Announcement
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/areas/add.html b/ietf/secr/templates/areas/add.html
new file mode 100644
index 000000000..9d4a03a30
--- /dev/null
+++ b/ietf/secr/templates/areas/add.html
@@ -0,0 +1,31 @@
+{% extends "base_site.html" %}
+
+{% block title %}Areas - Add{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Areas
+ » Add
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/areas/edit.html b/ietf/secr/templates/areas/edit.html
new file mode 100644
index 000000000..652568e63
--- /dev/null
+++ b/ietf/secr/templates/areas/edit.html
@@ -0,0 +1,32 @@
+{% extends "base_site.html" %}
+
+{% block title %}Areas - Edit{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Areas
+ » {{ area.acronym }}
+ » Edit
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/areas/list.html b/ietf/secr/templates/areas/list.html
new file mode 100644
index 000000000..ec20611fa
--- /dev/null
+++ b/ietf/secr/templates/areas/list.html
@@ -0,0 +1,42 @@
+{% extends "base_site.html" %}
+
+{% block title %}Areas{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Areas
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
+ Name
+ Acronym
+ Status
+
+
+
+ {% for item in results %}
+
+ {{ item.name }} {{ item.acronym }}
+ {{ item.state }}
+
+ {% endfor %}
+
+
+
+
+
Areas
+ » {{ area.acronym }}
+ » People
+{% endblock %}
+
+{% block content %}
+
+
+
Area Directors ({{ area.acronym }})
+
+ {% for director in directors %}
+
+ {% endfor %}
+
+
+
+
+
+
Areas
+ » {{ area.acronym }}
+{% endblock %}
+
+{% block content %}
+
+
+
Area - View
+
+ Area Acronym: {{ area.acronym }} Area Name: {{ area.name }} Status: {{ area.state }} Start Date: {{ area.start_date|date:"Y-m-d" }} Concluded Date: {{ area.concluded_date|date:"Y-m-d" }} Last Modified Date: {{ area.time|date:"Y-m-d" }} Comments: {{ area.comments}}
+
+
+
+ {% with area.groupurl_set.all as awps %}
+ {% include "includes/awp_view.html" %}
+ {% endwith %}
+
+
+
{% block title %}{% endblock %}
+
+
+ {% if not is_popup %}
+
+
+
+
+
+
+
+
+
+ {% block breadcrumbs %}Home {% endblock %}
+
+
+ {% block instructions %}{% endblock %}
+
+
+
+
+
+ {% endif %}
+
+ {% comment %}
+
+
+
You have Javascript disabled. Javascript is required for this application.
+ {% endcomment %}
+
+
+ {% if messages %}
+
+ {% for message in messages %}
+ {{ message }}
+ {% endfor %}
+
+ {% endif %}
+
+
+
+ {% block pretitle %}{% endblock %}
+ {% block content_title %}{% if title %}
{{ title }} {% endif %}{% endblock %}
+ {% block content %}
+ {% block object-tools %}{% endblock %}
+ {{ content }}
+ {% endblock %}
+ {% block sidebar %}{% endblock %}
+
+
+
+ {% block footer %}{% endblock %}
+
+
+
+ {% if request.user_is_secretariat %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}
+
+
+ {% if request.user_is_secretariat %}Secretariat {% endif %}Logged in: {{ request.META.REMOTE_USER }}
+
+
+
+{% endblock %}
+
+{% block nav-global %}{% endblock %}
+
+{% block footer %}
+
+{% endblock %}
diff --git a/ietf/secr/templates/console/main.html b/ietf/secr/templates/console/main.html
new file mode 100644
index 000000000..64be90091
--- /dev/null
+++ b/ietf/secr/templates/console/main.html
@@ -0,0 +1,20 @@
+{% extends "base_site.html" %}
+
+{% block title %}Console{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Console
+{% endblock %}
+
+{% block content %}
+
+
+
Console
+
+
+ Latest DocEvent {{ latest_docevent }}
+
+
Drafts
+ » {{ draft.canonical_name }}
+ » Abstract
+{% endblock %}
+
+{% block content %}
+
+
+
View Abstract - {{ draft.canonical_name }}
+
+ {{ draft.abstract }}
+
+
+
+
Drafts
+ » Add
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/drafts/approvals.html b/ietf/secr/templates/drafts/approvals.html
new file mode 100644
index 000000000..f3a7d7729
--- /dev/null
+++ b/ietf/secr/templates/drafts/approvals.html
@@ -0,0 +1,46 @@
+{% extends "base_site.html" %}
+
+{% block title %}Drafts - Approvals{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Drafts Approvals
+{% endblock %}
+
+{% block content %}
+
+
+
Draft - Approvals
+
+
+
+
Approved Drafts
+
+
+
+ Filename
+ Approved Date
+ Approved by
+
+
+
+ {% for doc in approved %}
+
+ {{ doc.name }}
+ {{ doc.time|date:"Y-m-d" }}
+ {{ doc.by }}
+
+ {% endfor %}
+
+
+
+
Drafts
+ » {{ draft.name }}
+ » Authors
+{% endblock %}
+
+{% block content %}
+
+
+
Authors
+
+
+
+ Name
+ Email
+ Order
+ Action
+
+
+
+ {% for author in draft.documentauthor_set.all %}
+
+ {{ author.author.person }}
+ {{ author.author }}
+ {{ author.order }}
+ Delete
+ {% endfor %}
+
+
+
+
+
+
+
+
+
Drafts
+ » {{ draft.name }}
+ » Confirm
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/drafts/dates.html b/ietf/secr/templates/drafts/dates.html
new file mode 100644
index 000000000..212bcdfd6
--- /dev/null
+++ b/ietf/secr/templates/drafts/dates.html
@@ -0,0 +1,35 @@
+{% extends "base_site.html" %}
+
+{% block title %}Drafts - Submission Dates{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Drafts
+ » Submission Dates
+{% endblock %}
+
+{% block content %}
+
+
+
Draft - Submission Dates
+
+ First Cut Off (Initial Version) {{ meeting.get_first_cut_off }} Second Cut Off (Update Version) {{ meeting.get_second_cut_off }} IETF Monday {{ meeting.get_ietf_monday }} All I-Ds will be processed by Monday after IETF Date for list of approved V-00 submissions from WG Chairs
+
+
+
+
Drafts
+ » {{ draft.name }}
+ » Edit
+{% endblock %}
+
+{% block content %}
+
+
+
Draft - Edit
+ {{ form.non_field_errors }}
+
+
Drafts
+ » {{ draft.name }}
+ » Email
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/drafts/error.html b/ietf/secr/templates/drafts/error.html
new file mode 100644
index 000000000..b84915eb8
--- /dev/null
+++ b/ietf/secr/templates/drafts/error.html
@@ -0,0 +1,23 @@
+{% extends "base_site.html" %}
+
+{% block title %}Drafts{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Drafts
+{% endblock %}
+
+{% block content %}
+
+
+
Drafts - Error Message
+ An ERROR has occured:
+
{{ error }}
+
+
+
Drafts
+ » {{ draft.name }}
+ » Extend
+{% endblock %}
+
+{% block content %}
+
+
+
Draft - Extend Expiry
+
+
+
Drafts
+ » {{ draft.name }}
+ » Make RFC
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+ {% include "includes/buttons_save_cancel.html" %}
+
+
Drafts
+ » {{ draft.name }}
+ » Replace
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/drafts/report_id_activity.txt b/ietf/secr/templates/drafts/report_id_activity.txt
new file mode 100644
index 000000000..6f2aaf097
--- /dev/null
+++ b/ietf/secr/templates/drafts/report_id_activity.txt
@@ -0,0 +1,21 @@
+IETF Activity since last IETF Meeting
+--------------------
+
+IETF Activity since last IETF Meeting ({{ meeting.city }})
+
+{{ new|stringformat:"3s" }} New I-Ds ({{ updated }} of which were updated, some ({{ updated_more }}) more than once)
+{{ total_updated|stringformat:"3s" }} I-Ds were updated (Some more than once)
+{{ last_call|stringformat:"3s" }} I-Ds Last Called
+{{ approved|stringformat:"3s" }} I-Ds approved for publication
+
+In the final 4 weeks before meeting
+
+{{ ff_new_count|stringformat:"3s" }} New I-Ds were received - {{ ff_new_percent }} of total newbies since last meeting
+{{ ff_update_count|stringformat:"3s" }} I-Ds were updated - {{ ff_update_percent }} of total updated since last meeting
+
+ Week1 0 %
+ Week2 0 %
+ Week3 0 %
+ Week4 0 %
+
+The IESG Secretary.
diff --git a/ietf/secr/templates/drafts/report_nudge.html b/ietf/secr/templates/drafts/report_nudge.html
new file mode 100644
index 000000000..440a605da
--- /dev/null
+++ b/ietf/secr/templates/drafts/report_nudge.html
@@ -0,0 +1,26 @@
+{% extends "base_site.html" %}
+{% load ams_filters %}
+
+{% block title %}Drafts{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Drafts
+{% endblock %}
+
+{% block content %}
+
+
+
Nudge Report
+
+ {% for doc in docs %}
+
+ {{ doc.name }} {{ doc|get_published_date|date:"Y-m-d" }}
+ {% if doc.ad_name %}{{ doc.ad_name }}{% else %} {% endif %}
+
+ {% endfor %}
+
+
+ ------- ------------------------------------------
+ {% for doc in new_docs %}
+ ({{ doc.group.acronym|stringformat:"8s" }}) {% if doc.rev == "00" %} + {% else %} o {% endif %}{{ doc.title }}
+ {{ doc.file_tag|safe }}
+ {% endfor %}
+
+ 6) {{ rfcs.count }} RFC(s) produced this period
+
+ S - Standard; PS - Proposed Standard; DS - Draft Standard;
+ B - Best Current Practices; E - Experimental; I - Informational
+
+ RFC Stat WG Published Title
+------- -- ---------- ---------- -----------------------------------------
+{% for event in rfcs %}
+{{ event.doc.canonical_name|upper }} {{ event.doc.intended_std_level.name|abbr_status|stringformat:"2s" }} ({{ event.doc.group.acronym|stringformat:"8s" }}) {{ event.time|date:"M d" }} {{ event.doc.title }}
+{% endfor %}
+
+ {{ counts.std }} Standards Track; {{ counts.bcp }} BCP; {{ counts.exp }} Experimental; {{ counts.inf }} Informational
\ No newline at end of file
diff --git a/ietf/secr/templates/drafts/revision.html b/ietf/secr/templates/drafts/revision.html
new file mode 100644
index 000000000..d579f6b8d
--- /dev/null
+++ b/ietf/secr/templates/drafts/revision.html
@@ -0,0 +1,32 @@
+{% extends "base_site.html" %}
+
+{% block title %}Drafts - Revision{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Drafts
+ » {{ draft.name }}
+ » Revision
+{% endblock %}
+
+{% block content %}
+
+
+
Draft - Revision Data
+
+
+
Draft - Search Add
+
+
+
+
Search Results
+ {% include "includes/draft_search_results.html" %}
+ {% if not_found %}{{ not_found }}{% endif %}
+
+
Drafts
+ » {{ draft.name }}
+{% endblock %}
+
+{% block content %}
+
+{% comment %}{{ request.user }}{% endcomment %}
+
+
+
+
Draft - View
+
+ Document Name: {{ draft.title }} Area: {% if draft.group.parent %}{{ draft.group.parent }}{% endif %} Group: {% if draft.group %}{{ draft.group.acronym }}{% endif %} Area Director: {{ draft.ad }} Shepherd: {{ draft.shepherd }} Notify: {{ draft.notify }} Document State: {{ draft.get_state }} IESG State: {{ draft.iesg_state }} Stream: {{ draft.stream }} Under Review by RFC Editor: {% if draft.review_by_rfc_editor %}YES{% else %}NO{% endif %} File Name:
+ {% if draft.expired_tombstone %}
+ {{ draft.filename }}
+ This is a last active version - the tombstone was expired.
+ {% else %}{{ draft.name }}
+ {% endif %}
+ Document Aliases:
+ {% for alias in draft.docalias_set.all %}
+ {% if not forloop.first %}, {% endif %}
+ {{ alias.name }}
+ {% endfor %}
+
+ Revision: {{ draft.rev }} Revision Date: {{ draft.revision_date }} Start Date: {{ draft.start_date }} Number of Pages: {{ draft.pages }} Local Path: /ftp/internet-drafts/{{ draft.local_path|default_if_none:"" }} Abstract: Click here to view the abstract Expiration Date: {{ draft.expires|date:"M. d, Y" }} Intended Status: {{ draft.intended_std_level|default_if_none:"" }} RFC Number: {{ draft.rfc_number|default_if_none:"" }} Comments: {{ draft.internal_comments|default_if_none:"" }} Last Modified Date: {{ draft.time }} Replaced by: {% if draft.replaced_by %}{{ draft.replaced_by.name }}{% endif %} Related Documents: {% for item in draft.relateddocument_set.all %}{% if not forloop.first %}, {% endif %}{{ item.relationship }} {{ item.target.name }} {% endfor %} Tags:
+ {% for tag in draft.tags.all %}
+ {% if not forloop.first %}, {% endif %}
+ {{ tag }}
+ {% endfor %}
+
+
+
+
+
+
+
+
Drafts
+ » {{ draft.name }}
+ » Withdraw
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/groups/add.html b/ietf/secr/templates/groups/add.html
new file mode 100644
index 000000000..237046634
--- /dev/null
+++ b/ietf/secr/templates/groups/add.html
@@ -0,0 +1,31 @@
+{% extends "base_site.html" %}
+
+{% block title %}Groups - Add{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Groups
+ » Add
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/groups/blue_dot_report.txt b/ietf/secr/templates/groups/blue_dot_report.txt
new file mode 100644
index 000000000..7516b01da
--- /dev/null
+++ b/ietf/secr/templates/groups/blue_dot_report.txt
@@ -0,0 +1,6 @@
+BLUE DOT REPORT
+
+NAMES ROSTER BADGE
+--------------------------------------------------------------------------
+{% for chair in chairs %}{{ chair.name|safe|stringformat:"-33s" }}{{ chair.groups|stringformat:"-36s" }}BLUE
+{% endfor %}
\ No newline at end of file
diff --git a/ietf/secr/templates/groups/charter.html b/ietf/secr/templates/groups/charter.html
new file mode 100644
index 000000000..03c88527c
--- /dev/null
+++ b/ietf/secr/templates/groups/charter.html
@@ -0,0 +1,24 @@
+{% extends "base_site.html" %}
+
+{% block title %}Groups - Charter{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Groups
+ » {{ group.acronym }}
+ » Charter
+{% endblock %}
+
+{% block content %}
+
+
+
Groups - Charter
+
+ {% if charter_txt %}{{ charter_text }}{% else %}Charter not found.{% endif %}
+
+
Groups
+ » {{ group.acronym }}
+ » Edit
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/groups/edit_gm.html b/ietf/secr/templates/groups/edit_gm.html
new file mode 100644
index 000000000..012835eae
--- /dev/null
+++ b/ietf/secr/templates/groups/edit_gm.html
@@ -0,0 +1,63 @@
+{% extends "base_site.html" %}
+
+{% block title %}Groups - Edit{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+
+
+{% endblock %}
+
+{% block breadcrumbs %}{{ block.super }}
+ » Groups
+ » {{ group.acronym }}
+ » Goals and Milestones
+ » Edit
+{% endblock %}
+
+{% block content %}
+
+
+
+
+{% endblock %}
diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html
new file mode 100644
index 000000000..a52e756d0
--- /dev/null
+++ b/ietf/secr/templates/groups/people.html
@@ -0,0 +1,67 @@
+{% extends "base_site.html" %}
+
+{% block title %}Groups - People{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+ Groups
+ » {{ group.acronym }}
+ » People
+{% endblock %}
+
+{% block content %}
+
+
+
People
+
+
+
+ Role
+ Name
+ Email
+ Action
+
+
+
+ {% for role in group.role_set.all %}
+
+ {{ role.name }}
+ {{ role.person }}
+ {{ role.email }}
+ Delete
+ {% endfor %}
+
+
+
+
+
+
+
+
+
Groups - Search Add
+
+
+
+
Search Results
+ {% include "includes/group_search_results.html" %}
+ {% if not_found %}{{ not_found }}{% endif %}
+
+
Groups
+ » {{ group.acronym }}
+{% endblock %}
+
+{% block content %}
+
+
+
+
Groups - View
+
+ Group Acronym: {{ group.acronym }} Group Name: {{ group.name }} Status: {{ group.state }} Type: {{ group.type }} Proposed Date: {{ group.proposed_date|date:"Y-m-d" }} Start Date: {{ group.start_date|date:"Y-m-d" }} Concluded Date: {{ group.concluded_date|date:"Y-m-d" }} Primary Area:
+ {% if not group.parent %}(No Data){% else %}
+ {{ group.parent }}
+ {% endif %}
+
+ Primary Area Director:
+ {% if group.ad %}
+ {{ group.ad }}
+ {% endif %}
+ Meeting Scheduled: {{ group.meeting_scheduled}} Email Address: {{ group.list_email }} Email Subscription: {{ group.list_subscribe }} Email Archive: {{ group.list_archive }} Charter: View Charter Comments: {{ group.comments }} Last Modified Date: {{ group.time }}
+
+ {% with group.groupurl_set.all as awps %}
+ {% include "includes/awp_view.html" %}
+ {% endwith %}
+
+
+
+
+
+
Groups
+ » {{ group.acronym }}
+ » Goals and Milestones
+{% endblock %}
+
+{% block content %}
+
+
+
Groups - View Goals and Milestones
+
+
+
+ Description
+ Expected Due Date
+ Done Date
+
+
+
+ {% for gm in group.groupmilestone_set.all %}
+
+ {{ gm.desc }}
+ {{ gm.expected_due_date|date:"Y-m-d" }}
+ {{ gm.done_date|date:"Y-m-d" }}
+
+ {% endfor %}
+
+
+
+
+
Activies Log
+
diff --git a/ietf/secr/templates/includes/awp_add_form.html b/ietf/secr/templates/includes/awp_add_form.html
new file mode 100644
index 000000000..fd5d73abd
--- /dev/null
+++ b/ietf/secr/templates/includes/awp_add_form.html
@@ -0,0 +1,15 @@
+
+
Additional Web Pages
+ {{ awp_formset.management_form }}
+ {{ awp_formset.non_form_errors }}
+
+ {% for form in awp_formset.forms %}
+
+ {% endfor %}
+
Additional Web Pages
+{{ awp_formset.management_form }}
+{{ awp_formset.non_form_errors }}
+
+{% for form in awp_formset.forms %}
+
+{% endfor %}
diff --git a/ietf/secr/templates/includes/awp_view.html b/ietf/secr/templates/includes/awp_view.html
new file mode 100644
index 000000000..55e070ddc
--- /dev/null
+++ b/ietf/secr/templates/includes/awp_view.html
@@ -0,0 +1,13 @@
+
+
Additional Web Pages
+ {% for item in awps %}
+
+ {% endfor %}
+
Activies Log
+
diff --git a/ietf/secr/templates/includes/draft_search_results.html b/ietf/secr/templates/includes/draft_search_results.html
new file mode 100644
index 000000000..d53de3537
--- /dev/null
+++ b/ietf/secr/templates/includes/draft_search_results.html
@@ -0,0 +1,20 @@
+
+
+
+ Name
+ Group
+ Status
+ Intended Status
+
+
+
+ {% for item in results %}
+
+ {{ item.name }} {{item.group.acronym}}
+ {{item.get_state}}
+ {{item.intended_std_level}}
+
+ {% endfor %}
+
+
diff --git a/ietf/secr/templates/includes/draft_upload_form.html b/ietf/secr/templates/includes/draft_upload_form.html
new file mode 100644
index 000000000..0d6a60dd5
--- /dev/null
+++ b/ietf/secr/templates/includes/draft_upload_form.html
@@ -0,0 +1,11 @@
+
diff --git a/ietf/secr/templates/includes/group_search_results.html b/ietf/secr/templates/includes/group_search_results.html
new file mode 100644
index 000000000..2d646f33e
--- /dev/null
+++ b/ietf/secr/templates/includes/group_search_results.html
@@ -0,0 +1,24 @@
+
+
+
+ Group Name
+ Group Acronym
+ Status
+ Type
+ Meeting Scheduled
+
+
+
+ {% for item in results %}
+
+ {{item.name}} {{item.acronym}}
+ {{item.state}}
+ {{item.type}}
+ {{item.meeting_scheduled}}
+
+ {% empty %}
+ No Results
+
diff --git a/ietf/secr/templates/includes/meetings_footer.html b/ietf/secr/templates/includes/meetings_footer.html
new file mode 100755
index 000000000..ba667519f
--- /dev/null
+++ b/ietf/secr/templates/includes/meetings_footer.html
@@ -0,0 +1 @@
+ View Agenda .Working Groups
+
+{% endif %}
+{% if set.bof %}
+ BoFs
+
+{% endif %}
+{% if set.ag %}
+ Area Group
+
+{% endif %}
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/proceeding_footer.html b/ietf/secr/templates/includes/proceeding_footer.html
new file mode 100644
index 000000000..84ba76f72
--- /dev/null
+++ b/ietf/secr/templates/includes/proceeding_footer.html
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+