From 84a8160d82812260870dfcc9b40149d4598f8b58 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 13 May 2019 08:44:29 +0200
Subject: [PATCH] Simplify Report form (incomplete work)
---
requirements.txt | 2 +-
.../static/scipost/toggle-report-fields.js | 22 +++++++++++
submissions/forms.py | 38 ++++++++++---------
.../partials/submissions/report_preview.html | 8 ++--
.../templates/submissions/report_form.html | 7 +++-
5 files changed, 53 insertions(+), 24 deletions(-)
create mode 100644 scipost/static/scipost/toggle-report-fields.js
diff --git a/requirements.txt b/requirements.txt
index 8e7090c13..6068d718f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ mock==2.0.0
# Django packages
-django_ajax_selects==1.7.1
+django_ajax_selects==1.7.1 # 2019-05-12
django-countries==5.3.3
django-debug-toolbar==1.8
django-extensions==1.7.6
diff --git a/scipost/static/scipost/toggle-report-fields.js b/scipost/static/scipost/toggle-report-fields.js
new file mode 100644
index 000000000..5e93bd265
--- /dev/null
+++ b/scipost/static/scipost/toggle-report-fields.js
@@ -0,0 +1,22 @@
+$(document).ready(function(){
+ $('#showSimpleReportButton').show();
+ $('#showFullReportButton').hide();
+ $('#reportSelectorButton').on('click', function () {
+ $('#showSimpleReportButton').toggle();
+ $('#showFullReportButton').toggle();
+ $('#id_strengths').parent('div').parent('div').toggle();
+ $('#id_weaknesses').parent('div').parent('div').toggle();
+ $('#id_requested_changes').parent('div').parent('div').toggle();
+ $('#id_validity').parent('div').parent('div').toggle();
+ $('#id_significance').parent('div').parent('div').toggle();
+ $('#id_originality').parent('div').parent('div').toggle();
+ $('#id_clarity').parent('div').parent('div').toggle();
+ $('#id_formatting').parent('div').parent('div').toggle();
+ $('#id_grammar').parent('div').parent('div').toggle();
+
+ $('#previewStrengths').toggle();
+ $('#previewWeaknesses').toggle();
+ $('#previewRequestedChanges').toggle();
+ $('#previewRatings').toggle();
+ });
+});
diff --git a/submissions/forms.py b/submissions/forms.py
index 771369bd1..782e10bd8 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1084,25 +1084,27 @@ class ReportForm(forms.ModelForm):
# If the Report is not a followup: Explicitly assign more fields as being required!
if not self.instance.is_followup_report and self.submission.submitted_to.name != SCIPOST_JOURNAL_PHYSICS_PROC:
required_fields_label += [
- 'strengths',
- 'weaknesses',
- 'requested_changes',
- 'validity',
- 'significance',
- 'originality',
- 'clarity',
- 'formatting',
- 'grammar']
+ # 'strengths',
+ # 'weaknesses',
+ # 'requested_changes',
+ # 'validity',
+ # 'significance',
+ # 'originality',
+ # 'clarity',
+ # 'formatting',
+ # 'grammar'
+ ]
required_fields += [
- 'strengths',
- 'weaknesses',
- 'requested_changes',
- 'validity',
- 'significance',
- 'originality',
- 'clarity',
- 'formatting',
- 'grammar']
+ # 'strengths',
+ # 'weaknesses',
+ # 'requested_changes',
+ # 'validity',
+ # 'significance',
+ # 'originality',
+ # 'clarity',
+ # 'formatting',
+ # 'grammar'
+ ]
for field in required_fields:
self.fields[field].required = True
diff --git a/submissions/templates/partials/submissions/report_preview.html b/submissions/templates/partials/submissions/report_preview.html
index ee07ab781..8d7495488 100644
--- a/submissions/templates/partials/submissions/report_preview.html
+++ b/submissions/templates/partials/submissions/report_preview.html
@@ -5,13 +5,13 @@
<h3><span data-receive="report-identity"><span if-anonymous="true" style="display: none;">Anonymous</span><span if-anonymous="false" style="display: none;">{{ request.user.first_name }} {{ request.user.last_name }}</span> on <span data-receive="report-date">{% now "SHORT_DATE_FORMAT" %}</span></h3>
</div>
- <div class="row">
+ <div class="row" id="previewStrengths">
<div class="col">
<h3 class="highlight tight">Strengths</h3>
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-strengths"></p></div>
</div>
</div>
- <div class="row">
+ <div class="row" id="previewWeaknesses">
<div class="col">
<h3 class="highlight tight">Weaknesses</h3>
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-weaknesses"></p></div>
@@ -23,14 +23,14 @@
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-report"></p></div>
</div>
</div>
- <div class="row">
+ <div class="row" id="previewRequestedChanges">
<div class="col">
<h3 class="highlight tight">Requested changes</h3>
<div class="pl-md-4"><p style="white-space: pre-wrap;" data-receive="report-requested_changes"></p></div>
</div>
</div>
- <div class="ratings">
+ <div class="ratings" id="previewRatings">
<ul>
<li>validity: <span data-receive="report-validity"></span></li>
<li>significance: <span data-receive="report-significance"></span></li>
diff --git a/submissions/templates/submissions/report_form.html b/submissions/templates/submissions/report_form.html
index b256fcd55..08d819cb0 100644
--- a/submissions/templates/submissions/report_form.html
+++ b/submissions/templates/submissions/report_form.html
@@ -34,6 +34,10 @@
<h2>Your {% if form.instance.is_followup_report %}followup {% endif %}report:</h2>
<p>A preview of text areas will appear below as you type (you can use $\LaTeX$ \$...\$ for in-text equations or \ [ ... \ ] for on-line equations).</p>
<p class="mb-0">Any fields with an asterisk (*) are required.</p>
+ <button class="btn btn-primary" id="reportSelectorButton">
+ <span id="showSimpleReportButton">Show simplified Report form</span>
+ <span id="showFullReportButton">Show full Report form</span>
+ </button>
{% if form.instance.is_followup_report %}
<p class="mb-0">
Because you have already submitted a Report for this Submission series, not all fields are required.
@@ -86,5 +90,6 @@
{% block footer_script %}
- <script type="text/javascript" src="{% static 'scipost/report-preview.js' %}"></script>
+ <script src="{% static 'scipost/toggle-report-fields.js' %}">
+ <script src="{% static 'scipost/report-preview.js' %}"></script>
{% endblock %}
--
GitLab