Download as
Browse Code »

Commit 34dd0453f1d06a38e62cfbfd9101b1c5db423830

Authored by fbormann
1 parent d9c91f9e
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

admin restriction, title is now uniform

Showing 3 changed files with 22 additions and 9 deletions   Show diff stats
amadeus/static/js/charts/home.js
  Diff comments   View file @34dd045
... ... @@ -18,7 +18,7 @@ var charts = {
18 18  
19 19  
20 20 var width = 600;
21   - var height = 480;
  21 + var height = 300;
22 22 var padding = 30;
23 23 var radius = Math.min(width, height) / 2 - padding;
24 24  
... ... @@ -43,7 +43,10 @@ var charts = {
43 43 .attr("x",0 )
44 44 .attr("y", -height/2 )
45 45 .style("font-size", "30px")
46   - .text("Recursos mais utilizados");
  46 + .text("Recursos mais utilizados")
  47 + .attr("fill", "#003333")
  48 + .style("font-weight", "bold")
  49 + .style("font-style", "italic");
47 50  
48 51  
49 52 var pie = d3.pie()
... ... @@ -86,7 +89,7 @@ var charts = {
86 89 build_bubble_user: function(url){
87 90 $.get(url, function(dataset){
88 91 var width = 600;
89   - var height = 480;
  92 + var height = 300;
90 93  
91 94  
92 95 function min(){
... ... @@ -132,7 +135,10 @@ var charts = {
132 135 .attr("x", width/2 )
133 136 .attr("y", 30)
134 137 .style("font-size", "30px")
135   - .text("Usuários mais ativos no Amadeus");
  138 + .text("Usuários mais ativos no Amadeus")
  139 + .attr("fill", "#003333")
  140 + .style("font-weight", "bold")
  141 + .style("font-style", "italic");
136 142  
137 143 var simulation = d3.forceSimulation()
138 144 .force("x", d3.forceX(width/2).strength(0.05))
... ... @@ -158,7 +164,7 @@ var charts = {
158 164  
159 165 .attr("fill", function(d){
160 166 //return color(d['count']);
161   - return 'url('+'#'+d['user']+')';
  167 + return 'url('+'#'+'user_'+d['user_id']+')';
162 168 });
163 169  
164 170  
... ... @@ -174,7 +180,7 @@ var charts = {
174 180  
175 181 defs.append("svg:pattern")
176 182 .attr("id", function(d){
177   - return d['user'];
  183 + return "user_"+d['user_id'];
178 184 })
179 185 .attr("width", function(d){
180 186 return radiusScale(d['count']);
... ...
subjects/templates/subjects/initial.html
  Diff comments   View file @34dd045
... ... @@ -82,7 +82,10 @@
82 82 </div>
83 83  
84 84 <div id="modal_subject"></div>
85   - <script type="text/javascript" src="{% static "js/charts/home.js" %}"></script>
  85 + {% if user.is_staff %}
  86 + <script type="text/javascript" src="{% static "js/charts/home.js" %}"></script>
  87 + {% endif %}
  88 +
86 89 <script type="text/javascript" src="{% static "subjects/js/modal_subject.js" %}"></script>
87 90 <script type="text/javascript" src="{% static 'js/category.js' %}"></script>
88 91 {% endblock content %}
89 92 \ No newline at end of file
... ...
users/views.py
  Diff comments   View file @34dd045
... ... @@ -525,8 +525,12 @@ def logout(request, next_page = None):
525 525  
526 526 def get_users_log(request):
527 527 fifty_users = Log.objects.values('user_id').annotate(count = Count('user_id')).order_by('-count')[:50]
528   -
529   - return JsonResponse(list(fifty_users.values('user_id','user','count')), safe=False)
  528 + fifty_users = list(fifty_users)
  529 + for user in fifty_users:
  530 + user_object = User.objects.get(id=user['user_id'])
  531 + user['image'] = user_object.image_url
  532 + user['user'] = user_object.social_name
  533 + return JsonResponse(fifty_users, safe=False)
530 534  
531 535  
532 536  
... ...