add pending and detail views and tests.

 - Legacy-Id: 11125

Author: rpcross

ietf/meeting/forms.py

@@ -3,18 +3,19 @@
 
 from django import forms
 from django.core.validators import ValidationError
-from django.forms import BaseFormSet
 from django.forms.fields import Field
 from django.utils.encoding import force_text
 from django.utils import six
 
 from ietf.group.models import Group
 from ietf.ietfauth.utils import has_role
-from ietf.meeting.models import Meeting, Schedule, TimeSlot, Session, SchedTimeSessAssignment, countries, timezones
+from ietf.meeting.models import Session, countries, timezones
+from ietf.meeting.helpers import assign_interim_session
 from ietf.utils.fields import DatepickerDateField
 
 # need to insert empty option for use in ChoiceField
-countries.insert(0, ('', '-'*9 ))
+#countries.insert(0, ('', '-'*9 ))
+countries.insert(0, ('', ''))
 timezones.insert(0, ('', '-'*9 ))
 
 # -------------------------------------------------
@@ -138,7 +139,7 @@ def save(self,commit=True):
 
 class InterimRequestForm(forms.Form):
     group = GroupModelChoiceField(queryset = Group.objects.filter(type__in=('wg','rg'),state='active').order_by('acronym'))
-    face_to_face = forms.BooleanField(required=False)
+    in_person = forms.BooleanField(required=False)
     meeting_type = forms.ChoiceField(choices=(("single", "Single"), ("multi-day", "Multi-Day"), ('series','Series')), required=False, initial='single', widget=forms.RadioSelect)
     approved = forms.BooleanField(required=False)
 
@@ -160,18 +161,20 @@ def set_group_options(self):
             queryset = Group.objects.filter(type="rg", state="active").order_by('acronym')
         elif has_role(self.user, "WG Chair"):
             queryset = Group.objects.filter(type="wg", state="active", role__person=self.person, role__name="chair").distinct().order_by('acronym')
-
+        elif has_role(self.user, "RG Chair"):
+            queryset = Group.objects.filter(type="rg", state="active", role__person=self.person, role__name="chair").distinct().order_by('acronym')
         self.fields['group'].queryset = queryset
 
         # if there's only one possibility make it the default
         if len(queryset) == 1:
             self.fields['group'].initial = queryset[0]
 
 class InterimSessionForm(forms.Form):
-    date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Date', required=True)
-    time = forms.TimeField()
+    # unset: date,time,duration
+    date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Date', required=False)
+    time = forms.TimeField(required=False)
     time_utc = forms.TimeField(required=False)
-    duration = DurationField()
+    duration = DurationField(required=False)
     end_time = forms.TimeField(required=False)
     end_time_utc = forms.TimeField(required=False)
     remote_instructions = forms.CharField(max_length=1024,required=False)
@@ -196,17 +199,16 @@ def save(self, request, group, meeting):
         time = self.cleaned_data.get('time')
         duration = self.cleaned_data.get('duration')
         remote_instructions = self.cleaned_data.get('remote_instructions')
-
-        slot = TimeSlot.objects.create(meeting=meeting, type_id="session", duration=duration,
-            time=datetime.datetime.combine(date, time))
+        time=datetime.datetime.combine(date, time)
         session = Session.objects.create(meeting=meeting,
             group=group,
             requested_by=person,
+            requested_duration=duration,
             status_id='apprw',
             type_id='session',
             remote_instructions=remote_instructions,
             agenda_note=agenda_note,)
-        SchedTimeSessAssignment.objects.create(timeslot=slot, session=session, schedule=meeting.agenda)
-
+        assign_interim_session(session,time)
+       
         if agenda:
             self._save_agenda(agenda)

ietf/meeting/helpers.py

@@ -17,8 +17,9 @@
 from ietf.doc.models import Document
 from ietf.group.models import Group
 from ietf.ietfauth.utils import has_role, user_is_person
+from ietf.liaisons.utils import get_person_for_user
 from ietf.person.models  import Person
-from ietf.meeting.models import Meeting, Schedule
+from ietf.meeting.models import Meeting, Schedule, TimeSlot, SchedTimeSessAssignment
 from ietf.utils.history import find_history_active_at, find_history_replacements_active_at
 from ietf.utils.pipe import pipe
 
@@ -285,6 +286,10 @@ def session_constraint_expire(request,session):
     if key is not None and cache.has_key(key):
         cache.delete(key)
 
+# -------------------------------------------------
+# Interim Meeting Helpers
+# -------------------------------------------------
+
 def get_earliest_session(session_formset):
     '''Return earliest InterimSessionForm from formset'''
     earliest = session_formset[0]
@@ -300,20 +305,79 @@ def get_next_interim_number(group,date):
     sequence = Meeting.objects.filter(number__startswith='interim-%s-%s' % (date.year,group.acronym)).count() + 1
     return 'interim-%s-%s-%s' % (date.year,group.acronym,sequence)
 
-def create_interim_meeting(request_form,session_form):
-    '''Create an Interim meeting, given an InterimRequestForm and InterimSessionForm'''    
-    group = request_form.cleaned_data.get('group')
-    date = session_form.cleaned_data.get('date')
+def create_interim_meeting(group,date,city='',country='',timezone='UTC',person=None):
+    '''Helper function to create interim meeting and associated schedule'''
+    if not person:
+        person = Person.objects.get(name="(System)")
     number = get_next_interim_number(group,date)
-    city = session_form.cleaned_data.get('city')
-    country = session_form.cleaned_data.get('country')
-    timezone = session_form.cleaned_data.get('timezone')
-    if not request_form.cleaned_data.get('face_to_face'):
-        timezone = 'UTC'
     meeting = Meeting.objects.create(number=number,type_id='interim',date=date,city=city,
         country=country,time_zone=timezone)
-    schedule = Schedule.objects.create(meeting=meeting, owner=request_form.person, visible=True, public=True)
+    schedule = Schedule.objects.create(meeting=meeting, owner=person, visible=True, public=True)
     meeting.agenda = schedule
     meeting.save()
     return meeting
 
+def create_interim_meeting_from_forms(request_form,session_form):
+    '''Create an Interim meeting, given an InterimRequestForm and InterimSessionForm'''
+    group = request_form.cleaned_data.get('group')
+    date = session_form.cleaned_data.get('date')
+    city = session_form.cleaned_data.get('city')
+    country = session_form.cleaned_data.get('country')
+    timezone = session_form.cleaned_data.get('timezone')
+    person = request_form.person
+    return create_interim_meeting(group=group,date=date,city=city,country=country,timezone=timezone,person=person)
+
+def assign_interim_session(session,time):
+    '''Helper function to create a timeslot and assign the interim session''' 
+    slot = TimeSlot.objects.create(meeting=session.meeting, type_id="session",
+        duration=session.requested_duration, time=time)
+    SchedTimeSessAssignment.objects.create(timeslot=slot, session=session, schedule=session.meeting.agenda)
+
+def can_approve_interim_request(meeting,user):
+    '''Returns True if the user has permissions to approve an interim meeting request'''
+    if meeting.type.slug != 'interim':
+        return False
+    if has_role(user, 'Secretariat'):
+        return True
+    person = get_person_for_user(user)
+    session = meeting.session_set.first()
+    if not session:
+        return False
+    group = session.group
+    if group.type.slug == 'wg' and group.parent.role_set.filter(name='ad',person=person):
+        return True
+    if group.type.slug == 'rg' and group.parent.role_set.filter(name='chair',person=person):
+        return True
+    return False
+
+def can_edit_interim_request(meeting,user):
+    '''Returns True if the user can edit the interim meeting request'''
+    
+    if can_approve_interim_request(meeting,user):
+        return True
+    
+    return False
+
+def can_request_interim_meeting(user):
+    if has_role(user, ('Secretariat','Area Director','WG Chair','IRTF Chair', 'RG Chair')):
+        return True
+    return False
+
+def can_view_interim_request(meeting,user):
+    '''Returns True if the user can see the pending interim request in the pending interim view'''
+    if meeting.type.slug != 'interim':
+        return False
+    if has_role(user, 'Secretariat'):
+        return True
+    person = get_person_for_user(user)
+    session = meeting.session_set.first()
+    if not session:
+        return False
+    group = session.group
+    if has_role(user, 'Area Director') and group.type.slug == 'wg':
+        return True
+    if has_role(user, 'IRTF Chair') and group.type.slug == 'rg':
+        return True
+    if group.role_set.filter(name='chair',person=person):
+        return True
+    return False

ietf/meeting/test_data.py

@@ -3,10 +3,21 @@
 from ietf.doc.models import Document, State
 from ietf.group.models import Group
 from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, SchedTimeSessAssignment, ResourceAssociation, SessionPresentation
+from ietf.meeting.helpers import create_interim_meeting, assign_interim_session
 from ietf.name.models import RoomResourceName
 from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
 
+def make_interim_meeting(group,date,status='sched'):
+    system_person = Person.objects.get(name="(System)")
+    time = datetime.datetime.combine(date, datetime.time(9))
+    meeting = create_interim_meeting(group=group,date=date)
+    session = Session.objects.create(meeting=meeting, group=group,
+        attendees=10, requested_by=system_person,
+        requested_duration=20, status_id=status,
+        scheduled=datetime.datetime.now(),type_id="session")
+    assign_interim_session(session,time)
+    return meeting
 
 def make_meeting_test_data():
     if not Group.objects.filter(acronym='mars'):
@@ -79,29 +90,13 @@ def make_meeting_test_data():
 
     # Future Interim Meetings
     date = datetime.date.today() + datetime.timedelta(days=365)
-    mars_meeting = Meeting.objects.create(
-        number="interim-%s-mars-1" % date.year,
-        type_id='interim',
-        date=date,
-        city="New York",
-        country="US",
-        )
-    mars_session = Session.objects.create(meeting=mars_meeting, group=mars,
-                                          attendees=10, requested_by=system_person,
-                                          requested_duration=20, status_id="sched",
-                                          scheduled=datetime.datetime.now(),type_id="session")
+    date2 = datetime.date.today() + datetime.timedelta(days=1000)
     ames = Group.objects.get(acronym="ames")
-    ames_meeting = Meeting.objects.create(
-        number="interim-%s-ames-1" % date.year,
-        type_id='interim',
-        date=date,
-        city="New York",
-        country="US",
-        )
-    ames_session = Session.objects.create(meeting=ames_meeting, group=ames,
-                                          attendees=10, requested_by=system_person,
-                                          requested_duration=20, status_id="canceled",
-                                          scheduled=datetime.datetime.now(),type_id="session")
+
+    make_interim_meeting(group=mars,date=date,status='sched')
+    make_interim_meeting(group=mars,date=date2,status='apprw')
+    make_interim_meeting(group=ames,date=date,status='canceled')
+    make_interim_meeting(group=ames,date=date2,status='apprw')
 
     return meeting