Tum лет назад: 2
Родитель
Сommit
7098c4d1a4
2 измененных файлов с 15 добавлено и 4 удалено
  1. 5 1
      app/backend/templates/backend/gen_report.html
  2. 10 3
      app/backend/views.py

+ 5 - 1
app/backend/templates/backend/gen_report.html

2
 {% load backend_tags %}
2
 {% load backend_tags %}
3
 {% block content %}
3
 {% block content %}
4
 <h2>Gen Report</h2>
4
 <h2>Gen Report</h2>
5
+<a class='btn btn-danger ms-3' href="{% url 'backend:dump_fixed_results' %}?redir={{ request.path_info }}">Dump API</a>
5
 <a href="#test_result" class='btn btn-link'>Test Result</a>
6
 <a href="#test_result" class='btn btn-link'>Test Result</a>
6
 <a href="#mikrotik" class='btn btn-link'>Mikrotik</a>
7
 <a href="#mikrotik" class='btn btn-link'>Mikrotik</a>
8
+{% if dump_again %}
9
+<h1>Please Click Dump API</h1>
10
+{% else %}
7
 <form class='my-2'>
11
 <form class='my-2'>
8
 
12
 
9
 {% for sla in  slas %}
13
 {% for sla in  slas %}
12
 </label>
16
 </label>
13
 {% endfor %}
17
 {% endfor %}
14
 <input type='submit' name='filter' Value='Filter' class='btn btn-primary ms-3' />
18
 <input type='submit' name='filter' Value='Filter' class='btn btn-primary ms-3' />
15
-<a class='btn btn-danger ms-3' href="{% url 'backend:dump_fixed_results' %}?redir={{ request.path_info }}">Dump API</a>
16
 <input type='submit' name='genReport' value='Gen Report' class='btn btn-info' />
19
 <input type='submit' name='genReport' value='Gen Report' class='btn btn-info' />
17
 {% if report_link %}
20
 {% if report_link %}
18
   <a href="{{ report_link }}" class='btn btn-link'>Download</a>
21
   <a href="{{ report_link }}" class='btn btn-link'>Download</a>
53
   text-align:center;
56
   text-align:center;
54
 }
57
 }
55
 </style>
58
 </style>
59
+{% endif %}
56
 {% endblock %}
60
 {% endblock %}

+ 10 - 3
app/backend/views.py

261
     temp = tt_json['result']
261
     temp = tt_json['result']
262
     for t in temp:
262
     for t in temp:
263
         tn = t['ids']['test_type_name']
263
         tn = t['ids']['test_type_name']
264
-        r = exfo.call_remote_api('/API/REST/Test/v1/FixedResults/'+tn+'?sections=all&size=20&sort=verifier_id asc,time_stamp desc&time_range={"start":"1 weeks  ago","end":"now"}').json()
264
+        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()
265
         #pprint(r)
265
         #pprint(r)
266
         try:
266
         try:
267
             r0 = r['result']
267
             r0 = r['result']
328
 
328
 
329
 def gen_report(request):
329
 def gen_report(request):
330
     pprint("report notebook ...")
330
     pprint("report notebook ...")
331
-    table,df = gen_report_notebook()
331
+    if request.GET.get('clear', None):
332
+        return redirect("/backend/dump_fixed_results/?redir=/backend/gen_report/")
333
+   
334
+    try:
335
+        table,df = gen_report_notebook()
336
+    except:
337
+        return render(request, 'backend/gen_report.html', {'dump_again': True})
338
+    
332
     slas = list(df['sla_name'].unique())
339
     slas = list(df['sla_name'].unique())
333
     sla_name = request.GET.getlist('sla_name')
340
     sla_name = request.GET.getlist('sla_name')
334
     
341
     
353
     except:
360
     except:
354
         mk_ips = []
361
         mk_ips = []
355
         mk_address = []
362
         mk_address = []
356
-    return render(request, 'backend/gen_report.html', {'tbl': table.to_html(\
363
+    return render(request, 'backend/gen_report.html', {'tbl': table.head(20).to_html(\
357
         classes=["table", "table-striped", "table-bordered", "align-middle"],\
364
         classes=["table", "table-striped", "table-bordered", "align-middle"],\
358
         table_id="report_tbl"), 'slas': slas, 'report_link': report_link, 'mk_ips': mk_ips, 'mk_address': mk_address})
365
         table_id="report_tbl"), 'slas': slas, 'report_link': report_link, 'mk_ips': mk_ips, 'mk_address': mk_address})