From 852e5721701deebe6831d50d268e4d09b8ded781 Mon Sep 17 00:00:00 2001
From: Alexandre Arias <apa13@inf.ufpr.br>
Date: Fri, 13 Nov 2015 10:39:45 -0200
Subject: [PATCH] update users statistics

Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>
---
 app/assets/javascripts/management.js                  | 11 +++++++++--
 app/assets/javascripts/management/users.js            | 11 +++++++++--
 app/controllers/management/statistics_controller.rb   |  5 +++++
 app/views/management/statistics/collections.html.erb  |  2 +-
 .../management/statistics/learning_objects.html.erb   |  5 ++++-
 app/views/management/statistics/users.html.erb        |  3 +++
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/management.js b/app/assets/javascripts/management.js
index 39015ad5..15c07141 100644
--- a/app/assets/javascripts/management.js
+++ b/app/assets/javascripts/management.js
@@ -19,15 +19,22 @@
 //= require locastyle
 //= require turbolinks
 //= require_tree ./management
-
+var teachers, curators, admins;
 var visualised,non_visualised;
 $(document).ready(function(){
   if (document.getElementById("lobject") !== null) {
     visualised = document.getElementById("lobject").value;
     non_visualised = document.getElementById("lobject_non").value;
-
+    
     var data_learning_objects = dataLearningObjects(visualised,non_visualised);
 
+    teachers = document.getElementById("n_teachers").value;
+    curators = document.getElementById("n_curators").value;
+    admins = document.getElementById("n_admins").value;
+
+    var data_users = dataUsers(teachers,curators,admins);
+
+
     var charts = ["colections","users","learning_objects","accesses"];
 
     for(i=0;i<charts.length;i++) {
diff --git a/app/assets/javascripts/management/users.js b/app/assets/javascripts/management/users.js
index 00e4ca15..375d75a6 100644
--- a/app/assets/javascripts/management/users.js
+++ b/app/assets/javascripts/management/users.js
@@ -1,8 +1,10 @@
 
 //Configurações de gráficos BAR
 //mais infos www.chartjs.org/docs/
+
+function dataUsers(teachers, curators, admins){
 var data_users = {
-  labels: ["Estudantes", "Professores", "Moderadores", "Admnistradores"],
+  labels: [ "Professores", "Curadores", "Admnistradores"],
  datasets: [
      {
          label: "My First dataset",
@@ -10,10 +12,15 @@ var data_users = {
          strokeColor: "rgba(220,220,220,0.8)",
          highlightFill: "rgba(220,220,220,0.75)",
          highlightStroke: "rgba(220,220,220,1)",
-         data: [20,42,7,1]
+         data: [teachers, curators, admins]
      },
  ]
 };
+return data
+
+}
+
+
 
 
 var bar_options = {
diff --git a/app/controllers/management/statistics_controller.rb b/app/controllers/management/statistics_controller.rb
index cd9c99ad..6bd679f4 100644
--- a/app/controllers/management/statistics_controller.rb
+++ b/app/controllers/management/statistics_controller.rb
@@ -49,6 +49,11 @@ class Management::StatisticsController < ManagementController
   end
 
   def collections
+    if @@flag == 0 || @@user != current_user
+      @@user =  current_user
+      set_statistics
+      @@flag = 1
+    end
     @n_collections = @@n_collections || []
   end
 
diff --git a/app/views/management/statistics/collections.html.erb b/app/views/management/statistics/collections.html.erb
index 0da808d5..9d4c571d 100644
--- a/app/views/management/statistics/collections.html.erb
+++ b/app/views/management/statistics/collections.html.erb
@@ -14,7 +14,7 @@
     <div class="col-sm-6 col-md-12">
       <div class="ls-box">
         <h6 class="ls-title-6">Total</h6>
-          <strong class="ls-color-theme">348</strong>
+          <strong class="ls-color-theme"><%= @n_collections %></strong>
       </div>
     </div>
   </div>
diff --git a/app/views/management/statistics/learning_objects.html.erb b/app/views/management/statistics/learning_objects.html.erb
index 75032560..e4712af2 100644
--- a/app/views/management/statistics/learning_objects.html.erb
+++ b/app/views/management/statistics/learning_objects.html.erb
@@ -36,8 +36,11 @@
 </div>
 </div>
 
+
+
 <input type="hidden" id="lobject" value="<%= @n_learning_objects - @n_non_visualised %>"/>
-<input type="hidden" id="lobject_non" value="<%= @n_non_visualised %>"/>
+<input type="hidden" id="lobject_non" value="<%= @n_non_visualised %>"/>3
+
 
 
 <div>
diff --git a/app/views/management/statistics/users.html.erb b/app/views/management/statistics/users.html.erb
index 6571c246..8a00f7b8 100644
--- a/app/views/management/statistics/users.html.erb
+++ b/app/views/management/statistics/users.html.erb
@@ -63,6 +63,9 @@
 </div>
 </div>
 
+<input type="hidden" id="n_teachers" value="<%= @n_teachers %>"/>
+<input type="hidden" id="n_curators" value="<%= @n_curators %>"/>
+<input type="hidden" id="n_admins" value="<%= @n_admins %>"/>
 
 <div align="center">
   <canvas id="users" width="400" height="350"> </canvas>
-- 
GitLab