From cdac1c2f90c0e9aae1cae8d7c0fb01d6384ce708 Mon Sep 17 00:00:00 2001
From: gbucchino <gbucchino@fortinet-us.com>
Date: Wed, 14 Jun 2023 16:53:32 +0200
Subject: [PATCH] Update report

---
 core/report.py                   | 12 +++++++++---
 reports/templates/sysctl.html.j2 |  8 ++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/report.py b/core/report.py
index e1875d7..3d4231f 100644
--- a/core/report.py
+++ b/core/report.py
@@ -30,12 +30,18 @@ def generateHtmlReport(data):
 
     if 'sysctl' in data['system']:
         dataJinja2['sysctl'] = dict()
+        dataJinja2['sysctl']['file'] = dict()
+        dataJinja2['sysctl']['file']['filename'] = data['system']['sysctl']['file']['filename']
+        dataJinja2['sysctl']['file']['sysctl'] = data['system']['sysctl']['file']['sysctl']
 
         for sysctl in data['system']['sysctl']['file']:
-            print(data['system']['sysctl']['file'][sysctl])
-
-    
+            pass
+            #print(data['system']['sysctl']['file'][sysctl])
+            #for entry in data['system']['sysctl']['file']['sysctl']:
+            #    print(entry)
+            #    print(data['system']['sysctl']['file']['sysctl'][entry])
 
+    print(dataJinja2)
     dataJinja2['year'] = '2023'
     rdr = tmplIndex.render(data=dataJinja2)
 
diff --git a/reports/templates/sysctl.html.j2 b/reports/templates/sysctl.html.j2
index fb427a0..d9b524a 100644
--- a/reports/templates/sysctl.html.j2
+++ b/reports/templates/sysctl.html.j2
@@ -1,16 +1,16 @@
 <h3 class="fs-3">Sysctl</h3>
 
-{% for item in data['sysctl'] %}
-<div class="accordion" id="accordionSysctl">
+{% for item in data['sysctl']['file']['sysctl'] %}
+<div class="accordion accordion-flush" id="accordionSysctl">
   <div class="accordion-item">
     <h2 class="accordion-header">
       <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#{{ item['accordion-id'] }}" aria-expanded="true" aria-controls="collapseOne">
-        Accordion Item #1
+	{{ item }} <span class="text-bg-danger p-1" style="padding-left:10pt;padding-right:10pt;margin-left:15pt;">{{ data['sysctl']['file']['sysctl'][item]['result']['result'] }}</span>
       </button>
     </h2>
     <div id="{{ item['accordion-id'] }}" class="accordion-collapse collapse show" data-bs-parent="#accordionSysctl">
       <div class="accordion-body">
-        <strong></strong>
+        <strong>{{ data['sysctl']['file']['sysctl'][item]['description'] }}</strong>
       </div>
     </div>
   </div>