CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

fix: [crawler] fix monthly crawled domains stats

dev
terrtia 2024-02-27 15:24:18 +01:00
parent 0d55725e28
commit e6d70e4f7b
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/www/blueprints/crawler_splash.py
View File

@ -306,10 +306,10 @@ def crawlers_last_domains_json():
stats.append(crawlers.get_crawlers_stats_by_day(date, domain_type))
return jsonify(stats)
@crawler_splash.route('/crawlers/last/domains/monthly/json')
@crawler_splash.route('/crawlers/last/domains/month/json')
@login_required
@login_read_only
def crawlers_last_domains_monthly_json():
def crawlers_last_domains_month_json():
domain_type = request.args.get('type')
if domain_type not in crawlers.get_crawler_all_types():
return jsonify({'error': 'Invalid domain type'}), 400

27
var/www/templates/crawler/crawler_splash/last_crawled.html
View File

@ -102,6 +102,7 @@
</div>
</div>
<h3>Month Stats:</h3>
<div id="barchart_type_month"></div>
</div>
@ -144,14 +145,13 @@ $(document).ready(function(){
$('#date-range-to-input').val(s2);
}
});
chart.stackBarChart = barchart_type_stack("{{ url_for('crawler_splash.crawlers_last_domains_json') }}?type={{type}}", '#barchart_type');
chart.stackBarChartMonth = barchart_type_stack("{{ url_for('crawler_splash.crawlers_last_domains_month_json') }}?type={{type}}", '#barchart_type_month');
chart.stackBarChart = barchart_type_stack("{{ url_for('crawler_splash.crawlers_last_domains_json') }}?type={{type}}", 'barchart_type');
chart.stackBarChartMonth = barchart_type_stack("{{ url_for('crawler_splash.crawlers_last_domains_monthly_json') }}?type={{type}}", 'barchart_type_month');
chart.onResize()
$(window).on("resize", function() {
chart.onResize();
});
//chart.onResize();
//$(window).on("resize", function() {
// chart.onResize();
//});
$('[data-toggle="popover"]').popover({
placement: 'top',
@ -177,8 +177,12 @@ function toggle_sidebar(){
</script>
<script>
function barchart_type_stack(url, svg_id) {
var margin = {top: 20, right: 90, bottom: 55, left: 0},
width = parseInt(d3.select('#' + id).style('width'), 10);
width = parseInt(d3.select(svg_id).style('width'), 10);
width = 1000 - margin.left - margin.right,
height = 500 - margin.top - margin.bottom;
var x = d3.scaleBand().rangeRound([0, width]).padding(0.1);
@ -191,7 +195,7 @@ var yAxis = d3.axisLeft(y);
var color = d3.scaleOrdinal(d3.schemeSet3);
var svg = d3.select("#" + id).append("svg")
var svg = d3.select(svg_id).append("svg")
.attr("id", "thesvg")
.attr("viewBox", "0 0 "+width+" 500")
.attr("width", width + margin.left + margin.right)
@ -199,9 +203,6 @@ var svg = d3.select("#" + id).append("svg")
.append("g")
.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
function barchart_type_stack(url, id) {
d3.json(url)
.then(function(data){
@ -281,7 +282,6 @@ function barchart_type_stack(url, id) {
drawLegend(varNames);
});
}
function drawLegend (varNames) {
var legend = svg.selectAll(".legend")
@ -305,6 +305,7 @@ function drawLegend (varNames) {
.style("text-anchor", "end")
.text(function (d) { return d; });
}
}
function removePopovers () {
$('.popover').each(function() {