Merge remote-tracking branch 'origin/enhancement/update-paf-font-size…

…s' into test
HyphaApp · Jul 17, 2023 · 02c557f · 02c557f
2 parents 2bab86e + 3bc5d6b
commit 02c557f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/hypha/apply/projects/templates/application_projects/paf_export.html b/hypha/apply/projects/templates/application_projects/paf_export.html
@@ -119,10 +119,8 @@ <h1 class="title"> {{ org_name }}(Project Approval Form | <a href="{{ project_li
             <p><b> Approvals </b></p>
             {% if approvals %}
                 {% for approval in approvals %}
-                    {% if approval.approved %}
-                        <p><b>{{ approval.paf_reviewer_role.label }}</b>({{ approval.user }}) - {{ approval.approved_at|date:"DATE_FORMAT" }}</p>
-                        <p>{% if approval.approved %} "Approved" {% else %} "Not approved yet"{% endif %}</p>
-                    {% endif %}
+                        <p>{{ approval.paf_reviewer_role.label }} - {% if approval.approved %} Approved {% else %} Pending{% endif %}
+                            {% if approval.user %}({{ approval.user }}){% endif %}</p>
                 {% endfor %}
             {% else %}
                 <p>-</p>

diff --git a/hypha/apply/projects/templates/application_projects/project_approval_detail.html b/hypha/apply/projects/templates/application_projects/project_approval_detail.html
@@ -96,39 +96,37 @@ <h4>{% trans "Approvals" %}</h4>
                 <div class="card card--solid">
                     {% for approval in project.paf_approvals.all %}
                         {% if approval.approved %}
-                            <p><b>{{ approval.paf_reviewer_role.label }}</b>({{ approval.user }}) - {{ approval.approved_at|date:"DATE_FORMAT" }}</p>
+                            <p><b>{{ approval.paf_reviewer_role.label }}</b> - {{ approval.user }} ({{ approval.approved_at|date:"DATE_FORMAT" }})</p>
+                        {% else %}
+                            <p><b>{{ approval.paf_reviewer_role.label }}</b> {% trans " - Pending" %}</p>
                         {% endif %}
                     {% endfor %}
                 </div>
 
                 <h4>{% trans "Review" %}</h4>
                 <div class="card card--solid">
-                    <p class="font-bold">{% trans "Submission lead" %}</p>
-                    <p>{{ project.submission.lead }}</p>
+                    <p class="font-bold mb-0 mt-0">{% trans "Submission lead" %}</p>
+                    <p class="mt-2 mb-0">{{ project.submission.lead }}</p>
 
-                    <p class="font-bold">{% trans "Staff reviewers" %}</p>
+                    <p class="font-bold mt-6 mb-0">{% trans "Staff reviewers" %}</p>
                     {% for review in project.submission.reviews.by_staff %}
-                    <div class="card__reviewer-outcome">
-                        <span class="card__reviewer">
+                        <p class="mt-2 mb-0">
                             {{ review.author }}
                             {% if review.author.role %}
                                 {% trans "as" %} {{ review.author.role }}
                             {% endif %}
                             - {{ review.created_at|date:"DATE_FORMAT" }}
-                        </span>
-                    </div>
+                        </p>
                     {% empty %}
-                        <p>{% trans "No reviews" %}</p>
+                        <p class="mt-2 mb-0">{% trans "No reviews" %}</p>
                     {% endfor %}
-                    <p class="font-bold">{% trans "Advisory council" %}</p>
+                    <p class="font-bold mb-0 mt-6">{% trans "Advisory council" %}</p>
                     {% for review in project.submission.reviews.by_reviewers %}
-                        <div class="card__reviewer-outcome">
-                            <span class="card__reviewer">
+                            <p class="mt-2 mb-0">
                                 {{ review.author }} - {{ review.created_at|date:"DATE_FORMAT" }}
-                            </span>
-                        </div>
+                            </p>
                     {% empty %}
-                        <p>{% trans "No reviews" %}</p>
+                        <p class="mt-2 mb-0">{% trans "No reviews" %}</p>
                     {% endfor %}
                 </div>