diff --git a/.bootstraprc b/.bootstraprc
index ab4a0cccb6882f155316d46dff87435d40a1502a..cd4c5b095e1f3274f4a76081fc0879c080796e86 100644
--- a/.bootstraprc
+++ b/.bootstraprc
@@ -9,6 +9,8 @@
],
"extractStyles": true,
"styles": {
+ # First tables, due to self dependencies
+ "tables": true,
"alert": true,
"button-group": true,
"buttons": true,
diff --git a/commentaries/factories.py b/commentaries/factories.py
index 31f1354fa2c7c811daccdbfa7bd9a27cdf55850f..60f1625f2f365bd240db1d1aa7e5d7beb2a9fa73 100644
--- a/commentaries/factories.py
+++ b/commentaries/factories.py
@@ -2,11 +2,12 @@ import factory
from scipost.constants import DISCIPLINE_PHYSICS, SCIPOST_SUBJECT_AREAS
from scipost.factories import ContributorFactory
-from journals.models import SCIPOST_JOURNALS_DOMAINS
+from journals.constants import SCIPOST_JOURNALS_DOMAINS
from common.helpers import random_arxiv_identifier_with_version_number
from .models import Commentary, COMMENTARY_TYPES
+
class CommentaryFactory(factory.django.DjangoModelFactory):
class Meta:
model = Commentary
diff --git a/commentaries/models.py b/commentaries/models.py
index 68860aa7f0763f6f81e6452d414366562d7361cd..eb7af81f0b08132b47e5e907a2ac37784ff524d8 100644
--- a/commentaries/models.py
+++ b/commentaries/models.py
@@ -1,12 +1,16 @@
from django.db import models
from django.contrib.postgres.fields import JSONField
+from django.core.urlresolvers import reverse
from django.template import Template, Context
-from journals.models import SCIPOST_JOURNALS_DOMAINS
+from journals.constants import SCIPOST_JOURNALS_DOMAINS
from scipost.behaviors import ArxivCallable
from scipost.models import TimeStampedModel, Contributor
from scipost.constants import SCIPOST_DISCIPLINES, DISCIPLINE_PHYSICS, SCIPOST_SUBJECT_AREAS
+from .managers import CommentaryManager
+
+
COMMENTARY_PUBLISHED = 'published'
COMMENTARY_PREPRINT = 'preprint'
COMMENTARY_TYPES = (
@@ -15,14 +19,6 @@ COMMENTARY_TYPES = (
)
-class CommentaryManager(models.Manager):
- def vetted(self, **kwargs):
- return self.filter(vetted=True, **kwargs)
-
- def awaiting_vetting(self, **kwargs):
- return self.filter(vetted=False, **kwargs)
-
-
class Commentary(ArxivCallable, TimeStampedModel):
"""
A Commentary contains all the contents of a SciPost Commentary page for a given publication.
@@ -87,49 +83,9 @@ class Commentary(ArxivCallable, TimeStampedModel):
def same_version_exists(self, identifier):
return self.objects.filter(arxiv_identifier=identifier).exists()
- def header_as_table(self):
- # for display in Commentary page itself
- header = ('<table>'
- '<tr><td>Title: </td><td> </td><td>{{ pub_title }}</td></tr>'
- '<tr><td>Author(s): </td><td> </td><td>{{ author_list }}</td></tr>'
- '<tr><td>As Contributors: </td><td> </td>')
- if self.authors.all():
- header += '<td>'
- for auth in self.authors.all():
- header += ('<a href="/contributor/' + str(auth.id) + '">' + auth.user.first_name
- + ' ' + auth.user.last_name + '</a>, ')
- header += '</td>'
- else:
- header += '<td>(none claimed)</td>'
- header += '</tr>'
- if self.type == 'published':
- header += ('<tr><td>Journal ref.: </td><td> </td><td>{{ journal }} {{ volume }}, '
- '{{ pages }}</td></tr>'
- '<tr><td>DOI: </td><td> </td><td><a href="{{ pub_DOI_link }}" '
- 'target="_blank">{{ pub_DOI_link }}</a></td></tr>')
- elif self.type == 'preprint':
- header += ('<tr><td>arxiv Link: </td><td> </td><td><a href="{{ arxiv_link }}">'
- '{{ arxiv_link }}</a></td></tr>')
- if self.pub_date:
- header += '<tr><td>Date: </td><td> </td><td>{{ pub_date }}</td></tr>'
- header += '</table>'
- template = Template(header)
- context = Context({
- 'pub_title': self.pub_title, 'author_list': self.author_list,
- })
- if self.type == 'published':
- context['journal'] = self.journal
- context['volume'] = self.volume
- context['pages'] = self.pages
- context['pub_DOI_link'] = self.pub_DOI_link
- context['pub_date'] = self.pub_date
- elif self.type == 'preprint':
- context['arxiv_link'] = self.arxiv_link
- return template.render(context)
-
def title_label(self):
context = Context({
- 'scipost_url': self.scipost_url(),
+ 'scipost_url': reverse('commentaries:commentary', args=(self.arxiv_or_DOI_string,)),
'pub_title': self.pub_title
})
template = Template('<a href="{{scipost_url}}" class="pubtitleli">{{pub_title}}</a>')
@@ -146,11 +102,3 @@ class Commentary(ArxivCallable, TimeStampedModel):
if commit:
self.save()
-
- def scipost_url(self):
- """ Returns the url of the SciPost Commentary Page """
- return '/commentary/' + self.arxiv_or_DOI_string
-
- def scipost_url_full(self):
- """ Returns the url of the SciPost Commentary Page """
- return 'https://scipost.org/commentary/' + self.arxiv_or_DOI_string
diff --git a/commentaries/templates/commentaries/_commentary_card_content.html b/commentaries/templates/commentaries/_commentary_card_content.html
index 6724ee64fb06a93f49d90aac0c5f062297bac03f..a00cd4ca86eda5aeae8d6dd1be4e027158de80b0 100644
--- a/commentaries/templates/commentaries/_commentary_card_content.html
+++ b/commentaries/templates/commentaries/_commentary_card_content.html
@@ -1,6 +1,6 @@
<div class="card-block">
<h3 class="card-title">
- <a href="{{ commentary.scipost_url }}">{{ commentary.pub_title }}</a>
+ <a href="{% url 'commentaries:commentary' commentary.arxiv_or_DOI_string %}">{{ commentary.pub_title }}</a>
</h3>
<p class="card-text">
by {{ commentary.author_list }}{% if commentary.type == 'published' %}, {{ commentary.journal }} {{ commentary.volume }}, {{ commentary.pages }}{% elif commentary.type == 'preprint' %} - <a href="{{ commentary.arxiv_link }}">{{ commentary.arxiv_link }}</a>{% endif %}
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index 0e253b730ee81cdb3feed44d1df665b63bf09715..5b47e90f8844ea97816973ff8de2271abd9a271c 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -38,7 +38,7 @@
<div class="row">
<div class="col-12">
<h2>Original publication: </h2>
- {{ commentary.header_as_table }}
+ {% include 'commentaries/_commentary_summary.html' with commentary=commentary %}
</div>
</div>
diff --git a/commentaries/templates/commentaries/vet_commentary_requests.html b/commentaries/templates/commentaries/vet_commentary_requests.html
index 1211f37e610d29a04277ab74fae16951f2150198..70edddb6e8eaca847e8337f0d5b1d003e759daae 100644
--- a/commentaries/templates/commentaries/vet_commentary_requests.html
+++ b/commentaries/templates/commentaries/vet_commentary_requests.html
@@ -16,7 +16,7 @@
<hr>
<div class="row">
<div class="col-8">
- {{ commentary_to_vet.header_as_table }}
+ {% include 'commentaries/_commentary_summary.html' with commentary=commentary_to_vet %}
<h3>Abstract:</h3>
<p>{{ commentary_to_vet.pub_abstract }}</p>
diff --git a/comments/admin.py b/comments/admin.py
index 69da3613e39f4bcc268141a5f3cab8d80e60e575..ac6a36e65aab47674d8579434abd6d721b104d8f 100644
--- a/comments/admin.py
+++ b/comments/admin.py
@@ -1,10 +1,19 @@
from django.contrib import admin
-from comments.models import Comment
+from .constants import STATUS_VETTED
+from .models import Comment
+
+
+def comment_is_vetted(comment):
+ '''Check if comment is vetted.'''
+ return comment.status is STATUS_VETTED
class CommentAdmin(admin.ModelAdmin):
- search_fields = ['comment_text', 'author__user__last_name']
+ list_display = ('comment_text', 'author', 'date_submitted', comment_is_vetted)
+ date_hierarchy = 'date_submitted'
+ list_filter = ('status',)
+ comment_is_vetted.boolean = True
admin.site.register(Comment, CommentAdmin)
diff --git a/comments/constants.py b/comments/constants.py
index 9361790ed061dcd64341a532a3920e7a000b708e..3b3cdcc44efc65dbf0c861ce2fb40c067464def7 100644
--- a/comments/constants.py
+++ b/comments/constants.py
@@ -1,3 +1,43 @@
EXTENTIONS_IMAGES = ['.jpg', '.png']
EXTENTIONS_PDF = ['.pdf']
EXTENTIONS_FILES = EXTENTIONS_PDF + EXTENTIONS_IMAGES
+
+STATUS_VETTED = 1
+STATUS_PENDING = 0
+STATUS_UNCLEAR = -1
+STATUS_INCORRECT = -2
+STATUS_NOT_USEFUL = -3
+COMMENT_STATUS = (
+ (STATUS_VETTED, 'vetted'),
+ (STATUS_PENDING, 'not yet vetted (pending)'),
+ (STATUS_UNCLEAR, 'rejected (unclear)'),
+ (STATUS_INCORRECT, 'rejected (incorrect)'),
+ (STATUS_NOT_USEFUL, 'rejected (not useful)'),
+)
+
+COMMENT_CATEGORIES = (
+ ('ERR', 'erratum'),
+ ('REM', 'remark'),
+ ('QUE', 'question'),
+ ('ANS', 'answer to question'),
+ ('OBJ', 'objection'),
+ ('REP', 'reply to objection'),
+ ('VAL', 'validation or rederivation'),
+ ('LIT', 'pointer to related literature'),
+ ('SUG', 'suggestion for further work'),
+)
+
+COMMENT_ACTION_ACCEPT = 1
+COMMENT_ACTION_REFUSE = 2
+COMMENT_ACTION_CHOICES = (
+ (COMMENT_ACTION_ACCEPT, 'accept'),
+ (COMMENT_ACTION_REFUSE, 'refuse (give reason below)'),
+)
+
+COMMENT_REFUSAL_EMPTY = 0
+COMMENT_REFUSAL_CHOICES = (
+ (COMMENT_REFUSAL_EMPTY, '-'),
+ (STATUS_UNCLEAR, 'unclear'),
+ (STATUS_INCORRECT, 'incorrect'),
+ (STATUS_NOT_USEFUL, 'not useful'),
+)
diff --git a/comments/forms.py b/comments/forms.py
index f38c9d933f5b177150cb4f43263c983d41c94c8b..8aace94b0c36586c54abc63509f04588f093ff64 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -1,25 +1,12 @@
from django import forms
+from .constants import COMMENT_ACTION_CHOICES, COMMENT_REFUSAL_CHOICES
from .models import Comment
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Div, Field, Fieldset, HTML, Submit
-COMMENT_ACTION_CHOICES = (
- (1, 'accept'),
- (2, 'refuse (give reason below)'),
- )
-
-COMMENT_REFUSAL_CHOICES = (
- (0, '-'),
- (-1, 'unclear'),
- (-2, 'incorrect'),
- (-3, 'not useful'),
- )
-comment_refusal_dict = dict(COMMENT_REFUSAL_CHOICES)
-
-
class CommentForm(forms.ModelForm):
class Meta:
model = Comment
@@ -52,7 +39,8 @@ class CommentForm(forms.ModelForm):
style="border: 0px; font-size: 90%"),
HTML('<br>'),
Div(
- Submit('submit', 'Submit your Comment for vetting', css_class="submitButton"),
+ Submit('submit', 'Submit your Comment for vetting',
+ css_class="submitButton"),
HTML('<p id="goodCommenter"><i>By clicking on Submit, you agree with the '
'<a href="{% url \'scipost:terms_and_conditions\' %}">'
'Terms and Conditions</a>.</i></p>'),
diff --git a/comments/models.py b/comments/models.py
index eff1cf1f0f6dfc5799433cc6f666a4649a722aa0..d2e5aed35164433256ff1eaf93dcde89cae7d977 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -1,44 +1,21 @@
from django.db import models
from django.shortcuts import get_object_or_404
-from django.template import Template, Context
-from django.utils.safestring import mark_safe
-
-from .behaviors import validate_file_extension, validate_max_file_size
from commentaries.models import Commentary
from scipost.models import TimeStampedModel, Contributor
from submissions.models import Submission, Report
from theses.models import ThesisLink
+from .behaviors import validate_file_extension, validate_max_file_size
+from .constants import COMMENT_STATUS, STATUS_PENDING
from .managers import CommentManager
-COMMENT_CATEGORIES = (
- ('ERR', 'erratum'),
- ('REM', 'remark'),
- ('QUE', 'question'),
- ('ANS', 'answer to question'),
- ('OBJ', 'objection'),
- ('REP', 'reply to objection'),
- ('VAL', 'validation or rederivation'),
- ('LIT', 'pointer to related literature'),
- ('SUG', 'suggestion for further work'),
- )
-
-COMMENT_STATUS = (
- (1, 'vetted'),
- (0, 'not yet vetted (pending)'),
- (-1, 'rejected (unclear)'),
- (-2, 'rejected (incorrect)'),
- (-3, 'rejected (not useful)'),
-)
-comment_status_dict = dict(COMMENT_STATUS)
-
class Comment(TimeStampedModel):
""" A Comment is an unsollicited note, submitted by a Contributor,
on a particular publication or in reply to an earlier Comment. """
- status = models.SmallIntegerField(default=0)
+ status = models.SmallIntegerField(default=STATUS_PENDING, choices=COMMENT_STATUS)
vetted_by = models.ForeignKey(
Contributor,
blank=True,
@@ -48,16 +25,18 @@ class Comment(TimeStampedModel):
)
file_attachment = models.FileField(
upload_to='uploads/comments/%Y/%m/%d/', blank=True,
- validators=[validate_file_extension,
- validate_max_file_size]
+ validators=[validate_file_extension, validate_max_file_size]
)
# a Comment is either for a Commentary or Submission or a ThesisLink.
commentary = models.ForeignKey(Commentary, blank=True, null=True, on_delete=models.CASCADE)
submission = models.ForeignKey(Submission, blank=True, null=True, on_delete=models.CASCADE)
thesislink = models.ForeignKey(ThesisLink, blank=True, null=True, on_delete=models.CASCADE)
is_author_reply = models.BooleanField(default=False)
- in_reply_to_comment = models.ForeignKey('self', blank=True, null=True, related_name="nested_comments", on_delete=models.CASCADE)
- in_reply_to_report = models.ForeignKey(Report, blank=True, null=True, on_delete=models.CASCADE)
+ in_reply_to_comment = models.ForeignKey('self', blank=True, null=True,
+ related_name="nested_comments",
+ on_delete=models.CASCADE)
+ in_reply_to_report = models.ForeignKey(Report, blank=True, null=True,
+ on_delete=models.CASCADE)
author = models.ForeignKey(Contributor, on_delete=models.CASCADE)
anonymous = models.BooleanField(default=False, verbose_name='Publish anonymously')
# Categories:
@@ -71,7 +50,8 @@ class Comment(TimeStampedModel):
is_lit = models.BooleanField(default=False, verbose_name='pointer to related literature')
is_sug = models.BooleanField(default=False, verbose_name='suggestion for further work')
comment_text = models.TextField()
- remarks_for_editors = models.TextField(default='', blank=True, verbose_name='optional remarks for the Editors only')
+ remarks_for_editors = models.TextField(default='', blank=True,
+ verbose_name='optional remarks for the Editors only')
date_submitted = models.DateTimeField('date submitted')
# Opinions
nr_A = models.PositiveIntegerField(default=0)
@@ -84,6 +64,7 @@ class Comment(TimeStampedModel):
related_name='in_disagreement',
blank=True
)
+
objects = CommentManager()
def __str__(self):
@@ -118,136 +99,3 @@ class Comment(TimeStampedModel):
self.nr_N = self.in_notsure.count()
self.nr_D = self.in_disagreement.count()
self.save()
-
- def opinions_as_ul(self):
- template = Template('''
- <ul class="opinionsDisplay">
- <li style="background-color: #000099">Agree {{ nr_A }}</li>
- <li style="background-color: #555555">Not sure {{ nr_N }}</li>
- <li style="background-color: #990000">Disagree {{ nr_D }}</li>
- </ul>
- ''')
- context = Context({'nr_A': self.nr_A, 'nr_N': self.nr_N, 'nr_D': self.nr_D})
- return template.render(context)
-
- def opinions_as_ul_tiny(self):
- template = Template('''
- <ul class="opinionsDisplay">
- <li style="background-color: #000099; font-size: 8px; padding: 2px;">Agree {{ nr_A }}</li>
- <li style="background-color: #555555; font-size: 8px; padding: 2px;">Not sure {{ nr_N }}</li>
- <li style="background-color: #990000; font-size: 8px; padding: 2px;">Disagree {{ nr_D }}</li>
- </ul>
- ''')
- context = Context({'nr_A': self.nr_A, 'nr_N': self.nr_N, 'nr_D': self.nr_D})
- return template.render(context)
-
- def print_identifier(self):
- # for display
- output = '<div class="commentid">\n'
- output += '<h3><a id="comment_id{{ id }}"></a>'
- context = Context({'id': self.id})
- if self.is_author_reply:
- output += 'Author '
- if not self.anonymous:
- output += (' <a href="/contributor/{{ author_id }}">'
- + '{{ first_name }} {{ last_name }}</a> on ')
- context['author_id'] = self.author.id
- context['first_name'] = self.author.user.first_name
- context['last_name'] = self.author.user.last_name
- output += '{{ date_comment_submitted }}'
- context['date_comment_submitted'] = self.date_submitted.strftime("%Y-%m-%d")
- if self.in_reply_to_comment:
- output += (' (in reply to <a href="#comment_id{{ in_reply_to_comment_id }}">'
- '{{ in_reply_to_comment_first_name }} '
- '{{ in_reply_to_comment_last_name }} on '
- '{{ in_reply_to_comment_date }}</a>)')
- context['in_reply_to_comment_id'] = self.in_reply_to_comment_id
- context['in_reply_to_comment_first_name'] = (self.in_reply_to_comment
- .author.user.first_name)
- context['in_reply_to_comment_last_name'] = (self.in_reply_to_comment
- .author.user.last_name)
- context['in_reply_to_comment_date'] = (self.in_reply_to_comment
- .date_submitted.strftime("%Y-%m-%d"))
- elif self.in_reply_to_report:
- output += ' (in reply to <a href="#report_id{{ in_reply_to_report_id }}">'
- context['in_reply_to_report_id'] = self.in_reply_to_report_id
- if not self.in_reply_to_report.anonymous:
- output += '{{ in_reply_to_report_first_name }} {{ in_reply_to_report_last_name}}'
- context['in_reply_to_report_first_name'] = (self.in_reply_to_report
- .author.user.first_name)
- context['in_reply_to_report_last_name'] = (self.in_reply_to_report
- .author.user.last_name)
- else:
- output += 'Report {{ in_reply_to_report_id }}'
- context['in_reply_to_report_id'] = self.in_reply_to_report_id
- output += ' on {{ date_report_submitted }}</a>)'
- context['date_report_submitted'] = self.in_reply_to_report.date_submitted.strftime(
- "%Y-%m-%d")
- output += '</h3></div>'
- template = Template(output)
- return template.render(context)
-
- def print_identifier_for_vetting(self):
- # for display, same as print_identifier but named even if anonymous, not linked
- output = '<div class="commentid">\n'
- output += '<h3>'
- context = Context()
- if self.is_author_reply:
- output += 'Author '
- output += ' <a href="/contributor/{{ author_id }}">{{ first_name }} {{ last_name }}</a>'
- context['author_id'] = self.author.id
- context['first_name'] = self.author.user.first_name
- context['last_name'] = self.author.user.last_name
- output += ' on {{ date_submitted }}'
- context['date_submitted'] = self.date_submitted.strftime("%Y-%m-%d")
- if self.in_reply_to_comment:
- output += (' (in reply to <a href="#comment_id{{ in_reply_to_comment_id }}">'
- '{{ in_reply_to_comment_first_name }} {{ in_reply_to_comment_last_name }} '
- 'on {{ in_reply_to_comment_date }}</a>)')
- context['in_reply_to_comment_id'] = self.in_reply_to_comment_id
- context['in_reply_to_comment_first_name'] = (self.in_reply_to_comment
- .author.user.first_name)
- context['in_reply_to_comment_last_name'] = (self.in_reply_to_comment
- .author.user.last_name)
- context['in_reply_to_comment_date'] = (self.in_reply_to_comment
- .date_submitted.strftime("%Y-%m-%d"))
- elif self.in_reply_to_report:
- output += ' (in reply to <a href="#report_id{{ in_reply_to_report_id }}">'
- context['in_reply_to_report_id'] = self.in_reply_to_report_id
- if not self.in_reply_to_report.anonymous:
- output += '{{ in_reply_to_report_first_name }} {{ in_reply_to_report_last_name}}'
- context['in_reply_to_report_first_name'] = (self.in_reply_to_report
- .author.user.first_name)
- context['in_reply_to_report_last_name'] = (self.in_reply_to_report
- .author.user.last_name)
- else:
- output += 'Report {{ in_reply_to_report_id }}'
- context['in_reply_to_report_id'] = self.in_reply_to_report_id
- output += '</a> on {{ date_submitted }})'
- context['date_submitted'] = self.in_reply_to_report.date_submitted.strftime("%Y-%m-%d")
- output += '</h3></div>'
- template = Template(output)
- return template.render(context)
-
- def categories_as_ul(self):
- output = '<div class="commentcategorydisplay"><h4>Category:</h4><ul>'
- if self.is_rem:
- output += '<li>remark</li>'
- if self.is_que:
- output += '<li>question</li>'
- if self.is_ans:
- output += '<li>answer to question</li>'
- if self.is_obj:
- output += '<li>objection</li>'
- if self.is_rep:
- output += '<li>reply to objection</li>'
- if self.is_cor:
- output += '<li>correction</li>'
- if self.is_val:
- output += '<li>validation or rederivation</li>'
- if self.is_lit:
- output += '<li>pointer to related literature</li>'
- if self.is_sug:
- output += '<li>suggestion for further work</li>'
- output += '</ul></div>'
- return mark_safe(output)
diff --git a/comments/templates/comments/_comment_card_content.html b/comments/templates/comments/_comment_card_content.html
index d4cec6b538ca30ec1de1c5c2f770f2c6bfd9b5d4..fba6a0aee5a47323a4c8a44090b04290a72b5f62 100644
--- a/comments/templates/comments/_comment_card_content.html
+++ b/comments/templates/comments/_comment_card_content.html
@@ -20,7 +20,7 @@
in commentary on <a href="{% url 'commentaries:commentary' comment.commentary.arxiv_or_DOI_string %}" class="pubtitleli">{{comment.commentary.pub_title}}</a>
<span class="text-muted">by {{comment.commentary.author_list}}</span>
{% elif comment.thesislink %}
- <a href="{% url 'commentaries:commentary' comment.commentary.arxiv_or_DOI_string %}#comment_id{{comment.id}}">
+ <a href="{% url 'theses:thesis' comment.thesislink.id %}#comment_id{{comment.id}}">
"{{comment.comment_text|slice:'30'}}{% if comment.comment_text|length > 30 %}...{% endif %}"
</a>
</p><p class="card-text pl-md-3">
diff --git a/comments/templates/comments/_single_comment.html b/comments/templates/comments/_single_comment.html
index 84a01f82c7516645d75c49cb00a1fe976da6fb73..1eaaf85a016bf09f61c8b349bd7339cbae35e843 100644
--- a/comments/templates/comments/_single_comment.html
+++ b/comments/templates/comments/_single_comment.html
@@ -8,7 +8,7 @@
<div class="row">
<div class="col-12">
- {{ comment.print_identifier }}
+ {% include 'comments/_comment_identifier.html' with comment=comment %}
{% include 'comments/_comment_categories.html' with comment=comment class='mr-2' %}
diff --git a/comments/templates/comments/reply_to_comment.html b/comments/templates/comments/reply_to_comment.html
index 3f2b8e81a153f0ee890db3e4b19657607d52db56..3937e5d0051a557def52eb7728998e2b5f0ccbf3 100644
--- a/comments/templates/comments/reply_to_comment.html
+++ b/comments/templates/comments/reply_to_comment.html
@@ -4,32 +4,10 @@
{% block content %}
-<script>
- $(document).ready(function(){
-
- var comment_text_input = $("#id_comment_text");
-
- function set_comment_text(value) {
- $("#preview-comment_text").text(value)
- }
- set_comment_text(comment_text_input.val())
-
- comment_text_input.keyup(function(){
- var new_text = $(this).val()
- set_comment_text(new_text)
- MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
- })
-
- });
-</script>
-
-
{% if user.is_authenticated %}
<div class="row">
<div class="col-12">
- <div class="panel">
- <h1>SciPost Reply to Comment Page</h1>
- </div>
+ <h1 class="highlight">SciPost Reply to Comment Page</h1>
</div>
</div>
@@ -37,7 +15,7 @@
<div class="col-12">
{% if comment.commentary %}
<h2>The Commentary concerned:</h2>
- {{ comment.commentary.header_as_table }}
+ {% include 'commentaries/_commentary_summary.html' with commentary=comment.commentary %}
<h3 class="mt-3">Abstract:</h3>
<p>{{ comment.commentary.pub_abstract }}</p>
@@ -45,21 +23,18 @@
{% if comment.submission %}
<h2>The Submission concerned:</h2>
- {{ comment.submission.header_as_table }}
- <h3 class="mt-3">Abstract:</h3>
- <p>{{ comment.submission.abstract }}</p>
+ {% include 'submissions/_submission_summary.html' with submission=comment.submission %}
+
{% endif %}
{% if comment.thesislink %}
<h2>The Thesis concerned:</h2>
- {% include "theses/_header_as_table.html" with thesislink=comment.thesislink %}
-
- <h3 class="mt-3">Abstract:</h3>
- <p>{{ comment.thesislink.abstract }}</p>
+ {% include "theses/_thesislink_information.html" with thesislink=comment.thesislink %}
{% endif %}
</div>
</div>
+
<div class="row">
<div class="col-12">
<h2>The Comment you wish to reply to:</h2>
@@ -68,7 +43,7 @@
<div class="row">
<div class="col-12">
<div class="comment">
- {{ comment.print_identifier }}
+ {% include 'comments/_comment_identifier.html' with comment=comment %}
{% include 'comments/_comment_categories.html' with comment=comment class='mr-2' %}
@@ -83,33 +58,21 @@
<div class="row">
<div class="col-12">
- <div class="panel">
- <h2>Your Reply to this Comment:</h2>
- {% if is_author %}
- <h3>(you are identified as an author, your reply will appear as an author reply)</h3>
- {% else %}
- <h3>(you are not identified as an author of this publication; if you are, you can claim authorship on your Personal Page)</h3>
- {% endif %}
+ <div class="card card-grey">
+ <div class="card-block">
+ <h2>Your Reply to this Comment:</h2>
+ {% if is_author %}
+ <h3>(you are identified as an author, your reply will appear as an author reply)</h3>
+ {% else %}
+ <h3>(you are not identified as an author of this publication; if you are, you can claim authorship on your Personal Page)</h3>
+ {% endif %}
+ </div>
</div>
</div>
</div>
- <div class="row">
- <div class="col-12">
- <form enctype="multipart/form-data" action="{% url 'comments:reply_to_comment' comment.id %}" method="post">
- {% csrf_token %}
- {% load crispy_forms_tags %}
- {% crispy form %}
- </form>
- </div>
- </div>
-
- <div class="row">
- <div class="col-12">
- <h3>Preview of your comment:</h3>
- <p id="preview-comment_text"></p>
- </div>
- </div>
+ {% url 'comments:reply_to_comment' comment.id as add_comment_url %}
+ {% include 'comments/_add_comment_form.html' with url=add_comment_url form=form %}
{% endif %}
diff --git a/comments/templates/comments/reply_to_report.html b/comments/templates/comments/reply_to_report.html
index af123a74c633a67803b2dca89b2419e1846a709c..348d82701826f73a80777e21357ef24fbc042db9 100644
--- a/comments/templates/comments/reply_to_report.html
+++ b/comments/templates/comments/reply_to_report.html
@@ -2,70 +2,37 @@
{% block pagetitle %}: reply to report{% endblock pagetitle %}
-{% block bodysup %}
-
-<script>
- $(document).ready(function(){
-
- var comment_text_input = $("#id_comment_text");
-
- function set_comment_text(value) {
- $("#preview-comment_text").text(value)
- }
- set_comment_text(comment_text_input.val())
-
- comment_text_input.keyup(function(){
- var new_text = $(this).val()
- set_comment_text(new_text)
- MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
- })
-
- });
-</script>
-
+{% block content %}
{% if user.is_authenticated %}
-<section>
- <hr class="hr12">
- <h1>SciPost Reply to Report Page</h1>
-
- {% if not is_author %}
- <h3>(you are not identified as an author of this Submission; if you are, you can claim authorship on your Personal Page)</h3>
- {% else %}
-
- <hr class="hr12">
- <h1>The Submission concerned:</h1>
- {{ report.submission.header_as_table }}
-
- <h3>Abstract:</h3>
- <p>{{ report.submission.abstract }}</p>
- <br>
-
- <hr class="hr6">
- <h2>The Report you wish to reply to:</h2>
+ <div class="row">
+ <div class="col-12">
+ <h1 class="highlight">SciPost Reply to Report Page</h1>
+ </div>
+ </div>
- {{ report.print_identifier }}
- {{ report.print_contents }}
+ <div class="row">
+ <div class="col-12">
+ {% if not is_author %}
+ <h2>(you are not identified as an author of this Submission; if you are, you can claim authorship on your Personal Page)</h2>
+ {% else %}
+ <h2>The Submission concerned:</h2>
+ {% include 'submissions/_submission_summary.html' with submission=report.submission %}
- <hr class="hr6">
- <h1>Your Reply to this Report:</h1>
+ </div>
+ </div>
- <form enctype="multipart/form-data" action="{% url 'comments:reply_to_report' report_id=report.id %}" method="post">
- {% csrf_token %}
- {% load crispy_forms_tags %}
- {% crispy form %}
- </form>
+ {% include 'submissions/_single_public_report_without_comments.html' with report=report %}
- <div class="row">
- <div class="col-10">
- <h3>Preview of your comment:</h3>
- <p id="preview-comment_text"></p>
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Your Reply to this Report:</h2>
+ {% url 'comments:reply_to_report' report_id=report.id as add_comment_url %}
+ {% include 'comments/_add_comment_form.html' with url=add_comment_url form=form %}
+ {% endif %}
+ </div>
</div>
- </div>
-
- {% endif %}
-</section>
{% endif %}
-{% endblock bodysup %}
+{% endblock content %}
diff --git a/comments/templates/comments/vet_submitted_comments.html b/comments/templates/comments/vet_submitted_comments.html
index 9300f1ff4820dee5f1385ee77386d714a13ee40d..e3a71b702cb6ab815ad2af54cf9abf1147506ad5 100644
--- a/comments/templates/comments/vet_submitted_comments.html
+++ b/comments/templates/comments/vet_submitted_comments.html
@@ -11,74 +11,79 @@
{% if not comments_to_vet %}
<div class="row">
<div class="col-12">
- <div class="panel">
- <h1>There are no comments for you to vet.</h1>
- </div>
+ <h1 class="highlight">There are no comments for you to vet.</h1>
</div>
</div>
{% else %}
<div class="row">
<div class="col-12">
- <div class="panel">
- <h1>SciPost Comments to vet:</h1>
- </div>
+ <h1 class="highlight">SciPost Comments to vet:</h1>
</div>
</div>
<div class="row">
- {% for comment_to_vet in comments_to_vet %}
- <div class="col-12">
- {% if comment_to_vet.commentary %}
- <h2>From Commentary (<a href="{% url 'commentaries:commentary' arxiv_or_DOI_string=comment_to_vet.commentary.arxiv_or_DOI_string %}">link</a>)</h2>
- {{ comment_to_vet.commentary.header_as_table }}
- <br />
- {% endif %}
+ <div class="col-12">
+ {% for comment_to_vet in comments_to_vet %}
+ <div class="card card-vetting">
+ <div class="card-header">
+
+ {% if comment_to_vet.commentary %}
+ <h2>From Commentary (<a href="{% url 'commentaries:commentary' arxiv_or_DOI_string=comment_to_vet.commentary.arxiv_or_DOI_string %}">link</a>)</h2>
+ {% include 'commentaries/_commentary_summary.html' with commentary=comment_to_vet.commentary %}
+ {% endif %}
+
+ {% if comment_to_vet.submission %}
+ <h2>From Submission (<a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=comment_to_vet.submission.arxiv_identifier_w_vn_nr %}">link</a>)</h2>
+ {% include 'submissions/_submission_summary_short.html' with submission=comment_to_vet.submission %}
+ {% endif %}
+
+ {% if comment_to_vet.thesislink %}
+ <h2>From Thesis Link (<a href="{% url 'theses:thesis' comment_to_vet.thesislink.id %}">link</a>)</h2>
+ {% include 'theses/_thesislink_information.html' with thesislink=comment_to_vet.thesislink %}
+ {% endif %}
+ </div>
+ <div class="card-block">
- {% if comment_to_vet.submission %}
- <h2>From Submission (<a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=comment_to_vet.submission.arxiv_identifier_w_vn_nr %}">link</a>)</h2>
- {{ comment_to_vet.submission.header_as_table }}
- <br />
- {% endif %}
+ <h2 class="card-title">The Comment to be vetted:</h2>
- <hr class="small">
- <h2>The Comment to be vetted:</h2>
+ <div class="row">
+ <div class="col-md-6">
+ {% include 'comments/_comment_identifier_vetting.html' with comment=comment_to_vet %}
+ <hr class="small">
- <div class="row">
- <div class="col-md-6">
- {{ comment_to_vet.print_identifier_for_vetting }}
- <h3>Comment text:</h3>
- <p>{{ comment_to_vet.comment_text }}</p>
+ <h3>Comment text:</h3>
+ <p>{{ comment_to_vet.comment_text }}</p>
- {% if comment_to_vet.file_attachment %}
- <h3>Attachment:</h3>
- <p>
- <a target="_blank" href="{{ comment_to_vet.file_attachment.url }}">
- {% if comment_to_vet.file_attachment|is_image %}
- <img class="attachment attachment-comment" src="{{ comment_to_vet.file_attachment.url }}">
- {% else %}
- {{ comment_to_vet.file_attachment|filename }}<br><small>{{ comment_to_vet.file_attachment.size|filesizeformat }}</small>
+ {% if comment_to_vet.file_attachment %}
+ <h3>Attachment:</h3>
+ <p>
+ <a target="_blank" href="{{ comment_to_vet.file_attachment.url }}">
+ {% if comment_to_vet.file_attachment|is_image %}
+ <img class="attachment attachment-comment" src="{{ comment_to_vet.file_attachment.url }}">
+ {% else %}
+ {{ comment_to_vet.file_attachment|filename }}<br><small>{{ comment_to_vet.file_attachment.size|filesizeformat }}</small>
+ {% endif %}
+ </a>
+ </p>
{% endif %}
- </a>
- </p>
- {% endif %}
- {% if comment_to_vet.remarks_for_editors %}
- <h3>Remarks for Editors only:</h3>
- <p>{{ comment_to_vet.remarks_for_editors }}</p>
- {% endif %}
- </div>
- <div class="col-md-6">
- <form action="{% url 'comments:vet_submitted_comment_ack' comment_id=comment_to_vet.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit" />
- </form>
+ {% if comment_to_vet.remarks_for_editors %}
+ <h3>Remarks for Editors only:</h3>
+ <p>{{ comment_to_vet.remarks_for_editors }}</p>
+ {% endif %}
+ </div>
+ <div class="col-md-6">
+ <form action="{% url 'comments:vet_submitted_comment_ack' comment_id=comment_to_vet.id %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input class="btn btn-primary" type="submit" value="Submit" />
+ </form>
+ </div>
+ </div>
+ </div>
</div>
- </div>
- <hr>
+ {% endfor %}
</div>
-
- {% endfor %}
</div>
{% endif %}
diff --git a/comments/views.py b/comments/views.py
index ce859b86553018a6788aee4a82472c71cfa388f8..af5577b3316f4f7d4508ebf52bf1a2e244d9a760 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -10,14 +10,15 @@ from django.http import HttpResponseRedirect, Http404
import strings
from .models import Comment
-from .forms import CommentForm, VetCommentForm, comment_refusal_dict
+from .forms import CommentForm, VetCommentForm
-from scipost.models import Contributor, title_dict
+from scipost.models import Contributor
from theses.models import ThesisLink
from submissions.utils import SubmissionUtils
from submissions.models import Submission, Report
from commentaries.models import Commentary
+
@permission_required('scipost.can_submit_comments', raise_exception=True)
def new_comment(request, **kwargs):
if request.method == "POST":
@@ -46,7 +47,7 @@ def new_comment(request, **kwargs):
if not thesislink.open_for_commenting:
raise PermissionDenied
new_comment.thesislink = thesislink
- redirect_link = reverse('theses:thesis', kwargs={"thesislink_id":thesislink.id})
+ redirect_link = reverse('theses:thesis', kwargs={"thesislink_id": thesislink.id})
elif type_of_object == "submission":
submission = Submission.objects.get(id=object_id)
if not submission.open_for_commenting:
@@ -62,7 +63,8 @@ def new_comment(request, **kwargs):
raise PermissionDenied
new_comment.commentary = commentary
redirect_link = reverse(
- 'commentaries:commentary', kwargs={'arxiv_or_DOI_string': commentary.arxiv_or_DOI_string}
+ 'commentaries:commentary',
+ kwargs={'arxiv_or_DOI_string': commentary.arxiv_or_DOI_string}
)
new_comment.save()
@@ -75,6 +77,7 @@ def new_comment(request, **kwargs):
# This view is only accessible by POST request
raise Http404
+
@permission_required('scipost.can_vet_comments', raise_exception=True)
def vet_submitted_comments(request):
contributor = Contributor.objects.get(user=request.user)
@@ -95,7 +98,7 @@ def vet_submitted_comment_ack(request, comment_id):
comment.status = 1
comment.vetted_by = request.user.contributor
comment.save()
- email_text = ('Dear ' + title_dict[comment.author.title] + ' '
+ email_text = ('Dear ' + comment.author.get_title_display() + ' '
+ comment.author.user.last_name +
', \n\nThe Comment you have submitted, '
'concerning publication with title ')
@@ -138,7 +141,7 @@ def vet_submitted_comment_ack(request, comment_id):
if comment.status == 0:
comment.status == -1
comment.save()
- email_text = ('Dear ' + title_dict[comment.author.title] + ' '
+ email_text = ('Dear ' + comment.author.get_title_display() + ' '
+ comment.author.user.last_name
+ ', \n\nThe Comment you have submitted, '
'concerning publication with title ')
@@ -151,7 +154,7 @@ def vet_submitted_comment_ack(request, comment_id):
elif comment.thesislink is not None:
email_text += comment.thesislink.title + ' by ' + comment.thesislink.author
email_text += (', has been rejected for the following reason: '
- + comment_refusal_dict[comment.status] + '.' +
+ + comment.get_status_display() + '.' +
'\n\nWe copy it below for your convenience.' +
'\n\nThank you for your contribution, \n\nThe SciPost Team.')
if form.cleaned_data['email_response_field']:
diff --git a/journals/models.py b/journals/models.py
index 2a07b982f244e93be2dcc1641ce93fe93b03948e..1c18db989536bed944afa86e3f67fa380fdf74d9 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -1,9 +1,13 @@
from django.contrib.postgres.fields import JSONField
from django.db import models
-from django.http import Http404
from django.template import Template, Context
from django.utils import timezone
+from .constants import SCIPOST_JOURNALS, SCIPOST_JOURNALS_DOMAINS,\
+ STATUS_DRAFT, STATUS_PUBLISHED, ISSUE_STATUSES
+from .helpers import paper_nr_string, journal_name_abbrev_citation
+from .managers import IssueManager, PublicationManager
+
from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS
from scipost.models import ChoiceArrayField, Contributor
@@ -16,103 +20,6 @@ class UnregisteredAuthor(models.Model):
return self.last_name + ', ' + self.first_name
-SCIPOST_JOURNALS = (
- ('SciPost Physics Select', 'SciPost Physics Select'),
- ('SciPost Physics', 'SciPost Physics'),
- ('SciPost Physics Lecture Notes', 'SciPost Physics Lecture Notes'),
- )
-journals_dict = dict(SCIPOST_JOURNALS)
-
-
-class JournalNameError(Exception):
- def __init__(self, name):
- self.name = name
-
- def __str__(self):
- return self.name
-
-
-def journal_name_abbrev_citation(journal_name):
- if journal_name == 'SciPost Physics':
- return 'SciPost Phys.'
- elif journal_name == 'SciPost Physics Select':
- return 'SciPost Phys. Sel.'
- elif journal_name == 'SciPost Physics Lecture Notes':
- return 'SciPost Phys. Lect. Notes'
- else:
- raise JournalNameError(journal_name)
-
-
-def journal_name_abbrev_doi(journal_name):
- if journal_name == 'SciPost Physics':
- return 'SciPostPhys'
- elif journal_name == 'SciPost Physics Select':
- return 'SciPostPhysSel'
- elif journal_name == 'SciPost Physics Lecture Notes':
- return 'SciPostPhysLectNotes'
- else:
- raise JournalNameError(journal_name)
-
-
-class PaperNumberError(Exception):
- def __init__(self, nr):
- self.nr = nr
-
- def __str__(self):
- return self.nr
-
-
-def paper_nr_string(nr):
- if nr < 10:
- return '00' + str(nr)
- elif nr < 100:
- return '0' + str(nr)
- elif nr < 1000:
- return str(nr)
- else:
- raise PaperNumberError(nr)
-
-
-class PaperNumberingError(Exception):
- def __init__(self, nr):
- self.nr = nr
-
- def __str__(self):
- return self.nr
-
-
-SCIPOST_JOURNALS_SUBMIT = ( # Same as SCIPOST_JOURNALS, but SP Select deactivated
- ('SciPost Physics', 'SciPost Physics'),
- ('SciPost Physics Lecture Notes', 'SciPost Physics Lecture Notes'),
- )
-journals_submit_dict = dict(SCIPOST_JOURNALS_SUBMIT)
-
-SCIPOST_JOURNALS_DOMAINS = (
- ('E', 'Experimental'),
- ('T', 'Theoretical'),
- ('C', 'Computational'),
- ('ET', 'Exp. & Theor.'),
- ('EC', 'Exp. & Comp.'),
- ('TC', 'Theor. & Comp.'),
- ('ETC', 'Exp., Theor. & Comp.'),
-)
-journals_domains_dict = dict(SCIPOST_JOURNALS_DOMAINS)
-
-SCIPOST_JOURNALS_SPECIALIZATIONS = (
- ('A', 'Atomic, Molecular and Optical Physics'),
- ('B', 'Biophysics'),
- ('C', 'Condensed Matter Physics'),
- ('F', 'Fluid Dynamics'),
- ('G', 'Gravitation, Cosmology and Astroparticle Physics'),
- ('H', 'High-Energy Physics'),
- ('M', 'Mathematical Physics'),
- ('N', 'Nuclear Physics'),
- ('Q', 'Quantum Statistical Mechanics'),
- ('S', 'Statistical and Soft Matter Physics'),
- )
-journals_spec_dict = dict(SCIPOST_JOURNALS_SPECIALIZATIONS)
-
-
class Journal(models.Model):
name = models.CharField(max_length=100, choices=SCIPOST_JOURNALS,
unique=True)
@@ -137,43 +44,6 @@ class Volume(models.Model):
return str(self.in_journal) + ' Vol. ' + str(self.number)
-STATUS_DRAFT = 'draft'
-STATUS_PUBLISHED = 'published'
-ISSUE_STATUSES = (
- (STATUS_DRAFT, 'Draft'),
- (STATUS_PUBLISHED, 'Published'),
-)
-
-
-class IssueManager(models.Manager):
- def get_published(self, *args, **kwargs):
- try:
- return self.published(*args, **kwargs)[0]
- except IndexError:
- raise Http404
-
- def published(self, journal=None, **kwargs):
- issues = self.filter(status=STATUS_PUBLISHED, **kwargs)
- if journal:
- issues.filter(in_volume__in_journal__name=journal)
- return issues
-
- def in_draft(self, journal=None, **kwargs):
- issues = self.filter(status=STATUS_DRAFT, **kwargs)
- if journal:
- issues.filter(in_volume__in_journal__name=journal)
- return issues
-
- def get_current_issue(self, *args, **kwargs):
- return self.published(start_date__lte=timezone.now(),
- until_date__gte=timezone.now(),
- **kwargs).order_by('-until_date').first()
-
- def get_last_filled_issue(self, *args, **kwargs):
- return self.published(publication__isnull=False,
- **kwargs).order_by('-until_date').first()
-
-
class Issue(models.Model):
in_volume = models.ForeignKey(Volume, on_delete=models.CASCADE)
number = models.PositiveSmallIntegerField()
@@ -198,7 +68,7 @@ class Issue(models.Model):
def period_as_string(self):
if self.start_date.month == self.until_date.month:
- return ' (' + self.until_date.strftime('%B') + ' ' + self.until_date.strftime('%Y') + ')'
+ return ' (%s %s)' % (self.until_date.strftime('%B'), self.until_date.strftime('%Y'))
else:
return (' (' + self.start_date.strftime('%B') + '-' + self.until_date.strftime('%B') +
' ' + self.until_date.strftime('%Y') + ')')
@@ -215,20 +85,6 @@ class Issue(models.Model):
return template.render(context)
-class PublicationManager(models.Manager):
- def get_published(self, *args, **kwargs):
- try:
- return self.published(*args, **kwargs)[0]
- except IndexError:
- raise Http404
-
- def published(self, **kwargs):
- return self.filter(in_issue__status=STATUS_PUBLISHED, **kwargs)
-
- def in_draft(self, **kwargs):
- return self.filter(in_issue__status=STATUS_DRAFT, **kwargs)
-
-
class Publication(models.Model):
accepted_submission = models.OneToOneField('submissions.Submission', on_delete=models.CASCADE)
in_issue = models.ForeignKey(Issue, on_delete=models.CASCADE)
@@ -296,7 +152,7 @@ class Publication(models.Model):
def citation_for_web_linked(self):
citation = ('<a href="{% url \'scipost:publication_detail\' doi_string=doi_string %}">'
'{{ abbrev }} <strong>{{ volume_nr }}</strong>'
- ', {{ paper_nr }} ({{ year }})')
+ ', {{ paper_nr }} ({{ year }})</a>')
template = Template(citation)
context = Context(
{'doi_string': self.doi_string,
@@ -307,49 +163,6 @@ class Publication(models.Model):
'year': self.publication_date.strftime('%Y'), })
return template.render(context)
- def details(self):
- """
- This method is called from the publication_detail template.
- It provides all the details for a publication.
- """
- pub_details = (
- '<div class="row"><div class="col-12">'
- '<h3 class="publicationTitle">'
- '<a href="{% url \'scipost:publication_detail\' doi_string=doi_string %}">{{ title }}</a>'
- '</h3>'
- '<p class="publicationAuthors">{{ author_list }}</p>'
- '<p class="publicationReference">{{ citation }} '
- '| published {{ pub_date}}</p>'
- '<ul class="publicationClickables">'
- '<li>doi: {{ doi_string }}</li>'
- '<li class="publicationPDF">'
- '<a href="{% url \'scipost:publication_pdf\' doi_string=doi_string %}" target="_blank">pdf</a>'
- '</li>'
- '<li><a href="#openModal">BiBTeX</a></li>'
- '<li><a href="{% url \'submissions:submission\' arxiv_identifier_w_vn_nr='
- 'arxiv_identifier_w_vn_nr %}">Submissions/Reports</a></li>'
- '</ul></div></div>'
- '<div class="row"><div class="col-12"><hr>'
- '<h3>Abstract:</h3>'
- '<p class="publicationAbstract">{{ abstract }}</p>'
- '<div id="openModal" class="modalDialog"><div>'
- '<a href="#close" title="Close" class="close">X</a>'
- '<h2>BiBTeX</h2><p>{{ BiBTeX|linebreaks }}</p></div></div>'
- '</div></div>'
- )
- template = Template(pub_details)
- context = Context({
- 'title': self.title,
- 'author_list': self.author_list,
- 'citation': self.citation_for_web,
- 'pub_date': self.publication_date.strftime('%d %B %Y'),
- 'abstract': self.abstract,
- 'doi_string': self.doi_string,
- 'BiBTeX': self.BiBTeX_entry,
- 'arxiv_identifier_w_vn_nr': self.accepted_submission.arxiv_identifier_w_vn_nr
- })
- return template.render(context)
-
def citations_as_ul(self):
output = '<ul>'
context = Context({})
diff --git a/journals/templates/journals/add_author.html b/journals/templates/journals/add_author.html
index 241de8b1a11ef7a0b1aa86685a8abb8c261400cf..fabb202ea90b856b73e0cbc2154f00e138f615c6 100644
--- a/journals/templates/journals/add_author.html
+++ b/journals/templates/journals/add_author.html
@@ -2,90 +2,102 @@
{% block pagetitle %}: add author to publication{% endblock pagetitle %}
-{% block headsup %}
-
{% load scipost_extras %}
-
-{% endblock headsup %}
-
-{% block bodysup %}
-
-
-<section>
- <div class="flex-greybox">
- <h1>Add author to publication</h1>
- </div>
- {{ publication.details }}
-</section>
-
-
-<section>
- <div class="flex-greybox">
- <h1>Add an (unregistered) author</h1>
- </div>
-
- <h3>Current list of authors as contributors:</h3>
- <p>
- {% for author in publication.authors.all %}
- <a href="/contributor/{{ author.id }}">{{ author.user.first_name }} {{ author.user.last_name }}</a>
- {% endfor %}
- </p>
- <h3>Current list of additional authors (unregistered):</h3>
- <p>
- {% for author in publication.authors_unregistered.all %}
- {{ author }}
- {% endfor %}
- </p>
-
- <h3>Search for missing author:</h3>
- <form action="{% url 'journals:add_author' publication_id=publication.id %}" method="post">
- {% csrf_token %}
- {{ form.as_p }}
- <input type="submit" value="Search">
- </form>
-
- {% if contributors_found %}
- <h3>Identified as contributor:</h3>
- <table>
- {% for contributor in contributors_found %}
- <tr>
- <td>{{ contributor.user.first_name }} {{ contributor.user.last_name }}</td>
- <td> </td>
- <td><a href="{% url 'journals:add_author' publication_id=publication.id contributor_id=contributor.id %}">Add this Contributor as author of this Publication</a></td>
- </tr>
- {% endfor %}
- </table>
- {% elif form.has_changed %}
- <p>No Contributor with this name could be identified.</p>
- {% endif %}
- <br/>
-
- {% if unregistered_authors_found %}
- <h3>Identified as existing unregistered author:</h3>
- <table>
- {% for unreg_auth in unregistered_authors_found %}
- <tr>
- <td>{{ unreg_auth }}</td>
- <td> </td>
- <td><a href="{% url 'journals:add_unregistered_author' publication_id=publication.id unregistered_author_id=unreg_auth.id %}">Add this unregistered author as author of this Publication</a></td>
- </tr>
- {% endfor %}
- </table>
- {% elif form.has_changed %}
- <p>No UnregisteredAuthor with this name could be found in the database.</p>
- {% endif %}
- <br/>
-
- <h3>You can otherwise create an UnregisteredAuthor object instance and link it to this publication:</h3>
- <form action="{% url 'journals:add_new_unreg_author' publication_id=publication.id %}" method="post">
- {% csrf_token %}
- {{ new_unreg_author_form.as_p }}
- <input type="submit" value="Add">
- </form>
-
- <h3><a href="{% url 'scipost:publication_detail' doi_string=publication.doi_string %}">Return to the publication's page</a></h3>
-
-</section>
-
-
-{% endblock bodysup %}
+{% load bootstrap %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Add author to publication</h1>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ {% include 'journals/_publication_details.html' with publication=publication %}
+ </div>
+</div>
+
+
+<div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Add an (unregistered) author</h2>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <h3>Current list of authors as contributors:</h3>
+ <ul class="list-group list-group-noborder">
+ {% for author in publication.authors.all %}
+ <li class="list-group-item py-1 pl-2">
+ <a href="{% url 'scipost:contributor_info' author.id %}">{{ author.user.first_name }} {{ author.user.last_name }}</a>
+ </li>
+ {% empty %}
+ No unregistered authors known.
+ {% endfor %}
+ </ul>
+ <h3>Current list of additional authors (unregistered):</h3>
+ <ul class="list-group list-group-noborder">
+ {% for author in publication.authors_unregistered.all %}
+ <li class="list-group-item py-1 pl-2">{{ author }}</li>
+ {% empty %}
+ No unregistered authors known.
+ {% endfor %}
+ </ul>
+ <hr class="small">
+
+ <div class="row">
+ <div class="col-md-8">
+ <h3>Search for missing author:</h3>
+ <form action="{% url 'journals:add_author' publication.id %}" method="post">
+ {% csrf_token %}
+ {{form|bootstrap}}
+ <input class="btn btn-secondary" type="submit" value="Search">
+ </form>
+
+ {% if form.has_changed %}
+ <h3 class="mt-4">Identified as contributor:</h3>
+ <ul class="list-group">
+ {% for contributor in contributors_found %}
+ <li class="list-group-item p-2">
+ <div class="d-block w-100 font-weight-bold">{{ contributor.user.first_name }} {{ contributor.user.last_name }}</div>
+ <a class="d-block" href="{% url 'journals:add_author' publication_id=publication.id contributor_id=contributor.id %}">Add this Contributor as author of this Publication</a>
+ </li>
+ {% empty %}
+ <span class="text-danger">No Contributor with this name could be identified.</span>
+ {% endfor %}
+ </ul>
+
+ <h3 class="mt-2">Identified as existing unregistered author:</h3>
+ <ul class="list-group">
+ {% for unreg_auth in unregistered_authors_found %}
+ <li class="list-group-item">
+ <div class="d-block w-100 font-weight-bold">{{ unreg_auth }}
+ <a class="d-block" href="{% url 'journals:add_unregistered_author' publication_id=publication.id unregistered_author_id=unreg_auth.id %}">Add this unregistered author as author of this Publication</a>
+ </li>
+ {% empty %}
+ <span class="text-danger">No UnregisteredAuthor with this name could be found in the database.</span>
+ {% endfor %}
+ </ul>
+
+ <h3 class="mt-3">You can otherwise create an UnregisteredAuthor object instance and link it to this publication:</h3>
+ <form action="{% url 'journals:add_new_unreg_author' publication_id=publication.id %}" method="post">
+ {% csrf_token %}
+ {{ new_unreg_author_form|bootstrap }}
+ <input class="btn btn-secondary" type="submit" value="Add">
+ </form>
+
+ {% endif %}
+ </div>
+ </div>
+
+ <h3>
+ <a href="{% url 'scipost:publication_detail' doi_string=publication.doi_string %}">Return to the publication's page</a>
+ </h3>
+ </div>
+</div>
+
+
+{% endblock content %}
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 12c8c509f7d5d5edc0d11a5232571a47874c8b6a..8b9d46ecd843d98224c350dad63c5efdb6d6cf4c 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -40,11 +40,7 @@
{% include 'journals/scipost_physics_menu.html' %}
-<div class="row">
- <div class="col-12">
- {{ publication.details }}
- </div>
-</div>
+{% include 'journals/_publication_details.html' with publication=publication %}
{% if publication.citedby|length >= 1 %}
<hr>
diff --git a/journals/templatetags/journals_extras.py b/journals/templatetags/journals_extras.py
index c5625821237805fb08970b9be997c43384996c73..382ac91e2b0e6a2528fbd9c54349ca4a9e0ac332 100644
--- a/journals/templatetags/journals_extras.py
+++ b/journals/templatetags/journals_extras.py
@@ -1,6 +1,6 @@
from django import template
-from journals.models import paper_nr_string
+from journals.helpers import paper_nr_string
register = template.Library()
diff --git a/journals/utils.py b/journals/utils.py
index 71d5cae1cd91cb6373334c5fd1d76b607bdb32bf..ccb5852064de8ae78db09de828d791749e7b5b0b 100644
--- a/journals/utils.py
+++ b/journals/utils.py
@@ -1,7 +1,5 @@
from django.core.mail import EmailMessage
-from scipost.models import title_dict
-
class JournalUtils(object):
@@ -14,7 +12,7 @@ class JournalUtils(object):
def send_authors_paper_published_email(cls):
""" Requires loading 'publication' attribute. """
email_text = ('Dear '
- + title_dict[cls.publication.accepted_submission.submitted_by.title]
+ + cls.publication.accepted_submission.submitted_by.get_title_display()
+ ' ' +
cls.publication.accepted_submission.submitted_by.user.last_name +
', \n\nWe are happy to inform you that your Submission to SciPost,\n\n' +
diff --git a/journals/views.py b/journals/views.py
index 77c1df2b0b48ffc596807004214966204c6c898a..5a4bf03f75a2007a68dbaf387d081de9907db0d4 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -8,14 +8,13 @@ import xml.etree.ElementTree as ET
from django.conf import settings
from django.utils import timezone
from django.shortcuts import get_object_or_404, render, redirect
-from django.core.files import File
from django.core.urlresolvers import reverse
from django.db import transaction
from django.http import HttpResponse
-from .models import Issue, Publication, PaperNumberingError,\
- journal_name_abbrev_doi, paper_nr_string, journal_name_abbrev_citation,\
- UnregisteredAuthor
+from .exceptions import PaperNumberingError
+from .helpers import journal_name_abbrev_citation, journal_name_abbrev_doi, paper_nr_string
+from .models import Issue, Publication, UnregisteredAuthor
from .forms import FundingInfoForm, InitiatePublicationForm, ValidatePublicationForm,\
UnregisteredAuthorForm, CreateMetadataXMLForm, CitationListBibitemsForm
from .utils import JournalUtils
diff --git a/news/models.py b/news/models.py
index 8f73d1be7c615125ae53c98b0f74a6f9b4d78748..a8992a3e7c5464b359a81208f4240c589e901320 100644
--- a/news/models.py
+++ b/news/models.py
@@ -1,5 +1,4 @@
from django.db import models
-from django.template import Template, Context
class NewsItem(models.Model):
@@ -14,39 +13,3 @@ class NewsItem(models.Model):
def __str__(self):
return self.date.strftime('%Y-%m-%d') + ', ' + self.headline
-
- def descriptor_full(self):
- """ For News page. """
- descriptor = ('<div class="flex-greybox640">'
- '<h3 class="NewsHeadline">{{ headline }}</h3>'
- '<p>{{ date }}</p>'
- '<p>{{ blurb }}</p>'
- )
- context = Context({'headline': self.headline,
- 'date': self.date.strftime('%Y-%m-%d'),
- 'blurb': self.blurb, })
- if self.followup_link:
- descriptor += '<p><a href="{{ followup_link }}">{{ followup_link_text }}</a></p>'
- context['followup_link'] = self.followup_link
- context['followup_link_text'] = self.followup_link_text
- descriptor += '</div>'
- template = Template(descriptor)
- return template.render(context)
-
- def descriptor_small(self):
- """ For index page. """
- descriptor = ('<h3 class="NewsHeadline">{{ headline }}</h3>'
- '<div class="p-2">'
- '<p>{{ date }}</p>'
- '<p>{{ blurb }}</p>'
- )
- context = Context({'headline': self.headline,
- 'date': self.date.strftime('%Y-%m-%d'),
- 'blurb': self.blurb, })
- if self.followup_link:
- descriptor += '<a href="{{ followup_link }}">{{ followup_link_text }}</a>'
- context['followup_link'] = self.followup_link
- context['followup_link_text'] = self.followup_link_text
- descriptor += '</div>'
- template = Template(descriptor)
- return template.render(context)
diff --git a/scipost/constants.py b/scipost/constants.py
index 5175737aab2fe2a7d5c3378996ac8b1f49aa3b57..61396046822991f0f22d8da26a65babe42fe6955 100644
--- a/scipost/constants.py
+++ b/scipost/constants.py
@@ -122,3 +122,29 @@ subject_areas_raw_dict = dict(SCIPOST_SUBJECT_AREAS)
subject_areas_dict = {}
for k in subject_areas_raw_dict.keys():
subject_areas_dict.update(dict(subject_areas_raw_dict[k]))
+
+
+CONTRIBUTOR_STATUS = (
+ # status determine the type of Contributor:
+ # 0: newly registered (unverified; not allowed to submit, comment or vote)
+ # 1: contributor has been vetted through
+ #
+ # Negative status denotes rejected requests or:
+ # -1: not a professional scientist (>= PhD student in known university)
+ # -2: other account already exists for this person
+ # -3: barred from SciPost (abusive behaviour)
+ # -4: disabled account (deceased)
+ (0, 'newly registered'),
+ (1, 'normal user'),
+ (-1, 'not a professional scientist'),
+ (-2, 'other account already exists'),
+ (-3, 'barred from SciPost'),
+ (-4, 'account disabled'),
+ )
+
+TITLE_CHOICES = (
+ ('PR', 'Prof.'),
+ ('DR', 'Dr'),
+ ('MR', 'Mr'),
+ ('MRS', 'Mrs'),
+)
diff --git a/scipost/factories.py b/scipost/factories.py
index 62eb21c81e74b9fa81c6d0c7892f06ef578bbc8c..7381d6173165155478253327f9aacac1665129c7 100644
--- a/scipost/factories.py
+++ b/scipost/factories.py
@@ -6,7 +6,8 @@ from django.contrib.auth.models import Group
from django_countries.data import COUNTRIES
-from .models import Contributor, EditorialCollege, EditorialCollegeFellowship, TITLE_CHOICES
+from .models import Contributor, EditorialCollege, EditorialCollegeFellowship
+from .constants import TITLE_CHOICES
class ContributorFactory(factory.django.DjangoModelFactory):
diff --git a/scipost/feeds.py b/scipost/feeds.py
index 29ea0a31d6fced705e0c8fd6ac77381e7ed818f8..6edb9e1b7d4b1aaf221382ba83cff76a5064d27b 100644
--- a/scipost/feeds.py
+++ b/scipost/feeds.py
@@ -5,11 +5,12 @@ from django.utils.feedgenerator import Atom1Feed
from django.core.urlresolvers import reverse
from django.db.models import Q
-from scipost.models import subject_areas_dict
from comments.models import Comment
from journals.models import Publication
from news.models import NewsItem
-from submissions.models import Submission, SUBMISSION_STATUS_PUBLICLY_INVISIBLE
+from scipost.models import subject_areas_dict
+from submissions.constants import SUBMISSION_STATUS_PUBLICLY_INVISIBLE
+from submissions.models import Submission
class LatestCommentsFeedRSS(Feed):
diff --git a/scipost/forms.py b/scipost/forms.py
index 3a85ac22032944518aae6cb8a7230eee68005bb9..f18c9e1aa07706765d763659e14a7880313ecbfb 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -10,15 +10,14 @@ from captcha.fields import ReCaptchaField
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Div, Field, HTML, Submit
-from .constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS
-from .models import TITLE_CHOICES, SCIPOST_FROM_ADDRESSES,\
+from .constants import SCIPOST_DISCIPLINES, TITLE_CHOICES
+from .models import SCIPOST_FROM_ADDRESSES,\
Contributor, DraftInvitation, RegistrationInvitation,\
SupportingPartner, SPBMembershipAgreement,\
UnavailabilityPeriod, PrecookedEmail
-from virtualmeetings.models import Feedback, Nomination, Motion
from journals.models import Publication
-from submissions.models import SUBMISSION_STATUS_PUBLICLY_UNLISTED
+from submissions.constants import SUBMISSION_STATUS_PUBLICLY_UNLISTED
from submissions.models import Submission
diff --git a/scipost/models.py b/scipost/models.py
index 2bb4c15cfb9b6ca2c262301852f55f68dbdad5c1..9d7ed767193d907df22bbc674ff0d5d27f4854f6 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -7,13 +7,12 @@ from django.db import models
from django.db.models import Q
from django.template import Template, Context
from django.utils import timezone
-from django.utils.encoding import force_text
from django.utils.safestring import mark_safe
from django_countries.fields import CountryField
from .constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS,\
- disciplines_dict, subject_areas_dict
+ disciplines_dict, subject_areas_dict, CONTRIBUTOR_STATUS, TITLE_CHOICES
from .db.fields import AutoDateTimeField
@@ -34,33 +33,6 @@ class ChoiceArrayField(ArrayField):
return super(ArrayField, self).formfield(**defaults)
-CONTRIBUTOR_STATUS = (
- # status determine the type of Contributor:
- # 0: newly registered (unverified; not allowed to submit, comment or vote)
- # 1: contributor has been vetted through
- #
- # Negative status denotes rejected requests or:
- # -1: not a professional scientist (>= PhD student in known university)
- # -2: other account already exists for this person
- # -3: barred from SciPost (abusive behaviour)
- # -4: disabled account (deceased)
- (0, 'newly registered'),
- (1, 'normal user'),
- (-1, 'not a professional scientist'),
- (-2, 'other account already exists'),
- (-3, 'barred from SciPost'),
- (-4, 'account disabled'),
- )
-
-TITLE_CHOICES = (
- ('PR', 'Prof.'),
- ('DR', 'Dr'),
- ('MR', 'Mr'),
- ('MRS', 'Mrs'),
- )
-title_dict = dict(TITLE_CHOICES)
-
-
class TimeStampedModel(models.Model):
"""
All objects should inherit from this abstract model.
@@ -117,7 +89,8 @@ class Contributor(models.Model):
return '%s, %s' % (self.user.last_name, self.user.first_name)
def get_title(self):
- return title_dict[self.title]
+ # Please use get_title_display(). To be removed in future
+ return self.get_title_display()
def is_currently_available(self):
unav_periods = UnavailabilityPeriod.objects.filter(contributor=self)
@@ -145,7 +118,7 @@ class Contributor(models.Model):
</table>
''')
context = Context({
- 'title': title_dict[self.title],
+ 'title': self.get_title_display(),
'first_name': self.user.first_name,
'last_name': self.user.last_name,
'email': self.user.email,
@@ -174,7 +147,7 @@ class Contributor(models.Model):
</table>
''')
context = Context({
- 'title': title_dict[self.title],
+ 'title': self.get_title_display(),
'first_name': self.user.first_name,
'last_name': self.user.last_name,
'email': self.user.email,
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index 0ca0434f571a37fc3d31d816d25957730b6091f2..e924f4f07db1eaf8e875412d873bf70b3136edb1 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -24,9 +24,11 @@ $card-border-color: rgba(238, 238, 238, 0.5);
// Colors
//
+$scipost-light: #C3D7EE;
$scipost-lightblue: #6884C2;
$scipost-darkblue: #002b49;
$scipost-orange: #FFA300;
+$green: #6ebb6e;
$blue: $scipost-lightblue !default;
$body-color: $scipost-darkblue !default;
@@ -63,6 +65,10 @@ $font-size-h4: 0.8rem;
$font-size-h5: 0.8rem;
$font-size-h6: 0.8rem;
+// Tables
+//
+$table-cell-padding: 0.25rem 0.5rem;
+
// Navbar
//
diff --git a/scipost/static/scipost/assets/css/_cards.scss b/scipost/static/scipost/assets/css/_cards.scss
index 129e0b047f5212a83c6af050d2aefcbde7813321..78bce205b80996f4d7607e1bbfa19301cccc45e7 100644
--- a/scipost/static/scipost/assets/css/_cards.scss
+++ b/scipost/static/scipost/assets/css/_cards.scss
@@ -28,3 +28,10 @@
.card-subtitle {
line-height: 1.5;
}
+
+.card.card-news {
+ .card-header {
+ background-color: $scipost-darkblue;
+ color: $scipost-light;
+ }
+}
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index 3a7a8095d4f6d2e860e636ba811e23613fca7852..806ff1329bfdd30180da7cd9e74dc87fdc069328 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -9,3 +9,7 @@
color: #FFA300;
}
}
+
+.bg-transparent {
+ background-color: transparent;
+}
diff --git a/scipost/static/scipost/assets/css/style.scss b/scipost/static/scipost/assets/css/style.scss
index 17cfeb51944c746c682c388bf64b816cbbab679b..b40f5ca89e040ec6aaa5d37cde766c8709ee29e8 100644
--- a/scipost/static/scipost/assets/css/style.scss
+++ b/scipost/static/scipost/assets/css/style.scss
@@ -23,10 +23,12 @@
@import "form";
@import "grid";
@import "labels";
+@import "list_group";
@import "messages";
// @import "modal";
@import "navbar";
@import "page_header";
+@import "tables";
@import "tooltip";
@import "type";
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index 3e750cc98753c4307cf32430c0c3accbdb8ff23e..35fc674ca9abdbd0345ce3764e8a09819ad6996f 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -13,15 +13,11 @@
<h1 class="card-title mb-0"><a href="{% url 'news:news' %}">News</a><a style="float: right;" href="{% url 'scipost:feeds' %}"><img src="{% static 'scipost/images/feed-icon-14x14.png' %}" alt="Feed logo" width="14"></a></h1>
<h4 class="card-subtitle mb-0 pb-0 text-muted">Latest news and announcements.</h4>
</div>
- <ul class="list-group list-group-flush">
{% for item in latest_newsitems %}
- <li class="list-group-item">
- <div class="card-block">
- {{ item.descriptor_small }}
- </div>
- </li>
+ <div class="card card-news bg-transparent m-2">
+ {% include 'news/news_card_content.html' with news=item %}
+ </div>
{% endfor %}
- </ul>
</div>
</div>
{% endif %}
diff --git a/scipost/templates/scipost/news.html b/scipost/templates/scipost/news.html
index f1ff82c7973d63ea39d5871a87f2db21f5527961..71982a644a9dd23d04c4c0090f67b18d4eb5a525 100644
--- a/scipost/templates/scipost/news.html
+++ b/scipost/templates/scipost/news.html
@@ -4,25 +4,22 @@
{% load staticfiles %}
-{% block bodysup %}
+{% block content %}
-
-<section>
- <div class="flex-container">
- <div class="flex-greybox">
- <h1>SciPost News</h1>
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">SciPost News</h1>
</div>
- </div>
-
- <div class="flex-container">
- <ul class="NewsItemsList">
- {% for item in newsitems %}
- <li>{{ item.descriptor_full|linebreaks }}</li>
- {% endfor %}
- </ul>
- </div>
-
-</section>
-
+</div>
+
+<div class="row">
+ <div class="col-12">
+ {% for item in newsitems %}
+ <div class="card card-grey card-news">
+ {% include 'news/news_card_content.html' with news=item %}
+ </div>
+ {% endfor %}
+ </div>
+</div>
-{% endblock bodysup %}
+{% endblock content %}
diff --git a/scipost/templatetags/bootstrap.py b/scipost/templatetags/bootstrap.py
index 5f7816e6a69bf51bd32a83e28ffc55d21330e22b..c06ec80d8eba9401d0696df6e668fa82bceda2f7 100644
--- a/scipost/templatetags/bootstrap.py
+++ b/scipost/templatetags/bootstrap.py
@@ -35,8 +35,18 @@ def bootstrap(element, args='2,10'):
@register.filter
-def bootstrap_inline(element):
- markup_classes = {'label': 'sr-only', 'value': '', 'single_value': ''}
+def bootstrap_inline(element, args='2,10'):
+ args = [arg.strip() for arg in args.split(',')]
+ markup_classes = {
+ 'label': 'sr-only col-md-%s' % args[0],
+ 'value': 'col-md-%s' % args[1],
+ 'single_value': ''
+ }
+ try:
+ markup_classes['label'] += ' col-form-label-%s' % args[2]
+ markup_classes['form_control'] = 'form-control-%s' % args[2]
+ except IndexError:
+ markup_classes['form_control'] = ''
return render(element, markup_classes)
diff --git a/scipost/utils.py b/scipost/utils.py
index bac564998baf16da8d187141d2d65d5c12214b30..20e45420ea434d53d2921f003f7c24cbcc084405 100644
--- a/scipost/utils.py
+++ b/scipost/utils.py
@@ -8,7 +8,7 @@ from django.core.mail import EmailMultiAlternatives
from django.template import Context, Template
from django.utils import timezone
-from .models import Contributor, DraftInvitation, RegistrationInvitation, title_dict
+from .models import Contributor, DraftInvitation, RegistrationInvitation
SCIPOST_SUMMARY_FOOTER = (
@@ -154,7 +154,7 @@ class Utils(object):
cls.contributor.key_expires = datetime.datetime.strftime(
datetime.datetime.now() + datetime.timedelta(days=2), "%Y-%m-%d %H:%M:%S")
cls.contributor.save()
- email_text = ('Dear ' + title_dict[cls.contributor.title] + ' ' +
+ email_text = ('Dear ' + cls.contributor.get_title_display() + ' ' +
cls.contributor.user.last_name +
', \n\nYour request for registration to the SciPost publication portal' +
' has been received. You now need to validate your email by visiting ' +
@@ -172,7 +172,7 @@ class Utils(object):
'\n<p>Your registration will thereafter be vetted. Many thanks for your interest.</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.contributor.title],
+ 'title': cls.contributor.get_title_display(),
'last_name': cls.contributor.user.last_name,
'activation_key': cls.contributor.activation_key,
})
@@ -220,7 +220,7 @@ class Utils(object):
@classmethod
def send_registration_invitation_email(cls, renew=False):
- signature = (title_dict[cls.invitation.invited_by.title] + ' '
+ signature = (cls.invitation.invited_by.get_title_display() + ' '
+ cls.invitation.invited_by.user.first_name + ' '
+ cls.invitation.invited_by.user.last_name)
if not renew:
@@ -253,9 +253,9 @@ class Utils(object):
email_text += 'Dear '
email_text_html += 'Dear '
if cls.invitation.message_style == 'F':
- email_text += title_dict[cls.invitation.title] + ' ' + cls.invitation.last_name
+ email_text += cls.invitation.get_title_display() + ' ' + cls.invitation.last_name
email_text_html += '{{ title }} {{ last_name }}'
- email_context['title'] = title_dict[cls.invitation.title]
+ email_context['title'] = cls.invitation.get_title_display()
email_context['last_name'] = cls.invitation.last_name
else:
email_text += cls.invitation.first_name
@@ -645,10 +645,10 @@ class Utils(object):
Requires loading the 'notification' attribute.
"""
email_context = Context({})
- email_text = ('Dear ' + title_dict[cls.notification.contributor.title] +
+ email_text = ('Dear ' + cls.notification.contributor.get_title_display() +
' ' + cls.notification.contributor.user.last_name)
email_text_html = 'Dear {{ title }} {{ last_name }}'
- email_context['title'] = title_dict[cls.notification.contributor.title]
+ email_context['title'] = cls.notification.contributor.get_title_display()
email_context['last_name'] = cls.notification.contributor.user.last_name
email_text += ',\n\n'
email_text_html += ',<br/>'
diff --git a/scipost/views.py b/scipost/views.py
index 311914d0356ea12f32757ec0b628bcefe544f429..efe1d100321911733b52cc12338a6273788b2823 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -29,7 +29,7 @@ from guardian.decorators import permission_required
from .constants import SCIPOST_SUBJECT_AREAS, subject_areas_raw_dict
from .models import Contributor, CitationNotification, UnavailabilityPeriod,\
DraftInvitation, RegistrationInvitation,\
- title_dict, SciPost_from_addresses_dict,\
+ SciPost_from_addresses_dict,\
AuthorshipClaim, SupportingPartner, SPBMembershipAgreement, EditorialCollege, EditorialCollegeFellowship
from .forms import AuthenticationForm, DraftInvitationForm, UnavailabilityPeriodForm,\
RegistrationForm, RegistrationInvitationForm, AuthorshipClaimForm,\
@@ -43,9 +43,9 @@ from commentaries.models import Commentary
from comments.models import Comment
from journals.models import Publication, Issue
from news.models import NewsItem
-from submissions.models import SUBMISSION_STATUS_PUBLICLY_UNLISTED
-from submissions.models import Submission, EditorialAssignment
-from submissions.models import RefereeInvitation, Report, EICRecommendation
+from submissions.constants import SUBMISSION_STATUS_PUBLICLY_UNLISTED
+from submissions.models import Submission, EditorialAssignment, RefereeInvitation,\
+ Report, EICRecommendation
from theses.models import ThesisLink
@@ -327,7 +327,7 @@ def invitation(request, key):
form.fields['first_name'].initial = invitation.first_name
form.fields['email'].initial = invitation.email
errormessage = ''
- welcome_message = ('Welcome, ' + title_dict[invitation.title] + ' '
+ welcome_message = ('Welcome, ' + invitation.get_title_display() + ' '
+ invitation.last_name + ', and thanks in advance for '
'registering (by completing this form)')
return render(request, 'scipost/register.html', {
@@ -374,7 +374,7 @@ def request_new_activation_link(request, oldkey):
contributor.key_expires = datetime.datetime.strftime(
datetime.datetime.now() + datetime.timedelta(days=2), "%Y-%m-%d %H:%M:%S")
contributor.save()
- email_text = ('Dear ' + title_dict[contributor.title] + ' ' + contributor.user.last_name +
+ email_text = ('Dear ' + contributor.get_title_display() + ' ' + contributor.user.last_name +
', \n\n'
'Your request for a new email activation link for registration to the SciPost '
'publication portal has been received. You now need to visit this link within '
@@ -453,7 +453,7 @@ def vet_registration_request_ack(request, contributor_id):
except RefereeInvitation.DoesNotExist:
pending_ref_inv_exists = False
- email_text = ('Dear ' + title_dict[contributor.title] + ' '
+ email_text = ('Dear ' + contributor.get_title_display() + ' '
+ contributor.user.last_name +
', \n\nYour registration to the SciPost publication portal '
'has been accepted. '
@@ -472,7 +472,7 @@ def vet_registration_request_ack(request, contributor_id):
emailmessage.send(fail_silently=False)
else:
ref_reason = int(form.cleaned_data['refusal_reason'])
- email_text = ('Dear ' + title_dict[contributor.title] + ' '
+ email_text = ('Dear ' + contributor.get_title_display() + ' '
+ contributor.user.last_name +
', \n\nYour registration to the SciPost publication portal '
'has been turned down, the reason being: '
@@ -1012,7 +1012,7 @@ def personal_page(request):
.filter(author=contributor, is_author_reply=True)
.order_by('-date_submitted'))
- appellation = title_dict[contributor.title] + ' ' + contributor.user.last_name
+ appellation = contributor.get_title_display() + ' ' + contributor.user.last_name
context = {
'contributor': contributor,
'user_groups': user_groups,
@@ -1300,7 +1300,7 @@ def email_group_members(request):
# emailmessage.send(fail_silently=False)
# with mail.get_connection() as connection:
# for member in form.cleaned_data['group'].user_set.all():
- # email_text = ('Dear ' + title_dict[member.contributor.title] + ' ' +
+ # email_text = ('Dear ' + member.contributor.get_title_display() + ' ' +
# member.last_name + ', \n\n'
# + form.cleaned_data['email_text'])
# mail.EmailMessage(form.cleaned_data['email_subject'],
@@ -1316,7 +1316,7 @@ def email_group_members(request):
email_text = ''
email_text_html = ''
if form.cleaned_data['personalize']:
- email_text = ('Dear ' + title_dict[member.contributor.title]
+ email_text = ('Dear ' + member.contributor.get_title_display()
+ ' ' + member.last_name + ', \n\n')
email_text_html = 'Dear {{ title }} {{ last_name }},<br/>'
email_text += form.cleaned_data['email_text']
@@ -1334,7 +1334,7 @@ def email_group_members(request):
'emails? <a href="https://scipost.org/unsubscribe/{{ key }}">'
'Unsubscribe</a>.</p>')
email_context = Context({
- 'title': title_dict[member.contributor.title],
+ 'title': member.contributor.get_title_display(),
'last_name': member.last_name,
'email_text': form.cleaned_data['email_text'],
'key': member.contributor.activation_key,
diff --git a/submissions/forms.py b/submissions/forms.py
index bcac8cac71b9590b2e4c30d78aecfb018a45e53e..2a5b87466d12368f58d3c700ddbe3552db98fab1 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1,8 +1,8 @@
from django import forms
from django.core.validators import RegexValidator
-from .models import ASSIGNMENT_BOOL, ASSIGNMENT_REFUSAL_REASONS,\
- Submission, RefereeInvitation, Report, EICRecommendation
+from .constants import ASSIGNMENT_BOOL, ASSIGNMENT_REFUSAL_REASONS
+from .models import Submission, RefereeInvitation, Report, EICRecommendation
from scipost.constants import SCIPOST_SUBJECT_AREAS
from scipost.models import Contributor
diff --git a/submissions/models.py b/submissions/models.py
index 93399cfad740fbba40a67515038e48918c9ec45d..a750d4834c43cdb62d5abe48e8cb1675fa2ec494 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -2,100 +2,24 @@ import datetime
from django.utils import timezone
from django.db import models, transaction
-from django.db.models import Q
from django.contrib.postgres.fields import JSONField
-from django.template import Template, Context
+
+from .constants import ASSIGNMENT_REFUSAL_REASONS, SUBMISSION_STATUS, ASSIGNMENT_NULLBOOL,\
+ SUBMISSION_TYPE, ED_COMM_CHOICES, REFEREE_QUALIFICATION, QUALITY_SPEC,\
+ RANKING_CHOICES, REPORT_REC
+from .managers import SubmissionManager, EditorialAssignmentManager, EICRecommendationManager
from scipost.behaviors import ArxivCallable
-from scipost.models import ChoiceArrayField, Contributor, TITLE_CHOICES, title_dict
-from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS, subject_areas_dict
-from journals.models import SCIPOST_JOURNALS_SUBMIT, SCIPOST_JOURNALS_DOMAINS
-from journals.models import journals_submit_dict, journals_domains_dict
+from scipost.constants import TITLE_CHOICES
+from scipost.models import ChoiceArrayField, Contributor
+from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS
+from journals.constants import SCIPOST_JOURNALS_SUBMIT, SCIPOST_JOURNALS_DOMAINS
from journals.models import Publication
###############
# Submissions:
###############
-SUBMISSION_STATUS = (
- ('unassigned', 'Unassigned, undergoing pre-screening'),
- ('assignment_failed', 'Failed to assign Editor-in-charge; manuscript rejected'),
- ('EICassigned', 'Editor-in-charge assigned, manuscript under review'),
- ('review_closed', 'Review period closed, editorial recommendation pending'),
- # If revisions required: resubmission creates a new Submission object
- ('revision_requested', 'Editor-in-charge has requested revision'),
- ('resubmitted', 'Has been resubmitted'),
- ('resubmitted_and_rejected', 'Has been resubmitted and subsequently rejected'),
- ('resubmitted_and_rejected_visible',
- 'Has been resubmitted and subsequently rejected (still publicly visible)'),
- # If acceptance/rejection:
- ('voting_in_preparation', 'Voting in preparation (eligible Fellows being selected)'),
- ('put_to_EC_voting', 'Undergoing voting at the Editorial College'),
- ('EC_vote_completed', 'Editorial College voting rounded up'),
- ('accepted', 'Publication decision taken: accept'),
- ('rejected', 'Publication decision taken: reject'),
- ('rejected_visible', 'Publication decision taken: reject (still publicly visible)'),
- ('published', 'Published'),
- # If withdrawn:
- ('withdrawn', 'Withdrawn by the Authors'),
- )
-submission_status_dict = dict(SUBMISSION_STATUS)
-
-SUBMISSION_STATUS_OUT_OF_POOL = [
- 'assignment_failed',
- 'resubmitted',
- 'published',
- 'withdrawn',
- 'rejected',
- 'rejected_visible',
-]
-
-# Submissions which should not appear in search lists
-SUBMISSION_STATUS_PUBLICLY_UNLISTED = [
- 'unassigned',
- 'assignment_failed',
- 'resubmitted',
- 'resubmitted_rejected',
- 'resubmitted_rejected_visible',
- 'rejected',
- 'published',
- 'withdrawn',
-]
-
-# Submissions which should not be viewable (except by admins, Fellows and authors)
-SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
- 'unassigned',
- 'assignment_failed',
- 'resubmitted_rejected',
- 'rejected',
- 'withdrawn',
-]
-
-# Submissions for which voting on a related recommendation is deprecated:
-SUBMISSION_STATUS_VOTING_DEPRECATED = [
- 'rejected',
- 'published',
- 'withdrawn',
-]
-
-SUBMISSION_TYPE = (
- ('Letter', 'Letter (broad-interest breakthrough results)'),
- ('Article', 'Article (in-depth reports on specialized research)'),
- ('Review', 'Review (candid snapshot of current research in a given area)'),
-)
-submission_type_dict = dict(SUBMISSION_TYPE)
-
-
-class SubmissionManager(models.Manager):
- def get_pool(self, user):
- return self.exclude(status__in=SUBMISSION_STATUS_OUT_OF_POOL)\
- .exclude(is_current=False)\
- .exclude(authors=user.contributor)\
- .exclude(Q(author_list__icontains=user.last_name),
- ~Q(authors_false_claims=user.contributor))\
- .order_by('-submission_date')
-
-
class Submission(ArxivCallable, models.Model):
# Main submission fields
author_comments = models.TextField(blank=True, null=True)
@@ -116,7 +40,8 @@ class Submission(ArxivCallable, models.Model):
secondary_areas = ChoiceArrayField(
models.CharField(max_length=10, choices=SCIPOST_SUBJECT_AREAS),
blank=True, null=True)
- status = models.CharField(max_length=30, choices=SUBMISSION_STATUS, default='unassigned') # set by Editors
+ # Status set by Editors
+ status = models.CharField(max_length=30, choices=SUBMISSION_STATUS, default='unassigned')
subject_area = models.CharField(max_length=10, choices=SCIPOST_SUBJECT_AREAS,
verbose_name='Primary subject area', default='Phys:QP')
submission_type = models.CharField(max_length=10, choices=SUBMISSION_TYPE,
@@ -234,40 +159,6 @@ class Submission(ArxivCallable, models.Model):
arxiv_identifier_wo_vn_nr=self.arxiv_identifier_wo_vn_nr
).exclude(pk=self.id).order_by('-arxiv_vn_nr')
- def header_as_table(self):
- # for Submission page
- header = '<table class="submission_header">'
- header += '<tr><td>Title: </td><td>{{ title }}</td></tr>'
- header += '<tr><td>Author(s): </td><td>{{ author_list }}</td></tr>'
- header += '<tr><td>As Contributors: </td>'
- if self.authors.all():
- header += '<td>'
- for auth in self.authors.all():
- header += ('<a href="/contributor/' + str(auth.id) + '">' + auth.user.first_name
- + ' ' + auth.user.last_name + '</a>')
- header += '</td>'
- else:
- header += '<td>(none claimed)</td>'
- header += ('</tr>'
- '<tr><td>arxiv Link: </td>'
- '<td><a href="{{ arxiv_link }}" target="_blank">{{ arxiv_link }}</a></td></tr>'
- '<tr><td>Date submitted: </td><td>{{ submission_date }}</td></tr>'
- '<tr><td>Submitted by: </td><td>{{ submitted_by }}</td></tr>'
- '<tr><td>Submitted to: </td><td>{{ to_journal }}</td></tr>'
- '<tr><td>Domain(s): </td><td>{{ domain }}</td></tr>'
- '<tr><td>Subject area: </td><td>{{ subject_area }}</td></tr>'
- '</table>')
- template = Template(header)
- context = Context({
- 'title': self.title, 'author_list': self.author_list,
- 'arxiv_link': self.arxiv_link, 'submission_date': self.submission_date,
- 'submitted_by': self.submitted_by,
- 'to_journal': journals_submit_dict[self.submitted_to_journal],
- 'domain': journals_domains_dict[self.domain],
- 'subject_area': subject_areas_dict[self.subject_area],
- })
- return template.render(context)
-
def count_accepted_invitations(self):
return self.refereeinvitation_set.filter(accepted=True).count()
@@ -292,86 +183,11 @@ class Submission(ArxivCallable, models.Model):
def count_awaiting_vetting(self):
return self.reports.filter(status=0).count()
- def refereeing_status_as_p(self):
- nr_ref_invited = RefereeInvitation.objects.filter(submission=self).count()
- nr_ref_accepted = RefereeInvitation.objects.filter(submission=self, accepted=True).count()
- nr_ref_declined = RefereeInvitation.objects.filter(submission=self, accepted=False).count()
- nr_invited_reports_in = Report.objects.filter(submission=self,
- status=1, invited=True).count()
- nr_contrib_reports_in = Report.objects.filter(submission=self,
- status=1, invited=False).count()
- nr_reports_awaiting_vetting = Report.objects.filter(submission=self, status=0).count()
- nr_reports_refused = Report.objects.filter(submission=self, status__lte=-1).count()
- header = ('<p>Nr referees invited: ' + str(nr_ref_invited) +
- ' [' + str(nr_ref_accepted) + ' accepted/ ' +
- str(nr_ref_declined) + ' declined/ ' +
- str(nr_ref_invited - nr_ref_accepted - nr_ref_declined) +
- ' response pending]</p>' +
- '<p>Nr reports obtained: ' +
- str(nr_invited_reports_in + nr_contrib_reports_in) + ' [' +
- str(nr_invited_reports_in) + ' invited/ ' + str(nr_contrib_reports_in) +
- ' contributed], nr refused: ' + str(nr_reports_refused) +
- ', nr awaiting vetting: ' + str(nr_reports_awaiting_vetting) + '</p>')
- template = Template(header)
- context = Context({})
- return template.render(context)
-
- def version_info_as_li(self):
- # for listing all versions of a Submission
- header = ('<li>'
- '<p>'
- '<a href="/submission/{{ arxiv_identifier_w_vn_nr }}" '
- 'class="pubtitleli">version {{ arxiv_vn_nr }}</a>')
- if self.is_current:
- header += ' (current version)'
- else:
- header += ' (deprecated version {{ arxiv_vn_nr }})'
- header += ('</p>'
- '</li>')
- context = Context({'arxiv_identifier_w_vn_nr': self.arxiv_identifier_w_vn_nr,
- 'arxiv_vn_nr': self.arxiv_vn_nr, })
- template = Template(header)
- return template.render(context)
-
- def status_info_as_table(self):
- header = '<table><tr><td>Current status: </td><td> </td><td>{{ status }}'
- context = Context({'status': submission_status_dict[self.status], })
- try:
- context['citation'] = self.publication.citation_for_web_linked()
- header += ' as {{ citation }}'
- except Publication.DoesNotExist:
- pass
- header += '</td></tr></table>'
- template = Template(header)
- return template.render(context)
-
######################
# Editorial workflow #
######################
-ASSIGNMENT_BOOL = ((True, 'Accept'), (False, 'Decline'))
-ASSIGNMENT_NULLBOOL = ((None, 'Response pending'), (True, 'Accept'), (False, 'Decline'))
-
-ASSIGNMENT_REFUSAL_REASONS = (
- ('BUS', 'Too busy'),
- ('VAC', 'Away on vacation'),
- ('COI', 'Conflict of interest: coauthor in last 5 years'),
- ('CCC', 'Conflict of interest: close colleague'),
- ('NIR', 'Cannot give an impartial assessment'),
- ('NIE', 'Not interested enough'),
- ('DNP', 'SciPost should not even consider this paper'),
- )
-assignment_refusal_reasons_dict = dict(ASSIGNMENT_REFUSAL_REASONS)
-
-
-class EditorialAssignmentManager(models.Manager):
- def get_for_user_in_pool(self, user):
- return self.exclude(submission__authors=user.contributor)\
- .exclude(Q(submission__author_list__icontains=user.last_name),
- ~Q(submission__authors_false_claims=user.contributor))
-
-
class EditorialAssignment(models.Model):
submission = models.ForeignKey(Submission, on_delete=models.CASCADE)
to = models.ForeignKey(Contributor, on_delete=models.CASCADE)
@@ -391,34 +207,6 @@ class EditorialAssignment(models.Model):
self.submission.title[:30] + ' by ' + self.submission.author_list[:30] +
', requested on ' + self.date_created.strftime('%Y-%m-%d'))
- def info_as_li(self):
- context = Context({'first_name': self.to.user.first_name,
- 'last_name': self.to.user.last_name,
- 'date_created': self.date_created.strftime('%Y-%m-%d %H:%M')})
- info = '<li'
- if self.accepted:
- info += ' style="color: green"'
- elif self.deprecated:
- info += ' style="color: purple"'
- elif not self.accepted:
- if self.refusal_reason == 'NIE' or self.refusal_reason == 'DNP':
- info += ' style="color: #CC0000"'
- else:
- info += ' style="color: #FF7700"'
- info += '>{{ first_name }} {{ last_name }}, requested {{ date_created }}'
- if self.accepted:
- info += ', accepted {{ date_answered }}'
- context['date_answered'] = self.date_answered.strftime('%Y-%m-%d %H:%M')
- if self.deprecated:
- info += ', deprecated'
- if self.refusal_reason:
- info += ', declined {{ date_answered }}, reason: {{ reason }}'
- context['date_answered'] = self.date_answered.strftime('%Y-%m-%d %H:%M')
- context['reason'] = assignment_refusal_reasons_dict[self.refusal_reason]
- info += '</li>'
- template = Template(info)
- return template.render(context)
-
class RefereeInvitation(models.Model):
submission = models.ForeignKey(Submission, on_delete=models.CASCADE)
@@ -447,71 +235,11 @@ class RefereeInvitation(models.Model):
self.submission.title[:30] + ' by ' + self.submission.author_list[:30] +
', invited on ' + self.date_invited.strftime('%Y-%m-%d'))
- def summary_as_tds(self):
- context = Context({'first_name': self.first_name, 'last_name': self.last_name,
- 'date_invited': self.date_invited.strftime('%Y-%m-%d %H:%M')})
- output = ('<td>{{ first_name }} {{ last_name }}</td><td>invited <br/>'
- '{{ date_invited }}</td><td>')
- if self.cancelled:
- output += '<strong style="color: red;">cancelled</strong>'
- elif self.accepted is not None:
- if self.accepted:
- output += '<strong style="color: green">task accepted</strong> '
- else:
- output += '<strong style="color: red">task declined</strong> '
- output += '<br/>{{ date_responded }}'
- context['date_responded'] = self.date_responded.strftime('%Y-%m-%d %H:%M')
- else:
- output += 'response pending'
- if self.fulfilled:
- output += '<br/><strong style="color: green">task fulfilled</strong>'
- output += '</td>'
- template = Template(output)
- return template.render(context)
-
###########
# Reports:
###########
-REFEREE_QUALIFICATION = (
- (4, 'expert in this subject'),
- (3, 'very knowledgeable in this subject'),
- (2, 'knowledgeable in this subject'),
- (1, 'generally qualified'),
- (0, 'not qualified'),
- )
-ref_qualif_dict = dict(REFEREE_QUALIFICATION)
-
-QUALITY_SPEC = (
- (6, 'perfect'),
- (5, 'excellent'),
- (4, 'good'),
- (3, 'reasonable'),
- (2, 'acceptable'),
- (1, 'below threshold'),
- (0, 'mediocre'),
- )
-quality_spec_dict = dict(QUALITY_SPEC)
-
-
-RANKING_CHOICES = (
- (101, '-'), # Only values between 0 and 100 are kept, anything outside those limits is discarded.
- (100, 'top'), (80, 'high'), (60, 'good'), (40, 'ok'), (20, 'low'), (0, 'poor')
- )
-ranking_choices_dict = dict(RANKING_CHOICES)
-
-REPORT_REC = (
- (1, 'Publish as Tier I (top 10% of papers in this journal, qualifies as Select) NOTE: SELECT NOT YET OPEN, STARTS EARLY 2017'),
- (2, 'Publish as Tier II (top 50% of papers in this journal)'),
- (3, 'Publish as Tier III (meets the criteria of this journal)'),
- (-1, 'Ask for minor revision'),
- (-2, 'Ask for major revision'),
- (-3, 'Reject')
- )
-report_rec_dict = dict(REPORT_REC)
-
-
class Report(models.Model):
""" Both types of reports, invited or contributed. """
# status: see forms.py:REPORT_REFUSAL_CHOICES
@@ -558,84 +286,11 @@ class Report(models.Model):
return (self.author.user.first_name + ' ' + self.author.user.last_name + ' on ' +
self.submission.title[:50] + ' by ' + self.submission.author_list[:50])
- def print_identifier(self):
- context = Context({'id': self.id, 'author_id': self.author.id,
- 'first_name': self.author.user.first_name,
- 'last_name': self.author.user.last_name,
- 'date_submitted': self.date_submitted.strftime("%Y-%m-%d")})
- output = '<div class="reportid">'
- output += '<h3><a id="report_id{{ id }}"></a>'
- if self.anonymous:
- output += 'Anonymous Report {{ id }}'
- else:
- output += '<a href="/contributor/{{ author_id }}">{{ first_name }} {{ last_name }}</a>'
- output += ' on {{ date_submitted }}</h3></div>'
- template = Template(output)
- return template.render(context)
-
- def print_contents(self):
- context = Context({'strengths': self.strengths, 'weaknesses': self.weaknesses,
- 'report': self.report, 'requested_changes': self.requested_changes})
- output = ('<div class="row"><div class="col-12"><h3 class="highlight tight">'
- 'Strengths</h3><div class="pl-md-4">{{ strengths|linebreaks }}</div></div></div>'
- '<div class="row"><div class="col-12"><h3 class="highlight tight">'
- 'Weaknesses</h3><div class="pl-md-4">{{ weaknesses|linebreaks }}</div></div></div>'
- '<div class="row"><div class="col-12"><h3 class="highlight tight">'
- 'Report</h3><div class="pl-md-4">{{ report|linebreaks }}</div></div></div>'
- '<div class="row"><div class="col-12"><h3 class="highlight tight">'
- 'Requested changes</h3><div class="pl-md-4">'
- '<p>{{ requested_changes|linebreaks }}</p>'
- '<div class="reportRatings"><ul>'
- '<li>validity: ' + ranking_choices_dict[self.validity] + '</li>'
- '<li>significance: ' + ranking_choices_dict[self.significance] + '</li>'
- '<li>originality: ' + ranking_choices_dict[self.originality] + '</li>'
- '<li>clarity: ' + ranking_choices_dict[self.clarity] + '</li>'
- '<li>formatting: ' + quality_spec_dict[self.formatting] + '</li>'
- '<li>grammar: ' + quality_spec_dict[self.grammar] + '</li>'
- '</ul></div></div></div></div>')
- template = Template(output)
- return template.render(context)
-
- def print_contents_for_editors(self):
- context = Context({
- 'id': self.id, 'author_id': self.author.id,
- 'author_first_name': self.author.user.first_name,
- 'author_last_name': self.author.user.last_name,
- 'date_submitted': self.date_submitted.strftime("%Y-%m-%d"),
- 'remarks_for_editors': self.remarks_for_editors,
- })
- output = '<div class="reportid">'
- output += '<h3>'
- if self.anonymous:
- output += '(chose public anonymity) '
- output += ('<a href="/contributor/{{ author_id }}">'
- '{{ author_first_name }} {{ author_last_name }}</a>'
- ' on {{ date_submitted }}</h3></div>'
- '<div class="row"><div class="col-12"><h3 class="highlight tight">Qualification</h3>'
- '<div class="pl-md-4">'
- + ref_qualif_dict[self.qualification] + '</div></div></div>')
- output += self.print_contents()
- output += '<div class="row"><div class="col-12"><h3>Remarks for editors</h3><div class="pl-md-4">{{ remarks_for_editors }}</div></div></div>'
- output += '<div class="row"><div class="col-12"><h3>Recommendation</h3><div class="pl-md-4">%s</div></div></div>' % report_rec_dict[self.recommendation]
- template = Template(output)
- return template.render(context)
-
##########################
# EditorialCommunication #
##########################
-ED_COMM_CHOICES = (
- ('EtoA', 'Editor-in-charge to Author'),
- ('EtoR', 'Editor-in-charge to Referee'),
- ('EtoS', 'Editor-in-charge to SciPost Editorial Administration'),
- ('AtoE', 'Author to Editor-in-charge'),
- ('RtoE', 'Referee to Editor-in-Charge'),
- ('StoE', 'SciPost Editorial Administration to Editor-in-charge'),
- )
-ed_comm_choices_dict = dict(ED_COMM_CHOICES)
-
-
class EditorialCommunication(models.Model):
"""
Each individual communication between Editor-in-charge
@@ -656,47 +311,11 @@ class EditorialCommunication(models.Model):
+ self.submission.author_list[:30])
return output
- def print_contents_as_li(self):
- context = Context({'timestamp': self.timestamp.strftime("%Y-%m-%d %H:%M"),
- 'text': self.text})
- output = '<li><p>'
- if self.comtype == 'EtoA':
- output += 'From you to Authors'
- elif self.comtype == 'EtoR':
- output += 'From you to Referee '
- try:
- output += self.referee.user.first_name + ' ' + self.referee.user.last_name
- except AttributeError:
- pass
- elif self.comtype == 'EtoS':
- output += 'From you to SciPost Ed Admin'
- elif self.comtype == 'AtoE':
- output += 'From Authors to you'
- elif self.comtype == 'RtoE':
- output += 'From Referee '
- try:
- output += (self.referee.user.first_name + ' ' +
- self.referee.user.last_name + ' to you')
- except AttributeError:
- pass
- elif self.comtype == 'StoE':
- output += 'From SciPost Ed Admin to you'
- output += ' on {{ timestamp }}</p><p>{{ text }}</p>'
- template = Template(output)
- return template.render(context)
-
############################
# Editorial Recommendation #
############################
-class EICRecommendationManager(models.Manager):
- def get_for_user_in_pool(self, user):
- return self.exclude(submission__authors=user.contributor)\
- .exclude(Q(submission__author_list__icontains=user.last_name),
- ~Q(submission__authors_false_claims=user.contributor))
-
-
# From the Editor-in-charge of a Submission
class EICRecommendation(models.Model):
submission = models.ForeignKey(Submission, on_delete=models.CASCADE)
@@ -719,7 +338,7 @@ class EICRecommendation(models.Model):
def __str__(self):
return (self.submission.title[:20] + ' by ' + self.submission.author_list[:30] +
- ', ' + report_rec_dict[self.recommendation])
+ ', ' + self.get_recommendation_display())
@property
def nr_for(self):
@@ -732,41 +351,3 @@ class EICRecommendation(models.Model):
@property
def nr_abstained(self):
return self.voted_abstain.count()
-
- def print_for_authors(self):
- output = ('<h3>Date: {{ date_submitted }}</h3>'
- '<h3>Remarks for authors</h3>'
- '<p>{{ remarks_for_authors }}</p>'
- '<h3>Requested changes</h3>'
- '<p>{{ requested_changes }}</p>'
- '<h3>Recommendation</h3>'
- '<p>{{ recommendation }}</p>')
- context = Context({
- 'date_submitted': self.date_submitted.strftime('%Y-%m-%d %H:%M'),
- 'remarks_for_authors': self.remarks_for_authors,
- 'requested_changes': self.requested_changes,
- 'recommendation': report_rec_dict[self.recommendation], })
- template = Template(output)
- return template.render(context)
-
- def print_for_Fellows(self):
- output = ('<h3>By {{ Fellow }}, formulated on {{ date_submitted }}</h3>'
- '<h3>Remarks for authors</h3>'
- '<p>{{ remarks_for_authors }}</p>'
- '<h3>Requested changes</h3>'
- '<p>{{ requested_changes }}</p>'
- '<h3>Remarks for Editorial College</h3>'
- '<p>{{ remarks_for_editorial_college }}</p>'
- '<h3>Recommendation</h3>'
- '<p>{{ recommendation }}</p>')
- context = Context({
- 'Fellow': (title_dict[self.submission.editor_in_charge.title] +
- ' ' + self.submission.editor_in_charge.user.first_name +
- ' ' + self.submission.editor_in_charge.user.last_name),
- 'date_submitted': self.date_submitted.strftime('%Y-%m-%d %H:%M'),
- 'remarks_for_authors': self.remarks_for_authors,
- 'requested_changes': self.requested_changes,
- 'remarks_for_editorial_college': self.remarks_for_editorial_college,
- 'recommendation': report_rec_dict[self.recommendation], })
- template = Template(output)
- return template.render(context)
diff --git a/submissions/templates/submissions/_recommendation_fellow_content.html b/submissions/templates/submissions/_recommendation_fellow_content.html
index 3ee1572de1ee79da41f0751b8a84edf9bf8e7e61..1cb07e3a91404cba5bfef1a2d0c9b5dc61cf1813 100644
--- a/submissions/templates/submissions/_recommendation_fellow_content.html
+++ b/submissions/templates/submissions/_recommendation_fellow_content.html
@@ -1,15 +1,10 @@
-<div class="card-block">
- <h3 class="card-title text-blue">By {{recommendation.submission.editor_in_charge.get_title_display}} {{recommendation.submission.editor_in_charge.user.first_name}} {{recommendation.submission.editor_in_charge.user.last_name}}, formulated on {{recommendation.date_submitted}}</h3>
-
- <h3 class="pb-0">Remarks for authors</h3>
- <p class="pl-md-3">{{recommendation.remarks_for_authors}}</p>
+{% extends 'submissions/_recommendation_author_content.html' %}
- <h3 class="pb-0">Requested changes</h3>
- <p class="pl-md-3">{{recommendation.requested_changes}}</p>
+{% block recommendation_header %}
+ <h3 class="card-title text-blue">By {{recommendation.submission.editor_in_charge.get_title_display}} {{recommendation.submission.editor_in_charge.user.first_name}} {{recommendation.submission.editor_in_charge.user.last_name}}, formulated on {{recommendation.date_submitted}}</h3>
+{% endblock %}
+{% block recommendation_before_recommendation %}
<h3 class="pb-0">Remarks for Editorial College</h3>
<p class="pl-md-3">{{recommendation.remarks_for_editorial_college}}</p>
-
- <h3 class="pb-0">Recommendation</h3>
- <p class="pl-md-3 mb-0">{{recommendation.get_recommendation_display}}</p>
-</div>
+{% endblock %}
diff --git a/submissions/templates/submissions/_single_report.html b/submissions/templates/submissions/_single_report.html
deleted file mode 100644
index ef15a1b73e89f08adffe69a19aebbd318de8e7e6..0000000000000000000000000000000000000000
--- a/submissions/templates/submissions/_single_report.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% load scipost_extras %}
-{% load submissions_extras %}
-
-<div class="row">
- <div class="col-12">
- <div class="report">
- {% if user.contributor == submission.editor_in_charge or user|is_in_group:'Editorial Administrators' and not is_author or user|is_in_group:'Editorial Administrators' and not is_author_unchecked %}
-
- <div class="reportid">
- <h3>{% if report.anonymous %}(chose public anonymity) {% endif %}<a href="{% url 'scipost:contributor_info' report.author.id %}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>
- on {{ report.date_submitted|date:'Y-n-j' }}</h3>
- </h3>
- </div>
-
- {% if report.flagged %}
- <h4 class="text-danger font-weight-bold">CAUTION: check if this referee has been flagged by the authors</h4>
- {% endif %}
-
- <div class="row">
- <div class="col-12">
- <h3 class="highlight tight">Qualification</h3>
- <div class="pl-md-4">{{ report.get_qualification_display}}</div>
- </div>
- </div>
-
- {% include 'submissions/_single_report_content.html' with report=report %}
-
- <div class="row">
- <div class="col-12">
- <h3>Remarks for editors</h3>
- <div class="pl-md-4">{{ report.remarks_for_editors }}</div>
- </div>
- </div>
- <div class="row">
- <div class="col-12">
- <h3>Recommendation</h3>
- <div class="pl-md-4">{{report.get_recommendation_display}}</div>
- </div>
- </div>
- {% else %}
- <div class="reportid">
- <h3 id="report_id{{report.id}}">{% if report.anonymous %}Anonymous Report {{report.id}}{% else %}<a href="{% url 'scipost:contributor_info' report.author.id %}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>{% endif %}
- on {{ report.date_submitted|date:'Y-n-j' }}</h3>
- </h3>
- </div>
- {# {{report.print_identifier}}#}
-
- {# {{ report.print_contents }}#}
- {% include 'submissions/_single_report_content.html' with report=report %}
- {% endif %}
-
- <hr class="small">
- <h3><a href="{% url 'comments:reply_to_report' report_id=report.id %}">Reply to this Report</a> (authors only)</h3>
-
- {% for reply in report.comment_set.vetted %}
- {% include 'comments/_single_comment_with_link.html' with comment=reply perms=perms user=user %}
- {% endfor %}
- </div>
- </div>
-</div>
diff --git a/submissions/templates/submissions/_submission_assignment_request.html b/submissions/templates/submissions/_submission_assignment_request.html
index 8b253bb83047c04ecdc63cc809e3c7a1ea569681..fa5d6099f74988830f2e27c18cac379fc0b2b548 100644
--- a/submissions/templates/submissions/_submission_assignment_request.html
+++ b/submissions/templates/submissions/_submission_assignment_request.html
@@ -1,11 +1,8 @@
{% load bootstrap %}
<div class="card-block">
- {{ assignment.submission.header_as_table }}
+ {% include 'submissions/_submission_summary.html' with submission=assignment.submission %}
<br />
-
- <h4>Abstract:</h4>
- <p>{{ assignment.submission.abstract }}</p>
</div>
<div class="card-footer">
<h1>Accept or Decline this Assignment</h1>
diff --git a/submissions/templates/submissions/_submission_card_in_pool.html b/submissions/templates/submissions/_submission_card_in_pool.html
index e4dda343e3a45bc1f82041f584ddf765486a2505..5012644dfd3e3efc3e712ad2271b7232c5879f0a 100644
--- a/submissions/templates/submissions/_submission_card_in_pool.html
+++ b/submissions/templates/submissions/_submission_card_in_pool.html
@@ -42,7 +42,7 @@
<h4>EIC Assignment requests:</h4>
<ul>
{% for assignment in submission.editorialassignment_set.all %}
- {{ assignment.info_as_li }}
+ {% include 'submissions/_assignment_info.html' with assignment=assignment %}
{% endfor %}
</ul>
{% endif %}
diff --git a/submissions/templates/submissions/accept_or_decline_ref_invitations.html b/submissions/templates/submissions/accept_or_decline_ref_invitations.html
index 518a0144693bf276a95899ce0a6651f150e24858..12465e7f61e2510bd50d5b474c0dad6df54fe8c5 100644
--- a/submissions/templates/submissions/accept_or_decline_ref_invitations.html
+++ b/submissions/templates/submissions/accept_or_decline_ref_invitations.html
@@ -33,10 +33,8 @@ $(document).ready(function(){
</div>
<br>
<hr>
- {{ invitation_to_consider.submission.header_as_table }}
- <br />
- <h4>Abstract:</h4>
- <p>{{ invitation_to_consider.submission.abstract }}</p>
+ {% include 'submissions/_submission_summary.html' with submission=invitation_to_consider.submission %}
+
<br/>
<hr>
<div class="flex-greybox">
diff --git a/submissions/templates/submissions/assign_submission.html b/submissions/templates/submissions/assign_submission.html
index 6365bf7feb95c769e7d3f8fd23f9e55a462faf47..15599863694c23cd653f9bc7a8b8e576f10ce594 100644
--- a/submissions/templates/submissions/assign_submission.html
+++ b/submissions/templates/submissions/assign_submission.html
@@ -10,10 +10,9 @@
<br>
<hr>
- {{ submission_to_assign.header_as_table }}
- <br />
- <h4>Abstract:</h4>
- <p>{{ submission_to_assign.abstract }}</p>
+
+ {% include 'submissions/_submission_summary.html' with submission=submission_to_assign %}
+
<br/>
<hr/>
@@ -29,7 +28,7 @@
<br/>
<hr>
- {{ submission_to_assign.status_info_as_table }}
+ {% include 'submissions/_submission_status_block.html' with submission=submission %}
<hr>
{% if submission_to_assign.editorialassignment_set.all %}
@@ -37,7 +36,7 @@
<h3>If more than 5 Fellows have declined an assignment for a red-marked reason, the Submission should be rejected.</h3>
<ul>
{% for assignment in sub.editorialassignment_set.all %}
- {{ assignment.info_as_li }}
+ {% include 'submissions/_assignment_info.html' with assignment=assignment %}
{% endfor %}
</ul>
{% endif %}
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index 989af1cedd256f936cf5fc3059bba6ad5655488e..e05ae5187a5e3654bfc031a68f6cd24ab1e767ea 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -2,199 +2,215 @@
{% block pagetitle %}: editorial page for submission{% endblock pagetitle %}
-{% block headsup %}
-
{% load scipost_extras %}
{% load submissions_extras %}
+{% load bootstrap %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-block">
+ <h1>Editorial Page for Submission</h1>
+ {% if not submission.is_current %}
+ <h3 class="text-danger">This is not the editorial page for the current version.</h3>
+ <p>Please go to the current version's page.</p>
+ {% endif %}
+
+ <h3>(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</h3>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+{% if other_versions %}
+ <div class="row">
+ <div class="col-12">
+ <h3>Other versions of this Submission exist:</h3>
+ <div class="pl-4">
+ {% for vn in other_versions %}
+ {% include 'submissions/_submission_version.html' with submission=vn %}
+ {% endfor %}
+ </div>
+ </div>
+ </div>
+{% endif %}
+
+
+<div class="row">
+ <div class="col-12">
+ <h2>Submission:</h2>
+ {% include 'submissions/_submission_summary_short.html' with submission=submission %}
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ {% if submission.author_comments %}
+ <h3>Author comments upon resubmission</h3>
+ <p>{{ submission.author_comments|linebreaks }}</p>
+ {% endif %}
+
+ {% if submission.list_of_changes %}
+ <h3>List of changes</h3>
+ <p>{{ submission.list_of_changes|linebreaks }}</p>
+ {% endif %}
+
+ {% if submission.remarks_for_editors %}
+ <h3>Comments for the Editor-in-charge</h3>
+ <p>{{ submission.remarks_for_editors|linebreaks }}</p>
+ {% endif %}
+
+ {% if submission.referees_suggested %}
+ <h3>Referees suggested by authors upon submission:</h3>
+ <p>{{ submission.referees_suggested }}</p>
+ {% endif %}
+
+ {% if submission.referees_flagged %}
+ <h3>Referees flagged upon submission (treat reports with caution):</h3>
+ <p>{{ submission.referees_flagged }}</p>
+ {% endif %}
-{% endblock headsup %}
-
-{% block bodysup %}
-
-
-<section>
- <div class="flex-greybox">
- <h1>Editorial Page for Submission</h1>
- {% if not submission.is_current %}
- <h3 style="color: red;">This is not the editorial page for the current version.</h3>
- <p>Please go to the current version's page.</p>
- {% endif %}
- <h3>(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">
- Submissions Page</a> to view Reports and Comments)</h3>
- </div>
-
- {% if other_versions %}
- <h3>Other versions of this Submission exist:</h3>
- <ul>
- {% for vn in other_versions %}
- {{ vn.version_info_as_li }}
- {% endfor %}
- </ul>
- {% endif %}
-
- <hr class="hr12">
- <div class="row">
- <div class="col-4">
- <h2>Submission:</h2>
</div>
- </div>
- {{ submission.header_as_table }}
-
- {% if submission.author_comments %}
- <h3>Author comments upon resubmission</h3>
- <p>{{ submission.author_comments|linebreaks }}</p>
- {% endif %}
-
- {% if submission.list_of_changes %}
- <h3>List of changes</h3>
- <p>{{ submission.list_of_changes|linebreaks }}</p>
- {% endif %}
-
- {% if submission.remarks_for_editors %}
- <h3>Comments for the Editor-in-charge</h3>
- <p>{{ submission.remarks_for_editors|linebreaks }}</p>
- {% endif %}
-
- {% if submission.referees_suggested %}
- <h3>Referees suggested by authors upon submission:</h3>
- <p>{{ submission.referees_suggested }}</p>
- {% endif %}
-
- {% if submission.referees_flagged %}
- <h3>Referees flagged upon submission (treat reports with caution):</h3>
- <p>{{ submission.referees_flagged }}</p>
- {% endif %}
-</section>
+</div>
{% if recommendation %}
-<section>
- <div class="flex-greybox">
- <h1>Editorial Recommendation</h1>
- </div>
- {{ recommendation.print_for_authors }}
-</section>
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Editorial Recommendation</h2>
+ {% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
+ </div>
+ </div>
{% endif %}
-<section>
- <div class="flex-greybox">
- <h1>Editorial Workflow</h1>
- <a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a>
- </div>
- <h3>Status:</h3>
- {{ submission.status_info_as_table }}
- {% if submission|required_actions %}
- <div class="flex-container">
- <div class-"flex-whitebox" style="background-color: #ffaaaa;">
- <h3>Required actions:</h3>
- <ul>
- {% for todoitem in submission|required_actions %}
- <li>{{ todoitem }}</li>
- {% endfor %}
- </ul>
+<div class="row">
+ <div class="col-12">
+ <div class="card card-grey">
+ <div class="card-block">
+ <h1 class="card-title">Editorial Workflow</h1>
+ <a href="{% url 'submissions:editorial_workflow' %}">How-to guide: summary of the editorial workflow</a>
+ </div>
+ </div>
</div>
- </div>
- {% endif %}
- <hr/>
-
- <h3>Refereeing status summary:</h3>
- {{ submission.refereeing_status_as_p }}
-
- <h4>Detail of refereeing invitations:</h4>
- {% if ref_invitations %}
- <table class="ref_listing">
- {% for invitation in ref_invitations %}
- <tr>
- {{ invitation.summary_as_tds }}
- {% if not invitation.accepted == False and not invitation.cancelled %}
- <td>
- {% if invitation.referee %}
- <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoR' referee_id=invitation.referee.id %}">Write a communication</a>
- {% else %}
- (not yet registered)
- {% endif %}
- </td>
- <td>
- {% if not invitation.fulfilled %}
- <a href="{% url 'submissions:ref_invitation_reminder' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr invitation_id=invitation.id %}">Send reminder email</a>
- {% else %}
- <strong style="color: green">Report has been delivered</strong>
- {% endif %}
- </td>
- <td>
- {% if invitation.nr_reminders > 0 %}
- (nr reminders sent: {{ invitation.nr_reminders }}, <br/>last on {{ invitation.date_last_reminded }})
- {% endif %}
- </td>
- <td>
- {% if not invitation.fulfilled %}
- <a href="{% url 'submissions:cancel_ref_invitation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr invitation_id=invitation.id %}">Cancel invitation</a>
- {% endif %}
- </td>
- {% else %}
- <td></td><td></td><td></td><td></td>
- {% endif %}
- </tr>
- {% endfor %}
- </table>
- {% else %}
- <p>You have not invited any referees yet.</p>
- {% endif %}
-
- <hr class="hr6"/>
- <h3>Actions:</h3>
- {% if not submission.is_current %}
- <h3 style="color: red;">BEWARE: This is not the editorial page for the current version.</h3>
- <p>The tools here are thus available only for exceptional circumstances (e.g. vetting a late report on a deprecated version).</p>
- <p>Please go to the current version's page using the link at the top.</p>
- <br/>
- {% endif %}
- <ul>
- <li><a href="{% url 'submissions:select_referee' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">
- Select an additional referee</a> (bear in mind flagged referees if any)</li>
- <li>Extend the refereeing deadline (currently {{ submission.reporting_deadline|date:'Y-m-d' }}) by
- <a href="{% url 'submissions:extend_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr days=2 %}">2 days</a>,
- <a href="{% url 'submissions:extend_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr days=7 %}">1 week</a> or
- <a href="{% url 'submissions:extend_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr days=14 %}">2 weeks</a>
- {% if submission.reporting_deadline_has_passed %}
- <b style="color: red">THE REPORTING DEADLINE HAS PASSED</b>
- {% endif %}
- </li>
- <li>
- Set refereeing deadline:
- <form action="{% url 'submissions:set_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
- {% csrf_token %}{{ set_deadline_form }}
- <input type="submit" value="Set deadline"/>
- </form>
- </li>
- <li><a href="{% url 'submissions:vet_submitted_reports' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
- {% if not submission.reporting_deadline_has_passed %}
- <li><a href="{% url 'submissions:close_refereeing_round' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Close the refereeing round</a> (deactivates submission of new Reports and Comments)</li>
- {% endif %}
- <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoA' %}">Draft and send a communication with the submitting Author</a></li>
- <li>Communicate with a Referee: see the table above.
- </li>
- <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoS' %}">Draft and send a communication with SciPost Editorial Administration</a></li>
- <li><a href="{% url 'submissions:eic_recommendation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Formulate an Editorial Recommendation</a>
- <p>If you recommend revisions, this will be communicated directly to the Authors, who will be asked to resubmit.
- <br/>If you recommend acceptance or rejection, this will be put to the Editorial College for ratification.</p>
- </li>
- </ul>
-</section>
-
-<section>
- <div class="flex-greybox">
- <h1>Communications</h1>
- </div>
- {% if communications %}
- <ul>
- {% for comm in communications %}
- {{ comm.print_contents_as_li }}
- {% endfor %}
- </ul>
- {% else %}
- <p>There have been no communications for this Submission.</p>
- {% endif %}
-</section>
-
-
-{% endblock bodysup %}
+</div>
+
+<div class="row">
+ <div class="col-md-12">
+ {% include 'submissions/_submission_status_block.html' with submission=submission %}
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-md-10 col-lg-8">
+ <div class="card {% if submission|required_actions %}card-danger text-white{% else %}card-outline-success text-success{% endif %}">
+ <div class="card-block">
+ <h3 class="card-title pt-0">Required actions:</h3>
+ <ul class="mb-0">
+ {% for todoitem in submission|required_actions %}
+ <li>{{ todoitem }}</li>
+ {% empty %}
+ <li>No actions required</li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <h3>Refereeing status summary:</h3>
+ {% include 'submissions/_submission_refereeing_status.html' with submission=submission %}
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <h3 class="mb-2">Detail of refereeing invitations:</h3>
+ {% include 'submissions/_submission_refereeing_invitations.html' with submission=submission invitations=ref_invitations %}
+ </div>
+</div>
+
+<hr>
+
+{% if not submission.is_current %}
+<div class="row">
+ <div class="col-12">
+ <div class="card card-outline-warning">
+ <div class="card-block">
+ <h3 class="mb-3 font-weight-bold">BEWARE: This is not the editorial page for the current version!</h3>
+ <p class="mb-0">
+ The tools here are thus available only for exceptional circumstances (e.g. vetting a late report on a deprecated version).
+ <br>Please go to the current version's page using the link at the top.
+ </p>
+ </div>
+ </div>
+ </div>
+</div>
+{% endif %}
+
+<div class="row">
+ <div class="col-12">
+ <h3>Actions:</h3>
+ <ul>
+ <li>
+ <a href="{% url 'submissions:select_referee' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Select an additional referee</a> (bear in mind flagged referees if any)
+ </li>
+ <li>Extend the refereeing deadline (currently {{ submission.reporting_deadline|date:'Y-m-d' }}) by
+ <a href="{% url 'submissions:extend_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr days=2 %}">2 days</a>,
+ <a href="{% url 'submissions:extend_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr days=7 %}">1 week</a> or
+ <a href="{% url 'submissions:extend_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr days=14 %}">2 weeks</a>
+ {% if submission.reporting_deadline_has_passed %}
+ <span class="ml-1 label label-sm label-outline-danger">THE REPORTING DEADLINE HAS PASSED</span>
+ {% endif %}
+ </li>
+ <li>
+ Set refereeing deadline:
+ <form class="form-inline" action="{% url 'submissions:set_refereeing_deadline' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
+ {% csrf_token %}{{ set_deadline_form|bootstrap_inline:'0,12' }}
+ <div class="ml-2 form-group row">
+ <div class="col-12">
+ <input class="btn btn-secondary" type="submit" value="Set deadline"/>
+ </div>
+ </div>
+ </form>
+ </li>
+ <li><a href="{% url 'submissions:vet_submitted_reports' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
+ {% if not submission.reporting_deadline_has_passed %}
+ <li><a href="{% url 'submissions:close_refereeing_round' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Close the refereeing round</a> (deactivates submission of new Reports and Comments)</li>
+ {% endif %}
+ <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoA' %}">Draft and send a communication with the submitting Author</a></li>
+ <li>Communicate with a Referee: see the table above.</li>
+ <li><a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='EtoS' %}">Draft and send a communication with SciPost Editorial Administration</a></li>
+ <li>
+ <a href="{% url 'submissions:eic_recommendation' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Formulate an Editorial Recommendation</a>
+ <p>If you recommend revisions, this will be communicated directly to the Authors, who will be asked to resubmit.
+ <br/>If you recommend acceptance or rejection, this will be put to the Editorial College for ratification.</p>
+ </li>
+ </ul>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Communications</h1>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-lg-6 offset-lg-3 col-md-8 offset-md-2">
+ <ul class="list-group list-group-flush">
+ {% for comm in communications %}
+ <li class="list-group-item">
+ {% include 'submissions/_editorial_communication_content.html' with communication=comm %}
+ </li>
+ {% empty %}
+ <li class="list-group-item">There have been no communications for this Submission.</li>
+ {% endfor %}
+ </ul>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/submissions/templates/submissions/eic_recommendation.html b/submissions/templates/submissions/eic_recommendation.html
index 135a636cc4ebbf643a53fad4fa01767bec0bb9d8..c692faa02da942295b07e82cbca56b835c89fdda 100644
--- a/submissions/templates/submissions/eic_recommendation.html
+++ b/submissions/templates/submissions/eic_recommendation.html
@@ -51,7 +51,7 @@
<h2>Submission:</h2>
</div>
</div>
- {{ submission.header_as_table }}
+ {% include 'submissions/_submission_summary.html' with submission=submission %}
<h3>Abstract:</h3>
<p>{{ submission.abstract }}</p>
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index 4c505ce342baad574f12648e53de04a411a4284d..5cc698d47945e9c2a56e925a49279b00f0b4b18b 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -41,7 +41,6 @@
<h3>Editorial recommendation</h3>
</div>
<div class="card-block">
- {# {{ rec.print_for_Fellows }}#}
<div class="card card-outline-secondary">
{% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
</div>
@@ -154,7 +153,7 @@
<h3>Editorial recommendation</h3>
</div>
<div class="card-block">
- {{ rec.print_for_Fellows }}
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
</div>
<div class="card-footer">
<h3>Actions:</h3>
@@ -191,7 +190,7 @@
<h3>Editorial recommendation</h3>
</div>
<div class="card-block">
- {{ rec.print_for_Fellows }}
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
</div>
<div class="card-footer">
<h3>Your position on this recommendation</h3>
diff --git a/submissions/templates/submissions/prepare_for_voting.html b/submissions/templates/submissions/prepare_for_voting.html
index dcd1a2e686a8350d33e18ac302784473f1aad7ca..bb9b8af8999559b01a46ce8fd115e0fd08feb7a5 100644
--- a/submissions/templates/submissions/prepare_for_voting.html
+++ b/submissions/templates/submissions/prepare_for_voting.html
@@ -34,7 +34,9 @@
<div class="flex-greybox">
<h3>Editorial recommendation:</h3>
<ul>
- <li>{{ recommendation.print_for_Fellows }}</li>
+ <li>
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+ </li>
</ul>
</div>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 15a64f60c15819593496a5c3a0f5a9efc7a77d3a..935acfd7a48ebae50cb4928556263aea5b10f398 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -38,14 +38,16 @@
<div class="row">
<div class="col-12">
- <div class="panel">
- <h1>SciPost Submission Page</h1>
- {% if not submission.is_current %}
- <h3 style="color: red;">This is not the current version.</h3>
- {% endif %}
- {% if user.contributor == submission.editor_in_charge %}
- <h3>(You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</h3>
- {% endif %}
+ <div class="card card-grey">
+ <div class="card-block">
+ <h1>SciPost Submission Page</h1>
+ {% if not submission.is_current %}
+ <h3 style="color: red;">This is not the current version.</h3>
+ {% endif %}
+ {% if user.contributor == submission.editor_in_charge %}
+ <h3>(You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</h3>
+ {% endif %}
+ </div>
</div>
</div>
</div>
@@ -53,26 +55,21 @@
{% if other_versions %}
<div class="row">
<div class="col-12">
- <h3>Other versions of this Submission (with Reports) exist:</h3>
- <ul>
- {% for vn in other_versions %}
- {{ vn.version_info_as_li }}
- {% endfor %}
- </ul>
+ <h3>Other versions of this Submission (with Reports) exist:</h3>
+ <div class="pl-4">
+ {% for vn in other_versions %}
+ {% include 'submissions/_submission_version.html' with submission=vn %}
+ {% endfor %}
+ </div>
</div>
</div>
{% endif %}
<div class="row">
<div class="col-12">
- <hr>
- {{ submission.header_as_table }}
+ {% include 'submissions/_submission_summary.html' with submission=submission %}
- <h3 class="mt-3">Abstract:</h3>
- <p>{{ submission.abstract }}</p>
-
- <h3>Status:</h3>
- {{ submission.status_info_as_table }}
+ {% include 'submissions/_submission_status_block.html' with submission=submission %}
{% if submission.author_comments %}
<h3>Author comments upon resubmission</h3>
@@ -87,16 +84,17 @@
</div>
{% if is_author or user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}
-{% if recommendation %}
-{% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' or recommendation|is_viewable_by_authors %}
-<div class="row">
- <div class="col-12">
- <h2>Editorial Recommendation</h2>
- {{ recommendation.print_for_authors }}
- </div>
-</div>
-{% endif %}
-{% endif %}
+ {% if recommendation %}
+ {% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' or recommendation|is_viewable_by_authors %}
+ <hr>
+ <div class="row">
+ <div class="col-12">
+ <h2>Editorial Recommendation</h2>
+ {% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
+ </div>
+ </div>
+ {% endif %}
+ {% endif %}
{% endif %}
@@ -113,12 +111,17 @@
<ul>
{% if submission.open_for_reporting %}
{% if perms.scipost.can_referee and not is_author and not is_author_unchecked %}
- <li><h3><a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Contribute a Report</a></h3>
- <div class="reportingDeadline">Deadline for reporting: {{ submission.reporting_deadline|date:"Y-m-d" }}</div></li>
+ <li>
+ <h3><a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Contribute a Report</a></h3>
+ <div class="text-danger">Deadline for reporting: {{ submission.reporting_deadline|date:"Y-m-d" }}</div>
+ </li>
{% elif is_author_unchecked %}
- <li><h3>Contribute a Report [deactivated]: the system flagged you as a potential author of this Submission.
- Please go to your <a href="{% url 'scipost:personal_page' %}">personal page</a>
- under the Submissions tab to clarify this.</h3></li>
+ <li>
+ <h3 class="text-blue">Contribute a Report [deactivated]</h3>
+ <div>The system flagged you as a potential author of this Submission.
+ Please go to your <a href="{% url 'scipost:personal_page' %}">personal page</a>
+ under the Submissions tab to clarify this.</div>
+ </li>
{% endif %}
{% else %}
<li>Reporting for this Submission is closed.</li>
@@ -150,7 +153,7 @@
<div id="invitedreportslist">
{% for report in invited_reports %}
- {% include 'submissions/_single_report.html' with report=report user=request.user perms=perms %}
+ {% include 'submissions/_single_public_report.html' with report=report user=request.user perms=perms %}
{% endfor %}
</div>
@@ -171,7 +174,7 @@
<div id="contributedreportslist">
{% for report in contributed_reports %}
- {% include 'submissions/_single_report.html' with report=report user=request.user perms=perms %}
+ {% include 'submissions/_single_public_report.html' with report=report user=request.user perms=perms %}
{% endfor %}
</div>
diff --git a/submissions/templates/submissions/submit_report.html b/submissions/templates/submissions/submit_report.html
index fad83a5aa691770c3437a6f8df26caa3da55b786..d47385506a57446fc570f74ab22a4b0eca855a8d 100644
--- a/submissions/templates/submissions/submit_report.html
+++ b/submissions/templates/submissions/submit_report.html
@@ -65,10 +65,8 @@
<div class="flex-greybox">
<h2>Submission summary and link</h2>
</div>
- {{ submission.header_as_table }}
- <br />
- <h3>Abstract:</h3>
- <p>{{ submission.abstract }}</p>
+ {% include 'submissions/_submission_summary.html' with submission=submission %}
+
</section>
diff --git a/submissions/templates/submissions/vet_submitted_reports.html b/submissions/templates/submissions/vet_submitted_reports.html
index d88bdeae77764c5e05b341a0f7ddc2865cdaa999..d545a3b09ebd6488f70b8ce3632a806e9b6c2c98 100644
--- a/submissions/templates/submissions/vet_submitted_reports.html
+++ b/submissions/templates/submissions/vet_submitted_reports.html
@@ -2,6 +2,8 @@
{% block pagetitle %}: vet reports{% endblock pagetitle %}
+{% load bootstrap %}
+
{% block headsup %}
<script>
@@ -9,7 +11,7 @@ $(document).ready(function(){
$('#refusal').hide();
- $('#id_action_option').on('change', function() {
+ $('[name="action_option"]').on('change', function() {
if ($('#id_action_option_1').is(':checked')) {
$('#refusal').show();
}
@@ -22,46 +24,40 @@ $(document).ready(function(){
{% endblock headsup %}
-{% block bodysup %}
-
-<section>
- {% if not report_to_vet %}
- <h1>There are no Reports for you to vet.</h1>
-
- {% else %}
-
- <h1>SciPost Report to vet:</h1>
-
- <br>
- <hr>
- <h3>Submission associated to Report:</h3>
- {{ report_to_vet.submission.header_as_table }}
- <br />
- <h4>Abstract:</h4>
- <p>{{ report_to_vet.submission.abstract }}</p>
- <hr style="border-style: dotted;" />
- <div class="flex-greybox">
- <h3>Report to vet:</h3>
- </div>
- {{ report_to_vet.print_contents_for_editors|linebreaks }}
-
- <hr class="hr6"/>
- <div class="flex-greaybox">
- <h2>Please vet this Report:</h2>
- </div>
- <form action="{% url 'submissions:vet_submitted_report_ack' report_id=report_to_vet.id %}" method="post">
- {% csrf_token %}
- {{ form.action_option }}
- <div id="refusal">
- <ul>
- <li>Refusal reason: {{ form.refusal_reason }}</li>
- <li>{{ form.email_response_field }}</li>
- </ul>
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ {% if not report_to_vet %}
+ <h1>There are no Reports for you to vet.</h1>
+ {% else %}
+ <h1 class="highlight">SciPost Report to vet:</h1>
+
+ <h2 class="mb-2">Submission associated to Report:</h2>
+ <div class="row">
+ <div class="col-12">
+ {% include 'submissions/_submission_summary_short.html' with submission=report_to_vet.submission %}
+ </div>
+ </div>
+
+ <h2 class="mb-2">Report to vet:</h2>
+
+ {% include 'submissions/_single_public_report_without_comments.html' with report=report_to_vet %}
+
+ <hr class="small">
+ <h2>Please vet this Report:</h2>
+ <form action="{% url 'submissions:vet_submitted_report_ack' report_id=report_to_vet.id %}" method="post">
+ {% csrf_token %}
+ {{ form.action_option|bootstrap }}
+ <div class="col-md-6" id="refusal">
+ {{ form.refusal_reason|bootstrap }}
+ {{ form.email_response_field|bootstrap }}
+ </div>
+ <input class="btn btn-secondary" type="submit" value="Submit" />
+ </form>
+
+ {% endif %}
</div>
- <input type="submit" value="Submit" />
- </form>
-
- {% endif %}
-</section>
+</div>
-{% endblock bodysup %}
+{% endblock content %}
diff --git a/submissions/templatetags/submissions_extras.py b/submissions/templatetags/submissions_extras.py
index b2b785c0357b7be546be77fe2a3eb0d1761022da..2da991f6d3ce3c33c022055bee26bbbbc5d7c597 100644
--- a/submissions/templatetags/submissions_extras.py
+++ b/submissions/templatetags/submissions_extras.py
@@ -2,14 +2,13 @@ import datetime
from django import template
from django.utils import timezone
-from django.utils.timesince import timesince
-from urllib.parse import urlencode
-from submissions.models import SUBMISSION_STATUS_OUT_OF_POOL
+from submissions.constants import SUBMISSION_STATUS_OUT_OF_POOL
from submissions.models import Submission
register = template.Library()
+
@register.filter(name='is_not_author_of_submission')
def is_not_author_of_submission(user, arxiv_identifier_w_vn_nr):
submission = Submission.objects.get(arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr)
@@ -17,7 +16,7 @@ def is_not_author_of_submission(user, arxiv_identifier_w_vn_nr):
and
(user.last_name not in submission.author_list
or
- user.contributor in submission.authors_false_claims.all() ) )
+ user.contributor in submission.authors_false_claims.all()))
@register.filter(name='is_viewable_by_authors')
@@ -26,6 +25,7 @@ def is_viewable_by_authors(recommendation):
'accepted', 'rejected',
'published', 'withdrawn']
+
@register.filter(name='required_actions')
def required_actions(submission):
"""
diff --git a/submissions/utils.py b/submissions/utils.py
index 18fcb7e14d6c46f5df576fe95e17cbb281ea959c..5bfdcdcba3390e9402c41205387a86bb73d48d23 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -3,12 +3,9 @@ import datetime
from django.core.mail import EmailMessage, EmailMultiAlternatives
from django.template import Context, Template
-from journals.models import journals_submit_dict
-from scipost.models import title_dict
from scipost.utils import EMAIL_FOOTER
from submissions.models import EditorialAssignment
-from submissions.models import assignment_refusal_reasons_dict, ed_comm_choices_dict
from submissions.forms import report_refusal_choices_dict
@@ -46,7 +43,7 @@ class SubmissionUtils(object):
@classmethod
def send_authors_submission_ack_email(cls):
""" Requires loading 'submission' attribute. """
- email_text = ('Dear ' + title_dict[cls.submission.submitted_by.title] + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nWe have received your Submission to SciPost,\n\n' +
cls.submission.title + ' by ' + cls.submission.author_list + '.' +
@@ -68,7 +65,7 @@ class SubmissionUtils(object):
'<p>With many thanks,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.submission.submitted_by.title],
+ 'title': cls.submission.submitted_by.get_title_display(),
'last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -88,7 +85,7 @@ class SubmissionUtils(object):
@classmethod
def send_authors_resubmission_ack_email(cls):
""" Requires loading 'submission' attribute. """
- email_text = ('Dear ' + title_dict[cls.submission.submitted_by.title] + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nWe have received your Resubmission to SciPost,\n\n' +
cls.submission.title + ' by ' + cls.submission.author_list + '.' +
@@ -107,7 +104,7 @@ class SubmissionUtils(object):
'<p>With many thanks,</p>'
'<p>The SciPost Team</p>')
email_context = Context({
- 'title': title_dict[cls.submission.submitted_by.title],
+ 'title': cls.submission.submitted_by.get_title_display(),
'last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -127,7 +124,7 @@ class SubmissionUtils(object):
@classmethod
def send_assignment_request_email(cls):
""" Requires loading 'assignment' attribute. """
- email_text = ('Dear ' + title_dict[cls.assignment.to.title] + ' ' +
+ email_text = ('Dear ' + cls.assignment.to.get_title_display() + ' ' +
cls.assignment.to.user.last_name +
', \n\nWe have received a Submission to SciPost ' +
'for which we would like you to consider becoming Editor-in-charge:\n\n' +
@@ -160,7 +157,7 @@ class SubmissionUtils(object):
'\n<p>Many thanks in advance for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.assignment.to.title],
+ 'title': cls.assignment.to.get_title_display(),
'last_name': cls.assignment.to.user.last_name,
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
@@ -180,7 +177,7 @@ class SubmissionUtils(object):
@classmethod
def send_EIC_appointment_email(cls):
""" Requires loading 'assignment' attribute. """
- email_text = ('Dear ' + title_dict[cls.assignment.to.title] + ' '
+ email_text = ('Dear ' + cls.assignment.to.get_title_display() + ' '
+ cls.assignment.to.user.last_name
+ ', \n\nThank you for accepting to become Editor-in-charge '
'of the SciPost Submission\n\n'
@@ -216,7 +213,7 @@ class SubmissionUtils(object):
'<p>Many thanks in advance for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.assignment.to.title],
+ 'title': cls.assignment.to.get_title_display(),
'last_name': cls.assignment.to.user.last_name,
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
@@ -237,7 +234,7 @@ class SubmissionUtils(object):
@classmethod
def send_EIC_reappointment_email(cls):
""" Requires loading 'submission' attribute. """
- email_text = ('Dear ' + title_dict[cls.submission.editor_in_charge.title] + ' '
+ email_text = ('Dear ' + cls.submission.editor_in_charge.get_title_display() + ' '
+ cls.submission.editor_in_charge.user.last_name
+ ', \n\nThe authors of the SciPost Submission\n\n'
+ cls.submission.title + ' by '
@@ -278,7 +275,7 @@ class SubmissionUtils(object):
'<p>Many thanks in advance for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.submission.editor_in_charge.title],
+ 'title': cls.submission.editor_in_charge.get_title_display(),
'last_name': cls.submission.editor_in_charge.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -299,7 +296,7 @@ class SubmissionUtils(object):
@classmethod
def send_author_prescreening_passed_email(cls):
""" Requires loading 'assignment' attribute. """
- email_text = ('Dear ' + title_dict[cls.assignment.submission.submitted_by.title] + ' '
+ email_text = ('Dear ' + cls.assignment.submission.submitted_by.get_title_display() + ' '
+ cls.assignment.submission.submitted_by.user.last_name
+ ', \n\nWe are pleased to inform you that your recent Submission to SciPost,\n\n'
+ cls.assignment.submission.title + ' by ' + cls.assignment.submission.author_list
@@ -354,7 +351,7 @@ class SubmissionUtils(object):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.assignment.submission.submitted_by.title],
+ 'title': cls.assignment.submission.submitted_by.get_title_display(),
'last_name': cls.assignment.submission.submitted_by.user.last_name,
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
@@ -377,7 +374,7 @@ class SubmissionUtils(object):
@classmethod
def assignment_failed_email_authors(cls):
""" Requires loading 'submission' attribute. """
- email_text = ('Dear ' + title_dict[cls.submission.submitted_by.title] + ' '
+ email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' '
+ cls.submission.submitted_by.user.last_name
+ ', \n\nYou recent Submission to SciPost,\n\n'
+ cls.submission.title + ' by ' + cls.submission.author_list
@@ -406,7 +403,7 @@ class SubmissionUtils(object):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.submission.submitted_by.title],
+ 'title': cls.submission.submitted_by.get_title_display(),
'last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -433,11 +430,11 @@ class SubmissionUtils(object):
instead, which calls the send_registration_email method in scipost/utils.
Requires loading 'invitation' attribute.
"""
- email_text = ('Dear ' + title_dict[cls.invitation.referee.title] + ' ' +
+ email_text = ('Dear ' + cls.invitation.referee.get_title_display() + ' ' +
cls.invitation.referee.user.last_name +
', \n\nWe have received a Submission to SciPost '
'which, in view of your expertise and on behalf of the Editor-in-charge '
- + title_dict[cls.invitation.submission.editor_in_charge.title] + ' '
+ + cls.invitation.submission.editor_in_charge.get_title_display() + ' '
+ cls.invitation.submission.editor_in_charge.user.last_name
+ ', we would like to invite you to referee:\n\n'
+ cls.invitation.submission.title + ' by ' + cls.invitation.submission.author_list
@@ -486,9 +483,9 @@ class SubmissionUtils(object):
'and thank you in advance for your consideration.</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'title': title_dict[cls.invitation.referee.title],
+ 'title': cls.invitation.referee.get_title_display(),
'last_name': cls.invitation.referee.user.last_name,
- 'EIC_title': title_dict[cls.invitation.submission.editor_in_charge.title],
+ 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
@@ -515,10 +512,10 @@ class SubmissionUtils(object):
This method is used to remind a referee who is not registered as a Contributor.
It is called from the ref_invitation_reminder method in submissions/views.py.
"""
- email_text = ('Dear ' + title_dict[cls.invitation.title] + ' '
+ email_text = ('Dear ' + cls.invitation.get_title_display() + ' '
+ cls.invitation.last_name + ',\n\n'
'On behalf of the Editor-in-charge '
- + title_dict[cls.invitation.submission.editor_in_charge.title] + ' '
+ + cls.invitation.submission.editor_in_charge.get_title_display() + ' '
+ cls.invitation.submission.editor_in_charge.user.last_name
+ ', we would like to cordially remind you of our recent request to referee\n\n'
+ cls.invitation.submission.title + ' by '
@@ -584,9 +581,9 @@ class SubmissionUtils(object):
'<p>Many thanks in advance,</p>'
'<p>The SciPost Team</p>')
email_context = Context({
- 'title': title_dict[cls.invitation.title],
+ 'title': cls.invitation.get_title_display(),
'last_name': cls.invitation.last_name,
- 'EIC_title': title_dict[cls.invitation.submission.editor_in_charge.title],
+ 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
@@ -614,10 +611,10 @@ class SubmissionUtils(object):
This method is used to inform a referee that his/her services are no longer required.
It is called from the cancel_ref_invitation method in submissions/views.py.
"""
- email_text = ('Dear ' + title_dict[cls.invitation.title] + ' '
+ email_text = ('Dear ' + cls.invitation.get_title_display() + ' '
+ cls.invitation.last_name + ',\n\n'
'On behalf of the Editor-in-charge '
- + title_dict[cls.invitation.submission.editor_in_charge.title] + ' '
+ + cls.invitation.submission.editor_in_charge.get_title_display() + ' '
+ cls.invitation.submission.editor_in_charge.user.last_name
+ ', we would like to inform you that your report on\n\n'
+ cls.invitation.submission.title + ' by '
@@ -655,9 +652,9 @@ class SubmissionUtils(object):
'after which your registration will be activated, giving you full access to '
'the portal\'s facilities (in particular allowing you to provide referee reports).</p>')
email_context = Context({
- 'title': title_dict[cls.invitation.title],
+ 'title': cls.invitation.get_title_display(),
'last_name': cls.invitation.last_name,
- 'EIC_title': title_dict[cls.invitation.submission.editor_in_charge.title],
+ 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
@@ -679,9 +676,9 @@ class SubmissionUtils(object):
@classmethod
def email_referee_response_to_EIC(cls):
""" Requires loading 'invitation' attribute. """
- email_text = ('Dear ' + title_dict[cls.invitation.submission.editor_in_charge.title] + ' ' +
+ email_text = ('Dear ' + cls.invitation.submission.editor_in_charge.get_title_display() + ' ' +
cls.invitation.submission.editor_in_charge.user.last_name + ','
- '\n\nReferee ' + title_dict[cls.invitation.referee.title] + ' ' +
+ '\n\nReferee ' + cls.invitation.referee.get_title_display() + ' ' +
cls.invitation.referee.user.last_name + ' has ')
email_text_html = (
'<p>Dear {{ EIC_title }} {{ EIC_last_name }},</p>'
@@ -693,7 +690,7 @@ class SubmissionUtils(object):
email_subject = 'SciPost: referee accepts to review'
elif not cls.invitation.accepted:
email_text += ('declined (due to reason: '
- + assignment_refusal_reasons_dict[cls.invitation.refusal_reason] + ') ')
+ + cls.invitation.get_refusal_reason_display() + ') ')
email_text_html += 'declined (due to reason: {{ reason }}) '
email_text += ('to referee Submission\n\n'
@@ -715,16 +712,16 @@ class SubmissionUtils(object):
email_text_html += ('<p>Many thanks for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'EIC_title': title_dict[cls.invitation.submission.editor_in_charge.title],
+ 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
- 'ref_title': title_dict[cls.invitation.referee.title],
+ 'ref_title': cls.invitation.referee.get_title_display(),
'ref_last_name': cls.invitation.referee.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
'arxiv_identifier_w_vn_nr': cls.invitation.submission.arxiv_identifier_w_vn_nr,
})
if cls.invitation.refusal_reason:
- email_context['reason'] = assignment_refusal_reasons_dict[cls.invitation.refusal_reason]
+ email_context['reason'] = cls.invitation.get_refusal_reason_display
email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
html_version = html_template.render(email_context)
@@ -740,9 +737,9 @@ class SubmissionUtils(object):
@classmethod
def email_EIC_report_delivered(cls):
""" Requires loading 'report' attribute. """
- email_text = ('Dear ' + title_dict[cls.report.submission.editor_in_charge.title] + ' '
+ email_text = ('Dear ' + cls.report.submission.editor_in_charge.get_title_display() + ' '
+ cls.report.submission.editor_in_charge.user.last_name + ','
- '\n\nReferee ' + title_dict[cls.report.author.title] + ' '
+ '\n\nReferee ' + cls.report.author.get_title_display() + ' '
+ cls.report.author.user.last_name +
' has delivered a Report for Submission\n\n'
+ cls.report.submission.title + ' by '
@@ -762,9 +759,9 @@ class SubmissionUtils(object):
'<p>Many thanks for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'EIC_title': title_dict[cls.report.submission.editor_in_charge.title],
+ 'EIC_title': cls.report.submission.editor_in_charge.get_title_display(),
'EIC_last_name': cls.report.submission.editor_in_charge.user.last_name,
- 'ref_title': title_dict[cls.report.author.title],
+ 'ref_title': cls.report.author.get_title_display(),
'ref_last_name': cls.report.author.user.last_name,
'sub_title': cls.report.submission.title,
'author_list': cls.report.submission.author_list,
@@ -784,7 +781,7 @@ class SubmissionUtils(object):
@classmethod
def acknowledge_report_email(cls):
""" Requires loading 'report' attribute. """
- email_text = ('Dear ' + title_dict[cls.report.author.title] + ' ' +
+ email_text = ('Dear ' + cls.report.author.get_title_display() + ' ' +
cls.report.author.user.last_name + ','
'\n\nMany thanks for your Report on Submission\n\n' +
cls.report.submission.title + ' by '
@@ -837,7 +834,7 @@ class SubmissionUtils(object):
'\n<strong>Requested changes</strong>: <br/><p>{{ requested_changes|linebreaks }}</p>'
'\n<strong>Remarks for Editors</strong>: <br/><p>{{ remarks_for_editors|linebreaks }}</p>')
email_context = Context({
- 'ref_title': title_dict[cls.report.author.title],
+ 'ref_title': cls.report.author.get_title_display(),
'ref_last_name': cls.report.author.user.last_name,
'sub_title': cls.report.submission.title,
'author_list': cls.report.submission.author_list,
@@ -866,7 +863,7 @@ class SubmissionUtils(object):
@classmethod
def send_author_report_received_email(cls):
""" Requires loading 'report' attribute. """
- email_text = ('Dear ' + title_dict[cls.report.submission.submitted_by.title] + ' ' +
+ email_text = ('Dear ' + cls.report.submission.submitted_by.get_title_display() + ' ' +
cls.report.submission.submitted_by.user.last_name +
', \n\nA Report has been posted on your recent Submission to SciPost,\n\n' +
cls.report.submission.title + ' by ' + cls.report.submission.author_list + '.'
@@ -897,7 +894,7 @@ class SubmissionUtils(object):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'auth_title': title_dict[cls.report.submission.submitted_by.title],
+ 'auth_title': cls.report.submission.submitted_by.get_title_display(),
'auth_last_name': cls.report.submission.submitted_by.user.last_name,
'sub_title': cls.report.submission.title,
'author_list': cls.report.submission.author_list,
@@ -918,7 +915,7 @@ class SubmissionUtils(object):
@classmethod
def send_author_comment_received_email(cls):
""" Requires loading 'submission' attribute. """
- email_text = ('Dear ' + title_dict[cls.submission.submitted_by.title] + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nA Comment has been posted on your recent Submission to SciPost,\n\n' +
cls.submission.title + ' by ' + cls.submission.author_list + '.'
@@ -939,7 +936,7 @@ class SubmissionUtils(object):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'auth_title': title_dict[cls.submission.submitted_by.title],
+ 'auth_title': cls.submission.submitted_by.get_title_display(),
'auth_last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -971,7 +968,7 @@ class SubmissionUtils(object):
if cls.communication.comtype in ['AtoE', 'RtoE', 'StoE']:
recipient_email.append(cls.communication.submission.editor_in_charge.user.email)
recipient_greeting = ('Dear ' +
- title_dict[cls.communication.submission.editor_in_charge.title] + ' ' +
+ cls.communication.submission.editor_in_charge.get_title_display() + ' ' +
cls.communication.submission.editor_in_charge.user.last_name)
further_action_page = ('https://scipost.org/submission/editorial_page/'
+ cls.communication.submission.arxiv_identifier_w_vn_nr)
@@ -981,14 +978,14 @@ class SubmissionUtils(object):
elif cls.communication.comtype in ['EtoA']:
recipient_email.append(cls.communication.submission.submitted_by.user.email)
recipient_greeting = ('Dear ' +
- title_dict[cls.communication.submission.submitted_by.title] + ' ' +
+ cls.communication.submission.submitted_by.get_title_display() + ' ' +
cls.communication.submission.submitted_by.user.last_name)
bcc_emails.append(cls.communication.submission.editor_in_charge)
bcc_emails.append('submissions@scipost.org')
elif cls.communication.comtype in ['EtoR']:
recipient_email.append(cls.communication.referee.user.email)
recipient_greeting = ('Dear ' +
- title_dict[cls.communication.referee.title] + ' ' +
+ cls.communication.referee.get_title_display() + ' ' +
cls.communication.referee.user.last_name)
bcc_emails.append(cls.communication.submission.editor_in_charge)
bcc_emails.append('submissions@scipost.org')
@@ -1000,7 +997,7 @@ class SubmissionUtils(object):
email_text = (recipient_greeting +
', \n\nPlease find here a communication (' +
- ed_comm_choices_dict[cls.communication.comtype] + ') '
+ cls.communication.get_comtype_display() + ') '
'concerning Submission\n\n' +
cls.communication.submission.title + ' by '
+ cls.communication.submission.author_list + '.'
@@ -1012,7 +1009,7 @@ class SubmissionUtils(object):
'\n\nSincerely,' +
'\n\nThe SciPost Team.')
emailmessage = EmailMessage(
- 'SciPost: communication (' + ed_comm_choices_dict[cls.communication.comtype] + ')',
+ 'SciPost: communication (' + cls.communication.get_comtype_display() + ')',
email_text,
'SciPost Editorial Admin <submissions@scipost.org>',
recipient_email,
@@ -1023,7 +1020,7 @@ class SubmissionUtils(object):
@classmethod
def send_author_revision_requested_email(cls):
""" Requires loading 'submission' and 'recommendation' attributes. """
- email_text = ('Dear ' + title_dict[cls.submission.submitted_by.title] + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nThe Editor-in-charge of your recent Submission to SciPost,\n\n' +
cls.submission.title + ' by ' + cls.submission.author_list + ','
@@ -1070,7 +1067,7 @@ class SubmissionUtils(object):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'auth_title': title_dict[cls.submission.submitted_by.title],
+ 'auth_title': cls.submission.submitted_by.get_title_display(),
'auth_last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -1092,7 +1089,7 @@ class SubmissionUtils(object):
@classmethod
def send_author_College_decision_email(cls):
""" Requires loading 'submission' and 'recommendation' attributes. """
- email_text = ('Dear ' + title_dict[cls.submission.submitted_by.title] + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nThe Editorial College of SciPost has taken a decision '
'regarding your recent Submission,\n\n' +
@@ -1107,7 +1104,7 @@ class SubmissionUtils(object):
or cls.recommendation.recommendation == 3):
email_text += ('We are pleased to inform you that your Submission '
'has been accepted for publication in '
- + journals_submit_dict[cls.submission.submitted_to_journal])
+ + cls.submission.get_submitted_to_journal_display())
email_text_html += (
'<p>We are pleased to inform you that your Submission '
'has been accepted for publication in <strong>{{ journal }}</strong>')
@@ -1159,12 +1156,12 @@ class SubmissionUtils(object):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = Context({
- 'auth_title': title_dict[cls.submission.submitted_by.title],
+ 'auth_title': cls.submission.submitted_by.get_title_display(),
'auth_last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
'arxiv_identifier_w_vn_nr': cls.submission.arxiv_identifier_w_vn_nr,
- 'journal': journals_submit_dict[cls.submission.submitted_to_journal],
+ 'journal': cls.submission.get_submitted_to_journal_display(),
})
email_text_html += '<br/>' + EMAIL_FOOTER
html_template = Template(email_text_html)
diff --git a/submissions/views.py b/submissions/views.py
index 89a633c257136419cb47da29464d8caf8d900716..c0fc5b703691ef0174d41d696a6dd48258efe2fa 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -10,17 +10,15 @@ from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404, render, redirect
from django.template import Template, Context
from django.utils import timezone
-from django.utils.decorators import method_decorator
from guardian.decorators import permission_required_or_403
-from guardian.mixins import LoginRequiredMixin, PermissionRequiredMixin
+from guardian.mixins import PermissionRequiredMixin
from guardian.shortcuts import assign_perm
+from .constants import SUBMISSION_STATUS_PUBLICLY_UNLISTED, SUBMISSION_STATUS_VOTING_DEPRECATED,\
+ SUBMISSION_STATUS_PUBLICLY_INVISIBLE, SUBMISSION_STATUS, ED_COMM_CHOICES
from .models import Submission, EICRecommendation, EditorialAssignment,\
- RefereeInvitation, Report, EditorialCommunication,\
- SUBMISSION_STATUS_PUBLICLY_UNLISTED, SUBMISSION_STATUS_VOTING_DEPRECATED,\
- SUBMISSION_STATUS_PUBLICLY_INVISIBLE, SUBMISSION_STATUS_OUT_OF_POOL,\
- SUBMISSION_STATUS, submission_status_dict, ed_comm_choices_dict
+ RefereeInvitation, Report, EditorialCommunication
from .forms import SubmissionIdentifierForm, SubmissionForm, SubmissionSearchForm,\
RecommendationVoteForm, ConsiderAssignmentForm, AssignSubmissionForm,\
SetRefereeingDeadlineForm, RefereeSelectForm, RefereeRecruitmentForm,\
@@ -29,9 +27,8 @@ from .forms import SubmissionIdentifierForm, SubmissionForm, SubmissionSearchFor
from .utils import SubmissionUtils
from comments.models import Comment
-from journals.models import journals_submit_dict
from scipost.forms import ModifyPersonalMessageForm, RemarkForm
-from scipost.models import Contributor, title_dict, Remark, RegistrationInvitation
+from scipost.models import Contributor, Remark, RegistrationInvitation
from scipost.services import ArxivCaller
from scipost.utils import Utils
@@ -381,7 +378,7 @@ def pool(request):
@login_required
@permission_required('scipost.can_view_pool', raise_exception=True)
def submissions_by_status(request, status):
- if status not in submission_status_dict.keys():
+ if status not in dict(SUBMISSION_STATUS).keys():
errormessage = 'Unknown status.'
return render(request, 'scipost/error.html', {'errormessage': errormessage})
submissions_of_status = (Submission.objects.get_pool(request.user)
@@ -470,7 +467,7 @@ def accept_or_decline_assignment_ack(request, assignment_id):
context = {'errormessage': errormessage}
return render(request, 'submissions/accept_or_decline_assignment_ack.html', context)
if assignment.submission.editor_in_charge:
- errormessage = (title_dict[assignment.submission.editor_in_charge.title] + ' ' +
+ errormessage = (assignment.submission.editor_in_charge.get_title_display() + ' ' +
assignment.submission.editor_in_charge.user.last_name +
' has already agreed to be Editor-in-charge of this Submission.')
context = {'errormessage': errormessage}
@@ -525,7 +522,7 @@ def volunteer_as_EIC(request, arxiv_identifier_w_vn_nr):
context = {'errormessage': errormessage}
return render(request, 'submissions/accept_or_decline_assignment_ack.html', context)
if submission.editor_in_charge:
- errormessage = (title_dict[submission.editor_in_charge.title] + ' ' +
+ errormessage = (submission.editor_in_charge.get_title_display() + ' ' +
submission.editor_in_charge.user.last_name +
' has already agreed to be Editor-in-charge of this Submission.')
context = {'errormessage': errormessage}
@@ -710,10 +707,10 @@ def recruit_referee(request, arxiv_identifier_w_vn_nr):
ref_invitation.save()
# Create and send a registration invitation
ref_inv_message_head = ('On behalf of the Editor-in-charge ' +
- title_dict[submission.editor_in_charge.title] + ' ' +
+ submission.editor_in_charge.get_title_display() + ' ' +
submission.editor_in_charge.user.last_name +
', we would like to invite you to referee a Submission to ' +
- journals_submit_dict[submission.submitted_to_journal] +
+ submission.get_submitted_to_journal_display +
', namely\n\n' + submission.title +
'\nby ' + submission.author_list +
'\n (see https://scipost.org/submission/'
@@ -917,7 +914,7 @@ def communication(request, arxiv_identifier_w_vn_nr, comtype, referee_id=None):
"""
submission = get_object_or_404(Submission, arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr)
errormessage = None
- if comtype not in ed_comm_choices_dict.keys():
+ if comtype not in dict(ED_COMM_CHOICES).keys():
errormessage = 'Unknown type of cummunication.'
# TODO: Verify that this is requested by an authorized contributor (eic, ref, author)
elif (comtype in ['EtoA', 'EtoR', 'EtoS'] and
@@ -971,7 +968,7 @@ def eic_recommendation(request, arxiv_identifier_w_vn_nr):
submission = get_object_or_404(Submission, arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr)
if submission.status not in ['EICassigned', 'review_closed']:
errormessage = ('This submission\'s current status is: ' +
- submission_status_dict[submission.status] + '. '
+ submission.get_status_display + '. '
'An Editorial Recommendation is not required.')
return render(request, 'scipost/error.html', {'errormessage': errormessage})
if request.method == 'POST':
diff --git a/theses/forms.py b/theses/forms.py
index 3f5dfcc0e5784131d4e8a0d9f7039bad5b07064a..f211402036e27e1ad7c12f19ecaff8972f9bd512 100644
--- a/theses/forms.py
+++ b/theses/forms.py
@@ -3,13 +3,11 @@ from django.core.mail import EmailMessage
from django.template.loader import render_to_string
from django.urls import reverse
-from scipost.models import Contributor, title_dict
+from scipost.models import Contributor
from .models import ThesisLink
from .helpers import past_years
-from scipost.models import Contributor, title_dict
-
class RequestThesisLinkForm(forms.ModelForm):
class Meta:
@@ -64,7 +62,7 @@ class VetThesisLinkForm(RequestThesisLinkForm):
def vet_request(self, thesislink, user):
mail_params = {
- 'vocative_title': title_dict[thesislink.requested_by.title],
+ 'vocative_title': thesislink.requested_by.get_title_display(),
'thesislink': thesislink,
'full_url': self.request.build_absolute_uri(
reverse('theses:thesis', kwargs={'thesislink_id': thesislink.id}))
diff --git a/theses/models.py b/theses/models.py
index f744431a5831180e6c0c7751ec668379659790b7..241a9409defc8069adee6ca49ccd074f6af3ff9a 100644
--- a/theses/models.py
+++ b/theses/models.py
@@ -1,7 +1,7 @@
from django.utils import timezone
from django.db import models
-from journals.models import SCIPOST_JOURNALS_DOMAINS
+from journals.constants import SCIPOST_JOURNALS_DOMAINS
from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS
from scipost.models import Contributor
diff --git a/theses/templatetags/theses_extras.py b/theses/templatetags/theses_extras.py
index f3b441f41f64e3bb5a7ad23f852eb3e627fe9dec..3958f21555cdde6e26465d2d537528f718b0a10e 100644
--- a/theses/templatetags/theses_extras.py
+++ b/theses/templatetags/theses_extras.py
@@ -1,7 +1,6 @@
from django import template
from scipost.constants import SCIPOST_DISCIPLINES, subject_areas_dict, disciplines_dict
-from journals.models import journals_domains_dict
register = template.Library()
@@ -18,7 +17,7 @@ def discipline(thesislink):
@register.filter
def domain(thesislink):
- return journals_domains_dict[thesislink.domain]
+ return thesislink.get_domain_display
@register.filter
diff --git a/theses/views.py b/theses/views.py
index 9f6a10f83005fa86da1c877ea2a5b45b8222cea7..b91abefdb2170c88a4de62c374fa7095e6093317 100644
--- a/theses/views.py
+++ b/theses/views.py
@@ -13,13 +13,9 @@ from django.utils.decorators import method_decorator
from .models import ThesisLink
from .forms import RequestThesisLinkForm, ThesisLinkSearchForm, VetThesisLinkForm
-from comments.models import Comment
from comments.forms import CommentForm
-from scipost.forms import TITLE_CHOICES
-from scipost.models import Contributor
-import strings
-title_dict = dict(TITLE_CHOICES) # Convert titles for use in emails
+import strings
################