Merge branch 'submissions/wip' into development

submissions/migrations/0047_submission_acceptance_date.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-26 19:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def do_nothing(apps, schema_editor):
+    pass
+
+
+def auto_fill_acceptance_dates(apps, schema_editor):
+    Publication = apps.get_model('journals', 'Publication')
+    for pub in Publication.objects.all():
+        submission = pub.accepted_submission
+        submission.acceptance_date = pub.acceptance_date
+        submission.save()
+    print("Auto-filled Acceptance dates for accepted Submissions")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submissions', '0046_auto_20170623_0806'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='acceptance_date',
+            field=models.DateField(blank=True, null=True, verbose_name='acceptance date'),
+        ),
+        migrations.RunPython(auto_fill_acceptance_dates, do_nothing),
+    ]

submissions/models.py

@@ -78,6 +78,7 @@ class Submission(ArxivCallable, models.Model):
     # Metadata
     metadata = JSONField(default={}, blank=True, null=True)
     submission_date = models.DateField(verbose_name='submission date', default=datetime.date.today)
+    acceptance_date = models.DateField(verbose_name='acceptance date', null=True, blank=True)
     latest_activity = models.DateTimeField(auto_now=True)
 
     objects = SubmissionManager()

submissions/templates/submissions/_submission_summary_short.html

@@ -24,6 +24,12 @@
             <a href="{{submission.arxiv_link}}" target="_blank">{{submission.arxiv_link}}</a>
         </td>
     </tr>
+    {% if submission.acceptance_date %}
+        <tr>
+            <td>Date accepted:</td>
+            <td>{{submission.acceptance_date}}</td>
+        </tr>
+    {% endif %}
     <tr>
         <td>Date submitted:</td>
         <td>{{submission.submission_date}}</td>

submissions/views.py

@@ -1232,6 +1232,7 @@ def fix_College_decision(request, rec_id):
     if recommendation.recommendation in [1, 2, 3]:
         # Publish as Tier I, II or III
         recommendation.submission.status = 'accepted'
+        recommendation.submission.acceptance_date = datetime.date.today()
         # Create a ProductionStream object
         prodstream = ProductionStream(submission=recommendation.submission)
         prodstream.save()