Download as
Browse Code »

Commit bcf2559ab547e76f983c70377377a26cacfabb4a

Authored by Felipe Bormann
1 parent de10b96f
Exists in master and in 2 other branches amadeus_univasf, refactoring

finished user charts

Showing 5 changed files with 33 additions and 5 deletions   Show diff stats
analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc
View file @bcf2559
No preview for this file type
analytics/static/analytics/general.css
  Diff comments   View file @bcf2559
@@ -77,6 +77,12 @@ @@ -77,6 +77,12 @@
77 .middle-chart article { 77 .middle-chart article {
78 text-align: center; } 78 text-align: center; }
79 79
  80 +.user-tooltip {
  81 + background: linear-gradient(#0e8999, #6bf0ce);
  82 + color: white;
  83 + border-radius: 10px;
  84 + padding: 7px; }
  85 +
80 .most-accessed-list { 86 .most-accessed-list {
81 background-color: #52b7bd; 87 background-color: #52b7bd;
82 width: 80%; 88 width: 80%;
analytics/static/analytics/general.css.map
  Diff comments   View file @bcf2559
1 { 1 {
2 "version": 3, 2 "version": 3,
3 -"mappings": "AAEA,YAAY;EACR,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,IAAI;;AAEf,sBAAsB;EAClB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACE,KAAK,EAbC,OAAO;EAejB,yBAAE;IACE,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,4BAAE;MACE,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MAEZ,yCAAY;QACR,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;MAEvB,gCAAG;QACC,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;;AAInC,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;;AAEvB,eAAe;EACX,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAEhB,UAAU;EACN,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,KAAK,EAAE,IAAI;;AAIf,SAAS;EACL,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;;AAGnB,mBAAmB;EACf,UAAU,EAAE,iCAAmC;;AAEnD,MAAM;EACF,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,SAAE;IACE,KAAK,EA1EC,OAAO;;AA4ErB,SAAS;EACL,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,GAAG;EACX,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,GAAG;EACjB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,iBAAiB;EAChC,WAAC;IACG,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;;AAInB,qBAAO;EACH,UAAU,EAAE,MAAM;;AAE1B,mBAAmB;EACf,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,GAAG;EACV,WAAW,EAAE,EAAE;EACf,UAAU,EAAE,EAAE;EACd,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,sDAAsD;EAElE,sBAAE;IACE,YAAY,EAAE,EAAE;;AAExB,yBAAyB;EACrB,gBAAgB,EAAE,OAAO", 3 +"mappings": "AAEA,YAAY;EACR,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,IAAI;;AAEf,sBAAsB;EAClB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACE,KAAK,EAbC,OAAO;EAejB,yBAAE;IACE,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,4BAAE;MACE,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MAEZ,yCAAY;QACR,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;MAEvB,gCAAG;QACC,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;;AAInC,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;;AAEvB,eAAe;EACX,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAEhB,UAAU;EACN,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,KAAK,EAAE,IAAI;;AAIf,SAAS;EACL,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;;AAGnB,mBAAmB;EACf,UAAU,EAAE,iCAAmC;;AAEnD,MAAM;EACF,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,SAAE;IACE,KAAK,EA1EC,OAAO;;AA4ErB,SAAS;EACL,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,GAAG;EACX,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,GAAG;EACjB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,IAAI;EAChB,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,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,sDAAsD;EAElE,sBAAE;IACE,YAAY,EAAE,EAAE;;AAExB,yBAAyB;EACrB,gBAAgB,EAAE,OAAO",
4 "sources": ["general.sass"], 4 "sources": ["general.sass"],
5 "names": [], 5 "names": [],
6 "file": "general.css" 6 "file": "general.css"
analytics/static/analytics/general.sass
  Diff comments   View file @bcf2559
@@ -91,6 +91,12 @@ $title-color: #009688 @@ -91,6 +91,12 @@ $title-color: #009688
91 article 91 article
92 text-align: center 92 text-align: center
93 93
  94 +.user-tooltip
  95 + background: linear-gradient( #0e8999, #6bf0ce)
  96 + color: white
  97 + border-radius: 10px
  98 + padding: 7px
  99 +
94 .most-accessed-list 100 .most-accessed-list
95 background-color: #52b7bd 101 background-color: #52b7bd
96 width: 80% 102 width: 80%
analytics/static/analytics/js/charts.js
  Diff comments   View file @bcf2559
@@ -187,22 +187,38 @@ var charts = { @@ -187,22 +187,38 @@ var charts = {
187 187
188 188
189 //Add texts to show user names 189 //Add texts to show user names
190 - groups.append("text") 190 + /*groups.append("text")
191 .text(function(d){ 191 .text(function(d){
192 return d['user'] +'('+ d['count'] + ')'; 192 return d['user'] +'('+ d['count'] + ')';
193 }).attr("fill", "#000000") 193 }).attr("fill", "#000000")
194 .attr("id", function(d){ 194 .attr("id", function(d){
195 return "user_tooltip_"+d['user_id']; 195 return "user_tooltip_"+d['user_id'];
196 - }).style("display", "none"); 196 + }).style("display", "none");*/
  197 +
  198 + var tooltip_div = d3.select("body").append("div")
  199 + .attr('class','user-tooltip')
  200 + .attr("display", "none")
  201 + .attr("height", 28)
  202 + .attr("width", 80)
  203 + .style("position", "absolute")
  204 + .style('pointer-events', 'none');
  205 +
  206 +
197 207
198 208
199 groups.on("mouseover", function(d){ 209 groups.on("mouseover", function(d){
200 - $("#"+"user_tooltip_"+d['user_id']).show(); 210 + //$("#"+"user_tooltip_"+d['user_id']).show();
  211 + tooltip_div.transition().duration(200).style("opacity", .9);
  212 + tooltip_div.html(d['user'] + '</br>' + d['count'] + ' acessos')
  213 + .style("left", (d3.event.pageX) + "px")
  214 + .style("top", (d3.event.pageY - 28) + "px");
  215 + console.log(d3.event.pageX);
  216 + console.log(d3.event.pageY);
201 }); 217 });
202 218
203 219
204 groups.on("mouseout", function(d){ 220 groups.on("mouseout", function(d){
205 - $("#"+"user_tooltip_"+d['user_id']).hide(); 221 + //$("#"+"user_tooltip_"+d['user_id']).hide();
206 }); 222 });
207 223
208 224