diff --git a/app/assets/images/colecoes.png b/app/assets/images/colecoes.png index c445958f284512ff08084306a1c6161392550a6f..79916b724793ff3c5555cdf93e8f210ced86d3be 100644 Binary files a/app/assets/images/colecoes.png and b/app/assets/images/colecoes.png differ diff --git a/app/assets/images/geral_acessos.png b/app/assets/images/geral_acessos.png new file mode 100644 index 0000000000000000000000000000000000000000..4dcfd193f51f2a8c723c252ac5bfabb60fe61142 Binary files /dev/null and b/app/assets/images/geral_acessos.png differ diff --git a/app/assets/images/geral_colecoes.png b/app/assets/images/geral_colecoes.png new file mode 100644 index 0000000000000000000000000000000000000000..d524a23bbb0989400bc6cc6d35556524d1367106 Binary files /dev/null and b/app/assets/images/geral_colecoes.png differ diff --git a/app/controllers/management/estatisticas_controller.rb b/app/controllers/management/estatisticas_controller.rb index 7318bb9616e5f1a6380d0d2af9e83600442f9230..c6c7a8647c5be905f3eadf1c4c09280fdc5700c1 100644 --- a/app/controllers/management/estatisticas_controller.rb +++ b/app/controllers/management/estatisticas_controller.rb @@ -40,6 +40,46 @@ class Management::EstatisticasController < ManagementController g.replace_colors(['green','yellow','black']) g.marker_count = 1 g.write("/home/alexandre/projetos/portalmec/app/assets/images/geral_download.png") + + g = Gruff::Line.new + g.title = "Colecoes" + g.data 'colecoes', [0, 55, 153, 220] + g.labels={ + 0 => '1', + 1 => '3', + 2 => '5', + 3 => '7', + 4 => '9' + } + g.theme = { + :colors => ['black', 'grey'], + :marker_color => 'grey', + :font_color => 'black', + :background_colors => 'transparent' + } + g.replace_colors(['green','yellow','black']) + g.marker_count = 1 + g.write("/home/alexandre/projetos/portalmec/app/assets/images/geral_colecoes.png") + + g = Gruff::Line.new + g.title = "Acessos" + g.data 'acessos', [0, 415, 388, 320, 577 ] + g.labels={ + 0 => '1', + 1 => '3', + 2 => '5', + 3 => '7', + 4 => '9' + } + g.theme = { + :colors => ['black', 'grey'], + :marker_color => 'grey', + :font_color => 'black', + :background_colors => 'transparent' + } + g.replace_colors(['green','yellow','black']) + g.marker_count = 1 + g.write("/home/alexandre/projetos/portalmec/app/assets/images/geral_acessos.png") end def usuarios @@ -79,7 +119,7 @@ class Management::EstatisticasController < ManagementController def colecoes g = Gruff::Bar.new - g.title = "Por disciplinas" + g.title = "Por disciplina" g.data 'Filosofia', 45 g.data 'Matemática', 92 g.data 'LÃngua Portuguesa', 78 diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..f601c8882476492c2eb6f77fd2ae22a429fc1ff5 --- /dev/null +++ b/app/controllers/management/users_controller.rb @@ -0,0 +1,4 @@ +class Management::UsersController < ManagementController + def index + end +end diff --git a/app/views/management/estatisticas/index.html.erb b/app/views/management/estatisticas/index.html.erb index b372d263062e790c286bc4cb99f37645494b5848..d02f5cc5a68f9daf9b1dd6f9b04d3ef1f1db2850 100644 --- a/app/views/management/estatisticas/index.html.erb +++ b/app/views/management/estatisticas/index.html.erb @@ -54,7 +54,7 @@ </div> <div style="float: left; margin-left:30px"> - <%= image_tag("geral_download.png", height:"220", :alt => "Image missing") %> + <%= image_tag("geral_colecoes.png", height:"220", :alt => "Image missing") %> </div> @@ -63,6 +63,6 @@ </div> <div style="float: left;margin-left:40px"> - <%= image_tag("geral_download.png", height:"220", :alt => "Image missing") %> + <%= image_tag("geral_acessos.png", height:"220", :alt => "Image missing") %> </div> </div> diff --git a/app/views/management/users/index.html.erb b/app/views/management/users/index.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..0e8d90ced95d69e7f8ba0f746cb7ed293aa959d8 --- /dev/null +++ b/app/views/management/users/index.html.erb @@ -0,0 +1,15 @@ +<h1><%= t("users") %></h1> +<br> +<div id="inventory-search"> + <%= form_tag management_users_path, method: 'get' do %> + <div class="flakes-search"> + <%= text_field_tag :search, params[:search], class: 'search-box search', placeholder: '', autofocus: '' %> + </div> + <% end %> + <div class="flakes-actions-bar"> + <%= link_to t("new_user"), {}, class: 'action button-gray smaller right' %> + </div> + + <%#= render 'data_table' %> + +</div> diff --git a/config/routes.rb b/config/routes.rb index 89de1a6ad97e2a92af716d061c3dce24d1f84063..8c6ecc4f9c69a3a706147928c919308ff933287e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,8 +15,7 @@ Rails.application.routes.draw do get 'management/estatisticas/acessos' => 'management/estatisticas#acessos' get 'management/estatisticas/downloads' => 'management/estatisticas#downloads' get 'management/denuncias' => 'management#denuncias' - get 'management/usuarios' => 'management#usuarios' - + get 'management/users' => 'management/users#index' get '/faq' => 'welcome#faq' get '/contato' => 'welcome#contact', as: 'contact' get '/denuncia' => 'welcome#complaint', as: 'complaint'