mail: add a field to enter a mail number (#8714)

welco/sources/mail/forms.py

@@ -18,5 +18,6 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 class MailQualificationForm(forms.Form):
+    mail_number = forms.CharField(label=_('Mail Number'), required=False)
     post_date = forms.DateTimeField(label=_('Post Date'), required=False)
     registered_mail_number = forms.CharField(label=_('Registered Mail Number'), required=False)

welco/sources/mail/migrations/0007_mail_mail_number.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mail', '0006_mail_note'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mail',
+            name='mail_number',
+            field=models.CharField(max_length=50, null=True, verbose_name='Mail Number'),
+            preserve_default=True,
+        ),
+    ]

welco/sources/mail/models.py

@@ -36,6 +36,7 @@ class Mail(models.Model):
     registered_mail_number = models.CharField(_('Registered Mail Number'),
             null=True, max_length=50)
     note = models.TextField(_('Note'), null=True)
+    mail_number = models.CharField(_('Mail Number'), null=True, max_length=50)
 
     # common to all source types:
     status = models.CharField(_('Status'), blank=True, max_length=50)
@@ -54,6 +55,7 @@ class Mail(models.Model):
     def get_qualification_form(self):
         return self.get_qualification_form_class()({
             'post_date': self.post_date,
+            'mail_number': self.mail_number,
             'registered_mail_number': self.registered_mail_number})
 
     @classmethod

welco/sources/mail/templates/welco/mail_home.html

@@ -10,6 +10,7 @@
 			<li data-source-pk="{{ mail.id }}"
 			    data-pdf-href="{{ mail.content.url }}"
 			    data-post-date="{{ mail.post_date|date:"d/m/Y" }}"
+			    data-mail-number="{% firstof mail.mail_number %}"
 			    data-registered-mail-number="{% firstof mail.registered_mail_number %}"
 			    >{{ mail.creation_timestamp }}
 			    {% for association in mail.associations.all %}

welco/sources/mail/views.py

@@ -80,6 +80,7 @@ def qualification_save(request, *args, **kwargs):
     form = MailQualificationForm(request.POST)
     if form.is_valid():
         mail.post_date = form.cleaned_data['post_date']
+        mail.mail_number = form.cleaned_data['mail_number']
         mail.registered_mail_number = form.cleaned_data['registered_mail_number']
         mail.save()
     return HttpResponseRedirect(reverse('qualif-zone') +

welco/static/js/welco.js

@@ -14,6 +14,7 @@ $(function() {
     $(this).addClass('active');
     $('#id_post_date').val($(this).data('post-date'));
     $('#id_registered_mail_number').val($(this).data('registered-mail-number'));
+    $('#id_mail_number').val($(this).data('mail-number'));
     var source_type = $('div.source div[data-source-type]').data('source-type');
     var source_pk = $('div.source .active[data-source-pk]').data('source-pk');
     $('#postit').data('url', $('#postit').data('base-url') + '?mail=' + source_pk);
@@ -117,11 +118,13 @@ $(function() {
   $('.document').delegate('button.save', 'click', function() {
     var post_date = $('#id_post_date').val();
     var registered_mail_number = $('#id_registered_mail_number').val();
+    var mail_number = $('#id_mail_number').val();
     var source_type = $('div.source div[data-source-type]').data('source-type');
     var source_pk = $('div.source .active[data-source-pk]').data('source-pk');
     $.ajax({url: $(this).data('action-url'),
             data: {post_date: post_date,
                    registered_mail_number: registered_mail_number,
+                   mail_number: mail_number,
                    source_type: source_type,
                    source_pk: source_pk},
             method: 'POST',
@@ -129,6 +132,7 @@ $(function() {
             success: function(data) {
                     $('div.source .active').data('post-date', post_date);
                     $('div.source .active').data('registered-mail-number', registered_mail_number);
+                    $('div.source .active').data('mail-number', mail_number);
                     $('#source-mainarea form').effect('highlight');
             },
             error: function(error) { console.log(':(', error); }