fix some statistics bugs

Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>

app/assets/javascripts/management.js

@@ -25,14 +25,15 @@ $(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);
+  }
+  if (document.getElementById("n_teachers") !== null) {
 
     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"];
@@ -51,7 +52,7 @@ $(document).ready(function(){
              break;
            case "learning_objects":
              new Chart(ctx).Pie(data_learning_objects,pie_options);
-             var learning_objects_chart = new Chart(ctx).Pie(data_learnin_objects);
+             var learning_objects_chart = new Chart(ctx).Pie(data_learning_objects);
              break;
            case "accesses":
              new Chart(ctx).Line(data_accesses,line_options);
@@ -64,7 +65,7 @@ $(document).ready(function(){
       }
     }
   }
-});
+);
 
 Chart.defaults.global = {
     // Boolean - Whether to animate the chart

app/assets/javascripts/management/users.js

@@ -3,20 +3,20 @@
 //mais infos www.chartjs.org/docs/
 
 function dataUsers(teachers, curators, admins){
-var data_users = {
+var data = {
   labels: [ "Professores", "Curadores", "Admnistradores"],
  datasets: [
      {
          label: "My First dataset",
-         fillColor: "rgba(220,220,220,0.5)",
-         strokeColor: "rgba(220,220,220,0.8)",
-         highlightFill: "rgba(220,220,220,0.75)",
-         highlightStroke: "rgba(220,220,220,1)",
+         fillColor: "rgba(100,89,54,0.5)",
+         strokeColor: "rgba(1,34,65,0.8)",
+         highlightFill: "rgba(53,13,54,0.75)",
+         highlightStroke: "rgba(32,80,90,1)",
          data: [teachers, curators, admins]
      },
  ]
 };
-return data
+return data;
 
 }
 

app/controllers/management/statistics_controller.rb

@@ -35,6 +35,7 @@ class Management::StatisticsController < ManagementController
         @n_teachers +=1
       end
     end
+
   end
 
   def downloads
@@ -45,6 +46,7 @@ class Management::StatisticsController < ManagementController
     #usar o logstash e kibana
     #enquanto isso, uso o sign_in_count do ActiveRecord
     @total= User.sum("sign_in_count")
+  
 
   end
 
@@ -62,6 +64,7 @@ class Management::StatisticsController < ManagementController
     if @@flag == 0 || @@user != current_user
       @@user =  current_user
       @@flag = 1
+      set_statistics
     end
     @n_learning_objects = @@n_learning_objects
     @most_visualised = @@most_visualised
@@ -76,7 +79,7 @@ class Management::StatisticsController < ManagementController
     @@n_learning_objects = learning_object_repository.count_all || []
     @@n_non_visualised = learning_object_repository.get_number_of_non_visualised || []
     @@most_visualised = learning_object_repository.get_most_visualised || []
-    @@n_views = main_page_repository.get_number_of("Views") || []
+    @@n_views = learning_object_repository.get_number_of("Views") || []
    end
 
   def views

app/views/management/statistics/accesses.html.erb

@@ -14,7 +14,7 @@
   <div id="sending-stats" class="row">
     <div class="col-sm-6 col-md-12">
       <div class="ls-box">
-        <h6 class="ls-title-6">Total</h6>
+        <h6 class="ls-title-6">Total de acessos dos usuários</h6>
           <strong class="ls-color-theme"><%= @total %></strong>
       </div>
     </div>

app/views/management/statistics/learning_objects.html.erb

@@ -39,7 +39,7 @@
 
 
 <input type="hidden" id="lobject" value="<%= @n_learning_objects - @n_non_visualised %>"/>
-<input type="hidden" id="lobject_non" value="<%= @n_non_visualised %>"/>3
+<input type="hidden" id="lobject_non" value="<%= @n_non_visualised %>"/>
 
 
 

app/views/management/statistics/users.html.erb

@@ -20,7 +20,7 @@
       </div>
     </div>
 
-    <div class="col-sm-6 col-md-2">
+    <div class="col-sm-6 col-md-4">
       <div class="ls-box">
         <h6 class="ls-title-4">Professores</h6>
           <strong class="ls-color-theme"><%=@n_teachers%></strong>
@@ -29,20 +29,20 @@
     </div>
 
 
-        <div class="col-sm-6 col-md-2">
+        <div class="col-sm-6 col-md-4">
           <div class="ls-box">
             <h6 class="ls-title-4 ">Curadores</h6>
-              <strong class="ls-color-theme"><%@n_curators%></strong>
+              <strong class="ls-color-theme"><%=@n_curators%></strong>
 
               <%#= link_to "Mais detalhes" , management_statistics_acessos_path, class: "ls-btn ls-btn-sm" %>
           </div>
         </div>
 
 
-    <div class="col-sm-6 col-md-3">
+    <div class="col-sm-6 col-md-4">
       <div class="ls-box">
         <h6 class="ls-title-4 ">Administradores</h6>
-          <strong class="ls-color-theme"><%@n_admins%></strong>
+          <strong class="ls-color-theme"><%=@n_admins%></strong>
       </div>
     </div>