New summary for recommended actions section on progress page

- Divide recommended actions into actions done and actions pending.
- Display recomended actions as goals (diplay four by defalut) without toggle but with link to new recommended actions page.
- Display description over short_description
This commit is contained in:
taitus
2019-01-11 13:13:58 +01:00
parent b6b49c435c
commit 45afbc0b10
9 changed files with 108 additions and 11 deletions

View File

@@ -1,5 +1,6 @@
class DashboardController < Dashboard::BaseController
helper_method :dashboard_action, :active_resources, :course
before_action :set_done_and_pending_actions, only: [:recommended_actions, :progress]
def show
authorize! :dashboard, proposal
@@ -11,8 +12,8 @@ class DashboardController < Dashboard::BaseController
proposal.publish
redirect_to proposal_dashboard_path(proposal), notice: t('proposals.notice.published')
end
def progress
def progress
authorize! :dashboard, proposal
end
@@ -21,7 +22,7 @@ class DashboardController < Dashboard::BaseController
end
private
def active_resources
@active_resources ||= Dashboard::Action.active.resources.order(required_supports: :asc, day_offset: :asc)
end
@@ -29,4 +30,9 @@ class DashboardController < Dashboard::BaseController
def course
@course ||= Dashboard::Action.course_for(proposal)
end
def set_done_and_pending_actions
@done_actions = proposed_actions.joins(:proposals).where("proposals.id = ?", proposal.id)
@pending_actions = proposed_actions - @done_actions
end
end