Fixes #191

Shows goals in progress graphic

app/assets/javascripts/dashboard_graphs.js

@@ -9,16 +9,49 @@
     this.url = url;
     this.targetId = null;
     this.groupBy = null;
+    this.proposalSuccess = null;
     this.progressLabel = 'Progress';
     this.supportsLabel = 'Supports';
+    this.chart = null;
+    this.goals = null;
+    this.xColumnValues = null;
+    this.progressColumnValues = null;
   };
 
   ProposalGraph.prototype.refresh = function() {
-    $.ajax({
+    this.refreshGoals()
+      .then(this.refreshData.bind(this))
+      .done(this.draw.bind(this));
+  };
+
+  ProposalGraph.prototype.refreshGoals = function () {
+    return $.ajax({
+      url: '/dashboard/resources.json',
+      cache: false,
+      success: function(data) {
+        this.parseGoals(data);
+      }.bind(this)
+    });
+  };
+
+  ProposalGraph.prototype.parseGoals = function(data) {
+    var i, l;
+
+    this.goals = [];
+    for (i = 0, l = data.length; i < l; i += 1) {
+      this.goals.push({
+        value: data[i].required_supports,
+        text: data[i].title
+      });
+    }
+  };
+
+  ProposalGraph.prototype.refreshData = function () {
+    return $.ajax({
       url: this.url,
       cache: false,
       success: function (data) {
-        this.draw(data);
+        this.parseData(data);
       }.bind(this),
       data: {
         group_by: this.groupBy
@@ -26,29 +59,34 @@
     });
   };
 
-  ProposalGraph.prototype.draw = function(data) {
-    var xColumnValues = [ 'x' ],
-      progressColumnValues =  [ this.progressLabel ],
-      key;
+  ProposalGraph.prototype.parseData = function(data) {
+    var key; 
+    
+    this.xColumnValues = [ 'x' ];
+    this.progressColumnValues =  [ this.progressLabel ];
 
     for (key in data) {
       if (data.hasOwnProperty(key)) {
-        xColumnValues.push(key);
-        progressColumnValues.push(data[key]);
+        this.xColumnValues.push(key);
+        this.progressColumnValues.push(data[key]);
       }
     }
+  };
 
-    c3.generate({
+  ProposalGraph.prototype.draw = function(data) {
+    this.chart = c3.generate({
       bindto: '#' + this.targetId,
       data: {
         x: 'x',
         columns: [
-          xColumnValues,
-          progressColumnValues
+          this.xColumnValues,
+          this.progressColumnValues
         ]
       },
       axis: {
         y: {
+          min: 0,
+          max: this.proposalSuccess,
           label: { 
             text: this.supportsLabel,
             position: 'outer-middle'
@@ -57,6 +95,11 @@
         x: {
           type: 'category'
         }
+      },
+      grid: {
+        y: {
+          lines: this.goals
+        }
       }
     });
   };
@@ -68,6 +111,7 @@
       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.proposalSuccess = parseInt($(this).data('proposal-success'), 10);
 
       graph.refresh();
     });

app/assets/stylesheets/application.scss

@@ -9,6 +9,7 @@
 @import 'participation';
 @import 'pages';
 @import 'proposal';
+@import 'proposal-graph';
 @import 'poll';
 @import 'legislation';
 @import 'legislation_process';

app/assets/stylesheets/proposal-graph.scss

@@ -0,0 +1,12 @@
+// #proposal-graph > svg > g:nth-child(2) > g.c3-grid.c3-grid-lines > g.c3-ygrid-lines > g:nth-child(2) > line
+#proposal-graph {
+    .c3-ygrid-lines {
+      line {
+        stroke: #005c92;
+      }
+
+      text {
+        fill: #005c92;
+      }
+    }
+  }

app/controllers/dashboard/resources_controller.rb

@@ -0,0 +1,19 @@
+class Dashboard::ResourcesController < Dashboard::BaseController 
+  skip_authorization_check
+
+  def index
+    @resources = ProposalDashboardAction
+                 .active
+                 .resources
+                 .where('required_supports > 0')
+                 .order(required_supports: :asc)
+
+    render json: @resources.map { |resource|
+      {
+        id: resource.id,
+        title: resource.title,
+        required_supports: resource.required_supports
+      }
+    }
+  end
+end

app/views/proposals_dashboard/progress.html.erb

@@ -1,11 +1,12 @@
 <% content_for :action_title, t('.title') %>
 
+<div class="row">
   <div class="small-12 column">
     <div class="button-group">
-    <%= link_to t('.group_by_year'), progress_proposal_dashboard_index_path(proposal, group_by: 'year'), class: 'button' %>
-    <%= link_to t('.group_by_month'), progress_proposal_dashboard_index_path(proposal, group_by: 'month'), class: 'button' %>
-    <%= link_to t('.group_by_week'), progress_proposal_dashboard_index_path(proposal, group_by: 'week'), class: 'button' %>
       <%= link_to t('.group_by_date'), progress_proposal_dashboard_index_path(proposal), class: 'button' %>
+      <%= link_to t('.group_by_week'), progress_proposal_dashboard_index_path(proposal, group_by: 'week'), class: 'button' %>
+      <%= link_to t('.group_by_month'), progress_proposal_dashboard_index_path(proposal, group_by: 'month'), class: 'button' %>
+    </div>
   </div>
 </div>
 
@@ -15,6 +16,7 @@
        data-proposal-graph-group-by="<%= params[:group_by] %>"
        data-proposal-graph-progress-label="<%= t '.progress' %>"
        data-proposal-graph-supports-label="<%= t '.supports' %>"
+       data-proposal-success="<%= Setting["votes_for_proposal_success"] %>"
        class="c3" 
        style="max-height: 320px; position: relative;"></div>
 </div>

config/locales/en/general.yml

@@ -515,10 +515,9 @@ en:
       success: The request for the administrator has been successfully sent.
     progress:
       title: Graphic
-      group_by_year: Group by year
-      group_by_month: Group by month
-      group_by_week: Group by week
-      group_by_date: Group by date
+      group_by_month: Monthly
+      group_by_week: Weekly
+      group_by_date: Daily
       progress: Acumulated progress
       supports: Supports
     index:

config/locales/es/general.yml

@@ -515,10 +515,9 @@ es:
       success: La petición ha sido correctamente enviada al administrador.
     progress:
       title: Gráfico
-      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
+      group_by_month: Mensual
+      group_by_week: Semanal
+      group_by_date: Diario
       progress: Progreso acumulado
       supports: Apoyos
     index:

config/routes/proposal.rb

@@ -1,3 +1,7 @@
+namespace :dashboard do
+  resources :resources, only: [:index]
+end
+
 resources :proposals do
   resources :proposals_dashboard, as: :dashboard, path: :dashboard, only: [:index] do
     collection do