From f7133ee04d7a181bc83d2547e73df40f26bd7903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?= Date: Thu, 5 Jul 2018 10:53:29 +0200 Subject: [PATCH] Implements #186 Progress view shows the actions according to the mockups. --- app/assets/stylesheets/proposal.scss | 37 +++++++++++++++ .../_proposed_action.html.erb | 47 ++++++++++++------- .../_recommended_actions.html.erb | 9 ++++ .../proposals_dashboard/_resources.html.erb | 1 + .../proposals_dashboard/progress.html.erb | 8 +--- config/locales/en/general.yml | 5 +- config/locales/es/general.yml | 7 ++- 7 files changed, 82 insertions(+), 32 deletions(-) create mode 100644 app/views/proposals_dashboard/_recommended_actions.html.erb diff --git a/app/assets/stylesheets/proposal.scss b/app/assets/stylesheets/proposal.scss index 7ce64dddc..5d4f52819 100644 --- a/app/assets/stylesheets/proposal.scss +++ b/app/assets/stylesheets/proposal.scss @@ -294,4 +294,41 @@ } } + + .proposed-action { + display: flex; + flex-flow: row wrap; + margin-bottom: 15pt; + + .exec-indicator { + margin-right: 10pt; + + i { + color: #00e193; + } + + .checkbox-unchecked { + display:block; + width: 16px; + height: 16px; + border: 1px solid lightgray; + margin-top: 4px; + } + } + + h4 { + font-weight: normal; + } + + p { + color: #535469; + line-height: 1rem; + font-size: 16px; + margin: 0; + } + + a { + font-size: 16px; + } + } } diff --git a/app/views/proposals_dashboard/_proposed_action.html.erb b/app/views/proposals_dashboard/_proposed_action.html.erb index 3cf8d458e..a82cd2a09 100644 --- a/app/views/proposals_dashboard/_proposed_action.html.erb +++ b/app/views/proposals_dashboard/_proposed_action.html.erb @@ -1,18 +1,29 @@ - - - <%= link_to new_request_proposal_dashboard_path(proposal, action) do %> - - <%= action.title %> - - <% end %> - - - <% if action.proposals.where(id: proposal.id).any? %> - <%=l action.proposal_executed_dashboard_actions.find_by(proposal: proposal).executed_at, format: :short %> - <% else %> - <%= link_to t('.execute'), - execute_proposal_dashboard_path(proposal, action), - method: 'post' %> - <% end %> - - +
+
+
+ <% if proposed_action.proposals.where(id: proposal.id).any? %> + + <% else %> + <%= link_to execute_proposal_dashboard_path(proposal, proposed_action), method: :post, id: "#{dom_id(proposed_action)}_execute" do %> +
+
+ <% end %> + <% end %> +
+ +
+

<%= proposed_action.title %>

+ <% if proposed_action.proposals.where(id: proposal.id).any? %> +

<%=l(proposed_action.proposal_executed_dashboard_actions.find_by(proposal: proposal).executed_at.to_date) %>

+ <% else %> + <% unless proposed_action.short_description.blank? %> +

<%= proposed_action.short_description %>

+ <% end %> + + <% proposed_action.links.each do |link| %> + <%= link_to link.label, link.url, target: '_blank' %> + <% end %> + <% end %> +
+
+
diff --git a/app/views/proposals_dashboard/_recommended_actions.html.erb b/app/views/proposals_dashboard/_recommended_actions.html.erb new file mode 100644 index 000000000..b6ec1a6ac --- /dev/null +++ b/app/views/proposals_dashboard/_recommended_actions.html.erb @@ -0,0 +1,9 @@ +<% if proposed_actions.any? %> +

+
+
<%= t('.title') %>
+
+
+ + <%= render partial: 'proposed_action', collection: proposed_actions %> +<% end %> diff --git a/app/views/proposals_dashboard/_resources.html.erb b/app/views/proposals_dashboard/_resources.html.erb index b6928f7ae..e3dc8d456 100644 --- a/app/views/proposals_dashboard/_resources.html.erb +++ b/app/views/proposals_dashboard/_resources.html.erb @@ -1,4 +1,5 @@ <% if active_resources.any? %> +

<%= t('.available_resources') %>
diff --git a/app/views/proposals_dashboard/progress.html.erb b/app/views/proposals_dashboard/progress.html.erb index 072bdd9b2..729b874b5 100644 --- a/app/views/proposals_dashboard/progress.html.erb +++ b/app/views/proposals_dashboard/progress.html.erb @@ -21,11 +21,5 @@ <%= javascript_include_tag 'dashboard_graphs', 'data-turbolinks-track' => true %> - - - <% proposed_actions.each do |action| %> - <%= render partial: 'proposed_action', locals: { action: action } %> - <% end %> -
<%= t('proposals_dashboard.menu.actions') %>
- +<%= render 'recommended_actions' %> <%= render 'resources' %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 7412b658c..d8864b312 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -508,10 +508,7 @@ en: my_proposal: My proposal progress: Progress resources: Resources - actions: Actions polls: Polls - proposed_action: - execute: Execute form: request: Request create_request: @@ -539,6 +536,8 @@ en: required_supports: "%{supports} supports required" and: and view_resource: See resource + recommended_actions: + title: Recommended actions dashboard: polls: index: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index cfe621291..4af6f440e 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -508,15 +508,12 @@ es: my_proposal: Mi propuesta progress: Progreso resources: Recursos - actions: Acciones polls: Encuestas - proposed_action: - execute: Ejecutar form: request: Solicitar create_request: success: La petición ha sido correctamente enviada al administrador. - stats: + progress: title: Gráfico group_by_year: Agrupar por año group_by_month: Agrupar por meses @@ -539,6 +536,8 @@ es: required_supports: "%{supports} apoyos necesarios" and: y view_resource: Ver recurso + recommended_actions: + title: Acciones recomendadas dashboard: polls: index: