From 2f66ef4e83dbc901e8dd0074c5c608d5aac966e6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Nikitsin Date: Wed, 16 Jul 2025 23:39:16 +0200 Subject: [PATCH] place details under the description field --- framework/python/src/common/testreport.py | 2 +- resources/report/test_report_styles.css | 15 ++++++++++++--- .../pilot/report_templates/results.jinja | 8 ++++---- .../qualification/report_templates/results.jinja | 8 ++++---- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py index 817315510..baa66cc1c 100644 --- a/framework/python/src/common/testreport.py +++ b/framework/python/src/common/testreport.py @@ -353,7 +353,7 @@ def _add_page_counter(self, html): def _calc_details_height(self, text): # Calculate a details line height - lines = math.ceil(len(text) / 100) + lines = math.ceil(len(text) / 45) return (lines * 14) + 12 def _gen_result_page(self, results, space): diff --git a/resources/report/test_report_styles.css b/resources/report/test_report_styles.css index 8dc55c884..8533f6c0d 100644 --- a/resources/report/test_report_styles.css +++ b/resources/report/test_report_styles.css @@ -447,11 +447,16 @@ border-top: 0; } - .result-line-result-details { + .result-line-result-with-details { border-top: 0; border-bottom: 0; } + .result-line-result-details { + height: auto; + border-top: 0; + } + .result-line-result-non-compliant-required { background: #FCE8E6; } @@ -483,8 +488,12 @@ .result-test-details { font-size: 11px; - margin-left: 3.6px; - padding: 6px; + width: 300px; + display: block; + margin-left: 2.1in; + margin-right: 0; + margin-bottom: 6px; + box-sizing: border-box; } .result-test-result-error { diff --git a/resources/test_packs/pilot/report_templates/results.jinja b/resources/test_packs/pilot/report_templates/results.jinja index df679a4e4..c516cbdb2 100644 --- a/resources/test_packs/pilot/report_templates/results.jinja +++ b/resources/test_packs/pilot/report_templates/results.jinja @@ -10,13 +10,13 @@ {% for test_result in page %} {% if test_result['result'] == 'Non-Compliant' and test_result['required_result'] in ["Required", "Required if Applicable"] %} {% if test_result['details']%} -
- {% else %} -
+
+ {% else%} +
{% endif %} {% else %} {% if test_result['details']%} -
+
{% else %}
{% endif %} diff --git a/resources/test_packs/qualification/report_templates/results.jinja b/resources/test_packs/qualification/report_templates/results.jinja index df679a4e4..c516cbdb2 100644 --- a/resources/test_packs/qualification/report_templates/results.jinja +++ b/resources/test_packs/qualification/report_templates/results.jinja @@ -10,13 +10,13 @@ {% for test_result in page %} {% if test_result['result'] == 'Non-Compliant' and test_result['required_result'] in ["Required", "Required if Applicable"] %} {% if test_result['details']%} -
- {% else %} -
+
+ {% else%} +
{% endif %} {% else %} {% if test_result['details']%} -
+
{% else %}
{% endif %}