fixed draw_constraints continuation to use promise interface

    show room size in unicode printout for room model
    but be explicit in template when the name is needed
    change constraint loading continuation function to use a promise.
    This is necessary because the constraints must all be loaded before the people
    conflicts can be calculated.  Do the people conflict calculation and show it
    The conflicts display is still broken.
    make loading of events wait for area directors to be populated
    use embedded group object so that group info, and therefore responsible AD information is available
    when events are being populated into the table
    removed recalculate button
    return session object with embedded group to avoid additional group load
    do json formatting in view rather than in template
    added single constraint API for consistency and debug
    be careful not to follow parent if it does not exist
    make list of area directors, create people objects from it, and then assign an area directory number and class
    implement person API, use it to fill in the Area Director
    use a thicker box for more critical conflicts
    rip out conflict display table, sort conflicts into a single list
    reworked session and group load to use $.ajax and promise interface.
    firefox has many $.ajax load errors for groups: web server and tamper data thinks the
    data loaded fine... in these cases work around by silly knowledge of href.
    reworked css so that conflict box renders nicely.
    some icons for showing conflicts
    clarify copyright and header files
    added new relationship for people must be present
    find and retrieve people constraints
    added some user objects and person objects for constraint person must present.
    Without the user objects, the IESGHistory routines fail
    added bethere ConstraintName to implement AD Must be be present
 - Legacy-Id: 6337

Author: mcr

r6328/ietf/group/models.py

@@ -11,7 +11,7 @@
 
 import datetime
 import debug
-    
+
 class GroupInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     name = models.CharField(max_length=80)
@@ -101,10 +101,14 @@ def json_dict(self, host_scheme):
         group1['name']    = self.name
         group1['state']   = self.state.slug
         group1['type']    = self.type.slug
-        group1['parent_href']  = urljoin(host_scheme, self.parent.json_url())
+        if self.parent is not None:
+            group1['parent_href']  = urljoin(host_scheme, self.parent.json_url())
         # uncomment when people URL handle is created
-        #if self.ad is not None:
-        #    group1['ad_href']      = urljoin(host_scheme, self.ad.url())
+        try:
+            if self.ad is not None:
+                group1['ad_href']      = urljoin(host_scheme, self.ad.json_url())
+        except Person.DoesNotExist:
+            pass
         group1['list_email'] = self.list_email
         group1['list_subscribe'] = self.list_subscribe
         group1['list_archive'] = self.list_archive

r6328/ietf/meeting/ajax.py

@@ -61,6 +61,30 @@ def readonly(request, meeting_num, schedule_id):
          'owner_href':  request.build_absolute_uri(schedule.owner.json_url()),
          'read_only':   read_only})
 
+@group_required('Area Director','Secretariat')
+@dajaxice_register
+def update_timeslot_pinned(request, schedule_id, scheduledsession_id, pinned=False):
+    schedule = get_object_or_404(Schedule, pk = int(schedule_id))
+    meeting  = schedule.meeting
+    cansee,canedit = agenda_permissions(meeting, schedule, request.user)
+
+    if not canedit:
+        raise Http403
+        return json.dumps({'error':'no permission'})
+
+    if scheduledsession_id is not None:
+        ss_id = int(scheduledsession_id)
+
+    if ss_id != 0:
+        ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id)
+
+    ss.pinned = pinned
+    ss.save()
+
+    return json.dumps({'message':'valid'})
+
+
+
 @group_required('Area Director','Secretariat')
 @dajaxice_register
 def update_timeslot(request, schedule_id, session_id, scheduledsession_id=None, extended_from_id=None, duplicate=False):
@@ -459,13 +483,35 @@ def session_json(request, num, sessionid):
         session = meeting.session_set.get(pk=int(sessionid))
     except Session.DoesNotExist:
         return json.dumps({'error':"no such session %s" % sessionid})
+        return HttpResponse(json.dumps({'error':"no such session %s" % sessionid}),
+                            status = 404,
+                            mimetype="application/json")
 
     sess1 = session.json_dict(request.build_absolute_uri('/'))
     return HttpResponse(json.dumps(sess1, sort_keys=True, indent=2),
                         mimetype="application/json")
 
 # Would like to cache for 1 day, but there are invalidation issues.
 #@cache_page(86400)
+def constraint_json(request, num, constraintid):
+    meeting = get_meeting(num)
+
+    try:
+        constraint = meeting.constraint_set.get(pk=int(constraintid))
+    except Constraint.DoesNotExist:
+        return HttpResponse(json.dumps({'error':"no such constraint %s" % constraintid}),
+                            status = 404,
+                            mimetype="application/json")
+
+    json1 = constraint.json_dict(request.get_host_protocol())
+    return HttpResponse(json.dumps(json1, sort_keys=True, indent=2),
+                        mimetype="application/json")
+
+
+# Cache for 2 hour2
+#@cache_page(7200)
+# caching is a problem if there Host: header changes.
+#
 def session_constraints(request, num, sessionid):
     meeting = get_meeting(num)
 

r6328/ietf/meeting/fixtures/constraint83.json

@@ -1454,5 +1454,9 @@
 {"pk": 22491, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1751, "name": "conflic2"}},
 {"pk": 22492, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1817, "name": "conflic2"}},
 {"pk": 22493, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1728, "name": "conflic2"}},
-{"pk": 22494, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1789, "name": "conflic2"}}
-]
+{"pk": 22494, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1789, "name": "conflic2"}},
+{"pk": 23000, "model": "meeting.constraint", "fields": {"source": 1816, "meeting": 83, "name": "bethere", "person": 103539}},
+{"pk": 23001, "model": "meeting.constraint", "fields": {"source": 1816, "meeting": 83, "name": "bethere", "person": 108554}},
+{"pk": 23002, "model": "meeting.constraint", "fields": {"source": 1816, "meeting": 83, "name": "bethere", "person": 102830}}
+
+]

r6328/ietf/meeting/helpers.py

@@ -10,8 +10,11 @@
 
 from django import forms
 from django.http import Http404
+from django.http import HttpRequest
 from django.db.models import Max, Q
 from django.conf import settings
+from django.core.cache import cache
+from django.utils.cache import get_cache_key
 
 import debug
 import urllib
@@ -127,7 +130,7 @@ def slot_decor(self):
         return self.timeslot.slot_decor
 
 def build_url_pair(request, meeting):
-    meeting_base_url = request.build_absolute_uri(meeting.base_url())
+    meeting_base_url = request.build_absolute_uri(meeting.json_url())
     site_base_url    = request.build_absolute_uri('/')
 
     # remove trailing / from site_base_url.
@@ -354,3 +357,15 @@ def agenda_permissions(meeting, schedule, user):
         canedit = True
 
     return cansee,canedit
+
+def session_constraint_expire(session):
+    from django.core.urlresolvers import reverse
+    from ajax import session_constraints
+    path = reverse(session_constraints, args=[session.meeting.number, session.pk])
+    request = HttpRequest()
+    request.path = path
+    key = get_cache_key(request)
+    if key is not None and cache.has_key(key):
+        cache.delete(key)
+
+