From ded44b04c2460b6ef4e0f81cd9b65c6e0536e4e7 Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Sat, 12 Dec 2015 15:59:36 +0100 Subject: [PATCH] Bug fixes in Personal Page --- commentaries/models.py | 2 ++ .../templates/contributors/personal_page.html | 16 ++++++++++------ scipost/static/scipost/SciPost.css | 5 +++++ submissions/models.py | 2 ++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/commentaries/models.py b/commentaries/models.py index 102f3ccbc..59340acc5 100644 --- a/commentaries/models.py +++ b/commentaries/models.py @@ -21,6 +21,8 @@ class Commentary(models.Model): arxiv_link = models.URLField(verbose_name='arXiv link (including version nr)') pub_DOI_link = models.URLField(verbose_name='DOI link to the original publication') author_list = models.CharField(max_length=1000) + # Authors which have been mapped to contributors: + authors = models.ManyToManyField (Contributor, blank=True, null=True, related_name='authors_com') pub_date = models.DateField(verbose_name='date of original publication') pub_abstract = models.TextField() diff --git a/contributors/templates/contributors/personal_page.html b/contributors/templates/contributors/personal_page.html index 79cb6caa4..65ab2c84b 100644 --- a/contributors/templates/contributors/personal_page.html +++ b/contributors/templates/contributors/personal_page.html @@ -64,17 +64,21 @@ <div class="col-4"> <table class="ratings"> <th>Reports</th><th>(nr: {{ contributor.nr_reports }})</th> - <tr><td>clarity:</td><td>{{ contributor.report_clarity_rating }}%</td></tr> - <tr><td>correctness:</td><td>{{ contributor.report_correctness_rating }}%</td></tr> - <tr><td>usefulness:</td><td>{{ contributor.report_usefulness_rating }}%</td></tr> + <tr><td>clarity:</td><td>{{ contributor.report_clarity_rating }}% ({{ contributor.nr_report_clarity_ratings }})</td></tr> + <tr><td>validity:</td><td>{{ contributor.report_validity_rating }}% ({{ contributor.nr_report_validity_ratings }})</td></tr> + <tr><td>rigour:</td><td>{{ contributor.report_rigour_rating }}% ({{ contributor.nr_report_rigour_ratings }})</td></tr> + <tr><td>originality:</td><td>{{ contributor.report_originality_rating }}% ({{ contributor.nr_report_originality_ratings }})</td></tr> + <tr><td>significance:</td><td>{{ contributor.report_significance_rating }}% ({{ contributor.nr_report_significance_ratings }})</td></tr> </table> </div> <div class="col-4"> <table class="ratings"> <th>Comments</th><th>(nr: {{ contributor.nr_comments }})</th> - <tr><td>clarity:</td><td>{{ contributor.comment_clarity_rating }}%</td></tr> - <tr><td>correctness:</td><td>{{ contributor.comment_correctness_rating }}%</td></tr> - <tr><td>usefulness:</td><td>{{ contributor.comment_usefulness_rating }}%</td></tr> + <tr><td>clarity:</td><td>{{ contributor.comment_clarity_rating }}% ({{ contributor.nr_comment_clarity_ratings }})</td></tr> + <tr><td>validity:</td><td>{{ contributor.comment_validity_rating }}% ({{ contributor.nr_comment_validity_ratings }})</td></tr> + <tr><td>rigour:</td><td>{{ contributor.comment_rigour_rating }}% ({{ contributor.nr_comment_rigour_ratings }})</td></tr> + <tr><td>originality:</td><td>{{ contributor.comment_originality_rating }}% ({{ contributor.nr_comment_originality_ratings }})</td></tr> + <tr><td>significance:</td><td>{{ contributor.comment_significance_rating }}% ({{ contributor.nr_comment_significance_ratings }})</td></tr> </table> </div> </div> diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css index ee20c85a8..5639a1378 100644 --- a/scipost/static/scipost/SciPost.css +++ b/scipost/static/scipost/SciPost.css @@ -37,6 +37,10 @@ General style sheet for SciPost } +.ratingsdata select { + font-size: 50%; +} + body { // font-family: Verdana, sans-serif; font-family: Helvetica Neue, sans-serif; @@ -277,6 +281,7 @@ section form.ratingsdata ul li { section form.ratingsdata ul li label { color: #ffffff; } + section div table.ratings { font-size: 90%; color: #ffffff; diff --git a/submissions/models.py b/submissions/models.py index e9da7b656..386c2cfee 100644 --- a/submissions/models.py +++ b/submissions/models.py @@ -30,6 +30,8 @@ class Submission(models.Model): open_for_commenting = models.BooleanField(default=True) title = models.CharField(max_length=300) author_list = models.CharField(max_length=1000) + # Authors which have been mapped to contributors: + authors = models.ManyToManyField (Contributor, blank=True, null=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') -- GitLab