Merge pull request #667 from intuitem/fix/add-observations-audit-report

fix: add score and observation on audit report
intuitem · Jul 19, 2024 · 8405bbb · 8405bbb
2 parents 90f54ff + 07a21b8
commit 8405bbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/backend/core/templates/core/audit_report.html b/backend/core/templates/core/audit_report.html
@@ -17,6 +17,9 @@
     <hr class="dotted">
     <div class="flex flex-row space-x-4 justify-center items-center mb-4">
         <h1 class='text-3xl'>{{ compliance_assessment.name }}: {{ compliance_assessment.framework }}</h1>
+        {% if compliance_assessment.get_global_score > -1 %}
+            <p class='font-semibold'>{% trans "Score:" %}</p> <span class="font-semibold">{{ compliance_assessment.get_global_score|floatformat }}</span>
+        {% endif %}
         {% bar_graph assessments ancestors %}
     </div>
     <div class="flex flex-row space-x-4 mb-4">

diff --git a/backend/core/templates/snippets/req_node.html b/backend/core/templates/snippets/req_node.html
@@ -15,11 +15,17 @@
                 <div class='flex flex-row space-x-2'>
                     <div class='text-center rounded-lg whitespace-nowrap px-2 py-1 text-{{ node.status_color_class }}'>{{ node.status }}</div>
                     <div class='text-white text-center rounded-lg whitespace-nowrap px-2 py-1 bg-{{ node.result_color_class }}'>{{ node.result }}</div>
+                    {% if node.assessments.is_scored %}
+                        <div class='text-center whitespace-nowrap px-2 py-1'>{{ node.assessments.score }}</div>
+                    {% endif %}
                 </div>
             </div>
             {% if node.assessments.requirement.description %}
                 <div class='text-left w-full'>{{ node.assessments.requirement.description }}</div>
             {% endif %}
+            {% if node.assessments.observation %}
+                <div class='text-left w-full'><p class="font-semibold">{% trans "Observation:" %}<p> {{ node.assessments.observation }}</div>
+            {% endif %}
         </div>
         {% if node.bar_graph %}
             {% bar_graph assessments ancestors node.requirement_node %}