altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions3 Packages Projects Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Ole Laursen 2012-07-05 18:57:15 +00:00
parent 95b144515e
commit 27935fb7a2
6 changed files with 68 additions and 294 deletions

1
ietf/templates/wginfo/edit_milestones.html
View file

@ -93,7 +93,6 @@ this list</a> to the currently in-use milestones for the {{ group.acronym }} {{
{% 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 }}";

4
ietf/templates/wginfo/milestone_form.html
View file

@ -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>

43
ietf/wginfo/milestones.py
View file

@ -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 @@ class MilestoneForm(forms.Form):
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 @@ class MilestoneForm(forms.Form):
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 edit_milestones(request, acronym, milestone_set="current"):
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 edit_milestones(request, acronym, milestone_set="current"):
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 edit_milestones(request, acronym, milestone_set="current"):
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,
)

47
ietf/wginfo/tests.py
View file

@ -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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
# 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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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 @@ class MilestoneTestCase(django.test.TestCase):
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

9
static/js/edit-milestones.js
View file

@ -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();
});

258
static/js/lib/jquery.maskedinput.js
View file

@ -1,258 +0,0 @@
/*
Masked Input plugin for jQuery
Copyright (c) 2007-@Year Josh Bush (digitalbush.com)
Licensed under the MIT license (http://digitalbush.com/projects/masked-input-plugin/#license)
Version: @version
*/
(function($) {
var pasteEventName = ($.browser.msie ? 'paste' : 'input') + ".mask";
var iPhone = (window.orientation != undefined);
$.mask = {
//Predefined character definitions
definitions: {
'9': "[0-9]",
'a': "[A-Za-z]",
'*': "[A-Za-z0-9]"
},
dataName:"rawMaskFn"
};
$.fn.extend({
//Helper Function for Caret positioning
caret: function(begin, end) {
if (this.length == 0) return;
if (typeof begin == 'number') {
end = (typeof end == 'number') ? end : begin;
return this.each(function() {
if (this.setSelectionRange) {
this.setSelectionRange(begin, end);
} else if (this.createTextRange) {
var range = this.createTextRange();
range.collapse(true);
range.moveEnd('character', end);
range.moveStart('character', begin);
range.select();
}
});
} else {
if (this[0].setSelectionRange) {
begin = this[0].selectionStart;
end = this[0].selectionEnd;
} else if (document.selection && document.selection.createRange) {
var range = document.selection.createRange();
begin = 0 - range.duplicate().moveStart('character', -100000);
end = begin + range.text.length;
}
return { begin: begin, end: end };
}
},
unmask: function() { return this.trigger("unmask"); },
mask: function(mask, settings) {
if (!mask && this.length > 0) {
var input = $(this[0]);
return input.data($.mask.dataName)();
}
settings = $.extend({
placeholder: "_",
completed: null
}, settings);
var defs = $.mask.definitions;
var tests = [];
var partialPosition = mask.length;
var firstNonMaskPos = null;
var len = mask.length;
$.each(mask.split(""), function(i, c) {
if (c == '?') {
len--;
partialPosition = i;
} else if (defs[c]) {
tests.push(new RegExp(defs[c]));
if(firstNonMaskPos==null)
firstNonMaskPos = tests.length - 1;
} else {
tests.push(null);
}
});
return this.trigger("unmask").each(function() {
var input = $(this);
var buffer = $.map(mask.split(""), function(c, i) { if (c != '?') return defs[c] ? settings.placeholder : c });
var focusText = input.val();
function seekNext(pos) {
while (++pos <= len && !tests[pos]);
return pos;
};
function seekPrev(pos) {
while (--pos >= 0 && !tests[pos]);
return pos;
};
function shiftL(begin,end) {
if(begin<0)
return;
for (var i = begin,j = seekNext(end); i < len; i++) {
if (tests[i]) {
if (j < len && tests[i].test(buffer[j])) {
buffer[i] = buffer[j];
buffer[j] = settings.placeholder;
} else
break;
j = seekNext(j);
}
}
writeBuffer();
input.caret(Math.max(firstNonMaskPos, begin));
};
function shiftR(pos) {
for (var i = pos, c = settings.placeholder; i < len; i++) {
if (tests[i]) {
var j = seekNext(i);
var t = buffer[i];
buffer[i] = c;
if (j < len && tests[j].test(t))
c = t;
else
break;
}
}
};
function keydownEvent(e) {
var k=e.which;
//backspace, delete, and escape get special treatment
if(k == 8 || k == 46 || (iPhone && k == 127)){
var pos = input.caret(),
begin = pos.begin,
end = pos.end;
if(end-begin==0){
begin=k!=46?seekPrev(begin):(end=seekNext(begin-1));
end=k==46?seekNext(end):end;
}
clearBuffer(begin, end);
shiftL(begin,end-1);
return false;
} else if (k == 27) {//escape
input.val(focusText);
input.caret(0, checkVal());
return false;
}
};
function keypressEvent(e) {
var k = e.which,
pos = input.caret();
if (e.ctrlKey || e.altKey || e.metaKey || k<32) {//Ignore
return true;
} else if (k) {
if(pos.end-pos.begin!=0){
clearBuffer(pos.begin, pos.end);
shiftL(pos.begin, pos.end-1);
}
var p = seekNext(pos.begin - 1);
if (p < len) {
var c = String.fromCharCode(k);
if (tests[p].test(c)) {
shiftR(p);
buffer[p] = c;
writeBuffer();
var next = seekNext(p);
input.caret(next);
if (settings.completed && next >= len)
settings.completed.call(input);
}
}
return false;
}
};
function clearBuffer(start, end) {
for (var i = start; i < end && i < len; i++) {
if (tests[i])
buffer[i] = settings.placeholder;
}
};
function writeBuffer() { return input.val(buffer.join('')).val(); };
function checkVal(allow) {
//try to place characters where they belong
var test = input.val();
var lastMatch = -1;
for (var i = 0, pos = 0; i < len; i++) {
if (tests[i]) {
buffer[i] = settings.placeholder;
while (pos++ < test.length) {
var c = test.charAt(pos - 1);
if (tests[i].test(c)) {
buffer[i] = c;
lastMatch = i;
break;
}
}
if (pos > test.length)
break;
} else if (buffer[i] == test.charAt(pos) && i!=partialPosition) {
pos++;
lastMatch = i;
}
}
if (!allow && lastMatch + 1 < partialPosition) {
input.val("");
clearBuffer(0, len);
} else if (allow || lastMatch + 1 >= partialPosition) {
writeBuffer();
if (!allow) input.val(input.val().substring(0, lastMatch + 1));
}
return (partialPosition ? i : firstNonMaskPos);
};
input.data($.mask.dataName,function(){
return $.map(buffer, function(c, i) {
return tests[i]&&c!=settings.placeholder ? c : null;
}).join('');
})
if (!input.attr("readonly"))
input
.one("unmask", function() {
input
.unbind(".mask")
.removeData($.mask.dataName);
})
.bind("focus.mask", function() {
focusText = input.val();
var pos = checkVal();
writeBuffer();
var moveCaret=function(){
if (pos == mask.length)
input.caret(0, pos);
else
input.caret(pos);
};
($.browser.msie ? moveCaret:function(){setTimeout(moveCaret,0)})();
})
.bind("blur.mask", function() {
checkVal();
if (input.val() != focusText)
input.change();
})
.bind("keydown.mask", keydownEvent)
.bind("keypress.mask", keypressEvent)
.bind(pasteEventName, function() {
setTimeout(function() { input.caret(checkVal(true)); }, 0);
});
checkVal(); //Perform initial check for existing values
});
}
});
})(jQuery);