chart

catalog/templates/new/index.html

@@ -134,23 +134,23 @@
 				{
 					label: "{{d.label}}",
 					url: "{{d.url}}",
-			    		value: "{{d.value}}"
+					value: "{{d.value}}"
 				},
 			{% endfor %}
 			],
 			resize: true
-		    }).on('click', function(i, row){
+			}).on('click', function(i, row){
 					console.log(1,row);
 					document.location.href = "{% url 'news-list'%}?"+row.url;
 						});
 
 		 new Morris.Area({
-        element: 'morris-area-chart',
-        data: [
+	element: 'morris-area-chart',
+	data: [
 		{% for hh in histogram %}
 		{
 			date:"{{hh.date}}",
-	                {% for key,value in hh.data.items %}
+			{% for key,value in hh.data.items %}
 				{{key}}:{{value}},
 			{% endfor %}
 		}{% if not forloop.last %},{% endif %}

catalog/views.py

@@ -224,6 +224,7 @@ def index(request):
 	histogramsData  = [ { "date":d["day"].strftime("%Y-%m-%d"), "data":{ "total": d["count"]}} for d in dateCount ]
 	histogramsLabels = ["total"]
 #	return render(request,'index.html',{"form":form, "info":info, "donutChart":{}, "histogram": {}, "histogramsLabels":{}})
+	print(donutChart)
 	return render(request,'new/index.html',{"form":form, "info":info, "donutChart":donutChart, "histogram": histogramsData, "histogramsLabels":histogramsLabels})
 #-------------------------------------------------------------------------------
 def publisherList(request, type="all"):