AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-26 15:57:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [crawler] fix monthly crawled domains stats

Browse source
This commit is contained in:
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)) stats.append(crawlers.get_crawlers_stats_by_day(date, domain_type))
return jsonify(stats) return jsonify(stats)
@crawler_splash.route('/crawlers/last/domains/monthly/json') @crawler_splash.route('/crawlers/last/domains/month/json')
@login_required @login_required
@login_read_only @login_read_only
def crawlers_last_domains_monthly_json(): def crawlers_last_domains_month_json():
domain_type = request.args.get('type') domain_type = request.args.get('type')
if domain_type not in crawlers.get_crawler_all_types(): if domain_type not in crawlers.get_crawler_all_types():
return jsonify({'error': 'Invalid domain type'}), 400 return jsonify({'error': 'Invalid domain type'}), 400

41
var/www/templates/crawler/crawler_splash/last_crawled.html
View file

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