Download as
Browse Code »

Commit 3e7ba4fca7f21a3c58b20df39e3f533b1b3669d9

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

added tooltip for heatmap calendar items

Showing 7 changed files with 37 additions and 8 deletions   Show diff stats
analytics/static/analytics/general.css
  Diff comments   View file @3e7ba4f
@@ -119,4 +119,11 @@ @@ -119,4 +119,11 @@
119 text-align: center; 119 text-align: center;
120 color: #009688; } 120 color: #009688; }
121 121
  122 +.date-tooltip {
  123 + width: 40px;
  124 + height: 20px;
  125 + background: #52b7bd;
  126 + color: white;
  127 + text-align: center; }
  128 +
122 /*# sourceMappingURL=general.css.map */ 129 /*# sourceMappingURL=general.css.map */
analytics/static/analytics/general.css.map
  Diff comments   View file @3e7ba4f
1 { 1 {
2 "version": 3, 2 "version": 3,
3 -"mappings": "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", 3 +"mappings": "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",
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 @3e7ba4f
@@ -139,4 +139,11 @@ $title-color: #009688 @@ -139,4 +139,11 @@ $title-color: #009688
139 139
140 #month_selector_div 140 #month_selector_div
141 text-align: center 141 text-align: center
142 - color: #009688  
143 \ No newline at end of file 142 \ No newline at end of file
  143 + color: #009688
  144 +
  145 +.date-tooltip
  146 + width: 40px
  147 + height: 20px
  148 + background: #52b7bd
  149 + color: white
  150 + text-align: center
144 \ No newline at end of file 151 \ No newline at end of file
analytics/static/analytics/js/charts.js
  Diff comments   View file @3e7ba4f
@@ -438,16 +438,18 @@ var charts = { @@ -438,16 +438,18 @@ var charts = {
438 }, 438 },
439 month_heatmap: function(data, target, div_target){ 439 month_heatmap: function(data, target, div_target){
440 440
441 - 441 +
442 442
443 443
444 if($('#'+div_target).lenght != 0 ){ 444 if($('#'+div_target).lenght != 0 ){
445 $('#'+div_target).fadeOut(); 445 $('#'+div_target).fadeOut();
446 $('#'+div_target).remove(); 446 $('#'+div_target).remove();
447 } 447 }
  448 + var width = 300;
  449 + var height = 200;
448 var svg = d3.select(target).append('svg') 450 var svg = d3.select(target).append('svg')
449 - .attr('width', 300)  
450 - .attr('height', 200); 451 + .attr('width', width)
  452 + .attr('height', height);
451 453
452 svg.attr('id', div_target); 454 svg.attr('id', div_target);
453 455
@@ -485,6 +487,19 @@ var charts = { @@ -485,6 +487,19 @@ var charts = {
485 return rect_height*(Math.floor( i / 7)) + rect_height/2; 487 return rect_height*(Math.floor( i / 7)) + rect_height/2;
486 }); 488 });
487 489
  490 + rects.on('mouseover', function(d, i){
  491 + tooltip = d3.select(target)
  492 + .append('div')
  493 + .attr('class', 'date-tooltip')
  494 + .style("left", ((d3.event.pageX) - width/2) + "px")
  495 + .style("top", ((d3.event.pageY) - height/2) + "px")
  496 + .style("position", "absolute")
  497 + .html(d['count'])
  498 + });
  499 +
  500 + rects.on('mouseout', function(){
  501 + tooltip.remove();
  502 + })
488 } 503 }
489 } 504 }
490 505
dashboards/templates/dashboards/category.html
  Diff comments   View file @3e7ba4f
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <li> 28 <li>
29 {% trans "Platform Report" %} 29 {% trans "Platform Report" %}
30 </li> 30 </li>
31 - <a href=""><li class="active"> 31 + <a href="{% url 'dashboards:' %}"><li class="active">
32 {% trans "Category Report" %} 32 {% trans "Category Report" %}
33 </li></a> 33 </li></a>
34 <li> 34 <li>
dashboards/templates/dashboards/general.html
  Diff comments   View file @3e7ba4f
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <section id="core-subjects-options-div"> 25 <section id="core-subjects-options-div">
26 <nav> 26 <nav>
27 <ul class="core-subjects-options report-menu-choice"> 27 <ul class="core-subjects-options report-menu-choice">
28 - 28 +
29 <li class="active"> 29 <li class="active">
30 {% trans "Platform Report" %} 30 {% trans "Platform Report" %}
31 </li> 31 </li>
dashboards/urls.py
  Diff comments   View file @3e7ba4f
@@ -3,6 +3,6 @@ from . import views @@ -3,6 +3,6 @@ from . import views
3 3
4 4
5 urlpatterns = [ 5 urlpatterns = [
6 - url(r'^view/general/$', views.GeneralView.as_view(), name='view_general'), 6 + url(r'^general/$', views.GeneralView.as_view(), name='view_general'),
7 7
8 ] 8 ]
9 \ No newline at end of file 9 \ No newline at end of file