vname

app/backend/templates/backend/gen_report.html

@@ -9,13 +9,25 @@
 <h1>Please Click Dump API</h1>
 {% else %}
 <form class='my-2'>
-
-{% for sla in  slas %}
-<label class='me-3'>
-  <input type='checkbox' name='sla_name' value='{{ sla }}' {% if sla in request.GET.sla_name %}checked{% endif %}/>{{ sla }}
-</label>
-{% endfor %}
-<input type='submit' name='filter' Value='Filter' class='btn btn-primary ms-3' />
+  <div>
+    <h2>SLAs</h2>
+    {% for sla in  slas %}
+    <label class='me-3'>
+      <input type='checkbox' name='sla_name' value='{{ sla }}' {% if sla in sla_name %}checked{% endif %}/>{{ sla }}
+    </label>
+    {% endfor %}
+  </div>
+  <div>
+    <h2>Verifiers</h2>
+    {% for v in  vrs %}
+    <label class='me-3'>
+      <input type='checkbox' name='vr_name' value='{{ v }}' {% if v in vr_name %}checked{% endif %}/>{{ v }}
+    </label>
+    {% endfor %}
+  </div>
+  <br>
+  <a href="{{ request.path_info }}" class='btn btn-danger'>Reset</a>
+<input type='submit' name='filter' Value='Filter' class='btn btn-primary' />
 <input type='submit' name='genReport' value='Gen Report' class='btn btn-info' />
 {% if report_link %}
   <a href="{{ report_link }}" class='btn btn-link'>Download</a>

app/backend/views.py

@@ -261,7 +261,7 @@ def dump_fixed_results(request):
     temp = tt_json['result']
     for t in temp:
         tn = t['ids']['test_type_name']
-        r = exfo.call_remote_api('/API/REST/Test/v1/FixedResults/'+tn+'?sections=all&size=0&sort=verifier_id asc,time_stamp desc&time_range={"start":"1 days  ago","end":"now"}').json()
+        r = exfo.call_remote_api('/API/REST/Test/v1/FixedResults/'+tn+'?sections=all&size=0&sort=verifier_id asc,time_stamp desc&time_range={"start":"3 days  ago","end":"now"}').json()
         #pprint(r)
         try:
             r0 = r['result']
@@ -316,13 +316,13 @@ def gen_report_notebook():
         data.append(d)
     df0 = pd.DataFrame(data)
     df0 = df0.explode(["header", "results"])
-    df1 = df0[["header", "results", "dt", "sla_name", "test_display_name"]]
+    df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name"]]
     df1 = df1.query('sla_name == sla_name')
     #pprint(df1['sla_name'].unique())
     
     #df1['results_text'] = df1['results'].apply(con_human)
     df1['results_text'] = df1.apply(con_human, axis=1)
-    table = df1.pivot(index=['sla_name', 'dt'],columns=['test_display_name','header'], values='results_text').sort_values(by=['sla_name', 'dt'], ascending=[True, False])
+    table = df1.pivot(index=['sla_name', 'dt', 'verifier_name'],columns=['test_display_name','header'], values='results_text').sort_values(by=['sla_name', 'dt'], ascending=[True, False])
     table = table.dropna(how='all', axis=0)
     return (table,df1)
 
@@ -333,17 +333,25 @@ def gen_report(request):
    
     try:
         table,df = gen_report_notebook()
-    except:
+    except Exception as e:
+        messages.error(request, str(e))
         return render(request, 'backend/gen_report.html', {'dump_again': True})
     
     slas = list(df['sla_name'].unique())
+    vrs = list(df['verifier_name'].unique())
     sla_name = request.GET.getlist('sla_name')
+    vr_name = request.GET.getlist('vr_name')
     
     pprint("--- sla_name ---")
     pprint(sla_name)
     if len(sla_name) > 0:
         sla_filter = ", ".join(f"'{w}'" for w in sla_name)
         table = table.query(f"sla_name in ({sla_filter})")
+    
+    if len(vr_name) > 0:
+        vr_filter = ", ".join(f"'{w}'" for w in vr_name)
+        table = table.query(f"verifier_name in ({vr_filter})")
+    
     gen_report = request.GET.get('genReport', None)
     
     report_link = None
@@ -362,4 +370,4 @@ def gen_report(request):
         mk_address = []
     return render(request, 'backend/gen_report.html', {'tbl': table.head(20).to_html(\
         classes=["table", "table-striped", "table-bordered", "align-middle"],\
-        table_id="report_tbl"), 'slas': slas, 'report_link': report_link, 'mk_ips': mk_ips, 'mk_address': mk_address})
+        table_id="report_tbl"), 'slas': slas, 'report_link': report_link, 'mk_ips': mk_ips, 'mk_address': mk_address, 'vrs': vrs, 'sla_name': sla_name, 'vr_name': vr_name})