Don't prompt for the day of the month in setting up milestones,

instead set the deadline to the last day of the month, also remove any
references to the day of the month from the output
 - Legacy-Id: 4596

Author: OleLaursen

ietf/templates/wginfo/edit_milestones.html

@@ -93,7 +93,6 @@ <h1>{{ title }}</h1>
 {% block content_end %}
 <script type="text/javascript" src="/js/lib/jquery.tokeninput.js"></script>
 <script type="text/javascript" src="/js/lib/json2.js"></script>
-<script type="text/javascript" src="/js/lib/jquery.maskedinput.js"></script>
 <script type="text/javascript" src="/js/tokenized-field.js"></script>
 <script>
   var finishedMilestoneText = "{{ finished_milestone_text|escapejs }}";

ietf/templates/wginfo/milestone_form.html

@@ -18,8 +18,8 @@
   </tr>
   {% if form.desc.errors %}<tr><td></td><td colspan="2">{{ form.desc.errors }}</td></tr>{% endif %}
   <tr>
-    <td>{{ form.due.label_tag }}:</td>
-    <td><span class="due">{{ form.due }}</span> {{ form.due.errors }}
+    <td>Due date:</td>
+    <td><span class="due">{{ form.due_month }} {{ form.due_year }}</span> {{ form.due_month.errors }} {{ form.due_year.errors }}
     <span class="resolved">{{ form.resolved_checkbox }} {{ form.resolved_checkbox.label_tag }} {{ form.resolved }}</span>
      {{ form.resolved.errors }}
     </td>

ietf/wginfo/milestones.py

@@ -1,6 +1,6 @@
 # WG milestone editing views
 
-import re, os, string, datetime, shutil
+import re, os, string, datetime, shutil, calendar
 
 from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.core.urlresolvers import reverse
@@ -29,7 +29,8 @@ class MilestoneForm(forms.Form):
     id = forms.IntegerField(required=True, widget=forms.HiddenInput)
 
     desc = forms.CharField(max_length=500, label="Milestone", required=True)
-    due = forms.DateField(required=True, label="Due date")
+    due_month = forms.TypedChoiceField(choices=(), required=True, coerce=int)
+    due_year = forms.TypedChoiceField(choices=(), required=True, coerce=int)
     resolved_checkbox = forms.BooleanField(required=False, label="Resolved")
     resolved = forms.CharField(max_length=50, required=False)
 
@@ -50,7 +51,8 @@ def __init__(self, *args, **kwargs):
                 kwargs["initial"] = {}
             kwargs["initial"].update(dict(id=m.pk,
                                           desc=m.desc,
-                                          due=m.due,
+                                          due_month=m.due.month,
+                                          due_year=m.due.year,
                                           resolved_checkbox=bool(m.resolved),
                                           resolved=m.resolved,
                                           docs=",".join(m.docs.values_list("pk", flat=True)),
@@ -62,6 +64,20 @@ def __init__(self, *args, **kwargs):
 
         super(MilestoneForm, self).__init__(*args, **kwargs)
 
+        # set choices for due date
+        this_year = datetime.date.today().year
+
+        self.fields["due_month"].choices = [(m, datetime.date(this_year, m, 1).strftime("%B")) for m in range(1, 13)]
+
+        years = [ y for y in range(this_year, this_year + 10)]
+
+        initial = self.initial.get("due_year")
+        if initial and initial not in years:
+            years.insert(0, initial)
+
+        self.fields["due_year"].choices = zip(years, map(str, years))
+
+
         # figure out what to prepopulate many-to-many field with
         pre = ""
         if not self.is_bound:
@@ -122,6 +138,11 @@ def edit_milestones(request, acronym, milestone_set="current"):
 
     milestones_dict = dict((str(m.id), m) for m in milestones)
 
+    def due_month_year_to_date(c):
+        y = c["due_year"]
+        m = c["due_month"]
+        return datetime.date(y, m, calendar.monthrange(y, m)[1])
+
     def set_attributes_from_form(f, m):
         c = f.cleaned_data
         m.group = group
@@ -133,7 +154,7 @@ def set_attributes_from_form(f, m):
         elif milestone_set == "charter":
             m.state = GroupMilestoneStateName.objects.get(slug="charter")
         m.desc = c["desc"]
-        m.due = c["due"]
+        m.due = due_month_year_to_date(c)
         m.resolved = c["resolved"]
 
     def save_milestone_form(f):
@@ -177,11 +198,13 @@ def save_milestone_form(f):
                 m.desc = c["desc"]
                 changes.append('set description to "%s"' % m.desc)
 
-            if c["due"] != m.due:
+
+            c_due = due_month_year_to_date(c)
+            if c_due != m.due:
                 if not history:
                     history = save_milestone_in_history(m)
-                changes.append('set due date to %s from %s' % (c["due"].strftime("%Y-%m-%d"), m.due.strftime("%Y-%m-%d")))
-                m.due = c["due"]
+                changes.append('set due date to %s from %s' % (c_due.strftime("%B %Y"), m.due.strftime("%B %Y")))
+                m.due = c_due
 
             resolved = c["resolved"]
             if resolved != m.resolved:
@@ -230,9 +253,9 @@ def save_milestone_form(f):
                 named_milestone = "charter " + named_milestone
 
             if m.state_id in ("active", "charter"):
-                return 'Added %s, due %s' % (named_milestone, m.due.strftime("%Y-%m-%d"))
+                return 'Added %s, due %s' % (named_milestone, m.due.strftime("%B %Y"))
             elif m.state_id == "review":
-                return 'Added %s for review, due %s' % (named_milestone, m.due.strftime("%Y-%m-%d"))
+                return 'Added %s for review, due %s' % (named_milestone, m.due.strftime("%B %Y"))
 
     finished_milestone_text = "Done"
 
@@ -353,7 +376,7 @@ def reset_charter_milestones(request, acronym):
 
             DocEvent.objects.create(type="changed_charter_milestone",
                                     doc=group.charter,
-                                    desc='Added milestone "%s", due %s, from current group milestones' % (new.desc, new.due.strftime("%Y-%m-%d")),
+                                    desc='Added milestone "%s", due %s, from current group milestones' % (new.desc, new.due.strftime("%B %Y")),
                                     by=login,
                                     )
 

ietf/wginfo/tests.py

@@ -30,7 +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 os, unittest, shutil
+import os, unittest, shutil, calendar
 
 import django.test
 from django.conf import settings
@@ -275,6 +275,9 @@ def create_test_milestones(self):
 
         return (m1, m2, group)
 
+    def last_day_of_month(self, d):
+        return datetime.date(d.year, d.month, calendar.monthrange(d.year, d.month)[1])
+
 
     def test_milestone_sets(self):
         m1, m2, group = self.create_test_milestones()
@@ -308,13 +311,14 @@ def test_add_milestone(self):
         events_before = group.groupevent_set.count()
         docs = Document.objects.filter(type="draft").values_list("name", flat=True)
 
-        due = datetime.date.today() + datetime.timedelta(days=365)
+        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
 
         # faulty post
         r = self.client.post(url, { 'prefix': "m-1",
-                                    'm-1-id': -1,
+                                    'm-1-id': "-1",
                                     'm-1-desc': "", # no description
-                                    'm-1-due': due.strftime("%Y-%m-%d"),
+                                    'm-1-due_month': str(due.month),
+                                    'm-1-due_year': str(due.year),
                                     'm-1-resolved': "",
                                     'm-1-docs': ",".join(docs),
                                     'action': "save",
@@ -326,9 +330,10 @@ def test_add_milestone(self):
 
         # add
         r = self.client.post(url, { 'prefix': "m-1",
-                                    'm-1-id': -1,
+                                    'm-1-id': "-1",
                                     'm-1-desc': "Test 3",
-                                    'm-1-due': due.strftime("%Y-%m-%d"),
+                                    'm-1-due_month': str(due.month),
+                                    'm-1-due_year': str(due.year),
                                     'm-1-resolved': "",
                                     'm-1-docs': ",".join(docs),
                                     'action': "save",
@@ -356,13 +361,14 @@ def test_add_milestone_as_chair(self):
 
         milestones_before = GroupMilestone.objects.count()
         events_before = group.groupevent_set.count()
-        due = datetime.date.today() + datetime.timedelta(days=365)
+        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
 
         # add
         r = self.client.post(url, { 'prefix': "m-1",
                                     'm-1-id': -1,
                                     'm-1-desc': "Test 3",
-                                    'm-1-due': due.strftime("%Y-%m-%d"),
+                                    'm-1-due_month': str(due.month),
+                                    'm-1-due_year': str(due.year),
                                     'm-1-resolved': "",
                                     'm-1-docs': "",
                                     'action': "save",
@@ -388,18 +394,20 @@ def test_accept_milestone(self):
         self.assertEquals(r.status_code, 200)
 
         events_before = group.groupevent_set.count()
-        due = datetime.date.today() + datetime.timedelta(days=365)
+        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
 
         # add
         r = self.client.post(url, { 'prefix': "m1",
                                     'm1-id': m1.id,
                                     'm1-desc': m1.desc,
-                                    'm1-due': m1.due.strftime("%Y-%m-%d"),
+                                    'm1-due_month': str(m1.due.month),
+                                    'm1-due_year': str(m1.due.year),
                                     'm1-resolved': m1.resolved,
                                     'm1-docs': ",".join(m1.docs.values_list("name", flat=True)),
                                     'm1-accept': "accept",
                                     'action': "save",
                                     })
+        print r.content
         self.assertEquals(r.status_code, 302)
 
         m = GroupMilestone.objects.get(pk=m1.pk)
@@ -420,7 +428,8 @@ def test_delete_milestone(self):
         r = self.client.post(url, { 'prefix': "m1",
                                     'm1-id': m1.id,
                                     'm1-desc': m1.desc,
-                                    'm1-due': m1.due.strftime("%Y-%m-%d"),
+                                    'm1-due_month': str(m1.due.month),
+                                    'm1-due_year': str(m1.due.year),
                                     'm1-resolved': "",
                                     'm1-docs': ",".join(m1.docs.values_list("name", flat=True)),
                                     'm1-delete': "checked",
@@ -444,13 +453,14 @@ def test_edit_milestone(self):
         events_before = group.groupevent_set.count()
         docs = Document.objects.filter(type="draft").values_list("name", flat=True)
 
-        due = datetime.date.today() + datetime.timedelta(days=365)
+        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
 
         # faulty post
         r = self.client.post(url, { 'prefix': "m1",
                                     'm1-id': m1.id,
                                     'm1-desc': "", # no description
-                                    'm1-due': due.strftime("%Y-%m-%d"),
+                                    'm1-due_month': str(due.month),
+                                    'm1-due_year': str(due.year),
                                     'm1-resolved': "",
                                     'm1-docs': ",".join(docs),
                                     'action': "save",
@@ -467,7 +477,8 @@ def test_edit_milestone(self):
         r = self.client.post(url, { 'prefix': "m1",
                                     'm1-id': m1.id,
                                     'm1-desc': "Test 2 - changed",
-                                    'm1-due': due.strftime("%Y-%m-%d"),
+                                    'm1-due_month': str(due.month),
+                                    'm1-due_year': str(due.year),
                                     'm1-resolved': "Done",
                                     'm1-resolved_checkbox': "checked",
                                     'm1-docs': ",".join(docs),
@@ -566,6 +577,9 @@ def test_send_milestones_due_reminders(self):
 
         early_warning_days = 30
 
+        # due dates here aren't aligned on the last day of the month,
+        # but everything should still work
+
         m1 = GroupMilestone.objects.create(group=group,
                                            desc="Test 1",
                                            due=datetime.date.today(),
@@ -606,6 +620,9 @@ def test_send_milestones_overdue_reminders(self):
         group = Group.objects.get(acronym="mars")
         person = Person.objects.get(user__username="marschairman")
 
+        # due dates here aren't aligned on the last day of the month,
+        # but everything should still work
+
         m1 = GroupMilestone.objects.create(group=group,
                                            desc="Test 1",
                                            due=datetime.date.today() - datetime.timedelta(days=200),
@@ -627,7 +644,7 @@ def test_send_milestones_overdue_reminders(self):
         m1.resolved = ""
         m1.save()
 
-        m2.due = datetime.date.today() - datetime.timedelta(days=300)
+        m2.due = self.last_day_of_month(datetime.date.today() - datetime.timedelta(days=300))
         m2.save()
 
         # send

static/js/edit-milestones.js

@@ -10,7 +10,7 @@ jQuery(function () {
 
     function setSubmitButtonState() {
         var action, label;
-        if (jQuery("#milestones-form input[name$=due]:visible").length > 0)
+        if (jQuery("#milestones-form input[name$=delete]:visible").length > 0)
             action = "review";
         else
             action = "save";
@@ -46,7 +46,6 @@ jQuery(function () {
 
             editRow.removeClass("template");
             setupTokenizedField(editRow.find(".tokenized-field")); // from tokenized-field.js
-            setInputMasks(editRow);
             editRow.show();
         }
         else {
@@ -102,12 +101,6 @@ jQuery(function () {
         .each(setDeleteState)
         .live("change", setDeleteState);
 
-    function setInputMasks(editRows) {
-        editRows.find(".due input").mask("9999-99-99");
-    }
-
-    setInputMasks(jQuery("#milestone-form .edit-milestone").not(".template"));
-
     jQuery('#milestones-form .edit-milestone .errorlist').each(function () {
         jQuery(this).closest(".edit-milestone").prev().click();
     });