mails: add registered mail number field (#8516)

welco/sources/mail/forms.py

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

welco/sources/mail/migrations/0005_auto_20151010_1819.py

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

welco/sources/mail/models.py

@@ -32,7 +32,8 @@ class Mail(models.Model):
 
     content = models.FileField(_('Content'))
     post_date = models.DateField(_('Post Date'), null=True)
-    registered_mail = models.BooleanField(_('Registered Mail'), default=False)
+    registered_mail_number = models.CharField(_('Registered Mail Number'),
+            null=True, max_length=50)
 
     # common to all source types:
     status = models.CharField(_('Status'), blank=True, max_length=50)
@@ -51,7 +52,7 @@ class Mail(models.Model):
     def get_qualification_form(self):
         return self.get_qualification_form_class()({
             'post_date': self.post_date,
-            'registered_mail': self.registered_mail})
+            'registered_mail_number': self.registered_mail_number})
 
     @classmethod
     def get_qualification_form_submit_url(cls):

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

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

welco/sources/mail/views.py

@@ -74,7 +74,7 @@ def qualification_save(request, *args, **kwargs):
     form = MailQualificationForm(request.POST)
     if form.is_valid():
         mail.post_date = form.cleaned_data['post_date']
-        mail.registered_mail = form.cleaned_data['registered_mail']
+        mail.registered_mail_number = form.cleaned_data['registered_mail_number']
         mail.save()
     return HttpResponseRedirect(reverse('qualif-zone') +
             '?source_type=%s&source_pk=%s' % (request.POST['source_type'],

welco/static/js/welco.js

@@ -13,7 +13,7 @@ $(function() {
     $(this).parent().find('li').removeClass('active');
     $(this).addClass('active');
     $('#id_post_date').val($(this).data('post-date'));
-    //var registered_mail = $('#id_registered_mail').prop('checked');
+    $('#id_registered_mail_number').val($(this).data('registered-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');
     $('.cell[data-zone-url]').each(function(idx, zone) {
@@ -91,18 +91,19 @@ $(function() {
 
   $('.document').delegate('button.save', 'click', function() {
     var post_date = $('#id_post_date').val();
-    var registered_mail = $('#id_registered_mail').prop('checked');
+    var registered_mail_number = $('#id_registered_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: registered_mail,
+                   registered_mail_number: registered_mail_number,
                    source_type: source_type,
                    source_pk: source_pk},
             method: 'POST',
             dataType: 'html',
             success: function(data) {
                     $('div.source .active').data('post-date', post_date);
+                    $('div.source .active').data('registered-mail-number', registered_mail_number);
                     $('#source-mainarea form').effect('highlight');
             },
             error: function(error) { console.log(':(', error); }