diff --git a/app/controllers/management/statistics_controller.rb b/app/controllers/management/statistics_controller.rb index 602ef754609cfa3471c13f7caf17fe71e944f02d..88da106aa348881ee354b9c65f04588e419c0cdf 100644 --- a/app/controllers/management/statistics_controller.rb +++ b/app/controllers/management/statistics_controller.rb @@ -3,14 +3,17 @@ class Management::StatisticsController < ManagementController #before_action :set_statistics before_action :authenticate_user!, except: [:index, :show, :like] - @@flag = 0 + #inicialização, primeira query + @@flag = 0 def index + #a cada novo login atualiza as estatÃsticas if @@flag == 0 || @@user != current_user @@user = current_user set_statistics @@flag = 1 end + @n_users = @@n_users @n_collections = @@n_collections @n_non_visualised = @@n_non_visualised @@ -19,6 +22,19 @@ class Management::StatisticsController < ManagementController def users #missing roles + @n_users = User.count + @n_curators = 0 + @n_admins = 0 + @n_teachers = 0 + User.includes(:roles).all.each do |u| + if u.roles[0]["name"] == "curator" + @n_curators += 1 + elsif u.roles[0]["name"] == "admin" + @n_admins += 1 + elsif u.roles[0]["name"] == "teacher" + @n_teachers +=1 + end + end end def downloads @@ -27,6 +43,9 @@ class Management::StatisticsController < ManagementController def accesses #usar o logstash e kibana + #enquanto isso, uso o sign_in_count do ActiveRecord + @total= User.sum("sign_in_count") + end def collections @@ -46,7 +65,7 @@ class Management::StatisticsController < ManagementController def set_statistics - @@n_users = subject_repository.get_number_of("User") || [] + @@n_users = User.count @@n_collections = collection_repository.get_number_of_collections || [] @@n_learning_objects = learning_object_repository.get_number_of("learningObject") || [] @@n_non_visualised = learning_object_repository.get_number_of_non_visualised || [] diff --git a/app/views/management/statistics/accesses.html.erb b/app/views/management/statistics/accesses.html.erb index 24f59d864c6fb3dcb903bf749b55e50636a8342d..719510dcdd26f037326f0673acfe9cd484049c3d 100644 --- a/app/views/management/statistics/accesses.html.erb +++ b/app/views/management/statistics/accesses.html.erb @@ -21,6 +21,9 @@ </div> </div> +<li><h2>TOTAL:<%=@total%></h2></li> + + <div align="center"> <canvas id="accesses" width="400" height="350"></canvas> </div> diff --git a/app/views/management/statistics/users.html.erb b/app/views/management/statistics/users.html.erb index 237fd288d86516e4dcb0e487d270c6ef1034a235..6571c246b4870f79396a0e8c4382bdf3f0ac5767 100644 --- a/app/views/management/statistics/users.html.erb +++ b/app/views/management/statistics/users.html.erb @@ -14,22 +14,16 @@ <div class="col-sm-6 col-md-12"> <div class="ls-box"> <h6 class="ls-title-6">Total</h6> - <strong class="ls-color-theme">70</strong> + <strong class="ls-color-theme"><%=@n_users%></strong> <!--<small>envios por mês</small>--> <%#= link_to "Mais detalhes" , management_statistics_users_path, class: "ls-btn ls-btn-sm" %> </div> </div> - <div class="col-sm-6 col-md-3"> - <div class="ls-box"> - <h6 class="ls-title-4">Estudantes</h6> - <strong class="ls-color-theme">20</strong> - <%#= link_to "Mais detalhes" , management_statistics_colections_path, class: "ls-btn ls-btn-sm" %> - </div> - </div> + <div class="col-sm-6 col-md-2"> <div class="ls-box"> <h6 class="ls-title-4">Professores</h6> - <strong class="ls-color-theme">42</strong> + <strong class="ls-color-theme"><%=@n_teachers%></strong> <%#= link_to "Mais detalhes" , management_statistics_downloads_path, class: "ls-btn ls-btn-sm" %> </div> </div> @@ -38,29 +32,17 @@ <div class="col-sm-6 col-md-2"> <div class="ls-box"> <h6 class="ls-title-4 ">Curadores</h6> - <strong class="ls-color-theme">4</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-2"> - <div class="ls-box"> - <h6 class="ls-title-4 ">Moderadores</h6> - <strong class="ls-color-theme">3</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="ls-box"> <h6 class="ls-title-4 ">Administradores</h6> - <strong class="ls-color-theme">1</strong> + <strong class="ls-color-theme"><%@n_admins%></strong> </div> </div>