diff --git a/submissions/migrations/0047_submission_acceptance_date.py b/submissions/migrations/0047_submission_acceptance_date.py new file mode 100644 index 0000000000000000000000000000000000000000..ec64c3acddce25595b8b1ea7b84440e9849447a3 --- /dev/null +++ b/submissions/migrations/0047_submission_acceptance_date.py @@ -0,0 +1,34 @@ +# -*- 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), + ] diff --git a/submissions/models.py b/submissions/models.py index 17a3643441ffd49857f4e637262444881de02fb2..6aa62b53228b673f215516a6866c70a54952983f 100644 --- a/submissions/models.py +++ b/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() diff --git a/submissions/templates/submissions/_submission_summary_short.html b/submissions/templates/submissions/_submission_summary_short.html index ca045cbf8b37536f29828c769d0d9fec1d764a9e..bf6915e89f54fe758948d39f7ae3d7c438025498 100644 --- a/submissions/templates/submissions/_submission_summary_short.html +++ b/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> diff --git a/submissions/views.py b/submissions/views.py index 6d5cdc5d5b1675735229e201af66d49e6aafce2b..071e117d82edd6af8e77a5be41630169f6ffc9ef 100644 --- a/submissions/views.py +++ b/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()