From e6d70e4f7be82e4d3e704d6e5549f92a1fc17fa3 Mon Sep 17 00:00:00 2001
From: terrtia <or1994@hotmail.fr>
Date: Tue, 27 Feb 2024 15:24:18 +0100
Subject: [PATCH] fix: [crawler] fix monthly crawled domains stats

---
 var/www/blueprints/crawler_splash.py          |  4 +-
 .../crawler/crawler_splash/last_crawled.html  | 99 ++++++++++---------
 2 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/var/www/blueprints/crawler_splash.py b/var/www/blueprints/crawler_splash.py
index b015b7c4..937ec732 100644
--- a/var/www/blueprints/crawler_splash.py
+++ b/var/www/blueprints/crawler_splash.py
@@ -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
diff --git a/var/www/templates/crawler/crawler_splash/last_crawled.html b/var/www/templates/crawler/crawler_splash/last_crawled.html
index eb756e08..66641848 100644
--- a/var/www/templates/crawler/crawler_splash/last_crawled.html
+++ b/var/www/templates/crawler/crawler_splash/last_crawled.html
@@ -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,30 +177,31 @@ function toggle_sidebar(){
 </script>
 
 <script>
-var margin = {top: 20, right: 90, bottom: 55, left: 0},
-				width = parseInt(d3.select('#' + 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);
-
-var y = d3.scaleLinear().rangeRound([height, 0]);
-
-var xAxis = d3.axisBottom(x);
-
-var yAxis = d3.axisLeft(y);
-
-var color = d3.scaleOrdinal(d3.schemeSet3);
-
-var svg = d3.select("#" + id).append("svg")
-				.attr("id", "thesvg")
-				.attr("viewBox", "0 0 "+width+" 500")
-				.attr("width",  width  + margin.left + margin.right)
-				.attr("height", height + margin.top  + margin.bottom)
-			.append("g")
-				.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
 
-function barchart_type_stack(url, id) {
+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,
+                    height = 500  - margin.top  - margin.bottom;
+    var x = d3.scaleBand().rangeRound([0, width]).padding(0.1);
+
+    var y = d3.scaleLinear().rangeRound([height, 0]);
+
+    var xAxis = d3.axisBottom(x);
+
+    var yAxis = d3.axisLeft(y);
+
+    var color = d3.scaleOrdinal(d3.schemeSet3);
+
+    var svg = d3.select(svg_id).append("svg")
+        .attr("id", "thesvg")
+        .attr("viewBox", "0 0 "+width+" 500")
+        .attr("width",  width  + margin.left + margin.right)
+        .attr("height", height + margin.top  + margin.bottom)
+        .append("g")
+        .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
   d3.json(url)
     .then(function(data){
@@ -281,29 +282,29 @@ function barchart_type_stack(url, id) {
 			drawLegend(varNames);
     });
 
-}
 
-function drawLegend (varNames) {
-    var legend = svg.selectAll(".legend")
-        .data(varNames.slice().reverse())
-      .enter().append("g")
-        .attr("class", "legend")
-        .attr("transform", function (d, i) { return "translate(0," + i * 20 + ")"; });
+    function drawLegend (varNames) {
+        var legend = svg.selectAll(".legend")
+            .data(varNames.slice().reverse())
+          .enter().append("g")
+            .attr("class", "legend")
+            .attr("transform", function (d, i) { return "translate(0," + i * 20 + ")"; });
 
-    legend.append("rect")
-        .attr("x", 943)
-        .attr("width", 10)
-        .attr("height", 10)
-        .style("fill", color)
-        .style("stroke", "grey");
+        legend.append("rect")
+            .attr("x", 943)
+            .attr("width", 10)
+            .attr("height", 10)
+            .style("fill", color)
+            .style("stroke", "grey");
 
-    legend.append("text")
-				.attr("class", "svgText")
-        .attr("x", 941)
-        .attr("y", 6)
-        .attr("dy", ".35em")
-        .style("text-anchor", "end")
-        .text(function (d) { return d; });
+        legend.append("text")
+                    .attr("class", "svgText")
+            .attr("x", 941)
+            .attr("y", 6)
+            .attr("dy", ".35em")
+            .style("text-anchor", "end")
+            .text(function (d) { return d; });
+    }
 }
 
 function removePopovers () {