diff --git a/requirements.txt b/requirements.txt index 8e7090c130d7d036787d323459ef7c38ab4107fd..6068d718febd21ca560a0de32f7abba3e12c939a 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 0000000000000000000000000000000000000000..5e93bd2655e550ce74477e36931624a80c00cc32 --- /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 771369bd189206c22eba959b44a38300bf2ea157..782e10bd85e4dba95b4ef477f13f4d841ce80ba8 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 ee07ab781d2ce459fdfba34498226130500fb051..8d749548895ddac05d3a3b1526d6ad7166f14b1b 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 b256fcd553200e1c95882144dea95af0dc318b44..08d819cb06075a93048fa0e5693f2aab093b992b 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 %}