From 89f3da25b93c8e5e237bc9554314a63a8b054684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?= Date: Wed, 20 Jun 2018 12:01:58 +0200 Subject: [PATCH] Implements #138 and #139 Implements graph with supports for the given period. --- app/assets/javascripts/dashboard_graphs.js | 123 +++++++++++++++++ app/assets/javascripts/stats.js.coffee | 2 +- app/assets/stylesheets/application.scss | 1 - app/assets/stylesheets/proposal.scss | 38 ++++++ .../stylesheets/proposals_dashboard.scss | 127 ------------------ .../proposals_dashboard_controller.rb | 9 ++ app/services/proposal_supports_query.rb | 50 +++++++ app/views/layouts/_header.html.erb | 19 +-- app/views/layouts/application.html.erb | 4 +- .../layouts/proposals_dashboard.html.erb | 18 ++- app/views/proposals_dashboard/_menu.html.erb | 99 ++++++++++++++ app/views/proposals_dashboard/index.html.erb | 119 +--------------- app/views/proposals_dashboard/stats.html.erb | 20 +++ config/initializers/assets.rb | 1 + config/locales/en/general.yml | 14 +- config/locales/es/general.yml | 14 +- config/routes/proposal.rb | 2 + 17 files changed, 398 insertions(+), 262 deletions(-) create mode 100644 app/assets/javascripts/dashboard_graphs.js delete mode 100644 app/assets/stylesheets/proposals_dashboard.scss create mode 100644 app/services/proposal_supports_query.rb create mode 100644 app/views/proposals_dashboard/_menu.html.erb create mode 100644 app/views/proposals_dashboard/stats.html.erb diff --git a/app/assets/javascripts/dashboard_graphs.js b/app/assets/javascripts/dashboard_graphs.js new file mode 100644 index 000000000..75de05bca --- /dev/null +++ b/app/assets/javascripts/dashboard_graphs.js @@ -0,0 +1,123 @@ +//= require d3 +//= require c3 +//= require c3ext + +(function(){ + 'use strict'; + + var ProposalGraph = function(url) { + this.url = url; + this.targetId = null; + this.groupBy = null; + this.progressLabel = 'Progress'; + this.supportsLabel = 'Supports'; + }; + + ProposalGraph.prototype.refresh = function() { + $.ajax({ + url: this.url, + cache: false, + success: function (data) { + this.draw(data); + }.bind(this), + data: { + group_by: this.groupBy + } + }); + }; + + ProposalGraph.prototype.draw = function(data) { + var xColumnValues = [ 'x' ], + progressColumnValues = [ this.progressLabel ], // [ '<%= t('.progress') %>' ], + key; + + for (key in data) { + if (data.hasOwnProperty(key)) { + xColumnValues.push(key); + progressColumnValues.push(data[key]); + } + } + + c3.generate({ + bindto: '#' + this.targetId, + data: { + x: 'x', + columns: [ + xColumnValues, + progressColumnValues + ] + }, + axis: { + y: { + label: { + text: this.supportsLabel, // '<%= t '.supports' %> ', + position: 'outer-middle' + } + }, + x: { + type: 'category' + } + } + }); + }; + + $(document).ready(function () { + $('[data-proposal-graph-url]').each(function () { + var graph = new ProposalGraph($(this).data('proposal-graph-url')); + graph.targetId = $(this).attr('id'); + graph.groupBy = $(this).data('proposal-graph-group-by'); + graph.progressLabel = $(this).data('proposal-graph-progress-label'); + graph.supportsLabel = $(this).data('proposal-graph-supports-label'); + + graph.refresh(); + }); + }); +})(); + +// function drawProposalGraph(data) { +// var xColumnValues = [ 'x' ], +// progressColumnValues = [ 'Progreso' ]; // [ '<%= t('.progress') %>' ], +// key; +// +// for (key in data) { +// if (data.hasOwnProperty(key)) { +// xColumnValues.push(key); +// progressColumnValues.push(data[key]); +// } +// } +// +// c3.generate({ +// bindto: '#proposal-graph', +// data: { +// x: 'x', +// columns: [ +// xColumnValues, +// progressColumnValues +// ] +// }, +// axis: { +// y: { +// label: { +// text: 'Apoyos', // '<%= t '.supports' %> ', +// position: 'outer-middle' +// } +// }, +// x: { +// type: 'category' +// } +// } +// }); +// } +// +// $(document).ready(function () { +// $.ajax({ +// url: '<%= supports_proposal_dashboard_index_path(proposal, format: :json) %>', +// cache: false, +// success: function (data) { +// drawProposalGraph(data); +// }, +// data: { +// group_by: '<%= params[:group_by] %>' +// } +// }); +// }); diff --git a/app/assets/javascripts/stats.js.coffee b/app/assets/javascripts/stats.js.coffee index 7fcdfb00a..9e32c0bd7 100644 --- a/app/assets/javascripts/stats.js.coffee +++ b/app/assets/javascripts/stats.js.coffee @@ -1,4 +1,4 @@ -# Helper for generate C3.js graphs +}# Helper for generate C3.js graphs #---------------------------------------------------------------------- buildGraph = (el) -> diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 51149006d..5de3bb76d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -8,7 +8,6 @@ @import 'participation'; @import 'pages'; @import 'proposal'; -@import 'proposals_dashboard'; @import 'legislation'; @import 'legislation_process'; @import 'community'; diff --git a/app/assets/stylesheets/proposal.scss b/app/assets/stylesheets/proposal.scss index 6ca80a791..63f90694c 100644 --- a/app/assets/stylesheets/proposal.scss +++ b/app/assets/stylesheets/proposal.scss @@ -16,3 +16,41 @@ background-color: #e7f3fd; } } + +.proposal-dashboard { + margin-top: -1.5rem; + + .columns { + padding: 0; + } + + .row { + max-width: 100%; + } + + .has-tip { + border-bottom: none; + font-weight: normal; + } + + .title { + border-bottom: 1pt solid lightgray; + + h5 { + padding: 1rem 1.5rem 1rem 1.5rem; + font-size: 16pt; + margin: 0; + } + } + + .left-menu { + border-right: 1pt solid lightgray; + border-bottom: 1pt solid lightgray; + padding: 1rem 1.5rem 1rem 1.5rem; + background-color: #fbfbfb; + } + + .body { + padding: 1rem 1.5rem 1rem 1.5rem; + } +} diff --git a/app/assets/stylesheets/proposals_dashboard.scss b/app/assets/stylesheets/proposals_dashboard.scss deleted file mode 100644 index 3c1351593..000000000 --- a/app/assets/stylesheets/proposals_dashboard.scss +++ /dev/null @@ -1,127 +0,0 @@ -.proposals-dashboard { - display: flex; - flex-direction: column; - margin-top: -1.5rem; - - .column-wrapper { - flex: 2; - display: flex; - - .left-column { - flex: 0 0 150pt; - background: lightgray; - margin-right: 5px; - padding: 5pt; - - .state-box { - .logo { - height: 100pt; - width: 100pt; - margin-left: 20pt; - margin-right: 20pt; - border-radius: 50pt; - background-color: #fff3cb; - border: 2pt solid white; - } - - .status { - height: 25pt; - width: 100pt; - margin-left: 20pt; - margin-right: 20pt; - padding-top: 3pt; - color: #055392; - font-weight: bold; - text-align: center; - vertical-align: middle; - } - - .draft { - background-color: #ffe699; - } - - .published { - background-color: #d3ebd2; - } - } - - .dashboard-menu { - color: #a9a9a9; - font-size: 16pt; - - .menu-title { - margin-top: 10pt; - } - - .menu-entry { - color: #a9a9a9; - padding-left: 25pt; - line-height: 30pt; - vertical-align: middle; - display: block; - } - - .menu-entry:focus, .menu-entry:active, .menu-entry:hover { - outline: 0; - text-decoration: none; - } - - .selected { - font-weight: bold; - color: #454545; - } - - .menu-entry.selected { - text-decoration: underline #a9a9a9; - } - } - } - - .right-column { - background: lightgray; - flex: 1 1; - padding: 5pt; - //min-height: 775px; - - .progress-info { - display: flex; - flex-flow: row wrap; - justify-content: flex-start; - align-items: center; - align-content: stretch; - width: 1440px; - } - - .cell-data { - flex-grow: 1; - width: 33%; - font-size: 16pt; - font-weight: bold; - line-height: 32pt; - vertical-align: middle; - padding-left: 42pt; - - .caption { - width: 150pt; - float: left; - } - - .value { - width: 50pt; - float: left; - text-align: right; - } - - .value:after { - clear: both; - } - } - - .body { - background-color: white; - height: 500px; - } - } - } -} - diff --git a/app/controllers/proposals_dashboard_controller.rb b/app/controllers/proposals_dashboard_controller.rb index 73c7f4778..12034a86a 100644 --- a/app/controllers/proposals_dashboard_controller.rb +++ b/app/controllers/proposals_dashboard_controller.rb @@ -50,6 +50,15 @@ class ProposalsDashboardController < ApplicationController end end + def stats + authorize! :dashboard, proposal + end + + def supports + authorize! :dashboard, proposal + render json: ProposalSupportsQuery.for(params) + end + private def proposal_executed_dashboard_action_params diff --git a/app/services/proposal_supports_query.rb b/app/services/proposal_supports_query.rb new file mode 100644 index 000000000..b886770d4 --- /dev/null +++ b/app/services/proposal_supports_query.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +class ProposalSupportsQuery + attr_reader :params + + def self.for(params) + query = ProposalSupportsQuery.new params + query.results + end + + def initialize(params) + @params = params + end + + def results + grouped_votes = groups + grouped_votes.each do |group, votes| + grouped_votes[group] = votes.inject(0) { |sum, vote| sum + vote.vote_weight } + end + + grouped_votes + end + + private + + def groups + return votes.group_by { |v| v.created_at.to_date.year } if params[:group_by] == 'year' + return votes.group_by { |v| "#{v.created_at.to_date.cweek}/#{v.created_at.to_date.year}" } if params[:group_by] == 'week' + return votes.group_by { |v| "#{v.created_at.to_date.year}-#{v.created_at.to_date.month}" } if params[:group_by] == 'month' + votes.group_by { |v| v.created_at.to_date } + end + + def votes + Vote.where(votable: proposal, created_at: start_date..end_date).order(created_at: :asc) + end + + def proposal + @proposal ||= Proposal.find(params[:proposal_id]) + end + + def start_date + return Date.parse(params[:start_date]) unless params[:start_date].blank? + proposal.created_at.to_date + end + + def end_date + return Date.parse(params[:end_date]) unless params[:end_date].blank? + Date.today + end +end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 8b4c0a171..c2c3aeb0b 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -63,15 +63,16 @@ -
-
-
- <%= render "shared/subnavigation" %> -
-
- <%= yield :header_addon %> + <% if with_subnavigation %> +
+
+
+ <%= render "shared/subnavigation" %> +
+
+ <%= yield :header_addon %> +
-
- + <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4e8299d66..41fd6b2e5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,7 +22,7 @@

<%= setting['org_name'] %>

- <%= render 'layouts/header' %> + <%= render partial: 'layouts/header', locals: {with_subnavigation: true} %> <%= render 'layouts/flash' %> - <%= yield %> +
diff --git a/app/views/layouts/proposals_dashboard.html.erb b/app/views/layouts/proposals_dashboard.html.erb index e771ff277..6aab90096 100644 --- a/app/views/layouts/proposals_dashboard.html.erb +++ b/app/views/layouts/proposals_dashboard.html.erb @@ -29,7 +29,7 @@

<%= setting['org_name'] %>

- <%= render 'layouts/header' %> + <%= render partial: 'layouts/header', locals: {with_subnavigation: false} %> - <%= render 'layouts/flash' %> + <%= render partial: 'layouts/flash' %> + +
+
+
<%= t '.title' %>
+
+
+
+ <%= render partial: 'proposals_dashboard/menu' %> +
+
+ <%= yield %> +
+
- <%= yield %>
diff --git a/app/views/proposals_dashboard/_menu.html.erb b/app/views/proposals_dashboard/_menu.html.erb new file mode 100644 index 000000000..f9871ef50 --- /dev/null +++ b/app/views/proposals_dashboard/_menu.html.erb @@ -0,0 +1,99 @@ + +<% if current_editable?(proposal) || can?(:publish, proposal) %> +
+
+
<%= t '.general' %>
+
+ + <% if current_editable?(proposal) %> +
+
+
+ <%= link_to t('.edit_proposal_link'), edit_proposal_path(proposal), target: '_blank' %> +
+
+ <% end %> + +
+
+
+ <%= link_to t('.send_notification'), + new_proposal_notification_path(proposal_id: proposal.id), + target: '_blank' %> +
+
+ + <% if can_destroy_image?(proposal) %> +
+
+
+ <%= link_to t('images.remove_image'), + image_path(proposal.image, from: request.url), + method: :delete, + data: { confirm: t('images.actions.destroy.confirm') } %> +
+
+ <% end %> + + <% unless proposal.retired? %> +
+
+
+ <%= link_to t('.retire'), + retire_form_proposal_path(proposal), + target: '_blank' %> +
+
+ <% end %> + + <% if can?(:publish, proposal) %> +
+
+
+ <%= link_to t('.publish'), publish_proposal_dashboard_index_path(proposal), method: :patch %> +
+
+ <% end %> +<% end %> + +
+
+
<%= t('.progress') %>
+
+ +
+
+
+ <%= link_to t('.graphic'), stats_proposal_dashboard_index_path(proposal.to_param) %> +
+
+ +
+
+
+ <%= link_to t('.actions'), proposal_dashboard_index_path(proposal.to_param) %> +
+
+ +<% if proposed_actions.resources.any? %> +
+
+
<%= t '.resources' %>
+
+ + <% proposed_actions.resources.each do |resource| %> +
+
+
+ + <% if resource.request_to_administrators? %> + <%= link_to resource.title, + new_request_proposal_dashboard_path(proposal, resource) %> + <% else %> + <%= link_to resource.title, resource.link, target: '_blank' %> + <% end %> + +
+
+ <% end %> +<% end %> diff --git a/app/views/proposals_dashboard/index.html.erb b/app/views/proposals_dashboard/index.html.erb index 42e6fe9c5..14566a855 100644 --- a/app/views/proposals_dashboard/index.html.erb +++ b/app/views/proposals_dashboard/index.html.erb @@ -1,113 +1,6 @@ -
-
-
-
- - <% if proposal.published? %> -
<%= t '.published' %>
- <% end %> - - <% if proposal.draft? %> -
<%= t '.draft' %>
- <% end %> -
-
- <% if current_editable?(proposal) || can?(:publish, proposal) %> -
<%= t '.general' %>
- <% if current_editable?(proposal) %> - <%= link_to t('.edit_proposal_link'), edit_proposal_path(proposal), class: 'menu-entry', target: '_blank' %> - <% end %> - - <%= link_to t('.send_notification'), - new_proposal_notification_path(proposal_id: proposal.id), - class: 'menu-entry', - target: '_blank' %> - - <% if can_destroy_image?(proposal) %> - <%= link_to t('images.remove_image'), - image_path(proposal.image, from: request.url), - method: :delete, - class: 'menu-entry', - data: { confirm: t('images.actions.destroy.confirm') } %> - <% end %> - - <% unless proposal.retired? %> - <%= link_to t('.retire'), - retire_form_proposal_path(proposal), - class: 'menu-entry', - target: '_blank' %> - <% end %> - - <%= link_to t('.publish'), publish_proposal_dashboard_index_path(proposal), method: :patch, class: 'menu-entry' if can?(:publish, proposal) %> - <% end %> - -
<%= t '.progress' %>
- - <%= link_to t('.actions'), proposal_dashboard_index_path(proposal.to_param), class: 'menu-entry' %> - - - -
<%= t '.resources' %>
- <% proposed_actions.resources.each do |resource| %> - - <% if resource.request_to_administrators? %> - <%= link_to resource.title, - new_request_proposal_dashboard_path(proposal, resource), - class: 'menu-entry' %> - <% else %> - <%= link_to resource.title, - resource.link, - target: '_blank', - class: 'menu-entry' %> - <% end %> - - <% end %> - -
-
- -
- -
- - - <% proposed_actions.each do |action| %> - <%= render partial: 'proposed_action', locals: { action: action } %> - <% end %> -
<%= t('.actions') %>
-
-
-
-
+ + + <% proposed_actions.each do |action| %> + <%= render partial: 'proposed_action', locals: { action: action } %> + <% end %> +
<%= t('.actions') %>
diff --git a/app/views/proposals_dashboard/stats.html.erb b/app/views/proposals_dashboard/stats.html.erb new file mode 100644 index 000000000..214092cea --- /dev/null +++ b/app/views/proposals_dashboard/stats.html.erb @@ -0,0 +1,20 @@ +
+
+ <%= link_to t('.group_by_year'), stats_proposal_dashboard_index_path(proposal, group_by: 'year'), class: 'button' %> + <%= link_to t('.group_by_month'), stats_proposal_dashboard_index_path(proposal, group_by: 'month'), class: 'button' %> + <%= link_to t('.group_by_week'), stats_proposal_dashboard_index_path(proposal, group_by: 'week'), class: 'button' %> + <%= link_to t('.group_by_date'), stats_proposal_dashboard_index_path(proposal), class: 'button' %> +
+
+ +
+
+
+ +<%= javascript_include_tag 'dashboard_graphs', 'data-turbolinks-track' => true %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index e5fc916f0..9693a1f8b 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,6 +12,7 @@ Rails.application.config.assets.version = '1.0' Rails.application.config.assets.precompile += %w( ckeditor/config.js ) Rails.application.config.assets.precompile += %w( ie_lt9.js ) Rails.application.config.assets.precompile += %w( stat_graphs.js ) +Rails.application.config.assets.precompile += %w( dashboard_graphs.js ) Rails.application.config.assets.precompile += %w( print.css ) Rails.application.config.assets.precompile += %w( ie.css ) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 9f48c003a..207ca3620 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -202,6 +202,8 @@ en: firefox: Firefox ie: We have detected that you are browsing with Internet Explorer. For an enhanced experience, we recommend using %{firefox} or %{chrome}. ie_title: This website is not optimised for your browser + proposals_dashboard: + title: Proposal dashboard footer: accessibility: Accessibility conditions: Terms and conditions of use @@ -490,9 +492,7 @@ en: form: submit_button: Save changes proposals_dashboard: - index: - draft: Draft - published: Published + menu: general: General publish: Publish edit_proposal_link: Edit @@ -501,12 +501,20 @@ en: progress: Progress resources: Resources actions: Actions + graphic: Graphic proposed_action: execute: Execute form: request: Request create_request: success: The request for the administrator has been successfully sent. + stats: + group_by_year: Group by year + group_by_month: Group by month + group_by_week: Group by week + group_by_date: Group by date + progress: Acumulated progress + supports: Supports polls: all: "All" no_dates: "no date assigned" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 11fc580f5..a211365cf 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -202,6 +202,8 @@ es: firefox: Firefox ie: Hemos detectado que estás navegando desde Internet Explorer. Para una mejor experiencia te recomendamos utilizar %{firefox} o %{chrome}. ie_title: Esta web no está optimizada para tu navegador + proposals_dashboard: + title: Dashboard de propuesta footer: accessibility: Accesibilidad conditions: Condiciones de uso @@ -490,9 +492,7 @@ es: form: submit_button: Guardar cambios proposals_dashboard: - index: - draft: Borrador - published: Publicada + menu: general: General publish: Publicar edit_proposal_link: Editar propuesta @@ -501,12 +501,20 @@ es: progress: Progreso resources: Recursos actions: Acciones + graphic: Gráfico proposed_action: execute: Ejecutar form: request: Solicitar create_request: success: La petición ha sido correctamente enviada al administrador. + stats: + group_by_year: Agrupar por año + group_by_month: Agrupar por meses + group_by_week: Agrupar por semanas + group_by_date: Agrupar por fechas + progress: Progreso acumulado + supports: Apoyos polls: all: "Todas" no_dates: "sin fecha asignada" diff --git a/config/routes/proposal.rb b/config/routes/proposal.rb index b7db55c2d..01f33d08f 100644 --- a/config/routes/proposal.rb +++ b/config/routes/proposal.rb @@ -2,6 +2,8 @@ resources :proposals do resources :proposals_dashboard, as: :dashboard, path: :dashboard, only: %i[index] do collection do patch :publish + get :supports + get :stats end member do