Skip to content

371525174: (fix) update ui on PDF report #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlgaMardvilko merged 3 commits into from
Oct 8, 2024
Merged

371525174: (fix) update ui on PDF report #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f44b6cb
371525174: (fix) update ui on PDF report
OlgaMardvilko Oct 8, 2024
dde52c3
371525174: (fix) update steps to resolve on PDF report
OlgaMardvilko Oct 8, 2024
9a3b786
Merge branch 'dev' into fix/ui/371525174
OlgaMardvilko Oct 8, 2024
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
8 changes: 4 additions & 4 deletions resources/report/header_macros.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</p>
<h1>{{ title }}</h1>
</div>
<h2 style="top: 50%;max-width:700px">
<p class="header-info-device">
{{ device['manufacturer'] }}
{{ device['model']}}
</h2>
</p>
{% else %}
<div class="header">
<div class="header-info">
Expand All @@ -33,10 +33,10 @@
</p>
<h1>{{ title }}</h1>
</div>
<h3 style="margin-top:0;max-width:700px">
<p class="header-info-device">
{{ device['manufacturer'] }}
{{ device['model']}}
</h3>
</p>
{% endif %}
<img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
</div>
Expand Down
35 changes: 25 additions & 10 deletions resources/report/test_report_styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,20 @@
letter-spacing: 1px;
}

.header-info-device {
margin-top: 0;
max-width: 700px;
margin-bottom: 24px;
font-size: 24px;
font-weight: bold;
}

.first-page .header-info-device {
margin: 0;
font-size: 48px;
font-weight: 700;
}

h1 {
margin: 0 0 8px 0;
font-size: 20px;
Expand Down Expand Up @@ -211,9 +225,13 @@
vertical-align: top;
}

.steps-to-resolve-row.content {
margin-left: 70px;
}

.steps-to-resolve-test-name {
display: inline-block;
margin-left: 60px;
margin-left: 70px;
margin-right: 10px;
margin-bottom: 20px;
width: 250px;
Expand All @@ -235,6 +253,7 @@
.steps-to-resolve-index {
font-size: 40px;
position: absolute;
margin-left: 10px;
}

.callout-container.info {
Expand Down Expand Up @@ -371,7 +390,7 @@
.page-heading {
padding-left: 0.2in;
margin: 0.2in 0;
font-size: 32px;
font-size: 30px;
font-weight: normal;
}

Expand Down Expand Up @@ -414,24 +433,20 @@
.result-test-result-error {
background-color: #FCE8E6;
color: #C5221F;
left: 7.3in;
}

.result-test-result-feature-not-detected {
background-color: #e3e3e3;
left: 6.85in;
}

.result-test-result-informational {
background-color: #E0F7FA;
color: #006064;
left: 7.08in;
}

.result-test-result-non-compliant {
background-color: #FCE8E6;
color: #C5221F;
left: 7.01in;
}

.result-test-result {
Expand All @@ -442,18 +457,17 @@
margin-top: 8px;
padding: 4px 4px 7px 5px;
border-radius: 2px;
left: 6.85in;
}

.result-test-result-compliant {
background-color: #E6F4EA;
color: #137333;
left: 7.16in;
}

.result-test-result-skipped {
background-color: #e3e3e3;
color: #393939;
left: 7.24in;
}

/* CSS for the footer */
Expand Down Expand Up @@ -511,10 +525,11 @@
overflow: hidden;
}

.module-page-content h1 {
.module-page-content h1,
.module-page-content h2 {
padding-left: 0.2in;
margin: 0.2in 0;
font-size: 32px;
font-size: 30px;
font-weight: normal;
}

Expand Down
12 changes: 7 additions & 5 deletions resources/report/test_report_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3>Results List <small>({{ successful_tests }}/{{ total_tests }})</small></h3>
<div class="result-line" style="margin-top: 10px;border-top-left-radius:4px;border-top-right-radius:4px;">
<div class="result-list-header-label" style="left: .1in">Name</div>
<div class="result-list-header-label" style="left: 2.8in">Description</div>
<div class="result-list-header-label" style="left: 7.3in">Result</div>
<div class="result-list-header-label" style="left: 6.85in">Result</div>
</div>
{% for i in range(results_from, results_to) %}
<div class="result-line result-line-result">
Expand Down Expand Up @@ -111,7 +111,7 @@ <h3>Results List <small>({{ successful_tests }}/{{ total_tests }})</small></h3>
{% set page_index.value = page_index.value+1 %}
<div class="page">
{{ header_macros.header(False, "Testrun report", json_data, device, logo, icon_qualification, icon_pilot)}}
<h1 class="page-heading">Steps to Resolve</h1>
<h2 class="page-heading">Non-complaint tests and suggested steps to resolve</h2>
{% for step in steps_to_resolve %}
<div class="steps-to-resolve">
<div class="steps-to-resolve-row">
Expand All @@ -123,7 +123,7 @@ <h1 class="page-heading">Steps to Resolve</h1>
<span class="steps-to-resolve subtitle">Description</span><br>{{ step["description"] }}
</div>
</div>
<div class="steps-to-resolve-row" style="margin-left: 70px;">
<div class="steps-to-resolve-row content">
<span class="steps-to-resolve subtitle">Steps to resolve</span>
{% for recommedtation in step['recommendations'] %}
<br><span style="font-size: 14px">{{ loop.index }}. {{ recommedtation }}</span>
Expand Down Expand Up @@ -155,7 +155,8 @@ <h1 class="page-heading">Steps to Resolve</h1>
{# Device profile #}
{% set page_index.value = page_index.value+1 %}
<div class="page">
{{ header_macros.header(False, "Device profile", json_data, device, logo, icon_qualification, icon_pilot)}}
{{ header_macros.header(False, "Testrun report", json_data, device, logo, icon_qualification, icon_pilot)}}
<h2 class="page-heading">Device profile</h2>
<div class="device-profile-content">
<div class="device-profile-head">
<div class="device-profile-head-question">Question</div>
Expand Down Expand Up @@ -190,6 +191,7 @@ <h1 class="page-heading">Steps to Resolve</h1>
{% set page_index.value = page_index.value + 1 %}
<div class="page">
{{ header_macros.header(False, "Testrun report", json_data, device, logo, icon_qualification, icon_pilot)}}
<h2 class="page-heading">Recommendations for Device Qualification</h2>
<div class="steps-to-resolve-info">
<p class="steps-to-resolve-info-heading">Attention</p>
<p class="steps-to-resolve-info-content">
Expand All @@ -214,7 +216,7 @@ <h1 class="page-heading">Steps to Resolve</h1>
{{ step["description"] }}
</div>
</div>
<div class="steps-to-resolve-row" style="margin-left: 70px;">
<div class="steps-to-resolve-row content">
<span class="steps-to-resolve subtitle">Steps to resolve</span>
{% for recommedtation in step['optional_recommendations'] %}
<br>
Expand Down