Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assignment: Validate that end date is provided if you didn't choose open-ended.

Browse source
This commit is contained in:
Ben Sturmfels 2021-12-10 18:37:13 +11:00
parent 530890f6ad
commit b0263491a0
Signed by: bsturmfels
GPG key ID: 023C05E2C9C068F0
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/conservancy/apps/assignment/forms.py
View file

@ -62,3 +62,6 @@ class AssignmentForm(forms.ModelForm):
def clean_period_ends(self): def clean_period_ends(self):
if 'period_begins' in self.cleaned_data and 'period_ends' in self.cleaned_data and self.cleaned_data['period_begins'] and self.cleaned_data['period_ends'] and self.cleaned_data['period_begins'] > self.cleaned_data['period_ends']: if 'period_begins' in self.cleaned_data and 'period_ends' in self.cleaned_data and self.cleaned_data['period_begins'] and self.cleaned_data['period_ends'] and self.cleaned_data['period_begins'] > self.cleaned_data['period_ends']:
raise ValidationError('End of period is before start') raise ValidationError('End of period is before start')
if self.cleaned_data['period_end_type'] == 'a specific past date' and not self.cleaned_data['period_ends']:
raise ValidationError('This field is required')

9
www/conservancy/templates/assignment/assignment_form.html
View file

@ -24,7 +24,8 @@
// End date field should be shown only when "a specific past date" is selected. // End date field should be shown only when "a specific past date" is selected.
const form = document.querySelector('#assignment-form'); const form = document.querySelector('#assignment-form');
const past_date_label = document.querySelector('label[for=id_period_ends]'); const past_date_label = document.querySelector('label[for=id_period_ends]');
const past_date_field = document.querySelector('#assignment-form > p:nth-child(11)'); const past_date_field = document.querySelector('#id_period_ends');
const past_date_container = past_date_field.parentElement;
form.addEventListener('change', togglePastDate); form.addEventListener('change', togglePastDate);
togglePastDate(); // Run change handler once to initialise form. togglePastDate(); // Run change handler once to initialise form.
@ -33,10 +34,12 @@
function togglePastDate() { function togglePastDate() {
if (form['period_end_type'].value === 'all future contributions') { if (form['period_end_type'].value === 'all future contributions') {
past_date_field.style.display = 'none'; past_date_container.style.display = 'none';
past_date_field.required = false;
} }
else { else {
past_date_field.style.display = ''; past_date_container.style.display = '';
past_date_field.required = true;
} }
} }
</script> </script>