Introduce more generic ballot models, start porting doc ballot page to the

new database schema.
 - Legacy-Id: 4240

Author: OleLaursen

ietf/doc/models.py

@@ -299,6 +299,8 @@ class DocReminder(models.Model):
     # IESG events
     ("started_iesg_process", "Started IESG process on document"),
 
+    ("created_ballot", "Created ballot"),
+    ("closed_ballot", "Closed ballot"),
     ("sent_ballot_announcement", "Sent ballot announcement"),
     ("changed_ballot_position", "Changed ballot position"),
 
@@ -335,7 +337,25 @@ class NewRevisionDocEvent(DocEvent):
     rev = models.CharField(max_length=16)
 
 # IESG events
+class BallotType(models.Model):
+    doc_type = models.ForeignKey(DocTypeName, blank=True, null=True)
+    slug = models.SlugField()
+    name = models.CharField(max_length=255)
+    question = models.TextField(blank=True)
+    used = models.BooleanField(default=True)
+    order = models.IntegerField(default=0)
+
+    def __unicode__(self):
+        return self.name
+    
+    class Meta:
+        ordering = ['order']
+
+class BallotDocEvent(DocEvent):
+    ballot_type = models.ForeignKey(BallotType)
+
 class BallotPositionDocEvent(DocEvent):
+#    ballot = models.ForeignKey(BallotDocEvent, null=True)
     ad = models.ForeignKey(Person)
     pos = models.ForeignKey(BallotPositionName, verbose_name="position", default="norecord")
     discuss = models.TextField(help_text="Discuss text if position is discuss", blank=True)

ietf/doc/utils.py

@@ -30,12 +30,19 @@ def get_tags_for_stream_id(stream_id):
     else:
         return []
 
-def active_ballot_positions(doc):
+def active_ballot_positions(doc, ballot=None):
     """Return dict mapping each active AD to a current ballot position (or None if they haven't voted)."""
     active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active"))
     res = {}
 
-    positions = BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position", ad__in=active_ads).select_related('ad').order_by("-time", "-id")
+    # FIXME: do something with ballot
+
+    start = datetime.datetime.min
+    e = doc.latest_event(type="started_iesg_process")
+    if e:
+        start = e.time
+
+    positions = BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position", ad__in=active_ads, time__gte=start).select_related('ad').order_by("-time", "-id")
 
     for pos in positions:
         if pos.ad not in res:
@@ -46,7 +53,46 @@ def active_ballot_positions(doc):
             res[ad] = None
 
     return res
+
+def needed_ballot_positions(doc, active_positions):
+    '''Returns text answering the question "what does this document
+    need to pass?".  The return value is only useful if the document
+    is currently in IESG evaluation.'''
+    yes = [p for p in active_positions if p.pos_id == "yes"]
+    noobj = [p for p in active_positions if p.pos_id == "noobj"]
+    blocking = [p for p in active_positions if p.pos.blocking]
+    recuse = [p for p in active_positions if p.pos_id == "recuse"]
+
+    answer = []
+    if yes < 1:
+        answer.append("Needs a YES.")
+    if blocking:
+        if blocking:
+            answer.append("Has a %s." % blocking[0].name.upper())
+        else:
+            answer.append("Has %d %s." % (len(blocking), blocking[0].name.upper()))
+    needed = 1
+    if doc.type_id == "draft" and doc.intended_std_level_id in ("bcp", "ps", "ds", "std"):
+        # For standards-track, need positions from 2/3 of the
+        # non-recused current IESG.
+        needed = len(active_positions) - recuse * 2 / 3
+
+    have = len(yes) + len(noobj) + len(blocking)
+    if have < needed:
+        more = needed - have
+        if more == 1:
+            answer.append("Needs %d more position." % more)
+        else:
+            answer.append("Needs %d more positions." % more)
+    else:
+        if blocking:
+            answer.append("Has enough positions to pass.")
+        else:
+            answer.append("Has enough positions to pass once %s positions are resolved." % blocking[0].name.upper())
+
+    return " ".join(answer)
 
+
 def get_rfc_number(doc):
     qs = doc.docalias_set.filter(name__startswith='rfc')
     return qs[0].name[3:] if qs else None

ietf/idrfc/views_doc.py

@@ -30,8 +30,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import re, os
-from datetime import datetime, time
+import re, os, datetime
 
 from django.http import HttpResponse, Http404
 from django.shortcuts import render_to_response, get_object_or_404, redirect
@@ -50,8 +49,8 @@
 from ietf.idrfc.models import RfcIndex, DraftVersions
 from ietf.idrfc.idrfc_wrapper import BallotWrapper, IdWrapper, RfcWrapper
 from ietf.ietfworkflows.utils import get_full_info_for_draft
-from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, WriteupDocEvent, TelechatDocEvent
-from ietf.doc.utils import get_chartering_type
+from ietf.doc.models import *
+from ietf.doc.utils import get_chartering_type, needed_ballot_positions
 from ietf.utils.history import find_history_active_at
 from ietf.ietfauth.decorators import has_role
 
@@ -240,7 +239,74 @@ def document_writeup(request, name):
                                    ),
                               context_instance=RequestContext(request))
 
+def document_ballot_content(request, name, ballot, editable=True):
+    doc = get_object_or_404(Document, docalias__name=name)
+
+    if ballot != None:
+        b = doc.latest_event(BallotDocEvent, type="created_ballot", id=ballot)
+    else:
+        b = doc.latest_event(BallotDocEvent, type="created_ballot")
+
+    if not b:
+        raise Http404()
+
+    deferred = None
+    if doc.get_state_slug("%s-iesg" % doc.type) == "defer":
+        # FIXME: fragile
+        deferred = doc.latest_event(type="changed_document", desc__startswith="State changed to <b>IESG Evaluation - Defer</b>")
+
+    # collect positions
+    active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active").distinct())
+
+    positions = []
+    seen = {}
+    # FIXME: restrict on ballot
+    for e in BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position").select_related('ad', 'pos').order_by("-time", '-id'):
+        if e.ad not in seen:
+            e.old_ad = e.ad in active_ads
+            e.old_positions = []
+            positions.append(e)
+            seen[e.ad] = pos
+        else:
+            latest = seen[e.ad]
+            if latest.old_positions:
+                prev = latest.old_positions[-1]
+            else:
+                prev = latest
+
+            if e.pos != prev.pos:
+                latest.old_positions.append(pos)
+
+    # add any missing ADs through fake No Record events
+    for ad in active_ads:
+        if ad not in seen:
+            e = BallotPositionDocEvent(type="changed_ballot_position", doc=doc, ad=ad)
+            e.pos_id = "norecord"
+            e.old_ad = False
+            e.old_positions = []
+            positions.append(e)
+
+    # put into position groups
+    position_groups = []
+    for n in BallotPositionName.objects.filter(slug__in=[p.pos_id for p in positions]).order_by('order'):
+        g = (n, [p for p in positions if p.pos_id == n.slug])
+        if n.blocking:
+            position_groups.insert(0, g)
+        else:
+            position_groups.append(g)
 
+    summary = needed_ballot_positions(doc, [p for p in positions if not p.old_ad])
+
+    return render_to_string("idrfc/document_ballot_content.html",
+                              dict(doc=doc,
+                                   ballot=b,
+                                   position_groups=position_groups,
+                                   positions=positions,
+                                   editable=editable,
+                                   deferred=deferred,
+                                   summary=summary,
+                                   ),
+                              context_instance=RequestContext(request))
 
 def document_ballot(request, name, ballot=None):
     if name.lower().startswith("draft") or name.lower().startswith("rfc"):
@@ -249,9 +315,14 @@ def document_ballot(request, name, ballot=None):
     doc = get_object_or_404(Document, docalias__name=name)
     top = render_document_top(request, doc, "ballot")
 
-    # FIXME: port implementation from wgcharter
+    c = document_ballot_content(request, name, ballot, editable=True)
 
-    raise Http404()
+    return render_to_response("idrfc/document_ballot.html",
+                              dict(doc=doc,
+                                   top=top,
+                                   ballot_content=c,
+                                   ),
+                              context_instance=RequestContext(request))
 
 def document_debug(request, name):
     r = re.compile("^rfc([1-9][0-9]*)$")
@@ -424,11 +495,11 @@ def _get_history(doc, versions):
 
     # convert plain dates to datetimes (required for sorting)
     for x in results:
-        if not isinstance(x['date'], datetime):
+        if not isinstance(x['date'], datetime.datetime):
             if x['date']:
-                x['date'] = datetime.combine(x['date'], time(0,0,0))
+                x['date'] = datetime.datetime.combine(x['date'], datetime.time(0,0,0))
             else:
-                x['date'] = datetime(1970,1,1)
+                x['date'] = datetime.datetime(1970,1,1)
 
     results.sort(key=lambda x: x['date'])
     results.reverse()