Date picker and file attachments. See ietf-tools#342

 - Legacy-Id: 2373

Author: emiliosanchez

ietf/liaisons/forms.py

@@ -1,51 +1,81 @@
 from django import forms
 from django.conf import settings
+from django.forms.util import ErrorList
 from django.template.loader import render_to_string
 
 from ietf.liaisons.accounts import (can_add_outgoing_liaison, can_add_incoming_liaison,
                                     get_person_for_user)
 from ietf.liaisons.models import LiaisonDetail
 from ietf.liaisons.utils import IETFHierarchyManager
-from ietf.liaisons.widgets import FromWidget, ReadOnlyWidget
+from ietf.liaisons.widgets import FromWidget, ReadOnlyWidget, ButtonWidget
 
 
 class LiaisonForm(forms.ModelForm):
 
     from_field = forms.ChoiceField(widget=FromWidget, label=u'From')
     replyto = forms.CharField(label=u'Reply to')
     organization = forms.ChoiceField()
-    to_poc = forms.CharField(widget=ReadOnlyWidget, label="POC")
-    cc1 = forms.CharField(widget=ReadOnlyWidget, label="CC")
+    to_poc = forms.CharField(widget=ReadOnlyWidget, label="POC", required=False)
+    cc1 = forms.CharField(widget=ReadOnlyWidget, label="CC", required=False)
     purpose_text = forms.CharField(widget=forms.Textarea, label='Other purpose')
     deadline_date = forms.DateField(label='Deadline')
+    title = forms.CharField(label=u'Title')
+    attachments = forms.CharField(label='Attachments', widget=ReadOnlyWidget, initial='No files attached', required=False)
+    attach_title = forms.CharField(label='Title', required=False)
+    attach_file = forms.FileField(label='File', required=False)
+    attach_button = forms.CharField(label='',
+                                    widget=ButtonWidget(label='Attach', show_on='id_attachments',
+                                                        require=['id_attach_title', 'id_attach_file'],
+                                                        required_label='title and file'),
+                                    required=False)
 
     fieldsets = (('From', ('from_field', 'replyto')),
                  ('To', ('organization', 'to_poc')),
                  ('Other email addresses', ('response_contact', 'technical_contact', 'cc1')),
                  ('Purpose', ('purpose', 'purpose_text', 'deadline_date')),
-                 ('Body', ('body', )),
+                 ('Liaison Statement', ('title', 'body', 'attachments')),
+                 ('Add attachment', ('attach_title', 'attach_file', 'attach_button')),
                 )
 
     class Meta:
         model = LiaisonDetail
 
     class Media:
         js = ("/js/jquery-1.4.2.min.js",
+              "/js/jquery-ui-1.8.2.custom.min.js",
               "/js/liaisons.js", )
 
-        css = {'all': ("/css/liaisons.css", )}
+        css = {'all': ("/css/liaisons.css",
+                       "/css/jquery-ui-themes/jquery-ui-1.8.2.custom.css")}
 
     def __init__(self, user, *args, **kwargs):
+        self.person = get_person_for_user(user)
+        if kwargs.get('data', None):
+            kwargs['data'].update({'person': self.person.pk})
         super(LiaisonForm, self).__init__(*args, **kwargs)
         self.hm = IETFHierarchyManager()
-        self.person = get_person_for_user(user)
         self.set_from_field()
         self.set_replyto_field()
         self.set_organization_field()
 
     def __unicode__(self):
         return self.as_div()
 
+    def set_purpose_required_fields(self):
+        purpose = self.data.get('purpose', None)
+        if purpose == '5':
+            self.fields['purpose_text'].required=True
+        else:
+            self.fields['purpose_text'].required=False
+        if purpose in ['1', '2']:
+            self.fields['deadline_date'].required=True
+        else:
+            self.fields['deadline_date'].required=False
+
+    def reset_purpose_required_fields(self):
+        self.fields['purpose_text'].required=True
+        self.fields['deadline_date'].required=True
+
     def set_from_field(self):
         assert NotImplemented
 
@@ -73,6 +103,23 @@ def get_fieldsets(self):
                         continue
                 yield fieldset_dict
 
+    def full_clean(self):
+        self.set_purpose_required_fields()
+        super(LiaisonForm, self).full_clean()
+        self.reset_purpose_required_fields()
+
+    def has_attachments(self):
+        for key in self.files.keys():
+            if key.startswith('attach_file_') and key.replace('file', 'title') in self.data.keys():
+                return True
+        return False
+
+    def clean(self):
+        if not self.cleaned_data.get('body', None) and not self.has_attachments():
+            self._errors['body'] = ErrorList([u'You must provide a body or attachment files'])
+            self._errors['attachments'] = ErrorList([u'You must provide a body or attachment files'])
+        return self.cleaned_data
+
 
 class IncomingLiaisonForm(LiaisonForm):
 
@@ -96,10 +143,10 @@ def set_organization_field(self):
         pass
 
 
-def liaison_form_factory(request):
+def liaison_form_factory(request, **kwargs):
     user = request.user
     if can_add_incoming_liaison(user):
-        return IncomingLiaisonForm(user)
+        return IncomingLiaisonForm(user, **kwargs)
     elif can_add_outgoing_liaison(user):
-        return OutgoingLiaisonForm(user)
+        return OutgoingLiaisonForm(user, **kwargs)
     return None

ietf/liaisons/views.py

@@ -13,7 +13,14 @@
 
 @can_submit_liaison
 def add_liaison(request):
-    form = liaison_form_factory(request)
+    if request.method == 'POST':
+        form = liaison_form_factory(request, data=request.POST.copy(), 
+                                    files = request.FILES)
+        if form.is_valid():
+            #form.save()
+            pass
+    else:
+        form = liaison_form_factory(request)
 
     return render_to_response(
         'liaisons/liaisondetail_edit.html',

ietf/liaisons/widgets.py

@@ -19,3 +19,24 @@ class ReadOnlyWidget(Widget):
     def render(self, name, value, attrs=None):
         html = u'<div id="id_%s">%s</div>' % (name, value or '')
         return mark_safe(html)
+
+
+class ButtonWidget(Widget):
+
+    def __init__(self, *args, **kwargs):
+        self.label = kwargs.pop('label', None)
+        self.show_on = kwargs.pop('show_on', None)
+        self.require = kwargs.pop('require', None)
+        self.required_label = kwargs.pop('required_label', None)
+        super(ButtonWidget, self).__init__(*args, **kwargs)
+
+    def render(self, name, value, attrs=None):
+        html = u'<span style="display: none" class="showAttachsOn">%s</span>' % self.show_on
+        html += u'<span style="display: none" class="attachEnabledLabel">%s</span>' % self.label
+        if self.require:
+            for i in self.require:
+                html += u'<span style="display: none" class="attachRequiredField">%s</span>' % i
+            required_str = u'Please fill %s to attach a new file' % self.required_label
+            html += u'<span style="display: none" class="attachDisabledLabel">%s</span>' % required_str
+        html += u'<input type="button" class="addAttachmentWidget" value="%s" />' % self.label
+        return mark_safe(html)

ietf/templates/liaisons/liaisondetail_edit.html

@@ -10,6 +10,11 @@
 {% block content %}
 <h1>Send Liaison Statement</h1>
 
+<ul>
+<li>If you wish to submit your liaison statement by e-mail, then please send it to <a href="mailto:statements@ietf.org">statements@ietf.org</a></li>
+<li>Fields marked with <span class="requiredField">*</span> are required. For detailed descriptions of the fields see <a href="https://datatracker.ietf.org/liaison/help/fields/">Field help</a></li>
+</ul>
+
 {{ form }}
 
 {% endblock %}

ietf/templates/liaisons/liaisonform.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<form class="liaisonform" method="post" action="">
+<form class="liaisonform" method="post" action="" enctype="multipart/form-data">
 
 <div class="formconfig" style="display: none;">
 {% block formconfig %}
@@ -10,6 +10,11 @@
 </div>
 
 <div class="baseform">
+  {% if form.errors %}
+   <div class="formErrors">
+     Please correct the errors below.
+   </div>
+  {% endif %}
 {% for fieldset in form.get_fieldsets %}
   {% if fieldset.name %}
     <div class="fieldset">
@@ -18,15 +23,16 @@ <h2>{{ fieldset.name }}</h2>
 
   {% for field in fieldset.fields %}
     <div id="baseform-fieldname-{{ field.html_name }}"
-         class="{% if field.errors %}error {% endif %}field BaseFormStringWidget{% if field.field.column_style %} {{ field.field.column_style }}{% endif %}">
-      <label for="id_{{ field.html_name }}">{{ field.label }}</label>
+         class="{% if field.errors %}fieldError {% endif %}field BaseFormStringWidget{% if field.field.column_style %} {{ field.field.column_style }}{% endif %}">
+      <label for="id_{{ field.html_name }}">{{ field.label }}
       {% if field.field.required %}
-      <span class="fieldRequired" title="Required"></span>
+         <span class="fieldRequired" title="Required">*</span>
       {% endif %}
+      </label>
       <div class="fieldWidget">
-      {{ field.errors }} 
       <div id="{{ field.html_name }}_help" class="formHelp"> {{ field.help_text }}</div>
       {{ field }}
+      {{ field.errors }} 
       </div>
       <div class="endfield"></div>
     </div>
@@ -37,10 +43,10 @@ <h2>{{ fieldset.name }}</h2>
   {% endif %}
 {% endfor %}
 
+  <div class="submitrow">
+    <input type="submit" value="Send and Post" name="send" />
+    <input type="submit" value="Post Only" name="post_only" />
+  </div>
 </div>
 
-<div class="submitrow">
-  <input type="submit" value="Send and Post" name="send" />
-  <input type="submit" value="Post Only" name="post_only" />
-</div>
 </form>