Fixes #226

Achievements query returns executed proposed actions. Progress graph do not shows the achievements.
2018-07-16 12:48:27 +02:00
parent 7a9faef775
commit 40e6cbc02b
2 changed files with 4 additions and 4 deletions
--- 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'
--- 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