diff --git a/analytics/static/.sass-cache/01cecb7b42e56765f6ed49ed3c70281ebdc742c7/general.sassc b/analytics/static/.sass-cache/01cecb7b42e56765f6ed49ed3c70281ebdc742c7/general.sassc
index 3eb15c2..e51246b 100644
Binary files a/analytics/static/.sass-cache/01cecb7b42e56765f6ed49ed3c70281ebdc742c7/general.sassc and b/analytics/static/.sass-cache/01cecb7b42e56765f6ed49ed3c70281ebdc742c7/general.sassc differ
diff --git a/analytics/static/analytics/general.css b/analytics/static/analytics/general.css
index 711e509..0ab1b65 100644
--- a/analytics/static/analytics/general.css
+++ b/analytics/static/analytics/general.css
@@ -47,8 +47,7 @@
color: #ffffff; }
.tag-name {
- color: #ffffff;
- font-size: 10px; }
+ color: #ffffff; }
#left-data-selector {
background: linear-gradient(#0e8999, #6bf0ce);
diff --git a/analytics/static/analytics/general.css.map b/analytics/static/analytics/general.css.map
index f0cebb3..647f53a 100644
--- a/analytics/static/analytics/general.css.map
+++ b/analytics/static/analytics/general.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AAEA,YAAY;EACR,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;;AAE7B,sBAAsB;EAClB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACE,KAAK,EAdC,OAAO;EAgBjB,yBAAE;IACE,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,aAAa,EAAE,GAAG;IAElB,4BAAE;MACE,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MACZ,SAAS,EAAE,IAAI;MACf,gBAAgB,EAAE,OAAO;MACzB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,aAAa,EAAE,IAAI;MACnB,MAAM,EAAE,IAAI;IAGhB,qCAAW;MACP,gBAAgB,EAAE,OAAO;MACzB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,aAAa,EAAE,IAAI;;AAM/B,sBAAsB;EAClB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,IAAI;EAEhB,yBAAE;IACE,WAAW,EAAE,EAAE;;AAGvB,UAAU;EACN,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAKlB,SAAS;EACL,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;;AAGnB,mBAAmB;EACf,UAAU,EAAE,iCAAmC;EAC/C,UAAU,EAAE,EAAE;EACd,WAAW,EAAE,EAAE;EACf,cAAc,EAAE,EAAE;;AAEtB,MAAM;EACF,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,SAAE;IACE,KAAK,EA9EC,OAAO;;AAgFrB,SAAS;EACL,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,GAAG;EACjB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,GAAG;EACf,aAAa,EAAE,iBAAiB;EAChC,WAAC;IACG,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;;AAInB,qBAAO;EACH,UAAU,EAAE,MAAM;;AAE1B,aAAa;EACT,UAAU,EAAE,iCAAkC;EAC9C,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;;AAEhB,mBAAmB;EACf,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,GAAG;EACV,WAAW,EAAE,EAAE;EACf,UAAU,EAAE,EAAE;EACd,QAAQ,EAAE,QAAQ;EAClB,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,iBAAiB;EACzB,UAAU,EAAE,sDAAsD;EAElE,sBAAE;IACE,YAAY,EAAE,EAAE;;AAExB,qDAAqD;EACjD,MAAM,EAAE,IAAI;EACZ,IAAI,EAAE,GAAG;EACT,MAAM,EAAE,iBAAiB;EACzB,OAAO,EAAE,GAAG;EACZ,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,CAAC;EACR,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,IAAI;;AAGxB,0BAA0B;EACtB,YAAY,EAAE,IAAI;EAClB,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,sBAAsB;EACpC,mBAAmB,EAAE,OAAO;;AAEhC,yBAAyB;EACrB,gBAAgB,EAAE,OAAO",
+"mappings": "AAEA,YAAY;EACR,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;;AAE7B,sBAAsB;EAClB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACE,KAAK,EAdC,OAAO;EAgBjB,yBAAE;IACE,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,aAAa,EAAE,GAAG;IAElB,4BAAE;MACE,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MACZ,SAAS,EAAE,IAAI;MACf,gBAAgB,EAAE,OAAO;MACzB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,aAAa,EAAE,IAAI;MACnB,MAAM,EAAE,IAAI;IAGhB,qCAAW;MACP,gBAAgB,EAAE,OAAO;MACzB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,aAAa,EAAE,IAAI;;AAM/B,sBAAsB;EAClB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,IAAI;EAEhB,yBAAE;IACE,WAAW,EAAE,EAAE;;AAGvB,UAAU;EACN,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAKlB,SAAS;EACL,KAAK,EAAE,OAAO;;AAGlB,mBAAmB;EACf,UAAU,EAAE,iCAAmC;EAC/C,UAAU,EAAE,EAAE;EACd,WAAW,EAAE,EAAE;EACf,cAAc,EAAE,EAAE;;AAEtB,MAAM;EACF,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,SAAE;IACE,KAAK,EA7EC,OAAO;;AA+ErB,SAAS;EACL,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,GAAG;EACjB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,GAAG;EACf,aAAa,EAAE,iBAAiB;EAChC,WAAC;IACG,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;;AAInB,qBAAO;EACH,UAAU,EAAE,MAAM;;AAE1B,aAAa;EACT,UAAU,EAAE,iCAAkC;EAC9C,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;;AAEhB,mBAAmB;EACf,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,GAAG;EACV,WAAW,EAAE,EAAE;EACf,UAAU,EAAE,EAAE;EACd,QAAQ,EAAE,QAAQ;EAClB,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,iBAAiB;EACzB,UAAU,EAAE,sDAAsD;EAElE,sBAAE;IACE,YAAY,EAAE,EAAE;;AAExB,qDAAqD;EACjD,MAAM,EAAE,IAAI;EACZ,IAAI,EAAE,GAAG;EACT,MAAM,EAAE,iBAAiB;EACzB,OAAO,EAAE,GAAG;EACZ,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,CAAC;EACR,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,IAAI;;AAGxB,0BAA0B;EACtB,YAAY,EAAE,IAAI;EAClB,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,sBAAsB;EACpC,mBAAmB,EAAE,OAAO;;AAEhC,yBAAyB;EACrB,gBAAgB,EAAE,OAAO",
"sources": ["general.sass"],
"names": [],
"file": "general.css"
diff --git a/analytics/static/analytics/general.sass b/analytics/static/analytics/general.sass
index 5bc340a..b4757e6 100644
--- a/analytics/static/analytics/general.sass
+++ b/analytics/static/analytics/general.sass
@@ -63,7 +63,6 @@ $title-color: #009688
.tag-name
color: #ffffff
- font-size: 10px
#left-data-selector
diff --git a/analytics/static/analytics/js/behavior.js b/analytics/static/analytics/js/behavior.js
index b4feb00..29bf25a 100644
--- a/analytics/static/analytics/js/behavior.js
+++ b/analytics/static/analytics/js/behavior.js
@@ -1,4 +1,6 @@
+
+
$(document).ready(function(){
selectors_options.init();
@@ -6,12 +8,14 @@ $(document).ready(function(){
$('#month_selector').change(function(){
$.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){
- console.log(data);
charts.month_heatmap(data);
});
});
+
+ $('#datetimepicker1').datetimepicker();
+
});
diff --git a/analytics/static/analytics/js/charts.js b/analytics/static/analytics/js/charts.js
index 740c5c3..a9e4dda 100644
--- a/analytics/static/analytics/js/charts.js
+++ b/analytics/static/analytics/js/charts.js
@@ -348,27 +348,7 @@ var charts = {
var width = 800;
var height = 300;
- function min(){
- minimum = 100000000000;
- for(var i = 0; i < dataset.length; i++){
- if (dataset[i]['count'] < min){
- minimum = dataset[i]['count'];
- }
- }
-
- return minimum
- }
-
- function max(){
- maximum = 0;
- for(var i = 0; i < dataset.length; i++){
- if (dataset[i]['count'] > max){
- maximum = dataset[i]['count'];
- }
- }
-
- return maximum
- }
+
var container_div = d3.select("#most-used-tags-body");
@@ -378,8 +358,8 @@ var charts = {
.style("background","#ddf8e7")
.append('g')
.attr("transform", "translate(0,0)")
- .style("width", width)
- .attr("height", height);
+ .attr("width", "100%")
+ .attr("height", height - 60);
var color = d3.scaleLinear()
@@ -392,7 +372,8 @@ var charts = {
return Math.floor(Math.random() * (max - min)) + min;
}
- var xScale = d3.scaleSqrt().domain([min(), max()]).range([10,80]);
+ var xScale = d3.scaleSqrt().domain([d3.min(dataset, function(d){ return d['count']}),
+ d3.max(dataset, function(d){ return d.count; })]).range([100,200]);
var tag_cloud = svg.selectAll('.tag-cloud-div')
.data(dataset)
.enter()
@@ -420,23 +401,29 @@ var charts = {
.text(function(d){
return d['name'];
})
+ .attr("text-anchor", "middle")
.attr("x", function(d){
- return xScale(d['count'])*0.2;
+ return xScale(d['count'])*1.2/2;
})
.attr("y", function(d){
- return xScale(d["count"])*0.2;
+ return xScale(d["count"])*0.4/2;
})
.attr("class", "tag-name")
- .attr("fill", "#ffffff");
+ .attr("fill", "#ffffff")
+ .style("font-size", function(d){
+ return xScale(d["count"])*0.1 + "px";
+ });
var simulation = d3.forceSimulation()
.force("x", d3.forceX(width/2).strength(0.05))
.force("y", d3.forceY(height/2).strength(0.05))
- .force("collide", d3.forceCollide(function(d){
- return xScale(d['count'])*0.4;
- }));
-
+ .force("charge", d3.forceManyBody().strength(-120).distanceMax(300)
+ .distanceMin(0));
+ /*
+ .force("collide", d3.forceCollide(function(d){
+ return xScale(d['count'])*0.3;
+ }))*/
//simulation
simulation.nodes(dataset)
.on('tick', ticked); //so all data points are attached to it
diff --git a/analytics/templates/analytics/general.html b/analytics/templates/analytics/general.html
index 82df770..cd45884 100644
--- a/analytics/templates/analytics/general.html
+++ b/analytics/templates/analytics/general.html
@@ -7,6 +7,7 @@
{% endblock style %}
{% block javascript %}
+
{% endblock javascript %}
@@ -102,9 +103,19 @@
+
+
+
diff --git a/analytics/views.py b/analytics/views.py
index 432c92b..8d78766 100644
--- a/analytics/views.py
+++ b/analytics/views.py
@@ -57,14 +57,13 @@ def most_used_tags(request):
data[tag.name]['count'] = resources_count
data = sorted(data.values(), key = lambda x: x['count'], reverse=True )
- data = data[:30] #get top 30 tags
+ data = data[:15] #get top 30 tags
return JsonResponse(data, safe= False)
def most_active_users_in_a_month(request):
params = request.GET
days = get_days_of_the_month(params['month'])
- print(days)
data = {}
mappings = {_('January'): 1, _('February'): 2, _('March'): 3, _('April'): 4, _('May'): 5, _('June'): 6, _('July'): 7
, _('August'): 8, _('September'): 9, _('October'): 10, _('November'): 11, _('December'): 12}
@@ -164,8 +163,6 @@ def get_days_of_the_month(month):
#get current year
year = date.today().year
- print(year)
- print(month)
mappings = {_('January'): 1, _('February'): 2, _('March'): 3, _('April'): 4, _('May'): 5, _('June'): 6, _('July'): 7
, _('August'): 8, _('September'): 9, _('October'): 10, _('November'): 11, _('December'): 12}
--
libgit2 0.21.2