allow edit of timeslots, changes to scheduled notifications, support non-official schedules

 - Legacy-Id: 7554

Author: rpcross

ietf/group/models.py

@@ -139,10 +139,10 @@ class GroupMilestoneInfo(models.Model):
     docs = models.ManyToManyField('doc.Document', blank=True)
 
     def __unicode__(self):
-	return self.desc[:20] + "..."
+        return self.desc[:20] + "..."
     class Meta:
         abstract = True
-	ordering = ['due', 'id']
+        ordering = ['due', 'id']
 
 class GroupMilestone(GroupMilestoneInfo):
     time = models.DateTimeField(auto_now=True)
@@ -159,14 +159,15 @@ class GroupStateTransitions(models.Model):
     next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states')
 
     def __unicode__(self):
-	return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
+        return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
 
 GROUP_EVENT_CHOICES = [
     ("changed_state", "Changed state"),
     ("added_comment", "Added comment"),
     ("info_changed", "Changed metadata"),
     ("requested_close", "Requested closing group"),
     ("changed_milestone", "Changed milestone"),
+    ("sent_notification", "Sent notification")
     ]
 
 class GroupEvent(models.Model):

ietf/meeting/models.py

@@ -206,20 +206,9 @@ def vtimezone(self):
         return ''
 
     def set_official_agenda(self, agenda):
-        # send_notification should be refactored into Session
-        from ietf.secr.meetings.views import send_notification
         if self.agenda != agenda:
             self.agenda = agenda
             self.save()
-            if self.agenda is not None:
-                for ss in self.agenda.scheduledsession_set.all():
-                    session = ss.session
-                    if session.status.slug == "schedw":
-                        session.status_id = "sched"
-                        session.scheduled = datetime.datetime.now()
-                        session.save()
-                        # refactoring send_notification will obviate this odd hoop-jump
-                        send_notification(None, Session.objects.filter(id=session.id))
 
     class Meta:
         ordering = ["-date", ]
@@ -1174,3 +1163,4 @@ def badness_fast(self, timeslot, scheduleslot, session_pk_list):
         if self.badness_test(1):
             self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness))
         return badness
+

ietf/secr/meetings/tests.py

@@ -1,7 +1,7 @@
 from django.core.urlresolvers import reverse
 from ietf.utils import TestCase
 
-from ietf.meeting.models import Meeting
+from ietf.meeting.models import Meeting, Schedule
 from ietf.utils.test_data import make_test_data
 
 from pyquery import PyQuery
@@ -22,3 +22,14 @@ def test_view(self):
         url = reverse('meetings_view', kwargs={'meeting_id':meeting.number})
         response = self.client.get(url, REMOTE_USER=SECR_USER)
         self.assertEqual(response.status_code, 200)
+
+    def test_add_meeting(self):
+        "Add Meeting"
+        url = reverse('meetings_add')
+        post_data = dict(number=1,city='Seattle',date='2014-07-20',country='US',
+                         time_zone='America/Los_Angeles',venue_name='Hilton',
+                         venue_addr='100 First Ave')
+        response = self.client.post(url, post_data,follow=True,REMOTE_USER=SECR_USER)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(Meeting.objects.count(),1)
+        self.assertEqual(Schedule.objects.count(),1)

ietf/secr/meetings/urls.py

@@ -9,14 +9,17 @@
     url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/$', 'blue_sheet', name='meetings_blue_sheet'),
     url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/generate/$', 'blue_sheet_generate', name='meetings_blue_sheet_generate'),
     url(r'^(?P<meeting_id>\d{1,6})/edit/$', 'edit_meeting', name='meetings_edit_meeting'),
-    url(r'^(?P<meeting_id>\d{1,6})/rooms/$', 'rooms', name='meetings_rooms'),
-    url(r'^(?P<meeting_id>\d{1,6})/times/$', 'times', name='meetings_times'),
-    url(r'^(?P<meeting_id>\d{1,6})/times/delete/(?P<time>[0-9\:]+)/$', 'times_delete', name='meetings_times_delete'),
-    url(r'^(?P<meeting_id>\d{1,6})/non_session/$', 'non_session', name='meetings_non_session'),
-    url(r'^(?P<meeting_id>\d{1,6})/non_session/edit/(?P<slot_id>\d{1,6})/$', 'non_session_edit', name='meetings_non_session_edit'),
-    url(r'^(?P<meeting_id>\d{1,6})/non_session/delete/(?P<slot_id>\d{1,6})/$', 'non_session_delete', name='meetings_non_session_delete'),
-    url(r'^(?P<meeting_id>\d{1,6})/select/$', 'select_group',
-        name='meetings_select_group'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<acronym>[A-Za-z0-9_\-\+]+)/schedule/$', 'schedule', name='meetings_schedule'),
+    url(r'^(?P<meeting_id>\d{1,6})/notifications/$', 'notifications', name='meetings_notifications'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/$', 'select', name='meetings_select'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/$', 'non_session', name='meetings_non_session'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/edit/(?P<slot_id>\d{1,6})/$', 'non_session_edit', name='meetings_non_session_edit'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/delete/(?P<slot_id>\d{1,6})/$', 'non_session_delete', name='meetings_non_session_delete'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/rooms/$', 'rooms', name='meetings_rooms'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/select/$', 'select_group', name='meetings_select_group'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/$', 'times', name='meetings_times'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/delete/(?P<time>[0-9\:]+)/$', 'times_delete', name='meetings_times_delete'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/edit/(?P<time>[0-9\:]+)/$', 'times_edit', name='meetings_times_edit'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/unschedule/(?P<session_id>\d{1,6})/$', 'unschedule', name='meetings_unschedule'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/schedule/$', 'schedule', name='meetings_schedule'),
     url(r'^(?P<meeting_id>\d{1,6})/(?P<acronym>[A-Za-z0-9_\-\+]+)/remove/$', 'remove_session', name='meetings_remove_session'),
 )