Skip to content

Commit

Permalink
issue 21
Browse files Browse the repository at this point in the history
  • Loading branch information
@1modm
1modm committed Dec 6, 2021
1 parent 3d7cc1d commit a92c7d3
Show file tree
Hide file tree
Showing 8 changed files with 245 additions and 238 deletions.
28 changes: 0 additions & 28 deletions CHANGELOG.md
View file

This file was deleted.

2 changes: 1 addition & 1 deletion app/config/petereport_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

DEFECTDOJO_CONFIG = {
'DefectDojoURL': 'https://demo.defectdojo.org',
'apiKey': 'Token Key' # Format Token Key
'apiKey': 'Token Key' # Format: Token <api_key>
}

DJANGO_CONFIG = {
Expand Down
2 changes: 1 addition & 1 deletion app/preport/templates/findings/finding_view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ <h3 class="card-title">
{% elif finding.severity == "Info" %}
<span><b><font color="#45a7f7">{{finding.severity}}</font></b></span>
{% else %}
<span>{{finding.severity}}</span>
<span><b>{{finding.severity}}</b></span> (will not appear in the report)
{% endif %}
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/preport/templates/findings/findings_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h3 class="card-title">{{ count_finding_query }} Open Findings</h3>
{% elif finding.severity == "Info" %}
<b><font color="#45A7F7">{{ finding.severity }}</font></b>
{% else %}
{{ finding.severity }}
<b>{{ finding.severity }}</b>
{% endif %}

</td>
Expand Down
2 changes: 1 addition & 1 deletion app/preport/templates/findings/reportfindings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h3 class="card-title">{{ count_finding_query }} Findings</h3>
{% elif finding.severity == "Info" %}
<b><font color="#45A7F7">{{ finding.severity }}</font></b>
{% else %}
{{ finding.severity }}
<b>{{ finding.severity }}</b> (will not appear in the report)
{% endif %}

</td>
Expand Down
2 changes: 1 addition & 1 deletion app/preport/templates/home/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 0.4
<b>Version</b> 0.5
</div>
<strong>Copyright &copy; 2021 <a href="https://github.com/1modm/petereport">PeTeReport</a>.</strong> All rights reserved.
</footer>
Expand Down
26 changes: 19 additions & 7 deletions app/preport/templates/reports/report_view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h3 class="card-title">

<div class="row">

<div class="col text-center">
<div class="col-2 text-center">

{% if count_findings_critical > 0 %}
<input type="text" value="{{count_findings_critical}}" class="dial" data-min="0" data-max="{{count_findings_critical}}" data-fgColor="#cc0000" data-readOnly=true data-width="60%">
Expand All @@ -91,7 +91,7 @@ <h3>Critical</h3>

</div>

<div class="col text-center">
<div class="col-2 text-center">

{% if count_findings_high > 0 %}
<input type="text" value="{{count_findings_high}}" class="dial" data-min="0" data-max="{{count_findings_high}}" data-fgColor="#f50000" data-readOnly=true data-width="60%">
Expand All @@ -103,7 +103,7 @@ <h3>High</h3>
</div>


<div class="col text-center">
<div class="col-2 text-center">

{% if count_findings_medium > 0 %}
<input type="text" value="{{count_findings_medium}}" class="dial" data-min="0" data-max="{{count_findings_medium}}" data-fgColor="#fc7f03" data-readOnly=true data-width="60%">
Expand All @@ -114,7 +114,7 @@ <h3>High</h3>
<h3>Medium</h3>
</div>

<div class="col text-center">
<div class="col-2 text-center">

{% if count_findings_low > 0 %}
<input type="text" value="{{count_findings_low}}" class="dial" data-min="0" data-max="{{count_findings_low}}" data-fgColor="#05b04f" data-readOnly=true data-width="60%">
Expand All @@ -126,17 +126,29 @@ <h3>Low</h3>
</div>


<div class="col text-center">
<div class="col-2 text-center">

{% if count_findings_info > 0 %}
<input type="text" value="{{count_findings_info}}" class="dial" data-min="0" data-max="{{count_findings_info}}" data-fgColor="#45a7f7" data-readOnly=true data-width="60%">
{% else %}
<input type="text" value="{{count_findings_info}}" class="dial" data-min="0" data-max="{{count_findings_info}}" data-fgColor="#D3D3D3" data-readOnly=true data-width="60%">
{% endif %}

<h3>Informational</h3>
<h3>Info</h3>
</div>

<div class="col-2 text-center">

{% if count_findings_none > 0 %}
<input type="text" value="{{count_findings_none}}" class="dial" data-min="0" data-max="{{count_findings_none}}" data-fgColor="#999999" data-readOnly=true data-width="60%">
{% else %}
<input type="text" value="{{count_findings_none}}" class="dial" data-min="0" data-max="{{count_findings_none}}" data-fgColor="#D3D3D3" data-readOnly=true data-width="60%">
{% endif %}

<h3>None</h3>
</div>


</div>


Expand Down Expand Up @@ -422,7 +434,7 @@ <h3 class="card-title">
{% elif finding.severity == "Info" %}
<b><font color="#45A7F7">{{ finding.severity }}</font></b>
{% else %}
{{ finding.severity }}
<b>{{ finding.severity }}</b> (will not appear in the report)
{% endif %}

</td>
Expand Down
Loading

0 comments on commit a92c7d3

Please sign in to comment.