From f44b6cb404aa4135176d10ace25155f9887cb49f Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Tue, 8 Oct 2024 15:17:44 +0000
Subject: [PATCH 1/2] 371525174: (fix) update ui on PDF report

---
 resources/report/header_macros.jinja       |  8 ++---
 resources/report/test_report_styles.css    | 42 ++++++++++++++++------
 resources/report/test_report_template.html | 16 +++++----
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/resources/report/header_macros.jinja b/resources/report/header_macros.jinja
index 94952f915..a6c9905df 100644
--- a/resources/report/header_macros.jinja
+++ b/resources/report/header_macros.jinja
@@ -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">
@@ -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>
diff --git a/resources/report/test_report_styles.css b/resources/report/test_report_styles.css
index 53a4cec0a..fb00cc492 100644
--- a/resources/report/test_report_styles.css
+++ b/resources/report/test_report_styles.css
@@ -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;
@@ -211,17 +225,26 @@
       vertical-align: top;
     }
 
+    .steps-to-resolve-row.heading {
+      display: flex;
+    }
+
+    .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;
+      width: 50%;
       vertical-align: top;
     }
 
     .steps-to-resolve-description {
       display: inline-block;
+      width: 50%;
     }
 
     .steps-to-resolve.subtitle {
@@ -235,6 +258,7 @@
     .steps-to-resolve-index {
       font-size: 40px;
       position: absolute;
+      margin-left: 10px;
     }
 
     .callout-container.info {
@@ -371,7 +395,7 @@
     .page-heading {
       padding-left: 0.2in;
       margin: 0.2in 0;
-      font-size: 32px;
+      font-size: 30px;
       font-weight: normal;
     }
 
@@ -414,24 +438,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 {
@@ -442,18 +462,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 */
@@ -511,10 +530,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;
     }
 
diff --git a/resources/report/test_report_template.html b/resources/report/test_report_template.html
index d02dfd54d..613a047ab 100644
--- a/resources/report/test_report_template.html
+++ b/resources/report/test_report_template.html
@@ -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">
@@ -111,10 +111,10 @@ <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">
+      <div class="steps-to-resolve-row heading">
         <span class="steps-to-resolve-index">{{ loop.index }}.</span>
         <div class="steps-to-resolve-test-name">
           <span class="steps-to-resolve subtitle">Name</span><br>{{ step['name'] }}
@@ -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>
@@ -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>
@@ -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">
@@ -201,7 +203,7 @@ <h1 class="page-heading">Steps to Resolve</h1>
     </div>
     {% for step in optional_steps_to_resolve %}
     <div class="steps-to-resolve">
-      <div class="steps-to-resolve-row">
+      <div class="steps-to-resolve-row heading">
         <span class="steps-to-resolve-index">
           {{ loop.index }}.
         </span>
@@ -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>

From dde52c37536df28f27dd2dcb245005aefe3d66ba Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Tue, 8 Oct 2024 15:56:26 +0000
Subject: [PATCH 2/2] 371525174: (fix) update steps to resolve on PDF report

---
 resources/report/test_report_styles.css    | 7 +------
 resources/report/test_report_template.html | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/resources/report/test_report_styles.css b/resources/report/test_report_styles.css
index fb00cc492..30709330a 100644
--- a/resources/report/test_report_styles.css
+++ b/resources/report/test_report_styles.css
@@ -225,10 +225,6 @@
       vertical-align: top;
     }
 
-    .steps-to-resolve-row.heading {
-      display: flex;
-    }
-
     .steps-to-resolve-row.content {
       margin-left: 70px;
     }
@@ -238,13 +234,12 @@
       margin-left: 70px;
       margin-right: 10px;
       margin-bottom: 20px;
-      width: 50%;
+      width: 250px;
       vertical-align: top;
     }
 
     .steps-to-resolve-description {
       display: inline-block;
-      width: 50%;
     }
 
     .steps-to-resolve.subtitle {
diff --git a/resources/report/test_report_template.html b/resources/report/test_report_template.html
index 613a047ab..0ea566e33 100644
--- a/resources/report/test_report_template.html
+++ b/resources/report/test_report_template.html
@@ -114,7 +114,7 @@ <h3>Results List <small>({{ successful_tests }}/{{ total_tests }})</small></h3>
     <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 heading">
+      <div class="steps-to-resolve-row">
         <span class="steps-to-resolve-index">{{ loop.index }}.</span>
         <div class="steps-to-resolve-test-name">
           <span class="steps-to-resolve subtitle">Name</span><br>{{ step['name'] }}
@@ -203,7 +203,7 @@ <h2 class="page-heading">Recommendations for Device Qualification</h2>
     </div>
     {% for step in optional_steps_to_resolve %}
     <div class="steps-to-resolve">
-      <div class="steps-to-resolve-row heading">
+      <div class="steps-to-resolve-row">
         <span class="steps-to-resolve-index">
           {{ loop.index }}.
         </span>