From 6e71434b58f91637c41bdea1a2e18224d1eecac8 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 28 Jan 2016 10:52:08 +0100
Subject: [PATCH] Start work on submission processing
---
.../commentaries/request_commentary.html | 4 +-
journals/models.py | 3 ++
scipost/models.py | 3 +-
submissions/forms.py | 2 +-
submissions/models.py | 23 +++++++++-
.../submissions/process_new_submissions.html | 43 +++++++++++--------
.../submissions/submission_detail.html | 11 +----
7 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/commentaries/templates/commentaries/request_commentary.html b/commentaries/templates/commentaries/request_commentary.html
index a9c9abd0a..9579928bf 100644
--- a/commentaries/templates/commentaries/request_commentary.html
+++ b/commentaries/templates/commentaries/request_commentary.html
@@ -52,9 +52,7 @@
<form action="{% url 'commentaries:request_commentary' %}" method="post">
{% csrf_token %}
<table>
- <ul>
- {{ form.as_table }}
- </ul>
+ {{ form.as_table }}
</table>
<input type="submit" value="Submit"/>
</form>
diff --git a/journals/models.py b/journals/models.py
index 2c65309a9..75f76f87f 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -44,6 +44,7 @@ SCIPOST_JOURNALS_SUBMIT = ( # Same as SCIPOST_JOURNALS, but SP Select deactivate
('SciPost Physics', 'SciPost Physics'),
('SciPost Physics Lecture Notes', 'SciPost Physics Lecture Notes'),
)
+journals_submit_dict = dict(SCIPOST_JOURNALS_SUBMIT)
SCIPOST_JOURNALS_DOMAINS = (
('E', 'Experimental'),
@@ -54,6 +55,7 @@ SCIPOST_JOURNALS_DOMAINS = (
('TC', 'Theor. & Comp.'),
('ETC', 'Exp., Theor. & Comp.'),
)
+journals_domains_dict = dict(SCIPOST_JOURNALS_DOMAINS)
SCIPOST_JOURNALS_SPECIALIZATIONS = (
('A', 'Atomic, Molecular and Optical Physics'),
@@ -67,6 +69,7 @@ SCIPOST_JOURNALS_SPECIALIZATIONS = (
('Q', 'Quantum Statistical Mechanics'),
('S', 'Statistical and Soft Matter Physics'),
)
+journals_spec_dict = dict(SCIPOST_JOURNALS_SPECIALIZATIONS)
PHYSICS_SUBJECTS = (
('A', 'Atomic, Molecular and Optical Physics'),
diff --git a/scipost/models.py b/scipost/models.py
index 2aefe515a..e95dda0f7 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -103,7 +103,8 @@ class Contributor(models.Model):
report_rigour_rating = models.DecimalField(default=0, max_digits=3, decimal_places=0)
def __str__ (self):
- return self.user.username
+# return self.user.username
+ return self.user.last_name + ', ' + self.user.first_name
def as_table (self):
output = '<table>'
diff --git a/submissions/forms.py b/submissions/forms.py
index 7243eac58..07189782b 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -22,7 +22,7 @@ class SubmissionForm(forms.ModelForm):
self.fields['arxiv_link'].widget.attrs.update({'placeholder': 'ex.: arxiv.org/abs/1234.56789v1'})
class ProcessSubmissionForm(forms.Form):
- editor_in_charge = forms.ModelChoiceField(queryset=Contributor.objects.filter(rank__gte=3), required=True)
+ editor_in_charge = forms.ModelChoiceField(queryset=Contributor.objects.filter(rank__gte=3), required=True, label='Select an Editor-in-charge')
class SubmissionSearchForm(forms.Form):
author = forms.CharField(max_length=100, required=False, label="Author(s)")
diff --git a/submissions/models.py b/submissions/models.py
index 878f00d39..8532d70ed 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -21,6 +21,7 @@ SUBMISSION_STATUS = (
(4, 'reviewed, peer checked, editorial decision pending'),
(5, 'editorial decision'),
)
+submission_status_dict = dict(SUBMISSION_STATUS)
class Submission(models.Model):
submitted_by = models.ForeignKey(Contributor)
@@ -38,7 +39,7 @@ class Submission(models.Model):
authors = models.ManyToManyField (Contributor, blank=True, related_name='authors_sub')
abstract = models.TextField()
arxiv_link = models.URLField(verbose_name='arXiv link (including version nr)')
- submission_date = models.DateField(verbose_name='date of original publication')
+ submission_date = models.DateField(verbose_name='submission date')
nr_clarity_ratings = models.IntegerField(default=0)
clarity_rating = models.DecimalField(default=0, max_digits=3, decimal_places=0, null=True)
@@ -55,6 +56,26 @@ class Submission(models.Model):
def __str__ (self):
return self.title
+ def header_as_table (self):
+ header = '<table>'
+ header += '<tr><td>Title: </td><td> </td><td>' + self.title + '</td></tr>'
+ header += '<tr><td>Author(s): </td><td> </td><td>' + self.author_list + '</td></tr>'
+ header += '<tr><td>arxiv Link: </td><td> </td><td><a href="' + self.arxiv_link + '">' + self.arxiv_link + '</a></td></tr>'
+ header += '<tr><td>Date submitted: </td><td> </td><td>' + str(self.submission_date) + '</td></tr>'
+ header += '<tr><td>Submitted by: </td><td> </td><td>' + str(self.submitted_by) + '</td></tr>'
+ header += '<tr><td>Submitted to: </td><td> </td><td>' + journals_submit_dict[self.submitted_to_journal] + '</td></tr>'
+ header += '<tr><td>Domain(s): </td><td> </td><td>' + journals_domains_dict[self.domain] + '</td></tr>'
+ header += '<tr><td>Specialization: </td><td> </td><td>' + journals_spec_dict[self.specialization] + '</td></tr>'
+ header += '</table>'
+ return header
+
+ def submission_info_as_table (self):
+ header = '<table>'
+ header += '<tr><td>Editor in charge: </td><td> </td><td>' + str(self.editor_in_charge) + '</td></tr>'
+ header += '<tr><td>Vetted: </td><td> </td><td>' + str(self.vetted) + '</td></tr>'
+ header += '<tr><td>Status: </td><td> </td><td>' + submission_status_dict[self.status] + '</td></tr>'
+ header += '</table>'
+ return header
###########
# Reports:
diff --git a/submissions/templates/submissions/process_new_submissions.html b/submissions/templates/submissions/process_new_submissions.html
index dc562b423..92e239901 100644
--- a/submissions/templates/submissions/process_new_submissions.html
+++ b/submissions/templates/submissions/process_new_submissions.html
@@ -14,25 +14,30 @@
<br>
<hr>
- <div class="row">
- <div class="col-8">
- <table>
- <tr><td>Title: </td><td>{{ submission_to_process.title }}</td></tr>
- <tr><td>Author(s): </td><td>{{ submission_to_process.author_list }}</td></tr>
- <tr><td>arxiv Link: </td><td><a href="{{ submission_to_process.arxiv_link }}">{{ submission_to_process.arxiv_link }}</a></td></tr>
- <tr><td>Date submitted: </td><td>{{ submission_to_process.submission_date }}</td></tr>
- </table>
- <br />
- <h4>Abstract:</h4>
- <p>{{ submission_to_process.abstract }}</p>
- </div>
- <div class="col-4">
- <form action="{% url 'submissions:process_new_submission_ack' submission_id=submission_to_process.id %}" method="post">
- {% csrf_token %}
- {{ form.as_ul }}
- <input type="submit" value="Submit" />
- </div>
- </div>
+ {{ submission_to_process.header_as_table|safe }}
+<!--
+ <table>
+ <tr><td>Title: </td><td>{{ submission_to_process.title }}</td></tr>
+ <tr><td>Author(s): </td><td>{{ submission_to_process.author_list }}</td></tr>
+ <tr><td>arxiv Link: </td><td><a href="{{ submission_to_process.arxiv_link }}">{{ submission_to_process.arxiv_link }}</a></td></tr>
+ <tr><td>Date submitted: </td><td>{{ submission_to_process.submission_date }}</td></tr>
+ </table>
+-->
+ <br />
+ <h4>Abstract:</h4>
+ <p>{{ submission_to_process.abstract }}</p>
+ <br/>
+ <hr/>
+ {{ submission_to_process.submission_info_as_table|safe }}
+
+ <br/>
+ <hr>
+ <h1>Required actions:</h1>
+ <form action="{% url 'submissions:process_new_submission_ack' submission_id=submission_to_process.id %}" method="post">
+ {% csrf_token %}
+ {{ form.as_ul }}
+ <input type="submit" value="Submit" />
+ </form>
{% endif %}
</section>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index b2db52aca..9eb6c82e5 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -45,16 +45,7 @@
</div>
</div>
<hr class="hr12">
-
- <table>
- <tr><td>Title: </td><td>{{ submission.title }}</td></tr>
- <tr><td>Author(s): </td><td>{{ submission.author_list }}</td></tr>
- <tr><td>arXiv link: </td><td><a href="{{ submission.arxiv_link }}">{{ submission.arxiv_link }}</a></td></tr>
- <tr><td>Date submitted: </td><td>{{ submission.submission_date }}</td></tr>
- <tr><td>Submitted to: </td><td>{{ submission.submitted_to_journal }}</td></tr>
- <tr><td>Specialization: </td><td>{{ submission.specialization }}</td></tr>
- </table>
-
+ {{ submission.header_as_table|safe }}
<h3>Abstract:</h3>
<p>{{ submission.abstract }}</p>
--
GitLab