Download as
Browse Code »

Commit 65960e95a4fef29956859d61b1fc327adafb3c88

Authored by Michel Felipe
1 parent 3514a969
Exists in master and in 8 other branches avoid_duplicated_tasks, proposal_response, proposal_task_category, proposal_task_category_required, remove_escaped_html, restore_rejected_proposal, staging, tasks_keep_filter_params

Added source of a proposal task in processed proposals view

Showing 1 changed file with 78 additions and 0 deletions   Show diff stats
views/tasks/processed.html.erb 0 → 100644
  Diff comments   View file @65960e9
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
  1 +<%= stylesheet_link_tag 'tasks' %>
  2 +
  3 +<div class="task-processed">
  4 +<h1><%= _("%s's processed tasks") % profile.name %></h1>
  5 +
  6 +<div class="task-processed-filter">
  7 +<%
  8 + type_collection = [[nil, _('All')]] + @task_types
  9 +%>
  10 + <%= form_tag '#', :method => 'get' do %>
  11 + <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
  12 + <div>
  13 + <%= labelled_select(_('Type of task')+': ', 'filter[type]', :first, :last, @filter[:type], type_collection, {:id => 'filter-type'}) %>
  14 + <%= labelled_select(_('Status:'), 'filter[status]', :last, :first, @filter[:status], [[_('Any'), nil], [_(Task::Status.names[Task::Status::CANCELLED]), 2], [_(Task::Status.names[Task::Status::FINISHED]), 3] ]) %>
  15 + </div>
  16 +
  17 + <div>
  18 + <%= labelled_text_field(_('Text Filter:'), 'filter[text]', @filter[:text]) %>
  19 + </div>
  20 +
  21 + <div>
  22 + <%= labelled_text_field(_('Requestor:'), 'filter[requestor]', @filter[:requestor]) %>
  23 + <%= labelled_text_field(_('Closed by:'), 'filter[closed_by]', @filter[:closed_by]) %>
  24 + </div>
  25 +
  26 + <%= labelled_form_field(_('Creation date'), date_range_field('filter[created_from]', 'filter[created_until]', @filter[:created_from], @filter[:created_until], '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %>
  27 + <%= labelled_form_field(_('Processed date'), date_range_field('filter[closed_from]', 'filter[closed_until]', @filter[:closed_from], @filter[:closed_until], '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_until' })) %>
  28 +
  29 + <div class="actions">
  30 + <%= submit_button(:search, _('Search')) %>
  31 + </div>
  32 + <% end %>
  33 + <% end %>
  34 +</div>
  35 +
  36 +<p>
  37 +<% if @tasks.empty? %>
  38 + <em><%= _('No processed tasks.') %></em>
  39 +<% else %>
  40 + <ul class="task-list">
  41 + <% @tasks.each do |item| %>
  42 + <li class="task status-<%= item.status%>">
  43 + <div class="task-proposal-source"><b><%= _('Source') %>:</b> <%= item.proposal_source %></div>
  44 + <div class="title">
  45 + <%= task_information(item) %>
  46 + </div>
  47 + <div class="status">
  48 + <%= _(Task::Status.names[item.status]) %>
  49 + </div>
  50 + <div class="dates">
  51 + <span class="created">
  52 + <span class="label"><%= _('Created:') %></span>
  53 + <span class="value"><%= show_date(item.created_at) %></span>
  54 + </span>
  55 + &nbsp; &#151; &nbsp;
  56 + <span class="processed">
  57 + <span class="label"><%= _('Processed:') %></span>
  58 + <span class="value"><%= show_date(item.end_date) %></span>
  59 + </span>
  60 + </div>
  61 + <% if item.closed_by.present? %>
  62 + <div class="closed-by">
  63 + <span class="label"><%= _('Closed by:') %></span>
  64 + <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span>
  65 + </div>
  66 + <% end %>
  67 + </li>
  68 + <% end %>
  69 + </ul>
  70 + <%= pagination_links(@tasks)%>
  71 +<% end %>
  72 +</p>
  73 +
  74 +<% button_bar do %>
  75 + <%= button(:back, _('Back'), :action => 'index') %>
  76 +<% end %>
  77 +
  78 +</div>