use formset for interim sessions

rpcross · rpcross · commit b85df63a4f4c · 2016-03-25T23:15:05.000Z
- Legacy-Id: 10978
diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py
@@ -117,72 +117,62 @@ def label_from_instance(self, obj):
 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)
-    multi_day = forms.BooleanField(required=False)
-    series = forms.BooleanField(required=False)
-    date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Date', required=True)
-    time = forms.TimeField()
-    duration = DurationField()
-    city = forms.CharField(max_length=255,required=False)
-    country = forms.ChoiceField(choices=countries,required=False)
-    timezone = forms.ChoiceField(choices=timezones)
-    remote_instructions = forms.CharField(max_length=1024,required=False)
-    agenda = forms.CharField(required=False,widget=forms.Textarea)
-    agenda_note = forms.CharField(max_length=255,required=False)
+    meeting_type = forms.ChoiceField(choices=(("single", "Single"), ("multi-day", "Multi-Day"), ('series','Series')), required=False, initial='single', widget=forms.RadioSelect)
 
     def __init__(self, request, *args, **kwargs):
         super(InterimRequestForm, self).__init__(*args, **kwargs)
         self.user = request.user
         self.person = self.user.person
         self.fields["group"].widget.attrs["class"] = "select2-field"
-
         self.set_group_options()
 
+    def set_group_options(self):
+        '''Set group options based on user accessing the form'''
+
+        if has_role(self.user, "Secretariat"):
+            return  # don't reduce group options
+        if has_role(self.user, "Area Director"):
+            queryset = Group.objects.filter(type="wg", state="active").order_by('acronym')
+        elif has_role(self.user, "IRTF Chair"):
+            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')
+
+        self.fields['group'].queryset = queryset
+
+class InterimSessionForm(forms.Form):
+    date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Date', required=True)
+    time = forms.TimeField()
+    duration = DurationField()
+    remote_instructions = forms.CharField(max_length=1024,required=False)
+    agenda = forms.CharField(required=False,widget=forms.Textarea)
+    agenda_note = forms.CharField(max_length=255,required=False)
+    city = forms.CharField(max_length=255,required=False)
+    country = forms.ChoiceField(choices=countries,required=False)
+    timezone = forms.ChoiceField(choices=timezones)
+
     def _save_agenda(self, text):
         pass
 
-    def save(self):
+    def save(self, request, group, meeting):
+        person = request.user.person
         agenda = self.cleaned_data.get('agenda')
         agenda_note = self.cleaned_data.get('agenda_note')
         date = self.cleaned_data.get('date')
         time = self.cleaned_data.get('time')
         duration = self.cleaned_data.get('duration')
-        group = self.cleaned_data.get('group')
-        city = self.cleaned_data.get('city')
-        country = self.cleaned_data.get('country')
-        timezone = self.cleaned_data.get('timezone')
         remote_instructions = self.cleaned_data.get('remote_instructions')
-        sequence = Meeting.objects.filter(number__startswith='interim-%s-%s' % (date.year,group.acronym)).count() + 1
-        number = 'interim-%s-%s-%s' % (date.year,group.acronym,sequence)
-        meeting = Meeting.objects.create(number=number,type_id='interim',date=date,city=city,
-            country=country,agenda_note=agenda_note,time_zone=timezone)
-        schedule = Schedule.objects.create(meeting=meeting, owner=self.person, visible=True, public=True)
-        meeting.agenda = schedule
-        meeting.save()
+
         slot = TimeSlot.objects.create(meeting=meeting, type_id="session", duration=duration,
             time=datetime.datetime.combine(date, time))
         session = Session.objects.create(meeting=meeting,
             group=group,
-            requested_by=self.person,
+            requested_by=person,
             status_id='apprw',
             type_id='session',
-            remote_instructions=remote_instructions)
-        SchedTimeSessAssignment.objects.create(timeslot=slot, session=session, schedule=schedule)
+            remote_instructions=remote_instructions,
+            agenda_note=agenda_note,)
+        SchedTimeSessAssignment.objects.create(timeslot=slot, session=session, schedule=meeting.agenda)
 
         if agenda:
             self._save_agenda(agenda)
-
-        return meeting
-
-    def set_group_options(self):
-        '''Set group options based on user accessing the form'''
-
-        if has_role(self.user, "Secretariat"):
-            return  # don't reduce group options
-        if has_role(self.user, "Area Director"):
-            queryset = Group.objects.filter(type="wg", state="active").order_by('acronym')
-        elif has_role(self.user, "IRTF Chair"):
-            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')
-
-        self.fields['group'].queryset = queryset
diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py
@@ -285,4 +285,6 @@ def session_constraint_expire(request,session):
     if key is not None and cache.has_key(key):
         cache.delete(key)
 
-
+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)
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
@@ -380,13 +380,13 @@ def test_interim_request_options(self):
         self.assertEqual(Group.objects.filter(type__in=('wg','rg'),state='active').count(),
             len(q("#id_group option")) -1 )  # -1 for options placeholder
 
-    def test_interim_request_submit(self):
+    def test_interim_request_single(self):
         make_meeting_test_data()
+        group = Group.objects.get(acronym='mars')
         date = datetime.date.today() + datetime.timedelta(days=30)
         time = datetime.datetime.now().time().replace(microsecond=0,second=0)
         dt = datetime.datetime.combine(date, time)
         duration = datetime.timedelta(hours=3)
-        group = Group.objects.get(acronym='mars')
         city = 'San Francisco'
         country = 'US'
         timezone = 'US/Pacific'
@@ -395,15 +395,18 @@ def test_interim_request_submit(self):
         agenda_note = 'On second level'
         self.client.login(username="secretary", password="secretary+password")
         data = {'group':group.pk,
-                'date':date.strftime("%Y-%m-%d"),
-                'time':time.strftime('%H:%M'),
-                'duration':'03:00:00',
-                'city':city,
-                'country':country,
-                'timezone':timezone,
-                'remote_instructions':remote_instructions,
-                'agenda':agenda,
-                'agenda_note':agenda_note}
+                'meeting_type':'single',
+                'form-0-date':date.strftime("%Y-%m-%d"),
+                'form-0-time':time.strftime('%H:%M'),
+                'form-0-duration':'03:00:00',
+                'form-0-city':city,
+                'form-0-country':country,
+                'form-0-timezone':timezone,
+                'form-0-remote_instructions':remote_instructions,
+                'form-0-agenda':agenda,
+                'form-0-agenda_note':agenda_note,
+                'form-TOTAL_FORMS':1,
+                'form-INITIAL_FORMS':0}
 
         r = self.client.post(urlreverse("ietf.meeting.views.interim_request"),data)
         
@@ -422,5 +425,60 @@ def test_interim_request_submit(self):
         self.assertEqual(timeslot.time,dt)
         self.assertEqual(timeslot.duration,duration)
 
+    def test_interim_request_multi_day(self):
+        make_meeting_test_data()
+        date = datetime.date.today() + datetime.timedelta(days=30)
+        date2 = date + datetime.timedelta(days=1)
+        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
+        dt = datetime.datetime.combine(date, time)
+        dt2 = datetime.datetime.combine(date2, time)
+        duration = datetime.timedelta(hours=3)
+        group = Group.objects.get(acronym='mars')
+        city = 'San Francisco'
+        country = 'US'
+        timezone = 'US/Pacific'
+        remote_instructions = 'Use webex'
+        agenda = 'Intro. Slides. Discuss.'
+        agenda_note = 'On second level'
+        self.client.login(username="secretary", password="secretary+password")
+        data = {'group':group.pk,
+                'meeting_type':'multi-day',
+                'form-0-date':date.strftime("%Y-%m-%d"),
+                'form-0-time':time.strftime('%H:%M'),
+                'form-0-duration':'03:00:00',
+                'form-0-city':city,
+                'form-0-country':country,
+                'form-0-timezone':timezone,
+                'form-0-remote_instructions':remote_instructions,
+                'form-0-agenda':agenda,
+                'form-0-agenda_note':agenda_note,
+                'form-1-date':date2.strftime("%Y-%m-%d"),
+                'form-1-time':time.strftime('%H:%M'),
+                'form-1-duration':'03:00:00',
+                'form-1-city':city,
+                'form-1-country':country,
+                'form-1-timezone':timezone,
+                'form-1-remote_instructions':remote_instructions,
+                'form-1-agenda':agenda,
+                'form-1-agenda_note':agenda_note,
+                'form-TOTAL_FORMS':2,
+                'form-INITIAL_FORMS':0}
 
+        r = self.client.post(urlreverse("ietf.meeting.views.interim_request"),data)
+        
+        self.assertRedirects(r,urlreverse('ietf.meeting.views.upcoming'))
+        meeting = Meeting.objects.order_by('id').last()
+        self.assertEqual(meeting.type_id,'interim')
+        self.assertEqual(meeting.date,date)
+        self.assertEqual(meeting.number,'interim-%s-%s-%s' % (date.year,group.acronym,1))
+        self.assertEqual(meeting.city,city)
+        self.assertEqual(meeting.country,country)
+        self.assertEqual(meeting.time_zone,timezone)
+        self.assertEqual(meeting.agenda_note,agenda_note)
+        self.assertEqual(meeting.session_set.count(),2)
+        for session in meeting.session_set.all():
+            self.assertEqual(session.remote_instructions,remote_instructions)
+            timeslot = session.official_timeslotassignment().timeslot
+            self.assertEqual(timeslot.time,dt2)
+            self.assertEqual(timeslot.duration,duration)
 
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -20,7 +20,7 @@
 from django.db.models import Min, Max
 from django.conf import settings
 from django.forms.models import modelform_factory
-from django.forms import ModelForm
+from django.forms import ModelForm, formset_factory
 from django.views.decorators.csrf import ensure_csrf_cookie
 
 from ietf.doc.models import Document, State
@@ -35,11 +35,11 @@
 from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting
 from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_meetings
 from ietf.meeting.helpers import preprocess_assignments_for_agenda, read_agenda_file
-from ietf.meeting.helpers import convert_draft_to_pdf
+from ietf.meeting.helpers import convert_draft_to_pdf, get_next_interim_number
 from ietf.utils.pipe import pipe
 from ietf.utils.pdf import pdf_pages
 
-from .forms import InterimRequestForm
+from .forms import InterimRequestForm, InterimSessionForm
 
 # -------------------------------------------------
 # Helper Functions
@@ -892,17 +892,36 @@ def sort_key(session):
 @role_required('Area Director','Secretariat','IRTF Chair','WG Chair')
 def interim_request(request):
     '''View for requesting an interim meeting'''
-    #form = InterimRequestForm(request=request)
-
+    SessionFormset = formset_factory(InterimSessionForm, extra=2)
+    
     if request.method == 'POST':
         form = InterimRequestForm(request, data=request.POST)
-        if form.is_valid():
-            form.save()
+        formset = SessionFormset(data=request.POST)
+        if form.is_valid() and formset.is_valid():
+            group = form.cleaned_data.get('group')
+            meeting_type = form.cleaned_data.get('meeting_type')
+            if meeting_type in ('single','multi-day'):
+                date = sorted([ f.cleaned_data.get('date') for f in formset.forms])[0]
+                number = get_next_interim_number(group,date)
+                city = formset.forms[0].cleaned_data.get('city')
+                country = formset.forms[0].cleaned_data.get('country')
+                timezone = formset.forms[0].cleaned_data.get('timezone')
+                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=person, visible=True, public=True)
+                meeting.agenda = schedule
+                meeting.save()
+            for f in formset.forms:
+                # TODO: create meetings if type == series
+                f.save(request,group,meeting)
             return redirect(upcoming)
+        else:
+            assert False, (form.errors, formset.errors)
     else:
         form = InterimRequestForm(request=request,initial={'meeting_type':'single'})
+        formset = SessionFormset()
 
-    return render(request, "meeting/interim_request.html", {"form":form})
+    return render(request, "meeting/interim_request.html", {"form":form, "formset":formset})
 
 def ical_upcoming(request):
     '''ICAL upcoming meetings'''
diff --git a/ietf/static/ietf/css/ietf.css b/ietf/static/ietf/css/ietf.css
@@ -462,3 +462,7 @@ form.navbar-form input.form-control.input-sm { width: 141px; }
     padding: 16px 16px;
     margin-bottom: 20px;
 }
+
+#interim-request-form .fieldset.template {
+    display: none;
+}
diff --git a/ietf/static/ietf/js/meeting-interim-request.js b/ietf/static/ietf/js/meeting-interim-request.js
@@ -3,20 +3,48 @@ var interimRequest = {
     // functions for Interim Meeting Request 
     init : function() {
         interimRequest.form = $(this);
+        //interimRequest.sessionTemplate = interimRequest.form.find('.fieldset.template');
         $('.select2-field').select2();
+        $('#add_session').click(interimRequest.addSession);
         $('#id_face_to_face').change(interimRequest.toggleLocation);
-        $('#id_face_to_face').each(interimRequest.toggleLocation)
+        $('#id_face_to_face').each(interimRequest.toggleLocation);
+    },
+
+    addSession : function() {
+        //var templateData = interimRequest.sessionTemplate.clone();
+        var template = interimRequest.form.find('.fieldset.template');
+        var el = template.clone(true);
+        var totalField = $('#id_form-TOTAL_FORMS');
+        var total = +totalField.val();
+
+        el.find(':input').each(function() {
+            var name = $(this).attr('name').replace('-' + (total-1) + '-','-' + total + '-');
+            var id = 'id_' + name;
+            $(this).attr({'name': name, 'id': id}).val('');
+        });
+
+        el.find('label').each(function() {
+            var newFor = $(this).attr('for').replace('-' + (total-1) + '-','-' + total + '-');
+            $(this).attr('for', newFor);
+        });
+
+        ++total;
+
+        totalField.val(total);
+
+        template.before(el);
+        el.removeClass("template");
+
+        el.find(".select2-field").each(function () {
+            setupSelect2Field($(this));
+        });
     },
 
     toggleLocation : function() {
         if(this.checked){
-            $("#id_city").prop('disabled', false);
-            $("#id_country").prop('disabled', false);
-            $("#id_timezone").prop('disabled', false);
+            $(".location").prop('disabled', false);
         } else {
-            $("#id_city").prop('disabled', true);
-            $("#id_country").prop('disabled', true);
-            $("#id_timezone").prop('disabled', true);
+            $(".location").prop('disabled', true);
         }
     }
 }
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
@@ -33,7 +33,7 @@ <h1>Interim Meeting Request</h1>
         <!-- <div id="meeting-type-options"> -->
         <div class="col-md-2 radio-inline"><strong>Meeting Type:</strong></div>
         <label class="radio-inline">
-            <input type="radio" value="single" name="meeting_type">Single
+            <input type="radio" value="single" checked="checked" name="meeting_type">Single
         </label>
         <label class="radio-inline">
             <input type="radio" value="multi-day" name="meeting_type">Multi-Day
@@ -47,13 +47,15 @@ <h1>Interim Meeting Request</h1>
 
     </div>
 
-    <div class="fieldset">    
+    {{ formset.management_form }}
+    {% for form in formset %}
+    <div class="fieldset{% if forloop.last %} template{% endif %}" >    
     <div class="form-group">
         <label for="face-to_face" class="col-md-2 control-label">Location</label>
         <div class="col-md-10 form-inline">
-            {% render_field form.city class="form-control" placeholder="City" %}
-            {% render_field form.country class="form-control" %}
-            {% render_field form.timezone class="form-control" %}
+            {% render_field form.city class="form-control location" placeholder="City" %}
+            {% render_field form.country class="form-control location" %}
+            {% render_field form.timezone class="form-control location" %}
         </div>
     </div>
     
@@ -83,6 +85,11 @@ <h1>Interim Meeting Request</h1>
         <div class="col-md-10">{% render_field form.agenda_note class="form-control" placeholder="Note" %}</div>
     </div>
     </div>  <!-- fieldset -->
+    {% endfor %}
+
+    <div class="row">
+    <button id="add_session" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus" aria-hidden="true">Add Session</button>
+    </div>  
 
     {% buttons %}
       <button type="submit" class="btn btn-primary">Submit</button>

Original file line number	Diff line number	Diff line change
`@@ -462,3 +462,7 @@ form.navbar-form input.form-control.input-sm { width: 141px; }`
`462`	`462`	`padding: 16px 16px;`
`463`	`463`	`margin-bottom: 20px;`
`464`	`464`	`}`
	`465`	`+`
	`466`	`+#interim-request-form .fieldset.template {`
	`467`	`+ display: none;`
	`468`	`+}`