consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #226

Browse Source 
Achievements query returns executed proposed actions.
Progress graph do not shows the achievements.
This commit is contained in:
Juan Salvador Pérez García
2018-07-16 12:48:27 +02:00
parent 7a9faef775
commit 40e6cbc02b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/dashboard_graphs.js
View File

@@ -175,10 +175,10 @@
grid: { grid: {
y: { y: {
lines: this.goals lines: this.goals
},
x: {
lines: this.achievements
} }
//x: {
// lines: this.achievements
//}
}, },
legend: { legend: {
position: 'right' position: 'right'

2
app/services/proposal_achievements_query.rb
View File

@@ -40,7 +40,7 @@ class ProposalAchievementsQuery
.joins(:proposal_dashboard_action) .joins(:proposal_dashboard_action)
.includes(:proposal_dashboard_action) .includes(:proposal_dashboard_action)
.where(proposal: proposal, executed_at: start_date.beginning_of_day..end_date.end_of_day) .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) .order(executed_at: :asc)
end end