From 40e6cbc02bcb493207629f563d8aa45bd7cb69cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?= Date: Mon, 16 Jul 2018 12:48:27 +0200 Subject: [PATCH] Fixes #226 Achievements query returns executed proposed actions. Progress graph do not shows the achievements. --- app/assets/javascripts/dashboard_graphs.js | 6 +++--- app/services/proposal_achievements_query.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/dashboard_graphs.js b/app/assets/javascripts/dashboard_graphs.js index ec913bf0a..b2a1ea9ac 100644 --- a/app/assets/javascripts/dashboard_graphs.js +++ b/app/assets/javascripts/dashboard_graphs.js @@ -175,10 +175,10 @@ grid: { y: { lines: this.goals - }, - x: { - lines: this.achievements } + //x: { + // lines: this.achievements + //} }, legend: { position: 'right' diff --git a/app/services/proposal_achievements_query.rb b/app/services/proposal_achievements_query.rb index efd978f6a..09789b70b 100644 --- a/app/services/proposal_achievements_query.rb +++ b/app/services/proposal_achievements_query.rb @@ -40,7 +40,7 @@ class ProposalAchievementsQuery .joins(:proposal_dashboard_action) .includes(:proposal_dashboard_action) .where(proposal: proposal, executed_at: start_date.beginning_of_day..end_date.end_of_day) - .where(proposal_dashboard_actions: { action_type: 1 }) + .where(proposal_dashboard_actions: { action_type: 0 }) .order(executed_at: :asc) end