Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion framework/python/src/common/testreport.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,20 @@ def _calc_details_height(self, text):
lines = math.ceil(len(text) / 45)
return (lines * 14) + 12

def _calc_text_line_height(self, text):
# Calculate result lines count
lines = math.ceil(len(text) / 52)
return 40 + 15 * (lines -1)

def _gen_result_page(self, results, space):
# Build results page content
page = []
page_space = 0
while results:
result = results[0]
line_height = 40
line_height = self._calc_text_line_height(result['description'])
if line_height > 40:
result['height'] = line_height
if result['details']:
line_height += self._calc_details_height(result['details'])
page_space += line_height
Expand Down
1 change: 1 addition & 0 deletions resources/report/test_report_styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,7 @@

.result-test-description {
max-width: 300px;
white-space: normal;
}

.result-test-details {
Expand Down
10 changes: 5 additions & 5 deletions resources/test_packs/pilot/report_templates/results.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
</div>
{% 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']%}
<div class="result-line result-line-result-with-details result-line-result-non-compliant-required">
{% if test_result['details'] %}
<div class="result-line result-line-result-with-details result-line-result-non-compliant-required" style="height: {{ test_result['height'] | default(38.4) }}px">
{% else%}
<div class="result-line result-line-result result-line-result-non-compliant-required">
<div class="result-line result-line-result result-line-result-non-compliant-required" style="height: {{ test_result['height'] | default(38.4) }}px">
{% endif %}
{% else %}
{% if test_result['details']%}
<div class="result-line result-line-result-with-details">
<div class="result-line result-line-result-with-details" style="height: {{ test_result['height'] | default(38.4) }}px">
{% else %}
<div class="result-line result-line-result">
<div class="result-line result-line-result" style="height: {{ test_result['height'] | default(38.4) }}px">
{% endif %}
{% endif %}
<div class="result-test-label" style="left: .1in;">{{ test_result['name'] }}</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
</div>
{% 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']%}
<div class="result-line result-line-result-with-details result-line-result-non-compliant-required">
{% if test_result['details'] %}
<div class="result-line result-line-result-with-details result-line-result-non-compliant-required" style="height: {{ test_result['height'] | default(38.4) }}px">
{% else%}
<div class="result-line result-line-result result-line-result-non-compliant-required">
<div class="result-line result-line-result result-line-result-non-compliant-required" style="height: {{ test_result['height'] | default(38.4) }}px">
{% endif %}
{% else %}
{% if test_result['details']%}
<div class="result-line result-line-result-with-details">
<div class="result-line result-line-result-with-details" style="height: {{ test_result['height'] | default(38.4) }}px">
{% else %}
<div class="result-line result-line-result">
<div class="result-line result-line-result" style="height: {{ test_result['height'] | default(38.4) }}px">
{% endif %}
{% endif %}
<div class="result-test-label" style="left: .1in;">{{ test_result['name'] }}</div>
Expand Down