Skip to content

Fix alignment with steps to resolve in PDF report #441

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
jboddey merged 1 commit into from
May 10, 2024
Merged

Fix alignment with steps to resolve in PDF report #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 39 additions & 22 deletions framework/python/src/common/testreport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,27 +296,28 @@ def generate_steps_to_resolve(self, json_data):

# Render test recommendations
page += f'''
<table class="steps-to-resolve">
<tbody>
<tr>
<td width="10%" class="steps-to-resolve index">{index}.</td>
<td width="32%" class="steps-to-resolve"><span class="steps-to-resolve subtitle">Name</span><br>{test["name"]}</td>
<td class="steps-to-resolve"><span class="steps-to-resolve subtitle">Description</span><br>{test["description"]}</td>
</tr>
<tr>
<td width="10%"></td>
<td colspan="2" class="steps-to-resolve" style="padding-bottom:20px;">
<span class="steps-to-resolve subtitle">Steps to resolve</span>
<div class="steps-to-resolve">
<div class="steps-to-resolve-row">
<span class="steps-to-resolve-index">{index}. </span>
<div class="steps-to-resolve-test-name">
<span class="steps-to-resolve subtitle">Name</span><br>{test["name"]}
</div>
<div class="steps-to-resolve-description">
<span class="steps-to-resolve subtitle">Description</span><br>{test["description"]}
</div>
</div>
<div class="steps-to-resolve-row" style="margin-left: 70px;">
<span class="steps-to-resolve subtitle">Steps to resolve</span>
'''

step_number = 1
for recommendation in test['recommendations']:
page += f'''<br>
<span style="font-size: 14px">{
page += f'''
<br><span style="font-size: 14px">{
step_number}. {recommendation}</span>'''
step_number += 1

page += '</td></tbody></table>'
page += '</div></div>'

index += 1
steps_so_far += 1
Expand Down Expand Up @@ -585,6 +586,11 @@ def generate_summary(self, json_data):
return summary

def generate_device_module_label(self, module, enabled):

# Do not render deleted modules
if module == 'nmap':
return ''

label = '<div class="summary-device-module-label">'
if enabled:
label += '<span style="color:#34a853">✔ </span>'
Expand Down Expand Up @@ -787,19 +793,30 @@ def generate_css(self):
font-family: 'Roboto Mono', monospace;
}

table.steps-to-resolve {
div.steps-to-resolve {
background-color: #F8F9FA;
margin-bottom: 30px;
width: var(--page-width);
width: 756px;
padding: 20px 30px;
vertical-align: top;
}

.steps-to-resolve-row {
vertical-align: top;
}

td.steps-to-resolve {
padding-left: 20px;
padding-top: 20px;
padding-right: 15px;
.steps-to-resolve-test-name {
display: inline-block;
margin-left: 70px;
margin-bottom: 20px;
width: 250px;
vertical-align: top;
}

.steps-to-resolve-description {
display: inline-block;
}

.steps-to-resolve.subtitle {
text-align: left;
padding-top: 15px;
Expand All @@ -808,9 +825,9 @@ def generate_css(self):
font-size: 14px;
}

.steps-to-resolve.index {
.steps-to-resolve-index {
font-size: 40px;
padding-left: 30px;
position: absolute;
}

.callout-container.info {
Expand Down
2 changes: 1 addition & 1 deletion framework/python/src/common/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def get_module_display_name(search):
'ntp': 'NTP',
'dns': 'DNS',
'connection': 'Connection',
'nmap': 'Services',
'services': 'Services',
'tls': 'TLS',
'protocol': 'Protocol'
}
Expand Down