mail: remove "mail number" (#9008)

welco/contrib/alfortville/templates/alfortville/mail-table-waiting.html

@@ -23,7 +23,6 @@
 <tr>
   <td>{{object.creation_timestamp|date:"d F Y"|lower}}</td>
   <td>{{object.post_date|default:'-'}}</td>
-  <td>{{object.mail_number|default:'-'}}</td>
   <td>{% for association in object.associations.all %}{{association.formdef_name}}{% if not forloop.last %}, {%  endif %}{% endfor %}</td>
   <td>{% if object.status == 'done-qualif' %}En attente de validation DGS
       {% elif object.status == 'done-dgs' %}En attente de validation DGA

welco/sources/mail/forms.py

@@ -18,6 +18,5 @@ 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/0008_remove_mail_mail_number.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mail', '0007_mail_mail_number'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='mail',
+            name='mail_number',
+        ),
+    ]

welco/sources/mail/models.py

@@ -38,7 +38,6 @@ 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)
@@ -57,7 +56,6 @@ 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,7 +10,6 @@
 			<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|date:"d/m/Y" }}
 			    {{mail.contact_name}}

welco/sources/mail/views.py

@@ -85,7 +85,6 @@ 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

@@ -41,7 +41,6 @@ $(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_pk = $('div.source .active[data-source-pk]').data('source-pk');
     $('#postit').data('url', $('#postit').data('base-url') + '?mail=' + source_pk);
     $('#postit').trigger('welco:load-mail-note');
@@ -161,13 +160,11 @@ $(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',
@@ -175,7 +172,6 @@ $(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');
                     if ($('#id_post_date').length && !$('#id_post_date').val()) {
                       $('div.qualif button.done').attr('disabled', 'disabled');